github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-14 06:15:45 +00:00
Code Issues Projects Releases Wiki Activity

cleanup: promote ProbeTerminationGracePeriod to conformance tests

Browse Source
This commit is contained in:
Paco Xu 2023-02-27 11:37:49 +08:00
parent af9f7a4d90
commit efee9b4866
2 changed files with 18 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2232,6 +2232,22 @@
every time health check fails, measure up to 5 restart. every time health check fails, measure up to 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: Set terminationGracePeriodSeconds for livenessProbe
codename: '[sig-node] Probing container should override timeoutGracePeriodSeconds
when LivenessProbe field is set [Conformance]'
description: A pod with a long terminationGracePeriod is created with a shorter
livenessProbe-level terminationGracePeriodSeconds. We confirm the shorter termination
period is used.
release: v1.21
file: test/e2e/common/node/container_probe.go
- testname: Set terminationGracePeriodSeconds for startupProbe
codename: '[sig-node] Probing container should override timeoutGracePeriodSeconds
when StartupProbe field is set [Conformance]'
description: A pod with a long terminationGracePeriod is created with a shorter
startupProbe-level terminationGracePeriodSeconds. We confirm the shorter termination
period is used.
release: v1.21
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

@ -459,7 +459,7 @@ var _ = SIGDescribe("Probing container", func() {
Testname: Set terminationGracePeriodSeconds for livenessProbe Testname: Set terminationGracePeriodSeconds for livenessProbe
Description: A pod with a long terminationGracePeriod is created with a shorter livenessProbe-level terminationGracePeriodSeconds. We confirm the shorter termination period is used. Description: A pod with a long terminationGracePeriod is created with a shorter livenessProbe-level terminationGracePeriodSeconds. We confirm the shorter termination period is used.
*/ */
ginkgo.It("should override timeoutGracePeriodSeconds when LivenessProbe field is set [Feature:ProbeTerminationGracePeriod]", func(ctx context.Context) { framework.ConformanceIt("should override timeoutGracePeriodSeconds when LivenessProbe field is set", func(ctx context.Context) {
pod := e2epod.NewAgnhostPod(f.Namespace.Name, "liveness-override-"+string(uuid.NewUUID()), nil, nil, nil, "/bin/sh", "-c", "sleep 1000") pod := e2epod.NewAgnhostPod(f.Namespace.Name, "liveness-override-"+string(uuid.NewUUID()), nil, nil, nil, "/bin/sh", "-c", "sleep 1000")
longGracePeriod := int64(500) longGracePeriod := int64(500)
pod.Spec.TerminationGracePeriodSeconds = &longGracePeriod pod.Spec.TerminationGracePeriodSeconds = &longGracePeriod
@ -487,7 +487,7 @@ var _ = SIGDescribe("Probing container", func() {
Testname: Set terminationGracePeriodSeconds for startupProbe Testname: Set terminationGracePeriodSeconds for startupProbe
Description: A pod with a long terminationGracePeriod is created with a shorter startupProbe-level terminationGracePeriodSeconds. We confirm the shorter termination period is used. Description: A pod with a long terminationGracePeriod is created with a shorter startupProbe-level terminationGracePeriodSeconds. We confirm the shorter termination period is used.
*/ */
ginkgo.It("should override timeoutGracePeriodSeconds when StartupProbe field is set [Feature:ProbeTerminationGracePeriod]", func(ctx context.Context) { framework.ConformanceIt("should override timeoutGracePeriodSeconds when StartupProbe field is set", func(ctx context.Context) {
pod := e2epod.NewAgnhostPod(f.Namespace.Name, "startup-override-"+string(uuid.NewUUID()), nil, nil, nil, "/bin/sh", "-c", "sleep 1000") pod := e2epod.NewAgnhostPod(f.Namespace.Name, "startup-override-"+string(uuid.NewUUID()), nil, nil, nil, "/bin/sh", "-c", "sleep 1000")
longGracePeriod := int64(500) longGracePeriod := int64(500)
pod.Spec.TerminationGracePeriodSeconds = &longGracePeriod pod.Spec.TerminationGracePeriodSeconds = &longGracePeriod