fix(cli): Get Redis password from secret in loadClusters() (#18951) (…

…#18955) * Get Redis password from secret in `loadClusters()` * feat: support redis password in admin stats command * Simplify code --------- Signed-off-by: David Wu <[email protected]> Signed-off-by: pashakostohrys <[email protected]> Co-authored-by: david-wu-octopus <[email protected]> Co-authored-by: pashakostohrys <[email protected]>
argoproj · Jul 5, 2024 · 065f849 · 065f849
1 parent beacacc
commit 065f849
Showing 1 changed file with 11 additions and 1 deletion.
diff --git a/cmd/argocd/commands/admin/cluster.go b/cmd/argocd/commands/admin/cluster.go
@@ -104,7 +104,17 @@ func loadClusters(ctx context.Context, kubeClient *kubernetes.Clientset, appClie
 		if err != nil {
 			return nil, err
 		}
-		client := redis.NewClient(&redis.Options{Addr: fmt.Sprintf("localhost:%d", port)})
+
+		redisOptions := &redis.Options{Addr: fmt.Sprintf("localhost:%d", port)}
+
+		secret, err := kubeClient.CoreV1().Secrets(namespace).Get(context.Background(), defaulRedisInitialPasswordSecretName, v1.GetOptions{})
+		if err == nil {
+			if _, ok := secret.Data[defaultResisInitialPasswordKey]; ok {
+				redisOptions.Password = string(secret.Data[defaultResisInitialPasswordKey])
+			}
+		}
+
+		client := redis.NewClient(redisOptions)
 		compressionType, err := cacheutil.CompressionTypeFromString(redisCompressionStr)
 		if err != nil {
 			return nil, err