From 1f7f33aaa4cbb37f942e6fe6de8e6985d9b4201a Mon Sep 17 00:00:00 2001 From: Manjunath A Kumatagi Date: Wed, 11 Jul 2018 11:20:23 +0530 Subject: [PATCH] Update the nginx image from hub.docker.com --- test/e2e/apimachinery/garbage_collector.go | 4 ++-- test/e2e/apimachinery/generated_clientset.go | 4 ++-- test/e2e/apps/statefulset.go | 2 +- test/e2e/apps/types.go | 4 ++-- test/e2e/common/container_probe.go | 2 +- test/e2e/common/pods.go | 8 ++++---- test/e2e/common/util.go | 2 +- test/e2e/framework/rc_util.go | 9 +++++++++ test/e2e/framework/statefulset_utils.go | 2 +- test/e2e/kubectl/kubectl.go | 14 +++++++------- test/e2e/node/pods.go | 4 ++-- test/e2e/servicecatalog/podpreset.go | 4 ++-- test/e2e/storage/persistent_volumes-local.go | 4 ++-- test/e2e/storage/persistent_volumes.go | 2 +- .../kubectl/nginx-deployment1.yaml.in | 2 +- .../kubectl/nginx-deployment2.yaml.in | 2 +- .../kubectl/nginx-deployment3.yaml.in | 2 +- .../kubectl/pod-with-readiness-probe.yaml.in | 2 +- test/e2e/upgrades/apps/deployments.go | 2 +- test/e2e/upgrades/apps/replicasets.go | 2 +- test/e2e_node/container_manager_test.go | 2 +- test/e2e_node/docker_test.go | 2 +- test/e2e_node/image_list.go | 2 +- test/e2e_node/mirror_pod_test.go | 2 +- test/e2e_node/security_context_test.go | 2 +- test/utils/image/manifest.go | 14 +++++++------- 26 files changed, 55 insertions(+), 46 deletions(-) diff --git a/test/e2e/apimachinery/garbage_collector.go b/test/e2e/apimachinery/garbage_collector.go index 6438133c480..c2ba58267a9 100644 --- a/test/e2e/apimachinery/garbage_collector.go +++ b/test/e2e/apimachinery/garbage_collector.go @@ -104,7 +104,7 @@ func getPodTemplateSpec(labels map[string]string) v1.PodTemplateSpec { Containers: []v1.Container{ { Name: "nginx", - Image: imageutils.GetE2EImage(imageutils.NginxSlim), + Image: imageutils.GetE2EImage(imageutils.Nginx), }, }, }, @@ -204,7 +204,7 @@ func newGCPod(name string) *v1.Pod { Containers: []v1.Container{ { Name: "nginx", - Image: imageutils.GetE2EImage(imageutils.NginxSlim), + Image: imageutils.GetE2EImage(imageutils.Nginx), }, }, }, diff --git a/test/e2e/apimachinery/generated_clientset.go b/test/e2e/apimachinery/generated_clientset.go index 228e9a26b3e..b6c4b994e0d 100644 --- a/test/e2e/apimachinery/generated_clientset.go +++ b/test/e2e/apimachinery/generated_clientset.go @@ -49,7 +49,7 @@ func stagingClientPod(name, value string) v1.Pod { Containers: []v1.Container{ { Name: "nginx", - Image: imageutils.GetE2EImage(imageutils.NginxSlim), + Image: imageutils.GetE2EImage(imageutils.Nginx), Ports: []v1.ContainerPort{{ContainerPort: 80}}, }, }, @@ -70,7 +70,7 @@ func testingPod(name, value string) v1.Pod { Containers: []v1.Container{ { Name: "nginx", - Image: imageutils.GetE2EImage(imageutils.NginxSlim), + Image: imageutils.GetE2EImage(imageutils.Nginx), Ports: []v1.ContainerPort{{ContainerPort: 80}}, LivenessProbe: &v1.Probe{ Handler: v1.Handler{ diff --git a/test/e2e/apps/statefulset.go b/test/e2e/apps/statefulset.go index 5f9c21a1bfa..2ed03326427 100644 --- a/test/e2e/apps/statefulset.go +++ b/test/e2e/apps/statefulset.go @@ -709,7 +709,7 @@ var _ = SIGDescribe("StatefulSet", func() { Containers: []v1.Container{ { Name: "nginx", - Image: imageutils.GetE2EImage(imageutils.NginxSlim), + Image: imageutils.GetE2EImage(imageutils.Nginx), Ports: []v1.ContainerPort{conflictingPort}, }, }, diff --git a/test/e2e/apps/types.go b/test/e2e/apps/types.go index 3980f35fff4..ed673b3eb82 100644 --- a/test/e2e/apps/types.go +++ b/test/e2e/apps/types.go @@ -31,7 +31,7 @@ var ( CronJobGroupVersionResourceBeta = schema.GroupVersionResource{Group: "batch", Version: "v1beta1", Resource: "cronjobs"} NautilusImage = imageutils.GetE2EImage(imageutils.Nautilus) KittenImage = imageutils.GetE2EImage(imageutils.Kitten) - NginxImage = imageutils.GetE2EImage(imageutils.NginxSlim) - NewNginxImage = imageutils.GetE2EImage(imageutils.NginxSlimNew) + NginxImage = imageutils.GetE2EImage(imageutils.Nginx) + NewNginxImage = imageutils.GetE2EImage(imageutils.NginxNew) RedisImage = imageutils.GetE2EImage(imageutils.Redis) ) diff --git a/test/e2e/common/container_probe.go b/test/e2e/common/container_probe.go index 3fb84cde89e..4ae6d37aae2 100644 --- a/test/e2e/common/container_probe.go +++ b/test/e2e/common/container_probe.go @@ -253,7 +253,7 @@ var _ = framework.KubeDescribe("Probing container", func() { Containers: []v1.Container{ { Name: "liveness", - Image: imageutils.GetE2EImage(imageutils.NginxSlim), + Image: imageutils.GetE2EImage(imageutils.Nginx), Ports: []v1.ContainerPort{{ContainerPort: 80}}, LivenessProbe: &v1.Probe{ Handler: v1.Handler{ diff --git a/test/e2e/common/pods.go b/test/e2e/common/pods.go index bcf966afef0..b0268efc0db 100644 --- a/test/e2e/common/pods.go +++ b/test/e2e/common/pods.go @@ -171,7 +171,7 @@ var _ = framework.KubeDescribe("Pods", func() { Containers: []v1.Container{ { Name: "nginx", - Image: imageutils.GetE2EImage(imageutils.NginxSlim), + Image: imageutils.GetE2EImage(imageutils.Nginx), }, }, }, @@ -297,7 +297,7 @@ var _ = framework.KubeDescribe("Pods", func() { Containers: []v1.Container{ { Name: "nginx", - Image: imageutils.GetE2EImage(imageutils.NginxSlim), + Image: imageutils.GetE2EImage(imageutils.Nginx), }, }, }, @@ -351,7 +351,7 @@ var _ = framework.KubeDescribe("Pods", func() { Containers: []v1.Container{ { Name: "nginx", - Image: imageutils.GetE2EImage(imageutils.NginxSlim), + Image: imageutils.GetE2EImage(imageutils.Nginx), }, }, }, @@ -623,7 +623,7 @@ var _ = framework.KubeDescribe("Pods", func() { By("updating the image") podClient.Update(podName, func(pod *v1.Pod) { - pod.Spec.Containers[0].Image = imageutils.GetE2EImage(imageutils.NginxSlim) + pod.Spec.Containers[0].Image = imageutils.GetE2EImage(imageutils.Nginx) }) time.Sleep(syncLoopFrequency) diff --git a/test/e2e/common/util.go b/test/e2e/common/util.go index 7fb839ef2eb..66bbdc39a96 100644 --- a/test/e2e/common/util.go +++ b/test/e2e/common/util.go @@ -59,7 +59,7 @@ var CommonImageWhiteList = sets.NewString( imageutils.GetE2EImage(imageutils.Mounttest), imageutils.GetE2EImage(imageutils.MounttestUser), imageutils.GetE2EImage(imageutils.Netexec), - imageutils.GetE2EImage(imageutils.NginxSlim), + imageutils.GetE2EImage(imageutils.Nginx), imageutils.GetE2EImage(imageutils.ServeHostname), imageutils.GetE2EImage(imageutils.TestWebserver), imageutils.GetE2EImage(imageutils.Hostexec), diff --git a/test/e2e/framework/rc_util.go b/test/e2e/framework/rc_util.go index ff2827e35c0..0cc8fbed5b7 100644 --- a/test/e2e/framework/rc_util.go +++ b/test/e2e/framework/rc_util.go @@ -216,6 +216,13 @@ func WaitForReplicationControllerwithSelector(c clientset.Interface, namespace s return nil } +// trimDockerIO is the function for trimming the docker.io from the beginning of the imagename. +// If community docker installed it will not prefix the registry names with the dockerimages vs registry names prefixed with other runtimes or docker installed via RHEL extra repo. +// So this function will help to trim the docker.io if exists +func trimDockerIO(imagename string) string { + return strings.Replace(imagename, "docker.io/", "", 1) +} + // validatorFn is the function which is individual tests will implement. // we may want it to return more than just an error, at some point. type validatorFn func(c clientset.Interface, podID string) error @@ -227,6 +234,7 @@ type validatorFn func(c clientset.Interface, podID string) error // "testname": which gets bubbled up to the logging/failure messages if errors happen. // "validator" function: This function is given a podID and a client, and it can do some specific validations that way. func ValidateController(c clientset.Interface, containerImage string, replicas int, containername string, testname string, validator validatorFn, ns string) { + containerImage = trimDockerIO(containerImage) getPodsTemplate := "--template={{range.items}}{{.metadata.name}} {{end}}" // NB: kubectl adds the "exists" function to the standard template functions. // This lets us check to see if the "running" entry exists for each of the containers @@ -258,6 +266,7 @@ waitLoop: } currentImage := RunKubectlOrDie("get", "pods", podID, "-o", "template", getImageTemplate, fmt.Sprintf("--namespace=%v", ns)) + currentImage = trimDockerIO(currentImage) if currentImage != containerImage { Logf("%s is created but running wrong image; expected: %s, actual: %s", podID, containerImage, currentImage) continue waitLoop diff --git a/test/e2e/framework/statefulset_utils.go b/test/e2e/framework/statefulset_utils.go index 918c7033044..7855b60da71 100644 --- a/test/e2e/framework/statefulset_utils.go +++ b/test/e2e/framework/statefulset_utils.go @@ -810,7 +810,7 @@ func NewStatefulSet(name, ns, governingSvcName string, replicas int32, statefulP Containers: []v1.Container{ { Name: "nginx", - Image: imageutils.GetE2EImage(imageutils.NginxSlim), + Image: imageutils.GetE2EImage(imageutils.Nginx), VolumeMounts: mounts, }, }, diff --git a/test/e2e/kubectl/kubectl.go b/test/e2e/kubectl/kubectl.go index dfbd184d3de..2db194520e5 100644 --- a/test/e2e/kubectl/kubectl.go +++ b/test/e2e/kubectl/kubectl.go @@ -93,15 +93,15 @@ var ( nautilusImage = imageutils.GetE2EImage(imageutils.Nautilus) kittenImage = imageutils.GetE2EImage(imageutils.Kitten) redisImage = imageutils.GetE2EImage(imageutils.Redis) - nginxImage = imageutils.GetE2EImage(imageutils.NginxSlim) + nginxImage = imageutils.GetE2EImage(imageutils.Nginx) busyboxImage = "busybox" ) var testImages = struct { GBFrontendImage string PauseImage string - NginxSlimImage string - NginxSlimNewImage string + NginxImage string + NginxNewImage string RedisImage string GBRedisSlaveImage string NautilusImage string @@ -109,8 +109,8 @@ var testImages = struct { }{ imageutils.GetE2EImage(imageutils.GBFrontend), imageutils.GetE2EImage(imageutils.Pause), - imageutils.GetE2EImage(imageutils.NginxSlim), - imageutils.GetE2EImage(imageutils.NginxSlimNew), + imageutils.GetE2EImage(imageutils.Nginx), + imageutils.GetE2EImage(imageutils.NginxNew), imageutils.GetE2EImage(imageutils.Redis), imageutils.GetE2EImage(imageutils.GBRedisSlave), imageutils.GetE2EImage(imageutils.Nautilus), @@ -428,7 +428,7 @@ var _ = SIGDescribe("Kubectl client", func() { defer closer.Close() By("executing a command in the container with pseudo-interactive stdin") - execOutput = framework.NewKubectlCommand("exec", fmt.Sprintf("--namespace=%v", ns), "-i", simplePodName, "bash"). + execOutput = framework.NewKubectlCommand("exec", fmt.Sprintf("--namespace=%v", ns), "-i", simplePodName, "sh"). WithStdinReader(r). ExecOrDie() if e, a := "hi", strings.TrimSpace(execOutput); e != a { @@ -819,7 +819,7 @@ metadata: By("verify replicas still is 3 and image has been updated") output = framework.RunKubectlOrDieInput(deployment3Yaml, "get", "-f", "-", nsFlag, "-o", "json") - requiredItems := []string{"\"replicas\": 3", imageutils.GetE2EImage(imageutils.NginxSlim)} + requiredItems := []string{"\"replicas\": 3", imageutils.GetE2EImage(imageutils.Nginx)} for _, item := range requiredItems { if !strings.Contains(output, item) { framework.Failf("Missing %s in kubectl apply", item) diff --git a/test/e2e/node/pods.go b/test/e2e/node/pods.go index 39a6b9b0662..44bbbc8636a 100644 --- a/test/e2e/node/pods.go +++ b/test/e2e/node/pods.go @@ -68,7 +68,7 @@ var _ = SIGDescribe("Pods Extended", func() { Containers: []v1.Container{ { Name: "nginx", - Image: imageutils.GetE2EImage(imageutils.NginxSlim), + Image: imageutils.GetE2EImage(imageutils.Nginx), }, }, }, @@ -223,7 +223,7 @@ var _ = SIGDescribe("Pods Extended", func() { Containers: []v1.Container{ { Name: "nginx", - Image: imageutils.GetE2EImage(imageutils.NginxSlim), + Image: imageutils.GetE2EImage(imageutils.Nginx), Resources: v1.ResourceRequirements{ Limits: v1.ResourceList{ v1.ResourceCPU: resource.MustParse("100m"), diff --git a/test/e2e/servicecatalog/podpreset.go b/test/e2e/servicecatalog/podpreset.go index f7488b99459..260c1790a2a 100644 --- a/test/e2e/servicecatalog/podpreset.go +++ b/test/e2e/servicecatalog/podpreset.go @@ -96,7 +96,7 @@ var _ = SIGDescribe("[Feature:PodPreset] PodPreset", func() { Containers: []v1.Container{ { Name: "nginx", - Image: imageutils.GetE2EImage(imageutils.NginxSlim), + Image: imageutils.GetE2EImage(imageutils.Nginx), }, }, }, @@ -204,7 +204,7 @@ var _ = SIGDescribe("[Feature:PodPreset] PodPreset", func() { Containers: []v1.Container{ { Name: "nginx", - Image: imageutils.GetE2EImage(imageutils.NginxSlim), + Image: imageutils.GetE2EImage(imageutils.Nginx), Env: []v1.EnvVar{{Name: "abc", Value: "value2"}, {Name: "ABC", Value: "value"}}, }, }, diff --git a/test/e2e/storage/persistent_volumes-local.go b/test/e2e/storage/persistent_volumes-local.go index 163249848a2..ac232875a5e 100644 --- a/test/e2e/storage/persistent_volumes-local.go +++ b/test/e2e/storage/persistent_volumes-local.go @@ -1240,7 +1240,7 @@ func makeLocalPod(config *localTestConfig, volume *localTestVolume, cmd string) } if volume.localVolumeType == BlockLocalVolumeType { // Block e2e tests require utilities for writing to block devices (e.g. dd), and nginx has this utilites. - pod.Spec.Containers[0].Image = imageutils.GetE2EImage(imageutils.NginxSlim) + pod.Spec.Containers[0].Image = imageutils.GetE2EImage(imageutils.Nginx) } return pod } @@ -1864,7 +1864,7 @@ func createStatefulSet(config *localTestConfig, ssReplicas int32, volumeCount in Containers: []v1.Container{ { Name: "nginx", - Image: imageutils.GetE2EImage(imageutils.NginxSlim), + Image: imageutils.GetE2EImage(imageutils.Nginx), VolumeMounts: mounts, }, }, diff --git a/test/e2e/storage/persistent_volumes.go b/test/e2e/storage/persistent_volumes.go index d20dbf4076a..b9dea5813dc 100644 --- a/test/e2e/storage/persistent_volumes.go +++ b/test/e2e/storage/persistent_volumes.go @@ -407,7 +407,7 @@ func makeStatefulSetWithPVCs(ns, cmd string, mounts []v1.VolumeMount, claims []v Containers: []v1.Container{ { Name: "nginx", - Image: imageutils.GetE2EImage(imageutils.NginxSlim), + Image: imageutils.GetE2EImage(imageutils.Nginx), Command: []string{"/bin/sh"}, Args: []string{"-c", cmd}, VolumeMounts: mounts, diff --git a/test/e2e/testing-manifests/kubectl/nginx-deployment1.yaml.in b/test/e2e/testing-manifests/kubectl/nginx-deployment1.yaml.in index 99b109cfd3a..e261758347d 100644 --- a/test/e2e/testing-manifests/kubectl/nginx-deployment1.yaml.in +++ b/test/e2e/testing-manifests/kubectl/nginx-deployment1.yaml.in @@ -14,6 +14,6 @@ spec: spec: containers: - name: nginx - image: {{.NginxSlimNewImage}} + image: {{.NginxNewImage}} ports: - containerPort: 80 diff --git a/test/e2e/testing-manifests/kubectl/nginx-deployment2.yaml.in b/test/e2e/testing-manifests/kubectl/nginx-deployment2.yaml.in index 436b469979a..b0b2c669556 100644 --- a/test/e2e/testing-manifests/kubectl/nginx-deployment2.yaml.in +++ b/test/e2e/testing-manifests/kubectl/nginx-deployment2.yaml.in @@ -13,6 +13,6 @@ spec: spec: containers: - name: nginx - image: {{.NginxSlimNewImage}} + image: {{.NginxNewImage}} ports: - containerPort: 80 diff --git a/test/e2e/testing-manifests/kubectl/nginx-deployment3.yaml.in b/test/e2e/testing-manifests/kubectl/nginx-deployment3.yaml.in index 5b5a624c133..5d563dec2c0 100644 --- a/test/e2e/testing-manifests/kubectl/nginx-deployment3.yaml.in +++ b/test/e2e/testing-manifests/kubectl/nginx-deployment3.yaml.in @@ -13,6 +13,6 @@ spec: spec: containers: - name: nginx - image: {{.NginxSlimImage}} + image: {{.NginxImage}} ports: - containerPort: 80 diff --git a/test/e2e/testing-manifests/kubectl/pod-with-readiness-probe.yaml.in b/test/e2e/testing-manifests/kubectl/pod-with-readiness-probe.yaml.in index 7e7b355f6b5..b813e336029 100644 --- a/test/e2e/testing-manifests/kubectl/pod-with-readiness-probe.yaml.in +++ b/test/e2e/testing-manifests/kubectl/pod-with-readiness-probe.yaml.in @@ -7,7 +7,7 @@ metadata: spec: containers: - name: nginx - image: {{.NginxSlimImage}} + image: {{.NginxImage}} ports: - containerPort: 80 readinessProbe: diff --git a/test/e2e/upgrades/apps/deployments.go b/test/e2e/upgrades/apps/deployments.go index d31e3258f5f..1ac478c4e25 100644 --- a/test/e2e/upgrades/apps/deployments.go +++ b/test/e2e/upgrades/apps/deployments.go @@ -51,7 +51,7 @@ func (DeploymentUpgradeTest) Name() string { return "[sig-apps] deployment-upgra // Setup creates a deployment and makes sure it has a new and an old replicaset running. func (t *DeploymentUpgradeTest) Setup(f *framework.Framework) { c := f.ClientSet - nginxImage := imageutils.GetE2EImage(imageutils.NginxSlim) + nginxImage := imageutils.GetE2EImage(imageutils.Nginx) ns := f.Namespace.Name deploymentClient := c.AppsV1().Deployments(ns) diff --git a/test/e2e/upgrades/apps/replicasets.go b/test/e2e/upgrades/apps/replicasets.go index 4b3fd327d0c..daf1c8b0e9e 100644 --- a/test/e2e/upgrades/apps/replicasets.go +++ b/test/e2e/upgrades/apps/replicasets.go @@ -50,7 +50,7 @@ func (ReplicaSetUpgradeTest) Name() string { return "[sig-apps] replicaset-upgra func (r *ReplicaSetUpgradeTest) Setup(f *framework.Framework) { c := f.ClientSet ns := f.Namespace.Name - nginxImage := imageutils.GetE2EImage(imageutils.NginxSlim) + nginxImage := imageutils.GetE2EImage(imageutils.Nginx) By(fmt.Sprintf("Creating replicaset %s in namespace %s", rsName, ns)) replicaSet := framework.NewReplicaSet(rsName, ns, 1, map[string]string{"test": "upgrade"}, "nginx", nginxImage) diff --git a/test/e2e_node/container_manager_test.go b/test/e2e_node/container_manager_test.go index 789a954fef8..13f7af595f5 100644 --- a/test/e2e_node/container_manager_test.go +++ b/test/e2e_node/container_manager_test.go @@ -178,7 +178,7 @@ var _ = framework.KubeDescribe("Container Manager Misc [Serial]", func() { Spec: v1.PodSpec{ Containers: []v1.Container{ { - Image: imageutils.GetE2EImage(imageutils.NginxSlim), + Image: imageutils.GetE2EImage(imageutils.Nginx), Name: podName, Resources: v1.ResourceRequirements{ Limits: v1.ResourceList{ diff --git a/test/e2e_node/docker_test.go b/test/e2e_node/docker_test.go index 8a361c65d09..adbf2d55fbf 100644 --- a/test/e2e_node/docker_test.go +++ b/test/e2e_node/docker_test.go @@ -61,7 +61,7 @@ var _ = framework.KubeDescribe("Docker features [Feature:Docker][Legacy:Docker]" Spec: v1.PodSpec{ Containers: []v1.Container{{ Name: containerName, - Image: imageutils.GetE2EImage(imageutils.NginxSlim), + Image: imageutils.GetE2EImage(imageutils.Nginx), }}, }, }) diff --git a/test/e2e_node/image_list.go b/test/e2e_node/image_list.go index d35bb5acaae..efc498c45d5 100644 --- a/test/e2e_node/image_list.go +++ b/test/e2e_node/image_list.go @@ -47,7 +47,7 @@ var NodeImageWhiteList = sets.NewString( busyboxImage, "k8s.gcr.io/busybox@sha256:4bdd623e848417d96127e16037743f0cd8b528c026e9175e22a84f639eca58ff", "k8s.gcr.io/node-problem-detector:v0.4.1", - imageutils.GetE2EImage(imageutils.NginxSlim), + imageutils.GetE2EImage(imageutils.Nginx), imageutils.GetE2EImage(imageutils.ServeHostname), imageutils.GetE2EImage(imageutils.Netexec), imageutils.GetE2EImage(imageutils.Nonewprivs), diff --git a/test/e2e_node/mirror_pod_test.go b/test/e2e_node/mirror_pod_test.go index 1236bb91b0f..7f0e8bbfc88 100644 --- a/test/e2e_node/mirror_pod_test.go +++ b/test/e2e_node/mirror_pod_test.go @@ -49,7 +49,7 @@ var _ = framework.KubeDescribe("MirrorPod", func() { By("create the static pod") err := createStaticPod(podPath, staticPodName, ns, - imageutils.GetE2EImage(imageutils.NginxSlim), v1.RestartPolicyAlways) + imageutils.GetE2EImage(imageutils.Nginx), v1.RestartPolicyAlways) Expect(err).ShouldNot(HaveOccurred()) By("wait for the mirror pod to be running") diff --git a/test/e2e_node/security_context_test.go b/test/e2e_node/security_context_test.go index 3d0aa231cc1..9e89b040e45 100644 --- a/test/e2e_node/security_context_test.go +++ b/test/e2e_node/security_context_test.go @@ -146,7 +146,7 @@ var _ = framework.KubeDescribe("Security Context", func() { BeforeEach(func() { nginxPodName := "nginx-hostpid-" + string(uuid.NewUUID()) podClient.CreateSync(makeHostPidPod(nginxPodName, - imageutils.GetE2EImage(imageutils.NginxSlim), + imageutils.GetE2EImage(imageutils.Nginx), nil, true, )) diff --git a/test/utils/image/manifest.go b/test/utils/image/manifest.go index e46123a2cee..f9dfc6a4c67 100644 --- a/test/utils/image/manifest.go +++ b/test/utils/image/manifest.go @@ -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) - } }