From 92aed2cbee07466872b6b7807b11c1f7ac4c5714 Mon Sep 17 00:00:00 2001 From: mehmetsalgar Date: Wed, 12 May 2021 13:06:54 +0200 Subject: [PATCH] Add ImagePullSecrets to CSI daemonset (#519) --- templates/csi-daemonset.yaml | 4 ++++ test/unit/csi-daemonset.bats | 29 +++++++++++++++++++++++++++++ 2 files changed, 33 insertions(+) diff --git a/templates/csi-daemonset.yaml b/templates/csi-daemonset.yaml index 5f80ed1..94b765d 100644 --- a/templates/csi-daemonset.yaml +++ b/templates/csi-daemonset.yaml @@ -73,4 +73,8 @@ spec: {{- if .Values.csi.volumes }} {{- toYaml .Values.csi.volumes | nindent 8}} {{- end }} + {{- if .Values.global.imagePullSecrets }} + imagePullSecrets: + {{- toYaml .Values.global.imagePullSecrets | nindent 8 }} + {{- end }} {{- end }} diff --git a/test/unit/csi-daemonset.bats b/test/unit/csi-daemonset.bats index 127ac54..992d1cf 100644 --- a/test/unit/csi-daemonset.bats +++ b/test/unit/csi-daemonset.bats @@ -62,6 +62,35 @@ load _helpers [ "${actual}" = "SomePullPolicy" ] } +@test "csi/daemonset: Custom imagePullSecrets" { + cd `chart_dir` + local object=$(helm template \ + --show-only templates/csi-daemonset.yaml \ + --set "csi.enabled=true" \ + --set 'global.imagePullSecrets[0].name=foo' \ + --set 'global.imagePullSecrets[1].name=bar' \ + . | tee /dev/stderr | + yq -r '.spec.template.spec.imagePullSecrets' | tee /dev/stderr) + + local actual=$(echo $object | + yq -r '.[0].name' | tee /dev/stderr) + [ "${actual}" = "foo" ] + + local actual=$(echo $object | + yq -r '.[1].name' | tee /dev/stderr) + [ "${actual}" = "bar" ] +} + +@test "csi/daemonset: default imagePullSecrets" { + cd `chart_dir` + local actual=$(helm template \ + --show-only templates/csi-daemonset.yaml \ + --set "csi.enabled=true" \ + . | tee /dev/stderr | + yq -r '.spec.template.spec.imagePullSecrets' | tee /dev/stderr) + [ "${actual}" = "null" ] +} + # Debug arg @test "csi/daemonset: debug arg is configurable" { cd `chart_dir`