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 #103711 from claudiubelu/test-image-manifest-cleanup

Browse Source 
cleanup: Removes GcrRelease and SampleRegistry from manifest.go
This commit is contained in:
Kubernetes Prow Robot 2021-08-04 22:12:13 -07:00 committed by GitHub
commit b8641af9c2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 0 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -38,9 +38,7 @@ type RegistryList struct {
GcEtcdRegistry string `yaml:"gcEtcdRegistry"` GcEtcdRegistry string `yaml:"gcEtcdRegistry"`
GcRegistry string `yaml:"gcRegistry"` GcRegistry string `yaml:"gcRegistry"`
SigStorageRegistry string `yaml:"sigStorageRegistry"` SigStorageRegistry string `yaml:"sigStorageRegistry"`
GcrReleaseRegistry string `yaml:"gcrReleaseRegistry"`
PrivateRegistry string `yaml:"privateRegistry"` PrivateRegistry string `yaml:"privateRegistry"`
SampleRegistry string `yaml:"sampleRegistry"`
MicrosoftRegistry string `yaml:"microsoftRegistry"` MicrosoftRegistry string `yaml:"microsoftRegistry"`
DockerLibraryRegistry string `yaml:"dockerLibraryRegistry"` DockerLibraryRegistry string `yaml:"dockerLibraryRegistry"`
CloudProviderGcpRegistry string `yaml:"cloudProviderGcpRegistry"` CloudProviderGcpRegistry string `yaml:"cloudProviderGcpRegistry"`
@ -99,8 +97,6 @@ var (
GcRegistry: "k8s.gcr.io", GcRegistry: "k8s.gcr.io",
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",
GcrReleaseRegistry: "gcr.io/gke-release",
MicrosoftRegistry: "mcr.microsoft.com", MicrosoftRegistry: "mcr.microsoft.com",
DockerLibraryRegistry: "docker.io/library", DockerLibraryRegistry: "docker.io/library",
CloudProviderGcpRegistry: "k8s.gcr.io/cloud-provider-gcp", CloudProviderGcpRegistry: "k8s.gcr.io/cloud-provider-gcp",
@ -391,10 +387,6 @@ func replaceRegistryInImageURLWithList(imageURL string, reg RegistryList) (strin
registryAndUser = reg.SigStorageRegistry registryAndUser = reg.SigStorageRegistry
case initRegistry.PrivateRegistry: case initRegistry.PrivateRegistry:
registryAndUser = reg.PrivateRegistry registryAndUser = reg.PrivateRegistry
case initRegistry.SampleRegistry:
registryAndUser = reg.SampleRegistry
case initRegistry.GcrReleaseRegistry:
registryAndUser = reg.GcrReleaseRegistry
case initRegistry.InvalidRegistry: case initRegistry.InvalidRegistry:
registryAndUser = reg.InvalidRegistry registryAndUser = reg.InvalidRegistry
case initRegistry.MicrosoftRegistry: case initRegistry.MicrosoftRegistry:

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

@ -49,12 +49,6 @@ func TestReplaceRegistryInImageURL(t *testing.T) {
}, { }, {
in: "gcr.io/k8s-authenticated-test/test:123", in: "gcr.io/k8s-authenticated-test/test:123",
out: "test.io/k8s-authenticated-test/test:123", out: "test.io/k8s-authenticated-test/test:123",
}, {
in: "gcr.io/google-samples/test:latest",
out: "test.io/google-samples/test:latest",
}, {
in: "gcr.io/gke-release/test:latest",
out: "test.io/gke-release/test:latest",
}, { }, {
in: "k8s.gcr.io/sig-storage/test:latest", in: "k8s.gcr.io/sig-storage/test:latest",
out: "test.io/sig-storage/test:latest", out: "test.io/sig-storage/test:latest",
@ -84,9 +78,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",
SigStorageRegistry: "test.io/sig-storage", SigStorageRegistry: "test.io/sig-storage",
InvalidRegistry: "test.io/invalid", InvalidRegistry: "test.io/invalid",
MicrosoftRegistry: "test.io/microsoft", MicrosoftRegistry: "test.io/microsoft",