[pgadmin4] Decouple serverDefinitions from existingSecret (#211)

* Decouple serverDefinitions from existingSecret Signed-off-by: Simon Domke <simon.domke@gmail.com> * Allow serverDefinitions as either ConfigMap or Secret Signed-off-by: Simon Domke <simon.domke@gmail.com> --------- Signed-off-by: Simon Domke <simon.domke@gmail.com>
rowanruseler · Aug 31, 2023 · 183dc3c · 183dc3c
1 parent ab289c5
commit 183dc3c
Show file tree

Hide file tree

Showing 7 changed files with 37 additions and 6 deletions.
diff --git a/charts/pgadmin4/Chart.yaml b/charts/pgadmin4/Chart.yaml
@@ -1,7 +1,7 @@
 apiVersion: v1
 description: pgAdmin4 is a web based administration tool for PostgreSQL database
 name: pgadmin4
-version: 1.16.1
+version: 1.17.0
 appVersion: "7.5"
 keywords:
   - pgadmin

diff --git a/charts/pgadmin4/README.md b/charts/pgadmin4/README.md
@@ -65,6 +65,7 @@ The command removes nearly all the Kubernetes components associated with the cha
 | `serviceAccount.name` | The name of the service account. Otherwise uses the fullname. | `` |
 | `strategy` | Specifies the strategy used to replace old Pods by new ones | `{}` |
 | `serverDefinitions.enabled` | Enables Server Definitions | `false` |
+| `serverDefinitions.resourceType` | The type of resource to deploy server definitions (either `ConfigMap` or `Secret`) | `ConfigMap` |
 | `serverDefinitions.servers` | Pre-configured server parameters | `{}` |
 | `networkPolicy.enabled` | Enables Network Policy | `true` |
 | `ingress.enabled` | Enables Ingress | `false` |

diff --git a/charts/pgadmin4/templates/secrets.yaml → charts/pgadmin4/templates/auth-secret.yaml b/charts/pgadmin4/templates/secrets.yaml → charts/pgadmin4/templates/auth-secret.yaml
@@ -10,7 +10,4 @@ metadata:
 type: Opaque
 data:
   password: {{ default "SuperSecret" .Values.env.password | b64enc | quote }}
-{{- if .Values.serverDefinitions.enabled }}
-  servers.json: {{ include "pgadmin.serverDefinitions" . | b64enc | quote }}
-{{- end }}
 {{- end }}
diff --git a/charts/pgadmin4/templates/deployment.yaml b/charts/pgadmin4/templates/deployment.yaml
@@ -35,7 +35,7 @@ spec:
         {{- .Values.podAnnotations | toYaml | nindent 8 }}
       {{- end }}
       {{- if not .Values.existingSecret }}
-        checksum/secret: {{ include (print $.Template.BasePath "/secrets.yaml") . | sha256sum }}
+        checksum/secret: {{ include (print $.Template.BasePath "/auth-secret.yaml") . | sha256sum }}
       {{- end }}
     {{- end }}
 
@@ -212,8 +212,13 @@ spec:
       {{- end }}
       {{- if .Values.serverDefinitions.enabled }}
         - name: definitions
+          {{- if eq .Values.serverDefinitions.resourceType "Secret" }}
           secret:
-            secretName: {{ template "pgadmin.secretName" . }}
+            secretName: {{ $fullName }}-server-definitions
+          {{- else }}
+          configMap:
+            name: {{ $fullName }}-server-definitions
+          {{- end }}
             items:
             - key: servers.json
               path: servers.json

diff --git a/charts/pgadmin4/templates/server-definitions-configmap.yaml b/charts/pgadmin4/templates/server-definitions-configmap.yaml
@@ -0,0 +1,12 @@
+{{- if and .Values.serverDefinitions.enabled ( ne .Values.serverDefinitions.resourceType "Secret" ) }}
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: {{ include "pgadmin.fullname" . }}-server-definitions
+  namespace: {{ include "pgadmin.namespaceName" . }}
+  labels:
+    {{- include "pgadmin.labels" . | nindent 4 }}
+data:
+  servers.json: |-
+{{ include "pgadmin.serverDefinitions" . | indent 4 }}
+{{- end }}
diff --git a/charts/pgadmin4/templates/server-definitions-secret.yaml b/charts/pgadmin4/templates/server-definitions-secret.yaml
@@ -0,0 +1,12 @@
+{{- if and .Values.serverDefinitions.enabled ( eq .Values.serverDefinitions.resourceType "Secret" ) }}
+apiVersion: v1
+kind: Secret
+metadata:
+  name: {{ include "pgadmin.fullname" . }}-server-definitions
+  namespace: {{ include "pgadmin.namespaceName" . }}
+  labels:
+    {{- include "pgadmin.labels" . | nindent 4 }}
+type: Opaque
+data:
+  servers.json: {{ include "pgadmin.serverDefinitions" . | b64enc | quote }}
+{{- end }}
diff --git a/charts/pgadmin4/values.yaml b/charts/pgadmin4/values.yaml
@@ -72,6 +72,10 @@ serverDefinitions:
   ##
   enabled: false
 
+  ## The resource type to use for deploying server definitions.
+  ## Can either be ConfigMap or Secret
+  resourceType: ConfigMap
+
   servers:
   #  firstServer:
   #    Name: "Minimally Defined Server"