Skip to content

Fix Redis URL formatting in Harbor Helm chart #2153

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Fix Redis URL formatting in Harbor Helm chart #2153

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
44e9526
Fix Redis URL formatting in Harbor Helm chart
Eyalm321 Mar 18, 2025
b85d095
Fix redis URL issue in Harbor Helm chart
Eyalm321 Mar 18, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
106 changes: 76 additions & 30 deletions templates/_helpers.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,17 +148,15 @@ app: "{{ template "harbor.name" . }}"

{{- define "harbor.redis.scheme" -}}
{{- with .Values.redis }}
{{- if eq .type "external" -}}
{{- if not (not .external.sentinelMasterSet) -}}
{{- ternary "rediss+sentinel" "redis+sentinel" (.external.tlsOptions.enable) }}
{{- else -}}
{{- ternary "rediss" "redis" (.external.tlsOptions.enable) }}
{{- end -}}
{{- else -}}
{{ print "redis" }}
{{- end -}}
{{- $scheme := ternary "rediss" "redis" (.external.tlsOptions.enable) }}
{{- if and (eq .type "external") .external.sentinelMasterSet }}
{{- printf "%s+sentinel" $scheme }}
{{- else }}
{{- printf "%s" $scheme }}
{{- end }}
{{- end }}
{{- end -}}
{{- end }}


{{- define "harbor.redis.enableTLS" -}}
{{- with .Values.redis }}
Expand Down Expand Up @@ -192,13 +190,18 @@ app: "{{ template "harbor.name" . }}"

{{- define "harbor.redis.cred" -}}
{{- with .Values.redis }}
{{- if (and (eq .type "external" ) (.external.existingSecret)) }}
{{- printf ":%s@" (include "harbor.redis.pwdfromsecret" $) }}
{{- else }}
{{- ternary (printf "%s:%s@" (.external.username | urlquery) (.external.password | urlquery)) "" (and (eq .type "external" ) (not (not .external.password))) }}
{{- $authPrefix := "" }}
{{- if and (eq .type "external") .external.password }}
{{- if .external.sentinelMasterSet }}
{{- $authPrefix = printf "%s@" (urlquery .external.password) }}
{{- else }}
{{- $authPrefix = printf ":%s@" (urlquery .external.password) }}
{{- end }}
{{- end }}
{{- printf "%s" $authPrefix }}
{{- end }}
{{- end -}}
{{- end }}


/*scheme://[:password@]host:port[/master_set]*/
{{- define "harbor.redis.url" -}}
Expand All @@ -211,51 +214,94 @@ app: "{{ template "harbor.name" . }}"
/*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 -}}
{{- $password := .external.password | default "" }}
{{- $address := .external.addr | default "redis:6379" }}
{{- $index := printf "%d" (.external.coreDatabaseIndex | default 0) }}
{{- $authPrefix := "" }}
{{- if $password }}
{{- $authPrefix = printf ":%s@" $password }}
{{- end }}
{{- printf "redis://%s%s/%s?idle_timeout_seconds=30" $authPrefix $address $index -}}
{{- end }}
{{- end -}}
{{- end }}


/*scheme://[:password@]addr/db_index*/

/*scheme://[:password@]addr/db_index?idle_timeout_seconds=30*/
{{- define "harbor.redis.urlForJobservice" -}}
{{- with .Values.redis }}
{{- $index := ternary .internal.jobserviceDatabaseIndex .external.jobserviceDatabaseIndex (eq .type "internal") }}
{{- printf "%s/%s" (include "harbor.redis.url" $) $index -}}
{{- $password := .external.password | default "" }}
{{- $address := .external.addr | default "redis:6379" }}
{{- $index := printf "%d" (.external.jobserviceDatabaseIndex | default 1 | int) }}
{{- $authPrefix := "" }}
{{- if $password }}
{{- $authPrefix = printf ":%s@" $password }}
{{- end }}
{{- printf "redis://%s%s/%s?idle_timeout_seconds=30" $authPrefix $address $index -}}
{{- end }}
{{- end -}}


/*scheme://[:password@]addr/db_index?idle_timeout_seconds=30*/
{{- define "harbor.redis.urlForRegistry" -}}
{{- with .Values.redis }}
{{- $index := ternary .internal.registryDatabaseIndex .external.registryDatabaseIndex (eq .type "internal") }}
{{- printf "%s/%s?idle_timeout_seconds=30" (include "harbor.redis.url" $) $index -}}
{{- $password := .external.password | default "" }}
{{- $address := .external.addr | default "redis:6379" }}
{{- $index := .external.registryDatabaseIndex | default 2 | toString }}
{{- $authPrefix := "" }}
{{- if $password }}
{{- $authPrefix = printf ":%s@" $password }}
{{- end }}
{{- printf "redis://%s%s/%s?idle_timeout_seconds=30" $authPrefix $address $index -}}
{{- end }}
{{- end -}}


/*scheme://[:password@]addr/db_index?idle_timeout_seconds=30*/
{{- define "harbor.redis.urlForTrivy" -}}
{{- with .Values.redis }}
{{- $index := ternary .internal.trivyAdapterIndex .external.trivyAdapterIndex (eq .type "internal") }}
{{- printf "%s/%s?idle_timeout_seconds=30" (include "harbor.redis.url" $) $index -}}
{{- $password := .external.password | default "" }}
{{- $address := .external.addr | default "redis:6379" }}
{{- $index := .external.trivyAdapterIndex | default "5" }}
{{- $authPrefix := "" }}
{{- if $password }}
{{- $authPrefix = printf ":%s@" $password }}
{{- end }}
{{- printf "redis://%s%s/%s?idle_timeout_seconds=30" $authPrefix $address $index -}}
{{- end }}
{{- end -}}


/*scheme://[:password@]addr/db_index?idle_timeout_seconds=30*/
{{- define "harbor.redis.urlForHarbor" -}}
{{- with .Values.redis }}
{{- $index := ternary .internal.harborDatabaseIndex .external.harborDatabaseIndex (eq .type "internal") }}
{{- printf "%s/%s?idle_timeout_seconds=30" (include "harbor.redis.url" $) $index -}}
{{- $password := .external.password | default "" }}
{{- $address := .external.addr | default "redis:6379" }}
{{- $index := .external.harborDatabaseIndex | default "3" }}
{{- $authPrefix := "" }}
{{- if $password }}
{{- $authPrefix = printf ":%s@" $password }}
{{- end }}
{{- printf "redis://%s%s/%s?idle_timeout_seconds=30" $authPrefix $address $index -}}
{{- end }}
{{- end -}}
{{- end }}


/*scheme://[:password@]addr/db_index?idle_timeout_seconds=30*/
{{- define "harbor.redis.urlForCache" -}}
{{- with .Values.redis }}
{{- $index := ternary .internal.cacheLayerDatabaseIndex .external.cacheLayerDatabaseIndex (eq .type "internal") }}
{{- printf "%s/%s?idle_timeout_seconds=30" (include "harbor.redis.url" $) $index -}}
{{- $password := .external.password | default "" }}
{{- $address := .external.addr | default "redis:6379" }}
{{- $index := .external.cacheLayerDatabaseIndex | default "4" }}
{{- $authPrefix := "" }}
{{- if $password }}
{{- $authPrefix = printf ":%s@" $password }}
{{- end }}
{{- printf "redis://%s%s/%s?idle_timeout_seconds=30" $authPrefix $address $index -}}
{{- end }}
{{- end -}}


{{- define "harbor.redis.dbForRegistry" -}}
{{- with .Values.redis }}
{{- ternary .internal.registryDatabaseIndex .external.registryDatabaseIndex (eq .type "internal") }}
Expand Down