Avoid duplicate kube-controllers tolerations#4746
Merged
caseydavenport merged 1 commit intotigera:masterfrom Apr 23, 2026
Merged
Conversation
When rendering calico-kube-controllers, append the operator's default tolerations only if they are not already present in Installation controlPlaneTolerations. This prevents duplicate CriticalAddonsOnly tolerations while preserving the default tolerations that kube-controllers needs.\n\nAdds a render test that covers the duplicate CriticalAddonsOnly case reported in tigera#3783. Signed-off-by: Asish Kumar <officialasishkumar@gmail.com>
caseydavenport
approved these changes
Apr 23, 2026
Member
|
/sem-approve |
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
3 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.
Description
Bug fix for #3783. The calico-kube-controllers renderer now appends the operator's default tolerations only when they are not already present in
Installation.spec.controlPlaneTolerations. This prevents duplicateCriticalAddonsOnlytolerations while preserving the default control-plane tolerations and GKE Arm64 toleration behavior.Testing done:
go test ./pkg/render/kubecontrollersComponents affected:
Closes #3783
Release Note
For PR author
make gen-filesmake gen-versionsFor PR reviewers
A note for code reviewers - all pull requests must have the following:
kind/bugif this is a bugfix.kind/enhancementif this is a a new feature.enterpriseif this PR applies to Calico Enterprise only.