Update istio-csr e2e: enable tech-preview feature addon

by patching Subscription object

Signed-off-by: Swarup Ghosh <[email protected]>

Author: swghosh

test/e2e/certificates_test.go

@@ -205,8 +205,9 @@ var _ = Describe("ACME Certificate", Ordered, func() {
 			Expect(err).NotTo(HaveOccurred())
 
 			By("setting cloud credential secret name in subscription object")
-			credentialSecret := "aws-creds"
-			err = patchSubscriptionWithCloudCredential(ctx, loader, credentialSecret)
+			err = patchSubscriptionWithEnvVars(ctx, loader, map[string]string{
+				"CLOUD_CREDENTIALS_SECRET_NAME": "aws-creds",
+			})
 			Expect(err).NotTo(HaveOccurred())
 
 			By("getting AWS zone from Infrastructure object")
@@ -297,8 +298,9 @@ var _ = Describe("ACME Certificate", Ordered, func() {
 			Expect(err).NotTo(HaveOccurred())
 
 			By("setting cloud credential secret name in subscription object")
-			credentialSecret := "aws-creds"
-			err = patchSubscriptionWithCloudCredential(ctx, loader, credentialSecret)
+			err = patchSubscriptionWithEnvVars(ctx, loader, map[string]string{
+				"CLOUD_CREDENTIALS_SECRET_NAME": "aws-creds",
+			})
 			Expect(err).NotTo(HaveOccurred())
 
 			By("getting AWS zone from Infrastructure object")
@@ -496,7 +498,9 @@ var _ = Describe("ACME Certificate", Ordered, func() {
 			Expect(err).NotTo(HaveOccurred())
 
 			By("Configure cert-manager to use credential, setting this credential secret name in subscription object")
-			err = patchSubscriptionWithCloudCredential(ctx, loader, credentialSecret)
+			err = patchSubscriptionWithEnvVars(ctx, loader, map[string]string{
+				"CLOUD_CREDENTIALS_SECRET_NAME": credentialSecret,
+			})
 			Expect(err).NotTo(HaveOccurred())
 
 			By("Getting GCP project ID from Infrastructure object")

test/e2e/istio_csr_test.go

@@ -46,6 +46,12 @@ var _ = Describe("Istio-CSR", Ordered, Label("TechPreview", "Feature:IstioCSR"),
 
 		dynamicClient, err = dynamic.NewForConfig(cfg)
 		Expect(err).Should(BeNil())
+
+		By("enable IstioCSR addon feature by patching subscription object")
+		err = patchSubscriptionWithEnvVars(ctx, loader, map[string]string{
+			"UNSUPPORTED_ADDON_FEATURES": "IstioCSR=true",
+		})
+		Expect(err).NotTo(HaveOccurred())
 	})
 
 	var ns *corev1.Namespace

test/e2e/utils_test.go

@@ -400,24 +400,28 @@ func getCertManagerOperatorSubscription(ctx context.Context, loader library.Dyna
 	return subName, nil
 }
 
-// patchSubscriptionWithCloudCredential uses the k8s dynamic client to patche the only Subscription object
-// in the cert-manager-operator namespace to inject CLOUD_CREDENTIALS_SECRET_NAME="aws-creds" env
-// into its spec.config.env
-func patchSubscriptionWithCloudCredential(ctx context.Context, loader library.DynamicResourceLoader, credentialSecret string) error {
+// patchSubscriptionWithEnvVars uses the k8s dynamic client to patch the only Subscription object
+// in the cert-manager-operator namespace, inject specified env vars into spec.config.env
+func patchSubscriptionWithEnvVars(ctx context.Context, loader library.DynamicResourceLoader, envVars map[string]string) error {
 	subName, err := getCertManagerOperatorSubscription(ctx, loader)
 	if err != nil {
 		return err
 	}
 
+	env := make([]interface{}, len(envVars))
+	i := 0
+	for k, v := range envVars {
+		env[i] = map[string]interface{}{
+			"name":  k,
+			"value": v,
+		}
+		i++
+	}
+
 	patch := map[string]interface{}{
 		"spec": map[string]interface{}{
 			"config": map[string]interface{}{
-				"env": []interface{}{
-					map[string]interface{}{
-						"name":  "CLOUD_CREDENTIALS_SECRET_NAME",
-						"value": credentialSecret,
-					},
-				},
+				"env": env,
 			},
 		},
 	}