github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Move nfs-provisioner from quay.io/kubernetes_incubator to staging-csi

Browse Source 
Signed-off-by: Davanum Srinivas <davanum@gmail.com>
This commit is contained in:
Davanum Srinivas 2020-05-19 14:46:33 -04:00
parent 5c966e3beb
commit fb7cb4307e
No known key found for this signature in database
GPG Key ID: 80D83A796103BF59
1 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
test/utils/image/manifest.go
View File

@ -41,7 +41,6 @@ type RegistryList struct {
PrivateRegistry string `yaml:"privateRegistry"` PrivateRegistry string `yaml:"privateRegistry"`
SampleRegistry string `yaml:"sampleRegistry"` SampleRegistry string `yaml:"sampleRegistry"`
K8sCSI string `yaml:"k8sCSI"` K8sCSI string `yaml:"k8sCSI"`
QuayIncubator string `yaml:"quayIncubator"`
} }
// Config holds an images registry, name, and version // Config holds an images registry, name, and version
@ -83,7 +82,6 @@ func initReg() RegistryList {
PrivateRegistry: "gcr.io/k8s-authenticated-test", PrivateRegistry: "gcr.io/k8s-authenticated-test",
SampleRegistry: "gcr.io/google-samples", SampleRegistry: "gcr.io/google-samples",
K8sCSI: "gcr.io/k8s-staging-csi", K8sCSI: "gcr.io/k8s-staging-csi",
QuayIncubator: "quay.io/kubernetes_incubator",
} }
repoList := os.Getenv("KUBE_TEST_REPO_LIST") repoList := os.Getenv("KUBE_TEST_REPO_LIST")
if repoList == "" { if repoList == "" {
@ -114,7 +112,6 @@ var (
gcrReleaseRegistry = registry.GcrReleaseRegistry gcrReleaseRegistry = registry.GcrReleaseRegistry
invalidRegistry = registry.InvalidRegistry invalidRegistry = registry.InvalidRegistry
k8sCSI = registry.K8sCSI k8sCSI = registry.K8sCSI
quayIncubator = registry.QuayIncubator
// PrivateRegistry is an image repository that requires authentication // PrivateRegistry is an image repository that requires authentication
PrivateRegistry = registry.PrivateRegistry PrivateRegistry = registry.PrivateRegistry
sampleRegistry = registry.SampleRegistry sampleRegistry = registry.SampleRegistry
@ -226,7 +223,7 @@ func initImageConfigs() map[int]Config {
configs[JessieDnsutils] = Config{e2eRegistry, "jessie-dnsutils", "1.0"} configs[JessieDnsutils] = Config{e2eRegistry, "jessie-dnsutils", "1.0"}
configs[Kitten] = Config{e2eRegistry, "kitten", "1.0"} configs[Kitten] = Config{e2eRegistry, "kitten", "1.0"}
configs[Nautilus] = Config{e2eRegistry, "nautilus", "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[Nginx] = Config{dockerLibraryRegistry, "nginx", "1.14-alpine"}
configs[NginxNew] = Config{dockerLibraryRegistry, "nginx", "1.15-alpine"} configs[NginxNew] = Config{dockerLibraryRegistry, "nginx", "1.15-alpine"}
configs[Nonewprivs] = Config{e2eRegistry, "nonewprivs", "1.0"} configs[Nonewprivs] = Config{e2eRegistry, "nonewprivs", "1.0"}