Adding labels support | generic 1.6.0

kool-dev · Oct 25, 2023 · f920901 · f920901
1 parent 1c9cd2e
commit f920901
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 7 deletions.
diff --git a/charts/generic/Chart.yaml b/charts/generic/Chart.yaml
@@ -1,4 +1,4 @@
 apiVersion: v2
 name: generic
 description: Generic Chart
-version: 1.5.2
+version: 1.6.0
diff --git a/charts/generic/templates/cronjobs.yaml b/charts/generic/templates/cronjobs.yaml
@@ -10,7 +10,11 @@ metadata:
   {{- else }}
   name: "{{ $fullName }}-{{ $cronjob.name | default $cronjobName }}"
   {{- end }}
-  labels: {{ include "generic.labels" $ | nindent 4 }}
+  labels:
+    {{ include "generic.labels" $ | indent 4 }}
+    {{- with .labels }}
+    {{ toYaml . | indent 4 }}
+    {{- end }}
   {{- with .annotations }}
   annotations: {{ toYaml . | nindent 4 }}
   {{- end }}

diff --git a/charts/generic/templates/deployment.yaml b/charts/generic/templates/deployment.yaml
@@ -3,7 +3,11 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: {{ $fullName }}
-  labels: {{ include "generic.labels" . | nindent 4 }}
+  labels:
+    {{ include "generic.labels" $ | indent 4 }}
+    {{- with .labels }}
+    {{ toYaml . | indent 4 }}
+    {{- end }}
   {{- with .annotations }}
   annotations: {{ toYaml . | nindent 4 }}
   {{- end }}

diff --git a/charts/generic/templates/jobs.yaml b/charts/generic/templates/jobs.yaml
@@ -10,11 +10,15 @@ metadata:
   {{- else }}
   name: "{{ $fullName }}-{{ $job.name | default $jobName }}"
   {{- end }}
-  labels: {{ include "generic.labels" $ | nindent 4 }}
+  labels:
+    {{ include "generic.labels" $ | indent 4 }}
+    {{- with .labels }}
+    {{ toYaml . | indent 4 }}
+    {{- end }}
   annotations:
-  {{- with .annotations }}
-  {{ toYaml . | indent 4 }}
-  {{- end }}
+    {{- with .annotations }}
+    {{ toYaml . | indent 4 }}
+    {{- end }}
     {{- with $job.hook }}
     "helm.sh/hook": {{ . }}
     {{- end }}