changed logic to set env variable in csv

Signed-off-by: Alka Kumari <alkumari@redhat.com>

Author: alkakumari016

test/openshift/e2e/ginkgo/fixture/fixture.go

@@ -636,6 +636,23 @@ func WaitForAllDeploymentsInTheNamespaceToBeReady(ns string, k8sClient client.Cl
 
 }
 
+func AddEnvVarToCSV(csv *olmv1alpha1.ClusterServiceVersion, envKey string, value string) {
+	containers := csv.Spec.InstallStrategy.StrategySpec.DeploymentSpecs[0].Spec.Template.Spec.Containers
+	for i := range containers {
+		found := false
+		for j := range containers[i].Env {
+			if containers[i].Env[j].Name == envKey {
+				containers[i].Env[j].Value = value
+				found = true
+				break
+			}
+		}
+		if !found {
+			containers[i].Env = append(containers[i].Env, corev1.EnvVar{Name: envKey, Value: value})
+		}
+	}
+}
+
 // WaitForOperatorPodToHaveEnvVar waits for the operator pod to have the specified environment variable with the expected value.
 // This ensures that after updating the subscription, the operator pod has actually restarted with the new env var.
 func WaitForOperatorPodToHaveEnvVar(ns string, envKey string, expectedValue string, k8sClient client.Client) {

test/openshift/e2e/ginkgo/sequential/1-115_validate_imagepullpolicy_console_plugin_test.go

@@ -280,7 +280,9 @@ var _ = Describe("GitOps Operator Parallel E2E Tests", func() {
 
 			By("adding image pull policy env variable IMAGE_PULL_POLICY in Subscription")
 
-			fixture.SetEnvInOperatorSubscriptionOrDeployment("IMAGE_PULL_POLICY", "Always")
+			fixture.AddEnvVarToCSV(csv, "IMAGE_PULL_POLICY", "Always")
+			//fixture.SetEnvInOperatorSubscriptionOrDeployment("IMAGE_PULL_POLICY", "Always")
+			Expect(k8sClient.Update(ctx, csv)).To(Succeed())
 			defer func() {
 				By("removing IMAGE_PULL_POLICY environment variable to restore default behavior")
 				fixture.RestoreSubcriptionToDefault()
@@ -336,7 +338,9 @@ var _ = Describe("GitOps Operator Parallel E2E Tests", func() {
 
 			By("updating image pull policy env variable to Never")
 
-			fixture.SetEnvInOperatorSubscriptionOrDeployment("IMAGE_PULL_POLICY", "Never")
+			//fixture.SetEnvInOperatorSubscriptionOrDeployment("IMAGE_PULL_POLICY", "Never")
+			fixture.AddEnvVarToCSV(csv, "IMAGE_PULL_POLICY", "Never")
+			Expect(k8sClient.Update(ctx, csv)).To(Succeed())
 			defer func() {
 				By("removing IMAGE_PULL_POLICY environment variable to restore default behavior")
 				fixture.RestoreSubcriptionToDefault()
@@ -372,7 +376,9 @@ var _ = Describe("GitOps Operator Parallel E2E Tests", func() {
 				return true
 			}, "3m", "5s").Should(BeTrue())
 
-			fixture.SetEnvInOperatorSubscriptionOrDeployment("IMAGE_PULL_POLICY", "IfNotPresent")
+			//fixture.SetEnvInOperatorSubscriptionOrDeployment("IMAGE_PULL_POLICY", "IfNotPresent")
+			fixture.AddEnvVarToCSV(csv, "IMAGE_PULL_POLICY", "IfNotPresent")
+			Expect(k8sClient.Update(ctx, csv)).To(Succeed())
 			defer func() {
 				By("removing IMAGE_PULL_POLICY environment variable to restore default behavior")
 				fixture.RestoreSubcriptionToDefault()