chore(agent): Bring back REDIS_PASSWORD distribution via envvar

Agent is not ready yet. Ref.: https://issues.redhat.com/browse/GITOPS-9070

Signed-off-by: Oliver Gondža <ogondza@gmail.com>

Author: olivergondza

controllers/argocdagent/agent/deployment.go

@@ -329,6 +329,18 @@ func buildAgentContainerEnv(cr *argoproj.ArgoCD) []corev1.EnvVar {
 		{
 			Name:  EnvArgoCDAgentEnableResourceProxy,
 			Value: "true",
+		}, {
+			// TODO: Convert to volume mount once possible: https://issues.redhat.com/browse/GITOPS-9070
+			Name: "REDIS_PASSWORD",
+			ValueFrom: &corev1.EnvVarSource{
+				SecretKeyRef: &corev1.SecretKeySelector{
+					Key: "admin.password",
+					LocalObjectReference: corev1.LocalObjectReference{
+						Name: fmt.Sprintf("%s-%s", cr.Name, "redis-initial-password"),
+					},
+					Optional: ptr.To(true),
+				},
+			},
 		},
 	}
 

controllers/argocdagent/agent/deployment_test.go

@@ -346,6 +346,11 @@ func TestReconcileAgentDeployment_VerifyDeploymentSpec(t *testing.T) {
 	// Verify some expected environment variables are present
 	envNames := make(map[string]bool)
 	for _, env := range container.Env {
+		// TODO: Convert to volume mount once possible: https://issues.redhat.com/browse/GITOPS-9070
+		if env.Name == "REDIS_PASSWORD" {
+			continue
+		}
+
 		envNames[env.Name] = true
 		// All environment variables should have direct values, not references
 		assert.Nil(t, env.ValueFrom, "Environment variable %s should have direct value, not reference", env.Name)

controllers/argocdagent/deployment.go

@@ -371,6 +371,18 @@ func buildPrincipalContainerEnv(cr *argoproj.ArgoCD) []corev1.EnvVar {
 		}, {
 			Name:  EnvArgoCDPrincipalJwtSecretName,
 			Value: getPrincipalJWTSecretName(cr),
+		}, {
+			// TODO: Convert to volume mount once possible: https://issues.redhat.com/browse/GITOPS-9070
+			Name: "REDIS_PASSWORD",
+			ValueFrom: &corev1.EnvVarSource{
+				SecretKeyRef: &corev1.SecretKeySelector{
+					Key: "admin.password",
+					LocalObjectReference: corev1.LocalObjectReference{
+						Name: fmt.Sprintf("%s-%s", cr.Name, "redis-initial-password"),
+					},
+					Optional: ptr.To(true),
+				},
+			},
 		},
 	}
 

controllers/argocdagent/deployment_test.go

@@ -383,14 +383,18 @@ func TestReconcilePrincipalDeployment_VerifyDeploymentSpec(t *testing.T) {
 	// Verify some expected environment variables are present
 	envNames := make(map[string]bool)
 	for _, env := range container.Env {
-		envNames[env.Name] = true
-		// Most environment variables should have direct values, except for secrets like Redis password
+		// TODO: Convert to volume mount once possible: https://issues.redhat.com/browse/GITOPS-9070
+		if env.Name == "REDIS_PASSWORD" {
+			continue
+		}
 
+		envNames[env.Name] = true
 		// All environment variables should have direct values, not references
 		assert.Nil(t, env.ValueFrom, "Environment variable %s should have direct value, not reference", env.Name)
 	}
 	// Check for some environment variables
 	assert.True(t, envNames["ARGOCD_PRINCIPAL_NAMESPACE"], "ARGOCD_PRINCIPAL_NAMESPACE should be set")
+	// TODO: Convert to volume mount once possible: https://issues.redhat.com/browse/GITOPS-9070
 	assert.False(t, envNames["REDIS_PASSWORD"], "REDIS_PASSWORD should not be set")
 
 	// Verify volume mounts

tests/ginkgo/sequential/1-051_validate_argocd_agent_principal_test.go

@@ -371,9 +371,10 @@ var _ = Describe("GitOps Operator Sequential E2E Tests", func() {
 				Expect(container.Env).To(ContainElement(corev1.EnvVar{Name: key, Value: value}), "Environment variable %s should be set to %s", key, value)
 			}
 
-			Expect(container.Env).NotTo(ContainElement(
-				HaveField("Name", "REDIS_PASSWORD"),
-			), "REDIS_PASSWORD should not be set")
+			// TODO: Convert to volume mount once possible: https://issues.redhat.com/browse/GITOPS-9070
+			//Expect(container.Env).NotTo(ContainElement(
+			//	HaveField("Name", "REDIS_PASSWORD"),
+			//), "REDIS_PASSWORD should not be set")
 
 			By("Disable principal")
 

tests/ginkgo/sequential/1-052_validate_argocd_agent_agent_test.go

@@ -344,9 +344,10 @@ var _ = Describe("GitOps Operator Sequential E2E Tests", func() {
 				Expect(container.Env).To(ContainElement(corev1.EnvVar{Name: key, Value: value}), "Environment variable %s should be set to %s", key, value)
 			}
 
-			Expect(container.Env).NotTo(ContainElement(
-				HaveField("Name", "REDIS_PASSWORD"),
-			), "REDIS_PASSWORD should not be set")
+			// TODO: Convert to volume mount once possible: https://issues.redhat.com/browse/GITOPS-9070
+			//Expect(container.Env).NotTo(ContainElement(
+			//	HaveField("Name", "REDIS_PASSWORD"),
+			//), "REDIS_PASSWORD should not be set")
 
 			By("Verify custom environment variable is present")