From c251c203648c2826c4c00f3750350a5e63e560c4 Mon Sep 17 00:00:00 2001
From: Josh Woodcock <josh@spacee.com>
Date: Wed, 16 Sep 2020 18:43:54 -0500
Subject: [PATCH] Create database secrets if postgres password is set

---
 stable/artifactory/Chart.yaml                                  | 2 +-
 stable/artifactory/templates/artifactory-database-secrets.yaml | 2 +-
 stable/artifactory/values.yaml                                 | 3 +++
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/stable/artifactory/Chart.yaml b/stable/artifactory/Chart.yaml
index 55b86d3dc2..a4d0a09c7d 100644
--- a/stable/artifactory/Chart.yaml
+++ b/stable/artifactory/Chart.yaml
@@ -1,7 +1,7 @@
 apiVersion: v1
 name: artifactory
 home: https://www.jfrog.com/artifactory/
-version: 11.0.1
+version: 11.0.2
 appVersion: 7.7.8
 description: Universal Repository Manager supporting all major packaging formats,
   build tools and CI servers.
diff --git a/stable/artifactory/templates/artifactory-database-secrets.yaml b/stable/artifactory/templates/artifactory-database-secrets.yaml
index 9edf87dc13..b178b491ac 100644
--- a/stable/artifactory/templates/artifactory-database-secrets.yaml
+++ b/stable/artifactory/templates/artifactory-database-secrets.yaml
@@ -1,4 +1,4 @@
-{{- if and  (not .Values.database.secrets) (not .Values.postgresql.enabled) }}
+{{- if or (and  (not .Values.database.secrets) (not .Values.postgresql.enabled)) .Values.database.password }}
 apiVersion: v1
 kind: Secret
 metadata:
diff --git a/stable/artifactory/values.yaml b/stable/artifactory/values.yaml
index 19ad1bbae3..4426382fa5 100644
--- a/stable/artifactory/values.yaml
+++ b/stable/artifactory/values.yaml
@@ -429,6 +429,9 @@ artifactory:
         url: "jdbc:postgresql://{{ .Release.Name }}-postgresql:{{ .Values.postgresql.service.port }}/{{ .Values.postgresql.postgresqlDatabase }}"
         driver: org.postgresql.Driver
         username: "{{ .Values.postgresql.postgresqlUsername }}"
+        {{- if .Values.postgresql.postgresqlPassword }}
+        password: "{{ .Values.postgresql.postgresqlPassword }}"
+        {{- end }}
         {{- else }}
         type: "{{ .Values.database.type }}"
         driver: "{{ .Values.database.driver }}"