[pgadmin4] fix bug where secret isnt created when using .serverDefini…

…tions.resourceType (#252) Signed-off-by: Alex Hofmann <45359966+alexhfmnn@users.noreply.github.com> Co-authored-by: Rowan Ruseler <rowanruseler@gmail.com>
rowanruseler · May 23, 2024 · 8a8a2f5 · 8a8a2f5
1 parent 8027e07
commit 8a8a2f5
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 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.25.2
+version: 1.25.3
 appVersion: "8.6"
 keywords:
   - pgadmin

diff --git a/charts/pgadmin4/templates/_helpers.tpl b/charts/pgadmin4/templates/_helpers.tpl
@@ -130,10 +130,10 @@ Generate serverDefinitions secret name
 {{- if eq .Values.serverDefinitions.resourceType "Secret" -}}
     {{- if .Values.serverDefinitions.existingSecret }}
         {{- printf "%s" (.Values.serverDefinitions.existingSecret) }}
+    {{- else if .Values.serverDefinitions.servers }}
+        {{- include "pgadmin.fullname" . }}-server-definitions
     {{- else if .Values.existingSecret }}
         {{- printf "%s" (.Values.existingSecret) }}
-    {{- else }}
-        {{- include "pgadmin.fullname" . }}-server-definitions
     {{- end }}
 {{- end }}
 {{- end }}

diff --git a/charts/pgadmin4/templates/server-definitions-secret.yaml b/charts/pgadmin4/templates/server-definitions-secret.yaml
@@ -1,4 +1,4 @@
-{{- if and (not .Values.serverDefinitions.existingSecret) (not .Values.existingSecret) -}}
+{{- if not .Values.serverDefinitions.existingSecret -}}
 {{- if and (.Values.serverDefinitions.enabled) ( eq .Values.serverDefinitions.resourceType "Secret") (.Values.serverDefinitions.servers) }}
 apiVersion: v1
 kind: Secret