fix(e2e): copy rest config from test ctx

Copy rest config from the context to prevent helm installer side effects
causing codec issues with the controller-runtime client.

Author: njhale

test/e2e/ctx/ctx.go

@@ -57,7 +57,7 @@ func (ctx TestContext) Scheme() *runtime.Scheme {
 }
 
 func (ctx TestContext) RESTConfig() *rest.Config {
-	return ctx.restConfig
+	return rest.CopyConfig(ctx.restConfig)
 }
 
 func (ctx TestContext) KubeClient() operatorclient.ClientInterface {

test/e2e/ctx/installer_helm.go

@@ -80,7 +80,6 @@ func (a clientAdapter) ConfigAccess() clientcmd.ConfigAccess {
 func Install(ctx *TestContext) error {
 	cfg := action.Configuration{}
 	cfg.Init(clientAdapter{ctx.RESTConfig()}, "", "memory", ctx.Logf)
-
 	act := action.NewInstall(&cfg)
 	act.Timeout = 5 * time.Second
 	act.ReleaseName = fmt.Sprintf("release-%s", rand.String(8))

test/e2e/util_test.go

@@ -873,13 +873,12 @@ func toggleFeatureGates(deployment *appsv1.Deployment, toToggle ...featuregate.F
 	w, err := c.Watch(clientCtx, metav1.ListOptions{})
 	Expect(err).ToNot(HaveOccurred())
 
-	timeout := 1 * time.Minute
-	Eventually(func() error {
-		_, err := c.Update(clientCtx, deployment, metav1.UpdateOptions{})
-		return err
-	}, timeout).Should(Succeed())
+	Eventually(Apply(deployment, func(d *appsv1.Deployment) error {
+		d.Spec = deployment.Spec
+		return nil
+	})).Should(Succeed())
 
-	deadline, cancel := context.WithTimeout(context.Background(), timeout)
+	deadline, cancel := context.WithTimeout(context.Background(), 1*time.Minute)
 	defer cancel()
 
 	awaitPredicates(deadline, w, deploymentReplicas(2), deploymentAvailable, deploymentReplicas(1))
@@ -1002,6 +1001,7 @@ func Apply(obj Object, changeFunc interface{}) func() error {
 		}
 
 		if err := client.Patch(bg, cp, controllerclient.Apply, controllerclient.ForceOwnership, controllerclient.FieldOwner("test")); err != nil {
+			fmt.Printf("first patch error: %s\n", err)
 			return err
 		}