Skip to content

OCPBUGS-33620: define *probes for KSM #2352

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 2 commits into from
Closed

OCPBUGS-33620: define *probes for KSM #2352

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9228102
ksm: add liveness and readiness probes
rexagod Jun 13, 2024
d99eaab
fixup! ksm: add liveness and readiness probes
rexagod Jul 22, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 17 additions & 0 deletions assets/kube-state-metrics/deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,22 @@ spec:
^kube_pod_completion_time$,
^kube_pod_status_scheduled$
image: registry.k8s.io/kube-state-metrics/kube-state-metrics:v2.13.0
livenessProbe:
httpGet:
path: /livez
port: main
scheme: HTTPS
name: kube-state-metrics
ports:
- containerPort: 8443
name: main
- containerPort: 9443
name: self
readinessProbe:
httpGet:
path: /readyz
port: self
scheme: HTTPS
resources:
requests:
cpu: 2m
Expand All @@ -79,6 +94,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=/livez
image: quay.io/brancz/kube-rbac-proxy:v0.17.1
name: kube-rbac-proxy-main
ports:
Expand Down Expand Up @@ -108,6 +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=/readyz
image: quay.io/brancz/kube-rbac-proxy:v0.17.1
name: kube-rbac-proxy-self
ports:
Expand Down
31 changes: 31 additions & 0 deletions jsonnet/components/kube-state-metrics.libsonnet
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -208,6 +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 ['/readyz'] else ['/livez']),
],
volumeMounts: [
{
Expand Down Expand Up @@ -266,6 +267,36 @@ function(params)
readOnly: true,
},
],
local mainPort = 8443,
local mainPortName = 'main',
local selfPort = 9443,
local selfPortName = 'self',
ports::: [
{
containerPort: mainPort,
name: mainPortName,
},
{
containerPort: selfPort,
name: selfPortName,
},
],
local livenessProbePath = '/livez',
local readinessProbePath = '/readyz',
livenessProbe::: {
httpGet: {
path: livenessProbePath,
port: mainPortName,
scheme: 'HTTPS',
},
},
readinessProbe::: {
httpGet: {
path: readinessProbePath,
port: selfPortName,
scheme: 'HTTPS',
},
},
},
super.containers,
),
Expand Down