Skip to content

Commit fb7cb43

Browse files
committed
Move nfs-provisioner from quay.io/kubernetes_incubator to staging-csi
Signed-off-by: Davanum Srinivas <[email protected]>
1 parent 5c966e3 commit fb7cb43

File tree

1 file changed

+1
-4
lines changed

1 file changed

+1
-4
lines changed

test/utils/image/manifest.go

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,6 @@ type RegistryList struct {
4141
PrivateRegistry string `yaml:"privateRegistry"`
4242
SampleRegistry string `yaml:"sampleRegistry"`
4343
K8sCSI string `yaml:"k8sCSI"`
44-
QuayIncubator string `yaml:"quayIncubator"`
4544
}
4645

4746
// Config holds an images registry, name, and version
@@ -83,7 +82,6 @@ func initReg() RegistryList {
8382
PrivateRegistry: "gcr.io/k8s-authenticated-test",
8483
SampleRegistry: "gcr.io/google-samples",
8584
K8sCSI: "gcr.io/k8s-staging-csi",
86-
QuayIncubator: "quay.io/kubernetes_incubator",
8785
}
8886
repoList := os.Getenv("KUBE_TEST_REPO_LIST")
8987
if repoList == "" {
@@ -114,7 +112,6 @@ var (
114112
gcrReleaseRegistry = registry.GcrReleaseRegistry
115113
invalidRegistry = registry.InvalidRegistry
116114
k8sCSI = registry.K8sCSI
117-
quayIncubator = registry.QuayIncubator
118115
// PrivateRegistry is an image repository that requires authentication
119116
PrivateRegistry = registry.PrivateRegistry
120117
sampleRegistry = registry.SampleRegistry
@@ -226,7 +223,7 @@ func initImageConfigs() map[int]Config {
226223
configs[JessieDnsutils] = Config{e2eRegistry, "jessie-dnsutils", "1.0"}
227224
configs[Kitten] = Config{e2eRegistry, "kitten", "1.0"}
228225
configs[Nautilus] = Config{e2eRegistry, "nautilus", "1.0"}
229-
configs[NFSProvisioner] = Config{quayIncubator, "nfs-provisioner", "v2.2.2"}
226+
configs[NFSProvisioner] = Config{k8sCSI, "nfs-provisioner", "v2.2.2"}
230227
configs[Nginx] = Config{dockerLibraryRegistry, "nginx", "1.14-alpine"}
231228
configs[NginxNew] = Config{dockerLibraryRegistry, "nginx", "1.15-alpine"}
232229
configs[Nonewprivs] = Config{e2eRegistry, "nonewprivs", "1.0"}

0 commit comments

Comments
 (0)