Skip to content

Commit 4fb7ea9

Browse files
andyzhangxandyzhangx
authored
Merge pull request kubernetes-csi#910 from andyzhangx/upgrade-sidecar-images6
chore: upgrade CSI driver sidecar image versions
2 parents 7dcb9ea + 4b3ffb4 commit 4fb7ea9

File tree

8 files changed

+43
-15
lines changed

8 files changed

+43
-15
lines changed

‎charts/README.md‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -51,13 +51,13 @@ The following table lists the configurable parameters of the latest SMB CSI Driv
5151
| `image.smb.repository` | csi-driver-smb docker image | `gcr.io/k8s-staging-sig-storage/smbplugin` |
5252
| `image.smb.tag` | csi-driver-smb docker image tag | `canary` |
5353
| `image.smb.pullPolicy` | csi-driver-smb image pull policy | `IfNotPresent` |
54-
| `image.csiProvisioner.tag` | csi-provisioner docker image tag | `v5.1.0` |
54+
| `image.csiProvisioner.tag` | csi-provisioner docker image tag | `v5.2.0` |
5555
| `image.csiProvisioner.pullPolicy` | csi-provisioner image pull policy | `IfNotPresent` |
5656
| `image.livenessProbe.repository` | liveness-probe docker image | `/livenessprobe` |
57-
| `image.livenessProbe.tag` | liveness-probe docker image tag | `v2.14.0` |
57+
| `image.livenessProbe.tag` | liveness-probe docker image tag | `v2.15.0` |
5858
| `image.livenessProbe.pullPolicy` | liveness-probe image pull policy | `IfNotPresent` |
5959
| `image.nodeDriverRegistrar.repository` | csi-node-driver-registrar docker image | `/csi-node-driver-registrar` |
60-
| `image.nodeDriverRegistrar.tag` | csi-node-driver-registrar docker image tag | `v2.12.0` |
60+
| `image.nodeDriverRegistrar.tag` | csi-node-driver-registrar docker image tag | `v2.13.0` |
6161
| `image.nodeDriverRegistrar.pullPolicy` | csi-node-driver-registrar image pull policy | `IfNotPresent` |
6262
| `imagePullSecrets` | Specify docker-registry secret names as an array | `[]` (does not add image pull secrets to deployed pods) |
6363
| `serviceAccount.create` | whether create service account of csi-smb-controller | `true` |

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

1 Byte
Binary file not shown.

‎charts/latest/csi-driver-smb/values.yaml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,19 +6,19 @@ image:
66
pullPolicy: IfNotPresent
77
csiProvisioner:
88
repository: /csi-provisioner
9-
tag: v5.1.0
9+
tag: v5.2.0
1010
pullPolicy: IfNotPresent
1111
csiResizer:
1212
repository: registry.k8s.io/sig-storage/csi-resizer
13-
tag: v1.12.0
13+
tag: v1.13.1
1414
pullPolicy: IfNotPresent
1515
livenessProbe:
1616
repository: /livenessprobe
17-
tag: v2.14.0
17+
tag: v2.15.0
1818
pullPolicy: IfNotPresent
1919
nodeDriverRegistrar:
2020
repository: /csi-node-driver-registrar
21-
tag: v2.12.0
21+
tag: v2.13.0
2222
pullPolicy: IfNotPresent
2323
csiproxy:
2424
repository: ghcr.io/kubernetes-sigs/sig-windows/csi-proxy

‎deploy/csi-smb-controller.yaml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ spec:
3838
effect: "NoSchedule"
3939
containers:
4040
- name: csi-provisioner
41-
image: registry.k8s.io/sig-storage/csi-provisioner:v5.1.0
41+
image: registry.k8s.io/sig-storage/csi-provisioner:v5.2.0
4242
args:
4343
- "-v=2"
4444
- "--csi-address=$(ADDRESS)"
@@ -65,7 +65,7 @@ spec:
6565
drop:
6666
- ALL
6767
- name: csi-resizer
68-
image: registry.k8s.io/sig-storage/csi-resizer:v1.12.0
68+
image: registry.k8s.io/sig-storage/csi-resizer:v1.13.1
6969
args:
7070
- "-csi-address=$(ADDRESS)"
7171
- "-v=2"
@@ -89,7 +89,7 @@ spec:
8989
drop:
9090
- ALL
9191
- name: liveness-probe
92-
image: registry.k8s.io/sig-storage/livenessprobe:v2.14.0
92+
image: registry.k8s.io/sig-storage/livenessprobe:v2.15.0
9393
args:
9494
- --csi-address=/csi/csi.sock
9595
- --probe-timeout=3s

‎deploy/csi-smb-node-windows-hostprocess.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ spec:
4242
- "New-Item -ItemType Directory -Path C:\\var\\lib\\kubelet\\plugins\\smb.csi.k8s.io\\ -Force"
4343
containers:
4444
- name: node-driver-registrar
45-
image: mcr.microsoft.com/oss/kubernetes-csi/csi-node-driver-registrar:v2.10.0
45+
image: mcr.microsoft.com/oss/kubernetes-csi/csi-node-driver-registrar:v2.13.0
4646
imagePullPolicy: IfNotPresent
4747
command:
4848
- "csi-node-driver-registrar.exe"

‎deploy/csi-smb-node-windows.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ spec:
3333
volumeMounts:
3434
- mountPath: C:\csi
3535
name: plugin-dir
36-
image: registry.k8s.io/sig-storage/livenessprobe:v2.14.0
36+
image: registry.k8s.io/sig-storage/livenessprobe:v2.15.0
3737
args:
3838
- --csi-address=$(CSI_ENDPOINT)
3939
- --probe-timeout=3s
@@ -53,7 +53,7 @@ spec:
5353
drop:
5454
- ALL
5555
- name: node-driver-registrar
56-
image: registry.k8s.io/sig-storage/csi-node-driver-registrar:v2.12.0
56+
image: registry.k8s.io/sig-storage/csi-node-driver-registrar:v2.13.0
5757
args:
5858
- --v=2
5959
- --csi-address=$(CSI_ENDPOINT)

‎deploy/csi-smb-node.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ spec:
3333
volumeMounts:
3434
- mountPath: /csi
3535
name: socket-dir
36-
image: registry.k8s.io/sig-storage/livenessprobe:v2.14.0
36+
image: registry.k8s.io/sig-storage/livenessprobe:v2.15.0
3737
args:
3838
- --csi-address=/csi/csi.sock
3939
- --probe-timeout=3s
@@ -50,7 +50,7 @@ spec:
5050
drop:
5151
- ALL
5252
- name: node-driver-registrar
53-
image: registry.k8s.io/sig-storage/csi-node-driver-registrar:v2.12.0
53+
image: registry.k8s.io/sig-storage/csi-node-driver-registrar:v2.13.0
5454
args:
5555
- --csi-address=$(ADDRESS)
5656
- --kubelet-registration-path=$(DRIVER_REG_SOCK_PATH)

‎pkg/smb/smb_test.go‎

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ limitations under the License.
1717
package smb
1818

1919
import (
20+
"context"
2021
"fmt"
2122
"os"
2223
"path/filepath"
@@ -529,3 +530,30 @@ func createTestFile(path string) error {
529530

530531
return nil
531532
}
533+
534+
func TestGetUserNamePasswordFromSecret(t *testing.T) {
535+
tests := []struct {
536+
desc string
537+
secretName string
538+
secretNamespace string
539+
expectedUsername string
540+
expectedPassword string
541+
expectedDomain string
542+
expectedError error
543+
}{
544+
{
545+
desc: "kubeclient is nil",
546+
secretName: "secretName",
547+
expectedError: fmt.Errorf("could not username and password from secret(secretName): KubeClient is nil"),
548+
},
549+
}
550+
551+
d := NewFakeDriver()
552+
for _, test := range tests {
553+
username, password, domain, err := d.GetUserNamePasswordFromSecret(context.Background(), test.secretName, test.secretNamespace)
554+
assert.Equal(t, test.expectedUsername, username, "test[%s]: unexpected username", test.desc)
555+
assert.Equal(t, test.expectedPassword, password, "test[%s]: unexpected password", test.desc)
556+
assert.Equal(t, test.expectedDomain, domain, "test[%s]: unexpected domain", test.desc)
557+
assert.Equal(t, test.expectedError, err, "test[%s]: unexpected error", test.desc)
558+
}
559+
}

0 commit comments

Comments
 (0)