[Cronjobs] improve labels fix (#11)

Co-authored-by: Rainer 'rei' Schuth <rainer.schuth@digital-results-international.com>
klicktipp · May 22, 2024 · 61cf969 · 61cf969
1 parent 28161d0
commit 61cf969
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git a/charts/cronjobs/Chart.yaml b/charts/cronjobs/Chart.yaml
@@ -3,7 +3,7 @@ apiVersion: v2
 name: cronjobs
 description: A generic helm cronjob chart for kubernetes
 type: application
-version: 1.2.0
+version: 1.2.1
 appVersion: latest
 home: https://github.com/klicktipp/helm-charts
 keywords:

diff --git a/charts/cronjobs/templates/_helpers.tpl b/charts/cronjobs/templates/_helpers.tpl
@@ -46,7 +46,6 @@ app.kubernetes.io/managed-by: {{ .Release.Service }}
 Selector labels
 */}}
 {{- define "cronjobs.selectorLabels" -}}
-app.kubernetes.io/name: {{ include "cronjobs.name" . }}
 app.kubernetes.io/instance: {{ .Release.Name }}
 {{- end }}
 

diff --git a/charts/cronjobs/templates/cronjob.yaml b/charts/cronjobs/templates/cronjob.yaml
@@ -14,6 +14,7 @@ metadata:
     {{- with $.Values.commonLabels }}
     {{- toYaml . | nindent 4 }}
     {{- end }}
+    app.kubernetes.io/name: {{ $chart_name }}-{{ $JOB_NAME_SLUG }}
     {{- include "cronjobs.labels" $ | nindent 4 }}
   annotations:
     {{- if $.commonAnnotations }}
@@ -56,6 +57,7 @@ spec:
             {{- toYaml . | nindent 12 }}
             {{- end }}
           labels:
+            app.kubernetes.io/name: {{ $chart_name }}-{{ $JOB_NAME_SLUG }}
             {{- with $.Values.commonLabels }}
             {{- toYaml . | nindent 12 }}
             {{- end }}