Add existingSecret configuration key to postgresql chart (#9729)

* Add existingSecret configuration key to postgresql chart Signed-off-by: Phillip Kast <phil@yearofcode.com> * Use existingSecret in new metrics sidecar Signed-off-by: Phillip Kast <phil@yearofcode.com> * Bump chart version to 2.7.8 Signed-off-by: Phillip Kast <phil@yearofcode.com>
helm · Dec 5, 2018 · 0ab8b4e · 0ab8b4e
1 parent 309e097
commit 0ab8b4e
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 2 deletions.
diff --git a/stable/postgresql/Chart.yaml b/stable/postgresql/Chart.yaml
@@ -1,5 +1,5 @@
 name: postgresql
-version: 2.7.7
+version: 2.7.8
 appVersion: 10.6.0
 description: Chart for PostgreSQL, an object-relational database management system (ORDBMS) with an emphasis on extensibility and on standards-compliance.
 keywords:

diff --git a/stable/postgresql/README.md b/stable/postgresql/README.md
@@ -63,6 +63,8 @@ The following tables lists the configurable parameters of the PostgreSQL chart a
 | `replication.user`                            | Replication user                                     | `repl_user`                                               |
 | `replication.password`                        | Replication user password                            | `repl_password`                                           |
 | `replication.slaveReplicas`                   | Number of slaves replicas                            | `1`                                                       |
+| `existingSecret`                              | Name of existing secret to use for postgresl passwords        | `nil`                                                     |
+
 | `postgresqlUsername`                          | PostgreSQL admin user                                | `postgres`                                                |
 | `postgresqlPassword`                          | PostgreSQL admin password                            | _random 10 character alphanumeric string_                 |
 | `postgresqlDatabase`                          | PostgreSQL database                                  | `nil`                                                     |

diff --git a/stable/postgresql/templates/NOTES.txt b/stable/postgresql/templates/NOTES.txt
@@ -23,7 +23,8 @@ PostgreSQL can be accessed via port 5432 on the following DNS name from within y
 
 To get the password for "{{ .Values.postgresqlUsername }}" run:
 
-    export POSTGRESQL_PASSWORD=$(kubectl get secret --namespace {{ .Release.Namespace }} {{ template "postgresql.fullname" . }} -o jsonpath="{.data.postgresql-password}" | base64 --decode)
+    export POSTGRESQL_PASSWORD=$(kubectl get secret --namespace {{ .Release.Namespace }} 
+            {{ if .Values.existingSecret }}{{ .Values.existingSecret }}{{ else }}{{ template "postgresql.fullname" . }}{{ end }} -o jsonpath="{.data.postgresql-password}" | base64 --decode)
 
 To connect to your database run the following command:
 

diff --git a/stable/postgresql/templates/secrets.yaml b/stable/postgresql/templates/secrets.yaml
@@ -1,3 +1,4 @@
+{{- if not .Values.existingSecret }}
 apiVersion: v1
 kind: Secret
 metadata:
@@ -21,3 +22,4 @@ data:
   postgresql-replication-password: {{ randAlphaNum 10 | b64enc | quote }}
   {{ end }}
   {{ end }}
+{{- end -}}
diff --git a/stable/postgresql/templates/statefulset-slaves.yaml b/stable/postgresql/templates/statefulset-slaves.yaml
@@ -93,7 +93,11 @@ spec:
         - name: POSTGRESQL_REPLICATION_PASSWORD
           valueFrom:
             secretKeyRef:
+            {{- if .Values.existingSecret }}
+              name: {{ .Values.existingSecret }}
+            {{- else }}
               name: {{ template "postgresql.fullname" . }}
+            {{- end }}  
               key: postgresql-replication-password
         - name: POSTGRESQL_MASTER_HOST
           value: {{ template "postgresql.fullname" . }}

diff --git a/stable/postgresql/templates/statefulset.yaml b/stable/postgresql/templates/statefulset.yaml
@@ -104,7 +104,11 @@ spec:
         - name: POSTGRESQL_PASSWORD
           valueFrom:
             secretKeyRef:
+            {{- if .Values.existingSecret }}
+              name: {{ .Values.existingSecret }}
+            {{- else }}
               name: {{ template "postgresql.fullname" . }}
+            {{- end }}  
               key: postgresql-password
         - name: POSTGRESQL_DATABASE
           value: {{ .Values.postgresqlDatabase | quote }}
@@ -170,7 +174,11 @@ spec:
         - name: DATA_SOURCE_PASS
           valueFrom:
             secretKeyRef:
+            {{- if .Values.existingSecret }}
+              name: {{ .Values.existingSecret }}
+            {{- else }}
               name: {{ template "postgresql.fullname" . }}
+            {{- end }}  
               key: postgresql-password
         - name: DATA_SOURCE_USER
           value: {{ .Values.postgresqlUsername }}