From 0164e0b4849cc353489fe1601be9fadf20ca66d4 Mon Sep 17 00:00:00 2001 From: Javier Perez Rubio Date: Tue, 15 Feb 2022 06:45:38 +0100 Subject: [PATCH] Add optional extra labels to k8s resources (#284) * Enable the possiblity to optionally add extra labels to k8s resources * Package lastest helm chart with extra labels changes * Address review comments - Rename extraLabels to customLabels - remove enabled field - repackage helm chart --- charts/latest/csi-driver-nfs-v3.2.0.tgz | Bin 3618 -> 3645 bytes .../csi-driver-nfs/templates/_helpers.tpl | 5 ++++- charts/latest/csi-driver-nfs/values.yaml | 1 + 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/charts/latest/csi-driver-nfs-v3.2.0.tgz b/charts/latest/csi-driver-nfs-v3.2.0.tgz index 97c836bc49fa65aa3d57018e9744bdf827bd0d07..6aaf3f0720cebd5b86798c3174bf7abe4b2bacc0 100644 GIT binary patch delta 3620 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 P0RR61Y4q>_SONe5|1u9+ diff --git a/charts/latest/csi-driver-nfs/templates/_helpers.tpl b/charts/latest/csi-driver-nfs/templates/_helpers.tpl index 62c53482..901a53f1 100644 --- a/charts/latest/csi-driver-nfs/templates/_helpers.tpl +++ b/charts/latest/csi-driver-nfs/templates/_helpers.tpl @@ -13,4 +13,7 @@ labels: app.kubernetes.io/name: "{{ template "nfs.name" . }}" app.kubernetes.io/version: "{{ .Chart.AppVersion }}" helm.sh/chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}" -{{- end -}} \ No newline at end of file + {{- if .Values.customLabels }} +{{ toYaml .Values.customLabels | indent 2 -}} + {{- end }} +{{- end -}} diff --git a/charts/latest/csi-driver-nfs/values.yaml b/charts/latest/csi-driver-nfs/values.yaml index 7f189bf8..40c2a9b6 100755 --- a/charts/latest/csi-driver-nfs/values.yaml +++ b/charts/latest/csi-driver-nfs/values.yaml @@ -1,3 +1,4 @@ +customLabels: {} image: nfs: repository: mcr.microsoft.com/k8s/csi/nfs-csi