From ab5b3e256bd109e72d9ffa8c608a4336ce76039a Mon Sep 17 00:00:00 2001 From: Michelle Au Date: Tue, 28 Jul 2020 18:35:09 -0700 Subject: [PATCH] Update e2e csi images to k8s.gcr.io Change-Id: Ic6c3f805aab1647f01f40fee725d6e8be992d04e --- .../storage-csi/gce-pd/controller_ss.yaml | 8 ++++---- .../storage-csi/gce-pd/node_ds.yaml | 6 +++--- .../hostpath/hostpath/csi-hostpath-attacher.yaml | 2 +- .../hostpath/hostpath/csi-hostpath-plugin.yaml | 6 +++--- .../hostpath/hostpath/csi-hostpath-provisioner.yaml | 2 +- .../hostpath/hostpath/csi-hostpath-resizer.yaml | 2 +- .../hostpath/hostpath/csi-hostpath-snapshotter.yaml | 2 +- .../storage-csi/mock/csi-mock-driver-attacher.yaml | 2 +- .../storage-csi/mock/csi-mock-driver-resizer.yaml | 2 +- .../storage-csi/mock/csi-mock-driver.yaml | 6 +++--- test/utils/image/manifest.go | 12 ++++++------ test/utils/image/manifest_test.go | 6 +++--- 12 files changed, 28 insertions(+), 28 deletions(-) diff --git a/test/e2e/testing-manifests/storage-csi/gce-pd/controller_ss.yaml b/test/e2e/testing-manifests/storage-csi/gce-pd/controller_ss.yaml index 7b42bb6d13c..07ee47affa7 100644 --- a/test/e2e/testing-manifests/storage-csi/gce-pd/controller_ss.yaml +++ b/test/e2e/testing-manifests/storage-csi/gce-pd/controller_ss.yaml @@ -21,7 +21,7 @@ spec: serviceAccountName: csi-gce-pd-controller-sa containers: - name: csi-snapshotter - image: gcr.io/k8s-staging-csi/csi-snapshotter:v2.0.1 + image: gcr.io/gke-release/csi-snapshotter:v2.1.1-gke.0 args: - "--v=5" - "--csi-address=/csi/csi.sock" @@ -30,7 +30,7 @@ spec: - name: socket-dir mountPath: /csi - name: csi-provisioner - image: gcr.io/gke-release/csi-provisioner:v1.5.0-gke.0 + image: gcr.io/gke-release/csi-provisioner:v1.6.0-gke.0 args: - "--v=5" - "--csi-address=/csi/csi.sock" @@ -39,7 +39,7 @@ spec: - name: socket-dir mountPath: /csi - name: csi-attacher - image: gcr.io/gke-release/csi-attacher:v2.1.1-gke.0 + image: gcr.io/gke-release/csi-attacher:v2.2.0-gke.0 args: - "--v=5" - "--csi-address=/csi/csi.sock" @@ -47,7 +47,7 @@ spec: - name: socket-dir mountPath: /csi - name: csi-resizer - image: gcr.io/gke-release/csi-resizer:v0.4.0-gke.0 + image: gcr.io/gke-release/csi-resizer:v0.5.0-gke.0 args: - "--v=5" - "--csi-address=/csi/csi.sock" diff --git a/test/e2e/testing-manifests/storage-csi/gce-pd/node_ds.yaml b/test/e2e/testing-manifests/storage-csi/gce-pd/node_ds.yaml index 2e34d524905..05dc54fa7b1 100644 --- a/test/e2e/testing-manifests/storage-csi/gce-pd/node_ds.yaml +++ b/test/e2e/testing-manifests/storage-csi/gce-pd/node_ds.yaml @@ -18,7 +18,7 @@ spec: hostNetwork: true containers: - name: csi-driver-registrar - image: gcr.io/gke-release/csi-node-driver-registrar:v1.2.0-gke.0 + image: gcr.io/gke-release/csi-node-driver-registrar:v1.3.0-gke.0 args: - "--v=5" - "--csi-address=/csi/csi.sock" @@ -40,7 +40,7 @@ spec: - name: gce-pd-driver securityContext: privileged: true - image: gcr.io/gke-release/gcp-compute-persistent-disk-csi-driver:v0.6.2-gke.0 + image: gcr.io/gke-release/gcp-compute-persistent-disk-csi-driver:v0.7.0-gke.0 args: - "--v=5" - "--endpoint=unix:/csi/csi.sock" @@ -103,4 +103,4 @@ spec: tolerations: - operator: Exists nodeSelector: - kubernetes.io/os: linux \ No newline at end of file + kubernetes.io/os: linux diff --git a/test/e2e/testing-manifests/storage-csi/hostpath/hostpath/csi-hostpath-attacher.yaml b/test/e2e/testing-manifests/storage-csi/hostpath/hostpath/csi-hostpath-attacher.yaml index 757ad3e10b7..2c23f75c71c 100644 --- a/test/e2e/testing-manifests/storage-csi/hostpath/hostpath/csi-hostpath-attacher.yaml +++ b/test/e2e/testing-manifests/storage-csi/hostpath/hostpath/csi-hostpath-attacher.yaml @@ -40,7 +40,7 @@ spec: serviceAccountName: csi-attacher containers: - name: csi-attacher - image: gcr.io/k8s-staging-csi/csi-attacher:v2.2.0 + image: k8s.gcr.io/sig-storage/csi-attacher:v2.2.0 args: - --v=5 - --csi-address=/csi/csi.sock diff --git a/test/e2e/testing-manifests/storage-csi/hostpath/hostpath/csi-hostpath-plugin.yaml b/test/e2e/testing-manifests/storage-csi/hostpath/hostpath/csi-hostpath-plugin.yaml index 2b7f17b90db..5997d00e71d 100644 --- a/test/e2e/testing-manifests/storage-csi/hostpath/hostpath/csi-hostpath-plugin.yaml +++ b/test/e2e/testing-manifests/storage-csi/hostpath/hostpath/csi-hostpath-plugin.yaml @@ -36,7 +36,7 @@ spec: spec: containers: - name: node-driver-registrar - image: gcr.io/k8s-staging-csi/csi-node-driver-registrar:v1.3.0 + image: k8s.gcr.io/sig-storage/csi-node-driver-registrar:v1.3.0 args: - --v=5 - --csi-address=/csi/csi.sock @@ -61,7 +61,7 @@ spec: name: csi-data-dir - name: hostpath - image: gcr.io/k8s-staging-csi/hostpathplugin:v1.4.0-rc2 + image: k8s.gcr.io/sig-storage/hostpathplugin:v1.4.0 args: - "--drivername=hostpath.csi.k8s.io" - "--v=5" @@ -109,7 +109,7 @@ spec: volumeMounts: - mountPath: /csi name: socket-dir - image: gcr.io/k8s-staging-csi/livenessprobe:v1.1.0 + image: k8s.gcr.io/sig-storage/livenessprobe:v1.1.0 args: - --csi-address=/csi/csi.sock - --health-port=9898 diff --git a/test/e2e/testing-manifests/storage-csi/hostpath/hostpath/csi-hostpath-provisioner.yaml b/test/e2e/testing-manifests/storage-csi/hostpath/hostpath/csi-hostpath-provisioner.yaml index 2a015b60d2c..856dbff120c 100644 --- a/test/e2e/testing-manifests/storage-csi/hostpath/hostpath/csi-hostpath-provisioner.yaml +++ b/test/e2e/testing-manifests/storage-csi/hostpath/hostpath/csi-hostpath-provisioner.yaml @@ -40,7 +40,7 @@ spec: serviceAccountName: csi-provisioner containers: - name: csi-provisioner - image: gcr.io/k8s-staging-csi/csi-provisioner:v1.6.0 + image: k8s.gcr.io/sig-storage/csi-provisioner:v1.6.0 args: - -v=5 - --csi-address=/csi/csi.sock diff --git a/test/e2e/testing-manifests/storage-csi/hostpath/hostpath/csi-hostpath-resizer.yaml b/test/e2e/testing-manifests/storage-csi/hostpath/hostpath/csi-hostpath-resizer.yaml index 056fe4d6ccf..0294f8b2a38 100644 --- a/test/e2e/testing-manifests/storage-csi/hostpath/hostpath/csi-hostpath-resizer.yaml +++ b/test/e2e/testing-manifests/storage-csi/hostpath/hostpath/csi-hostpath-resizer.yaml @@ -40,7 +40,7 @@ spec: serviceAccountName: csi-resizer containers: - name: csi-resizer - image: gcr.io/k8s-staging-csi/csi-resizer:v0.5.0 + image: k8s.gcr.io/sig-storage/csi-resizer:v0.5.0 args: - -v=5 - -csi-address=/csi/csi.sock diff --git a/test/e2e/testing-manifests/storage-csi/hostpath/hostpath/csi-hostpath-snapshotter.yaml b/test/e2e/testing-manifests/storage-csi/hostpath/hostpath/csi-hostpath-snapshotter.yaml index b42a98fe2d2..693518274c0 100644 --- a/test/e2e/testing-manifests/storage-csi/hostpath/hostpath/csi-hostpath-snapshotter.yaml +++ b/test/e2e/testing-manifests/storage-csi/hostpath/hostpath/csi-hostpath-snapshotter.yaml @@ -40,7 +40,7 @@ spec: serviceAccount: csi-snapshotter containers: - name: csi-snapshotter - image: gcr.io/k8s-staging-csi/csi-snapshotter:v2.1.0 + image: k8s.gcr.io/sig-storage/csi-snapshotter:v2.1.0 args: - -v=5 - --csi-address=/csi/csi.sock 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 b1c40cbeed2..c1717252480 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: gcr.io/k8s-staging-csi/csi-attacher:v3.0.0-rc1 + image: k8s.gcr.io/sig-storage/csi-attacher:v2.2.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 416ced6a9c2..c57d5a061e2 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: gcr.io/k8s-staging-csi/csi-resizer:v0.4.0 + image: k8s.gcr.io/sig-storage/csi-resizer:v0.5.0 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 c41d321c030..a5f3c9a7da4 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: gcr.io/k8s-staging-csi/csi-provisioner:v2.0.0-rc1 + image: k8s.gcr.io/sig-storage/csi-provisioner:v1.6.0 args: - "--csi-address=$(ADDRESS)" # Topology support is needed for the pod rescheduling test @@ -29,7 +29,7 @@ spec: - mountPath: /csi name: socket-dir - name: driver-registrar - image: gcr.io/k8s-staging-csi/csi-node-driver-registrar:v1.2.0 + image: k8s.gcr.io/sig-storage/csi-node-driver-registrar:v1.3.0 args: - --v=5 - --csi-address=/csi/csi.sock @@ -48,7 +48,7 @@ spec: - mountPath: /registration name: registration-dir - name: mock - image: gcr.io/k8s-staging-csi/mock-driver:v3.1.0 + image: k8s.gcr.io/sig-storage/mock-driver:v3.1.0 args: - "--name=mock.storage.k8s.io" - "--permissive-target-path" # because of https://github.com/kubernetes/kubernetes/issues/75535 diff --git a/test/utils/image/manifest.go b/test/utils/image/manifest.go index a33f99aa4ee..51da1b4f7b4 100644 --- a/test/utils/image/manifest.go +++ b/test/utils/image/manifest.go @@ -36,10 +36,10 @@ type RegistryList struct { BuildImageRegistry string `yaml:"buildImageRegistry"` InvalidRegistry string `yaml:"invalidRegistry"` GcRegistry string `yaml:"gcRegistry"` + SigStorageRegistry string `yaml:"sigStorageRegistry"` GcrReleaseRegistry string `yaml:"gcrReleaseRegistry"` PrivateRegistry string `yaml:"privateRegistry"` SampleRegistry string `yaml:"sampleRegistry"` - K8sCSI string `yaml:"k8sCSI"` } // Config holds an images registry, name, and version @@ -75,10 +75,10 @@ func initReg() RegistryList { BuildImageRegistry: "k8s.gcr.io/build-image", InvalidRegistry: "invalid.com/invalid", GcRegistry: "k8s.gcr.io", + SigStorageRegistry: "k8s.gcr.io/sig-storage", GcrReleaseRegistry: "gcr.io/gke-release", PrivateRegistry: "gcr.io/k8s-authenticated-test", SampleRegistry: "gcr.io/google-samples", - K8sCSI: "gcr.io/k8s-staging-csi", } repoList := os.Getenv("KUBE_TEST_REPO_LIST") if repoList == "" { @@ -107,9 +107,9 @@ var ( buildImageRegistry = registry.BuildImageRegistry gcAuthenticatedRegistry = registry.GcAuthenticatedRegistry gcRegistry = registry.GcRegistry + sigStorageRegistry = registry.SigStorageRegistry gcrReleaseRegistry = registry.GcrReleaseRegistry invalidRegistry = registry.InvalidRegistry - k8sCSI = registry.K8sCSI // PrivateRegistry is an image repository that requires authentication PrivateRegistry = registry.PrivateRegistry sampleRegistry = registry.SampleRegistry @@ -221,7 +221,7 @@ func initImageConfigs() map[int]Config { configs[JessieDnsutils] = Config{e2eRegistry, "jessie-dnsutils", "1.0"} configs[Kitten] = Config{e2eRegistry, "kitten", "1.0"} configs[Nautilus] = Config{e2eRegistry, "nautilus", "1.0"} - configs[NFSProvisioner] = Config{k8sCSI, "nfs-provisioner", "v2.2.2"} + configs[NFSProvisioner] = Config{sigStorageRegistry, "nfs-provisioner", "v2.2.2"} configs[Nginx] = Config{dockerLibraryRegistry, "nginx", "1.14-alpine"} configs[NginxNew] = Config{dockerLibraryRegistry, "nginx", "1.15-alpine"} configs[Nonewprivs] = Config{e2eRegistry, "nonewprivs", "1.0"} @@ -280,6 +280,8 @@ func ReplaceRegistryInImageURL(imageURL string) (string, error) { registryAndUser = e2eVolumeRegistry case "k8s.gcr.io": registryAndUser = gcRegistry + case "k8s.gcr.io/sig-storage": + registryAndUser = sigStorageRegistry case "gcr.io/k8s-authenticated-test": registryAndUser = PrivateRegistry case "gcr.io/google-samples": @@ -288,8 +290,6 @@ func ReplaceRegistryInImageURL(imageURL string) (string, error) { registryAndUser = gcrReleaseRegistry case "docker.io/library": registryAndUser = dockerLibraryRegistry - case "gcr.io/k8s-staging-csi": - registryAndUser = k8sCSI default: if countParts == 1 { // We assume we found an image from docker hub library diff --git a/test/utils/image/manifest_test.go b/test/utils/image/manifest_test.go index 4c4faffb576..938af362f08 100644 --- a/test/utils/image/manifest_test.go +++ b/test/utils/image/manifest_test.go @@ -94,9 +94,9 @@ var registryTests = []struct { }, }, { - "gcr.io/k8s-staging-csi/test:latest", + "k8s.gcr.io/sig-storage/test:latest", result{ - result: "test.io/k8s-staging-csi/test:latest", + result: "test.io/sig-storage/test:latest", err: nil, }, }, @@ -119,7 +119,7 @@ func TestReplaceRegistryInImageURL(t *testing.T) { gcrReleaseRegistry = "test.io/gke-release" PrivateRegistry = "test.io/k8s-authenticated-test" sampleRegistry = "test.io/google-samples" - k8sCSI = "test.io/k8s-staging-csi" + sigStorageRegistry = "test.io/sig-storage" for _, tt := range registryTests { t.Run(tt.in, func(t *testing.T) {