Merge pull request #1297 from MinerYang/external_reids__url

fix external redis url
goharbor · Sep 16, 2022 · 2efdb42 · 2efdb42
2 parents 7cbed7d + 7ad559a
commit 2efdb42
Showing 1 changed file with 6 additions and 6 deletions.
diff --git a/templates/_helpers.tpl b/templates/_helpers.tpl
@@ -168,40 +168,40 @@ postgres://{{ template "harbor.database.username" . }}:{{ template "harbor.datab
   {{- end }}
 {{- end -}}
 
-/*scheme://[redis:password@]host:port[/master_set]*/
+/*scheme://[:password@]host:port[/master_set]*/
 {{- define "harbor.redis.url" -}}
   {{- with .Values.redis }}
     {{- $path := ternary "" (printf "/%s" (include "harbor.redis.masterSet" $)) (not (include "harbor.redis.masterSet" $)) }}
-    {{- $cred := ternary (printf "redis:%s@" (.external.password | urlquery)) "" (and (eq .type "external" ) (not (not .external.password))) }}
+    {{- $cred := ternary (printf ":%s@" (.external.password | urlquery)) "" (and (eq .type "external" ) (not (not .external.password))) }}
     {{- printf "%s://%s%s%s" (include "harbor.redis.scheme" $) $cred (include "harbor.redis.addr" $) $path -}}
   {{- end }}
 {{- end -}}
 
-/*scheme://[redis:password@]addr/db_index?idle_timeout_seconds=30*/
+/*scheme://[:password@]addr/db_index?idle_timeout_seconds=30*/
 {{- define "harbor.redis.urlForCore" -}}
   {{- with .Values.redis }}
     {{- $index := ternary "0" .external.coreDatabaseIndex (eq .type "internal") }}
     {{- printf "%s/%s?idle_timeout_seconds=30" (include "harbor.redis.url" $) $index -}}
   {{- end }}
 {{- end -}}
 
-/*scheme://[redis:password@]addr/db_index*/
+/*scheme://[:password@]addr/db_index*/
 {{- define "harbor.redis.urlForJobservice" -}}
   {{- with .Values.redis }}
     {{- $index := ternary "1" .external.jobserviceDatabaseIndex (eq .type "internal") }}
     {{- printf "%s/%s" (include "harbor.redis.url" $) $index -}}
   {{- end }}
 {{- end -}}
 
-/*scheme://[redis:password@]addr/db_index?idle_timeout_seconds=30*/
+/*scheme://[:password@]addr/db_index?idle_timeout_seconds=30*/
 {{- define "harbor.redis.urlForRegistry" -}}
   {{- with .Values.redis }}
     {{- $index := ternary "2" .external.registryDatabaseIndex (eq .type "internal") }}
     {{- printf "%s/%s?idle_timeout_seconds=30" (include "harbor.redis.url" $) $index -}}
   {{- end }}
 {{- end -}}
 
-/*scheme://[redis:password@]addr/db_index?idle_timeout_seconds=30*/
+/*scheme://[:password@]addr/db_index?idle_timeout_seconds=30*/
 {{- define "harbor.redis.urlForTrivy" -}}
   {{- with .Values.redis }}
     {{- $index := ternary "5" .external.trivyAdapterIndex (eq .type "internal") }}