OPSEXP-2785 Add completely customizable probes for connector charts (#…

…343)
Alfresco · Aug 19, 2024 · 9b304d9 · 9b304d9
1 parent 1c21c9b
commit 9b304d9
Show file tree

Hide file tree

Showing 10 changed files with 65 additions and 26 deletions.
diff --git a/charts/alfresco-connector-ms365/Chart.yaml b/charts/alfresco-connector-ms365/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 name: alfresco-connector-ms365
 description: A Helm chart for deploying Alfresco connector ms365 service
 type: application
-version: 1.0.0
+version: 2.0.0-alpha.0
 appVersion: 2.0.2
 dependencies:
   - name: alfresco-common

diff --git a/charts/alfresco-connector-ms365/README.md b/charts/alfresco-connector-ms365/README.md
@@ -5,7 +5,7 @@ parent: Charts Reference
 
 # alfresco-connector-ms365
 
-![Version: 1.0.0](https://img.shields.io/badge/Version-1.0.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.0.2](https://img.shields.io/badge/AppVersion-2.0.2-informational?style=flat-square)
+![Version: 2.0.0-alpha.0](https://img.shields.io/badge/Version-2.0.0--alpha.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.0.2](https://img.shields.io/badge/AppVersion-2.0.2-informational?style=flat-square)
 
 A Helm chart for deploying Alfresco connector ms365 service
 
@@ -32,8 +32,10 @@ Checkout [alfresco-content-services chart's doc](https://github.com/Alfresco/acs
 | ingress.extraAnnotations | object | `{}` |  |
 | ingress.path | string | `"/ooi-service"` |  |
 | ingress.tls | list | `[]` |  |
+| livenessProbe.failureThreshold | int | `1` |  |
 | livenessProbe.initialDelaySeconds | int | `10` |  |
 | livenessProbe.periodSeconds | int | `20` |  |
+| livenessProbe.tcpSocket.port | int | `9095` |  |
 | livenessProbe.timeoutSeconds | int | `10` |  |
 | nodeSelector | object | `{}` |  |
 | podAnnotations | object | `{}` |  |
@@ -42,6 +44,7 @@ Checkout [alfresco-content-services chart's doc](https://github.com/Alfresco/acs
 | podSecurityContext.runAsUser | int | `33006` |  |
 | readinessProbe.initialDelaySeconds | int | `20` |  |
 | readinessProbe.periodSeconds | int | `60` |  |
+| readinessProbe.tcpSocket.port | int | `9095` |  |
 | readinessProbe.timeoutSeconds | int | `10` |  |
 | replicaCount | int | `2` |  |
 | repository.existingConfigMap.keys.host | string | `"REPO_HOST"` | name of the key in the configMap where to find the repository service host |

diff --git a/charts/alfresco-connector-ms365/templates/deployment-connector-ms365.yaml b/charts/alfresco-connector-ms365/templates/deployment-connector-ms365.yaml
@@ -37,18 +37,9 @@ spec:
               - containerPort: {{ .Values.image.internalPort }}
           resources: {{- toYaml .Values.resources | nindent 12 }}
           readinessProbe:
-            tcpSocket:
-              port: {{ .Values.image.internalPort }}
-            initialDelaySeconds: {{ .Values.readinessProbe.initialDelaySeconds }}
-            periodSeconds: {{ .Values.readinessProbe.periodSeconds }}
-            timeoutSeconds: {{ .Values.readinessProbe.timeoutSeconds }}
+            {{- toYaml .Values.readinessProbe | nindent 12 }}
           livenessProbe:
-            tcpSocket:
-              port: {{ .Values.image.internalPort }}
-            initialDelaySeconds: {{ .Values.livenessProbe.initialDelaySeconds }}
-            periodSeconds: {{ .Values.livenessProbe.periodSeconds }}
-            failureThreshold: 1
-            timeoutSeconds: {{ .Values.livenessProbe.timeoutSeconds }}
+            {{- toYaml .Values.livenessProbe | nindent 12 }}
       {{- with .Values.nodeSelector }}
       nodeSelector:
         {{- toYaml . | nindent 8 }}

diff --git a/charts/alfresco-connector-ms365/tests/deployment-connector-ms365_test.yaml b/charts/alfresco-connector-ms365/tests/deployment-connector-ms365_test.yaml
@@ -96,3 +96,23 @@ tests:
             app.kubernetes.io/name: testName
             app.kubernetes.io/version: 2.0.0
             helm.sh/chart: alfresco-connector-ms365-1.0.0
+
+  - it: should render probes
+    asserts:
+      - equal:
+          path: spec.template.spec.containers[0].readinessProbe
+          value:
+            tcpSocket:
+              port: 9095
+            initialDelaySeconds: 20
+            periodSeconds: 60
+            timeoutSeconds: 10
+      - equal:
+          path: spec.template.spec.containers[0].livenessProbe
+          value:
+            tcpSocket:
+              port: 9095
+            initialDelaySeconds: 10
+            periodSeconds: 20
+            failureThreshold: 1
+            timeoutSeconds: 10
diff --git a/charts/alfresco-connector-ms365/values.yaml b/charts/alfresco-connector-ms365/values.yaml
@@ -72,12 +72,17 @@ resources:
     memory: "1000Mi"
 environment: {}
 readinessProbe:
+  tcpSocket:
+    port: 9095
   initialDelaySeconds: 20
   periodSeconds: 60
   timeoutSeconds: 10
 livenessProbe:
+  tcpSocket:
+    port: 9095
   initialDelaySeconds: 10
   periodSeconds: 20
+  failureThreshold: 1
   timeoutSeconds: 10
 repository:
   # -- ACS repository host

diff --git a/charts/alfresco-connector-msteams/Chart.yaml b/charts/alfresco-connector-msteams/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 name: alfresco-connector-msteams
 description: A Helm chart for deploying Alfresco connector msteams service
 type: application
-version: 0.6.0
+version: 1.0.0-alpha.0
 appVersion: 2.0.2
 dependencies:
   - name: alfresco-common

diff --git a/charts/alfresco-connector-msteams/README.md b/charts/alfresco-connector-msteams/README.md
@@ -5,7 +5,7 @@ parent: Charts Reference
 
 # alfresco-connector-msteams
 
-![Version: 0.6.0](https://img.shields.io/badge/Version-0.6.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.0.2](https://img.shields.io/badge/AppVersion-2.0.2-informational?style=flat-square)
+![Version: 1.0.0-alpha.0](https://img.shields.io/badge/Version-1.0.0--alpha.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.0.2](https://img.shields.io/badge/AppVersion-2.0.2-informational?style=flat-square)
 
 A Helm chart for deploying Alfresco connector msteams service
 
@@ -35,8 +35,10 @@ Checkout [alfresco-content-services chart's doc](https://github.com/Alfresco/acs
 | ingress.extraAnnotations | object | `{}` |  |
 | ingress.path | string | `"/ms-teams-service"` |  |
 | ingress.tls | list | `[]` |  |
+| livenessProbe.failureThreshold | int | `1` |  |
 | livenessProbe.initialDelaySeconds | int | `10` |  |
 | livenessProbe.periodSeconds | int | `20` |  |
+| livenessProbe.tcpSocket.port | int | `3978` |  |
 | livenessProbe.timeoutSeconds | int | `10` |  |
 | microsoft.app.existingSecret.keys.id | string | `"MICROSOFT_APP_ID"` |  |
 | microsoft.app.existingSecret.keys.password | string | `"MICROSOFT_APP_PASSWORD"` |  |
@@ -49,6 +51,7 @@ Checkout [alfresco-content-services chart's doc](https://github.com/Alfresco/acs
 | podSecurityContext.runAsUser | int | `33041` |  |
 | readinessProbe.initialDelaySeconds | int | `20` |  |
 | readinessProbe.periodSeconds | int | `60` |  |
+| readinessProbe.tcpSocket.port | int | `3978` |  |
 | readinessProbe.timeoutSeconds | int | `10` |  |
 | replicaCount | int | `2` |  |
 | repository.existingConfigMap.keys.url | string | `"ALFRESCO_BASE_URL"` | Key within the configmap holding the full url to connect to the alfresco repository |

diff --git a/charts/alfresco-connector-msteams/templates/deployment-connector-msteams.yaml b/charts/alfresco-connector-msteams/templates/deployment-connector-msteams.yaml
@@ -46,15 +46,6 @@ spec:
               - containerPort: {{ .Values.image.internalPort }}
           resources: {{- toYaml .Values.resources | nindent 12 }}
           readinessProbe:
-            tcpSocket:
-              port: {{ .Values.image.internalPort }}
-            initialDelaySeconds: {{ .Values.readinessProbe.initialDelaySeconds }}
-            periodSeconds: {{ .Values.readinessProbe.periodSeconds }}
-            timeoutSeconds: {{ .Values.readinessProbe.timeoutSeconds }}
+            {{- toYaml .Values.readinessProbe | nindent 12 }}
           livenessProbe:
-            tcpSocket:
-              port: {{ .Values.image.internalPort }}
-            initialDelaySeconds: {{ .Values.livenessProbe.initialDelaySeconds }}
-            periodSeconds: {{ .Values.livenessProbe.periodSeconds }}
-            failureThreshold: 1
-            timeoutSeconds: {{ .Values.livenessProbe.timeoutSeconds }}
+            {{- toYaml .Values.livenessProbe | nindent 12 }}
diff --git a/charts/alfresco-connector-msteams/tests/deployment-connector-msteams_test.yaml b/charts/alfresco-connector-msteams/tests/deployment-connector-msteams_test.yaml
@@ -153,3 +153,24 @@ tests:
           app.kubernetes.io/version: 2.0.0
           helm.sh/chart: alfresco-connector-msteams-1.0.0
   template: deployment-connector-msteams.yaml
+
+- it: should render probes
+  asserts:
+    - equal:
+        path: spec.template.spec.containers[0].readinessProbe
+        value:
+          tcpSocket:
+            port: 3978
+          initialDelaySeconds: 20
+          periodSeconds: 60
+          timeoutSeconds: 10
+    - equal:
+        path: spec.template.spec.containers[0].livenessProbe
+        value:
+          tcpSocket:
+            port: 3978
+          initialDelaySeconds: 10
+          periodSeconds: 20
+          failureThreshold: 1
+          timeoutSeconds: 10
+  template: deployment-connector-msteams.yaml
diff --git a/charts/alfresco-connector-msteams/values.yaml b/charts/alfresco-connector-msteams/values.yaml
@@ -31,11 +31,16 @@ resources:
     cpu: "1"
     memory: "1000Mi"
 readinessProbe:
+  tcpSocket:
+    port: 3978
   initialDelaySeconds: 20
   periodSeconds: 60
   timeoutSeconds: 10
 livenessProbe:
+  tcpSocket:
+    port: 3978
   initialDelaySeconds: 10
+  failureThreshold: 1
   periodSeconds: 20
   timeoutSeconds: 10
 environment: null