github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-04 01:40:07 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #92957 from r4f4/override-volume-images

Browse Source 
Make nested /volume/ repo images overridable
This commit is contained in:
Kubernetes Prow Robot 2020-07-16 06:31:41 -07:00 committed by GitHub
commit 6a8129f7f6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -31,6 +31,7 @@ type RegistryList struct {
DockerLibraryRegistry string `yaml:"dockerLibraryRegistry"` DockerLibraryRegistry string `yaml:"dockerLibraryRegistry"`
DockerGluster string `yaml:"dockerGluster"` DockerGluster string `yaml:"dockerGluster"`
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,6 +72,7 @@ func initReg() RegistryList {
DockerLibraryRegistry: "docker.io/library", DockerLibraryRegistry: "docker.io/library",
DockerGluster: "docker.io/gluster", DockerGluster: "docker.io/gluster",
E2eRegistry: "gcr.io/kubernetes-e2e-test-images", E2eRegistry: "gcr.io/kubernetes-e2e-test-images",
E2eVolumeRegistry: "gcr.io/kubernetes-e2e-test-images/volume",
// TODO: After the domain flip, this should instead be k8s.gcr.io/k8s-artifacts-prod/e2e-test-images // TODO: After the domain flip, this should instead be k8s.gcr.io/k8s-artifacts-prod/e2e-test-images
PromoterE2eRegistry: "us.gcr.io/k8s-artifacts-prod/e2e-test-images", PromoterE2eRegistry: "us.gcr.io/k8s-artifacts-prod/e2e-test-images",
BuildImageRegistry: "us.gcr.io/k8s-artifacts-prod/build-image", BuildImageRegistry: "us.gcr.io/k8s-artifacts-prod/build-image",
@ -105,6 +107,7 @@ var (
dockerLibraryRegistry = registry.DockerLibraryRegistry dockerLibraryRegistry = registry.DockerLibraryRegistry
dockerGluster = registry.DockerGluster dockerGluster = registry.DockerGluster
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
@ -237,10 +240,10 @@ func initImageConfigs() map[int]Config {
configs[RegressionIssue74839] = Config{e2eRegistry, "regression-issue-74839-amd64", "1.0"} configs[RegressionIssue74839] = Config{e2eRegistry, "regression-issue-74839-amd64", "1.0"}
configs[ResourceConsumer] = Config{e2eRegistry, "resource-consumer", "1.5"} configs[ResourceConsumer] = Config{e2eRegistry, "resource-consumer", "1.5"}
configs[SdDummyExporter] = Config{gcRegistry, "sd-dummy-exporter", "v0.2.0"} configs[SdDummyExporter] = Config{gcRegistry, "sd-dummy-exporter", "v0.2.0"}
configs[VolumeNFSServer] = Config{e2eRegistry, "volume/nfs", "1.0"} configs[VolumeNFSServer] = Config{e2eVolumeRegistry, "nfs", "1.0"}
configs[VolumeISCSIServer] = Config{e2eRegistry, "volume/iscsi", "2.0"} configs[VolumeISCSIServer] = Config{e2eVolumeRegistry, "iscsi", "2.0"}
configs[VolumeGlusterServer] = Config{e2eRegistry, "volume/gluster", "1.0"} configs[VolumeGlusterServer] = Config{e2eVolumeRegistry, "gluster", "1.0"}
configs[VolumeRBDServer] = Config{e2eRegistry, "volume/rbd", "1.0.1"} configs[VolumeRBDServer] = Config{e2eVolumeRegistry, "rbd", "1.0.1"}
return configs return configs
} }
@ -278,6 +281,8 @@ 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 "gcr.io/k8s-authenticated-test": case "gcr.io/k8s-authenticated-test":

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

@ -58,6 +58,13 @@ 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{
@ -107,6 +114,7 @@ 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"