浏览代码

Add helm labels required by istio (#2548)

Patryk D. Cichy 2 年之前
父节点
当前提交
1134ec5d13
共有 1 个文件被更改,包括 7 次插入5 次删除
  1. 7 5
      charts/kafka-ui/templates/deployment.yaml

+ 7 - 5
charts/kafka-ui/templates/deployment.yaml

@@ -20,6 +20,8 @@ spec:
         checksum/config: {{ include (print $.Template.BasePath "/configmap.yaml") . | sha256sum }}
         checksum/config: {{ include (print $.Template.BasePath "/configmap.yaml") . | sha256sum }}
         checksum/secret: {{ include (print $.Template.BasePath "/secret.yaml") . | sha256sum }}
         checksum/secret: {{ include (print $.Template.BasePath "/secret.yaml") . | sha256sum }}
       labels:
       labels:
+        app: {{ include "kafka-ui.name" . }}
+        version: {{ .Values.image.tag | default .Chart.AppVersion }}
         {{- include "kafka-ui.selectorLabels" . | nindent 8 }}
         {{- include "kafka-ui.selectorLabels" . | nindent 8 }}
         {{- if .Values.podLabels }}
         {{- if .Values.podLabels }}
         {{- toYaml .Values.podLabels | nindent 8 }}
         {{- toYaml .Values.podLabels | nindent 8 }}
@@ -72,7 +74,7 @@ spec:
             {{- if .Values.envs.secret}}
             {{- if .Values.envs.secret}}
             - secretRef:
             - secretRef:
                 name: {{ include "kafka-ui.fullname" . }}
                 name: {{ include "kafka-ui.fullname" . }}
-            {{- end}}    
+            {{- end}}
           ports:
           ports:
             - name: http
             - name: http
               containerPort: 8080
               containerPort: 8080
@@ -97,7 +99,7 @@ spec:
             {{- toYaml .Values.resources | nindent 12 }}
             {{- toYaml .Values.resources | nindent 12 }}
           {{- if or .Values.yamlApplicationConfig .Values.volumeMounts .Values.yamlApplicationConfigConfigMap}}
           {{- if or .Values.yamlApplicationConfig .Values.volumeMounts .Values.yamlApplicationConfigConfigMap}}
           volumeMounts:
           volumeMounts:
-            {{- with .Values.volumeMounts }} 
+            {{- with .Values.volumeMounts }}
               {{- toYaml . | nindent 12 }}
               {{- toYaml . | nindent 12 }}
             {{- end }}
             {{- end }}
             {{- if .Values.yamlApplicationConfig }}
             {{- if .Values.yamlApplicationConfig }}
@@ -116,12 +118,12 @@ spec:
         {{- end }}
         {{- end }}
         {{- if .Values.yamlApplicationConfig }}
         {{- if .Values.yamlApplicationConfig }}
         - name: kafka-ui-yaml-conf
         - name: kafka-ui-yaml-conf
-          configMap: 
+          configMap:
             name: {{ include "kafka-ui.fullname" . }}-fromvalues
             name: {{ include "kafka-ui.fullname" . }}-fromvalues
         {{- end }}
         {{- end }}
         {{- if .Values.yamlApplicationConfigConfigMap}}
         {{- if .Values.yamlApplicationConfigConfigMap}}
         - name: kafka-ui-yaml-conf-configmap
         - name: kafka-ui-yaml-conf-configmap
-          configMap: 
+          configMap:
             name: {{ .Values.yamlApplicationConfigConfigMap.name }}
             name: {{ .Values.yamlApplicationConfigConfigMap.name }}
         {{- end }}
         {{- end }}
       {{- end }}
       {{- end }}
@@ -136,4 +138,4 @@ spec:
       {{- with .Values.tolerations }}
       {{- with .Values.tolerations }}
       tolerations:
       tolerations:
         {{- toYaml . | nindent 8 }}
         {{- toYaml . | nindent 8 }}
-      {{- end }}
+      {{- end }}