Merge pull request kubernetes#75244 from aojea/e2e_ipv6_health

k8s-ci-robot · web-flow · commit 462d909f6d56 · 2019-04-17T13:40:04.000-07:00
Add ipv6 support to the e2e healthz test
diff --git a/test/e2e/common/container_probe.go b/test/e2e/common/container_probe.go
@@ -255,7 +255,7 @@ var _ = framework.KubeDescribe("Probing container", func() {
 				Containers: []v1.Container{
 					{
 						Name:  "liveness",
-						Image: imageutils.GetE2EImage(imageutils.Nginx),
+						Image: imageutils.GetE2EImage(imageutils.TestWebserver),
 						Ports: []v1.ContainerPort{{ContainerPort: 80}},
 						LivenessProbe: &v1.Probe{
 							Handler: v1.Handler{

Original file line number	Diff line number	Diff line change
`@@ -255,7 +255,7 @@ var _ = framework.KubeDescribe("Probing container", func() {`
`255`	`255`	`Containers: []v1.Container{`
`256`	`256`	`{`
`257`	`257`	`Name: "liveness",`
`258`		`- Image: imageutils.GetE2EImage(imageutils.Nginx),`
	`258`	`+ Image: imageutils.GetE2EImage(imageutils.TestWebserver),`
`259`	`259`	`Ports: []v1.ContainerPort{{ContainerPort: 80}},`
`260`	`260`	`LivenessProbe: &v1.Probe{`
`261`	`261`	`Handler: v1.Handler{`