Change startup, liveness and readiness probes. All configuration

settings are in `values.yaml`. Now, The probes are using `httpGet` instead of `runUMTool.sh` utility.
SoftwareAG · Dec 14, 2023 · 018dca9 · 018dca9
1 parent 154d6fd
commit 018dca9
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 24 deletions.
diff --git a/universalmessaging/helm/Chart.yaml b/universalmessaging/helm/Chart.yaml
@@ -24,7 +24,7 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 1.0.1
+version: 1.0.2
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to

diff --git a/universalmessaging/helm/README.md.gotmpl b/universalmessaging/helm/README.md.gotmpl
@@ -56,7 +56,8 @@ helm install um webmethods/universalmessaging
 
 | Version | Changes and Description |
 |-----|------|
-| `1.0.0' | Initial release |
-| `1.0.1' | Update JMX Exporter configuration file from latest [UM Git repository](https://github.com/SoftwareAG/universalmessaging-prometheus-jmx-exporter-config). Bugfix: Mount configuration files into container. Nginx added. |
+| `1.0.0` | Initial release |
+| `1.0.1` | Update JMX Exporter configuration file from latest [UM Git repository](https://github.com/SoftwareAG/universalmessaging-prometheus-jmx-exporter-config). Bugfix: Mount configuration files into container. Nginx added. |
+| `1.0.2` | Change startup, liveness and readiness probes. All configuration settings are in `values.yaml`. Now, The probes are using `httpGet` instead of `runUMTool.sh` utility. |
 
 {{ template "chart.valuesSection" . }}
diff --git a/universalmessaging/helm/templates/statefulset.yaml b/universalmessaging/helm/templates/statefulset.yaml
@@ -156,26 +156,10 @@ spec:
           {{ toYaml .Values.lifecycle | indent 10 }}
           {{- end }}          
           startupProbe:
-            tcpSocket:
-              port: 9000
-            initialDelaySeconds: 10
-            timeoutSeconds: 1
-            periodSeconds: 5
-            successThreshold: 1
-            failureThreshold: 10
+            {{- toYaml .Values.startupProbe | nindent 12 }}
           livenessProbe:
-            exec:
-              command:
-              - runUMTool.sh
-              - GetServerTime
-              - -rname=nsp://localhost:9000
             {{- toYaml .Values.livenessProbe | nindent 12 }}
           readinessProbe:
-            exec:
-              command:
-              - runUMTool.sh
-              - GetServerTime
-              - -rname=nsp://localhost:9000
             {{- toYaml .Values.readinessProbe | nindent 12 }}
           resources:
             {{- toYaml .Values.resources | nindent 12 }}

diff --git a/universalmessaging/helm/values.yaml b/universalmessaging/helm/values.yaml
@@ -182,19 +182,38 @@ tolerations: []
 
 affinity: {}
 
+# -- Configure liveness probe
+startupProbe:
+  httpGet:
+    path: /health/
+    port: 9000
+  initialDelaySeconds: 30
+  periodSeconds: 10
+  timeoutSeconds: 5
+  successThreshold: 1
+  failureThreshold: 30
+
 # -- Configure liveness probe
 livenessProbe:
+  httpGet:
+    path: /health/
+    port: 9000
+  initialDelaySeconds: 0
   periodSeconds: 15
-  timeoutSeconds: 60
+  timeoutSeconds: 30
   successThreshold: 1
-  failureThreshold: 5
+  failureThreshold: 3
 
 # -- Configure readiness probe
 readinessProbe:
+  httpGet:
+    path: /health/
+    port: 9000
+  initialDelaySeconds: 0
   periodSeconds: 15
-  timeoutSeconds: 60
+  timeoutSeconds: 30
   successThreshold: 1
-  failureThreshold: 5
+  failureThreshold: 3
 
 # -- Deploy Nginx as external LB. The LB will be configured to dispatch incoming requests to all `replicaCount` replicas.
 # Nginx is configured by example from [Universal Messaging documentation](https://documentation.softwareag.com/universal_messaging/num10-15/webhelp/num-webhelp/#page/num-webhelp%2Fre-configure_nginx_to_serve_http_requests.html%23)