Fix external database secret (#96)

* Fix providing external secret for database credentials * Update chart version and changelog
jfrog · Oct 24, 2018 · 558eaaf · 558eaaf
1 parent a5c8cfb
commit 558eaaf
Show file tree

Hide file tree

Showing 7 changed files with 23 additions and 4 deletions.
diff --git a/stable/artifactory-ha/CHANGELOG.md b/stable/artifactory-ha/CHANGELOG.md
@@ -1,6 +1,9 @@
 # JFrog Artifactory-ha Chart Changelog
 All changes to this chart will be documented in this file.
 
+## [0.6.9] - Oct 23, 2018
+* Fix providing external secret for database credentials
+
 ## [0.6.8] - Oct 22, 2018
 * Allow user to configure externalTrafficPolicy for Loadbalancer
 

diff --git a/stable/artifactory-ha/Chart.yaml b/stable/artifactory-ha/Chart.yaml
@@ -1,7 +1,7 @@
 apiVersion: v1
 name: artifactory-ha
 home: https://www.jfrog.com/artifactory/
-version: 0.6.8
+version: 0.6.9
 appVersion: 6.5.2
 description: Universal Repository Manager supporting all major packaging formats,
   build tools and CI servers.

diff --git a/stable/artifactory-ha/templates/artifactory-node-statefulset.yaml b/stable/artifactory-ha/templates/artifactory-node-statefulset.yaml
@@ -113,13 +113,26 @@ spec:
           value: '{{ .Values.database.host }}'
         - name: DB_PORT
           value: '{{ .Values.database.port }}'
+      {{- if .Values.database.secrets }}
+        - name: DB_USER
+          valueFrom:
+            secretKeyRef:
+              name: {{ .Values.database.secrets.user.name }}
+              key: {{ .Values.database.secrets.user.key }}
+        - name: DB_PASSWORD
+          valueFrom:
+            secretKeyRef:
+              name: {{ .Values.database.secrets.password.name }}
+              key: {{ .Values.database.secrets.password.key }}
+      {{- else }}
         - name: DB_USER
           value: '{{ .Values.database.user }}'
         - name: DB_PASSWORD
           valueFrom:
             secretKeyRef:
               name: {{ template "artifactory-ha.fullname" . }}
               key: db-password
+      {{- end }}
       {{- end }}
         - name: EXTRA_JAVA_OPTIONS
           value: "

diff --git a/stable/artifactory-ha/templates/artifactory-primary-statefulset.yaml b/stable/artifactory-ha/templates/artifactory-primary-statefulset.yaml
@@ -121,7 +121,7 @@ spec:
           valueFrom:
             secretKeyRef:
               name: {{ .Values.database.secrets.user.name }}
-              key: {{ .Values.database.secrets.user.Key }}
+              key: {{ .Values.database.secrets.user.key }}
         - name: DB_PASSWORD
           valueFrom:
             secretKeyRef:

diff --git a/stable/artifactory/CHANGELOG.md b/stable/artifactory/CHANGELOG.md
@@ -1,6 +1,9 @@
 # JFrog Artifactory Chart Changelog
 All changes to this chart will be documented in this file.
 
+## [7.6.8] - Oct 23, 2018
+* Fix providing external secret for database credentials
+
 ## [7.6.7] - Oct 23, 2018
 * Allow user to configure externalTrafficPolicy for Loadbalancer
 

diff --git 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: 7.6.7
+version: 7.6.8
 appVersion: 6.5.2
 description: Universal Repository Manager supporting all major packaging formats,
   build tools and CI servers.

diff --git a/stable/artifactory/templates/artifactory-statefulset.yaml b/stable/artifactory/templates/artifactory-statefulset.yaml
@@ -116,7 +116,7 @@ spec:
           valueFrom:
             secretKeyRef:
               name: {{ .Values.database.secrets.user.name }}
-              key: {{ .Values.database.secrets.user.Key }}
+              key: {{ .Values.database.secrets.user.key }}
         - name: DB_PASSWORD
           valueFrom:
             secretKeyRef: