E2E: Preserve CVO state when bypassing VAP

Store and restore CVO's initial replica count instead of hardcoding 1.
Fixes debugging workflows where CVO is intentionally disabled.

Author: gcs278

test/e2e/util_gatewayapi_test.go

@@ -1184,10 +1184,34 @@ func scaleDeployment(t *testing.T, namespace, name string, replicas int32) error
 	})
 }
 
+// getCVOReplicas returns the current replica count of the CVO deployment.
+func getCVOReplicas(t *testing.T) (int32, error) {
+	t.Helper()
+	nsName := types.NamespacedName{Namespace: cvoNamespace, Name: cvoDeploymentName}
+	cvo := &appsv1.Deployment{}
+
+	err := wait.PollUntilContextTimeout(context.Background(), 1*time.Second, 30*time.Second, false, func(ctx context.Context) (bool, error) {
+		if err := kclient.Get(ctx, nsName, cvo); err != nil {
+			t.Logf("failed to get cvo deployment: %v, retrying...", err)
+			return false, nil
+		}
+		return true, nil
+	})
+	if err != nil {
+		return 0, fmt.Errorf("failed to get cvo deployment: %w", err)
+	}
+
+	if cvo.Spec.Replicas != nil {
+		return *cvo.Spec.Replicas, nil
+	}
+	return 1, nil
+}
+
 // vapManager helps to disable the VAP resource which is managed by CVO.
 type vapManager struct {
-	t    *testing.T
-	name string
+	t                  *testing.T
+	name               string
+	initialCVOReplicas int32
 }
 
 // newVAPManager returns a new instance of VAPManager.
@@ -1200,12 +1224,19 @@ func newVAPManager(t *testing.T, vapName string) *vapManager {
 
 // disable scales down CVO and removes the VAP resource.
 func (m *vapManager) disable() (error, func()) {
+	// Save the current replica count before scaling down
+	replicas, err := getCVOReplicas(m.t)
+	if err != nil {
+		return err, nil
+	}
+	m.initialCVOReplicas = replicas
+
 	if err := scaleDeployment(m.t, cvoNamespace, cvoDeploymentName, 0); err != nil {
 		return fmt.Errorf("failed to scale down cvo: %w", err), func() { /*scale down didn't work, nothing to do*/ }
 	}
 	if err := deleteExistingVAP(m.t, m.name); err != nil {
 		return fmt.Errorf("failed to delete vap %q: %w", m.name, err), func() {
-			if err := scaleDeployment(m.t, cvoNamespace, cvoDeploymentName, 1); err != nil {
+			if err := scaleDeployment(m.t, cvoNamespace, cvoDeploymentName, m.initialCVOReplicas); err != nil {
 				m.t.Errorf("failed to scale up cvo: %v", err)
 			}
 		}
@@ -1215,10 +1246,12 @@ func (m *vapManager) disable() (error, func()) {
 
 // Enable scales up CVO and waits until the VAP is recreated.
 func (m *vapManager) enable() {
-	if err := scaleDeployment(m.t, cvoNamespace, cvoDeploymentName, 1); err != nil {
+	if err := scaleDeployment(m.t, cvoNamespace, cvoDeploymentName, m.initialCVOReplicas); err != nil {
 		m.t.Errorf("failed to scale up cvo: %v", err)
-	} else if err := assertVAP(m.t, m.name); err != nil {
-		m.t.Errorf("failed to find vap %q: %v", m.name, err)
+	} else if m.initialCVOReplicas > 0 {
+		if err := assertVAP(m.t, m.name); err != nil {
+			m.t.Errorf("failed to find vap %q: %v", m.name, err)
+		}
 	}
 }