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

Merge pull request #97619 from andrewsykim/conformance-probe-tests

Browse Source 
conformance: promote container exec probe timeout tests
This commit is contained in:
Kubernetes Prow Robot 2021-02-23 22:56:49 -08:00 committed by GitHub
commit 9a8da9ee43
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 21 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -335,6 +335,14 @@
restart count to 1. restart count to 1.
release: v1.9 release: v1.9
file: test/e2e/common/container_probe.go 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) - testname: Pod liveness probe, using http endpoint, multiple restarts (slow)
codename: '[k8s.io] Probing container should have monotonically increasing restart codename: '[k8s.io] Probing container should have monotonically increasing restart
count [NodeConformance] [Conformance]' count [NodeConformance] [Conformance]'
@ -347,6 +355,14 @@
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/container_probe.go 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 - testname: Pod readiness probe, with initial delay
codename: '[k8s.io] Probing container with readiness probe should not be ready before codename: '[k8s.io] Probing container with readiness probe should not be ready before
initial delay and never restart [NodeConformance] [Conformance]' initial delay and never restart [NodeConformance] [Conformance]'

10
test/e2e/common/container_probe.go
View File

@ -210,10 +210,10 @@ var _ = framework.KubeDescribe("Probing container", func() {
/* /*
Release: v1.9 Release: v1.9
Testname: Pod liveness probe, docker exec, 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.
*/ */
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"} 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"}),
@ -227,10 +227,10 @@ var _ = framework.KubeDescribe("Probing container", func() {
/* /*
Release: v1.20 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. 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"} 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"}),