Change:
[x] test approval issue : [x] test pr : 18 May 2023 [x] two weeks soak end date : 01 June 2023 [x] test promotion pr : According to following APIsnoop query, there are still 2 PodEphemeralcontainers endpoints that are not tested for Conformance. Using a number of existing e2e test practices a new has been created to address these 2 endpoints. The e2e logs for this test are listed below. This query shows the following podephemeralcontainers endpoints are hit within a short period of running this e2e test. If a test with these calls gets merged, test coverage will go up by 2 points This test is also created with the goal of conformance promotion. /sig testing /sig architecture /area conformance
/triage accepted cc
/reopen
Reopened this issue. <detailsIn response to : /reopen Instructions for interacting with me using PR comments are available . If you have questions or suggestions related to my behavior, please file an issue against the repository. </details

Discussion:
import ( "context" <ins> "fmt" </ins> "time" v1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" <ins> "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime/schema" clientscheme "k8s.io/client-go/kubernetes/scheme" "k8s.io/client-go/util/retry" </ins> "k8s.io/kubernetes/test/e2e/framework" e2epod "k8s.io/kubernetes/test/e2e/framework/pod" imageutils "k8s.io/kubernetes/test/utils/image"

framework.ExpectNoError(err, "Failed to get logs for pod %q ephemeral container %q", e2epod.FormatPod(pod), ecName) gomega.Expect(log).To(gomega.ContainSubstring("polo")) }) <ins> ginkgo.It("should update the ephemeral containers in an existing pod", func(ctx context.Context) { ginkgo.By("creating a target pod") pod := podClient.CreateSync(ctx, &v1.Pod{ ObjectMeta: metav1.ObjectMeta{Name: "ephemeral-containers-target-pod"}, Spec: v1.PodSpec{ Containers: []v1.Container{ { Name:    "test-container-1", Image:   imageutils.GetE2EImage(imageutils.BusyBox), Command: []string{"/bin/sleep"}, Args:    []string{"10000"}, }, }, }, }) ginkgo.By("adding an ephemeral container") ecName := "debugger" ec := &v1.EphemeralContainer{ EphemeralContainerCommon: v1.EphemeralContainerCommon{ Name:    ecName, Image:   imageutils.GetE2EImage(imageutils.BusyBox), Command: e2epod.GenerateScriptCmd("while true; do echo polo; sleep 2; done"), Stdin:   true, TTY:     true, }, } err := podClient.AddEphemeralContainerSync(ctx, pod, ec, time.Minute) framework.ExpectNoError(err, "Failed to patch ephemeral containers in pod %q", e2epod.FormatPod(pod)) ginkgo.By("checking pod container endpoints") // Can't use anything depending on kubectl here because it's not available in the node test environment output := e2epod.ExecCommandInContainer(f, pod.Name, ecName, "/bin/echo", "marco") gomega.Expect(output).To(gomega.ContainSubstring("marco")) log, err := e2epod.GetPodLogs(ctx, f.ClientSet, pod.Namespace, pod.Name, ecName) framework.ExpectNoError(err, "Failed to get logs for pod %q ephemeral container %q", e2epod.FormatPod(pod), ecName) gomega.Expect(log).To(gomega.ContainSubstring("polo")) ginkgo.By(fmt.Sprintf("checking pod %q has only one ephemeralcontainer", pod.Name)) podResource := schema.GroupVersionResource{Group: "", Version: "v1", Resource: "pods"} unstruct, err := f.DynamicClient.Resource(podResource).Namespace(f.Namespace.Name).Get(ctx, "ephemeral-containers-target-pod", metav1.GetOptions{}, "ephemeralcontainers") framework.ExpectNoError(err, "can't get ephermalcontainers") verifyPod, err := unstructuredToPod(unstruct) framework.ExpectNoError(err, "Getting the %q pod's ephemeralcontainers", verifyPod.Name) gomega.Expect(verifyPod.Spec.EphemeralContainers).To(gomega.HaveLen(1), "checking ephemeralContainer count") ginkgo.By(fmt.Sprintf("adding another ephemeralcontainer to pod %q", pod.Name)) var podToUpdate *v1.Pod err = retry.RetryOnConflict(retry.DefaultRetry, func() error { podToUpdate, err = podClient.Get(ctx, pod.Name, metav1.GetOptions{}) framework.ExpectNoError(err, "Unable to retrieve pod %s", pod.Name) podToUpdate.Spec.EphemeralContainers = append(podToUpdate.Spec.EphemeralContainers, v1.EphemeralContainer{ EphemeralContainerCommon: v1.EphemeralContainerCommon{ Name:                     "debugger2", Image:                    imageutils.GetE2EImage(imageutils.Agnhost), ImagePullPolicy:          "IfNotPresent", TerminationMessagePolicy: "File", }, }) _, err = podClient.UpdateEphemeralContainers(context.TODO(), pod.Name, podToUpdate, metav1.UpdateOptions{}) return err }) framework.ExpectNoError(err, "Failed to update ephemeral container.") ginkgo.By(fmt.Sprintf("checking pod %q has only two ephemeralcontainers", pod.Name)) unstruct, err = f.DynamicClient.Resource(podResource).Namespace(f.Namespace.Name).Get(ctx, "ephemeral-containers-target-pod", metav1.GetOptions{}, "ephemeralcontainers") framework.ExpectNoError(err, "can't get ephermalcontainers") verifyPod, err = unstructuredToPod(unstruct) framework.ExpectNoError(err, "Getting the %q pod's ephemeralcontainers", verifyPod.Name) gomega.Expect(verifyPod.Spec.EphemeralContainers).To(gomega.HaveLen(2), "checking ephemeralContainer count") }) </ins> }) <ins> func unstructuredToPod(obj *unstructured.Unstructured) (*v1.Pod, error) { json, err := runtime.Encode(unstructured.UnstructuredJSONScheme, obj) if err != nil { return nil, err } p := &v1.Pod{} err = runtime.DecodeInto(clientscheme.Codecs.LegacyCodec(v1.SchemeGroupVersion), json, p) return p, err } </ins>