From 98a6d857d7d48183c0a207c3d285ff566ac8a5aa Mon Sep 17 00:00:00 2001
From: John Mazzitelli <mazz@redhat.com>
Date: Wed, 13 Nov 2024 13:35:15 -0500
Subject: [PATCH 1/2] be able to configure server readiness probe

---
 kiali-server/templates/deployment.yaml | 4 ++--
 kiali-server/values.yaml               | 3 +++
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/kiali-server/templates/deployment.yaml b/kiali-server/templates/deployment.yaml
index 46f7c37..3534b83 100644
--- a/kiali-server/templates/deployment.yaml
+++ b/kiali-server/templates/deployment.yaml
@@ -101,8 +101,8 @@ spec:
             {{- else }}
             scheme: HTTP
             {{- end }}
-          initialDelaySeconds: 5
-          periodSeconds: 30
+          initialDelaySeconds: {{ .Values.deployment.readiness_probe.initial_delay_seconds | int | default 5 }}
+          periodSeconds: {{ .Values.deployment.readiness_probe.period_seconds | int | default 30 }}
         livenessProbe:
           httpGet:
             path: {{ include "kiali-server.server.web_root" . | trimSuffix "/"  }}/healthz
diff --git a/kiali-server/values.yaml b/kiali-server/values.yaml
index 29185ba..a84b76b 100644
--- a/kiali-server/values.yaml
+++ b/kiali-server/values.yaml
@@ -69,6 +69,9 @@ deployment:
   pod_annotations: {}
   pod_labels: {}
   priority_class_name: ""
+  readiness_probe:
+    initial_delay_seconds: 5
+    period_seconds: 30
   remote_cluster_resources_only: false
   # if deployment.hpa is defined, this replicas setting will be ignored
   replicas: 1

From 8e33258ea12f2bddbac911b087421a3dedfc49a1 Mon Sep 17 00:00:00 2001
From: John Mazzitelli <mazz@redhat.com>
Date: Wed, 13 Nov 2024 13:57:04 -0500
Subject: [PATCH 2/2] be able to configure all probes

---
 kiali-server/templates/deployment.yaml | 14 +++++++-------
 kiali-server/values.yaml               | 14 +++++++++++---
 2 files changed, 18 insertions(+), 10 deletions(-)

diff --git a/kiali-server/templates/deployment.yaml b/kiali-server/templates/deployment.yaml
index 3534b83..e02e75f 100644
--- a/kiali-server/templates/deployment.yaml
+++ b/kiali-server/templates/deployment.yaml
@@ -101,8 +101,8 @@ spec:
             {{- else }}
             scheme: HTTP
             {{- end }}
-          initialDelaySeconds: {{ .Values.deployment.readiness_probe.initial_delay_seconds | int | default 5 }}
-          periodSeconds: {{ .Values.deployment.readiness_probe.period_seconds | int | default 30 }}
+          initialDelaySeconds: {{ .Values.deployment.probes.readiness.initial_delay_seconds | int | default 5 }}
+          periodSeconds: {{ .Values.deployment.probes.readiness.period_seconds | int | default 30 }}
         livenessProbe:
           httpGet:
             path: {{ include "kiali-server.server.web_root" . | trimSuffix "/"  }}/healthz
@@ -112,8 +112,8 @@ spec:
             {{- else }}
             scheme: HTTP
             {{- end }}
-          initialDelaySeconds: 5
-          periodSeconds: 30
+          initialDelaySeconds: {{ .Values.deployment.probes.liveness.initial_delay_seconds | int | default 5 }}
+          periodSeconds: {{ .Values.deployment.probes.liveness.period_seconds | int | default 30 }}
         startupProbe:
           httpGet:
             path: {{ include "kiali-server.server.web_root" . | trimSuffix "/"  }}/healthz
@@ -123,9 +123,9 @@ spec:
             {{- else }}
             scheme: HTTP
             {{- end }}
-          initialDelaySeconds: 30
-          periodSeconds: 10
-          failureThreshold: 6
+          failureThreshold: {{ .Values.deployment.probes.startup.failure_threshold | int | default 6 }}
+          initialDelaySeconds: {{ .Values.deployment.probes.startup.initial_delay_seconds | int | default 30 }}
+          periodSeconds: {{ .Values.deployment.probes.startup.period_seconds | int | default 10 }}
         env:
         - name: ACTIVE_NAMESPACE
           valueFrom:
diff --git a/kiali-server/values.yaml b/kiali-server/values.yaml
index a84b76b..d0cc6a5 100644
--- a/kiali-server/values.yaml
+++ b/kiali-server/values.yaml
@@ -69,9 +69,17 @@ deployment:
   pod_annotations: {}
   pod_labels: {}
   priority_class_name: ""
-  readiness_probe:
-    initial_delay_seconds: 5
-    period_seconds: 30
+  probes:
+    liveness:
+      initial_delay_seconds: 5
+      period_seconds: 30
+    readiness:
+      initial_delay_seconds: 5
+      period_seconds: 30
+    startup:
+      failure_threshold: 6
+      initial_delay_seconds: 30
+      period_seconds: 10
   remote_cluster_resources_only: false
   # if deployment.hpa is defined, this replicas setting will be ignored
   replicas: 1