fix: allow opting-into upstream probes

Allow users to opt-into upstream probe definitions. Signed-off-by: Pranshu Srivastava <[email protected]>
prometheus-operator · Sep 8, 2024 · ed3886f · ed3886f
1 parent eb7f83a
commit ed3886f
Show file tree

Hide file tree

Showing 14 changed files with 540 additions and 28 deletions.
diff --git a/jsonnet/kube-prometheus/components/kube-state-metrics.libsonnet b/jsonnet/kube-prometheus/components/kube-state-metrics.libsonnet
@@ -46,6 +46,7 @@ local defaults = {
       runbookURLPattern: 'https://runbooks.prometheus-operator.dev/runbooks/kube-state-metrics/%s',
     },
   },
+  upstreamProbesOptIn: false,
 };
 
 function(params) (import 'github.com/kubernetes/kube-state-metrics/jsonnet/kube-state-metrics/kube-state-metrics.libsonnet') {
@@ -162,13 +163,17 @@ function(params) (import 'github.com/kubernetes/kube-state-metrics/jsonnet/kube-
           automountServiceAccountToken: true,
           containers: std.map(function(c) c {
             ports:: null,
-            livenessProbe:: null,
-            readinessProbe:: null,
             securityContext+: {
               runAsGroup: 65534,
             },
             args: ['--host=127.0.0.1', '--port=8081', '--telemetry-host=127.0.0.1', '--telemetry-port=8082'],
             resources: ksm._config.resources,
+          } + if ksm._config.upstreamProbesOptIn then {
+            livenessProbe: super.livenessProbe,
+            readinessProbe: super.livenessProbe,
+          } else {
+            livenessProbe:: null,
+            readinessProbe:: null,
           }, super.containers) + [kubeRbacProxyMain, kubeRbacProxySelf],
         },
       },

diff --git a/jsonnetfile.lock.json b/jsonnetfile.lock.json
@@ -18,7 +18,7 @@
           "subdir": "contrib/mixin"
         }
       },
-      "version": "4bb9392289623e8bf05916281bd696fbbe42fd4d",
+      "version": "f89dfed2dce518413078800926d930531ec9459a",
       "sum": "IXI3LQIT9NmTPJAk8WLUJd5+qZfcGpeNCyWIK7oEpws="
     },
     {
@@ -88,7 +88,7 @@
           "subdir": "grafana-builder"
         }
       },
-      "version": "1132fd721e4e97fbeeba24aeb0b45e9844c00e09",
+      "version": "52be87fb93edc439b69b550acb893abb51a079c5",
       "sum": "yxqWcq/N3E/a/XreeU6EuE6X7kYPnG0AspAQFKOjASo="
     },
     {
@@ -98,7 +98,7 @@
           "subdir": "mixin-utils"
         }
       },
-      "version": "1132fd721e4e97fbeeba24aeb0b45e9844c00e09",
+      "version": "52be87fb93edc439b69b550acb893abb51a079c5",
       "sum": "LoYq5QxJmUXEtqkEG8CFUBLBhhzDDaNANHc7Gz36ZdM="
     },
     {
@@ -128,8 +128,8 @@
           "subdir": ""
         }
       },
-      "version": "8c0479c02d05f479fafdcce56ad09ea7a264998a",
-      "sum": "QTVAYskSzcQW3fp2NqH4frV2nlYA93x7VMQ/4515zsU="
+      "version": "50150c585ebee6e4d9cb72218182da8f3c616515",
+      "sum": "0g1pn3gGq2yZyeUTx+zniK/D7jMKbAnqJ83Lke+uJ6o="
     },
     {
       "source": {
@@ -138,7 +138,7 @@
           "subdir": "jsonnet/kube-state-metrics"
         }
       },
-      "version": "e6f359db36ab62b0238aff20bf568ad69f998a87",
+      "version": "db01d3eb023c0e0d7d727c1f91f241b256d9a7f3",
       "sum": "lO7jUSzAIy8Yk9pOWJIWgPRhubkWzVh56W6wtYfbVH4="
     },
     {
@@ -148,7 +148,7 @@
           "subdir": "jsonnet/kube-state-metrics-mixin"
         }
       },
-      "version": "e6f359db36ab62b0238aff20bf568ad69f998a87",
+      "version": "db01d3eb023c0e0d7d727c1f91f241b256d9a7f3",
       "sum": "qclI7LwucTjBef3PkGBkKxF0mfZPbHnn4rlNWKGtR4c="
     },
     {
@@ -158,7 +158,7 @@
           "subdir": "jsonnet/mixin"
         }
       },
-      "version": "e7dd06566f3372d51144bffd51975806bcc14a7e",
+      "version": "1dc7f9215a64d6611e7ac7d278c7c2cc41b95c44",
       "sum": "gi+knjdxs2T715iIQIntrimbHRgHnpM8IFBJDD1gYfs=",
       "name": "prometheus-operator-mixin"
     },
@@ -169,8 +169,8 @@
           "subdir": "jsonnet/prometheus-operator"
         }
       },
-      "version": "e7dd06566f3372d51144bffd51975806bcc14a7e",
-      "sum": "Sc4Iv+TmicXlurzRDJXlr3K1Z044VeKdzXTQ3hwEPi4="
+      "version": "1dc7f9215a64d6611e7ac7d278c7c2cc41b95c44",
+      "sum": "nkQ22KTboIYhXEnBiINtMw7M1ptoO3UK6+s7O/G5fK8="
     },
     {
       "source": {
@@ -179,7 +179,7 @@
           "subdir": "doc/alertmanager-mixin"
         }
       },
-      "version": "9c711fc6d1d7613569f39bb86c41a64f1f7d254a",
+      "version": "ccc1ed914dabc288e2111f745fadf8fff105eed8",
       "sum": "IpF46ZXsm+0wJJAPtAre8+yxTNZA57mBqGpBP/r7/kw=",
       "name": "alertmanager"
     },
@@ -200,7 +200,7 @@
           "subdir": "documentation/prometheus-mixin"
         }
       },
-      "version": "a35b15cea8355c4e5c76440debfaeebb1eb6ef66",
+      "version": "09c1e0b1405ee74d3ee9b922738c7ff35704a01c",
       "sum": "dYLcLzGH4yF3qB7OGC/7z4nqeTNjv42L7Q3BENU8XJI=",
       "name": "prometheus"
     },
@@ -222,7 +222,7 @@
           "subdir": "mixin"
         }
       },
-      "version": "3270568f6b23fb81a58695d64fbc5c5716dcc449",
+      "version": "27412d2868b8363d96a516956aaabde1c091ed1f",
       "sum": "ieCD4eMgGbOlrI8GmckGPHBGQDcLasE1rULYq56W/bs=",
       "name": "thanos-mixin"
     },