Update to latest kfbat/kafka-ui chart

Signed-off-by: Tamal Saha <[email protected]>
kubedb · Sep 23, 2024 · 7d7cba9 · 7d7cba9
1 parent bec1d07
commit 7d7cba9
Show file tree

Hide file tree

Showing 6 changed files with 151 additions and 74 deletions.
diff --git a/charts/kafka-ui/Chart.yaml b/charts/kafka-ui/Chart.yaml
@@ -3,9 +3,9 @@ name: kafka-ui
 description: A Helm chart for kafka-UI
 type: application
 version: v2024.4.27
-appVersion: v0.7.2
-home: https://docs.kafka-ui.provectus.io
-icon: https://github.com/provectus/kafka-ui/raw/master/documentation/images/kafka-ui-logo.png
+appVersion: v1.0.0
+home: https://kafbat.io
+icon: https://raw.githubusercontent.com/kafbat/kafka-ui/main/documentation/images/logo_new.png
 maintainers:
 - name: appscode
   email: [email protected]
diff --git a/charts/kafka-ui/README.md b/charts/kafka-ui/README.md
diff --git a/charts/kafka-ui/templates/configmap_fromValues.yaml b/charts/kafka-ui/templates/configmap_fromValues.yaml
@@ -8,5 +8,5 @@ metadata:
     {{- include "kafka-ui.labels" . | nindent 4 }}
 data:
   config.yml: |-
-    {{- toYaml .Values.yamlApplicationConfig | nindent 4}}
+    {{- tpl (toYaml .Values.yamlApplicationConfig) . | nindent 4}}
 {{ end }}
diff --git a/charts/kafka-ui/templates/deployment.yaml b/charts/kafka-ui/templates/deployment.yaml
@@ -16,6 +16,9 @@ spec:
   selector:
     matchLabels:
       {{- include "kafka-ui.selectorLabels" . | nindent 6 }}
+  {{- if .Values.revisionHistoryLimit }}
+  revisionHistoryLimit: {{ .Values.revisionHistoryLimit }}
+  {{- end }}
   template:
     metadata:
       annotations:
@@ -48,20 +51,37 @@ spec:
             {{- toYaml .Values.securityContext | nindent 12 }}
           image: {{ include "kafka-ui.imageName" . }}
           imagePullPolicy: {{ .Values.image.pullPolicy }}
-          {{- if or .Values.env  .Values.yamlApplicationConfig .Values.yamlApplicationConfigConfigMap}}
+          {{- if or .Values.env  .Values.yamlApplicationConfig .Values.yamlApplicationConfigConfigMap .Values.yamlApplicationConfigSecret }}
           env:
             {{- with .Values.env }}
               {{- toYaml . | nindent 12 }}
             {{- end }}
-            {{- if or .Values.yamlApplicationConfig .Values.yamlApplicationConfigConfigMap}}
+            {{- if or .Values.yamlApplicationConfig .Values.yamlApplicationConfigConfigMap .Values.yamlApplicationConfigSecret }}
             - name: SPRING_CONFIG_ADDITIONAL-LOCATION
               {{- if .Values.yamlApplicationConfig }}
               value: /kafka-ui/config.yml
               {{- else if .Values.yamlApplicationConfigConfigMap }}
               value: /kafka-ui/{{ .Values.yamlApplicationConfigConfigMap.keyName | default "config.yml" }}
+              {{- else if .Values.yamlApplicationConfigSecret }}
+              value: /kafka-ui/{{ .Values.yamlApplicationConfigSecret.keyName | default "config.yml" }}
               {{- end }}
             {{- end }}
           {{- end }}
+          {{- range $key, $value := .Values.envs.secretMappings }}
+            - name: {{ $key }}
+              valueFrom:
+                secretKeyRef:
+                  name: {{ required "Missing required value envs.secretMappings.[].name" $value.name }}
+                  key: {{ required "Missing required value envs.secretMappings.[].keyName"  $value.keyName }}
+          {{- end }}
+          {{- range $key, $value := .Values.envs.configMappings }}
+            - name: {{ $key }}
+              valueFrom:
+                configMapKeyRef:
+                  name: {{ required "Missing required value envs.configMappings.[].name" $value.name }}
+                  key: {{ required "Missing required value envs.configMappings.[].keyName"  $value.keyName }}
+          {{- end }}
+          {{- if or .Values.existingConfigMap .Values.envs.config .Values.existingSecret .Values.envs.secret }}
           envFrom:
             {{- if .Values.existingConfigMap }}
             - configMapRef:
@@ -78,7 +98,8 @@ spec:
             {{- if .Values.envs.secret}}
             - secretRef:
                 name: {{ include "kafka-ui.fullname" . }}
-            {{- end}}    
+            {{- end}}
+          {{- end }}
           ports:
             - name: http
               containerPort: 8080
@@ -107,7 +128,7 @@ spec:
             timeoutSeconds: 10
           resources:
             {{- toYaml .Values.resources | nindent 12 }}
-          {{- if or .Values.yamlApplicationConfig .Values.volumeMounts .Values.yamlApplicationConfigConfigMap}}
+          {{- if or .Values.yamlApplicationConfig .Values.volumeMounts .Values.yamlApplicationConfigConfigMap .Values.yamlApplicationConfigSecret }}
           volumeMounts:
             {{- with .Values.volumeMounts }} 
               {{- toYaml . | nindent 12 }}
@@ -120,8 +141,15 @@ spec:
             - name: kafka-ui-yaml-conf-configmap
               mountPath: /kafka-ui/
             {{- end }}
+            {{- if .Values.yamlApplicationConfigSecret}}
+            - name: kafka-ui-yaml-conf-secret
+              mountPath: /kafka-ui/
+            {{- end }}
           {{- end }}
-      {{- if or .Values.yamlApplicationConfig .Values.volumes .Values.yamlApplicationConfigConfigMap}}
+        {{- with .Values.extraContainers }}
+        {{ tpl . $ | nindent 8 }}
+        {{- end }}
+      {{- if or .Values.yamlApplicationConfig .Values.volumes .Values.yamlApplicationConfigConfigMap .Values.yamlApplicationConfigSecret }}
       volumes:
         {{- with .Values.volumes }}
           {{- toYaml . | nindent 8 }}
@@ -136,6 +164,11 @@ spec:
           configMap: 
             name: {{ .Values.yamlApplicationConfigConfigMap.name }}
         {{- end }}
+        {{- if .Values.yamlApplicationConfigSecret}}
+        - name: kafka-ui-yaml-conf-secret
+          secret:
+            secretName: {{ .Values.yamlApplicationConfigSecret.name }}
+        {{- end }}
       {{- end }}
       {{- with .Values.nodeSelector }}
       nodeSelector:
@@ -149,3 +182,7 @@ spec:
       tolerations:
         {{- toYaml . | nindent 8 }}
       {{- end }}
+      {{- with .Values.hostAliases }}
+      hostAliases:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
diff --git a/charts/kafka-ui/templates/secret.yaml b/charts/kafka-ui/templates/secret.yaml
@@ -7,8 +7,8 @@ metadata:
   labels:
     {{- include "kafka-ui.labels" . | nindent 4 }}
 type: Opaque
-data:
+stringData:
   {{- range $key, $val := .Values.envs.secret }}
-  {{ $key }}: {{ $val | b64enc | quote }}
+  {{ $key }}: {{ $val | quote }}
   {{- end -}}
 {{- end}}
diff --git a/charts/kafka-ui/values.yaml b/charts/kafka-ui/values.yaml
@@ -1,8 +1,8 @@
 replicaCount: 1
 
 image:
-  registry: docker.io
-  repository: provectuslabs/kafka-ui
+  registry: ghcr.io
+  repository: kafbat/kafka-ui
   pullPolicy: IfNotPresent
   # Overrides the image tag whose default is the chart appVersion.
   tag: ""
@@ -40,10 +40,23 @@ yamlApplicationConfigConfigMap:
   {}
   # keyName: config.yml
   # name: configMapName
+yamlApplicationConfigSecret:
+  {}
+  # keyName: config.yml
+  # name: secretName
+
 existingSecret: ""
 envs:
   secret: {}
   config: {}
+  secretMappings: {}
+    #ENV_NAME:
+    #  name: kubernetes-secret-name
+    #  keyName: kubernetes-secret-key
+  configMappings: {}
+    #ENV_NAME:
+    #  name: kubernetes-configmap-name
+    #  keyName: kubernetes-configmap-key
 
 networkPolicy:
   enabled: false
@@ -129,6 +142,27 @@ volumeMounts: {}
 
 volumes: {}
 
+hostAliases: {}
+
+## Specify additional containers in extraContainers.
+## For example, to add an authentication proxy to a kafka-ui pod.
+extraContainers: |
+# - name: proxy
+#   image: quay.io/gambol99/keycloak-proxy:latest
+#   args:
+#   - -provider=github
+#   - -client-id=
+#   - -client-secret=
+#   - -github-org=<ORG_NAME>
+#   - -email-domain=*
+#   - -cookie-secret=
+#   - -http-address=http://0.0.0.0:4181
+#   - -upstream-url=http://127.0.0.1:3000
+#   ports:
+#     - name: proxy-web
+#       containerPort: 4181
+revisionHistoryLimit: null
+
 namespace:
   create: false