Merge pull request #998 from kubernetes-csi/copilot/add-csidriver-labels-support

feat: Add driver.labels option to helm chart for CSIDriver resource

Author: k8s-ci-robot

Makefile

@@ -44,7 +44,7 @@ BUILD_DATE := $(shell date -u +"%Y-%m-%dT%H:%M:%SZ")
 endif
 LDFLAGS = -X ${PKG}/pkg/smb.driverVersion=${IMAGE_VERSION} -X ${PKG}/pkg/smb.gitCommit=${GIT_COMMIT} -X ${PKG}/pkg/smb.buildDate=${BUILD_DATE}
 EXT_LDFLAGS = -s -w -extldflags "-static"
-E2E_HELM_OPTIONS ?= --set image.smb.repository=$(REGISTRY)/$(IMAGENAME) --set image.smb.tag=$(IMAGE_VERSION) --set controller.runOnControlPlane=true
+E2E_HELM_OPTIONS ?= --set image.smb.repository=$(REGISTRY)/$(IMAGENAME) --set image.smb.tag=$(IMAGE_VERSION) --set controller.runOnControlPlane=true --set driver.labels.testlabel=testvalue
 E2E_HELM_OPTIONS += ${EXTRA_HELM_OPTIONS}
 # Generate all combination of all OS, ARCH, and OSVERSIONS for iteration
 ALL_OS = linux windows

charts/latest/csi-driver-smb-v0.0.0.tgz

@@ -3,6 +3,10 @@ apiVersion: storage.k8s.io/v1
 kind: CSIDriver
 metadata:
   name: {{ .Values.driver.name }}
+{{- if .Values.driver.labels }}
+  labels:
+{{- toYaml .Values.driver.labels | nindent 4 }}
+{{- end }}
 spec:
   attachRequired: false
   podInfoOnMount: true

charts/latest/csi-driver-smb/templates/csi-smb-driver.yaml

@@ -36,6 +36,7 @@ rbac:
 
 driver:
   name: smb.csi.k8s.io
+  labels: {}
 
 feature:
   enableGetVolumeStats: true