From 37326815882ad9a12886a0445217dde637fd0dc2 Mon Sep 17 00:00:00 2001 From: Nicolas Lamirault Date: Sun, 16 Jan 2022 23:29:28 +0100 Subject: [PATCH] Support additonal labels and all Kubernetes recommanded labels (#7186) * Add: Kubernetes recommanded labels Signed-off-by: Nicolas Lamirault * Add: support additional labels Signed-off-by: Nicolas Lamirault * Add: commonLabels default value Signed-off-by: Nicolas Lamirault --- charts/ingress-nginx/templates/_helpers.tpl | 4 ++++ charts/ingress-nginx/values.yaml | 6 ++++++ 2 files changed, 10 insertions(+) diff --git a/charts/ingress-nginx/templates/_helpers.tpl b/charts/ingress-nginx/templates/_helpers.tpl index 726224f18..a72af5d9d 100644 --- a/charts/ingress-nginx/templates/_helpers.tpl +++ b/charts/ingress-nginx/templates/_helpers.tpl @@ -88,7 +88,11 @@ helm.sh/chart: {{ include "ingress-nginx.chart" . }} {{- if .Chart.AppVersion }} app.kubernetes.io/version: {{ .Chart.AppVersion | quote }} {{- end }} +app.kubernetes.io/part-of: {{ template "ingress-nginx.name" . }} app.kubernetes.io/managed-by: {{ .Release.Service }} +{{- if .Values.commonLabels}} +{{ toYaml .Values.commonLabels }} +{{- end }} {{- end -}} {{/* diff --git a/charts/ingress-nginx/values.yaml b/charts/ingress-nginx/values.yaml index a030ff2db..d30c170b6 100644 --- a/charts/ingress-nginx/values.yaml +++ b/charts/ingress-nginx/values.yaml @@ -7,6 +7,12 @@ # nameOverride: # fullnameOverride: +## Labels to apply to all resources +## +commonLabels: {} +# scmhash: abc123 +# myLabel: aakkmd + controller: name: controller image: