Skip to content

chore: upgrade CSI driver sidecar image versions #910

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jan 23, 2025
Merged

chore: upgrade CSI driver sidecar image versions #910

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
46fb162
chore: upgrade CSI driver sidecar image versions
andyzhangx Jan 22, 2025
4b3ffb4
test: add unit test
andyzhangx Jan 22, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions charts/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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` |
Expand Down
Binary file modified charts/latest/csi-driver-smb-v0.0.0.tgz
View file
Open in desktop
Binary file not shown.
8 changes: 4 additions & 4 deletions charts/latest/csi-driver-smb/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,19 +6,19 @@ image:
pullPolicy: IfNotPresent
csiProvisioner:
repository: /csi-provisioner
tag: v5.1.0
tag: v5.2.0
pullPolicy: IfNotPresent
csiResizer:
repository: registry.k8s.io/sig-storage/csi-resizer
tag: v1.12.0
tag: v1.13.1
pullPolicy: IfNotPresent
livenessProbe:
repository: /livenessprobe
tag: v2.14.0
tag: v2.15.0
pullPolicy: IfNotPresent
nodeDriverRegistrar:
repository: /csi-node-driver-registrar
tag: v2.12.0
tag: v2.13.0
pullPolicy: IfNotPresent
csiproxy:
repository: ghcr.io/kubernetes-sigs/sig-windows/csi-proxy
Expand Down
6 changes: 3 additions & 3 deletions deploy/csi-smb-controller.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ spec:
effect: "NoSchedule"
containers:
- name: csi-provisioner
image: registry.k8s.io/sig-storage/csi-provisioner:v5.1.0
image: registry.k8s.io/sig-storage/csi-provisioner:v5.2.0
args:
- "-v=2"
- "--csi-address=$(ADDRESS)"
Expand All @@ -65,7 +65,7 @@ spec:
drop:
- ALL
- name: csi-resizer
image: registry.k8s.io/sig-storage/csi-resizer:v1.12.0
image: registry.k8s.io/sig-storage/csi-resizer:v1.13.1
args:
- "-csi-address=$(ADDRESS)"
- "-v=2"
Expand All @@ -89,7 +89,7 @@ spec:
drop:
- ALL
- name: liveness-probe
image: registry.k8s.io/sig-storage/livenessprobe:v2.14.0
image: registry.k8s.io/sig-storage/livenessprobe:v2.15.0
args:
- --csi-address=/csi/csi.sock
- --probe-timeout=3s
Expand Down
2 changes: 1 addition & 1 deletion deploy/csi-smb-node-windows-hostprocess.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ spec:
- "New-Item -ItemType Directory -Path C:\\var\\lib\\kubelet\\plugins\\smb.csi.k8s.io\\ -Force"
containers:
- name: node-driver-registrar
image: mcr.microsoft.com/oss/kubernetes-csi/csi-node-driver-registrar:v2.10.0
image: mcr.microsoft.com/oss/kubernetes-csi/csi-node-driver-registrar:v2.13.0
imagePullPolicy: IfNotPresent
command:
- "csi-node-driver-registrar.exe"
Expand Down
4 changes: 2 additions & 2 deletions deploy/csi-smb-node-windows.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ spec:
volumeMounts:
- mountPath: C:\csi
name: plugin-dir
image: registry.k8s.io/sig-storage/livenessprobe:v2.14.0
image: registry.k8s.io/sig-storage/livenessprobe:v2.15.0
args:
- --csi-address=$(CSI_ENDPOINT)
- --probe-timeout=3s
Expand All @@ -53,7 +53,7 @@ spec:
drop:
- ALL
- name: node-driver-registrar
image: registry.k8s.io/sig-storage/csi-node-driver-registrar:v2.12.0
image: registry.k8s.io/sig-storage/csi-node-driver-registrar:v2.13.0
args:
- --v=2
- --csi-address=$(CSI_ENDPOINT)
Expand Down
4 changes: 2 additions & 2 deletions deploy/csi-smb-node.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ spec:
volumeMounts:
- mountPath: /csi
name: socket-dir
image: registry.k8s.io/sig-storage/livenessprobe:v2.14.0
image: registry.k8s.io/sig-storage/livenessprobe:v2.15.0
args:
- --csi-address=/csi/csi.sock
- --probe-timeout=3s
Expand All @@ -50,7 +50,7 @@ spec:
drop:
- ALL
- name: node-driver-registrar
image: registry.k8s.io/sig-storage/csi-node-driver-registrar:v2.12.0
image: registry.k8s.io/sig-storage/csi-node-driver-registrar:v2.13.0
args:
- --csi-address=$(ADDRESS)
- --kubelet-registration-path=$(DRIVER_REG_SOCK_PATH)
Expand Down
28 changes: 28 additions & 0 deletions pkg/smb/smb_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ limitations under the License.
package smb

import (
"context"
"fmt"
"os"
"path/filepath"
Expand Down Expand Up @@ -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)
}
}
Loading