add sentinel support for chartmuseum

Signed-off-by: Ziming Zhang <zziming@vmware.com>
goharbor · Dec 23, 2020 · 25b539b · 25b539b
1 parent d1b652e
commit 25b539b
Show file tree

Hide file tree

Showing 4 changed files with 32 additions and 11 deletions.
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -137,7 +137,7 @@ jobs:
       run: |
         export GITHUB_TOKEN=xxx
         set -ex
-        kubectl apply -f manifests/samples/full_stack_fs.yaml
+        kubectl apply -f manifests/samples/full_stack_other_fs.yaml
         for i in $(seq 1 6);do
           sleep 30
           echo $i
@@ -166,7 +166,7 @@ jobs:
         sudo kubectl port-forward -n ingress-nginx service/ingress-nginx-controller 443:443 80:80 --address=0.0.0.0 &
         sleep 10
         echo 127.0.0.1 core.harbor.domain | sudo tee -a /etc/hosts
-        curl https://core.harbor.domain/api/v2.0/systeminfo -i -k
+        curl https://core.harbor.domain/api/v2.0/systeminfo -i -k -f
         mkdir -p ~/.docker/tls/core.harbor.domain
         kubectl -n cluster-sample-ns get secret sample-public-certificate -o jsonpath='{.data.ca\.crt}' \
           | base64 --decode \

diff --git a/config/config/assets/chartmuseum-config.yaml.tmpl b/config/config/assets/chartmuseum-config.yaml.tmpl
@@ -28,13 +28,22 @@ bearer.auth: 1
 {{- end }}
 
 {{- if .Spec.Cache.Redis }}
+{{- if .Spec.Cache.Redis.SentinelMasterSet }}
+cache: redis_sentinel
+{{- else }}
 cache: redis
+{{- end }}
 cache.redis:
-  {{- with (.Spec.Cache.Redis.GetDSN "") }}
-  addr: {{ quote .Host }}
-  # password: Will be set with environment variable
-  db: {{ .EscapedPath | trimAll "/" }}
+  {{- if .Spec.Cache.Redis.SentinelMasterSet }}
+  mastername: {{ .Spec.Cache.Redis.SentinelMasterSet | quote }}
+  {{- end }}
+  {{- if .Spec.Cache.Redis.Port }}
+  addr: {{ printf "%s:%d" .Spec.Cache.Redis.Host .Spec.Cache.Redis.Port | quote }}
+  {{- else }}
+  addr: {{ .Spec.Cache.Redis.Host | quote }}
   {{- end }}
+  # password: setted through environment variable
+  db: {{ .Spec.Cache.Redis.Database }}
 {{- end }}
 
 context.path: ''