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

remove e2e volume registry as it is not used

Browse Source
This commit is contained in:
pacoxu 2021-03-11 15:54:33 +08:00
parent 3baa0358b9
commit 59d96263e4
2 changed files with 0 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -32,7 +32,6 @@ import (
type RegistryList struct { type RegistryList struct {
GcAuthenticatedRegistry string `yaml:"gcAuthenticatedRegistry"` GcAuthenticatedRegistry string `yaml:"gcAuthenticatedRegistry"`
E2eRegistry string `yaml:"e2eRegistry"` E2eRegistry string `yaml:"e2eRegistry"`
E2eVolumeRegistry string `yaml:"e2eVolumeRegistry"`
PromoterE2eRegistry string `yaml:"promoterE2eRegistry"` PromoterE2eRegistry string `yaml:"promoterE2eRegistry"`
BuildImageRegistry string `yaml:"buildImageRegistry"` BuildImageRegistry string `yaml:"buildImageRegistry"`
InvalidRegistry string `yaml:"invalidRegistry"` InvalidRegistry string `yaml:"invalidRegistry"`
@ -71,7 +70,6 @@ func initReg() RegistryList {
registry := RegistryList{ registry := RegistryList{
GcAuthenticatedRegistry: "gcr.io/authenticated-image-pulling", GcAuthenticatedRegistry: "gcr.io/authenticated-image-pulling",
E2eRegistry: "gcr.io/kubernetes-e2e-test-images", E2eRegistry: "gcr.io/kubernetes-e2e-test-images",
E2eVolumeRegistry: "gcr.io/kubernetes-e2e-test-images/volume",
PromoterE2eRegistry: "k8s.gcr.io/e2e-test-images", PromoterE2eRegistry: "k8s.gcr.io/e2e-test-images",
BuildImageRegistry: "k8s.gcr.io/build-image", BuildImageRegistry: "k8s.gcr.io/build-image",
InvalidRegistry: "invalid.com/invalid", InvalidRegistry: "invalid.com/invalid",
@ -109,7 +107,6 @@ var (
// Preconfigured image configs // Preconfigured image configs
dockerLibraryRegistry = "docker.io/library" dockerLibraryRegistry = "docker.io/library"
e2eRegistry = registry.E2eRegistry e2eRegistry = registry.E2eRegistry
e2eVolumeRegistry = registry.E2eVolumeRegistry
promoterE2eRegistry = registry.PromoterE2eRegistry promoterE2eRegistry = registry.PromoterE2eRegistry
buildImageRegistry = registry.BuildImageRegistry buildImageRegistry = registry.BuildImageRegistry
gcAuthenticatedRegistry = registry.GcAuthenticatedRegistry gcAuthenticatedRegistry = registry.GcAuthenticatedRegistry
@ -387,8 +384,6 @@ func ReplaceRegistryInImageURL(imageURL string) (string, error) {
switch registryAndUser { switch registryAndUser {
case "gcr.io/kubernetes-e2e-test-images": case "gcr.io/kubernetes-e2e-test-images":
registryAndUser = e2eRegistry registryAndUser = e2eRegistry
case "gcr.io/kubernetes-e2e-test-images/volume":
registryAndUser = e2eVolumeRegistry
case "k8s.gcr.io": case "k8s.gcr.io":
registryAndUser = gcRegistry registryAndUser = gcRegistry
case "k8s.gcr.io/sig-storage": case "k8s.gcr.io/sig-storage":

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

@ -61,13 +61,6 @@ var registryTests = []struct {
err: nil, err: nil,
}, },
}, },
{
"gcr.io/kubernetes-e2e-test-images/volume/test:123",
result{
result: "test.io/kubernetes-e2e-test-images/volume/test:123",
err: nil,
},
},
{ {
"k8s.gcr.io/test:123", "k8s.gcr.io/test:123",
result{ result{
@ -117,7 +110,6 @@ func TestReplaceRegistryInImageURL(t *testing.T) {
// Set custom registries // Set custom registries
dockerLibraryRegistry = "test.io/library" dockerLibraryRegistry = "test.io/library"
e2eRegistry = "test.io/kubernetes-e2e-test-images" e2eRegistry = "test.io/kubernetes-e2e-test-images"
e2eVolumeRegistry = "test.io/kubernetes-e2e-test-images/volume"
gcRegistry = "test.io" gcRegistry = "test.io"
gcrReleaseRegistry = "test.io/gke-release" gcrReleaseRegistry = "test.io/gke-release"
PrivateRegistry = "test.io/k8s-authenticated-test" PrivateRegistry = "test.io/k8s-authenticated-test"