From 9447c93fecdb55e0c69c50b19db509b138829208 Mon Sep 17 00:00:00 2001 From: Md Irshad Sheikh Date: Tue, 3 Sep 2024 10:34:48 -0400 Subject: [PATCH] Update probes In this commit, readinessProbe and livelinessProbe have been updated as per the given duration. failureThreshold, initialDelaySeconds, periodSeconds, successThreshold, and timeoutSeconds have been updated in all the pods of istio-operator and kiali. All the probes for charts istio-cni, istiod, istio-ingressGateways, istio-EgressGateways are added in the istio-operator.yaml Here helm-override will not work because it does not download the other charts except istio-operator chart while building the application package. Probes can only be added in istio-opeator.yaml file. Test Plan: PASS: build-pkgs & build-image PASS: AIO-SX app upload/apply/remove/delete PASS: AIO-SX Verify if the livelinessProbe parameters are configured with the updated duration. Checked using command: "kubectl get po -n istio-system -o yaml | grep -A 10 liveliness" PASS: AIO-SX Verify if the readiness probes parameters are configured with the updated duration. Checked using command: "kubectl get po -n istio-system -o yaml | grep -A 10 readiness" Story: 2011118 Task: 50956 Change-Id: I4539ed293cfe936c70564be54ebe72e735721e97 Signed-off-by: Md Irshad Sheikh --- .../istio-helm/debian/deb_folder/changelog | 2 +- .../kiali-helm/debian/deb_folder/changelog | 6 ++ ...-liveness-and-readiness-probe-update.patch | 83 +++++++++++++++++++ .../debian/deb_folder/patches/series | 1 + .../upstream/kiali-helm/debian/meta_data.yaml | 4 +- .../istio-operator/istio-operator.yaml | 36 ++++++++ .../kiali-server-static-overrides.yaml | 12 +++ 7 files changed, 141 insertions(+), 3 deletions(-) create mode 100644 helm-charts/upstream/kiali-helm/debian/deb_folder/patches/0001-liveness-and-readiness-probe-update.patch create mode 100644 helm-charts/upstream/kiali-helm/debian/deb_folder/patches/series diff --git a/helm-charts/upstream/istio-helm/debian/deb_folder/changelog b/helm-charts/upstream/istio-helm/debian/deb_folder/changelog index a61f6f9..4790c9c 100644 --- a/helm-charts/upstream/istio-helm/debian/deb_folder/changelog +++ b/helm-charts/upstream/istio-helm/debian/deb_folder/changelog @@ -2,7 +2,7 @@ istio-helm (1.22-1) unstable; urgency=medium * Update istio chart version - -- Sirin Shaikh Thu, 20 June 2024 09:17:09 +0000 + -- Sirin Shaikh Thu, 20 Jun 2024 09:17:09 +0000 istio-helm (1.19-4) unstable; urgency=medium diff --git a/helm-charts/upstream/kiali-helm/debian/deb_folder/changelog b/helm-charts/upstream/kiali-helm/debian/deb_folder/changelog index d4baf77..fee291a 100644 --- a/helm-charts/upstream/kiali-helm/debian/deb_folder/changelog +++ b/helm-charts/upstream/kiali-helm/debian/deb_folder/changelog @@ -1,3 +1,9 @@ +kiali-helm (1.85-1) unstable; urgency=medium + + * Update liveliness and readiness probe + + -- Md Irshad Sheikh Tue, 3 Sep 2024 08:17:58 -0400 + kiali-helm (1.85-0) unstable; urgency=medium * Update kiali chart version diff --git a/helm-charts/upstream/kiali-helm/debian/deb_folder/patches/0001-liveness-and-readiness-probe-update.patch b/helm-charts/upstream/kiali-helm/debian/deb_folder/patches/0001-liveness-and-readiness-probe-update.patch new file mode 100644 index 0000000..9b8e11f --- /dev/null +++ b/helm-charts/upstream/kiali-helm/debian/deb_folder/patches/0001-liveness-and-readiness-probe-update.patch @@ -0,0 +1,83 @@ +From 8b27e3ef12e131c9c8f413f0faae3d563fcbc650 Mon Sep 17 00:00:00 2001 +From: Md Irshad Sheikh +Date: Tue, 3 Sep 2024 10:03:39 -0400 +Subject: [PATCH] liveness-and-readiness-probe-update + +--- + kiali-server/templates/deployment.yaml | 14 ++++++++++---- + kiali-server/values.yaml | 12 ++++++++++++ + 2 files changed, 22 insertions(+), 4 deletions(-) + +diff --git a/kiali-server/templates/deployment.yaml b/kiali-server/templates/deployment.yaml +index 172dbcd..e8a2b9c 100644 +--- a/kiali-server/templates/deployment.yaml ++++ b/kiali-server/templates/deployment.yaml +@@ -89,6 +89,7 @@ spec: + containerPort: {{ .Values.server.observability.metrics.port | default 9090 }} + {{- end }} + readinessProbe: ++ failureThreshold: {{ .Values.deployment.readinessProbe.failureThreshold }} + httpGet: + path: {{ include "kiali-server.server.web_root" . | trimSuffix "/" }}/healthz + port: api-port +@@ -97,9 +98,12 @@ spec: + {{- else }} + scheme: HTTP + {{- end }} +- initialDelaySeconds: 5 +- periodSeconds: 30 ++ initialDelaySeconds: {{ .Values.deployment.readinessProbe.initialDelaySeconds }} ++ periodSeconds: {{ .Values.deployment.readinessProbe.periodSeconds }} ++ successThreshold: {{ .Values.deployment.readinessProbe.successThreshold }} ++ timeoutSeconds: {{ .Values.deployment.readinessProbe.timeoutSeconds }} + livenessProbe: ++ failureThreshold: {{ .Values.deployment.livenessProbe.failureThreshold }} + httpGet: + path: {{ include "kiali-server.server.web_root" . | trimSuffix "/" }}/healthz + port: api-port +@@ -108,8 +112,10 @@ spec: + {{- else }} + scheme: HTTP + {{- end }} +- initialDelaySeconds: 5 +- periodSeconds: 30 ++ initialDelaySeconds: {{ .Values.deployment.livenessProbe.initialDelaySeconds }} ++ periodSeconds: {{ .Values.deployment.livenessProbe.periodSeconds }} ++ successThreshold: {{ .Values.deployment.livenessProbe.successThreshold }} ++ timeoutSeconds: {{ .Values.deployment.livenessProbe.timeoutSeconds }} + env: + - name: ACTIVE_NAMESPACE + valueFrom: +diff --git a/kiali-server/values.yaml b/kiali-server/values.yaml +index 51de0f5..6e68ff0 100644 +--- a/kiali-server/values.yaml ++++ b/kiali-server/values.yaml +@@ -67,6 +67,12 @@ deployment: + override_yaml: + metadata: {} + instance_name: "kiali" ++ livenessProbe: ++ failureThreshold: 3 ++ initialDelaySeconds: 5 ++ periodSeconds: 30 ++ successThreshold: 1 ++ timeoutSeconds: 5 + logger: + log_format: "text" + log_level: "info" +@@ -76,6 +82,12 @@ deployment: + pod_annotations: {} + pod_labels: {} + priority_class_name: "" ++ readinessProbe: ++ failureThreshold: 3 ++ initialDelaySeconds: 5 ++ periodSeconds: 30 ++ successThreshold: 1 ++ timeoutSeconds: 5 + replicas: 1 + resources: + requests: +-- +2.25.1 + diff --git a/helm-charts/upstream/kiali-helm/debian/deb_folder/patches/series b/helm-charts/upstream/kiali-helm/debian/deb_folder/patches/series new file mode 100644 index 0000000..53b90dd --- /dev/null +++ b/helm-charts/upstream/kiali-helm/debian/deb_folder/patches/series @@ -0,0 +1 @@ +0001-liveness-and-readiness-probe-update.patch \ No newline at end of file diff --git a/helm-charts/upstream/kiali-helm/debian/meta_data.yaml b/helm-charts/upstream/kiali-helm/debian/meta_data.yaml index a592db6..02d85b2 100644 --- a/helm-charts/upstream/kiali-helm/debian/meta_data.yaml +++ b/helm-charts/upstream/kiali-helm/debian/meta_data.yaml @@ -1,13 +1,13 @@ --- debname: kiali-helm -debver: 1.85-0 +debver: 1.85-1 dl_path: name: helm-charts-kiali-1.85.0.tar.gz url: https://github.com/kiali/helm-charts/archive/refs/tags/v1.85.0.tar.gz sha256sum: 46ccb22c23fb74aa62c3c0fd2788e467c7c9d0fdf50cc5c9a36f07146bda7c16 revision: dist: $STX_DIST - stx_patch: -1 + stx_patch: 0 GITREVCOUNT: SRC_DIR: ${MY_REPO}/stx/app-istio/helm-charts/upstream/kiali-helm BASE_SRCREV: 245357e2ff1271c5451b6b369fb7dc894a04f962 diff --git a/stx-istio-helm/stx-istio-helm/fluxcd-manifests/istio-operator/istio-operator.yaml b/stx-istio-helm/stx-istio-helm/fluxcd-manifests/istio-operator/istio-operator.yaml index 37cd66b..e9c9287 100644 --- a/stx-istio-helm/stx-istio-helm/fluxcd-manifests/istio-operator/istio-operator.yaml +++ b/stx-istio-helm/stx-istio-helm/fluxcd-manifests/istio-operator/istio-operator.yaml @@ -8,6 +8,42 @@ spec: components: cni: enabled: true + k8s: + readinessProbe: + failureThreshold: 3 + initialDelaySeconds: 1 + periodSeconds: 10 + successThreshold: 1 + timeoutSeconds: 5 + pilot: + enabled: true + k8s: + readinessProbe: + failureThreshold: 4 + initialDelaySeconds: 1 + periodSeconds: 15 + successThreshold: 1 + timeoutSeconds: 5 + ingressGateways: + - name: istio-ingressgateway + enabled: true + k8s: + readinessProbe: + failureThreshold: 30 + initialDelaySeconds: 1 + periodSeconds: 10 + successThreshold: 1 + timeoutSeconds: 5 + egressGateways: + - name: istio-egressgateway + enabled: true + k8s: + readinessProbe: + failureThreshold: 30 + initialDelaySeconds: 1 + periodSeconds: 10 + successThreshold: 1 + timeoutSeconds: 5 values: sidecarInjectorWebhook: injectedAnnotations: diff --git a/stx-istio-helm/stx-istio-helm/fluxcd-manifests/kiali-server/kiali-server-static-overrides.yaml b/stx-istio-helm/stx-istio-helm/fluxcd-manifests/kiali-server/kiali-server-static-overrides.yaml index 4d788ad..b00392c 100644 --- a/stx-istio-helm/stx-istio-helm/fluxcd-manifests/kiali-server/kiali-server-static-overrides.yaml +++ b/stx-istio-helm/stx-istio-helm/fluxcd-manifests/kiali-server/kiali-server-static-overrides.yaml @@ -15,3 +15,15 @@ deployment: image_version: v1.85.0 version_label: v1.85.0 service_type: NodePort + livenessProbe: + failureThreshold: 3 + initialDelaySeconds: 5 + periodSeconds: 30 + successThreshold: 1 + timeoutSeconds: 5 + readinessProbe: + failureThreshold: 3 + initialDelaySeconds: 5 + periodSeconds: 30 + successThreshold: 1 + timeoutSeconds: 5