Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

cleanup: Removes GcrRelease and SampleRegistry from manifest.go #103711

Merged
merged 1 commit into from
Aug 5, 2021
Merged

cleanup: Removes GcrRelease and SampleRegistry from manifest.go #103711

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
8 changes: 0 additions & 8 deletions test/utils/image/manifest.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,9 +38,7 @@ type RegistryList struct {
GcEtcdRegistry string `yaml:"gcEtcdRegistry"`
GcRegistry string `yaml:"gcRegistry"`
SigStorageRegistry string `yaml:"sigStorageRegistry"`
GcrReleaseRegistry string `yaml:"gcrReleaseRegistry"`
PrivateRegistry string `yaml:"privateRegistry"`
SampleRegistry string `yaml:"sampleRegistry"`
MicrosoftRegistry string `yaml:"microsoftRegistry"`
DockerLibraryRegistry string `yaml:"dockerLibraryRegistry"`
CloudProviderGcpRegistry string `yaml:"cloudProviderGcpRegistry"`
Expand Down Expand Up @@ -99,8 +97,6 @@ var (
GcRegistry: "k8s.gcr.io",
SigStorageRegistry: "k8s.gcr.io/sig-storage",
PrivateRegistry: "gcr.io/k8s-authenticated-test",
SampleRegistry: "gcr.io/google-samples",
GcrReleaseRegistry: "gcr.io/gke-release",
MicrosoftRegistry: "mcr.microsoft.com",
DockerLibraryRegistry: "docker.io/library",
CloudProviderGcpRegistry: "k8s.gcr.io/cloud-provider-gcp",
Expand Down Expand Up @@ -391,10 +387,6 @@ func replaceRegistryInImageURLWithList(imageURL string, reg RegistryList) (strin
registryAndUser = reg.SigStorageRegistry
case initRegistry.PrivateRegistry:
registryAndUser = reg.PrivateRegistry
case initRegistry.SampleRegistry:
registryAndUser = reg.SampleRegistry
case initRegistry.GcrReleaseRegistry:
registryAndUser = reg.GcrReleaseRegistry
case initRegistry.InvalidRegistry:
registryAndUser = reg.InvalidRegistry
case initRegistry.MicrosoftRegistry:
Expand Down
8 changes: 0 additions & 8 deletions test/utils/image/manifest_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,12 +49,6 @@ func TestReplaceRegistryInImageURL(t *testing.T) {
}, {
in: "gcr.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",
out: "test.io/sig-storage/test:latest",
Expand Down Expand Up @@ -84,9 +78,7 @@ func TestReplaceRegistryInImageURL(t *testing.T) {
DockerLibraryRegistry: "test.io/library",
E2eRegistry: "test.io/kubernetes-e2e-test-images",
GcRegistry: "test.io",
GcrReleaseRegistry: "test.io/gke-release",
PrivateRegistry: "test.io/k8s-authenticated-test",
SampleRegistry: "test.io/google-samples",
SigStorageRegistry: "test.io/sig-storage",
InvalidRegistry: "test.io/invalid",
MicrosoftRegistry: "test.io/microsoft",
Expand Down