From 065f8494cf4caeadcbe46d7ac64b36aafbefe725 Mon Sep 17 00:00:00 2001 From: "gcp-cherry-pick-bot[bot]" <98988430+gcp-cherry-pick-bot[bot]@users.noreply.github.com> Date: Fri, 5 Jul 2024 11:12:24 -0400 Subject: [PATCH] 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 <155603967+david-wu-octopus@users.noreply.github.com> Signed-off-by: pashakostohrys Co-authored-by: david-wu-octopus <155603967+david-wu-octopus@users.noreply.github.com> Co-authored-by: pashakostohrys --- cmd/argocd/commands/admin/cluster.go | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/cmd/argocd/commands/admin/cluster.go b/cmd/argocd/commands/admin/cluster.go index 932460dc24d26..a04885b101522 100644 --- 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