OPSEXP-2702 Update APS admin probes endpoints (#368)

Alfresco · Sep 24, 2024 · 026a5b4 · 026a5b4
1 parent 620d291
commit 026a5b4
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 7 deletions.
diff --git a/charts/alfresco-activiti-admin/Chart.yaml b/charts/alfresco-activiti-admin/Chart.yaml
@@ -1,7 +1,7 @@
 apiVersion: v2
 description: A Helm chart for Alfresco Activiti
 name: alfresco-activiti-admin
-version: 0.2.0
+version: 0.3.0
 appVersion: 24.3.0
 dependencies:
   - name: alfresco-common

diff --git a/charts/alfresco-activiti-admin/README.md b/charts/alfresco-activiti-admin/README.md
@@ -5,7 +5,7 @@ parent: Charts Reference
 
 # alfresco-activiti-admin
 
-![Version: 0.2.0](https://img.shields.io/badge/Version-0.2.0-informational?style=flat-square) ![AppVersion: 24.3.0](https://img.shields.io/badge/AppVersion-24.3.0-informational?style=flat-square)
+![Version: 0.3.0](https://img.shields.io/badge/Version-0.3.0-informational?style=flat-square) ![AppVersion: 24.3.0](https://img.shields.io/badge/AppVersion-24.3.0-informational?style=flat-square)
 
 A Helm chart for Alfresco Activiti
 
@@ -50,7 +50,7 @@ A Helm chart for Alfresco Activiti
 | ingress.tls | list | `[]` |  |
 | livenessProbe.failureThreshold | int | `5` |  |
 | livenessProbe.initialDelaySeconds | int | `25` |  |
-| livenessProbe.path | string | `"/activiti-admin/"` |  |
+| livenessProbe.path | string | `"/activiti-admin/actuator/health/liveness"` | For APS prior to 24.3.0, path must be set to `/activiti-admin/` |
 | livenessProbe.periodSeconds | int | `10` |  |
 | livenessProbe.timeoutSeconds | int | `5` |  |
 | nodeSelector | object | `{}` |  |
@@ -59,7 +59,7 @@ A Helm chart for Alfresco Activiti
 | podSecurityContext.runAsUser | int | `33007` |  |
 | readinessProbe.failureThreshold | int | `5` |  |
 | readinessProbe.initialDelaySeconds | int | `25` |  |
-| readinessProbe.path | string | `"/activiti-admin/"` |  |
+| readinessProbe.path | string | `"/activiti-admin/actuator/health/readiness"` | For APS prior to 24.3.0, path must be set to `/activiti-admin/` |
 | readinessProbe.periodSeconds | int | `10` |  |
 | readinessProbe.timeoutSeconds | int | `5` |  |
 | resources.limits.cpu | string | `"1000m"` |  |

diff --git a/charts/alfresco-activiti-admin/tests/deployment_test.yaml b/charts/alfresco-activiti-admin/tests/deployment_test.yaml
@@ -66,3 +66,11 @@ tests:
             configMapRef:
               name: RELEASE-NAME-alfresco-activiti-admin
         template: deployment.yaml
+  - it: should render default probes
+    asserts:
+      - equal:
+          path: spec.template.spec.containers[0].livenessProbe.httpGet.path
+          value: /activiti-admin/actuator/health/liveness
+      - equal:
+          path: spec.template.spec.containers[0].readinessProbe.httpGet.path
+          value: /activiti-admin/actuator/health/readiness
diff --git a/charts/alfresco-activiti-admin/values.yaml b/charts/alfresco-activiti-admin/values.yaml
@@ -14,13 +14,20 @@ service:
   name: activiti-admin
   type: ClusterIP
   externalPort: 80
-livenessProbe: &adminProbe
-  path: /activiti-admin/
+livenessProbe:
+  # -- For APS prior to 24.3.0, path must be set to `/activiti-admin/`
+  path: /activiti-admin/actuator/health/liveness
+  initialDelaySeconds: 25
+  periodSeconds: 10
+  failureThreshold: 5
+  timeoutSeconds: 5
+readinessProbe:
+  # -- For APS prior to 24.3.0, path must be set to `/activiti-admin/`
+  path: /activiti-admin/actuator/health/readiness
   initialDelaySeconds: 25
   periodSeconds: 10
   failureThreshold: 5
   timeoutSeconds: 5
-readinessProbe: *adminProbe
 ingress:
   # -- Toggle ingress for APS admin
   enabled: true