github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-23 11:50:44 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #100179 from cpanato/GH-1525-gke

Browse Source 
test: remove gcr.io/gke-release since it is deprecated
This commit is contained in:
Kubernetes Prow Robot 2021-03-14 23:49:04 -07:00 committed by GitHub
commit 9657dd77a3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 0 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -76,7 +76,6 @@ func initReg() RegistryList {
GcEtcdRegistry: "k8s.gcr.io", GcEtcdRegistry: "k8s.gcr.io",
GcRegistry: "k8s.gcr.io", GcRegistry: "k8s.gcr.io",
SigStorageRegistry: "k8s.gcr.io/sig-storage", SigStorageRegistry: "k8s.gcr.io/sig-storage",
GcrReleaseRegistry: "gcr.io/gke-release",
PrivateRegistry: "gcr.io/k8s-authenticated-test", PrivateRegistry: "gcr.io/k8s-authenticated-test",
SampleRegistry: "gcr.io/google-samples", SampleRegistry: "gcr.io/google-samples",
MicrosoftRegistry: "mcr.microsoft.com", MicrosoftRegistry: "mcr.microsoft.com",
@ -113,7 +112,6 @@ 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
@ -392,8 +390,6 @@ 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

@ -75,13 +75,6 @@ var registryTests = []struct {
err: nil, err: nil,
}, },
}, },
{
"gcr.io/gke-release/test:latest",
result{
result: "test.io/gke-release/test:latest",
err: nil,
},
},
{ {
"gcr.io/google-samples/test:latest", "gcr.io/google-samples/test:latest",
result{ result{
@ -111,7 +104,6 @@ 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"