Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix rendering of flyte-core and flyteagent charts #5048

Merged
merged 2 commits into from
Mar 26, 2024
Merged

fix rendering of flyte-core and flyteagent charts #5048

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
80c0c5b
fix rendering of flyte-core and flyteagent charts
pbrogan12 Mar 13, 2024
edc72ed
update to kubeflow spark-operator repo fixes #5055
pbrogan12 Mar 14, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 0 additions & 22 deletions charts/flyte-core/templates/_helpers.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,28 +102,6 @@ app.kubernetes.io/managed-by: {{ .Release.Service }}
{{- end }}
{{- end -}}

{{- define "flyteagent.name" -}}
flyteagent
{{- end -}}

{{- define "flyteagent.selectorLabels" -}}
app.kubernetes.io/name: {{ template "flyteagent.name" . }}
app.kubernetes.io/instance: {{ .Release.Name }}
{{- end -}}

{{- define "flyteagent.labels" -}}
{{ include "flyteagent.selectorLabels" . }}
helm.sh/chart: {{ include "flyte.chart" . }}
app.kubernetes.io/managed-by: {{ .Release.Service }}
{{- end -}}

{{- define "flyteagent.podLabels" -}}
{{ include "flyteagent.labels" . }}
{{- with .Values.flyteagent.podLabels }}
{{ toYaml . }}
{{- end }}
{{- end -}}

{{- define "flytepropeller.name" -}}
flytepropeller
{{- end -}}
Expand Down
2 changes: 1 addition & 1 deletion charts/flyteagent/templates/_helpers.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ app.kubernetes.io/managed-by: {{ .Release.Service }}
{{- define "flyteagent.podLabels" -}}
{{ include "flyteagent.labels" . }}
{{- with .Values.podLabels }}
{{- toYaml . }}
{{ toYaml . }}
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍 I can confirm that this change is correct

This is what I have in our local copy of the chart, so it would appear that I accidentally did not carry it over into my PR at #4756 (fb9ffd5#diff-40d80930ba32a1baa6eaca2a0694d9b0d21b8d72fc71fd71405b2973fde1a5aaR34)

Apologies!

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Will a new version of the chart be published before the 1.12 release w/ these fixes?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

we can certainly have this out as a patch release before 1.12.

{{- end }}
{{- end -}}

Expand Down
Loading