From 925b9f3a55a06f3e01f42d3957062a4ef4ea214f Mon Sep 17 00:00:00 2001
From: Emilien Devos <121870973+edevosc2c@users.noreply.github.com>
Date: Thu, 4 Jul 2024 15:40:59 +0200
Subject: [PATCH 1/2] improve all probes + remove ingress old kubernetes
 version

---
 templates/analytics/analytics-deployment.yaml |  9 +++--
 templates/analytics/analytics-svc.yaml        |  2 +-
 templates/cas/cas-deployment.yaml             |  9 +++--
 templates/cas/cas-svc.yaml                    |  2 +-
 templates/console/console-deployment.yaml     |  9 +++--
 templates/console/console-svc.yaml            |  2 +-
 .../datafeeder/datafeeder-deployment.yaml     | 13 ++++---
 templates/datafeeder/datafeeder-svc.yaml      |  2 +-
 templates/datafeeder/import-deployment.yaml   | 11 ++----
 templates/datafeeder/import-svc.yaml          |  2 +-
 .../extractorapp/extractorapp-deployment.yaml |  9 +++--
 templates/extractorapp/extractorapp-svc.yaml  |  2 +-
 templates/gateway/gateway-deployment.yaml     | 13 ++++---
 templates/gateway/gateway-svc.yaml            |  2 +-
 .../elasticsearch/es-deployment.yaml          | 17 +++++++-
 .../geonetwork/elasticsearch/es-svc.yaml      |  2 +-
 .../geonetwork/geonetwork-deployment.yaml     |  9 +++--
 templates/geonetwork/geonetwork-svc.yaml      |  2 +-
 .../geonetwork/kibana/kibana-deployment.yaml  | 18 ++++++++-
 .../ogc-api-records-deployment.yaml           | 12 +++++-
 .../ogc-api-records/ogc-api-records-svc.yaml  |  2 +-
 templates/geoserver/geoserver-deployment.yaml |  9 +++--
 templates/geoserver/geoserver-svc.yaml        |  2 +-
 templates/ingress/ingress.yaml                | 39 ++-----------------
 templates/ldap/openldap-deployment.yaml       | 11 +++++-
 templates/ldap/openldap-svc.yaml              |  2 +-
 .../mapfishapp/mapfishapp-deployment.yaml     |  9 +++--
 templates/mapfishapp/mapfishapp-svc.yaml      |  2 +-
 templates/mapstore/mapstore-deployment.yaml   |  6 +--
 templates/mapstore/mapstore-svc.yaml          |  2 +-
 .../security-proxy-deployment.yaml            |  8 ++--
 .../security-proxy/security-proxy-svc.yaml    |  2 +-
 32 files changed, 135 insertions(+), 106 deletions(-)

diff --git a/templates/analytics/analytics-deployment.yaml b/templates/analytics/analytics-deployment.yaml
index 8d19b3f..9237091 100644
--- a/templates/analytics/analytics-deployment.yaml
+++ b/templates/analytics/analytics-deployment.yaml
@@ -41,15 +41,16 @@ spec:
             name: georchestra-datadir
         ports:
         - containerPort: 8080
-          name: http-proxy
+          name: http
         livenessProbe:
           httpGet:
             path: /analytics/
-            port: 8080
+            port: http
           periodSeconds: 10
         startupProbe:
-          tcpSocket:
-            port: 8080
+          httpGet:
+            path: /analytics/
+            port: http
           failureThreshold: 5
           periodSeconds: 10
       volumes:
diff --git a/templates/analytics/analytics-svc.yaml b/templates/analytics/analytics-svc.yaml
index 1756805..2d5b075 100644
--- a/templates/analytics/analytics-svc.yaml
+++ b/templates/analytics/analytics-svc.yaml
@@ -15,7 +15,7 @@ spec:
   ports:
   - port: 8080
     protocol: TCP
-    targetPort: 8080
+    targetPort: http
   selector:
     org.georchestra.service/name: {{ include "georchestra.fullname" . }}-analytics
 {{- end }}
\ No newline at end of file
diff --git a/templates/cas/cas-deployment.yaml b/templates/cas/cas-deployment.yaml
index 849310e..586894e 100644
--- a/templates/cas/cas-deployment.yaml
+++ b/templates/cas/cas-deployment.yaml
@@ -43,15 +43,16 @@ spec:
             name: georchestra-datadir
         ports:
         - containerPort: 8080
-          name: http-proxy
+          name: http
         livenessProbe:
           httpGet:
             path: /cas/login
-            port: 8080
+            port: http
           periodSeconds: 10
         startupProbe:
-          tcpSocket:
-            port: 8080
+          httpGet:
+            path: /cas/login
+            port: http
           failureThreshold: 5
           periodSeconds: 60
       volumes:
diff --git a/templates/cas/cas-svc.yaml b/templates/cas/cas-svc.yaml
index 00360cf..1a3952a 100644
--- a/templates/cas/cas-svc.yaml
+++ b/templates/cas/cas-svc.yaml
@@ -15,7 +15,7 @@ spec:
   ports:
   - port: 8080
     protocol: TCP
-    targetPort: 8080
+    targetPort: http
   selector:
     org.georchestra.service/name: {{ include "georchestra.fullname" . }}-cas
 {{- end }}
\ No newline at end of file
diff --git a/templates/console/console-deployment.yaml b/templates/console/console-deployment.yaml
index 9314d77..588e2f2 100644
--- a/templates/console/console-deployment.yaml
+++ b/templates/console/console-deployment.yaml
@@ -46,15 +46,16 @@ spec:
             name: georchestra-datadir
         ports:
         - containerPort: 8080
-          name: http-proxy
+          name: http
         livenessProbe:
           httpGet:
             path: /console/account/new
-            port: 8080
+            port: http
           periodSeconds: 10
         startupProbe:
-          tcpSocket:
-            port: 8080
+          httpGet:
+            path: /console/account/new
+            port: http
           failureThreshold: 5
           periodSeconds: 20
         {{- with $webapp.lifecycle }}
diff --git a/templates/console/console-svc.yaml b/templates/console/console-svc.yaml
index fe4ebf8..11bf4c8 100644
--- a/templates/console/console-svc.yaml
+++ b/templates/console/console-svc.yaml
@@ -15,7 +15,7 @@ spec:
   ports:
   - port: 8080
     protocol: TCP
-    targetPort: 8080
+    targetPort: http
   selector:
     org.georchestra.service/name: {{ include "georchestra.fullname" . }}-console
 {{- end }}
diff --git a/templates/datafeeder/datafeeder-deployment.yaml b/templates/datafeeder/datafeeder-deployment.yaml
index 69f6a23..4100908 100644
--- a/templates/datafeeder/datafeeder-deployment.yaml
+++ b/templates/datafeeder/datafeeder-deployment.yaml
@@ -102,15 +102,18 @@ spec:
           {{- end }}
         ports:
         - containerPort: 8080
-          name: http-proxy
+          name: http
         volumeMounts:
           - mountPath: /etc/georchestra
             name: georchestra-datadir
         livenessProbe:
-          tcpSocket:
-            port: http-proxy
-          periodSeconds: 10
-          initialDelaySeconds: 20
+          httpGet:
+            path: /datafeeder/
+            port: http
+        readinessProbe:
+          httpGet:
+            path: /datafeeder/
+            port: http
       volumes:
       - name: georchestra-datadir
         emptyDir: {}
diff --git a/templates/datafeeder/datafeeder-svc.yaml b/templates/datafeeder/datafeeder-svc.yaml
index 89ff643..03595a9 100644
--- a/templates/datafeeder/datafeeder-svc.yaml
+++ b/templates/datafeeder/datafeeder-svc.yaml
@@ -15,7 +15,7 @@ spec:
   ports:
   - port: 8080
     protocol: TCP
-    targetPort: 8080
+    targetPort: http
   selector:
     org.georchestra.service/name: {{ include "georchestra.fullname" . }}-datafeeder
 {{- end }}
\ No newline at end of file
diff --git a/templates/datafeeder/import-deployment.yaml b/templates/datafeeder/import-deployment.yaml
index b4f679e..c5ea8c9 100644
--- a/templates/datafeeder/import-deployment.yaml
+++ b/templates/datafeeder/import-deployment.yaml
@@ -45,14 +45,11 @@ spec:
         livenessProbe:
           httpGet:
             path: /index.html
-            port: 80
-          periodSeconds: 10
-          timeoutSeconds: 5
+            port: http
         startupProbe:
-          tcpSocket:
-            port: 80
-          failureThreshold: 5
-          periodSeconds: 5
+          httpGet:
+            path: /index.html
+            port: http
         volumeMounts:
           - mountPath: /etc/georchestra
             name: georchestra-datadir
diff --git a/templates/datafeeder/import-svc.yaml b/templates/datafeeder/import-svc.yaml
index 264d418..443454b 100644
--- a/templates/datafeeder/import-svc.yaml
+++ b/templates/datafeeder/import-svc.yaml
@@ -15,7 +15,7 @@ spec:
   ports:
   - port: 80
     protocol: TCP
-    targetPort: 80
+    targetPort: http
   selector:
     org.georchestra.service/name: {{ include "georchestra.fullname" . }}-import
 {{- end }}
\ No newline at end of file
diff --git a/templates/extractorapp/extractorapp-deployment.yaml b/templates/extractorapp/extractorapp-deployment.yaml
index 49be033..e7409b1 100644
--- a/templates/extractorapp/extractorapp-deployment.yaml
+++ b/templates/extractorapp/extractorapp-deployment.yaml
@@ -42,15 +42,16 @@ spec:
             name: georchestra-datadir
         ports:
         - containerPort: 8080
-          name: http-proxy
+          name: http
         livenessProbe:
           httpGet:
             path: /extractorapp/extractor/tasks
-            port: 8080
+            port: http
           periodSeconds: 10
         startupProbe:
-          tcpSocket:
-            port: 8080
+          httpGet:
+            path: /extractorapp/extractor/tasks
+            port: http
           failureThreshold: 5
           periodSeconds: 20
       volumes:
diff --git a/templates/extractorapp/extractorapp-svc.yaml b/templates/extractorapp/extractorapp-svc.yaml
index 5274f62..6379824 100644
--- a/templates/extractorapp/extractorapp-svc.yaml
+++ b/templates/extractorapp/extractorapp-svc.yaml
@@ -15,7 +15,7 @@ spec:
   ports:
   - port: 8080
     protocol: TCP
-    targetPort: 8080
+    targetPort: http
   selector:
     org.georchestra.service/name: {{ include "georchestra.fullname" . }}-extractorapp
 {{- end }}
\ No newline at end of file
diff --git a/templates/gateway/gateway-deployment.yaml b/templates/gateway/gateway-deployment.yaml
index 2545516..e615ae9 100644
--- a/templates/gateway/gateway-deployment.yaml
+++ b/templates/gateway/gateway-deployment.yaml
@@ -46,19 +46,22 @@ spec:
           {{- end }}
         ports:
         - containerPort: 8080
-          name: gateway
+          name: http
+        - containerPort: 8090
+          name: actuator
         volumeMounts:
           - mountPath: /etc/georchestra
             name: georchestra-datadir
         livenessProbe:
           httpGet:
-            path: /actuator/health
-            port: 8090
+            path: /actuator/health/liveness
+            port: actuator
           periodSeconds: 10
           timeoutSeconds: 3
         startupProbe:
-          tcpSocket:
-            port: 8080
+          httpGet:
+            path: /actuator/health/readiness
+            port: actuator
           failureThreshold: 5
           periodSeconds: 15
       volumes:
diff --git a/templates/gateway/gateway-svc.yaml b/templates/gateway/gateway-svc.yaml
index 70fba10..c736b12 100644
--- a/templates/gateway/gateway-svc.yaml
+++ b/templates/gateway/gateway-svc.yaml
@@ -15,7 +15,7 @@ spec:
   ports:
   - port: 8080
     protocol: TCP
-    targetPort: 8080
+    targetPort: http
   selector:
     org.georchestra.service/name: {{ include "georchestra.fullname" . }}-gateway
 {{- end }}
\ No newline at end of file
diff --git a/templates/geonetwork/elasticsearch/es-deployment.yaml b/templates/geonetwork/elasticsearch/es-deployment.yaml
index 967827a..541c0a9 100644
--- a/templates/geonetwork/elasticsearch/es-deployment.yaml
+++ b/templates/geonetwork/elasticsearch/es-deployment.yaml
@@ -48,7 +48,22 @@ spec:
             {{- toYaml $webapp.resources | nindent 12 }}
         ports:
         - containerPort: 9200
-          name: elastic
+          name: http
+        startupProbe:
+          tcpSocket:
+            port: http
+          initialDelaySeconds: 5
+          periodSeconds: 10
+          timeoutSeconds: 3
+          failureThreshold: 30
+        livenessProbe:
+          periodSeconds: 20
+          timeoutSeconds: 5
+          failureThreshold: 10
+          successThreshold: 1
+          initialDelaySeconds: 10
+          tcpSocket:
+            port: http
         volumeMounts:
           - mountPath: /usr/share/elasticsearch/data
             name: gn4-es-data
diff --git a/templates/geonetwork/elasticsearch/es-svc.yaml b/templates/geonetwork/elasticsearch/es-svc.yaml
index df6af32..d4aa162 100644
--- a/templates/geonetwork/elasticsearch/es-svc.yaml
+++ b/templates/geonetwork/elasticsearch/es-svc.yaml
@@ -15,7 +15,7 @@ spec:
   ports:
   - port: 9200
     protocol: TCP
-    targetPort: 9200
+    targetPort: http
   selector:
     org.georchestra.service/name: {{ include "georchestra.fullname" . }}-gn4-elasticsearch
 {{- end }}
\ No newline at end of file
diff --git a/templates/geonetwork/geonetwork-deployment.yaml b/templates/geonetwork/geonetwork-deployment.yaml
index fc2a0fc..cd3a4c5 100644
--- a/templates/geonetwork/geonetwork-deployment.yaml
+++ b/templates/geonetwork/geonetwork-deployment.yaml
@@ -58,7 +58,7 @@ spec:
         {{- end }}
         ports:
         - containerPort: 8080
-          name: http-proxy
+          name: http
         env:
           {{- include "georchestra.database-georchestra-envs" . | nindent 10  }}
           {{- include "georchestra.service-envs" . | nindent 10 }}
@@ -68,12 +68,13 @@ spec:
         livenessProbe:
           httpGet:
             path: /geonetwork/srv/eng/catalog.search
-            port: 8080
+            port: http
           periodSeconds: 10
           timeoutSeconds: 5
         startupProbe:
-          tcpSocket:
-            port: 8080
+          httpGet:
+            path: /geonetwork/srv/eng/catalog.search
+            port: http
           failureThreshold: 5
           periodSeconds: 50
       {{- if $webapp.jetty_monitoring }}
diff --git a/templates/geonetwork/geonetwork-svc.yaml b/templates/geonetwork/geonetwork-svc.yaml
index a8c31d3..35476ea 100644
--- a/templates/geonetwork/geonetwork-svc.yaml
+++ b/templates/geonetwork/geonetwork-svc.yaml
@@ -15,7 +15,7 @@ spec:
   ports:
   - port: 8080
     protocol: TCP
-    targetPort: 8080
+    targetPort: http
   selector:
     org.georchestra.service/name: {{ include "georchestra.fullname" . }}-geonetwork
 {{- end }}
\ No newline at end of file
diff --git a/templates/geonetwork/kibana/kibana-deployment.yaml b/templates/geonetwork/kibana/kibana-deployment.yaml
index 0205628..e659aa8 100644
--- a/templates/geonetwork/kibana/kibana-deployment.yaml
+++ b/templates/geonetwork/kibana/kibana-deployment.yaml
@@ -33,7 +33,23 @@ spec:
             value: http://{{ include "georchestra.fullname" . }}-gn4-elasticsearch-svc:9200
         ports:
         - containerPort: 5601
-          name: kibana
+          name: http
+        startupProbe:
+          tcpSocket:
+            port: http
+          periodSeconds: 10
+          timeoutSeconds: 5
+          failureThreshold: 20
+          successThreshold: 1
+          initialDelaySeconds: 30
+        livenessProbe:
+          tcpSocket:
+            port: http
+          periodSeconds: 20
+          timeoutSeconds: 5
+          failureThreshold: 10
+          successThreshold: 1
+          initialDelaySeconds: 10
         volumeMounts:
           - mountPath: /usr/share/kibana/config
             name: gn4-kibana-config
diff --git a/templates/geonetwork/ogc-api-records/ogc-api-records-deployment.yaml b/templates/geonetwork/ogc-api-records/ogc-api-records-deployment.yaml
index 044272c..e94b1ba 100644
--- a/templates/geonetwork/ogc-api-records/ogc-api-records-deployment.yaml
+++ b/templates/geonetwork/ogc-api-records/ogc-api-records-deployment.yaml
@@ -73,7 +73,17 @@ spec:
           {{- end }}
         ports:
         - containerPort: 8080
-          name: http-proxy
+          name: http
+        livenessProbe:
+          httpGet:
+            path: /ogc-api-records/collections
+            port: http
+          timeoutSeconds: 5
+        startupProbe:
+          httpGet:
+            path: /ogc-api-records/collections
+            port: http
+          timeoutSeconds: 5
         volumeMounts:
         - mountPath: /etc/georchestra
           name: georchestra-datadir
diff --git a/templates/geonetwork/ogc-api-records/ogc-api-records-svc.yaml b/templates/geonetwork/ogc-api-records/ogc-api-records-svc.yaml
index cd801aa..96e0b9b 100644
--- a/templates/geonetwork/ogc-api-records/ogc-api-records-svc.yaml
+++ b/templates/geonetwork/ogc-api-records/ogc-api-records-svc.yaml
@@ -15,7 +15,7 @@ spec:
   ports:
   - port: 8080
     protocol: TCP
-    targetPort: 8080
+    targetPort: http
   selector:
     org.georchestra.service/name: {{ include "georchestra.fullname" . }}-gn4-ogc-api-records
 {{- end -}}
diff --git a/templates/geoserver/geoserver-deployment.yaml b/templates/geoserver/geoserver-deployment.yaml
index 06a5a05..b691bfa 100644
--- a/templates/geoserver/geoserver-deployment.yaml
+++ b/templates/geoserver/geoserver-deployment.yaml
@@ -194,20 +194,21 @@ spec:
           {{- end }}
         ports:
         - containerPort: 8080
-          name: http-proxy
+          name: http
         {{- if $webapp.custom_liveness_probe }}
         {{ $webapp.custom_liveness_probe | toYaml | nindent 8 }}
         {{- else }}
         livenessProbe:
           httpGet:
             path: /geoserver/ows?SERVICE=WMS&LAYERS=geor:public_layer&FORMAT=image/png&VERSION=1.3.0&SLD_VERSION=1.1.0&REQUEST=GetMap&CRS=EPSG:3857&BBOX=-20820223,-20820223,20820223,20820223&WIDTH=10&HEIGHT=10
-            port: 8080
+            port: http
           periodSeconds: 10
           timeoutSeconds: 5
         {{- end }}
         startupProbe:
-          tcpSocket:
-            port: 8080
+          httpGet:
+            path: /geoserver/ows?SERVICE=WMS&LAYERS=geor:public_layer&FORMAT=image/png&VERSION=1.3.0&SLD_VERSION=1.1.0&REQUEST=GetMap&CRS=EPSG:3857&BBOX=-20820223,-20820223,20820223,20820223&WIDTH=10&HEIGHT=10
+            port: http
           failureThreshold: 5
           periodSeconds: 40
       {{- if $webapp.jetty_monitoring }}
diff --git a/templates/geoserver/geoserver-svc.yaml b/templates/geoserver/geoserver-svc.yaml
index 11b3123..2f81204 100644
--- a/templates/geoserver/geoserver-svc.yaml
+++ b/templates/geoserver/geoserver-svc.yaml
@@ -15,7 +15,7 @@ spec:
   ports:
   - port: 8080
     protocol: TCP
-    targetPort: 8080
+    targetPort: http
   selector:
     org.georchestra.service/name: {{ include "georchestra.fullname" . }}-geoserver
 {{- end }}
\ No newline at end of file
diff --git a/templates/ingress/ingress.yaml b/templates/ingress/ingress.yaml
index f85e539..129897f 100644
--- a/templates/ingress/ingress.yaml
+++ b/templates/ingress/ingress.yaml
@@ -1,12 +1,6 @@
 {{- if .Values.ingress.enabled -}}
 {{- $fullName := include "georchestra.fullname" . -}}
-{{- if semverCompare ">=1.19-0" .Capabilities.KubeVersion.GitVersion -}}
 apiVersion: networking.k8s.io/v1
-{{- else if semverCompare ">=1.14-0" .Capabilities.KubeVersion.GitVersion -}}
-apiVersion: networking.k8s.io/v1beta1
-{{- else -}}
-apiVersion: extensions/v1beta1
-{{- end }}
 
 kind: Ingress
 metadata:
@@ -18,7 +12,7 @@ metadata:
     {{- toYaml . | nindent 4 }}
   {{- end }}
 spec:
-  {{- if and .Values.ingress.className (semverCompare ">=1.18-0" .Capabilities.KubeVersion.GitVersion) }}
+  {{- if .Values.ingress.className }}
   ingressClassName: {{ .Values.ingress.className }}
   {{- end }}
   {{- if .Values.ingress.tls }}
@@ -41,11 +35,8 @@ spec:
       http:
         paths:
           - path: /
-            {{- if semverCompare ">=1.18-0" $.Capabilities.KubeVersion.GitVersion }}
             pathType: Prefix
-            {{- end }}
             backend:
-              {{- if semverCompare ">=1.19-0" $.Capabilities.KubeVersion.GitVersion }}
               service:
                 {{- if $.Values.georchestra.webapps.gateway.enabled }}
                 name: {{ include "georchestra.fullname" $ }}-gateway-svc
@@ -53,46 +44,24 @@ spec:
                 name: {{ include "georchestra.fullname" $ }}-sp-svc
                 {{- end }}
                 port:
-                  number: 8080
-              {{- else }}
-              {{- if $.Values.georchestra.webapps.gateway.enabled }}
-              serviceName: {{ include "georchestra.fullname" $ }}-gateway-svc
-              {{- else }}
-              serviceName: {{ include "georchestra.fullname" $ }}-sp-svc
-              {{- end }}
-              servicePort: 8080
-              {{- end }}
+                  name: http
           {{- if $.Values.georchestra.webapps.cas.enabled }}
           - path: /cas
-            {{- if semverCompare ">=1.18-0" $.Capabilities.KubeVersion.GitVersion }}
             pathType: Prefix
-            {{- end }}
             backend:
-              {{- if semverCompare ">=1.19-0" $.Capabilities.KubeVersion.GitVersion }}
               service:
                 name: {{ include "georchestra.fullname" $ }}-cas-svc
                 port:
-                  number: 8080
-              {{- else }}
-              serviceName: {{ include "georchestra.fullname" $ }}-cas-svc
-              servicePort: 8080
-              {{- end }}
+                  name: http
           {{- end }}
           {{- if and $.Values.georchestra.webapps.geonetwork.enabled $.Values.georchestra.webapps.geonetwork.ogc_api_records.enabled }}
           - path: /ogc-api-records
-            {{- if semverCompare ">=1.18-0" $.Capabilities.KubeVersion.GitVersion }}
             pathType: Prefix
-            {{- end }}
             backend:
-              {{- if semverCompare ">=1.19-0" $.Capabilities.KubeVersion.GitVersion }}
               service:
                 name: {{ include "georchestra.fullname" $ }}-gn4-ogc-api-records-svc
                 port:
-                  number: 8080
-              {{- else }}
-              serviceName: {{ include "georchestra.fullname" $ }}-gn4-ogc-api-records-svc
-              servicePort: 8080
-              {{- end }}
+                  name: http
           {{- end }}
     {{- end }}
   {{- end }}
diff --git a/templates/ldap/openldap-deployment.yaml b/templates/ldap/openldap-deployment.yaml
index c0946b9..908035b 100644
--- a/templates/ldap/openldap-deployment.yaml
+++ b/templates/ldap/openldap-deployment.yaml
@@ -58,6 +58,15 @@ spec:
           {{- if $webapp.extraVolumeMounts }}
             {{- toYaml $webapp.extraVolumeMounts | nindent 10 }}
           {{- end }}
+        startupProbe:
+          exec:
+            command:
+            - ldapsearch
+            - -x
+            - -Hldap://localhost:{{ .Values.ldap.port }}/
+            - -b{{ .Values.ldap.baseDn }}
+            - {{ .Values.ldap.adminDn }}
+          initialDelaySeconds: 5
         livenessProbe:
           exec:
             command:
@@ -66,7 +75,7 @@ spec:
             - -Hldap://localhost:{{ .Values.ldap.port }}/
             - -b{{ .Values.ldap.baseDn }}
             - {{ .Values.ldap.adminDn }}
-          initialDelaySeconds: 30
+          periodSeconds: 5
       {{- if $webapp.extraContainers }}
         {{ toYaml $webapp.extraContainers | nindent 6 }}
       {{- end }}
diff --git a/templates/ldap/openldap-svc.yaml b/templates/ldap/openldap-svc.yaml
index e11a6cb..10a5abb 100644
--- a/templates/ldap/openldap-svc.yaml
+++ b/templates/ldap/openldap-svc.yaml
@@ -15,7 +15,7 @@ spec:
   ports:
   - port: 389
     protocol: TCP
-    targetPort: 389
+    targetPort: ldap
   selector:
     org.georchestra.service/name: {{ include "georchestra.fullname" . }}-ldap
 {{- end }}
diff --git a/templates/mapfishapp/mapfishapp-deployment.yaml b/templates/mapfishapp/mapfishapp-deployment.yaml
index bc63f28..47b1297 100644
--- a/templates/mapfishapp/mapfishapp-deployment.yaml
+++ b/templates/mapfishapp/mapfishapp-deployment.yaml
@@ -38,18 +38,19 @@ spec:
         {{- end }}
         ports:
         - containerPort: 8080
-          name: http-proxy
+          name: http
         volumeMounts:
           - mountPath: /etc/georchestra
             name: georchestra-datadir
         livenessProbe:
           httpGet:
             path: /mapfishapp/
-            port: 8080
+            port: http
           periodSeconds: 10
         startupProbe:
-          tcpSocket:
-            port: 8080
+          httpGet:
+            path: /mapfishapp/
+            port: http
           failureThreshold: 5
           periodSeconds: 30
       volumes:
diff --git a/templates/mapfishapp/mapfishapp-svc.yaml b/templates/mapfishapp/mapfishapp-svc.yaml
index 0c8862a..23a8e43 100644
--- a/templates/mapfishapp/mapfishapp-svc.yaml
+++ b/templates/mapfishapp/mapfishapp-svc.yaml
@@ -15,7 +15,7 @@ spec:
   ports:
   - port: 8080
     protocol: TCP
-    targetPort: 8080
+    targetPort: http
   selector:
     org.georchestra.service/name: {{ include "georchestra.fullname" . }}-mapfishapp
 {{- end }}
\ No newline at end of file
diff --git a/templates/mapstore/mapstore-deployment.yaml b/templates/mapstore/mapstore-deployment.yaml
index 153db29..3dd68f5 100644
--- a/templates/mapstore/mapstore-deployment.yaml
+++ b/templates/mapstore/mapstore-deployment.yaml
@@ -58,7 +58,7 @@ spec:
           {{- end }}
         ports:
         - containerPort: 8080
-          name: http-proxy
+          name: http
         {{- with $webapp.lifecycle }}
         lifecycle:
           {{- toYaml . | nindent 10 }}
@@ -66,12 +66,12 @@ spec:
         livenessProbe:
           httpGet:
             path: /mapstore/configs/config.json
-            port: 8080
+            port: http
           periodSeconds: 10
         startupProbe:
           httpGet:
             path: /mapstore/configs/config.json
-            port: 8080
+            port: http
           failureThreshold: 5
           periodSeconds: 15
       volumes:
diff --git a/templates/mapstore/mapstore-svc.yaml b/templates/mapstore/mapstore-svc.yaml
index b0215f3..0d6480d 100644
--- a/templates/mapstore/mapstore-svc.yaml
+++ b/templates/mapstore/mapstore-svc.yaml
@@ -15,7 +15,7 @@ spec:
   ports:
   - port: 8080
     protocol: TCP
-    targetPort: 8080
+    targetPort: http
   selector:
     org.georchestra.service/name: {{ include "georchestra.fullname" . }}-mapstore
 {{- end }}
\ No newline at end of file
diff --git a/templates/security-proxy/security-proxy-deployment.yaml b/templates/security-proxy/security-proxy-deployment.yaml
index d19f271..81d8bd9 100644
--- a/templates/security-proxy/security-proxy-deployment.yaml
+++ b/templates/security-proxy/security-proxy-deployment.yaml
@@ -65,19 +65,19 @@ spec:
           {{- end }}
         ports:
         - containerPort: 8080
-          name: http-proxy
+          name: http
         volumeMounts:
           - mountPath: /etc/georchestra
             name: georchestra-datadir
         livenessProbe:
           httpGet:
             path: /_static/bootstrap_3.0.0/css/bootstrap-theme.min.css
-            port: 8080
+            port: http
           periodSeconds: 10
-          timeoutSeconds: 3
+          timeoutSeconds: 5
         startupProbe:
           tcpSocket:
-            port: 8080
+            port: http
           failureThreshold: 5
           periodSeconds: 15
       {{- if $webapp.jetty_monitoring }}
diff --git a/templates/security-proxy/security-proxy-svc.yaml b/templates/security-proxy/security-proxy-svc.yaml
index 64e4fcb..0050999 100644
--- a/templates/security-proxy/security-proxy-svc.yaml
+++ b/templates/security-proxy/security-proxy-svc.yaml
@@ -15,7 +15,7 @@ spec:
   ports:
   - port: 8080
     protocol: TCP
-    targetPort: 8080
+    targetPort: http
   selector:
     org.georchestra.service/name: {{ include "georchestra.fullname" . }}-sp
 {{- end }}
\ No newline at end of file

From 2387bf99d067790b94d3d866aa17585e25c33f17 Mon Sep 17 00:00:00 2001
From: Emilien Devos <121870973+edevosc2c@users.noreply.github.com>
Date: Mon, 15 Jul 2024 15:24:29 +0200
Subject: [PATCH 2/2] omit final slash for datafeeder healthcheck

---
 templates/datafeeder/datafeeder-deployment.yaml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/templates/datafeeder/datafeeder-deployment.yaml b/templates/datafeeder/datafeeder-deployment.yaml
index 4100908..a904441 100644
--- a/templates/datafeeder/datafeeder-deployment.yaml
+++ b/templates/datafeeder/datafeeder-deployment.yaml
@@ -108,11 +108,11 @@ spec:
             name: georchestra-datadir
         livenessProbe:
           httpGet:
-            path: /datafeeder/
+            path: /datafeeder
             port: http
         readinessProbe:
           httpGet:
-            path: /datafeeder/
+            path: /datafeeder
             port: http
       volumes:
       - name: georchestra-datadir