Use staging-csi to work around quay.io availability
Signed-off-by: Davanum Srinivas <davanum@gmail.com>
This commit is contained in:
@@ -40,7 +40,7 @@ type RegistryList struct {
|
||||
GoogleContainerRegistry string `yaml:"googleContainerRegistry"`
|
||||
PrivateRegistry string `yaml:"privateRegistry"`
|
||||
SampleRegistry string `yaml:"sampleRegistry"`
|
||||
QuayK8sCSI string `yaml:"quayK8sCSI"`
|
||||
K8sCSI string `yaml:"k8sCSI"`
|
||||
QuayIncubator string `yaml:"quayIncubator"`
|
||||
}
|
||||
|
||||
@@ -82,7 +82,7 @@ func initReg() RegistryList {
|
||||
GoogleContainerRegistry: "gcr.io/google-containers",
|
||||
PrivateRegistry: "gcr.io/k8s-authenticated-test",
|
||||
SampleRegistry: "gcr.io/google-samples",
|
||||
QuayK8sCSI: "quay.io/k8scsi",
|
||||
K8sCSI: "gcr.io/k8s-staging-csi",
|
||||
QuayIncubator: "quay.io/kubernetes_incubator",
|
||||
}
|
||||
repoList := os.Getenv("KUBE_TEST_REPO_LIST")
|
||||
@@ -113,7 +113,7 @@ var (
|
||||
gcRegistry = registry.GcRegistry
|
||||
gcrReleaseRegistry = registry.GcrReleaseRegistry
|
||||
invalidRegistry = registry.InvalidRegistry
|
||||
quayK8sCSI = registry.QuayK8sCSI
|
||||
k8sCSI = registry.K8sCSI
|
||||
quayIncubator = registry.QuayIncubator
|
||||
// PrivateRegistry is an image repository that requires authentication
|
||||
PrivateRegistry = registry.PrivateRegistry
|
||||
@@ -291,8 +291,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
|
||||
|
@@ -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) {
|
||||
|
Reference in New Issue
Block a user