Merge pull request #126 from camptocamp/Fix_125

Add probes again
camptocamp · Mar 28, 2023 · e77e6f0 · e77e6f0
2 parents 3927f30 + e7fbaec
commit e77e6f0
Show file tree

Hide file tree

Showing 6 changed files with 189 additions and 8 deletions.
diff --git a/.github/workflows/pr-checks.yaml b/.github/workflows/pr-checks.yaml
@@ -7,16 +7,17 @@ on:
       - reopened
       - labeled
       - unlabeled
-      - edit
+      - edited
       - synchronize
 
 jobs:
   build:
     name: Pull request check
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     timeout-minutes: 5
 
     steps:
+      - run: pip install --upgrade attrs
       - uses: actions/checkout@v3
 
       - run: echo "${HOME}/.local/bin" >> ${GITHUB_PATH}

diff --git a/Makefile b/Makefile
@@ -4,6 +4,8 @@ LOCAL_IP ?= $(shell hostname -I | awk '{print $$1}')
 .PHONY examples-clean:
 examples-clean:
 	rm -f examples/common/charts/*.tgz
+	rm -f examples/datadir/charts/*.tgz
+	rm -f examples/jdbc/charts/*.tgz
 	${HELM} uninstall gs-cloud-common || /bin/true
 	${HELM} uninstall gs-cloud-datadir || /bin/true
 	${HELM} uninstall gs-cloud-jdbc || /bin/true

diff --git a/tests/expected-common.yaml b/tests/expected-common.yaml
@@ -43,9 +43,9 @@ metadata:
     app.kubernetes.io/managed-by: Helm
 type: Opaque
 data:
-  rabbitmq-password: "OHVWMUpucElKV2x3UGFEZw=="
+  rabbitmq-password: "bVFUcDJMNnRhcmdGQ3BYaA=="
 
-  rabbitmq-erlang-cookie: "Y0lyNHIwMWtDYUY5N3BoYXpseGpBRmUybWlBcmNHbmQ="
+  rabbitmq-erlang-cookie: "eVlGelU5RGJjbWhZTjg1T3JNblRqeE1sNE9qNVZWTTI="
 ---
 # Source: examples-common/templates/cm_db_jndi.yaml
 # NB: this suppose that a docker postgis container
@@ -308,7 +308,7 @@ spec:
         app.kubernetes.io/managed-by: Helm
       annotations:
         checksum/config: fc0b91f081a2da0a894a7149dd689d8172b001c909cc4ddd69dc0756d5a23efe
-        checksum/secret: 836e2bdb4e1c6a60bfa5c34978da98b872c2cc30fb80a55c7500d8c2cf8f647c
+        checksum/secret: 590a769fda8661b9184fd19411256e6f0d4d9866a88f4bc91c804744b2261907
     spec:
 
       serviceAccountName: gs-cloud-common-rabbitmq

diff --git a/tests/expected-datadir.yaml b/tests/expected-datadir.yaml
@@ -1008,6 +1008,18 @@ spec:
               containerPort: 8080
               hostIP: 127.0.0.1
 
+          livenessProbe:
+            failureThreshold: 10
+            httpGet:
+              path: /actuator/health/liveness
+              port: health
+            initialDelaySeconds: 30
+            periodSeconds: 10
+          readinessProbe:
+            httpGet:
+              path: /actuator/health/readiness
+              port: health
+            periodSeconds: 5
       volumes:
         - name: cache
           persistentVolumeClaim:
@@ -1111,6 +1123,18 @@ spec:
               containerPort: 8080
               hostIP: 127.0.0.1
 
+          livenessProbe:
+            failureThreshold: 10
+            httpGet:
+              path: /actuator/health/liveness
+              port: health
+            initialDelaySeconds: 30
+            periodSeconds: 10
+          readinessProbe:
+            httpGet:
+              path: /actuator/health/readiness
+              port: health
+            periodSeconds: 5
       volumes:
         - name: cache
           persistentVolumeClaim:
@@ -1214,6 +1238,18 @@ spec:
               containerPort: 8080
               hostIP: 127.0.0.1
 
+          livenessProbe:
+            failureThreshold: 10
+            httpGet:
+              path: /actuator/health/liveness
+              port: health
+            initialDelaySeconds: 30
+            periodSeconds: 10
+          readinessProbe:
+            httpGet:
+              path: /actuator/health/readiness
+              port: health
+            periodSeconds: 5
       volumes:
         - name: cache
           persistentVolumeClaim:
@@ -1317,6 +1353,18 @@ spec:
               containerPort: 8080
               hostIP: 127.0.0.1
 
+          livenessProbe:
+            failureThreshold: 10
+            httpGet:
+              path: /actuator/health/liveness
+              port: health
+            initialDelaySeconds: 30
+            periodSeconds: 10
+          readinessProbe:
+            httpGet:
+              path: /actuator/health/readiness
+              port: health
+            periodSeconds: 5
       volumes:
         - name: cache
           persistentVolumeClaim:
@@ -1420,6 +1468,18 @@ spec:
               containerPort: 8080
               hostIP: 127.0.0.1
 
+          livenessProbe:
+            failureThreshold: 10
+            httpGet:
+              path: /actuator/health/liveness
+              port: health
+            initialDelaySeconds: 30
+            periodSeconds: 10
+          readinessProbe:
+            httpGet:
+              path: /actuator/health/readiness
+              port: health
+            periodSeconds: 5
       volumes:
         - name: cache
           persistentVolumeClaim:
@@ -1523,6 +1583,18 @@ spec:
               containerPort: 8080
               hostIP: 127.0.0.1
 
+          livenessProbe:
+            failureThreshold: 10
+            httpGet:
+              path: /actuator/health/liveness
+              port: health
+            initialDelaySeconds: 30
+            periodSeconds: 10
+          readinessProbe:
+            httpGet:
+              path: /actuator/health/readiness
+              port: health
+            periodSeconds: 5
       volumes:
         - name: cache
           persistentVolumeClaim:
@@ -1626,6 +1698,18 @@ spec:
               containerPort: 8080
               hostIP: 127.0.0.1
 
+          livenessProbe:
+            failureThreshold: 10
+            httpGet:
+              path: /actuator/health/liveness
+              port: health
+            initialDelaySeconds: 30
+            periodSeconds: 10
+          readinessProbe:
+            httpGet:
+              path: /actuator/health/readiness
+              port: health
+            periodSeconds: 5
       volumes:
         - name: cache
           persistentVolumeClaim:

diff --git a/tests/expected-jdbc.yaml b/tests/expected-jdbc.yaml
@@ -1051,6 +1051,18 @@ spec:
               containerPort: 8080
               hostIP: 127.0.0.1
 
+          livenessProbe:
+            failureThreshold: 10
+            httpGet:
+              path: /actuator/health/liveness
+              port: health
+            initialDelaySeconds: 30
+            periodSeconds: 10
+          readinessProbe:
+            httpGet:
+              path: /actuator/health/readiness
+              port: health
+            periodSeconds: 5
       volumes:
         - name: cache
           persistentVolumeClaim:
@@ -1179,6 +1191,18 @@ spec:
               containerPort: 8080
               hostIP: 127.0.0.1
 
+          livenessProbe:
+            failureThreshold: 10
+            httpGet:
+              path: /actuator/health/liveness
+              port: health
+            initialDelaySeconds: 30
+            periodSeconds: 10
+          readinessProbe:
+            httpGet:
+              path: /actuator/health/readiness
+              port: health
+            periodSeconds: 5
       volumes:
         - name: cache
           persistentVolumeClaim:
@@ -1307,6 +1331,18 @@ spec:
               containerPort: 8080
               hostIP: 127.0.0.1
 
+          livenessProbe:
+            failureThreshold: 10
+            httpGet:
+              path: /actuator/health/liveness
+              port: health
+            initialDelaySeconds: 30
+            periodSeconds: 10
+          readinessProbe:
+            httpGet:
+              path: /actuator/health/readiness
+              port: health
+            periodSeconds: 5
       volumes:
         - name: cache
           persistentVolumeClaim:
@@ -1435,6 +1471,18 @@ spec:
               containerPort: 8080
               hostIP: 127.0.0.1
 
+          livenessProbe:
+            failureThreshold: 10
+            httpGet:
+              path: /actuator/health/liveness
+              port: health
+            initialDelaySeconds: 30
+            periodSeconds: 10
+          readinessProbe:
+            httpGet:
+              path: /actuator/health/readiness
+              port: health
+            periodSeconds: 5
       volumes:
         - name: cache
           persistentVolumeClaim:
@@ -1563,6 +1611,18 @@ spec:
               containerPort: 8080
               hostIP: 127.0.0.1
 
+          livenessProbe:
+            failureThreshold: 10
+            httpGet:
+              path: /actuator/health/liveness
+              port: health
+            initialDelaySeconds: 30
+            periodSeconds: 10
+          readinessProbe:
+            httpGet:
+              path: /actuator/health/readiness
+              port: health
+            periodSeconds: 5
       volumes:
         - name: cache
           persistentVolumeClaim:
@@ -1691,6 +1751,18 @@ spec:
               containerPort: 8080
               hostIP: 127.0.0.1
 
+          livenessProbe:
+            failureThreshold: 10
+            httpGet:
+              path: /actuator/health/liveness
+              port: health
+            initialDelaySeconds: 30
+            periodSeconds: 10
+          readinessProbe:
+            httpGet:
+              path: /actuator/health/readiness
+              port: health
+            periodSeconds: 5
       volumes:
         - name: cache
           persistentVolumeClaim:
@@ -1819,6 +1891,18 @@ spec:
               containerPort: 8080
               hostIP: 127.0.0.1
 
+          livenessProbe:
+            failureThreshold: 10
+            httpGet:
+              path: /actuator/health/liveness
+              port: health
+            initialDelaySeconds: 30
+            periodSeconds: 10
+          readinessProbe:
+            httpGet:
+              path: /actuator/health/readiness
+              port: health
+            periodSeconds: 5
       volumes:
         - name: cache
           persistentVolumeClaim:

diff --git a/values.yaml b/values.yaml
@@ -19,12 +19,10 @@ volumes: &common-volumes
     configMap:
       name: cm-etc-gscloud
 
-
 volumeMounts: &common-volume-mounts
   /etc/gscloud:
     name: vol-etc-gscloud
 
-
 ports: &common-ports
   http:
     containerPort: 8080
@@ -52,7 +50,7 @@ env: &common-env
   GWC_ENABLED:
     value: "true"
   JAVA_OPTS:
-    value: '-DALLOW_ENV_PARAMETRIZATION=true'
+    value: '-DALLOW_ENV_PARAMETRIZATION=true -XX:MaxRAMPercentage=80 -XX:InitialRAMPercentage=80'
   GEOTOOLS_HTTPCLIENT_PROXY_ENABLED:
     value: "false"
   # RABBITMQ_PASSWORD:
@@ -78,6 +76,18 @@ common-spring-container-stuff: &common-spring-container-stuff
     <<: *common-volume-mounts
   env:
     <<: *common-env
+  livenessProbe: &geoserver-spring-livenessProbe
+    httpGet:
+      path: /actuator/health/liveness
+      port: health
+    periodSeconds: 10
+    failureThreshold: 10
+    initialDelaySeconds: 30
+  readinessProbe: &geoserver-spring-readinessProbe
+    httpGet:
+      path: /actuator/health/readiness
+      port: health
+    periodSeconds: 5
 
 common-generic-stuff: &common-generic-stuff
   replicaCount: 1