Skip to content

Commit

Permalink
Revert "Add helm labels required by istio (#2548)" (#2589)
Browse files Browse the repository at this point in the history
This reverts commit 1134ec5.
  • Loading branch information
Haarolean authored Sep 15, 2022
1 parent 5db2c17 commit d149d26
Showing 1 changed file with 5 additions and 7 deletions.
12 changes: 5 additions & 7 deletions charts/kafka-ui/templates/deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,6 @@ spec:
checksum/config: {{ include (print $.Template.BasePath "/configmap.yaml") . | sha256sum }}
checksum/secret: {{ include (print $.Template.BasePath "/secret.yaml") . | sha256sum }}
labels:
app: {{ include "kafka-ui.name" . }}
version: {{ .Values.image.tag | default .Chart.AppVersion }}
{{- include "kafka-ui.selectorLabels" . | nindent 8 }}
{{- if .Values.podLabels }}
{{- toYaml .Values.podLabels | nindent 8 }}
Expand Down Expand Up @@ -74,7 +72,7 @@ spec:
{{- if .Values.envs.secret}}
- secretRef:
name: {{ include "kafka-ui.fullname" . }}
{{- end}}
{{- end}}
ports:
- name: http
containerPort: 8080
Expand All @@ -99,7 +97,7 @@ spec:
{{- toYaml .Values.resources | nindent 12 }}
{{- if or .Values.yamlApplicationConfig .Values.volumeMounts .Values.yamlApplicationConfigConfigMap}}
volumeMounts:
{{- with .Values.volumeMounts }}
{{- with .Values.volumeMounts }}
{{- toYaml . | nindent 12 }}
{{- end }}
{{- if .Values.yamlApplicationConfig }}
Expand All @@ -118,12 +116,12 @@ spec:
{{- end }}
{{- if .Values.yamlApplicationConfig }}
- name: kafka-ui-yaml-conf
configMap:
configMap:
name: {{ include "kafka-ui.fullname" . }}-fromvalues
{{- end }}
{{- if .Values.yamlApplicationConfigConfigMap}}
- name: kafka-ui-yaml-conf-configmap
configMap:
configMap:
name: {{ .Values.yamlApplicationConfigConfigMap.name }}
{{- end }}
{{- end }}
Expand All @@ -138,4 +136,4 @@ spec:
{{- with .Values.tolerations }}
tolerations:
{{- toYaml . | nindent 8 }}
{{- end }}
{{- end }}

0 comments on commit d149d26

Please sign in to comment.