Merge pull request #159 from xenit-eu/XENOPS-1191

XENOPS-1191 added acs.customLivenessProbe
xenit-eu · Aug 20, 2024 · 065b022 · 065b022
2 parents 39b66bb + 693048e
commit 065b022
Show file tree

Hide file tree

Showing 4 changed files with 31 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,6 +6,13 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 chronology things are added/fixed/changed and - where possible - links to the PRs involved.
 
 ### Changes
+[v0.7.3]
+* added acs.customLivenessProbe
+* added acs.customReadinessProbe
+
+[v0.7.2]
+* fix cluster-issuer default value
+
 [v0.7.1]
 * add flag to enable/disable enterprise-only functionality
 * remove HorizontalPodAutoscaler as it was not functional

diff --git a/README.md b/README.md
@@ -377,6 +377,13 @@ Digital Workspace are disabled.
 ```
 * Description: Specify the livenessProbe configuration for acs
 
+#### `acs.customLivenessProbe`
+
+* Required: false
+* Default: None
+* Description: Specify a custom livenessProbe configuration for acs (for example to replace httpGet with exec). 
+* When this is defined, acs.livenessProbe is ignored.
+
 #### `acs.readinessProbe`
 
 * Required: false
@@ -394,6 +401,13 @@ Digital Workspace are disabled.
 ```
 * Description: Specify the readinessProbe configuration for acs
 
+#### `acs.customReadinessProbe`
+
+* Required: false
+* Default: None
+* Description: Specify a custom readinessProbe configuration for acs (for example to replace httpGet with exec).
+* When this is defined, acs.readinessProbe is ignored.
+
 #### `acs.strategy.type`
 
 * Required: false

diff --git a/xenit-alfresco/templates/acs/acs-deployment.yaml b/xenit-alfresco/templates/acs/acs-deployment.yaml
@@ -49,11 +49,17 @@ spec:
       - name: acs-container
         image: {{ .Values.acs.image.registry }}/{{ .Values.acs.image.repository }}:{{ .Values.acs.image.tag }}
         imagePullPolicy: {{ .Values.acs.imagePullPolicy | default "IfNotPresent" }}
-        {{- if .Values.acs.readinessProbe }}
+        {{- if .Values.acs.customReadinessProbe }}
+        readinessProbe:
+          {{ toYaml .Values.acs.customReadinessProbe | nindent 10 }}
+        {{- else if .Values.acs.readinessProbe }}
         readinessProbe:
           {{ toYaml .Values.acs.readinessProbe | nindent 10 }}
         {{- end }}
-        {{- if .Values.acs.livenessProbe }}
+        {{- if .Values.acs.customLivenessProbe }}
+        livenessProbe:
+          {{ toYaml .Values.acs.customLivenessProbe | nindent 10 }}
+        {{- else if .Values.acs.livenessProbe }}
         livenessProbe:
           {{ toYaml .Values.acs.livenessProbe | nindent 10 }}
         {{- end }}

diff --git a/xenit-alfresco/values.yaml b/xenit-alfresco/values.yaml
@@ -60,6 +60,7 @@ acs:
     periodSeconds: 20
     successThreshold: 1
     timeoutSeconds: 10
+  customLivenessProbe:
   readinessProbe:
     httpGet:
       path: /alfresco/api/-default-/public/alfresco/versions/1/probes/-ready-
@@ -70,6 +71,7 @@ acs:
     periodSeconds: 20
     successThreshold: 1
     timeoutSeconds: 10
+  customReadinessProbe:
   ingress:
     enabled: true
 digitalWorkspace: