github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-24 20:24:09 +00:00
Code Issues Projects Releases Wiki Activity

revert removal of gcr.io/gke-release from pr 100179

Browse Source
This commit is contained in:
Carlos Panato 2021-03-16 16:30:18 +01:00
parent 2a26f276a8
commit c0e61e95a0
No known key found for this signature in database
GPG Key ID: 37CA4627A2CA778F
2 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -78,6 +78,7 @@ func initReg() RegistryList {
SigStorageRegistry: "k8s.gcr.io/sig-storage", SigStorageRegistry: "k8s.gcr.io/sig-storage",
PrivateRegistry: "gcr.io/k8s-authenticated-test", PrivateRegistry: "gcr.io/k8s-authenticated-test",
SampleRegistry: "gcr.io/google-samples", SampleRegistry: "gcr.io/google-samples",
GcrReleaseRegistry: "gcr.io/gke-release",
MicrosoftRegistry: "mcr.microsoft.com", MicrosoftRegistry: "mcr.microsoft.com",
} }
repoList := os.Getenv("KUBE_TEST_REPO_LIST") repoList := os.Getenv("KUBE_TEST_REPO_LIST")
@ -112,6 +113,7 @@ var (
gcEtcdRegistry = registry.GcEtcdRegistry gcEtcdRegistry = registry.GcEtcdRegistry
gcRegistry = registry.GcRegistry gcRegistry = registry.GcRegistry
sigStorageRegistry = registry.SigStorageRegistry sigStorageRegistry = registry.SigStorageRegistry
gcrReleaseRegistry = registry.GcrReleaseRegistry
invalidRegistry = registry.InvalidRegistry invalidRegistry = registry.InvalidRegistry
sampleRegistry = registry.SampleRegistry sampleRegistry = registry.SampleRegistry
microsoftRegistry = registry.MicrosoftRegistry microsoftRegistry = registry.MicrosoftRegistry
@ -390,6 +392,8 @@ func ReplaceRegistryInImageURL(imageURL string) (string, error) {
registryAndUser = PrivateRegistry registryAndUser = PrivateRegistry
case "gcr.io/google-samples": case "gcr.io/google-samples":
registryAndUser = sampleRegistry registryAndUser = sampleRegistry
case "gcr.io/gke-release":
registryAndUser = gcrReleaseRegistry
case "docker.io/library": case "docker.io/library":
registryAndUser = dockerLibraryRegistry registryAndUser = dockerLibraryRegistry
default: default:

8
test/utils/image/manifest_test.go
View File

@ -82,6 +82,13 @@ var registryTests = []struct {
err: nil, err: nil,
}, },
}, },
{
"gcr.io/gke-release/test:latest",
result{
result: "test.io/gke-release/test:latest",
err: nil,
},
},
{ {
"k8s.gcr.io/sig-storage/test:latest", "k8s.gcr.io/sig-storage/test:latest",
result{ result{
@ -104,6 +111,7 @@ func TestReplaceRegistryInImageURL(t *testing.T) {
dockerLibraryRegistry = "test.io/library" dockerLibraryRegistry = "test.io/library"
e2eRegistry = "test.io/kubernetes-e2e-test-images" e2eRegistry = "test.io/kubernetes-e2e-test-images"
gcRegistry = "test.io" gcRegistry = "test.io"
gcrReleaseRegistry = "test.io/gke-release"
PrivateRegistry = "test.io/k8s-authenticated-test" PrivateRegistry = "test.io/k8s-authenticated-test"
sampleRegistry = "test.io/google-samples" sampleRegistry = "test.io/google-samples"
sigStorageRegistry = "test.io/sig-storage" sigStorageRegistry = "test.io/sig-storage"