Skip to content

Commit 9228102

Browse files
committed
ksm: add liveness and readiness probes
Signed-off-by: Pranshu Srivastava <[email protected]>
1 parent 5c4e4e6 commit 9228102

File tree

2 files changed

+48
-0
lines changed

2 files changed

+48
-0
lines changed

assets/kube-state-metrics/deployment.yaml

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,22 @@ spec:
5757
^kube_pod_completion_time$,
5858
^kube_pod_status_scheduled$
5959
image: registry.k8s.io/kube-state-metrics/kube-state-metrics:v2.13.0
60+
livenessProbe:
61+
httpGet:
62+
path: livez
63+
port: main
64+
scheme: HTTPS
6065
name: kube-state-metrics
66+
ports:
67+
- containerPort: 8443
68+
name: main
69+
- containerPort: 9443
70+
name: self
71+
readinessProbe:
72+
httpGet:
73+
path: metrics
74+
port: self
75+
scheme: HTTPS
6176
resources:
6277
requests:
6378
cpu: 2m
@@ -79,6 +94,7 @@ spec:
7994
- --tls-private-key-file=/etc/tls/private/tls.key
8095
- --client-ca-file=/etc/tls/client/client-ca.crt
8196
- --config-file=/etc/kube-rbac-policy/config.yaml
97+
- --ignore-paths=/livez
8298
image: quay.io/brancz/kube-rbac-proxy:v0.17.1
8399
name: kube-rbac-proxy-main
84100
ports:
@@ -108,6 +124,7 @@ spec:
108124
- --tls-private-key-file=/etc/tls/private/tls.key
109125
- --client-ca-file=/etc/tls/client/client-ca.crt
110126
- --config-file=/etc/kube-rbac-policy/config.yaml
127+
- --ignore-paths=/metrics
111128
image: quay.io/brancz/kube-rbac-proxy:v0.17.1
112129
name: kube-rbac-proxy-self
113130
ports:

jsonnet/components/kube-state-metrics.libsonnet

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -208,6 +208,7 @@ function(params)
208208
'--tls-private-key-file=/etc/tls/private/tls.key',
209209
'--client-ca-file=/etc/tls/client/client-ca.crt',
210210
'--config-file=/etc/kube-rbac-policy/config.yaml',
211+
'--ignore-paths=' + std.join(',', if std.endsWith(c.name, '-self') then ['/metrics'] else ['/livez']),
211212
],
212213
volumeMounts: [
213214
{
@@ -266,6 +267,36 @@ function(params)
266267
readOnly: true,
267268
},
268269
],
270+
local mainPort = 8443,
271+
local mainPortName = 'main',
272+
local selfPort = 9443,
273+
local selfPortName = 'self',
274+
ports::: [
275+
{
276+
containerPort: mainPort,
277+
name: mainPortName,
278+
},
279+
{
280+
containerPort: selfPort,
281+
name: selfPortName,
282+
},
283+
],
284+
local livenessProbePath = 'livez',
285+
local readinessProbePath = 'metrics',
286+
livenessProbe::: {
287+
httpGet: {
288+
path: livenessProbePath,
289+
port: mainPortName,
290+
scheme: 'HTTPS',
291+
},
292+
},
293+
readinessProbe::: {
294+
httpGet: {
295+
path: readinessProbePath,
296+
port: selfPortName,
297+
scheme: 'HTTPS',
298+
},
299+
},
269300
},
270301
super.containers,
271302
),

0 commit comments

Comments
 (0)