diff --git a/test/conformance/testdata/conformance.yaml b/test/conformance/testdata/conformance.yaml index 4d483a74328..587c5048ddf 100755 --- a/test/conformance/testdata/conformance.yaml +++ b/test/conformance/testdata/conformance.yaml @@ -335,6 +335,14 @@ restart count to 1. release: v1.9 file: test/e2e/common/container_probe.go +- testname: Pod liveness probe, container exec timeout, restart + codename: '[k8s.io] Probing container should be restarted with an exec liveness + probe with timeout [NodeConformance] [Conformance]' + description: A Pod is created with liveness probe with a Exec action on the Pod. + If the liveness probe call does not return within the timeout specified, liveness + probe MUST restart the Pod. + release: v1.9 + file: test/e2e/common/container_probe.go - testname: Pod liveness probe, using http endpoint, multiple restarts (slow) codename: '[k8s.io] Probing container should have monotonically increasing restart count [NodeConformance] [Conformance]' @@ -347,6 +355,14 @@ everytime health check fails, measure upto 5 restart. release: v1.9 file: test/e2e/common/container_probe.go +- testname: Pod readiness probe, container exec timeout, not ready + codename: '[k8s.io] Probing container should not be ready with an exec readiness + probe timeout [NodeConformance] [Conformance]' + description: A Pod is created with readiness probe with a Exec action on the Pod. + If the readiness probe call does not return within the timeout specified, readiness + probe MUST not be Ready. + release: v1.20 + file: test/e2e/common/container_probe.go - testname: Pod readiness probe, with initial delay codename: '[k8s.io] Probing container with readiness probe should not be ready before initial delay and never restart [NodeConformance] [Conformance]' diff --git a/test/e2e/common/container_probe.go b/test/e2e/common/container_probe.go index 791996fba58..943ff6dca85 100644 --- a/test/e2e/common/container_probe.go +++ b/test/e2e/common/container_probe.go @@ -210,10 +210,10 @@ var _ = framework.KubeDescribe("Probing container", func() { /* Release: v1.9 - Testname: Pod liveness probe, docker exec, restart - Description: A Pod is created with liveness probe with a Exec action on the Pod. If the liveness probe call does not return within the timeout specified, liveness probe MUST restart the Pod. + Testname: Pod liveness probe, container exec timeout, restart + Description: A Pod is created with liveness probe with a Exec action on the Pod. If the liveness probe call does not return within the timeout specified, liveness probe MUST restart the Pod. */ - ginkgo.It("should be restarted with an exec liveness probe with timeout [NodeConformance]", func() { + framework.ConformanceIt("should be restarted with an exec liveness probe with timeout [NodeConformance]", func() { cmd := []string{"/bin/sh", "-c", "sleep 600"} livenessProbe := &v1.Probe{ Handler: execHandler([]string{"/bin/sh", "-c", "sleep 10"}), @@ -227,10 +227,10 @@ var _ = framework.KubeDescribe("Probing container", func() { /* Release: v1.20 - Testname: Pod readiness probe, docker exec, not ready + Testname: Pod readiness probe, container exec timeout, not ready Description: A Pod is created with readiness probe with a Exec action on the Pod. If the readiness probe call does not return within the timeout specified, readiness probe MUST not be Ready. */ - ginkgo.It("should not be ready with an exec readiness probe timeout [NodeConformance]", func() { + framework.ConformanceIt("should not be ready with an exec readiness probe timeout [NodeConformance]", func() { cmd := []string{"/bin/sh", "-c", "sleep 600"} readinessProbe := &v1.Probe{ Handler: execHandler([]string{"/bin/sh", "-c", "sleep 10"}),