diff --git a/test/conformance/testdata/conformance.yaml b/test/conformance/testdata/conformance.yaml index e44621abf87..d26b9dedd25 100755 --- a/test/conformance/testdata/conformance.yaml +++ b/test/conformance/testdata/conformance.yaml @@ -2458,6 +2458,27 @@ The PodTemplate must be deleted. release: v1.19 file: test/e2e/common/node/podtemplates.go +- testname: Pods Generation, graceful delete + codename: '[sig-node] Pods Extended (pod generation) Pod Generation custom-set generation + on new pods and graceful delete [Conformance]' + description: Create a Pod, ensure that triggering a graceful delete causes the generation + to be updated. + release: v1.35 + file: test/e2e/node/pods.go +- testname: Pods Generation, 500 updates + codename: '[sig-node] Pods Extended (pod generation) Pod Generation issue 500 podspec + updates and verify generation and observedGeneration eventually converge [Conformance]' + description: Create a Pod, issue 499 podSpec updates and verify generation and observedGeneration + eventually converge to 500. + release: v1.35 + file: test/e2e/node/pods.go +- testname: Pods Generation, updates + codename: '[sig-node] Pods Extended (pod generation) Pod Generation pod generation + should start at 1 and increment per update [Conformance]' + description: Create a Pod, and perform a few updates, ensuring that the pod's metadata.generation + and status.observedGeneration are updated as expected. + release: v1.35 + file: test/e2e/node/pods.go - testname: Pods, QOS codename: '[sig-node] Pods Extended Pods Set QOS Class should be set on Pods with matching resource requests and limits for memory and cpu [Conformance]' diff --git a/test/e2e/node/pods.go b/test/e2e/node/pods.go index 3a464a99bc3..02c70139b2c 100644 --- a/test/e2e/node/pods.go +++ b/test/e2e/node/pods.go @@ -419,7 +419,7 @@ var _ = SIGDescribe("Pods Extended", func() { }) }) -var _ = SIGDescribe("Pods Extended (pod generation)", framework.WithFeatureGate(features.PodObservedGenerationTracking), func() { +var _ = SIGDescribe("Pods Extended (pod generation)", func() { f := framework.NewDefaultFramework("pods") f.NamespacePodSecurityLevel = admissionapi.LevelBaseline @@ -429,7 +429,12 @@ var _ = SIGDescribe("Pods Extended (pod generation)", framework.WithFeatureGate( podClient = e2epod.NewPodClient(f) }) - ginkgo.It("pod generation should start at 1 and increment per update", func(ctx context.Context) { + /* + Release: v1.35 + Testname: Pods Generation, updates + Description: Create a Pod, and perform a few updates, ensuring that the pod's metadata.generation and status.observedGeneration are updated as expected. + */ + framework.ConformanceIt("pod generation should start at 1 and increment per update", func(ctx context.Context) { ginkgo.By("creating the pod") podName := "pod-generation-" + string(uuid.NewUUID()) pod := e2epod.NewAgnhostPod(f.Namespace.Name, podName, nil, nil, nil) @@ -529,7 +534,12 @@ var _ = SIGDescribe("Pods Extended (pod generation)", framework.WithFeatureGate( } }) - ginkgo.It("custom-set generation on new pods and graceful delete", func(ctx context.Context) { + /* + Release: v1.35 + Testname: Pods Generation, graceful delete + Description: Create a Pod, ensure that triggering a graceful delete causes the generation to be updated. + */ + framework.ConformanceIt("custom-set generation on new pods and graceful delete", func(ctx context.Context) { ginkgo.By("creating the pod") name := "pod-generation-" + string(uuid.NewUUID()) value := strconv.Itoa(time.Now().Nanosecond()) @@ -565,7 +575,12 @@ var _ = SIGDescribe("Pods Extended (pod generation)", framework.WithFeatureGate( gomega.Expect(pod.Generation).To(gomega.BeEquivalentTo(2)) }) - ginkgo.It("issue 500 podspec updates and verify generation and observedGeneration eventually converge", func(ctx context.Context) { + /* + Release: v1.35 + Testname: Pods Generation, 500 updates + Description: Create a Pod, issue 499 podSpec updates and verify generation and observedGeneration eventually converge to 500. + */ + framework.ConformanceIt("issue 500 podspec updates and verify generation and observedGeneration eventually converge", func(ctx context.Context) { ginkgo.By("creating the pod") name := "pod-generation-" + string(uuid.NewUUID()) value := strconv.Itoa(time.Now().Nanosecond())