fix(config):handle empty redis password (#625)

- handle empty redis password for js - handle empty redis password for registry - handle empty redis password for chartmuseum Signed-off-by: Steven Zou <szou@vmware.com> also fix #608
goharbor · Apr 29, 2021 · 0592321 · 0592321
1 parent 8481e68
commit 0592321
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 2 deletions.
diff --git a/config/config/assets/jobservice-config.yaml.tmpl b/config/config/assets/jobservice-config.yaml.tmpl
@@ -18,7 +18,11 @@ worker_pool:
   backend: "redis"
 
   redis_pool:
+{{- if .Spec.WorkerPool.Redis.PasswordRef }}
     redis_url: {{ "redis-password" | secretData .Spec.WorkerPool.Redis.PasswordRef | .Spec.WorkerPool.Redis.GetDSN }}
+{{- else }}
+    redis_url: {{ "" | .Spec.WorkerPool.Redis.GetDSN }}
+{{- end }}
     namespace: {{ default ( printf "jobservice::%s::%s" .ObjectMeta.Namespace .ObjectMeta.Name ) .Spec.WorkerPool.Redis.Namespace }}
     idle_timeout_second: {{ .Spec.WorkerPool.Redis.IdleTimeout.Duration.Seconds | int64 }}
 

diff --git a/controllers/goharbor/chartmuseum/deployments.go b/controllers/goharbor/chartmuseum/deployments.go
@@ -235,7 +235,7 @@ func (r *Reconciler) GetDeployment(ctx context.Context, chartMuseum *goharborv1.
 		})
 	}
 
-	if chartMuseum.Spec.Cache.Redis != nil {
+	if chartMuseum.Spec.Cache.Redis != nil && len(chartMuseum.Spec.Cache.Redis.PasswordRef) > 0 {
 		envs = append(envs, corev1.EnvVar{
 			Name: "CACHE_REDIS_PASSWORD",
 			ValueFrom: &corev1.EnvVarSource{

diff --git a/controllers/goharbor/registry/deployments.go b/controllers/goharbor/registry/deployments.go
@@ -98,7 +98,7 @@ func (r *Reconciler) GetDeployment(ctx context.Context, registry *goharborv1.Reg
 		})
 	}
 
-	if registry.Spec.Redis != nil {
+	if registry.Spec.Redis != nil && len(registry.Spec.Redis.PasswordRef) > 0 {
 		envs = append(envs, corev1.EnvVar{
 			Name: "REGISTRY_REDIS_PASSWORD",
 			ValueFrom: &corev1.EnvVarSource{

diff --git a/manifests/cluster/deployment.yaml b/manifests/cluster/deployment.yaml
@@ -20983,7 +20983,11 @@ data:
       backend: "redis"
 
       redis_pool:
+    {{- if .Spec.WorkerPool.Redis.PasswordRef }}
         redis_url: {{ "redis-password" | secretData .Spec.WorkerPool.Redis.PasswordRef | .Spec.WorkerPool.Redis.GetDSN }}
+    {{- else }}
+        redis_url: {{ "" | .Spec.WorkerPool.Redis.GetDSN }}
+    {{- end }}
         namespace: {{ default ( printf "jobservice::%s::%s" .ObjectMeta.Namespace .ObjectMeta.Name ) .Spec.WorkerPool.Redis.Namespace }}
         idle_timeout_second: {{ .Spec.WorkerPool.Redis.IdleTimeout.Duration.Seconds | int64 }}
 

diff --git a/manifests/harbor/deployment.yaml b/manifests/harbor/deployment.yaml
@@ -13527,7 +13527,11 @@ data:
       backend: "redis"
 
       redis_pool:
+    {{- if .Spec.WorkerPool.Redis.PasswordRef }}
         redis_url: {{ "redis-password" | secretData .Spec.WorkerPool.Redis.PasswordRef | .Spec.WorkerPool.Redis.GetDSN }}
+    {{- else }}
+        redis_url: {{ "" | .Spec.WorkerPool.Redis.GetDSN }}
+    {{- end }}
         namespace: {{ default ( printf "jobservice::%s::%s" .ObjectMeta.Namespace .ObjectMeta.Name ) .Spec.WorkerPool.Redis.Namespace }}
         idle_timeout_second: {{ .Spec.WorkerPool.Redis.IdleTimeout.Duration.Seconds | int64 }}