From ec4ff751b36ffa357148d689713cf1110d4ba2c6 Mon Sep 17 00:00:00 2001 From: "Miguel A. Cabrera Minagorri" Date: Thu, 22 Aug 2019 14:24:00 +0000 Subject: [PATCH] [bitnami/harbor] Add Harbor Redis password when using redis chart dependency Signed-off-by: Miguel A. Cabrera Minagorri --- bitnami/harbor/Chart.yaml | 2 +- bitnami/harbor/templates/_helpers.tpl | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/bitnami/harbor/Chart.yaml b/bitnami/harbor/Chart.yaml index 6de52c51b..350a26065 100644 --- a/bitnami/harbor/Chart.yaml +++ b/bitnami/harbor/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v1 name: harbor -version: 2.5.2 +version: 2.5.3 appVersion: 1.8.1 description: Harbor is an an open source trusted cloud native registry project that stores, signs, and scans content keywords: diff --git a/bitnami/harbor/templates/_helpers.tpl b/bitnami/harbor/templates/_helpers.tpl index 0df389b66..5c0593566 100644 --- a/bitnami/harbor/templates/_helpers.tpl +++ b/bitnami/harbor/templates/_helpers.tpl @@ -227,9 +227,12 @@ We truncate at 63 chars because some Kubernetes name fields are limited to this {{- end -}} {{- define "harbor.redis.rawPassword" -}} - {{- if and (eq .Values.redis.enabled false) .Values.externalRedis.password -}} + {{- if and (not .Values.redis.enabled) .Values.externalRedis.password -}} {{- .Values.externalRedis.password -}} {{- end -}} + {{- if and .Values.redis.enabled .Values.redis.password -}} + {{- .Values.redis.password -}} + {{- end -}} {{- end -}} {{- define "harbor.redis.escapedRawPassword" -}}