github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-31 07:20:13 +00:00
Code Issues Projects Releases Wiki Activity

Revert : conformance: promote container exec probe timeout tests

Browse Source 
Reverting af3e118b1f and
2242d0ffc4 as these tests fail when
ExecProbeTimeout feature gate is turned on.

Signed-off-by: Davanum Srinivas <davanum@gmail.com>
This commit is contained in:
Davanum Srinivas 2021-03-09 17:05:00 -05:00
parent 2bcbc527a7
commit ecc8de7083
No known key found for this signature in database
GPG Key ID: 80D83A796103BF59
2 changed files with 2 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
test/conformance/testdata/conformance.yaml vendored
View File

@ -1950,14 +1950,6 @@
restart count to 1. restart count to 1.
release: v1.9 release: v1.9
file: test/e2e/common/node/container_probe.go file: test/e2e/common/node/container_probe.go
- testname: Pod liveness probe, container exec timeout, restart
codename: '[sig-node] 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/node/container_probe.go
- testname: Pod liveness probe, using http endpoint, multiple restarts (slow) - testname: Pod liveness probe, using http endpoint, multiple restarts (slow)
codename: '[sig-node] Probing container should have monotonically increasing restart codename: '[sig-node] Probing container should have monotonically increasing restart
count [NodeConformance] [Conformance]' count [NodeConformance] [Conformance]'
@ -1970,14 +1962,6 @@
everytime health check fails, measure upto 5 restart. everytime health check fails, measure upto 5 restart.
release: v1.9 release: v1.9
file: test/e2e/common/node/container_probe.go file: test/e2e/common/node/container_probe.go
- testname: Pod readiness probe, container exec timeout, not ready
codename: '[sig-node] 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/node/container_probe.go
- testname: Pod readiness probe, with initial delay - testname: Pod readiness probe, with initial delay
codename: '[sig-node] Probing container with readiness probe should not be ready codename: '[sig-node] Probing container with readiness probe should not be ready
before initial delay and never restart [NodeConformance] [Conformance]' before initial delay and never restart [NodeConformance] [Conformance]'

4
test/e2e/common/node/container_probe.go
View File

@ -213,7 +213,7 @@ var _ = SIGDescribe("Probing container", func() {
Testname: Pod liveness probe, container exec timeout, restart 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. 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.
*/ */
framework.ConformanceIt("should be restarted with an exec liveness probe with timeout [NodeConformance]", func() { ginkgo.It("should be restarted with an exec liveness probe with timeout [NodeConformance]", func() {
cmd := []string{"/bin/sh", "-c", "sleep 600"} cmd := []string{"/bin/sh", "-c", "sleep 600"}
livenessProbe := &v1.Probe{ livenessProbe := &v1.Probe{
Handler: execHandler([]string{"/bin/sh", "-c", "sleep 10"}), Handler: execHandler([]string{"/bin/sh", "-c", "sleep 10"}),
@ -230,7 +230,7 @@ var _ = SIGDescribe("Probing container", func() {
Testname: Pod readiness probe, container exec timeout, 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. 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.
*/ */
framework.ConformanceIt("should not be ready with an exec readiness probe timeout [NodeConformance]", func() { ginkgo.It("should not be ready with an exec readiness probe timeout [NodeConformance]", func() {
cmd := []string{"/bin/sh", "-c", "sleep 600"} cmd := []string{"/bin/sh", "-c", "sleep 600"}
readinessProbe := &v1.Probe{ readinessProbe := &v1.Probe{
Handler: execHandler([]string{"/bin/sh", "-c", "sleep 10"}), Handler: execHandler([]string{"/bin/sh", "-c", "sleep 10"}),