Merge "[OOM] Change DMaaP message-router livenessProbe"

2 files changed, 19 insertions, 12 deletions

diff --git a/kubernetes/dmaap/components/message-router/templates/statefulset.yaml b/kubernetes/dmaap/components/message-router/templates/statefulset.yaml
index f3658309bf..dbe3ffd487 100644
--- a/kubernetes/dmaap/components/message-router/templates/statefulset.yaml
+++ b/kubernetes/dmaap/components/message-router/templates/statefulset.yaml
@@ -2,6 +2,7 @@
 # Copyright © 2017 Amdocs, Bell Canada
 # Modifications Copyright © 2018 AT&T
 # Modifications Copyright © 2021-2022 Nordix Foundation
+# Modifications Copyright © 2023 DTAG
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -33,13 +34,15 @@ spec:
           ports: {{ include "common.containerPorts" . | nindent 10  }}
           {{- if eq .Values.liveness.enabled true }}
           livenessProbe:
-            tcpSocket:
+            httpGet:
+              path: /events/__strimzi-topic-operator-kstreams-topic-store-changelog/CG1/C1
               port: {{ .Values.liveness.port }}
+              scheme: HTTP
+            failureThreshold: {{ .Values.liveness.failureThreshold }}
             initialDelaySeconds: {{ .Values.liveness.initialDelaySeconds }}
             periodSeconds: {{ .Values.liveness.periodSeconds }}
-            timeoutSeconds: {{ .Values.liveness.timeoutSeconds }}
             successThreshold: {{ .Values.liveness.successThreshold }}
-            failureThreshold: {{ .Values.liveness.failureThreshold }}
+            timeoutSeconds: {{ .Values.liveness.timeoutSeconds }}
           {{ end }}
           readinessProbe:
             tcpSocket:
@@ -50,13 +53,15 @@ spec:
             successThreshold: {{ .Values.readiness.successThreshold }}
             failureThreshold: {{ .Values.readiness.failureThreshold }}
           startupProbe:
-            tcpSocket:
-                port: {{ .Values.startup.port }}
+            httpGet:
+              path: /events/__strimzi-topic-operator-kstreams-topic-store-changelog/CG1/C1
+              port: {{ .Values.startup.port }}
+              scheme: HTTP
+            failureThreshold: {{ .Values.startup.failureThreshold }}
             initialDelaySeconds: {{ .Values.startup.initialDelaySeconds }}
             periodSeconds: {{ .Values.startup.periodSeconds }}
-            timeoutSeconds: {{ .Values.startup.timeoutSeconds }}
             successThreshold: {{ .Values.startup.successThreshold }}
-            failureThreshold: {{ .Values.startup.failureThreshold }}
+            timeoutSeconds: {{ .Values.startup.timeoutSeconds }}
           env:
           - name: JAASLOGIN
             valueFrom:
diff --git a/kubernetes/dmaap/components/message-router/values.yaml b/kubernetes/dmaap/components/message-router/values.yaml
index 9645810ab6..958e29ca81 100644
--- a/kubernetes/dmaap/components/message-router/values.yaml
+++ b/kubernetes/dmaap/components/message-router/values.yaml
@@ -1,6 +1,7 @@
 # Copyright © 2017 Amdocs, Bell Canada
 # Modifications Copyright © 2018 AT&T
 # Modifications Copyright © 2021-2022 Nordix Foundation
+# Modifications Copyright © 2023 DTAG
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -63,8 +64,8 @@ ingress:
 # probe configuration parameters
 liveness:
   initialDelaySeconds: 10
-  periodSeconds: 10
-  timeoutSeconds: 1
+  periodSeconds: 30
+  timeoutSeconds: 15
   successThreshold: 1
   failureThreshold: 3
   # necessary to disable liveness probe when setting breakpoints
@@ -80,10 +81,11 @@ readiness:
   failureThreshold: 3
   port: *svc_port
 
+# periodSeconds is set longer to avoid DMaaP 429 error
 startup:
-  initialDelaySeconds: 10
-  periodSeconds: 10
-  timeoutSeconds: 1
+  initialDelaySeconds: 90
+  periodSeconds: 30
+  timeoutSeconds: 15
   successThreshold: 1
   failureThreshold: 70
   port: *svc_port