From 33533c722f3a98731cd3eaadafc72d861964307c Mon Sep 17 00:00:00 2001
From: tm8enk <frederic.comte@insee.fr>
Date: Fri, 12 Mar 2021 16:21:12 +0000
Subject: [PATCH] correction of detection

---
 charts/jupyter/Chart.yaml             | 2 +-
 charts/jupyter/templates/_helpers.tpl | 2 ++
 charts/pgadmin/Chart.yaml             | 2 +-
 charts/pgadmin/templates/_helpers.tpl | 3 ++-
 4 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/charts/jupyter/Chart.yaml b/charts/jupyter/Chart.yaml
index 0aca3090..8e9104fd 100644
--- a/charts/jupyter/Chart.yaml
+++ b/charts/jupyter/Chart.yaml
@@ -16,7 +16,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.3.6
+version: 0.3.7
 
 # 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/jupyter/templates/_helpers.tpl b/charts/jupyter/templates/_helpers.tpl
index d711e191..ccf2a454 100644
--- a/charts/jupyter/templates/_helpers.tpl
+++ b/charts/jupyter/templates/_helpers.tpl
@@ -119,6 +119,7 @@ nginx.ingress.kubernetes.io/whitelist-source-range: {{ .Values.security.whitelis
 {{ printf "<configuration>"}}
 {{- $virgule := 0 }}      
 {{ range $index, $service := (lookup "v1" "Service" .Release.Namespace "").items }}
+{{- if (index $service "metadata" "labels" "helm.sh/chart") }}
 {{- if hasPrefix "hive-metastore" (index $service "metadata" "labels" "helm.sh/chart") }}
 {{- if $virgule }}
 {{- end }}
@@ -129,6 +130,7 @@ nginx.ingress.kubernetes.io/whitelist-source-range: {{ .Values.security.whitelis
 {{- $virgule = 1}}
 {{- end }}
 {{- end }}
+{{- end }}
 {{ printf "</configuration>"}}
 {{- end }}
 
diff --git a/charts/pgadmin/Chart.yaml b/charts/pgadmin/Chart.yaml
index e2fd012d..d6f8e9aa 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.4
+version: 0.2.5
 
 # 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/_helpers.tpl b/charts/pgadmin/templates/_helpers.tpl
index 45040a0a..0a304e61 100644
--- a/charts/pgadmin/templates/_helpers.tpl
+++ b/charts/pgadmin/templates/_helpers.tpl
@@ -79,6 +79,7 @@ nginx.ingress.kubernetes.io/whitelist-source-range: {{ .Values.security.whitelis
 {{ printf "\"Servers\": {" | indent 2 }} 
 {{- $virgule := 0 }}      
 {{ range $index, $service := (lookup "v1" "Service" .Release.Namespace "").items }}
+{{- if (index $service "metadata" "labels" "helm.sh/chart") }}
 {{- if hasPrefix "postgres" (index $service "metadata" "labels" "helm.sh/chart") }}
 {{- if $virgule }}
 {{ printf "," }}
@@ -94,7 +95,7 @@ nginx.ingress.kubernetes.io/whitelist-source-range: {{ .Values.security.whitelis
 {{- $virgule = 1}}
 {{ printf "}" | indent 4}}
 {{- end }}
-
+{{- end }}
 {{- end }}
 {{ printf "}" | indent 2}}
 {{ printf "}" }}