diff --git a/Makefile b/Makefile index c01f49e2..0a0f1d54 100644 --- a/Makefile +++ b/Makefile @@ -124,4 +124,4 @@ e2e-teardown: .PHONY: e2e-test e2e-test: - go test -v -timeout=0 ./test/e2e ${GINKGO_FLAGS} \ No newline at end of file + go test -v -timeout=0 ./test/e2e ${GINKGO_FLAGS} diff --git a/charts/README.md b/charts/README.md index f4f5d975..f1e86f70 100644 --- a/charts/README.md +++ b/charts/README.md @@ -43,6 +43,7 @@ The following table lists the configurable parameters of the latest NFS CSI Driv | `image.nodeDriverRegistrar.repository` | csi-node-driver-registrar docker image | k8s.gcr.io/sig-storage/csi-node-driver-registrar | | `image.nodeDriverRegistrar.tag` | csi-node-driver-registrar docker image tag | v2.0.1 | | `image.nodeDriverRegistrar.pullPolicy` | csi-node-driver-registrar image pull policy | IfNotPresent | +| `imagePullSecrets` | Specify docker-registry secret names as an array | [] (does not add image pull secrets to deployed pods) | | `serviceAccount.create` | whether create service account of csi-nfs-controller | true | | `rbac.create` | whether create rbac of csi-nfs-controller | true | | `controller.replicas` | the replicas of csi-nfs-controller | 2 | diff --git a/charts/latest/csi-driver-nfs-v3.0.0.tgz b/charts/latest/csi-driver-nfs-v3.0.0.tgz index c0ebf7b5..b554a07d 100644 Binary files a/charts/latest/csi-driver-nfs-v3.0.0.tgz and b/charts/latest/csi-driver-nfs-v3.0.0.tgz differ diff --git a/charts/latest/csi-driver-nfs/templates/csi-nfs-controller.yaml b/charts/latest/csi-driver-nfs/templates/csi-nfs-controller.yaml index d284fdca..5041e813 100755 --- a/charts/latest/csi-driver-nfs/templates/csi-nfs-controller.yaml +++ b/charts/latest/csi-driver-nfs/templates/csi-nfs-controller.yaml @@ -15,6 +15,10 @@ spec: {{ include "nfs.labels" . | indent 6 }} app: csi-nfs-controller spec: + {{- if .Values.imagePullSecrets }} + imagePullSecrets: +{{ toYaml .Values.imagePullSecrets | indent 8 }} + {{- end }} hostNetwork: true # controller also needs to mount nfs to create dir dnsPolicy: ClusterFirstWithHostNet serviceAccountName: csi-nfs-controller-sa diff --git a/charts/latest/csi-driver-nfs/templates/csi-nfs-node.yaml b/charts/latest/csi-driver-nfs/templates/csi-nfs-node.yaml index f4234283..8441184d 100755 --- a/charts/latest/csi-driver-nfs/templates/csi-nfs-node.yaml +++ b/charts/latest/csi-driver-nfs/templates/csi-nfs-node.yaml @@ -15,6 +15,10 @@ spec: {{ include "nfs.labels" . | indent 6 }} app: csi-nfs-node spec: + {{- if .Values.imagePullSecrets }} + imagePullSecrets: +{{ toYaml .Values.imagePullSecrets | indent 8 }} + {{- end }} hostNetwork: true # original nfs connection would be broken without hostNetwork setting dnsPolicy: ClusterFirstWithHostNet nodeSelector: diff --git a/charts/latest/csi-driver-nfs/values.yaml b/charts/latest/csi-driver-nfs/values.yaml index b81f9baa..372bc893 100755 --- a/charts/latest/csi-driver-nfs/values.yaml +++ b/charts/latest/csi-driver-nfs/values.yaml @@ -26,3 +26,9 @@ controller: node: logLevel: 5 + +## Reference to one or more secrets to be used when pulling images +## ref: https://kubernetes.io/docs/tasks/configure-pod-container/pull-image-private-registry/ +## +imagePullSecrets: [] +# - name: "image-pull-secret"