From a39b3877e99a6232e6880cbdc961b2104e17c972 Mon Sep 17 00:00:00 2001 From: Patrick Ohly Date: Thu, 2 Dec 2021 15:17:57 +0100 Subject: [PATCH] storage e2e: update mock deployment These changes were created automatically with the updated update-hostpath.sh script. --- .../storage-csi/mock/csi-mock-driver-attacher.yaml | 2 +- .../storage-csi/mock/csi-mock-driver-resizer.yaml | 2 +- .../storage-csi/mock/csi-mock-driver-snapshotter.yaml | 2 +- .../storage-csi/mock/csi-mock-driver.yaml | 4 ++-- .../testing-manifests/storage-csi/mock/csi-mock-proxy.yaml | 4 ++-- test/e2e/testing-manifests/storage-csi/update-hostpath.sh | 7 +++++++ 6 files changed, 14 insertions(+), 7 deletions(-) diff --git a/test/e2e/testing-manifests/storage-csi/mock/csi-mock-driver-attacher.yaml b/test/e2e/testing-manifests/storage-csi/mock/csi-mock-driver-attacher.yaml index c87c137158a..57f8226da7a 100644 --- a/test/e2e/testing-manifests/storage-csi/mock/csi-mock-driver-attacher.yaml +++ b/test/e2e/testing-manifests/storage-csi/mock/csi-mock-driver-attacher.yaml @@ -15,7 +15,7 @@ spec: serviceAccountName: csi-mock containers: - name: csi-attacher - image: k8s.gcr.io/sig-storage/csi-attacher:v3.2.0 + image: k8s.gcr.io/sig-storage/csi-attacher:v3.3.0 args: - --v=5 - --csi-address=$(ADDRESS) diff --git a/test/e2e/testing-manifests/storage-csi/mock/csi-mock-driver-resizer.yaml b/test/e2e/testing-manifests/storage-csi/mock/csi-mock-driver-resizer.yaml index 682089ec7df..4573884e36d 100644 --- a/test/e2e/testing-manifests/storage-csi/mock/csi-mock-driver-resizer.yaml +++ b/test/e2e/testing-manifests/storage-csi/mock/csi-mock-driver-resizer.yaml @@ -15,7 +15,7 @@ spec: serviceAccountName: csi-mock containers: - name: csi-resizer - image: k8s.gcr.io/sig-storage/csi-resizer:v1.1.0 + image: k8s.gcr.io/sig-storage/csi-resizer:v1.3.0 args: - "--v=5" - "--csi-address=$(ADDRESS)" diff --git a/test/e2e/testing-manifests/storage-csi/mock/csi-mock-driver-snapshotter.yaml b/test/e2e/testing-manifests/storage-csi/mock/csi-mock-driver-snapshotter.yaml index fb42c0d1ad5..6d5db053429 100644 --- a/test/e2e/testing-manifests/storage-csi/mock/csi-mock-driver-snapshotter.yaml +++ b/test/e2e/testing-manifests/storage-csi/mock/csi-mock-driver-snapshotter.yaml @@ -15,7 +15,7 @@ spec: serviceAccountName: csi-mock containers: - name: csi-snapshotter - image: k8s.gcr.io/sig-storage/csi-snapshotter:v4.0.0 + image: k8s.gcr.io/sig-storage/csi-snapshotter:v4.2.1 args: - "--v=5" - "--csi-address=$(ADDRESS)" diff --git a/test/e2e/testing-manifests/storage-csi/mock/csi-mock-driver.yaml b/test/e2e/testing-manifests/storage-csi/mock/csi-mock-driver.yaml index 0f9d2ef006e..7424b3b656a 100644 --- a/test/e2e/testing-manifests/storage-csi/mock/csi-mock-driver.yaml +++ b/test/e2e/testing-manifests/storage-csi/mock/csi-mock-driver.yaml @@ -15,7 +15,7 @@ spec: serviceAccountName: csi-mock containers: - name: csi-provisioner - image: k8s.gcr.io/sig-storage/csi-provisioner:v2.2.0 + image: k8s.gcr.io/sig-storage/csi-provisioner:v3.0.0 args: - "--csi-address=$(ADDRESS)" # Topology support is needed for the pod rescheduling test @@ -34,7 +34,7 @@ spec: - mountPath: /csi name: socket-dir - name: driver-registrar - image: k8s.gcr.io/sig-storage/csi-node-driver-registrar:v2.1.0 + image: k8s.gcr.io/sig-storage/csi-node-driver-registrar:v2.3.0 args: - --v=5 - --csi-address=/csi/csi.sock diff --git a/test/e2e/testing-manifests/storage-csi/mock/csi-mock-proxy.yaml b/test/e2e/testing-manifests/storage-csi/mock/csi-mock-proxy.yaml index adf9bf45e81..8d93f08db58 100644 --- a/test/e2e/testing-manifests/storage-csi/mock/csi-mock-proxy.yaml +++ b/test/e2e/testing-manifests/storage-csi/mock/csi-mock-proxy.yaml @@ -15,7 +15,7 @@ spec: serviceAccountName: csi-mock containers: - name: csi-provisioner - image: k8s.gcr.io/sig-storage/csi-provisioner:v2.2.0 + image: k8s.gcr.io/sig-storage/csi-provisioner:v3.0.0 args: - "--csi-address=$(ADDRESS)" # Topology support is needed for the pod rescheduling test @@ -35,7 +35,7 @@ spec: - mountPath: /csi name: socket-dir - name: driver-registrar - image: k8s.gcr.io/sig-storage/csi-node-driver-registrar:v2.1.0 + image: k8s.gcr.io/sig-storage/csi-node-driver-registrar:v2.3.0 args: - --v=5 - --csi-address=/csi/csi.sock diff --git a/test/e2e/testing-manifests/storage-csi/update-hostpath.sh b/test/e2e/testing-manifests/storage-csi/update-hostpath.sh index 415b2cbcdaa..af94b9b7025 100755 --- a/test/e2e/testing-manifests/storage-csi/update-hostpath.sh +++ b/test/e2e/testing-manifests/storage-csi/update-hostpath.sh @@ -132,3 +132,10 @@ for image in $images; do esac download "$project" "$path" "$tag" "$rbac" done + +# Update the mock driver manifests, too. +grep -r image: hostpath/hostpath/csi-hostpath-plugin.yaml | while read -r image; do + version=$(echo "$image" | sed -e 's/.*:\(.*\)/\1/') + image=$(echo "$image" | sed -e 's/.*image: \([^:]*\).*/\1/') + sed -i -e "s;$image:.*;$image:$version;" mock/*.yaml +done