From d31d0cc29a2d016657b8ed88d3d01e45b8be54e7 Mon Sep 17 00:00:00 2001 From: Lee Verberne Date: Thu, 11 Nov 2021 08:04:43 -0500 Subject: [PATCH] Remove kubectl from ephemeral container e2e It's not available in the node e2e environment. --- test/e2e/common/node/ephemeral_containers.go | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/test/e2e/common/node/ephemeral_containers.go b/test/e2e/common/node/ephemeral_containers.go index b5b4d24eb80..fdda0b17c16 100644 --- a/test/e2e/common/node/ephemeral_containers.go +++ b/test/e2e/common/node/ephemeral_containers.go @@ -29,6 +29,7 @@ import ( imageutils "k8s.io/kubernetes/test/utils/image" "github.com/onsi/ginkgo" + "github.com/onsi/gomega" ) var _ = SIGDescribe("Ephemeral Containers [NodeFeature:EphemeralContainers]", func() { @@ -74,9 +75,11 @@ var _ = SIGDescribe("Ephemeral Containers [NodeFeature:EphemeralContainers]", fu framework.ExpectNoError(err, "Failed to patch ephemeral containers in pod %q", format.Pod(pod)) ginkgo.By("checking pod container endpoints") - _, err = framework.LookForStringInPodExecToContainer(pod.Namespace, pod.Name, ecName, []string{"/bin/echo", "marco"}, "marco", time.Minute) - framework.ExpectNoError(err, "Failed to exec in pod %q ephemeral container %q", format.Pod(pod), ecName) - _, err = framework.LookForStringInLog(pod.Namespace, pod.Name, ecName, "polo", time.Minute) - framework.ExpectNoError(err, "Failed to find logs in pod %q ephemeral container %q", format.Pod(pod), ecName) + // Can't use anything depending on kubectl here because it's not available in the node test environment + output := f.ExecCommandInContainer(pod.Name, ecName, "/bin/echo", "marco") + gomega.Expect(output).To(gomega.ContainSubstring("marco")) + log, err := e2epod.GetPodLogs(f.ClientSet, pod.Namespace, pod.Name, ecName) + framework.ExpectNoError(err, "Failed to get logs for pod %q ephemeral container %q", format.Pod(pod), ecName) + gomega.Expect(log).To(gomega.ContainSubstring("polo")) }) })