From 46fb162903471cc256717846262d488bc5bfa2a0 Mon Sep 17 00:00:00 2001 From: andyzhangx Date: Wed, 22 Jan 2025 14:45:11 +0000 Subject: [PATCH 1/2] chore: upgrade CSI driver sidecar image versions --- charts/README.md | 6 +++--- charts/latest/csi-driver-smb-v0.0.0.tgz | Bin 5714 -> 5715 bytes charts/latest/csi-driver-smb/values.yaml | 8 ++++---- deploy/csi-smb-controller.yaml | 6 +++--- deploy/csi-smb-node-windows-hostprocess.yaml | 2 +- deploy/csi-smb-node-windows.yaml | 4 ++-- deploy/csi-smb-node.yaml | 4 ++-- 7 files changed, 15 insertions(+), 15 deletions(-) diff --git a/charts/README.md b/charts/README.md index 7cb9bf75508..6445d7caea8 100644 --- a/charts/README.md +++ b/charts/README.md @@ -51,13 +51,13 @@ The following table lists the configurable parameters of the latest SMB CSI Driv | `image.smb.repository` | csi-driver-smb docker image | `gcr.io/k8s-staging-sig-storage/smbplugin` | | `image.smb.tag` | csi-driver-smb docker image tag | `canary` | | `image.smb.pullPolicy` | csi-driver-smb image pull policy | `IfNotPresent` | -| `image.csiProvisioner.tag` | csi-provisioner docker image tag | `v5.1.0` | +| `image.csiProvisioner.tag` | csi-provisioner docker image tag | `v5.2.0` | | `image.csiProvisioner.pullPolicy` | csi-provisioner image pull policy | `IfNotPresent` | | `image.livenessProbe.repository` | liveness-probe docker image | `/livenessprobe` | -| `image.livenessProbe.tag` | liveness-probe docker image tag | `v2.14.0` | +| `image.livenessProbe.tag` | liveness-probe docker image tag | `v2.15.0` | | `image.livenessProbe.pullPolicy` | liveness-probe image pull policy | `IfNotPresent` | | `image.nodeDriverRegistrar.repository` | csi-node-driver-registrar docker image | `/csi-node-driver-registrar` | -| `image.nodeDriverRegistrar.tag` | csi-node-driver-registrar docker image tag | `v2.12.0` | +| `image.nodeDriverRegistrar.tag` | csi-node-driver-registrar docker image tag | `v2.13.0` | | `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-smb-controller | `true` | diff --git a/charts/latest/csi-driver-smb-v0.0.0.tgz b/charts/latest/csi-driver-smb-v0.0.0.tgz index d04f15ebea9179d168fd765c488f7b34c82d88cd..a22b4060680d44b796f0a9945150347b625fb1db 100644 GIT binary patch delta 3061 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 D2paZ5 delta 3060 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 Date: Wed, 22 Jan 2025 15:17:08 +0000 Subject: [PATCH 2/2] test: add unit test --- pkg/smb/smb_test.go | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/pkg/smb/smb_test.go b/pkg/smb/smb_test.go index 21761cbbd49..3102bfbc003 100644 --- a/pkg/smb/smb_test.go +++ b/pkg/smb/smb_test.go @@ -17,6 +17,7 @@ limitations under the License. package smb import ( + "context" "fmt" "os" "path/filepath" @@ -529,3 +530,30 @@ func createTestFile(path string) error { return nil } + +func TestGetUserNamePasswordFromSecret(t *testing.T) { + tests := []struct { + desc string + secretName string + secretNamespace string + expectedUsername string + expectedPassword string + expectedDomain string + expectedError error + }{ + { + desc: "kubeclient is nil", + secretName: "secretName", + expectedError: fmt.Errorf("could not username and password from secret(secretName): KubeClient is nil"), + }, + } + + d := NewFakeDriver() + for _, test := range tests { + username, password, domain, err := d.GetUserNamePasswordFromSecret(context.Background(), test.secretName, test.secretNamespace) + assert.Equal(t, test.expectedUsername, username, "test[%s]: unexpected username", test.desc) + assert.Equal(t, test.expectedPassword, password, "test[%s]: unexpected password", test.desc) + assert.Equal(t, test.expectedDomain, domain, "test[%s]: unexpected domain", test.desc) + assert.Equal(t, test.expectedError, err, "test[%s]: unexpected error", test.desc) + } +}