From 76e8331ec8eafbd28f037fb33e6514be9979e1bb Mon Sep 17 00:00:00 2001
From: Pranshu Srivastava <rexagod@gmail.com>
Date: Mon, 22 Jul 2024 22:52:50 +0530
Subject: [PATCH] fixup! ksm: add liveness and readiness probes

---
 assets/kube-state-metrics/deployment.yaml       | 6 +++---
 jsonnet/components/kube-state-metrics.libsonnet | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/assets/kube-state-metrics/deployment.yaml b/assets/kube-state-metrics/deployment.yaml
index 63681f90f3..a3e8e76e49 100644
--- a/assets/kube-state-metrics/deployment.yaml
+++ b/assets/kube-state-metrics/deployment.yaml
@@ -59,7 +59,7 @@ spec:
         image: registry.k8s.io/kube-state-metrics/kube-state-metrics:v2.12.0
         livenessProbe:
           httpGet:
-            path: livez
+            path: /livez
             port: main
             scheme: HTTPS
         name: kube-state-metrics
@@ -70,7 +70,7 @@ spec:
           name: self
         readinessProbe:
           httpGet:
-            path: metrics
+            path: /readyz
             port: self
             scheme: HTTPS
         resources:
@@ -124,7 +124,7 @@ spec:
         - --tls-private-key-file=/etc/tls/private/tls.key
         - --client-ca-file=/etc/tls/client/client-ca.crt
         - --config-file=/etc/kube-rbac-policy/config.yaml
-        - --ignore-paths=/metrics
+        - --ignore-paths=/readyz
         image: quay.io/brancz/kube-rbac-proxy:v0.17.1
         name: kube-rbac-proxy-self
         ports:
diff --git a/jsonnet/components/kube-state-metrics.libsonnet b/jsonnet/components/kube-state-metrics.libsonnet
index e6b961a52a..7deeb81381 100644
--- a/jsonnet/components/kube-state-metrics.libsonnet
+++ b/jsonnet/components/kube-state-metrics.libsonnet
@@ -208,7 +208,7 @@ function(params)
                         '--tls-private-key-file=/etc/tls/private/tls.key',
                         '--client-ca-file=/etc/tls/client/client-ca.crt',
                         '--config-file=/etc/kube-rbac-policy/config.yaml',
-                        '--ignore-paths=' + std.join(',', if std.endsWith(c.name, '-self') then ['/metrics'] else ['/livez']),
+                        '--ignore-paths=' + std.join(',', if std.endsWith(c.name, '-self') then ['/readyz'] else ['/livez']),
                       ],
                       volumeMounts: [
                         {
@@ -281,8 +281,8 @@ function(params)
                           name: selfPortName,
                         },
                       ],
-                      local livenessProbePath = 'livez',
-                      local readinessProbePath = 'metrics',
+                      local livenessProbePath = '/livez',
+                      local readinessProbePath = '/readyz',
                       livenessProbe::: {
                         httpGet: {
                           path: livenessProbePath,