diff --git a/test/conformance/testdata/conformance.yaml b/test/conformance/testdata/conformance.yaml index a3c412ae8d8..728bac75178 100755 --- a/test/conformance/testdata/conformance.yaml +++ b/test/conformance/testdata/conformance.yaml @@ -2136,6 +2136,14 @@ restart count MUST remain zero. release: v1.9 file: test/e2e/common/node/container_probe.go +- testname: Pod liveness probe, using grpc call, success + codename: '[sig-node] Probing container should *not* be restarted with a GRPC liveness + probe [NodeConformance] [Conformance]' + description: A Pod is created with liveness probe on grpc service. Liveness probe + on this endpoint will not fail. When liveness probe does not fail then the restart + count MUST remain zero. + release: v1.23 + file: test/e2e/common/node/container_probe.go - testname: Pod liveness probe, using local file, no restart codename: '[sig-node] Probing container should *not* be restarted with a exec "cat /tmp/health" liveness probe [NodeConformance] [Conformance]' @@ -2162,6 +2170,14 @@ killed and restarted incrementing restart count to 1. release: v1.9 file: test/e2e/common/node/container_probe.go +- testname: Pod liveness probe, using grpc call, failure + codename: '[sig-node] Probing container should be restarted with a GRPC liveness + probe [NodeConformance] [Conformance]' + description: A Pod is created with liveness probe on grpc service. Liveness probe + on this endpoint should fail because of wrong probe port. When liveness probe + does fail then the restart count should +1. + release: v1.23 + file: test/e2e/common/node/container_probe.go - testname: Pod liveness probe, using local file, restart codename: '[sig-node] Probing container should be restarted with a exec "cat /tmp/health" liveness probe [NodeConformance] [Conformance]' diff --git a/test/e2e/common/node/container_probe.go b/test/e2e/common/node/container_probe.go index 888bbb9e7c1..d0e443d7091 100644 --- a/test/e2e/common/node/container_probe.go +++ b/test/e2e/common/node/container_probe.go @@ -520,7 +520,7 @@ var _ = SIGDescribe("Probing container", func() { Testname: Pod liveness probe, using grpc call, success Description: A Pod is created with liveness probe on grpc service. Liveness probe on this endpoint will not fail. When liveness probe does not fail then the restart count MUST remain zero. */ - ginkgo.It("should *not* be restarted with a GRPC liveness probe [NodeConformance]", func(ctx context.Context) { + framework.ConformanceIt("should *not* be restarted with a GRPC liveness probe [NodeConformance]", func(ctx context.Context) { livenessProbe := &v1.Probe{ ProbeHandler: v1.ProbeHandler{ GRPC: &v1.GRPCAction{ @@ -543,7 +543,7 @@ var _ = SIGDescribe("Probing container", func() { Description: A Pod is created with liveness probe on grpc service. Liveness probe on this endpoint should fail because of wrong probe port. When liveness probe does fail then the restart count should +1. */ - ginkgo.It("should be restarted with a GRPC liveness probe [NodeConformance]", func(ctx context.Context) { + framework.ConformanceIt("should be restarted with a GRPC liveness probe [NodeConformance]", func(ctx context.Context) { livenessProbe := &v1.Probe{ ProbeHandler: v1.ProbeHandler{ GRPC: &v1.GRPCAction{