[18.0-fr3] Add tolerations customization interface for service operators#1551
Merged
openshift-merge-bot[bot] merged 1 commit intoAug 6, 2025
Conversation
Adds ability for service operators to customize pod tolerations similar
to how resource limits/requests are currently handled.
Features:
- Add Tolerations field to ContainerSpec API type
- Implement merge behavior: custom tolerations are merged with defaults,
overriding by key when same key exists
- Set global default tolerations (node.kubernetes.io/not-ready and
node.kubernetes.io/unreachable with 120s timeout) in controller
- Update deployment templates (managers.yaml, operator.yaml) to render
custom tolerations from Deployment struct
- Add test coverage for merge logic and override behavior
Example usage:
```yaml
operatorOverrides:
- name: "keystone"
controllerManager:
tolerations:
- key: "node.kubernetes.io/not-ready" # Override default timeout
operator: "Exists"
effect: "NoExecute"
tolerationSeconds: 600
- key: "node.example.com/gpu" # Add new toleration
operator: "Equal"
value: "nvidia"
effect: "NoSchedule"
```
The merge behavior ensures operators get both default tolerations
(unless overridden by matching key) plus any additional custom ones,
providing flexibility while maintaining safe defaults.
Jira: OSPRH-18693
Assisted-by: claude-4-sonnet
Signed-off-by: Martin Schuppert <mschuppert@redhat.com>
Contributor
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: openshift-cherrypick-robot, stuggi The full list of commands accepted by this bot can be found here. The pull request process is described here DetailsNeeds approval from an approver in each of these files:
Approvers can indicate their approval by writing |
openshift-merge-bot
Bot
merged commit dcf6968
into
openstack-k8s-operators:18.0-fr3
8 checks passed
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
This is an automated cherry-pick of #1550
/assign stuggi
Jira: OSPRH-18693