feat(charts): fix wrong charts values

relate tchiotludo#426
sajiljosephs · Oct 1, 2020 · c82e6ce · c82e6ce
1 parent ec99a21
commit c82e6ce
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 26 deletions.
diff --git a/helm/akhq/Chart.yaml b/helm/akhq/Chart.yaml
@@ -6,8 +6,7 @@ version: 0.1.3
 keywords:
   - kafka
   - confluent
-  - timeseries
-  - influxdata
+  - gui
 home: https://akhq.io
 icon: https://raw.githubusercontent.com/tchiotludo/akhq/master/assets/img/logo_black.png
 sources:

diff --git a/helm/akhq/templates/deployment.yaml b/helm/akhq/templates/deployment.yaml
@@ -2,7 +2,7 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: {{ include "akhq.fullname" . }}
-  {{- with .Values.image.annotations }}
+  {{- with .Values.annotations }}
   annotations:
     {{- toYaml . | nindent 4 }}
   {{- end }}
@@ -53,15 +53,13 @@ spec:
           image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
           imagePullPolicy: {{ .Values.image.pullPolicy | default "Always" }}
           env:
-          {{- if .Values.secrets }}
-          - name: MICRONAUT_ENVIRONMENTS
-            value: secrets
-          - name: MICRONAUT_CONFIG_FILES
-            value: /app/application.yml,/app/application-secrets.yml
-          {{- end }}
-          {{- with .Values.image.extraEnv }}
-{{ toYaml . | trim | indent 10 }}
-          {{- end }}
+            {{- if $.Values.extraEnv }}{{ toYaml $.Values.extraEnv | trim | nindent 12 }}{{ end }}
+            {{- if .Values.secrets }}
+            - name: MICRONAUT_ENVIRONMENTS
+              value: secrets
+            - name: MICRONAUT_CONFIG_FILES
+              value: /app/application.yml,/app/application-secrets.yml
+            {{- end }}
           volumeMounts:
           {{- if .Values.extraVolumeMounts }}{{ toYaml .Values.extraVolumeMounts | trim | nindent 12 }}{{ end }}
           {{- if .Values.configuration }}

diff --git a/helm/akhq/values.yaml b/helm/akhq/values.yaml
@@ -1,22 +1,26 @@
-#imagePullSecrets:
+# imagePullSecrets:
 #  - name: my-repository-secret
 image:
   repository: tchiotludo/akhq
   tag: latest
-  annotations: {}
-    #prometheus.io/scrape: 'true'
-    #prometheus.io/port: '8080'
-    #prometheus.io/path: '/metrics'
-  extraEnv: []
-  ## You can put directly your configuration here...
-  # - name: AKHQ_CONFIGURATION
-  #   value: |
-  #       akhq:
-  #         secrets:
-  #           docker-kafka-server:
-  #             properties:
-  #               bootstrap.servers: "kafka:9092"
 
+# custom annotations (example: for prometheus)
+annotations: {}
+  #prometheus.io/scrape: 'true'
+  #prometheus.io/port: '8080'
+  #prometheus.io/path: '/prometheus'
+
+## You can put directly your configuration here... or add java opts or any other env vars
+extraEnv: []
+# - name: AKHQ_CONFIGURATION
+#   value: |
+#       akhq:
+#         secrets:
+#           docker-kafka-server:
+#             properties:
+#               bootstrap.servers: "kafka:9092"
+# - name: JAVA_OPTS
+#   value: "-Djavax.net.ssl.trustStore=/usr/local/openjdk-11/lib/security/cacerts -Djavax.net.ssl.trustStorePassword=password"
 
 ## Or you can also use configmap for the configuration...
 configuration: |