Skip to content

K
k3s
Commit 1f7f33aa authored by Manjunath A Kumatagi's avatar Manjunath A Kumatagi
Browse files
Options

Update the nginx image from hub.docker.com

parent 4cd27c36
Hide whitespace changes
Inline Side-by-side
Showing with 55 additions and 46 deletions
test/e2e/apimachinery/garbage_collector.go
View file @ 1f7f33aa
...@@ -104,7 +104,7 @@ func getPodTemplateSpec(labels map[string]string) v1.PodTemplateSpec { ...@@ -104,7 +104,7 @@ func getPodTemplateSpec(labels map[string]string) v1.PodTemplateSpec {
Containers: []v1.Container{ Containers: []v1.Container{
{ {
Name: "nginx", Name: "nginx",
Image: imageutils.GetE2EImage(imageutils.NginxSlim), Image: imageutils.GetE2EImage(imageutils.Nginx),
}, },
}, },
}, },
...@@ -204,7 +204,7 @@ func newGCPod(name string) *v1.Pod { ...@@ -204,7 +204,7 @@ func newGCPod(name string) *v1.Pod {
Containers: []v1.Container{ Containers: []v1.Container{
{ {
Name: "nginx", Name: "nginx",
Image: imageutils.GetE2EImage(imageutils.NginxSlim), Image: imageutils.GetE2EImage(imageutils.Nginx),
}, },
}, },
}, },
......
test/e2e/apimachinery/generated_clientset.go
View file @ 1f7f33aa
...@@ -49,7 +49,7 @@ func stagingClientPod(name, value string) v1.Pod { ...@@ -49,7 +49,7 @@ func stagingClientPod(name, value string) v1.Pod {
Containers: []v1.Container{ Containers: []v1.Container{
{ {
Name: "nginx", Name: "nginx",
Image: imageutils.GetE2EImage(imageutils.NginxSlim), Image: imageutils.GetE2EImage(imageutils.Nginx),
Ports: []v1.ContainerPort{{ContainerPort: 80}}, Ports: []v1.ContainerPort{{ContainerPort: 80}},
}, },
}, },
...@@ -70,7 +70,7 @@ func testingPod(name, value string) v1.Pod { ...@@ -70,7 +70,7 @@ func testingPod(name, value string) v1.Pod {
Containers: []v1.Container{ Containers: []v1.Container{
{ {
Name: "nginx", Name: "nginx",
Image: imageutils.GetE2EImage(imageutils.NginxSlim), Image: imageutils.GetE2EImage(imageutils.Nginx),
Ports: []v1.ContainerPort{{ContainerPort: 80}}, Ports: []v1.ContainerPort{{ContainerPort: 80}},
LivenessProbe: &v1.Probe{ LivenessProbe: &v1.Probe{
Handler: v1.Handler{ Handler: v1.Handler{
......
test/e2e/apps/statefulset.go
View file @ 1f7f33aa
...@@ -709,7 +709,7 @@ var _ = SIGDescribe("StatefulSet", func() { ...@@ -709,7 +709,7 @@ var _ = SIGDescribe("StatefulSet", func() {
Containers: []v1.Container{ Containers: []v1.Container{
{ {
Name: "nginx", Name: "nginx",
Image: imageutils.GetE2EImage(imageutils.NginxSlim), Image: imageutils.GetE2EImage(imageutils.Nginx),
Ports: []v1.ContainerPort{conflictingPort}, Ports: []v1.ContainerPort{conflictingPort},
}, },
}, },
......
test/e2e/apps/types.go
View file @ 1f7f33aa
...@@ -31,7 +31,7 @@ var ( ...@@ -31,7 +31,7 @@ var (
CronJobGroupVersionResourceBeta = schema.GroupVersionResource{Group: "batch", Version: "v1beta1", Resource: "cronjobs"} CronJobGroupVersionResourceBeta = schema.GroupVersionResource{Group: "batch", Version: "v1beta1", Resource: "cronjobs"}
NautilusImage = imageutils.GetE2EImage(imageutils.Nautilus) NautilusImage = imageutils.GetE2EImage(imageutils.Nautilus)
KittenImage = imageutils.GetE2EImage(imageutils.Kitten) KittenImage = imageutils.GetE2EImage(imageutils.Kitten)
NginxImage = imageutils.GetE2EImage(imageutils.NginxSlim) NginxImage = imageutils.GetE2EImage(imageutils.Nginx)
NewNginxImage = imageutils.GetE2EImage(imageutils.NginxSlimNew) NewNginxImage = imageutils.GetE2EImage(imageutils.NginxNew)
RedisImage = imageutils.GetE2EImage(imageutils.Redis) RedisImage = imageutils.GetE2EImage(imageutils.Redis)
) )
test/e2e/common/container_probe.go
View file @ 1f7f33aa
...@@ -253,7 +253,7 @@ var _ = framework.KubeDescribe("Probing container", func() { ...@@ -253,7 +253,7 @@ var _ = framework.KubeDescribe("Probing container", func() {
Containers: []v1.Container{ Containers: []v1.Container{
{ {
Name: "liveness", Name: "liveness",
Image: imageutils.GetE2EImage(imageutils.NginxSlim), Image: imageutils.GetE2EImage(imageutils.Nginx),
Ports: []v1.ContainerPort{{ContainerPort: 80}}, Ports: []v1.ContainerPort{{ContainerPort: 80}},
LivenessProbe: &v1.Probe{ LivenessProbe: &v1.Probe{
Handler: v1.Handler{ Handler: v1.Handler{
......
test/e2e/common/pods.go
View file @ 1f7f33aa
...@@ -171,7 +171,7 @@ var _ = framework.KubeDescribe("Pods", func() { ...@@ -171,7 +171,7 @@ var _ = framework.KubeDescribe("Pods", func() {
Containers: []v1.Container{ Containers: []v1.Container{
{ {
Name: "nginx", Name: "nginx",
Image: imageutils.GetE2EImage(imageutils.NginxSlim), Image: imageutils.GetE2EImage(imageutils.Nginx),
}, },
}, },
}, },
...@@ -297,7 +297,7 @@ var _ = framework.KubeDescribe("Pods", func() { ...@@ -297,7 +297,7 @@ var _ = framework.KubeDescribe("Pods", func() {
Containers: []v1.Container{ Containers: []v1.Container{
{ {
Name: "nginx", Name: "nginx",
Image: imageutils.GetE2EImage(imageutils.NginxSlim), Image: imageutils.GetE2EImage(imageutils.Nginx),
}, },
}, },
}, },
...@@ -351,7 +351,7 @@ var _ = framework.KubeDescribe("Pods", func() { ...@@ -351,7 +351,7 @@ var _ = framework.KubeDescribe("Pods", func() {
Containers: []v1.Container{ Containers: []v1.Container{
{ {
Name: "nginx", Name: "nginx",
Image: imageutils.GetE2EImage(imageutils.NginxSlim), Image: imageutils.GetE2EImage(imageutils.Nginx),
}, },
}, },
}, },
...@@ -623,7 +623,7 @@ var _ = framework.KubeDescribe("Pods", func() { ...@@ -623,7 +623,7 @@ var _ = framework.KubeDescribe("Pods", func() {
By("updating the image") By("updating the image")
podClient.Update(podName, func(pod *v1.Pod) { 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) time.Sleep(syncLoopFrequency)
......
test/e2e/common/util.go
View file @ 1f7f33aa
...@@ -59,7 +59,7 @@ var CommonImageWhiteList = sets.NewString( ...@@ -59,7 +59,7 @@ var CommonImageWhiteList = sets.NewString(
imageutils.GetE2EImage(imageutils.Mounttest), imageutils.GetE2EImage(imageutils.Mounttest),
imageutils.GetE2EImage(imageutils.MounttestUser), imageutils.GetE2EImage(imageutils.MounttestUser),
imageutils.GetE2EImage(imageutils.Netexec), imageutils.GetE2EImage(imageutils.Netexec),
imageutils.GetE2EImage(imageutils.NginxSlim), imageutils.GetE2EImage(imageutils.Nginx),
imageutils.GetE2EImage(imageutils.ServeHostname), imageutils.GetE2EImage(imageutils.ServeHostname),
imageutils.GetE2EImage(imageutils.TestWebserver), imageutils.GetE2EImage(imageutils.TestWebserver),
imageutils.GetE2EImage(imageutils.Hostexec), imageutils.GetE2EImage(imageutils.Hostexec),
......
test/e2e/framework/rc_util.go
View file @ 1f7f33aa
...@@ -216,6 +216,13 @@ func WaitForReplicationControllerwithSelector(c clientset.Interface, namespace s ...@@ -216,6 +216,13 @@ func WaitForReplicationControllerwithSelector(c clientset.Interface, namespace s
return nil 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. // validatorFn is the function which is individual tests will implement.
// we may want it to return more than just an error, at some point. // we may want it to return more than just an error, at some point.
type validatorFn func(c clientset.Interface, podID string) error type validatorFn func(c clientset.Interface, podID string) error
...@@ -227,6 +234,7 @@ 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. // "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. // "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) { 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}}" getPodsTemplate := "--template={{range.items}}{{.metadata.name}} {{end}}"
// NB: kubectl adds the "exists" function to the standard template functions. // 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 // This lets us check to see if the "running" entry exists for each of the containers
...@@ -258,6 +266,7 @@ waitLoop: ...@@ -258,6 +266,7 @@ waitLoop:
} }
currentImage := RunKubectlOrDie("get", "pods", podID, "-o", "template", getImageTemplate, fmt.Sprintf("--namespace=%v", ns)) currentImage := RunKubectlOrDie("get", "pods", podID, "-o", "template", getImageTemplate, fmt.Sprintf("--namespace=%v", ns))
currentImage = trimDockerIO(currentImage)
if currentImage != containerImage { if currentImage != containerImage {
Logf("%s is created but running wrong image; expected: %s, actual: %s", podID, containerImage, currentImage) Logf("%s is created but running wrong image; expected: %s, actual: %s", podID, containerImage, currentImage)
continue waitLoop continue waitLoop
......
test/e2e/framework/statefulset_utils.go
View file @ 1f7f33aa
...@@ -810,7 +810,7 @@ func NewStatefulSet(name, ns, governingSvcName string, replicas int32, statefulP ...@@ -810,7 +810,7 @@ func NewStatefulSet(name, ns, governingSvcName string, replicas int32, statefulP
Containers: []v1.Container{ Containers: []v1.Container{
{ {
Name: "nginx", Name: "nginx",
Image: imageutils.GetE2EImage(imageutils.NginxSlim), Image: imageutils.GetE2EImage(imageutils.Nginx),
VolumeMounts: mounts, VolumeMounts: mounts,
}, },
}, },
......
test/e2e/kubectl/kubectl.go
View file @ 1f7f33aa
...@@ -93,15 +93,15 @@ var ( ...@@ -93,15 +93,15 @@ var (
nautilusImage = imageutils.GetE2EImage(imageutils.Nautilus) nautilusImage = imageutils.GetE2EImage(imageutils.Nautilus)
kittenImage = imageutils.GetE2EImage(imageutils.Kitten) kittenImage = imageutils.GetE2EImage(imageutils.Kitten)
redisImage = imageutils.GetE2EImage(imageutils.Redis) redisImage = imageutils.GetE2EImage(imageutils.Redis)
nginxImage = imageutils.GetE2EImage(imageutils.NginxSlim) nginxImage = imageutils.GetE2EImage(imageutils.Nginx)
busyboxImage = "busybox" busyboxImage = "busybox"
) )
var testImages = struct { var testImages = struct {
GBFrontendImage string GBFrontendImage string
PauseImage string PauseImage string
NginxSlimImage string NginxImage string
NginxSlimNewImage string NginxNewImage string
RedisImage string RedisImage string
GBRedisSlaveImage string GBRedisSlaveImage string
NautilusImage string NautilusImage string
...@@ -109,8 +109,8 @@ var testImages = struct { ...@@ -109,8 +109,8 @@ var testImages = struct {
}{ }{
imageutils.GetE2EImage(imageutils.GBFrontend), imageutils.GetE2EImage(imageutils.GBFrontend),
imageutils.GetE2EImage(imageutils.Pause), imageutils.GetE2EImage(imageutils.Pause),
imageutils.GetE2EImage(imageutils.NginxSlim), imageutils.GetE2EImage(imageutils.Nginx),
imageutils.GetE2EImage(imageutils.NginxSlimNew), imageutils.GetE2EImage(imageutils.NginxNew),
imageutils.GetE2EImage(imageutils.Redis), imageutils.GetE2EImage(imageutils.Redis),
imageutils.GetE2EImage(imageutils.GBRedisSlave), imageutils.GetE2EImage(imageutils.GBRedisSlave),
imageutils.GetE2EImage(imageutils.Nautilus), imageutils.GetE2EImage(imageutils.Nautilus),
...@@ -428,7 +428,7 @@ var _ = SIGDescribe("Kubectl client", func() { ...@@ -428,7 +428,7 @@ var _ = SIGDescribe("Kubectl client", func() {
defer closer.Close() defer closer.Close()
By("executing a command in the container with pseudo-interactive stdin") 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). WithStdinReader(r).
ExecOrDie() ExecOrDie()
if e, a := "hi", strings.TrimSpace(execOutput); e != a { if e, a := "hi", strings.TrimSpace(execOutput); e != a {
...@@ -819,7 +819,7 @@ metadata: ...@@ -819,7 +819,7 @@ metadata:
By("verify replicas still is 3 and image has been updated") By("verify replicas still is 3 and image has been updated")
output = framework.RunKubectlOrDieInput(deployment3Yaml, "get", "-f", "-", nsFlag, "-o", "json") 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 { for _, item := range requiredItems {
if !strings.Contains(output, item) { if !strings.Contains(output, item) {
framework.Failf("Missing %s in kubectl apply", item) framework.Failf("Missing %s in kubectl apply", item)
......
test/e2e/node/pods.go
View file @ 1f7f33aa
...@@ -68,7 +68,7 @@ var _ = SIGDescribe("Pods Extended", func() { ...@@ -68,7 +68,7 @@ var _ = SIGDescribe("Pods Extended", func() {
Containers: []v1.Container{ Containers: []v1.Container{
{ {
Name: "nginx", Name: "nginx",
Image: imageutils.GetE2EImage(imageutils.NginxSlim), Image: imageutils.GetE2EImage(imageutils.Nginx),
}, },
}, },
}, },
...@@ -223,7 +223,7 @@ var _ = SIGDescribe("Pods Extended", func() { ...@@ -223,7 +223,7 @@ var _ = SIGDescribe("Pods Extended", func() {
Containers: []v1.Container{ Containers: []v1.Container{
{ {
Name: "nginx", Name: "nginx",
Image: imageutils.GetE2EImage(imageutils.NginxSlim), Image: imageutils.GetE2EImage(imageutils.Nginx),
Resources: v1.ResourceRequirements{ Resources: v1.ResourceRequirements{
Limits: v1.ResourceList{ Limits: v1.ResourceList{
v1.ResourceCPU: resource.MustParse("100m"), v1.ResourceCPU: resource.MustParse("100m"),
......
test/e2e/servicecatalog/podpreset.go
View file @ 1f7f33aa
...@@ -96,7 +96,7 @@ var _ = SIGDescribe("[Feature:PodPreset] PodPreset", func() { ...@@ -96,7 +96,7 @@ var _ = SIGDescribe("[Feature:PodPreset] PodPreset", func() {
Containers: []v1.Container{ Containers: []v1.Container{
{ {
Name: "nginx", Name: "nginx",
Image: imageutils.GetE2EImage(imageutils.NginxSlim), Image: imageutils.GetE2EImage(imageutils.Nginx),
}, },
}, },
}, },
...@@ -204,7 +204,7 @@ var _ = SIGDescribe("[Feature:PodPreset] PodPreset", func() { ...@@ -204,7 +204,7 @@ var _ = SIGDescribe("[Feature:PodPreset] PodPreset", func() {
Containers: []v1.Container{ Containers: []v1.Container{
{ {
Name: "nginx", Name: "nginx",
Image: imageutils.GetE2EImage(imageutils.NginxSlim), Image: imageutils.GetE2EImage(imageutils.Nginx),
Env: []v1.EnvVar{{Name: "abc", Value: "value2"}, {Name: "ABC", Value: "value"}}, Env: []v1.EnvVar{{Name: "abc", Value: "value2"}, {Name: "ABC", Value: "value"}},
}, },
}, },
......
test/e2e/storage/persistent_volumes-local.go
View file @ 1f7f33aa
...@@ -1240,7 +1240,7 @@ func makeLocalPod(config *localTestConfig, volume *localTestVolume, cmd string) ...@@ -1240,7 +1240,7 @@ func makeLocalPod(config *localTestConfig, volume *localTestVolume, cmd string)
} }
if volume.localVolumeType == BlockLocalVolumeType { if volume.localVolumeType == BlockLocalVolumeType {
// Block e2e tests require utilities for writing to block devices (e.g. dd), and nginx has this utilites. // 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 return pod
} }
...@@ -1864,7 +1864,7 @@ func createStatefulSet(config *localTestConfig, ssReplicas int32, volumeCount in ...@@ -1864,7 +1864,7 @@ func createStatefulSet(config *localTestConfig, ssReplicas int32, volumeCount in
Containers: []v1.Container{ Containers: []v1.Container{
{ {
Name: "nginx", Name: "nginx",
Image: imageutils.GetE2EImage(imageutils.NginxSlim), Image: imageutils.GetE2EImage(imageutils.Nginx),
VolumeMounts: mounts, VolumeMounts: mounts,
}, },
}, },
......
test/e2e/storage/persistent_volumes.go
View file @ 1f7f33aa
...@@ -407,7 +407,7 @@ func makeStatefulSetWithPVCs(ns, cmd string, mounts []v1.VolumeMount, claims []v ...@@ -407,7 +407,7 @@ func makeStatefulSetWithPVCs(ns, cmd string, mounts []v1.VolumeMount, claims []v
Containers: []v1.Container{ Containers: []v1.Container{
{ {
Name: "nginx", Name: "nginx",
Image: imageutils.GetE2EImage(imageutils.NginxSlim), Image: imageutils.GetE2EImage(imageutils.Nginx),
Command: []string{"/bin/sh"}, Command: []string{"/bin/sh"},
Args: []string{"-c", cmd}, Args: []string{"-c", cmd},
VolumeMounts: mounts, VolumeMounts: mounts,
......
test/e2e/testing-manifests/kubectl/nginx-deployment1.yaml.in
View file @ 1f7f33aa
...@@ -14,6 +14,6 @@ spec: ...@@ -14,6 +14,6 @@ spec:
spec: spec:
containers: containers:
- name: nginx - name: nginx
image: {{.NginxSlimNewImage}} image: {{.NginxNewImage}}
ports: ports:
- containerPort: 80 - containerPort: 80
test/e2e/testing-manifests/kubectl/nginx-deployment2.yaml.in
View file @ 1f7f33aa
...@@ -13,6 +13,6 @@ spec: ...@@ -13,6 +13,6 @@ spec:
spec: spec:
containers: containers:
- name: nginx - name: nginx
image: {{.NginxSlimNewImage}} image: {{.NginxNewImage}}
ports: ports:
- containerPort: 80 - containerPort: 80
test/e2e/testing-manifests/kubectl/nginx-deployment3.yaml.in
View file @ 1f7f33aa
...@@ -13,6 +13,6 @@ spec: ...@@ -13,6 +13,6 @@ spec:
spec: spec:
containers: containers:
- name: nginx - name: nginx
image: {{.NginxSlimImage}} image: {{.NginxImage}}
ports: ports:
- containerPort: 80 - containerPort: 80
test/e2e/testing-manifests/kubectl/pod-with-readiness-probe.yaml.in
View file @ 1f7f33aa
...@@ -7,7 +7,7 @@ metadata: ...@@ -7,7 +7,7 @@ metadata:
spec: spec:
containers: containers:
- name: nginx - name: nginx
image: {{.NginxSlimImage}} image: {{.NginxImage}}
ports: ports:
- containerPort: 80 - containerPort: 80
readinessProbe: readinessProbe:
......
test/e2e/upgrades/apps/deployments.go
View file @ 1f7f33aa
...@@ -51,7 +51,7 @@ func (DeploymentUpgradeTest) Name() string { return "[sig-apps] deployment-upgra ...@@ -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. // Setup creates a deployment and makes sure it has a new and an old replicaset running.
func (t *DeploymentUpgradeTest) Setup(f *framework.Framework) { func (t *DeploymentUpgradeTest) Setup(f *framework.Framework) {
c := f.ClientSet c := f.ClientSet
nginxImage := imageutils.GetE2EImage(imageutils.NginxSlim) nginxImage := imageutils.GetE2EImage(imageutils.Nginx)
ns := f.Namespace.Name ns := f.Namespace.Name
deploymentClient := c.AppsV1().Deployments(ns) deploymentClient := c.AppsV1().Deployments(ns)
......
test/e2e/upgrades/apps/replicasets.go
View file @ 1f7f33aa
...@@ -50,7 +50,7 @@ func (ReplicaSetUpgradeTest) Name() string { return "[sig-apps] replicaset-upgra ...@@ -50,7 +50,7 @@ func (ReplicaSetUpgradeTest) Name() string { return "[sig-apps] replicaset-upgra
func (r *ReplicaSetUpgradeTest) Setup(f *framework.Framework) { func (r *ReplicaSetUpgradeTest) Setup(f *framework.Framework) {
c := f.ClientSet c := f.ClientSet
ns := f.Namespace.Name 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)) By(fmt.Sprintf("Creating replicaset %s in namespace %s", rsName, ns))
replicaSet := framework.NewReplicaSet(rsName, ns, 1, map[string]string{"test": "upgrade"}, "nginx", nginxImage) replicaSet := framework.NewReplicaSet(rsName, ns, 1, map[string]string{"test": "upgrade"}, "nginx", nginxImage)
......
test/e2e_node/container_manager_test.go
View file @ 1f7f33aa
...@@ -178,7 +178,7 @@ var _ = framework.KubeDescribe("Container Manager Misc [Serial]", func() { ...@@ -178,7 +178,7 @@ var _ = framework.KubeDescribe("Container Manager Misc [Serial]", func() {
Spec: v1.PodSpec{ Spec: v1.PodSpec{
Containers: []v1.Container{ Containers: []v1.Container{
{ {
Image: imageutils.GetE2EImage(imageutils.NginxSlim), Image: imageutils.GetE2EImage(imageutils.Nginx),
Name: podName, Name: podName,
Resources: v1.ResourceRequirements{ Resources: v1.ResourceRequirements{
Limits: v1.ResourceList{ Limits: v1.ResourceList{
......
test/e2e_node/docker_test.go
View file @ 1f7f33aa
...@@ -61,7 +61,7 @@ var _ = framework.KubeDescribe("Docker features [Feature:Docker][Legacy:Docker]" ...@@ -61,7 +61,7 @@ var _ = framework.KubeDescribe("Docker features [Feature:Docker][Legacy:Docker]"
Spec: v1.PodSpec{ Spec: v1.PodSpec{
Containers: []v1.Container{{ Containers: []v1.Container{{
Name: containerName, Name: containerName,
Image: imageutils.GetE2EImage(imageutils.NginxSlim), Image: imageutils.GetE2EImage(imageutils.Nginx),
}}, }},
}, },
}) })
......
test/e2e_node/image_list.go
View file @ 1f7f33aa
...@@ -47,7 +47,7 @@ var NodeImageWhiteList = sets.NewString( ...@@ -47,7 +47,7 @@ var NodeImageWhiteList = sets.NewString(
busyboxImage, busyboxImage,
"k8s.gcr.io/busybox@sha256:4bdd623e848417d96127e16037743f0cd8b528c026e9175e22a84f639eca58ff", "k8s.gcr.io/busybox@sha256:4bdd623e848417d96127e16037743f0cd8b528c026e9175e22a84f639eca58ff",
"k8s.gcr.io/node-problem-detector:v0.4.1", "k8s.gcr.io/node-problem-detector:v0.4.1",
imageutils.GetE2EImage(imageutils.NginxSlim), imageutils.GetE2EImage(imageutils.Nginx),
imageutils.GetE2EImage(imageutils.ServeHostname), imageutils.GetE2EImage(imageutils.ServeHostname),
imageutils.GetE2EImage(imageutils.Netexec), imageutils.GetE2EImage(imageutils.Netexec),
imageutils.GetE2EImage(imageutils.Nonewprivs), imageutils.GetE2EImage(imageutils.Nonewprivs),
......
test/e2e_node/mirror_pod_test.go
View file @ 1f7f33aa
...@@ -49,7 +49,7 @@ var _ = framework.KubeDescribe("MirrorPod", func() { ...@@ -49,7 +49,7 @@ var _ = framework.KubeDescribe("MirrorPod", func() {
By("create the static pod") By("create the static pod")
err := createStaticPod(podPath, staticPodName, ns, err := createStaticPod(podPath, staticPodName, ns,
imageutils.GetE2EImage(imageutils.NginxSlim), v1.RestartPolicyAlways) imageutils.GetE2EImage(imageutils.Nginx), v1.RestartPolicyAlways)
Expect(err).ShouldNot(HaveOccurred()) Expect(err).ShouldNot(HaveOccurred())
By("wait for the mirror pod to be running") By("wait for the mirror pod to be running")
......
test/e2e_node/security_context_test.go
View file @ 1f7f33aa
...@@ -146,7 +146,7 @@ var _ = framework.KubeDescribe("Security Context", func() { ...@@ -146,7 +146,7 @@ var _ = framework.KubeDescribe("Security Context", func() {
BeforeEach(func() { BeforeEach(func() {
nginxPodName := "nginx-hostpid-" + string(uuid.NewUUID()) nginxPodName := "nginx-hostpid-" + string(uuid.NewUUID())
podClient.CreateSync(makeHostPidPod(nginxPodName, podClient.CreateSync(makeHostPidPod(nginxPodName,
imageutils.GetE2EImage(imageutils.NginxSlim), imageutils.GetE2EImage(imageutils.Nginx),
nil, nil,
true, true,
)) ))
......
test/utils/image/manifest.go
View file @ 1f7f33aa
...@@ -22,10 +22,11 @@ import ( ...@@ -22,10 +22,11 @@ import (
) )
const ( const (
e2eRegistry = "gcr.io/kubernetes-e2e-test-images" dockerHubRegistry = "docker.io"
gcRegistry = "k8s.gcr.io" e2eRegistry = "gcr.io/kubernetes-e2e-test-images"
PrivateRegistry = "gcr.io/k8s-authenticated-test" gcRegistry = "k8s.gcr.io"
sampleRegistry = "gcr.io/google-samples" PrivateRegistry = "gcr.io/k8s-authenticated-test"
sampleRegistry = "gcr.io/google-samples"
) )
type ImageConfig struct { type ImageConfig struct {
...@@ -73,8 +74,8 @@ var ( ...@@ -73,8 +74,8 @@ var (
Net = ImageConfig{e2eRegistry, "net", "1.0", false} Net = ImageConfig{e2eRegistry, "net", "1.0", false}
Netexec = ImageConfig{e2eRegistry, "netexec", "1.0", false} Netexec = ImageConfig{e2eRegistry, "netexec", "1.0", false}
Nettest = ImageConfig{e2eRegistry, "nettest", "1.0", false} Nettest = ImageConfig{e2eRegistry, "nettest", "1.0", false}
NginxSlim = ImageConfig{gcRegistry, "nginx-slim", "0.20", true} Nginx = ImageConfig{dockerHubRegistry, "nginx", "1.14-alpine", false}
NginxSlimNew = ImageConfig{gcRegistry, "nginx-slim", "0.21", true} NginxNew = ImageConfig{dockerHubRegistry, "nginx", "1.15-alpine", false}
Nonewprivs = ImageConfig{e2eRegistry, "nonewprivs", "1.0", false} Nonewprivs = ImageConfig{e2eRegistry, "nonewprivs", "1.0", false}
NoSnatTest = ImageConfig{e2eRegistry, "no-snat-test", "1.0", false} NoSnatTest = ImageConfig{e2eRegistry, "no-snat-test", "1.0", false}
NoSnatTestProxy = ImageConfig{e2eRegistry, "no-snat-test-proxy", "1.0", false} NoSnatTestProxy = ImageConfig{e2eRegistry, "no-snat-test-proxy", "1.0", false}
...@@ -102,7 +103,6 @@ func GetE2EImageWithArch(image ImageConfig, arch string) string { ...@@ -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) return fmt.Sprintf("%s/%s-%s:%s", image.registry, image.name, arch, image.version)
} else { } else {
return fmt.Sprintf("%s/%s:%s", image.registry, image.name, image.version) return fmt.Sprintf("%s/%s:%s", image.registry, image.name, image.version)
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment