revert test changes and update volume mounts test

Signed-off-by: Atif Ali <[email protected]>

Author: aali309

test/openshift/e2e/ginkgo/parallel/1-019_validate_volume_mounts_test.go

@@ -71,9 +71,6 @@ var _ = Describe("GitOps Operator Parallel E2E Tests", func() {
 				{Name: "tls-certs", MountPath: "/app/config/tls"},
 				{Name: "argocd-repo-server-tls", MountPath: "/app/config/server/tls"},
 				{Name: "argocd-operator-redis-tls", MountPath: "/app/config/server/tls/redis"},
-				{Name: "plugins-home", MountPath: "/home/argocd"},
-				{Name: "argocd-cmd-params-cm", MountPath: "/home/argocd/params"},
-				{Name: "tmp", MountPath: "/tmp"},
 			}))
 
 			Expect(argocdServerDepl.Spec.Template.Spec.Volumes).To(Equal([]corev1.Volume{
@@ -109,25 +106,6 @@ var _ = Describe("GitOps Operator Parallel E2E Tests", func() {
 						},
 					},
 				},
-				{
-					Name: "plugins-home", VolumeSource: corev1.VolumeSource{
-						EmptyDir: &corev1.EmptyDirVolumeSource{},
-					},
-				},
-				{
-					Name: "argocd-cmd-params-cm", VolumeSource: corev1.VolumeSource{
-						ConfigMap: &corev1.ConfigMapVolumeSource{
-							DefaultMode:          ptr.To(int32(420)),
-							Items:                []corev1.KeyToPath{{Key: "server.profile.enabled", Path: "profiler.enabled"}},
-							LocalObjectReference: corev1.LocalObjectReference{Name: "argocd-cmd-params-cm"},
-							Optional:             ptr.To(true)},
-					},
-				},
-				{
-					Name: "tmp", VolumeSource: corev1.VolumeSource{
-						EmptyDir: &corev1.EmptyDirVolumeSource{},
-					},
-				},
 			}))
 
 			By("verifying volumemounts and volumes of Argo CD Repo server")
@@ -216,9 +194,6 @@ var _ = Describe("GitOps Operator Parallel E2E Tests", func() {
 			Expect(applControllerSS.Spec.Template.Spec.Containers[0].VolumeMounts).To(Equal([]corev1.VolumeMount{
 				{Name: "argocd-repo-server-tls", MountPath: "/app/config/controller/tls"},
 				{Name: "argocd-operator-redis-tls", MountPath: "/app/config/controller/tls/redis"},
-				{Name: "argocd-home", MountPath: "/home/argocd"},
-				{Name: "argocd-cmd-params-cm", MountPath: "/home/argocd/params"},
-				{Name: "argocd-application-controller-tmp", MountPath: "/tmp"},
 			}))
 
 			Expect(applControllerSS.Spec.Template.Spec.Volumes).To(Equal([]corev1.Volume{
@@ -240,25 +215,6 @@ var _ = Describe("GitOps Operator Parallel E2E Tests", func() {
 						},
 					},
 				},
-				{
-					Name: "argocd-home", VolumeSource: corev1.VolumeSource{
-						EmptyDir: &corev1.EmptyDirVolumeSource{},
-					},
-				},
-				{
-					Name: "argocd-cmd-params-cm", VolumeSource: corev1.VolumeSource{
-						ConfigMap: &corev1.ConfigMapVolumeSource{
-							DefaultMode:          ptr.To(int32(420)),
-							Items:                []corev1.KeyToPath{{Key: "controller.profile.enabled", Path: "profiler.enabled"}},
-							LocalObjectReference: corev1.LocalObjectReference{Name: "argocd-cmd-params-cm"},
-							Optional:             ptr.To(true)},
-					},
-				},
-				{
-					Name: "argocd-application-controller-tmp", VolumeSource: corev1.VolumeSource{
-						EmptyDir: &corev1.EmptyDirVolumeSource{},
-					},
-				},
 			}))
 
 		})

test/openshift/e2e/ginkgo/parallel/1-067_validate_redis_secure_comm_no_autotls_ha_test.go

@@ -33,7 +33,6 @@ import (
 	fixtureUtils "github.com/redhat-developer/gitops-operator/test/openshift/e2e/ginkgo/fixture/utils"
 	appsv1 "k8s.io/api/apps/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-	"k8s.io/utils/ptr"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 )
 
@@ -69,9 +68,6 @@ var _ = Describe("GitOps Operator Parallel E2E Tests", func() {
 					HA: argov1beta1api.ArgoCDHASpec{
 						Enabled: true,
 					},
-					RBAC: argov1beta1api.ArgoCDRBACSpec{
-						Policy: ptr.To("g, system:cluster-admins, role:admin\ng, cluster-admins, role:admin"),
-					},
 				},
 			}
 			Expect(k8sClient.Create(ctx, argoCD)).To(Succeed())

test/openshift/e2e/ginkgo/parallel/1-069_validate_redis_secure_comm_autotls_ha_test.go

@@ -32,7 +32,6 @@ import (
 	appsv1 "k8s.io/api/apps/v1"
 	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-	"k8s.io/utils/ptr"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 )
 
@@ -69,9 +68,6 @@ var _ = Describe("GitOps Operator Parallel E2E Tests", func() {
 					HA: argov1beta1api.ArgoCDHASpec{
 						Enabled: true,
 					},
-					RBAC: argov1beta1api.ArgoCDRBACSpec{
-						Policy: ptr.To("g, system:cluster-admins, role:admin\ng, cluster-admins, role:admin"),
-					},
 				},
 			}
 			Expect(k8sClient.Create(ctx, argoCD)).To(Succeed())