From 2cd2c6b6d057d3818e7e8005ae5d41b7ba398fcd Mon Sep 17 00:00:00 2001
From: tm8enk <frederic.comte@insee.fr>
Date: Thu, 1 Apr 2021 08:19:51 +0000
Subject: [PATCH] pgadmin

---
 charts/pgadmin/Chart.yaml                | 2 +-
 charts/pgadmin/templates/deployment.yaml | 8 +++++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/charts/pgadmin/Chart.yaml b/charts/pgadmin/Chart.yaml
index d6f8e9aa..6ed8db18 100644
--- a/charts/pgadmin/Chart.yaml
+++ b/charts/pgadmin/Chart.yaml
@@ -15,7 +15,7 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 0.2.5
+version: 0.2.6
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to
diff --git a/charts/pgadmin/templates/deployment.yaml b/charts/pgadmin/templates/deployment.yaml
index 2bf24f86..574db48f 100644
--- a/charts/pgadmin/templates/deployment.yaml
+++ b/charts/pgadmin/templates/deployment.yaml
@@ -20,10 +20,12 @@ spec:
       labels:
         {{- include "pgadmin.selectorLabels" . | nindent 8 }}
     spec:
+      {{- if .Values.discovery.postgres -}}
       volumes:
       - name: config
         configMap:
           name: {{ include "pgadmin.fullname" . }}
+      {{- end }}
       {{- with .Values.imagePullSecrets }}
       imagePullSecrets:
         {{- toYaml . | nindent 8 }}
@@ -49,16 +51,20 @@ spec:
             httpGet:
               path: /
               port: http
+          {{- if .Values.discovery.postgres -}}
           volumeMounts:
           - name: config
             mountPath: "/data"
+          {{- end }}
           env:
             - name: PGADMIN_DEFAULT_EMAIL
               value: {{ .Values.security.mail }}
             - name: PGADMIN_DEFAULT_PASSWORD
               value: {{ .Values.security.password }}
+            {{- if .Values.discovery.postgres -}}
             - name: PGADMIN_SERVER_JSON_FILE
-              value: "/data/servers.json" 
+              value: "/data/servers.json"
+            {{- end }}
           resources:
             {{- toYaml .Values.resources | nindent 12 }}
       {{- with .Values.nodeSelector }}