From f920901b8906225e6223ec4228120b250808300b Mon Sep 17 00:00:00 2001
From: Daniel Polito <danielbpolito@gmail.com>
Date: Wed, 25 Oct 2023 10:00:17 -0300
Subject: [PATCH] Adding labels support | generic 1.6.0

---
 charts/generic/Chart.yaml                |  2 +-
 charts/generic/templates/cronjobs.yaml   |  6 +++++-
 charts/generic/templates/deployment.yaml |  6 +++++-
 charts/generic/templates/jobs.yaml       | 12 ++++++++----
 4 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/charts/generic/Chart.yaml b/charts/generic/Chart.yaml
index 7e2d9e3..2cb6650 100644
--- 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
index 938a3e7..66fafda 100644
--- 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
index 86a0cf9..6e315f3 100644
--- 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
index af5d6d6..7de5469 100644
--- 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 }}