From ea6495e8284b7eccd292c67e21a32081c4a29967 Mon Sep 17 00:00:00 2001 From: Mihai Costea Date: Wed, 7 Jun 2023 15:40:10 +0300 Subject: [PATCH 1/2] Remove StartupProbe on debug with pod copy --- staging/src/k8s.io/kubectl/pkg/cmd/debug/profiles.go | 1 + 1 file changed, 1 insertion(+) diff --git a/staging/src/k8s.io/kubectl/pkg/cmd/debug/profiles.go b/staging/src/k8s.io/kubectl/pkg/cmd/debug/profiles.go index 656f92bf8b8..603970fcb87 100644 --- a/staging/src/k8s.io/kubectl/pkg/cmd/debug/profiles.go +++ b/staging/src/k8s.io/kubectl/pkg/cmd/debug/profiles.go @@ -217,6 +217,7 @@ func removeLabelsAndProbes(p *corev1.Pod) { for i := range p.Spec.Containers { p.Spec.Containers[i].LivenessProbe = nil p.Spec.Containers[i].ReadinessProbe = nil + p.Spec.Containers[i].StartupProbe = nil } } From e6bc945a61b9638df8a412fd5504a7f726e03e7e Mon Sep 17 00:00:00 2001 From: Mihai Costea Date: Fri, 9 Jun 2023 08:49:31 +0300 Subject: [PATCH 2/2] Add startup probe in integration test --- test/cmd/debug.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/test/cmd/debug.sh b/test/cmd/debug.sh index 0e6507c3bb3..afa84b83a58 100755 --- a/test/cmd/debug.sh +++ b/test/cmd/debug.sh @@ -146,6 +146,7 @@ run_kubectl_debug_general_tests() { kube::test::get_object_assert pod/target-copy '{{range.spec.containers}}{{.image}}:{{end}}' "${IMAGE_NGINX:?}:busybox:" kube::test::get_object_assert pod/target-copy '{{range.spec.containers}}{{if (index . "livenessProbe")}}:{{end}}{{end}}' '' kube::test::get_object_assert pod/target-copy '{{range.spec.containers}}{{if (index . "readinessProbe")}}:{{end}}{{end}}' '' + kube::test::get_object_assert pod/target-copy '{{range.spec.containers}}{{if (index . "startupProbe")}}:{{end}}{{end}}' '' kube::test::get_object_assert pod/target-copy '{{(index (index .spec.containers 1).securityContext.capabilities.add 0)}}' 'SYS_PTRACE' kube::test::get_object_assert pod/target-copy '{{.spec.shareProcessNamespace}}' 'true' # Clean up @@ -225,6 +226,7 @@ run_kubectl_debug_baseline_tests() { kube::test::get_object_assert pod/target-copy '{{range.spec.containers}}{{.image}}:{{end}}' "${IMAGE_NGINX:?}:busybox:" kube::test::get_object_assert pod/target-copy '{{range.spec.containers}}{{if (index . "livenessProbe")}}:{{end}}{{end}}' '' kube::test::get_object_assert pod/target-copy '{{range.spec.containers}}{{if (index . "readinessProbe")}}:{{end}}{{end}}' '' + kube::test::get_object_assert pod/target-copy '{{range.spec.containers}}{{if (index . "startupProbe")}}:{{end}}{{end}}' '' kube::test::get_object_assert pod/target-copy '{{if (index (index .spec.containers 0) "securityContext")}}:{{end}}' '' kube::test::get_object_assert pod/target-copy '{{.spec.shareProcessNamespace}}' 'true' # Clean up