changes

Signed-off-by: akhil nittala <nakhil@redhat.com>

Author: akhilnittala

test/openshift/e2e/ginkgo/sequential/1-121-valiate_resource_constraints_gitopsservice_test.go

@@ -66,22 +66,24 @@ var _ = Describe("GitOps Operator Sequential E2E Tests", func() {
 		var (
 			ctx       context.Context
 			k8sClient client.Client
-			ocVersion string
 		)
 		BeforeEach(func() {
 			fixture.EnsureSequentialCleanSlate()
 			k8sClient, _ = utils.GetE2ETestKubeClient()
 			ctx = context.Background()
-			ocVersion = getOCPVersion()
-			Expect(ocVersion).ToNot(BeEmpty())
-			fixture.SkipIfMinOCPVersion(ocVersion, fixture.OCP4_22)
 		})
 
 		It("validates that GitOpsService can take in custom resource constraints", func() {
 			csv := clusterserviceversion.Get(ctx, k8sClient)
 			Expect(csv).ToNot(BeNil())
 			defer func() { Expect(fixture.RemoveDynamicPluginFromCSV(ctx, k8sClient)).To(Succeed()) }()
 
+			ocVersion := getOCPVersion()
+			Expect(ocVersion).ToNot(BeEmpty())
+			if strings.Contains(ocVersion, "4.15.") {
+				Skip("skipping this test as OCP version is 4.15")
+				return
+			}
 			addDynamicPluginEnv(csv, ocVersion)
 
 			depl := &appsv1.Deployment{ObjectMeta: metav1.ObjectMeta{Name: "gitops-plugin", Namespace: "openshift-gitops"}}
@@ -180,6 +182,12 @@ var _ = Describe("GitOps Operator Sequential E2E Tests", func() {
 			Expect(csv).ToNot(BeNil())
 			defer func() { Expect(fixture.RemoveDynamicPluginFromCSV(ctx, k8sClient)).To(Succeed()) }()
 
+			ocVersion := getOCPVersion()
+			Expect(ocVersion).ToNot(BeEmpty())
+			if strings.Contains(ocVersion, "4.15.") {
+				Skip("skipping this test as OCP version is 4.15")
+				return
+			}
 			addDynamicPluginEnv(csv, ocVersion)
 
 			depl := &appsv1.Deployment{ObjectMeta: metav1.ObjectMeta{Name: "gitops-plugin", Namespace: "openshift-gitops"}}
@@ -245,6 +253,12 @@ var _ = Describe("GitOps Operator Sequential E2E Tests", func() {
 			Expect(csv).ToNot(BeNil())
 			defer func() { Expect(fixture.RemoveDynamicPluginFromCSV(ctx, k8sClient)).To(Succeed()) }()
 
+			ocVersion := getOCPVersion()
+			Expect(ocVersion).ToNot(BeEmpty())
+			if strings.Contains(ocVersion, "4.15.") {
+				Skip("skipping this test as OCP version is 4.15")
+				return
+			}
 			addDynamicPluginEnv(csv, ocVersion)
 
 			depl := &appsv1.Deployment{ObjectMeta: metav1.ObjectMeta{Name: "gitops-plugin", Namespace: "openshift-gitops"}}

test/openshift/e2e/ginkgo/sequential/1-143_validate_deployment_Env_Args_For_Tls_Configuration_test.go

@@ -254,6 +254,31 @@ var _ = Describe("Validate Deployment Env Args For TLS Configuration", func() {
 				GinkgoWriter.Printf("%s TLS args ciphers value: %s\n", deployment.Name, tlsCiphersTLS12)
 				return true
 			}, 60*time.Second, 2*time.Second).Should(BeTrue())
+			By("Validating TLS environment variables in cluster deployment")
+			Eventually(func() error {
+				depl := &appsv1.Deployment{}
+				if err := c.Get(ctx, types.NamespacedName{
+					Name:      "cluster",
+					Namespace: "openshift-gitops",
+				}, depl); err != nil {
+					return err
+				}
+				Expect(depl.Spec.Template.Spec.Containers).NotTo(BeEmpty())
+				env := depl.Spec.Template.Spec.Containers[0].Env
+				Expect(env).To(ContainElement(corev1.EnvVar{
+					Name:  "TLS_MIN_VERSION",
+					Value: "1.2",
+				}))
+				Expect(env).To(ContainElement(corev1.EnvVar{
+					Name: "TLS_CIPHER_SUITES",
+					Value: "TLS_AES_128_GCM_SHA256:TLS_AES_256_GCM_SHA384:TLS_CHACHA20_POLY1305_SHA256:" +
+						"ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES128-GCM-SHA256:" +
+						"ECDHE-ECDSA-AES256-GCM-SHA384:ECDHE-RSA-AES256-GCM-SHA384:" +
+						"ECDHE-ECDSA-CHACHA20-POLY1305:ECDHE-RSA-CHACHA20-POLY1305",
+				}))
+
+				return nil
+			}, 60*time.Second, 2*time.Second).Should(Succeed())
 		})
 	})
 })