improve all probes for all components

georchestra · Jul 4, 2024 · 2ad1769 · 2ad1769
1 parent 689eb1c
commit 2ad1769
Show file tree

Hide file tree

Showing 32 changed files with 134 additions and 74 deletions.
diff --git 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
@@ -15,7 +15,7 @@ spec:
   ports:
   - port: 8080
     protocol: TCP
-    targetPort: 8080
+    targetPort: http
   selector:
     org.georchestra.service/name: {{ include "georchestra.fullname" . }}-analytics
 {{- end }}
diff --git 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
@@ -15,7 +15,7 @@ spec:
   ports:
   - port: 8080
     protocol: TCP
-    targetPort: 8080
+    targetPort: http
   selector:
     org.georchestra.service/name: {{ include "georchestra.fullname" . }}-cas
 {{- end }}
diff --git 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
@@ -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
@@ -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
@@ -15,7 +15,7 @@ spec:
   ports:
   - port: 8080
     protocol: TCP
-    targetPort: 8080
+    targetPort: http
   selector:
     org.georchestra.service/name: {{ include "georchestra.fullname" . }}-datafeeder
 {{- end }}
diff --git 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
@@ -15,7 +15,7 @@ spec:
   ports:
   - port: 80
     protocol: TCP
-    targetPort: 80
+    targetPort: http
   selector:
     org.georchestra.service/name: {{ include "georchestra.fullname" . }}-import
 {{- end }}
diff --git 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
@@ -15,7 +15,7 @@ spec:
   ports:
   - port: 8080
     protocol: TCP
-    targetPort: 8080
+    targetPort: http
   selector:
     org.georchestra.service/name: {{ include "georchestra.fullname" . }}-extractorapp
 {{- end }}
diff --git 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
@@ -15,7 +15,7 @@ spec:
   ports:
   - port: 8080
     protocol: TCP
-    targetPort: 8080
+    targetPort: http
   selector:
     org.georchestra.service/name: {{ include "georchestra.fullname" . }}-gateway
 {{- end }}
diff --git 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
@@ -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 }}
diff --git 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
@@ -15,7 +15,7 @@ spec:
   ports:
   - port: 8080
     protocol: TCP
-    targetPort: 8080
+    targetPort: http
   selector:
     org.georchestra.service/name: {{ include "georchestra.fullname" . }}-geonetwork
 {{- end }}
diff --git 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
@@ -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
@@ -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
@@ -196,20 +196,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
@@ -15,7 +15,7 @@ spec:
   ports:
   - port: 8080
     protocol: TCP
-    targetPort: 8080
+    targetPort: http
   selector:
     org.georchestra.service/name: {{ include "georchestra.fullname" . }}-geoserver
 {{- end }}