Skip to content

OCPBUGS-48578: chore(metrics-server): prefer control-plane nodes and tolerate their taints #2801

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

Merged
openshift-merge-bot merged 1 commit into from
Mar 13, 2026
+31 −0
Merged

OCPBUGS-48578: chore(metrics-server): prefer control-plane nodes and tolerate their taints #2801

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 10 additions & 0 deletions assets/metrics-server/deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,13 @@ spec:
app.kubernetes.io/part-of: openshift-monitoring
spec:
affinity:
nodeAffinity:
preferredDuringSchedulingIgnoredDuringExecution:
- preference:
matchExpressions:
- key: node-role.kubernetes.io/control-plane
operator: Exists
weight: 100
podAntiAffinity:
requiredDuringSchedulingIgnoredDuringExecution:
- labelSelector:
Expand Down Expand Up @@ -103,6 +110,9 @@ spec:
priorityClassName: system-cluster-critical
serviceAccountName: metrics-server
terminationGracePeriodSeconds: 170
tolerations:
- effect: NoSchedule
key: node-role.kubernetes.io/master
volumes:
- name: secret-metrics-server-client-certs
secret:
Expand Down
21 changes: 21 additions & 0 deletions jsonnet/components/metrics-server.libsonnet
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -173,6 +173,21 @@ function(params) {
},
spec: {
affinity: {
nodeAffinity: {
preferredDuringSchedulingIgnoredDuringExecution: [
{
weight: 100,
preference: {
matchExpressions: [
{
key: 'node-role.kubernetes.io/control-plane',
operator: 'Exists',
},
],
},
},
],
},
podAntiAffinity: {
requiredDuringSchedulingIgnoredDuringExecution: [
{
Expand Down Expand Up @@ -274,6 +289,12 @@ function(params) {
'kubernetes.io/os': 'linux',
},
priorityClassName: 'system-cluster-critical',
tolerations: [
{
key: 'node-role.kubernetes.io/master',
effect: 'NoSchedule',
},
],
serviceAccountName: 'metrics-server',
terminationGracePeriodSeconds: 170,
volumes: [
Expand Down