Adding custom labels to helm template for deployments (#267)

* adding labels to helm templates * update chart version
hellofresh · Aug 2, 2023 · ea2b3ce · ea2b3ce
1 parent 47d308d
commit ea2b3ce
Show file tree

Hide file tree

Showing 10 changed files with 48 additions and 2 deletions.
diff --git a/charts/kangal/Chart.yaml b/charts/kangal/Chart.yaml
@@ -6,7 +6,7 @@ keywords:
   - performance tests
   - tests runner
 name: kangal
-version: 2.2.4
+version: 2.2.5
 home: https://github.com/hellofresh/kangal
 icon: https://raw.githubusercontent.com/hellofresh/kangal/master/logo.svg
 maintainers:

diff --git a/charts/kangal/templates/clusterrole.yaml b/charts/kangal/templates/clusterrole.yaml
@@ -1,9 +1,14 @@
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
 metadata:
+  name: system-controller-kangal-controller-{{ $.Release.Namespace }}
   labels:
     kubernetes.io/bootstrapping: rbac-defaults
-  name: system-controller-kangal-controller-{{ $.Release.Namespace }}
+{{- if $.Values.labels }}
+{{- with $.Values.labels }}
+{{ toYaml . | indent 4 }}
+{{- end }}
+{{- end }}
 rules:
 
   - apiGroups:

diff --git a/charts/kangal/templates/clusterrolebinding.yaml b/charts/kangal/templates/clusterrolebinding.yaml
@@ -5,6 +5,12 @@ apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRoleBinding
 metadata:
   name: system-controller-kangal-{{ $key }}-{{ $.Release.Namespace }}
+{{- if $.Values.labels }}
+  labels:
+{{- with $.Values.labels }}
+{{ toYaml . | indent 4 }}
+{{- end }}
+{{- end }}
 roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: ClusterRole

diff --git a/charts/kangal/templates/configmap.yaml b/charts/kangal/templates/configmap.yaml
@@ -8,6 +8,11 @@ metadata:
     chart: {{ template "<CHARTNAME>.chart" . }}
     release: {{ .Release.Name }}
     heritage: {{ .Release.Service }}
+{{- if $.Values.labels }}
+{{- with $.Values.labels }}
+{{ toYaml . | indent 4 }}
+{{- end }}
+{{- end }}
 data:
 {{ toYaml .Values.configMap | indent 2 }}
 {{- end }}
diff --git a/charts/kangal/templates/deployment.yaml b/charts/kangal/templates/deployment.yaml
@@ -38,6 +38,11 @@ spec:
         release: {{ $.Release.Name }}
         environment: {{ $.Values.environment }}
         version: "{{ if $value.tag }}{{ $value.tag }}{{ else if $.Values.tag }}{{ $.Values.tag }}{{ else }}{{ $.Chart.AppVersion }}{{ end }}"
+{{- if $.Values.labels }}
+{{- with $.Values.labels }}
+{{ toYaml . | indent 8 }}
+{{- end }}
+{{- end }}
 {{- if or ($.Values.podAnnotations) ($value.podAnnotations) }}
       annotations:
 {{- with $.Values.podAnnotations }}

diff --git a/charts/kangal/templates/ingress.yaml b/charts/kangal/templates/ingress.yaml
@@ -17,6 +17,11 @@ metadata:
     chart: {{ template "<CHARTNAME>.chart" $ }}
     release: {{ $.Release.Name }}
     heritage: {{ $.Release.Service }}
+{{- if $.Values.labels }}
+{{- with $.Values.labels }}
+{{ toYaml . | indent 4 }}
+{{- end }}
+{{- end }}
 {{- with $value.ingress.annotations }}
   annotations:
 {{ toYaml . | indent 4 }}

diff --git a/charts/kangal/templates/prometheus-servicemonitor.yaml b/charts/kangal/templates/prometheus-servicemonitor.yaml
@@ -11,6 +11,11 @@ metadata:
     release: {{ $.Release.Name }}
     heritage: {{ $.Release.Service }}
     prometheus: kube-prometheus
+{{- if $.Values.labels }}
+{{- with $.Values.labels }}
+{{ toYaml . | indent 4 }}
+{{- end }}
+{{- end }}
   name: {{ template "<CHARTNAME>.fullname" $ }}-{{ $key }}
 spec:
   endpoints:

diff --git a/charts/kangal/templates/secret.yaml b/charts/kangal/templates/secret.yaml
@@ -8,6 +8,11 @@ metadata:
     chart: {{ template "<CHARTNAME>.chart" . }}
     release: {{ .Release.Name }}
     heritage: {{ .Release.Service }}
+{{- if $.Values.labels }}
+{{- with $.Values.labels }}
+{{ toYaml . | indent 4 }}
+{{- end }}
+{{- end }}
 data:
   AWS_ACCESS_KEY_ID: {{ .Values.secrets.AWS_ACCESS_KEY_ID | b64enc }}
   AWS_SECRET_ACCESS_KEY: {{ .Values.secrets.AWS_SECRET_ACCESS_KEY | b64enc }}

diff --git a/charts/kangal/templates/service.yaml b/charts/kangal/templates/service.yaml
@@ -11,6 +11,11 @@ metadata:
     chart: {{ template "<CHARTNAME>.chart" $ }}
     release: {{ $.Release.Name }}
     heritage: {{$.Release.Service }}
+{{- if $.Values.labels }}
+{{- with $.Values.labels }}
+{{ toYaml . | indent 4 }}
+{{- end }}
+{{- end }}
 {{- with $value.annotations }}
   annotations:
 {{ toYaml . | indent 4}}

diff --git a/charts/kangal/templates/serviceaccount.yaml b/charts/kangal/templates/serviceaccount.yaml
@@ -12,6 +12,11 @@ metadata:
     chart: {{ template "<CHARTNAME>.chart" $ }}
     release: {{ $.Release.Name }}
     heritage: {{ $.Release.Service }}
+{{- if $.Values.labels }}
+{{- with $.Values.labels }}
+{{ toYaml . | indent 4 }}
+{{- end }}
+{{- end }}
   {{- if ($value.serviceAccount.annotations) }}
   annotations:
     {{- with $value.serviceAccount.annotations }}