Squashed commit of the following:

commit 0ad8576 Author: Alexandre Nuttinck <[email protected]> Date: Fri Aug 30 10:45:49 2019 +0200 feature mount servers.json #4
cetic · Aug 30, 2019 · 22b8dec · 22b8dec
1 parent 572fe03
commit 22b8dec
Show file tree

Hide file tree

Showing 5 changed files with 53 additions and 6 deletions.
diff --git a/Chart.yaml b/Chart.yaml
@@ -1,6 +1,6 @@
 name: pgadmin
-version: 0.1.8
-appVersion: 4.11.0
+version: 0.1.9
+appVersion: 4.12.0
 description: pgAdmin is a web based administration tool for the PostgreSQL database.
 keywords:
   - pgadmin

diff --git a/README.md b/README.md
@@ -87,10 +87,13 @@ The following table lists the configurable parameters of the pgAdmin chart and t
 | `ingress.path`                                                              | Path to access frontend                                                                                            | `/`                             |
 | `ingress.hosts`                                                             | Ingress hosts                                                                                                      | `[]`                            |
 | `ingress.tls`                                                               | Ingress TLS configuration                                                                                          | `[]`                            |
+| **Servers**                                                                 |
+| `servers.enabled`                                                           | Enable the servers configuration. If enabled, server definitions found in `servers.config` will be loaded at launch time.| `true`                    |
+| `servers.config`                                                            | Server definitions                                                                                                 | `See the values.yaml`           |
 | **ReadinessProbe**                                                          |
-| `readinessProbe`                                                            | Rediness Probe settings                                                                                            | `nil` |
+| `readinessProbe`                                                            | Rediness Probe settings                                                                                            | `nil`                           |
 | **LivenessProbe**                                                           |
-| `livenessProbe`                                                             | Liveness Probe settings                                                                                            | `nil`|
+| `livenessProbe`                                                             | Liveness Probe settings                                                                                            | `nil`                           |
 | **Resources**                                                               |
 | `resources`                                                                 | CPU/Memory resource requests/limits                                                                                | `{}`                            |
 

diff --git a/templates/configmap.yaml b/templates/configmap.yaml
@@ -0,0 +1,15 @@
+---
+{{- if .Values.servers.enabled }}
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: {{ template "pgadmin.fullname" . }}
+  labels:
+    app: {{ template "pgadmin.name" . }}
+    chart: {{ template "pgadmin.chart" . }}
+    release: {{ .Release.Name | quote }}
+    heritage: {{ .Release.Service | quote }}
+data:
+  servers.json: |-
+{{ toJson .Values.servers.config | indent 4 }}
+{{- end }}
diff --git a/templates/deployment.yaml b/templates/deployment.yaml
@@ -1,3 +1,4 @@
+---
 apiVersion: extensions/v1beta1
 kind: Deployment
 metadata:
@@ -48,13 +49,18 @@ spec:
           - name: pgadmin-data
             mountPath: /var/lib/pgadmin
          {{- if .Values.pgadmin.tls }}
-          - namegedit : tls-cert
+          - name: tls-cert
             mountPath: /certs/server.cert
             subPath: server.cert
           - name: tls-private-key
             mountPath: /certs/server.key
             subPath: server.key
          {{- end }}
+         {{- if .Values.servers.enabled }}
+          - name: servers-config
+            mountPath: /pgadmin4/servers.json
+            subPath: servers.json
+         {{- end}}
           resources:
 {{ toYaml .Values.resources | indent 12 }}
           livenessProbe:
@@ -83,6 +89,14 @@ spec:
               - key: server.cert
                 path: server.cert
          {{- end }}
+         {{- if .Values.servers.enabled }}
+        - name: servers-config
+          configMap:
+            name: {{ template "pgadmin.fullname" . }}
+            items:
+            - key: servers.json
+              path: servers.json
+         {{- end }}
     {{- if .Values.nodeSelector }}
       nodeSelector:
 {{ toYaml .Values.nodeSelector | indent 8 }}

diff --git a/values.yaml b/values.yaml
@@ -3,7 +3,7 @@
 ##
 image:
   repository: dpage/pgadmin4
-  tag: 4.11
+  tag: 4.12
   pullPolicy: IfNotPresent
 
 pgadmin:
@@ -71,6 +71,21 @@ ingress:
   hosts: []
   tls: []
 
+## Configure servers.json: https://www.pgadmin.org/docs/pgadmin4/latest/import_export_servers.html
+##
+servers:
+  enabled: false
+  config:
+    Servers:
+      1:
+        Name: "Test"
+        Group: "Server Group 1"
+        Port: 5432
+        Username: "postgres"
+        Host: "postgres"
+        SSLMode: "prefer"
+        MaintenanceDB: "postgres"
+
 ## Configure liveness and readiness probes
 ## ref: https://kubernetes.io/docs/tasks/configure-pod-container/configure-liveness-readiness-probes/
 ##