Skip to content

Commit 86c8a23

Browse files
authored
Merge pull request kubernetes#88009 from davidz627/fix/pdVer
Update version of gcp-compute-persistent-disk-csi-driver used in in-tree tests
2 parents f7c37d3 + c6c0bb2 commit 86c8a23

File tree

2 files changed

+25
-7
lines changed

2 files changed

+25
-7
lines changed

test/e2e/testing-manifests/storage-csi/gce-pd/controller_ss.yaml

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,15 @@ spec:
1313
labels:
1414
app: gcp-compute-persistent-disk-csi-driver
1515
spec:
16+
# Host network must be used for interaction with Workload Identity in GKE
17+
# since it replaces GCE Metadata Server with GKE Metadata Server. Remove
18+
# this requirement when issue is resolved and before any exposure of
19+
# metrics ports
20+
hostNetwork: true
1621
serviceAccountName: csi-gce-pd-controller-sa
1722
containers:
1823
- name: csi-snapshotter
19-
# TODO: replace with official 2.0.0 release when ready
20-
image: quay.io/k8scsi/csi-snapshotter:v2.0.0-rc2
24+
image: quay.io/k8scsi/csi-snapshotter:v2.0.1
2125
args:
2226
- "--v=5"
2327
- "--csi-address=/csi/csi.sock"
@@ -35,7 +39,7 @@ spec:
3539
- name: socket-dir
3640
mountPath: /csi
3741
- name: csi-attacher
38-
image: gcr.io/gke-release/csi-attacher:v2.0.0-gke.0
42+
image: gcr.io/gke-release/csi-attacher:v2.1.1-gke.0
3943
args:
4044
- "--v=5"
4145
- "--csi-address=/csi/csi.sock"
@@ -51,7 +55,7 @@ spec:
5155
- name: socket-dir
5256
mountPath: /csi
5357
- name: gce-pd-driver
54-
image: gcr.io/gke-release/gcp-compute-persistent-disk-csi-driver:v0.6.0-gke.0
58+
image: gcr.io/gke-release/gcp-compute-persistent-disk-csi-driver:v0.6.2-gke.0
5559
args:
5660
- "--v=5"
5761
- "--endpoint=unix:/csi/csi.sock"

test/e2e/testing-manifests/storage-csi/gce-pd/node_ds.yaml

Lines changed: 17 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,11 @@ spec:
1111
labels:
1212
app: gcp-compute-persistent-disk-csi-driver
1313
spec:
14+
# Host network must be used for interaction with Workload Identity in GKE
15+
# since it replaces GCE Metadata Server with GKE Metadata Server. Remove
16+
# this requirement when issue is resolved and before any exposure of
17+
# metrics ports.
18+
hostNetwork: true
1419
containers:
1520
- name: csi-driver-registrar
1621
image: gcr.io/gke-release/csi-node-driver-registrar:v1.2.0-gke.0
@@ -35,7 +40,7 @@ spec:
3540
- name: gce-pd-driver
3641
securityContext:
3742
privileged: true
38-
image: gcr.io/gke-release/gcp-compute-persistent-disk-csi-driver:v0.6.0-gke.0
43+
image: gcr.io/gke-release/gcp-compute-persistent-disk-csi-driver:v0.6.2-gke.0
3944
args:
4045
- "--v=5"
4146
- "--endpoint=unix:/csi/csi.sock"
@@ -47,7 +52,8 @@ spec:
4752
mountPath: /csi
4853
- name: device-dir
4954
mountPath: /dev
50-
# The following mounts are required to trigger host udevadm from container
55+
# The following mounts are required to trigger host udevadm from
56+
# container
5157
- name: udev-rules-etc
5258
mountPath: /etc/udev
5359
- name: udev-rules-lib
@@ -73,7 +79,8 @@ spec:
7379
hostPath:
7480
path: /dev
7581
type: Directory
76-
# The following mounts are required to trigger host udevadm from container
82+
# The following mounts are required to trigger host udevadm from
83+
# container
7784
- name: udev-rules-etc
7885
hostPath:
7986
path: /etc/udev
@@ -90,3 +97,10 @@ spec:
9097
hostPath:
9198
path: /sys
9299
type: Directory
100+
# https://kubernetes.io/docs/concepts/configuration/taint-and-toleration/
101+
# See "special case". This will tolerate everything. Node component should
102+
# be scheduled on all nodes.
103+
tolerations:
104+
- operator: Exists
105+
nodeSelector:
106+
kubernetes.io/os: linux

0 commit comments

Comments
 (0)