Skip to content
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

[OSD-25656] Enhance the affinity rules to avoid pod mis-scheduling #62

Open
wants to merge 10 commits into
base: main
Choose a base branch
from
Open

[OSD-25656] Enhance the affinity rules to avoid pod mis-scheduling #62

Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
985d83c
Enhance the affinity rules to avoid pod mis-scheduling
xiaoyu74 Nov 25, 2024
8bf235e
Fixed some yaml format issues
xiaoyu74 Dec 3, 2024
e3de6ef
Fix some format and syntax issue based on the review feedback
xiaoyu74 Dec 8, 2024
d132c5f
Updated the node affinity to add multiple nodeSelectorTerms to provid…
xiaoyu74 Dec 16, 2024
2034633
Added another nodeSlectorTerm for additional tolerence
xiaoyu74 Dec 16, 2024
2eb63f1
Update the format a bit
xiaoyu74 Dec 16, 2024
4174626
Merge remote-tracking branch 'upstream/main' into resolve_pod_mis_sch…
xiaoyu74 Jan 21, 2025
27d794b
Updated the nodeAffinity for metrics-forward to require 2 labels
xiaoyu74 Jan 21, 2025
514c3ee
Updated to optimze the affinity rules
xiaoyu74 Jan 21, 2025
b5b58fa
Update to fix YAML formatting issues
xiaoyu74 Jan 21, 2025
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
21 changes: 14 additions & 7 deletions package/resources.yaml.gotmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -154,6 +154,14 @@ spec:
spec:
affinity:
nodeAffinity:
requiredDuringSchedulingIgnoredDuringExecution:
# Enforce scheduling on nodes with the correct hypershift.openshift.io/cluster label
nodeSelectorTerms:
- matchExpressions:
- key: hypershift.openshift.io/cluster
operator: In
values:
- '{{.package.metadata.namespace}}'
xiaoyu74 marked this conversation as resolved.
Show resolved Hide resolved
preferredDuringSchedulingIgnoredDuringExecution:
- weight: 50
preference:
Expand All @@ -169,13 +177,12 @@ spec:
operator: In
values:
- "true"
- weight: 70
preference:
matchExpressions:
- key: hypershift.openshift.io/cluster
operator: In
values:
- '{{.package.metadata.namespace}}'
# Fallback preference to any worker node (for cases where labels are missing)
- weight: 30
preference:
matchExpressions:
- key: node-role.kubernetes.io/worker
operator: Exists
podAffinity:
preferredDuringSchedulingIgnoredDuringExecution:
- podAffinityTerm:
Expand Down