github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-23 19:56:01 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #85486 from spiffxp/conformance-liveness-tcp-probe

Browse Source 
Promote a TCP socket probe test to Conformance
This commit is contained in:
Kubernetes Prow Robot 2020-01-21 16:26:35 -08:00 committed by GitHub
commit 3091ae7aac
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
test/conformance/testdata/conformance.txt vendored
View File

@ -103,6 +103,7 @@ test/e2e/common/container_probe.go: "with readiness probe that fails should neve
test/e2e/common/container_probe.go: "should be restarted with a exec \\\"cat /tmp/health\\\" liveness probe"
test/e2e/common/container_probe.go: "should *not* be restarted with a exec \\\"cat /tmp/health\\\" liveness probe"
test/e2e/common/container_probe.go: "should be restarted with a /healthz http liveness probe"
test/e2e/common/container_probe.go: "should *not* be restarted with a tcp:8080 liveness probe"
test/e2e/common/container_probe.go: "should have monotonically increasing restart count"
test/e2e/common/container_probe.go: "should *not* be restarted with a /healthz http liveness probe"
test/e2e/common/docker_containers.go: "should use the image defaults if command and args are blank"

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

@ -160,11 +160,11 @@ var _ = framework.KubeDescribe("Probing container", func() {
})
/*
Release : v1.15
Release : v1.18
Testname: Pod liveness probe, using tcp socket, no restart
Description: A Pod is created with liveness probe on tcp socket 8080. The http handler on port 8080 will return http errors after 10 seconds, but socket will remain open. Liveness probe MUST not fail to check health and the restart count should remain 0.
Description: A Pod is created with liveness probe on tcp socket 8080. The http handler on port 8080 will return http errors after 10 seconds, but the socket will remain open. Liveness probe MUST not fail to check health and the restart count should remain 0.
*/
ginkgo.It("should *not* be restarted with a tcp:8080 liveness probe [NodeConformance]", func() {
framework.ConformanceIt("should *not* be restarted with a tcp:8080 liveness probe [NodeConformance]", func() {
livenessProbe := &v1.Probe{
Handler: tcpSocketHandler(8080),
InitialDelaySeconds: 15,