Merge pull request #2606 from gauravkghildiyal/incorrect-neg-status

Replace obsolete test based on neg-status with one based on NEG CR for Standalone NEGs.
kubernetes · Jul 24, 2024 · d8efe39 · d8efe39
2 parents 42314e4 + d24e733
commit d8efe39
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 73 deletions.
diff --git a/cmd/e2e-test/upgrade/neg.go b/cmd/e2e-test/upgrade/neg.go
@@ -38,86 +38,32 @@ var (
 	expectedNegAttrs  = map[string]string{"80": "", "443": ""}
 )
 
-// StandaloneNeg implements e2e.UpgradeTest interface
-type StandaloneNeg struct {
+// StandaloneNEGWithSvcNEG implements e2e.UpgradeTest interface
+type StandaloneNEGWithSvcNEG struct {
 	t         *testing.T
 	s         *e2e.Sandbox
 	framework *e2e.Framework
 }
 
-func NewStandaloneNegUpgradeTest() e2e.UpgradeTest {
-	return &StandaloneNeg{}
+func NewStandaloneNEGWithSvcNEGUpgradeTest() e2e.UpgradeTest {
+	return &StandaloneNEGWithSvcNEG{}
 }
 
 // Name implements e2e.UpgradeTest.Init.
-func (sn *StandaloneNeg) Name() string {
-	return "StandaloneNegUpgrade"
+func (n *StandaloneNEGWithSvcNEG) Name() string {
+	return "StandaloneNEGWithSvcNEGUpgrade"
 }
 
 // Init implements e2e.UpgradeTest.Init.
-func (sn *StandaloneNeg) Init(t *testing.T, s *e2e.Sandbox, framework *e2e.Framework) error {
-	sn.t = t
-	sn.s = s
-	sn.framework = framework
-	return nil
-}
-
-// PreUpgrade implements e2e.UpgradeTest.PreUpgrade.
-func (sn *StandaloneNeg) PreUpgrade() error {
-	svcAnnotations := map[string]string{
-		annotations.NEGAnnotationKey: negAnnotation.String(),
-	}
-	_, err := e2e.EnsureEchoService(sn.s, svcName, svcAnnotations, v1.ServiceTypeClusterIP, 0)
-
-	if err != nil {
-		sn.t.Fatalf("error ensuring echo service: %v", err)
-	}
-	sn.t.Logf("Echo service ensured (%s/%s)", sn.s.Namespace, svcName)
-
-	negScaleAndValidate(sn.t, sn.s, sn.framework, 1)
-	negScaleAndValidate(sn.t, sn.s, sn.framework, 3)
-	return nil
-}
-
-// DuringUpgrade implements e2e.UpgradeTest.DuringUpgrade.
-func (sn *StandaloneNeg) DuringUpgrade() error {
-	return nil
-}
-
-// PostUpgrade implements e2e.UpgradeTest.PostUpgrade
-func (sn *StandaloneNeg) PostUpgrade() error {
-	negValidate(sn.t, sn.s, sn.framework, 3)
-	negScaleAndValidate(sn.t, sn.s, sn.framework, 5)
-	negScaleAndValidate(sn.t, sn.s, sn.framework, 2)
-	return nil
-}
-
-// NegCRD implements e2e.UpgradeTest interface
-type NegCRD struct {
-	t         *testing.T
-	s         *e2e.Sandbox
-	framework *e2e.Framework
-}
-
-func NewNegCRDUpgradeTest() e2e.UpgradeTest {
-	return &NegCRD{}
-}
-
-// Name implements e2e.UpgradeTest.Init.
-func (n *NegCRD) Name() string {
-	return "NegCRDUpgrade"
-}
-
-// Init implements e2e.UpgradeTest.Init.
-func (n *NegCRD) Init(t *testing.T, s *e2e.Sandbox, framework *e2e.Framework) error {
+func (n *StandaloneNEGWithSvcNEG) Init(t *testing.T, s *e2e.Sandbox, framework *e2e.Framework) error {
 	n.t = t
 	n.s = s
 	n.framework = framework
 	return nil
 }
 
 // PreUpgrade implements e2e.UpgradeTest.PreUpgrade.
-func (n *NegCRD) PreUpgrade() error {
+func (n *StandaloneNEGWithSvcNEG) PreUpgrade() error {
 	svcAnnotations := map[string]string{
 		annotations.NEGAnnotationKey: negAnnotation.String(),
 	}
@@ -133,12 +79,12 @@ func (n *NegCRD) PreUpgrade() error {
 }
 
 // DuringUpgrade implements e2e.UpgradeTest.DuringUpgrade.
-func (n *NegCRD) DuringUpgrade() error {
+func (n *StandaloneNEGWithSvcNEG) DuringUpgrade() error {
 	return nil
 }
 
 // PostUpgrade implements e2e.UpgradeTest.PostUpgrade
-func (n *NegCRD) PostUpgrade() error {
+func (n *StandaloneNEGWithSvcNEG) PostUpgrade() error {
 	negValidate(n.t, n.s, n.framework, 1)
 
 	negStatus, err := e2e.WaitForNegCRs(n.s, svcName, expectedNegAttrs)
@@ -179,9 +125,9 @@ func negScaleAndValidate(t *testing.T, s *e2e.Sandbox, framework *e2e.Framework,
 // negValidate check if the NEG status annotation and the corresponding NEGs are correctly configured.
 func negValidate(t *testing.T, s *e2e.Sandbox, framework *e2e.Framework, replicas int32) {
 	// validate neg status
-	negStatus, err := e2e.WaitForNegStatus(s, svcName, expectServicePort, false)
+	negStatus, err := e2e.WaitForNegCRs(s, svcName, expectedNegAttrs)
 	if err != nil {
-		t.Fatalf("error waiting for NEG status to update: %v", err)
+		t.Fatalf("error waiting for NEG CRs to update: %v", err)
 	}
 
 	// validate neg configurations

diff --git a/cmd/e2e-test/upgrade_test.go b/cmd/e2e-test/upgrade_test.go
@@ -28,7 +28,7 @@ func TestGenericUpgrade(t *testing.T) {
 
 	for _, test := range []e2e.UpgradeTest{
 		upgrade.NewBasicHTTPUpgradeTest(),
-		upgrade.NewStandaloneNegUpgradeTest(),
+		upgrade.NewStandaloneNEGWithSvcNEGUpgradeTest(),
 	} {
 		test := test // Capture test as we are running this in parallel.
 		runUpgradeTest(t, test)
@@ -47,12 +47,6 @@ func TestUpgradeToV1dot8(t *testing.T) {
 	runUpgradeTest(t, upgrade.NewV2FrontendNamerTest())
 }
 
-// TestUpgradeToV1dot10 runs upgrade tests for features that are introduced in v1.10.0.
-// Note that this test runs only when an upgrade results in enabling these features.
-func TestUpgradeToV1dot10(t *testing.T) {
-	runUpgradeTest(t, upgrade.NewNegCRDUpgradeTest())
-}
-
 // TestUpgradeToV1dot15 runs upgrade tests for features that are introduced in v1.15.0.
 // Note that this test runs only when an upgrade results in enabling these features.
 func TestUpgradeToV1dot15(t *testing.T) {