fix: modify e2e tests according to new argocd-operaor version

Signed-off-by: Jayendra Parsai <[email protected]>

Author: jparsai

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

@@ -73,6 +73,7 @@ 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: "redis-initial-pass", MountPath: "/app/config/redis-auth/"},
 				{Name: "plugins-home", MountPath: "/home/argocd"},
 				{Name: "argocd-cmd-params-cm", MountPath: "/home/argocd/params"},
 				{Name: "tmp", MountPath: "/tmp"},
@@ -111,6 +112,19 @@ var _ = Describe("GitOps Operator Parallel E2E Tests", func() {
 						},
 					},
 				},
+				{
+					Name: "redis-initial-pass",
+					VolumeSource: corev1.VolumeSource{
+						Secret: &corev1.SecretVolumeSource{
+							SecretName:  "argocd-redis-initial-password",
+							DefaultMode: ptr.To(int32(420)),
+							Items: []corev1.KeyToPath{
+								{Key: "auth", Path: "auth"},
+								{Key: "auth_username", Path: "auth_username"},
+							},
+						},
+					},
+				},
 				{
 					Name: "plugins-home", VolumeSource: corev1.VolumeSource{
 						EmptyDir: &corev1.EmptyDirVolumeSource{},
@@ -144,6 +158,7 @@ var _ = Describe("GitOps Operator Parallel E2E Tests", func() {
 				{Name: "gpg-keyring", MountPath: "/app/config/gpg/keys"},
 				{Name: "argocd-repo-server-tls", MountPath: "/app/config/reposerver/tls"},
 				{Name: "argocd-operator-redis-tls", MountPath: "/app/config/reposerver/tls/redis"},
+				{Name: "redis-initial-pass", MountPath: "/app/config/redis-auth/"},
 				{Name: "plugins", MountPath: "/home/argocd/cmp-server/plugins"},
 				{Name: "tmp", MountPath: "/tmp"},
 			}))
@@ -193,6 +208,19 @@ var _ = Describe("GitOps Operator Parallel E2E Tests", func() {
 						},
 					},
 				},
+				{
+					Name: "redis-initial-pass",
+					VolumeSource: corev1.VolumeSource{
+						Secret: &corev1.SecretVolumeSource{
+							SecretName:  "argocd-redis-initial-password",
+							DefaultMode: ptr.To(int32(420)),
+							Items: []corev1.KeyToPath{
+								{Key: "auth", Path: "auth"},
+								{Key: "auth_username", Path: "auth_username"},
+							},
+						},
+					},
+				},
 				{
 					Name: "var-files", VolumeSource: corev1.VolumeSource{
 						EmptyDir: &corev1.EmptyDirVolumeSource{},
@@ -218,6 +246,7 @@ 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: "redis-initial-pass", MountPath: "/app/config/redis-auth/"},
 				{Name: "argocd-home", MountPath: "/home/argocd"},
 				{Name: "argocd-cmd-params-cm", MountPath: "/home/argocd/params"},
 				{Name: "argocd-application-controller-tmp", MountPath: "/tmp"},
@@ -242,6 +271,19 @@ var _ = Describe("GitOps Operator Parallel E2E Tests", func() {
 						},
 					},
 				},
+				{
+					Name: "redis-initial-pass",
+					VolumeSource: corev1.VolumeSource{
+						Secret: &corev1.SecretVolumeSource{
+							SecretName:  "argocd-redis-initial-password",
+							DefaultMode: ptr.To(int32(420)),
+							Items: []corev1.KeyToPath{
+								{Key: "auth", Path: "auth"},
+								{Key: "auth_username", Path: "auth_username"},
+							},
+						},
+					},
+				},
 				{
 					Name: "argocd-home", VolumeSource: corev1.VolumeSource{
 						EmptyDir: &corev1.EmptyDirVolumeSource{},

test/openshift/e2e/ginkgo/parallel/1-031_validate_toolchain_test.go

@@ -87,7 +87,7 @@ var _ = Describe("GitOps Operator Parallel E2E Tests", func() {
 			// These variables need to be maintained according to the component matrix: https://spaces.redhat.com/display/GITOPS/GitOps+Component+Matrix
 			expected_kustomizeVersion := "v5.8.1"
 			expected_helmVersion := "v3.19.4"
-			expected_argocdVersion := "v3.3.2"
+			expected_argocdVersion := "v3.3.6"
 
 			var expected_dexVersion string
 			var expected_redisVersion string

test/openshift/e2e/ginkgo/parallel/1-066_validate_redis_secure_comm_no_autotls_no_ha_test.go

@@ -142,7 +142,7 @@ var _ = Describe("GitOps Operator Parallel E2E Tests", func() {
 
 			By("expecting redis-server to have desired container process command/arguments")
 
-			expectedString := "--save \"\" --appendonly no --requirepass " + "$(REDIS_PASSWORD)" + " --tls-port 6379 --port 0 --tls-cert-file /app/config/redis/tls/tls.crt --tls-key-file /app/config/redis/tls/tls.key --tls-auth-clients no"
+			expectedString := "--save \"\" --appendonly no --aclfile /app/config/redis-auth/users.acl --tls-port 6379 --port 0 --tls-cert-file /app/config/redis/tls/tls.crt --tls-key-file /app/config/redis/tls/tls.key --tls-auth-clients no"
 
 			if !fixture.IsUpstreamOperatorTests() {
 				// Downstream operator adds these arguments