Merge pull request #91257 from dims/use-staging-csi-to-work-around-quay-io

Use staging-csi to work around quay.io availability
2025-07-23 03:41:45 +00:00 · 2020-05-19 14:00:19 -07:00 · 2020-05-19 14:00:19 -07:00 · 0f23eef0c8
commit 0f23eef0c8
parent 6c9aab2b09 fb7cb4307e
12 changed files with 23 additions and 26 deletions
--- a/cluster/addons/volumesnapshots/volume-snapshot-controller/volume-snapshot-controller-deployment.yaml
+++ b/cluster/addons/volumesnapshots/volume-snapshot-controller/volume-snapshot-controller-deployment.yaml
@ -23,7 +23,7 @@ spec:
      containers:
        - name: volume-snapshot-controller
          # TODO(xyang): Replace with an official image when it is released
-          image: quay.io/k8scsi/snapshot-controller:v2.0.0-rc2
+          image: gcr.io/k8s-staging-csi/snapshot-controller:v2.0.0-rc2
          args:
            - "--v=5"
          imagePullPolicy: Always
--- 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: quay.io/k8scsi/csi-snapshotter:v2.0.1
+          image: gcr.io/k8s-staging-csi/csi-snapshotter:v2.0.1
          args:
            - "--v=5"
            - "--csi-address=/csi/csi.sock"
--- 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: quay.io/k8scsi/csi-attacher:v2.2.0
+          image: gcr.io/k8s-staging-csi/csi-attacher:v2.2.0
          args:
            - --v=5
            - --csi-address=/csi/csi.sock
--- 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: quay.io/k8scsi/csi-node-driver-registrar:v1.3.0
+          image: gcr.io/k8s-staging-csi/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: quay.io/k8scsi/hostpathplugin:v1.4.0-rc2
+          image: gcr.io/k8s-staging-csi/hostpathplugin:v1.4.0-rc2
          args:
            - "--drivername=hostpath.csi.k8s.io"
            - "--v=5"
@ -109,7 +109,7 @@ spec:
          volumeMounts:
          - mountPath: /csi
            name: socket-dir
-          image: quay.io/k8scsi/livenessprobe:v1.1.0
+          image: gcr.io/k8s-staging-csi/livenessprobe:v1.1.0
          args:
          - --csi-address=/csi/csi.sock
          - --health-port=9898
--- 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: quay.io/k8scsi/csi-provisioner:v1.6.0
+          image: gcr.io/k8s-staging-csi/csi-provisioner:v1.6.0
          args:
            - -v=5
            - --csi-address=/csi/csi.sock
--- 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: quay.io/k8scsi/csi-resizer:v0.5.0
+          image: gcr.io/k8s-staging-csi/csi-resizer:v0.5.0
          args:
            - -v=5
            - -csi-address=/csi/csi.sock
--- 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: quay.io/k8scsi/csi-snapshotter:v2.1.0
+          image: gcr.io/k8s-staging-csi/csi-snapshotter:v2.1.0
          args:
            - -v=5
            - --csi-address=/csi/csi.sock
--- 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: quay.io/k8scsi/csi-attacher:v3.0.0-rc1
+          image: gcr.io/k8s-staging-csi/csi-attacher:v3.0.0-rc1
          args:
            - --v=5
            - --csi-address=$(ADDRESS)
--- 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: quay.io/k8scsi/csi-resizer:v0.4.0
+          image: gcr.io/k8s-staging-csi/csi-resizer:v0.4.0
          args:
            - "--v=5"
            - "--csi-address=$(ADDRESS)"
--- 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: quay.io/k8scsi/csi-provisioner:v2.0.0-rc1
+          image: gcr.io/k8s-staging-csi/csi-provisioner:v2.0.0-rc1
          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: quay.io/k8scsi/csi-node-driver-registrar:v1.2.0
+          image: gcr.io/k8s-staging-csi/csi-node-driver-registrar:v1.2.0
          args:
            - --v=5
            - --csi-address=/csi/csi.sock
@ -48,7 +48,7 @@ spec:
          - mountPath: /registration
            name: registration-dir
        - name: mock
-          image: quay.io/k8scsi/mock-driver:v3.1.0
+          image: gcr.io/k8s-staging-csi/mock-driver:v3.1.0
          args:
            - "--name=mock.storage.k8s.io"
            - "--permissive-target-path" # because of https://github.com/kubernetes/kubernetes/issues/75535
--- a/test/utils/image/manifest.go
+++ b/test/utils/image/manifest.go
@ -40,8 +40,7 @@ type RegistryList struct {
 	GoogleContainerRegistry string `yaml:"googleContainerRegistry"`
 	PrivateRegistry         string `yaml:"privateRegistry"`
 	SampleRegistry          string `yaml:"sampleRegistry"`
-	QuayK8sCSI              string `yaml:"quayK8sCSI"`
-	QuayIncubator           string `yaml:"quayIncubator"`
+	K8sCSI                  string `yaml:"k8sCSI"`
 }

 // Config holds an images registry, name, and version
@ -82,8 +81,7 @@ func initReg() RegistryList {
 		GoogleContainerRegistry: "gcr.io/google-containers",
 		PrivateRegistry:         "gcr.io/k8s-authenticated-test",
 		SampleRegistry:          "gcr.io/google-samples",
-		QuayK8sCSI:              "quay.io/k8scsi",
-		QuayIncubator:           "quay.io/kubernetes_incubator",
+		K8sCSI:                  "gcr.io/k8s-staging-csi",
 	}
 	repoList := os.Getenv("KUBE_TEST_REPO_LIST")
 	if repoList == "" {
@ -113,8 +111,7 @@ var (
 	gcRegistry              = registry.GcRegistry
 	gcrReleaseRegistry      = registry.GcrReleaseRegistry
 	invalidRegistry         = registry.InvalidRegistry
-	quayK8sCSI              = registry.QuayK8sCSI
-	quayIncubator           = registry.QuayIncubator
+	k8sCSI                  = registry.K8sCSI
 	// PrivateRegistry is an image repository that requires authentication
 	PrivateRegistry = registry.PrivateRegistry
 	sampleRegistry  = registry.SampleRegistry
@ -226,7 +223,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{quayIncubator, "nfs-provisioner", "v2.2.2"}
+	configs[NFSProvisioner] = Config{k8sCSI, "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"}
@ -291,8 +288,8 @@ func ReplaceRegistryInImageURL(imageURL string) (string, error) {
 		registryAndUser = gcrReleaseRegistry
 	case "docker.io/library":
 		registryAndUser = dockerLibraryRegistry
-	case "quay.io/k8scsi":
-		registryAndUser = quayK8sCSI
+	case "gcr.io/k8s-staging-csi":
+		registryAndUser = k8sCSI
 	default:
 		if countParts == 1 {
 			// We assume we found an image from docker hub library
--- a/test/utils/image/manifest_test.go
+++ b/test/utils/image/manifest_test.go
@ -87,9 +87,9 @@ var registryTests = []struct {
 		},
 	},
 	{
-		"quay.io/k8scsi/test:latest",
+		"gcr.io/k8s-staging-csi/test:latest",
 		result{
-			result: "test.io/k8scsi/test:latest",
+			result: "test.io/k8s-staging-csi/test:latest",
 			err:    nil,
 		},
 	},
@ -111,7 +111,7 @@ func TestReplaceRegistryInImageURL(t *testing.T) {
 	gcrReleaseRegistry = "test.io/gke-release"
 	PrivateRegistry = "test.io/k8s-authenticated-test"
 	sampleRegistry = "test.io/google-samples"
-	quayK8sCSI = "test.io/k8scsi"
+	k8sCSI = "test.io/k8s-staging-csi"

 	for _, tt := range registryTests {
 		t.Run(tt.in, func(t *testing.T) {