Added config_local.py support, helm/README.md Update, Changed default port

Author: KorenP1

helm/README.md

@@ -14,17 +14,20 @@ The majority of features and values are covered in the helm chart but always can
 ### Important Values
 | Value | Description | Default |
 | --------- | ----------- | ------- |
-| `containerPort` | Internal PgAdmin4 Port | `8080` |
+| `containerPort` | Internal PgAdmin4 Port | `5050` |
 | `image.registry` | Image registry | `"docker.io"` |
 | `image.repository` | Image Repository | `"dpage/pgadmin4"` |
 | `image.tag` | Image tag (If empty, will use .Chart.AppVersion) | `""` |
 | `auth.email` | Admin Email | `"[email protected]"` |
 | `auth.password` | Admin password (If both auth.password and auth.existingSecret are empty, the password will be randomly generated) | `""` |
 | `auth.existingSecret` | Existing secret name for admin password (If both auth.password and auth.existingSecret are empty, the password will be randomly generated) | `""` |
 | `extraEnvVars` | Extra environment variables | `[]` |
-| `serverDefinitions.enabled` | Do predefined server definitions should be created | `false` |
-| `serverDefinitions.servers` | Server definitions to load | `{}` |
-| `preferences.enabled` | Do preferences should be initialized | `false` |
+| `config_local.enabled` | Whether to mount config_local.py file | `false` |
+| `config_local.data` | config_local.py configuration content | `""` |
+| `config_local.existingSecret` | Existing secret name containing config_local.py file | `""` |
+| `serverDefinitions.enabled` | Whether to mount servers.json | `false` |
+| `serverDefinitions.data` | Server definitions to import | `{}` |
+| `preferences.enabled` | Whether to mount preferences.json | `false` |
 | `preferences.data` | Preferences to load | `{}` |
 | `resources.*` | Allocated requests and limits resources | `{"requests": {...}, "limits": {...}}` |
 | `persistence.enabled` | PVC resource creation | `false` |

helm/templates/NOTES.txt

@@ -4,7 +4,7 @@ Image: {{ template "pgadmin4.image" . }}
 
 Credentials:
   Email: {{ .Values.auth.email }}
-  Password: {{ printf "$(kubectl get secret %s -n %s -o jsonpath='{.data.%s}' | base64 -d)" (include "pgadmin4.fullname" .) .Release.Namespace .Values.auth.passwordKey }}
+  Password: {{ printf "kubectl get secret %s -n %s -o jsonpath='{.data.%s}' | base64 -d" (include "pgadmin4.fullname" .) .Release.Namespace .Values.auth.passwordKey }}
 
 Ingress: {{ ternary (tpl .Values.ingress.hostname .) "DISABLED" .Values.ingress.enabled }}
 

helm/templates/configmap-serverDefinitions.yaml

@@ -10,5 +10,5 @@ metadata:
   annotations: {{ . | toYaml | nindent 4 }}
   {{- end }}
 data:
-  servers.json: | {{ tpl (dict "Servers" .Values.serverDefinitions.servers | toYaml) . | fromYaml | toPrettyJson | nindent 4 }}
+  servers.json: | {{ tpl (dict "Servers" .Values.serverDefinitions.data | toYaml) . | fromYaml | toPrettyJson | nindent 4 }}
 {{- end }}

helm/templates/deployment.yaml

@@ -31,12 +31,15 @@ spec:
         {{- if not .Values.existingSecret }}
         checksum/secret: {{ include (print $.Template.BasePath "/secret.yaml") . | sha256sum }}
         {{- end }}
-        {{- if .Values.preferences.enabled }}
-        checksum/configmap-preferences: {{ include (print $.Template.BasePath "/configmap-preferences.yaml") . | sha256sum }}
+        {{- if and .Values.config_local.enabled (empty .Values.config_local.existingSecret) }}
+        checksum/secret-config: {{ include (print $.Template.BasePath "/secret-config.yaml") . | sha256sum }}
         {{- end }}
         {{- if .Values.serverDefinitions.enabled }}
         checksum/configmap-server-definitions: {{ include (print $.Template.BasePath "/configmap-serverDefinitions.yaml") . | sha256sum }}
         {{- end }}
+        {{- if .Values.preferences.enabled }}
+        checksum/configmap-preferences: {{ include (print $.Template.BasePath "/configmap-preferences.yaml") . | sha256sum }}
+        {{- end }}
       {{- end }}
     spec:
       {{- if or .Values.global.imagePullSecrets .Values.image.pullSecrets }}
@@ -55,6 +58,14 @@ spec:
           persistentVolumeClaim:
             claimName: {{ template "pgadmin4.fullname" . }}
       {{- end }}
+      {{- if .Values.config_local.enabled }}
+        - name: config-local
+          secret:
+            secretName: {{ default (printf "%s-config" (include "pgadmin4.fullname" .)) .Values.config_local.existingSecret }}
+            items:
+              - key: {{ .Values.config_local.configKey }}
+                path: {{ .Values.config_local.configKey }}
+      {{- end }}
       {{- if .Values.serverDefinitions.enabled }}
         - name: server-definitions
           configMap:
@@ -127,6 +138,11 @@ spec:
             - name: empty-dir
               mountPath: /var/log/pgadmin
               subPath: logs
+              {{- if .Values.config_local.enabled }}
+            - name: config-local
+              mountPath: /pgadmin4/config_local.py
+              subPath: {{ .Values.config_local.configKey }}
+              {{- end }}
               {{- if .Values.serverDefinitions.enabled }}
             - name: server-definitions
               mountPath: /pgadmin4/servers.json

helm/templates/secret-config.yaml

@@ -0,0 +1,15 @@
+{{- if and .Values.config_local.enabled (empty .Values.config_local.existingSecret) }}
+apiVersion: v1
+kind: Secret
+metadata:
+  name: {{ template "pgadmin4.fullname" . }}-config
+  {{- with .Values.commonLabels }}
+  labels: {{ . | toYaml | nindent 4 }}
+  {{- end }}
+  {{- with .Values.commonAnnotations }}
+  annotations: {{ . | toYaml | nindent 4 }}
+  {{- end }}
+type: Opaque
+stringData:
+  {{ .Values.config_local.configKey }}: | {{ tpl .Values.config_local.data . | nindent 4 }}
+{{- end }}

helm/values.yaml

@@ -25,7 +25,7 @@ extraDeploy: []
 
 replicas: 1
 
-containerPort: 8080
+containerPort: 5050
 disablePostfix: true
 auth:
   email: [email protected]
@@ -38,9 +38,19 @@ extraEnvVars: []
 extraVolumes: []
 extraVolumeMounts: []
 
+config_local:
+  enabled: false
+  existingSecret: ""
+  configKey: config_local.py
+  data: ""
+#  data: |
+#    DEBUG = True
+#    JSON_LOGGER = True
+#    AUTHENTICATION_SOURCES = ['oauth2', 'internal']
+
 serverDefinitions:
   enabled: false
-  servers: {}
+  data: {}
 #   "1":
 #     Name: Minimally Defined Server
 #     Group: Servers
@@ -67,7 +77,7 @@ resources:
     memory: 512Mi
 
 persistence:
-  enabled: false
+  enabled: true
   size: 1Gi
   storageClass: ""
   accessModes: ["ReadWriteOnce"]