Support custom labels (#529)

* Add: support custom labels Signed-off-by: Nicolas Lamirault <nicolas.lamirault@gmail.com> * Fix: do not add custom labels Signed-off-by: Nicolas Lamirault <nicolas.lamirault@gmail.com>
aws · Dec 15, 2021 · ceadee9 · ceadee9
1 parent ffd6a1c
commit ceadee9
Show file tree

Hide file tree

Showing 7 changed files with 17 additions and 4 deletions.
diff --git a/config/helm/aws-node-termination-handler/templates/_helpers.tpl b/config/helm/aws-node-termination-handler/templates/_helpers.tpl
@@ -36,12 +36,17 @@ Name will not exceed 63 characters.
 Common labels
 */}}
 {{- define "aws-node-termination-handler.labels" -}}
-helm.sh/chart: {{ include "aws-node-termination-handler.chart" . }}
 {{ include "aws-node-termination-handler.selectorLabels" . }}
 {{- if .Chart.AppVersion }}
 app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
 {{- end }}
+app.kubernetes.io/component: {{ .Release.Name }}
+app.kubernetes.io/part-of: {{ .Release.Name }}
 app.kubernetes.io/managed-by: {{ .Release.Service }}
+helm.sh/chart: {{ include "aws-node-termination-handler.chart" . }}
+{{- if .Values.customLabels }}
+{{ toYaml .Values.customLabels }}
+{{- end }}
 {{- end -}}
 
 {{/*

diff --git a/config/helm/aws-node-termination-handler/templates/clusterrole.yaml b/config/helm/aws-node-termination-handler/templates/clusterrole.yaml
@@ -2,6 +2,8 @@ kind: ClusterRole
 apiVersion: rbac.authorization.k8s.io/v1
 metadata:
   name: {{ include "aws-node-termination-handler.fullname" . }}
+  labels:
+    {{- include "aws-node-termination-handler.labels" . | nindent 4 }}
 rules:
 - apiGroups:
     - ""

diff --git a/config/helm/aws-node-termination-handler/templates/clusterrolebinding.yaml b/config/helm/aws-node-termination-handler/templates/clusterrolebinding.yaml
@@ -2,6 +2,8 @@ kind: ClusterRoleBinding
 apiVersion: rbac.authorization.k8s.io/v1
 metadata:
   name: {{ include "aws-node-termination-handler.fullname" . }}
+  labels:
+    {{- include "aws-node-termination-handler.labels" . | nindent 4 }}
 subjects:
 - kind: ServiceAccount
   name: {{ template "aws-node-termination-handler.serviceAccountName" . }}

diff --git a/config/helm/aws-node-termination-handler/templates/daemonset.linux.yaml b/config/helm/aws-node-termination-handler/templates/daemonset.linux.yaml
@@ -29,7 +29,7 @@ spec:
       {{- end }}
       {{- end }}
       labels:
-        {{- include "aws-node-termination-handler.selectorLabels" . | nindent 8 }}
+        {{- include "aws-node-termination-handler.labels" . | nindent 8 }}
         k8s-app: aws-node-termination-handler
         {{ include "aws-node-termination-handler.nodeSelectorTermsOs" . }}: linux
       {{- range $key, $value := (mergeOverwrite (dict) .Values.podLabels .Values.linuxPodLabels) }}

diff --git a/config/helm/aws-node-termination-handler/templates/daemonset.windows.yaml b/config/helm/aws-node-termination-handler/templates/daemonset.windows.yaml
@@ -29,7 +29,7 @@ spec:
       {{- end }}
       {{- end }}
       labels:
-        {{- include "aws-node-termination-handler.selectorLabels" . | nindent 8 }}
+        {{- include "aws-node-termination-handler.labels" . | nindent 8 }}
         k8s-app: aws-node-termination-handler
         {{ include "aws-node-termination-handler.nodeSelectorTermsOs" . }}: windows
       {{- range $key, $value := (mergeOverwrite (dict) .Values.podLabels .Values.windowsPodLabels) }}

diff --git a/config/helm/aws-node-termination-handler/templates/deployment.yaml b/config/helm/aws-node-termination-handler/templates/deployment.yaml
@@ -19,7 +19,7 @@ spec:
         {{ $key }}: {{ $value | quote }}
       {{- end }}
       labels:
-        {{- include "aws-node-termination-handler.selectorLabels" . | nindent 8 }}
+        {{- include "aws-node-termination-handler.labels" . | nindent 8 }}
         k8s-app: aws-node-termination-handler
         {{ include "aws-node-termination-handler.nodeSelectorTermsOs" . }}: linux
       {{- range $key, $value := .Values.podLabels }}

diff --git a/config/helm/aws-node-termination-handler/values.yaml b/config/helm/aws-node-termination-handler/values.yaml
@@ -8,6 +8,10 @@ image:
   pullPolicy: IfNotPresent
   pullSecrets: []
 
+# -- Custom labels to add into metadata
+customLabels: {}
+  # app: aws-node-termination-handler
+
 securityContext:
   runAsUserID: 1000
   runAsGroupID: 1000