Skip to content

Commit 82d0a57

Browse files
authored
Merge pull request #581 from leonardoce/update-deploy-manifests
Update deployment structure and sidecar versions for Kubernetes 1.32
2 parents e636430 + f459b52 commit 82d0a57

29 files changed

+29
-22
lines changed

.prow.sh

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,13 @@ CSI_PROW_HOSTPATH_DRIVER_NAME="hostpath.csi.k8s.io"
2626

2727
CSI_PROW_TESTS_SANITY="sanity"
2828

29+
# We need to hardcode e2e version for resizer for now, because
30+
# we need fixes from latest release-1.31 branch for all e2es to pass.
31+
#
32+
# See: https://github.com/kubernetes-csi/csi-driver-host-path/pull/581#issuecomment-2634529098
33+
# See: https://github.com/kubernetes-csi/external-resizer/blob/20072c0fdf8baaf919ef95d6e918538ba9d84eaf/.prow.sh
34+
export CSI_PROW_E2E_VERSION="release-1.31"
35+
2936
. release-tools/prow.sh
3037

3138
main

deploy/kubernetes-1.28

Lines changed: 0 additions & 1 deletion
This file was deleted.

deploy/kubernetes-1.28-test

Lines changed: 0 additions & 1 deletion
This file was deleted.

deploy/kubernetes-1.27-test/README.md renamed to deploy/kubernetes-1.30-test/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
The deployment for Kubernetes 1.21 uses the CSI snapshotter sidecar
1+
The deployment for Kubernetes 1.30 uses the CSI snapshotter sidecar
22
4.x and thus is incompatible with Kubernetes clusters where older
33
snapshotter CRDs are installed.
44

deploy/kubernetes-1.27-test/hostpath/csi-hostpath-attacher.yaml renamed to deploy/kubernetes-1.30-test/hostpath/csi-hostpath-attacher.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ spec:
3737
serviceAccountName: csi-attacher
3838
containers:
3939
- name: csi-attacher
40-
image: registry.k8s.io/sig-storage/csi-attacher:v4.7.0
40+
image: registry.k8s.io/sig-storage/csi-attacher:v4.8.0
4141
args:
4242
- --v=5
4343
- --csi-address=/csi/csi.sock

deploy/kubernetes-1.27-test/hostpath/csi-hostpath-plugin.yaml renamed to deploy/kubernetes-1.30-test/hostpath/csi-hostpath-plugin.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -77,13 +77,13 @@ spec:
7777
volumeMounts:
7878
- mountPath: /csi
7979
name: socket-dir
80-
image: registry.k8s.io/sig-storage/livenessprobe:v2.14.0
80+
image: registry.k8s.io/sig-storage/livenessprobe:v2.15.0
8181
args:
8282
- --csi-address=/csi/csi.sock
8383
- --health-port=9898
8484

8585
- name: csi-external-health-monitor-controller
86-
image: registry.k8s.io/sig-storage/csi-external-health-monitor-controller:v0.13.0
86+
image: registry.k8s.io/sig-storage/csi-external-health-monitor-controller:v0.14.0
8787
args:
8888
- "--v=5"
8989
- "--csi-address=$(ADDRESS)"
@@ -97,7 +97,7 @@ spec:
9797
mountPath: /csi
9898

9999
- name: node-driver-registrar
100-
image: registry.k8s.io/sig-storage/csi-node-driver-registrar:v2.12.0
100+
image: registry.k8s.io/sig-storage/csi-node-driver-registrar:v2.13.0
101101
args:
102102
- --v=5
103103
- --csi-address=/csi/csi.sock

deploy/kubernetes-1.27-test/hostpath/csi-hostpath-provisioner.yaml renamed to deploy/kubernetes-1.30-test/hostpath/csi-hostpath-provisioner.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ spec:
3737
serviceAccountName: csi-provisioner
3838
containers:
3939
- name: csi-provisioner
40-
image: registry.k8s.io/sig-storage/csi-provisioner:v5.1.0
40+
image: registry.k8s.io/sig-storage/csi-provisioner:v5.2.0
4141
args:
4242
- -v=5
4343
- --csi-address=/csi/csi.sock

0 commit comments

Comments
 (0)