fix: support specifying username/password for redis holding manifests…

… in argocd-server (argoproj#16786) Signed-off-by: Alexander Matyushentsev <AMatyushentsev@gmail.com> Signed-off-by: penglongli <pelenli@tencent.com>
penglongli · Mar 6, 2024 · c620701 · c620701
1 parent 856461b
commit c620701
Showing 1 changed file with 8 additions and 0 deletions.
diff --git a/util/cache/cache.go b/util/cache/cache.go
@@ -199,6 +199,14 @@ func AddCacheFlagsToCmd(cmd *cobra.Command, opts ...Options) func() (*Cache, err
 		}
 		password := os.Getenv(envRedisPassword)
 		username := os.Getenv(envRedisUsername)
+		if opt.FlagPrefix != "" {
+			if val := os.Getenv(opt.getEnvPrefix() + envRedisUsername); val != "" {
+				username = val
+			}
+			if val := os.Getenv(opt.getEnvPrefix() + envRedisPassword); val != "" {
+				password = val
+			}
+		}
 		maxRetries := env.ParseNumFromEnv(envRedisRetryCount, defaultRedisRetryCount, 0, math.MaxInt32)
 		compression, err := CompressionTypeFromString(compressionStr)
 		if err != nil {