From dd61a3086974eff285489460ad82e390593f286a Mon Sep 17 00:00:00 2001 From: Penny Zheng Date: Mon, 29 Jul 2019 16:09:08 +0800 Subject: [PATCH] liveness: replace test image liveness and goproxy with unified agnhost The agnhost binary has several subcommands which are can be used to test different Kubernetes features. The liveness subcommand will start a simple server that is alive for 10 seconds, then reports unhealthy for the rest of its (hopefully) short existence. Fixes: #1864 Signed-off-by: Bin Lu Signed-off-by: Penny Zheng --- .../runtimeclass_workloads/pod-http-liveness.yaml | 4 ++-- .../runtimeclass_workloads/pod-tcp-liveness.yaml | 8 +++++--- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/integration/kubernetes/runtimeclass_workloads/pod-http-liveness.yaml b/integration/kubernetes/runtimeclass_workloads/pod-http-liveness.yaml index b51d3fd50..b3023ff23 100644 --- a/integration/kubernetes/runtimeclass_workloads/pod-http-liveness.yaml +++ b/integration/kubernetes/runtimeclass_workloads/pod-http-liveness.yaml @@ -13,9 +13,9 @@ spec: runtimeClassName: kata containers: - name: liveness - image: k8s.gcr.io/liveness + image: gcr.io/kubernetes-e2e-test-images/agnhost:2.2 args: - - /server + - liveness livenessProbe: httpGet: path: /healthz diff --git a/integration/kubernetes/runtimeclass_workloads/pod-tcp-liveness.yaml b/integration/kubernetes/runtimeclass_workloads/pod-tcp-liveness.yaml index 3cfc09412..c434e1938 100644 --- a/integration/kubernetes/runtimeclass_workloads/pod-tcp-liveness.yaml +++ b/integration/kubernetes/runtimeclass_workloads/pod-tcp-liveness.yaml @@ -8,12 +8,14 @@ kind: Pod metadata: name: tcptest labels: - app: goproxy + app: tcp-liveness spec: runtimeClassName: kata containers: - - name: goproxy - image: k8s.gcr.io/goproxy:0.1 + - name: tcp-liveness + image: gcr.io/kubernetes-e2e-test-images/agnhost:2.2 + args: + - liveness ports: - containerPort: 8080 readinessProbe: