OPSEXP-2785 Add customizable probes for charts (#379)

Co-authored-by: Giovanni Toraldo <[email protected]>
Alfresco · Oct 2, 2024 · e4b0801 · e4b0801
1 parent 27c0e95
commit e4b0801
Show file tree

Hide file tree

Showing 39 changed files with 198 additions and 118 deletions.
diff --git a/charts/activemq/Chart.yaml b/charts/activemq/Chart.yaml
@@ -7,7 +7,7 @@ keywords:
 name: activemq
 sources:
   - https://github.com/Alfresco/alfresco-helm-charts
-version: 3.5.5
+version: 3.6.0-alpha.0
 appVersion: 5.18.5
 dependencies:
   - name: alfresco-common

diff --git a/charts/activemq/README.md b/charts/activemq/README.md
@@ -5,7 +5,7 @@ parent: Charts Reference
 
 # activemq
 
-![Version: 3.5.5](https://img.shields.io/badge/Version-3.5.5-informational?style=flat-square) ![AppVersion: 5.18.5](https://img.shields.io/badge/AppVersion-5.18.5-informational?style=flat-square)
+![Version: 3.6.0-alpha.0](https://img.shields.io/badge/Version-3.6.0--alpha.0-informational?style=flat-square) ![AppVersion: 5.18.5](https://img.shields.io/badge/AppVersion-5.18.5-informational?style=flat-square)
 
 A Helm chart providing a basic Apache ActiveMQ deployment required to evaluate ACS (not meant to be used in production).
 
@@ -34,6 +34,7 @@ A Helm chart providing a basic Apache ActiveMQ deployment required to evaluate A
 | livenessProbe.failureThreshold | int | `6` |  |
 | livenessProbe.initialDelaySeconds | int | `60` |  |
 | livenessProbe.periodSeconds | int | `10` |  |
+| livenessProbe.tcpSocket.port | string | `"openwire"` |  |
 | livenessProbe.timeoutSeconds | int | `1` |  |
 | nodeSelector | object | `{}` |  |
 | persistence.accessModes | list | `["ReadWriteOnce"]` | defines type of access required by the persistent volume [Access_Modes] (https://kubernetes.io/docs/concepts/storage/persistent-volumes/#access-modes) |
@@ -49,6 +50,7 @@ A Helm chart providing a basic Apache ActiveMQ deployment required to evaluate A
 | readinessProbe.failureThreshold | int | `6` |  |
 | readinessProbe.initialDelaySeconds | int | `5` |  |
 | readinessProbe.periodSeconds | int | `10` |  |
+| readinessProbe.tcpSocket.port | string | `"openwire"` |  |
 | readinessProbe.timeoutSeconds | int | `1` |  |
 | replicaCount | int | `1` |  |
 | resources.limits.cpu | string | `"2"` |  |

diff --git a/charts/activemq/templates/deployment-activemq.yaml b/charts/activemq/templates/deployment-activemq.yaml
@@ -55,21 +55,12 @@ spec:
           containerPort: {{ .Values.services.broker.ports.internal.amqp | default 5672 }}
         - name: web-console
           containerPort: {{ .Values.services.webConsole.ports.internal.webConsole | default 8161 }}
-        readinessProbe:
-          tcpSocket:
-            port: {{ .Values.services.broker.ports.internal.openwire | default 61616 }}
-          initialDelaySeconds: {{ .Values.readinessProbe.initialDelaySeconds }}
-          periodSeconds: {{ .Values.readinessProbe.periodSeconds }}
-          failureThreshold: {{ .Values.readinessProbe.failureThreshold }}
-          timeoutSeconds: {{ .Values.readinessProbe.timeoutSeconds }}
         livenessProbe:
-          tcpSocket:
-            port: {{ .Values.services.broker.ports.internal.openwire | default 61616 }}
-          initialDelaySeconds: {{ .Values.livenessProbe.initialDelaySeconds }}
-          periodSeconds: {{ .Values.livenessProbe.periodSeconds }}
-          failureThreshold: {{ .Values.livenessProbe.failureThreshold }}
-          timeoutSeconds: {{ .Values.livenessProbe.timeoutSeconds }}
-        resources: {{- toYaml .Values.resources | nindent 12 }}
+          {{- toYaml .Values.livenessProbe | nindent 12 }}
+        readinessProbe:
+          {{- toYaml .Values.readinessProbe | nindent 12 }}
+        resources:
+          {{- toYaml .Values.resources | nindent 12 }}
         volumeMounts:
           - name: data
             mountPath: {{ .Values.persistence.data.mountPath }}

diff --git a/charts/activemq/values.yaml b/charts/activemq/values.yaml
@@ -50,11 +50,15 @@ readinessProbe:
   periodSeconds: 10
   timeoutSeconds: 1
   failureThreshold: 6
+  tcpSocket:
+    port: openwire
 livenessProbe:
   initialDelaySeconds: 60
   periodSeconds: 10
   timeoutSeconds: 1
   failureThreshold: 6
+  tcpSocket:
+    port: openwire
 persistence:
   enabled: true
   baseSize: 20Gi

diff --git a/charts/alfresco-adf-app/Chart.yaml b/charts/alfresco-adf-app/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 name: alfresco-adf-app
 description: A generic Alfresco Development Framework Helm chart for Kubernetes
 type: application
-version: 0.1.1
+version: 0.2.0-alpha.0
 dependencies:
   - name: alfresco-common
     version: 3.1.3

diff --git a/charts/alfresco-adf-app/README.md b/charts/alfresco-adf-app/README.md
@@ -5,7 +5,7 @@ parent: Charts Reference
 
 # alfresco-adf-app
 
-![Version: 0.1.1](https://img.shields.io/badge/Version-0.1.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square)
+![Version: 0.2.0-alpha.0](https://img.shields.io/badge/Version-0.2.0--alpha.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square)
 
 A generic Alfresco Development Framework Helm chart for Kubernetes
 
@@ -36,20 +36,32 @@ Checkout [alfresco-content-services chart's doc](https://github.com/Alfresco/acs
 | ingress.hosts[0].paths[0].path | string | `"/"` |  |
 | ingress.hosts[0].paths[0].pathType | string | `"Prefix"` |  |
 | ingress.tls | list | `[]` |  |
+| livenessProbe.failureThreshold | int | `3` |  |
+| livenessProbe.httpGet.path | string | `"/"` |  |
+| livenessProbe.httpGet.port | string | `"http"` |  |
+| livenessProbe.initialDelaySeconds | int | `0` |  |
+| livenessProbe.periodSeconds | int | `10` |  |
+| livenessProbe.timeoutSeconds | int | `1` |  |
 | nameOverride | string | `""` |  |
 | nodeSelector | object | `{}` |  |
 | podAnnotations | object | `{}` |  |
 | podLabels | object | `{}` |  |
 | podSecurityContext.runAsNonRoot | bool | `true` |  |
 | podSecurityContext.runAsUser | int | `101` | Retrocompat with Activiti Common chart |
+| readinessProbe.failureThreshold | int | `3` |  |
+| readinessProbe.httpGet.path | string | `"/"` |  |
+| readinessProbe.httpGet.port | string | `"http"` |  |
+| readinessProbe.initialDelaySeconds | int | `0` |  |
+| readinessProbe.periodSeconds | int | `10` |  |
+| readinessProbe.timeoutSeconds | int | `1` |  |
 | replicaCount | int | `1` |  |
 | resources.limits.cpu | string | `"100m"` |  |
 | resources.limits.memory | string | `"128Mi"` |  |
 | resources.requests.cpu | string | `"100m"` |  |
 | resources.requests.memory | string | `"128Mi"` |  |
 | securityContext | object | `{}` |  |
-| service.port | int | `80` |  |
-| service.targetPort | int | `8080` |  |
+| service.port | int | `8080` |  |
+| service.targetPort | string | `"http"` |  |
 | service.type | string | `"ClusterIP"` |  |
 | serviceAccount.annotations | object | `{}` | Annotations to add to the service account |
 | serviceAccount.automount | bool | `true` | Automatically mount a ServiceAccount's API credentials? |

diff --git a/charts/alfresco-adf-app/templates/deployment.yaml b/charts/alfresco-adf-app/templates/deployment.yaml
@@ -41,13 +41,9 @@ spec:
               containerPort: {{ .Values.service.port }}
               protocol: TCP
           livenessProbe:
-            httpGet:
-              path: /
-              port: {{ .Values.service.targetPort }}
+            {{- toYaml .Values.livenessProbe | nindent 12 }}
           readinessProbe:
-            httpGet:
-              path: /
-              port: {{ .Values.service.targetPort }}
+            {{- toYaml .Values.readinessProbe | nindent 12 }}
           resources:
             {{- toYaml .Values.resources | nindent 12 }}
           {{- with .Values.volumeMounts }}

diff --git a/charts/alfresco-adf-app/values.yaml b/charts/alfresco-adf-app/values.yaml
@@ -32,8 +32,8 @@ securityContext: {}
 
 service:
   type: ClusterIP
-  port: 80
-  targetPort: 8080
+  port: 8080
+  targetPort: http
 
 ingress:
   enabled: true
@@ -46,6 +46,24 @@ ingress:
           pathType: Prefix
   tls: []
 
+livenessProbe:
+  httpGet:
+    path: /
+    port: http
+  initialDelaySeconds: 0
+  periodSeconds: 10
+  timeoutSeconds: 1
+  failureThreshold: 3
+
+readinessProbe:
+  httpGet:
+    path: /
+    port: http
+  initialDelaySeconds: 0
+  periodSeconds: 10
+  timeoutSeconds: 1
+  failureThreshold: 3
+
 resources:
   limits:
     cpu: 100m

diff --git a/charts/alfresco-ai-transformer/Chart.yaml b/charts/alfresco-ai-transformer/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 name: alfresco-ai-transformer
 description: A Helm chart for deploying Alfresco ai transformer service
 type: application
-version: 2.0.1
+version: 3.0.0-alpha.0
 appVersion: 3.1.6
 dependencies:
   - name: alfresco-common

diff --git a/charts/alfresco-ai-transformer/README.md b/charts/alfresco-ai-transformer/README.md
@@ -5,7 +5,7 @@ parent: Charts Reference
 
 # alfresco-ai-transformer
 
-![Version: 2.0.1](https://img.shields.io/badge/Version-2.0.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 3.1.6](https://img.shields.io/badge/AppVersion-3.1.6-informational?style=flat-square)
+![Version: 3.0.0-alpha.0](https://img.shields.io/badge/Version-3.0.0--alpha.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 3.1.6](https://img.shields.io/badge/AppVersion-3.1.6-informational?style=flat-square)
 
 A Helm chart for deploying Alfresco ai transformer service
 
@@ -47,11 +47,10 @@ Checkout [alfresco-content-services chart's doc](https://github.com/Alfresco/acs
 | image.pullPolicy | string | `"IfNotPresent"` |  |
 | image.repository | string | `"quay.io/alfresco/alfresco-ai-docker-engine"` |  |
 | image.tag | string | `"3.1.6"` |  |
+| livenessProbe.failureThreshold | int | `1` |  |
+| livenessProbe.httpGet.path | string | `"/live"` |  |
+| livenessProbe.httpGet.port | string | `"service-port"` |  |
 | livenessProbe.initialDelaySeconds | int | `10` |  |
-| livenessProbe.livenessPercent | int | `400` |  |
-| livenessProbe.livenessTransformPeriodSeconds | int | `600` |  |
-| livenessProbe.maxTransformSeconds | int | `1800` |  |
-| livenessProbe.maxTransforms | int | `10000` |  |
 | livenessProbe.periodSeconds | int | `20` |  |
 | livenessProbe.timeoutSeconds | int | `10` |  |
 | messageBroker.existingConfigMap | object | `{"keys":{"url":"BROKER_URL"},"name":null}` | Alternatively, provide credentials via an existing secret and set the keys as they are given |
@@ -63,6 +62,9 @@ Checkout [alfresco-content-services chart's doc](https://github.com/Alfresco/acs
 | messageBroker.user | string | `nil` |  |
 | nodeSelector | object | `{}` |  |
 | podSecurityContext.runAsUser | int | `33015` |  |
+| readinessProbe.failureThreshold | int | `3` |  |
+| readinessProbe.httpGet.path | string | `"/ready"` |  |
+| readinessProbe.httpGet.port | string | `"service-port"` |  |
 | readinessProbe.initialDelaySeconds | int | `20` |  |
 | readinessProbe.periodSeconds | int | `60` |  |
 | readinessProbe.timeoutSeconds | int | `10` |  |
@@ -84,4 +86,8 @@ Checkout [alfresco-content-services chart's doc](https://github.com/Alfresco/acs
 | strategy.rollingUpdate.maxUnavailable | int | `0` |  |
 | tags.ci | bool | `false` | A chart tag used for Hyland's CI purpose. Do not set it to true. |
 | tolerations | list | `[]` |  |
+| transformerLiveness.livenessPercent | int | `400` |  |
+| transformerLiveness.livenessTransformPeriodSeconds | int | `600` |  |
+| transformerLiveness.maxTransformSeconds | int | `1800` |  |
+| transformerLiveness.maxTransforms | int | `10000` |  |
 | trouter.pipelines | list | See | List of transformer pipelines the ATS router can advertise when using AI To get more details abous pipeline configuration check https://docs.alfresco.com/transform-service/latest/config/#transform-pipelines https://github.com/Alfresco/alfresco-ai-renditions/blob/master/ai-renditions/docker-compose/ai-pipeline-routes.json |
diff --git a/charts/alfresco-ai-transformer/templates/config-ai-transformer.yaml b/charts/alfresco-ai-transformer/templates/config-ai-transformer.yaml
@@ -8,7 +8,7 @@ data:
   {{- range $key, $val := .Values.environment }}
   {{ $key }}: {{ $val | quote }}
   {{- end }}
-  livenessPercent: "{{ .Values.livenessProbe.livenessPercent }}"
-  livenessTransformPeriodSeconds: "{{ .Values.livenessProbe.livenessTransformPeriodSeconds }}"
-  maxTransforms: "{{ .Values.livenessProbe.maxTransforms }}"
-  maxTransformSeconds: "{{ .Values.livenessProbe.maxTransformSeconds }}"
+  livenessPercent: "{{ .Values.transformerLiveness.livenessPercent }}"
+  livenessTransformPeriodSeconds: "{{ .Values.transformerLiveness.livenessTransformPeriodSeconds }}"
+  maxTransforms: "{{ .Values.transformerLiveness.maxTransforms }}"
+  maxTransformSeconds: "{{ .Values.transformerLiveness.maxTransformSeconds }}"
diff --git a/charts/alfresco-ai-transformer/templates/deployment-ai-transformer.yaml b/charts/alfresco-ai-transformer/templates/deployment-ai-transformer.yaml
@@ -80,26 +80,16 @@ spec:
                   key: {{ .Values.aws.existingConfigMap.keys.comprehendRoleARN }}
 
           ports:
-            - containerPort: {{ .Values.image.internalPort }}
+            - name: service-port
+              containerPort: {{ .Values.image.internalPort }}
           resources:
             {{- toYaml .Values.resources | nindent 12 }}
           volumeMounts:
             {{- toYaml .Values.extraVolumeMounts | nindent 12 }}
           readinessProbe:
-            httpGet:
-              path: /ready
-              port: {{ .Values.image.internalPort }}
-            initialDelaySeconds: {{ .Values.readinessProbe.initialDelaySeconds }}
-            periodSeconds: {{ .Values.readinessProbe.periodSeconds }}
-            timeoutSeconds: {{ .Values.readinessProbe.timeoutSeconds }}
+            {{- toYaml .Values.readinessProbe | nindent 12 }}
           livenessProbe:
-            httpGet:
-              path: /live
-              port: {{ .Values.image.internalPort }}
-            initialDelaySeconds: {{ .Values.livenessProbe.initialDelaySeconds }}
-            periodSeconds: {{ .Values.livenessProbe.periodSeconds }}
-            failureThreshold: 1
-            timeoutSeconds: {{ .Values.livenessProbe.timeoutSeconds }}
+            {{- toYaml .Values.livenessProbe | nindent 12 }}
           {{- if .Values.command }}
           command:
             {{- toYaml .Values.command | nindent 12 }}

diff --git a/charts/alfresco-ai-transformer/values.yaml b/charts/alfresco-ai-transformer/values.yaml
@@ -36,13 +36,22 @@ environment:
     -XX:MinRAMPercentage=50
     -XX:MaxRAMPercentage=80
 readinessProbe:
+  httpGet:
+    path: /ready
+    port: service-port
   initialDelaySeconds: 20
   periodSeconds: 60
   timeoutSeconds: 10
+  failureThreshold: 3
 livenessProbe:
+  httpGet:
+    path: /live
+    port: service-port
   initialDelaySeconds: 10
   periodSeconds: 20
   timeoutSeconds: 10
+  failureThreshold: 1
+transformerLiveness:
   livenessPercent: 400
   livenessTransformPeriodSeconds: 600
   maxTransforms: 10000

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: 2.1.0
+version: 2.2.0-alpha.0
 appVersion: 2.0.3
 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: 2.1.0](https://img.shields.io/badge/Version-2.1.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.0.3](https://img.shields.io/badge/AppVersion-2.0.3-informational?style=flat-square)
+![Version: 2.2.0-alpha.0](https://img.shields.io/badge/Version-2.2.0--alpha.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.0.3](https://img.shields.io/badge/AppVersion-2.0.3-informational?style=flat-square)
 
 A Helm chart for deploying Alfresco connector ms365 service
 
@@ -36,7 +36,7 @@ Checkout [alfresco-content-services chart's doc](https://github.com/Alfresco/acs
 | livenessProbe.failureThreshold | int | `1` |  |
 | livenessProbe.initialDelaySeconds | int | `10` |  |
 | livenessProbe.periodSeconds | int | `20` |  |
-| livenessProbe.tcpSocket.port | int | `9095` |  |
+| livenessProbe.tcpSocket.port | string | `"service-port"` |  |
 | livenessProbe.timeoutSeconds | int | `10` |  |
 | nodeSelector | object | `{}` |  |
 | podAnnotations | object | `{}` |  |
@@ -45,7 +45,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.tcpSocket.port | string | `"service-port"` |  |
 | 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
@@ -34,7 +34,8 @@ spec:
           env:
             {{- include "alfresco-connector-ms365.env" $ | indent 12 }}
           ports:
-              - containerPort: {{ .Values.image.internalPort }}
+            - name: service-port
+              containerPort: {{ .Values.image.internalPort }}
           resources: {{- toYaml .Values.resources | nindent 12 }}
           readinessProbe:
             {{- toYaml .Values.readinessProbe | nindent 12 }}

diff --git a/charts/alfresco-connector-ms365/tests/deployment-connector-ms365_test.yaml b/charts/alfresco-connector-ms365/tests/deployment-connector-ms365_test.yaml
@@ -103,15 +103,15 @@ tests:
           path: spec.template.spec.containers[0].readinessProbe
           value:
             tcpSocket:
-              port: 9095
+              port: service-port
             initialDelaySeconds: 20
             periodSeconds: 60
             timeoutSeconds: 10
       - equal:
           path: spec.template.spec.containers[0].livenessProbe
           value:
             tcpSocket:
-              port: 9095
+              port: service-port
             initialDelaySeconds: 10
             periodSeconds: 20
             failureThreshold: 1

diff --git a/charts/alfresco-connector-ms365/values.yaml b/charts/alfresco-connector-ms365/values.yaml
@@ -74,13 +74,13 @@ resources:
 environment: {}
 readinessProbe:
   tcpSocket:
-    port: 9095
+    port: service-port
   initialDelaySeconds: 20
   periodSeconds: 60
   timeoutSeconds: 10
 livenessProbe:
   tcpSocket:
-    port: 9095
+    port: service-port
   initialDelaySeconds: 10
   periodSeconds: 20
   failureThreshold: 1

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: 1.1.0
+version: 1.2.0-alpha.0
 appVersion: 2.0.3
 dependencies:
   - name: alfresco-common