github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update the nginx image from hub.docker.com

Browse Source
This commit is contained in:
Manjunath A Kumatagi
2018-07-11 11:20:23 +05:30
parent 4cd27c3644
commit 1f7f33aaa4
26 changed files with 55 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -22,10 +22,11 @@ import (
)
const (
e2eRegistry = "gcr.io/kubernetes-e2e-test-images"
gcRegistry = "k8s.gcr.io"
PrivateRegistry = "gcr.io/k8s-authenticated-test"
sampleRegistry = "gcr.io/google-samples"
dockerHubRegistry = "docker.io"
e2eRegistry = "gcr.io/kubernetes-e2e-test-images"
gcRegistry = "k8s.gcr.io"
PrivateRegistry = "gcr.io/k8s-authenticated-test"
sampleRegistry = "gcr.io/google-samples"
)
type ImageConfig struct {
@@ -73,8 +74,8 @@ var (
Net = ImageConfig{e2eRegistry, "net", "1.0", false}
Netexec = ImageConfig{e2eRegistry, "netexec", "1.0", false}
Nettest = ImageConfig{e2eRegistry, "nettest", "1.0", false}
NginxSlim = ImageConfig{gcRegistry, "nginx-slim", "0.20", true}
NginxSlimNew = ImageConfig{gcRegistry, "nginx-slim", "0.21", true}
Nginx = ImageConfig{dockerHubRegistry, "nginx", "1.14-alpine", false}
NginxNew = ImageConfig{dockerHubRegistry, "nginx", "1.15-alpine", false}
Nonewprivs = ImageConfig{e2eRegistry, "nonewprivs", "1.0", false}
NoSnatTest = ImageConfig{e2eRegistry, "no-snat-test", "1.0", false}
NoSnatTestProxy = ImageConfig{e2eRegistry, "no-snat-test-proxy", "1.0", false}
@@ -102,7 +103,6 @@ func GetE2EImageWithArch(image ImageConfig, arch string) string {
return fmt.Sprintf("%s/%s-%s:%s", image.registry, image.name, arch, image.version)
} else {
return fmt.Sprintf("%s/%s:%s", image.registry, image.name, image.version)
}
}