github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-03 17:30:00 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #100050 from neolit123/1.21-tag-node-probe-test-with-kubelet-version

Browse Source 
e2e/common/node: tag tests with MinimumKubeletVersion
This commit is contained in:
Kubernetes Prow Robot 2021-03-12 18:01:03 -08:00 committed by GitHub
commit d39c427d01
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -214,7 +214,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.
*/ */
ginkgo.It("should be restarted with an exec liveness probe with timeout [NodeConformance]", func() { ginkgo.It("should be restarted with an exec liveness probe with timeout [MinimumKubeletVersion:1.20] [NodeConformance]", func() {
// The ExecProbeTimeout feature gate exists to allow backwards-compatibility with pre-1.20 cluster behaviors, where livenessProbe timeouts were ignored // The ExecProbeTimeout feature gate exists to allow backwards-compatibility with pre-1.20 cluster behaviors, where livenessProbe timeouts were ignored
// If ExecProbeTimeout feature gate is disabled, timeout enforcement for exec livenessProbes is disabled, so we should skip this test // If ExecProbeTimeout feature gate is disabled, timeout enforcement for exec livenessProbes is disabled, so we should skip this test
e2eskipper.SkipUnlessExecProbeTimeoutEnabled() e2eskipper.SkipUnlessExecProbeTimeoutEnabled()
@ -234,7 +234,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.
*/ */
ginkgo.It("should not be ready with an exec readiness probe timeout [NodeConformance]", func() { ginkgo.It("should not be ready with an exec readiness probe timeout [MinimumKubeletVersion:1.20] [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"}),