feat(helm): add granular custom labels for ingress and networkPolicy (#…

…1982) Co-authored-by: Gabriele Giacobazzi <[email protected]>
tchiotludo · Oct 28, 2024 · 63b7841 · 63b7841
1 parent 2ce053e
commit 63b7841
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 5 deletions.
diff --git a/helm/akhq/Chart.yaml b/helm/akhq/Chart.yaml
@@ -1,8 +1,8 @@
 apiVersion: v1
-appVersion: "0.25.1"
+appVersion: "0.25.2"
 description: Kafka GUI for Apache Kafka to manage topics, topics data, consumers group, schema registry, connect and more...
 name: akhq
-version: 0.25.1
+version: 0.25.2
 keywords:
   - kafka
   - confluent

diff --git a/helm/akhq/templates/ingress.yaml b/helm/akhq/templates/ingress.yaml
@@ -10,6 +10,9 @@ metadata:
     helm.sh/chart: {{ include "akhq.chart" . }}
     app.kubernetes.io/instance: {{ .Release.Name }}
     app.kubernetes.io/managed-by: {{ .Release.Service }}
+    {{- range $key, $value := .Values.ingress.labels }}
+    {{ $key }}: {{ $value | quote }}
+    {{- end }}
   {{- with .Values.ingress.annotations }}
   annotations:
     {{- tpl (toYaml .) $ | nindent 4 }}

diff --git a/helm/akhq/templates/networkpolicy.yaml b/helm/akhq/templates/networkpolicy.yaml
@@ -8,9 +8,9 @@ metadata:
     helm.sh/chart: {{ include "akhq.chart" . }}
     app.kubernetes.io/instance: {{ .Release.Name }}
     app.kubernetes.io/managed-by: {{ .Release.Service }}
-     {{- with .Values.labels }}
-       {{- toYaml . | nindent 4 }}
-     {{- end }}
+    {{- range $key, $value := .Values.networkPolicy.labels }}
+    {{ $key }}: {{ $value | quote }}
+    {{- end }}
 spec:
   policyTypes:
     - Ingress

diff --git a/helm/akhq/values.yaml b/helm/akhq/values.yaml
@@ -139,6 +139,7 @@ ingress:
   annotations: {}
     # kubernetes.io/ingress.class: nginx
     # kubernetes.io/tls-acme: "true"
+  labels: {}
   paths:
     - /
   pathType: "ImplementationSpecific"
@@ -191,3 +192,4 @@ affinity: {}
 
 networkPolicy:
   enabled: true
+  labels: {}