[pgadmin4] Fix Helm Chart invalid empty subPath (#265)

Fixes: * #261
rowanruseler · Nov 25, 2024 · e6e2bcb · e6e2bcb
1 parent 2c7e86e
commit e6e2bcb
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 8 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.33.0
+version: 1.33.1
 appVersion: "8.13"
 keywords:
   - pgadmin

diff --git a/charts/pgadmin4/templates/deployment.yaml b/charts/pgadmin4/templates/deployment.yaml
@@ -66,7 +66,7 @@ spec:
           volumeMounts:
             - name: pgadmin-data
               mountPath: /var/lib/pgadmin
-              subPath: {{ .Values.persistentVolume.subPath | default "" }}
+              subPath: "{{ .Values.persistentVolume.subPath }}"
           securityContext:
             runAsUser: 0
           resources:
@@ -190,7 +190,7 @@ spec:
           volumeMounts:
             - name: pgadmin-data
               mountPath: /var/lib/pgadmin
-              subPath: {{ .Values.persistentVolume.subPath | default "" }}
+              subPath: "{{ .Values.persistentVolume.subPath }}"
           {{- if and (.Values.serverDefinitions.enabled) (or (eq .Values.serverDefinitions.resourceType "ConfigMap") (eq .Values.serverDefinitions.resourceType "Secret")) -}}
           {{- if or (.Values.serverDefinitions.existingConfigmap) (.Values.serverDefinitions.existingSecret) (.Values.existingSecret) (.Values.serverDefinitions.servers) }}
             - name: definitions
@@ -201,13 +201,13 @@ spec:
           {{- range .Values.extraConfigmapMounts }}
             - name: {{ .name }}
               mountPath: {{ .mountPath }}
-              subPath: {{ .subPath | default "" }}
+              subPath: {{ .subPath }}
               readOnly: {{ .readOnly }}
           {{- end }}
           {{- range .Values.extraSecretMounts }}
             - name: {{ .name }}
               mountPath: {{ .mountPath }}
-              subPath: {{ .subPath | default "" }}
+              subPath: {{ .subPath }}
               readOnly: {{ .readOnly }}
           {{- end }}
           {{- if .Values.extraVolumeMounts }}

diff --git a/charts/pgadmin4/values.yaml b/charts/pgadmin4/values.yaml
@@ -135,7 +135,7 @@ ingress:
 extraConfigmapMounts: []
   # - name: certs-configmap
   #   mountPath: /etc/ssl/certs
-  #   subPath: ca-certificates.crt # (optional)
+  #   subPath: ""
   #   configMap: certs-configmap
   #   readOnly: true
 
@@ -254,8 +254,11 @@ persistentVolume:
   ##
   # storageClass: "-"
   # existingClaim: ""
-  ## Sub-directory of the PV to mount
-  # subPath: ""
+
+  ## Subdirectory of pgAdmin4 Persistent Volume to mount
+  ## Useful if the volume's root directory is not empty
+  ##
+  subPath: ""
 
 ## Additional volumes to be added to the deployment
 ##