Skip to content

operator: fix tolerations for operator #40531

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

Jump to bottom
Merged
merged 2 commits into from
Jul 15, 2025
Merged

operator: fix tolerations for operator #40531

merged 2 commits into from
Jul 15, 2025

Conversation

marseel
Copy link
Contributor

@marseel marseel commented Jul 15, 2025

In #40137 we've added fixed list of tolerations.
However, it was not handling agentNotReadyTaintKey toleration, that can be easily changed by users.

operator: include agentNotReadyTaintKey toleration by default

@marseel marseel added kind/bug This is a bug in the Cilium logic. release-note/minor This PR changes functionality that users may find relevant to operating Cilium. labels Jul 15, 2025
@maintainer-s-little-helper
Copy link

Commit af2ad34 does not match "(?m)^Signed-off-by:".

Please follow instructions provided in https://docs.cilium.io/en/stable/contributing/development/contributing_guide/#developer-s-certificate-of-origin

@maintainer-s-little-helper maintainer-s-little-helper bot added the dont-merge/needs-sign-off The author needs to add signoff to their commits before merge. label Jul 15, 2025
@marseel marseel force-pushed the pr/marseel/fix_operator_taints branch from af2ad34 to 5b6b72c Compare July 15, 2025 11:21
@maintainer-s-little-helper
Copy link

Commit af2ad34 does not match "(?m)^Signed-off-by:".

Please follow instructions provided in https://docs.cilium.io/en/stable/contributing/development/contributing_guide/#developer-s-certificate-of-origin

@marseel marseel closed this Jul 15, 2025
@marseel marseel reopened this Jul 15, 2025
@marseel marseel force-pushed the pr/marseel/fix_operator_taints branch from 5b6b72c to dc473bd Compare July 15, 2025 11:23
@maintainer-s-little-helper maintainer-s-little-helper bot removed the dont-merge/needs-sign-off The author needs to add signoff to their commits before merge. label Jul 15, 2025
@marseel
Copy link
Contributor Author

marseel commented Jul 15, 2025

/ci-gke

@marseel marseel added the needs-backport/1.18 This PR / issue needs backporting to the v1.18 branch label Jul 15, 2025
@marseel marseel force-pushed the pr/marseel/fix_operator_taints branch 2 times, most recently from 7ed9368 to f72a739 Compare July 15, 2025 12:29
@marseel
Copy link
Contributor Author

marseel commented Jul 15, 2025

/ci-gke

@marseel
Copy link
Contributor Author

marseel commented Jul 15, 2025

/test

@marseel marseel force-pushed the pr/marseel/fix_operator_taints branch from f72a739 to 60f8954 Compare July 15, 2025 13:55
marseel added 2 commits July 15, 2025 16:10
@marseel
operator: fix tolerations for operator
2429542 
In #40137 we've added fixed list of tolerations.
However, it was not handling agentNotReadyTaintKey toleration, that can
be easily changed by users.

Signed-off-by: Marcel Zieba <marcel.zieba@isovalent.com>
@marseel
Revert "gha: fix operator tolerations in GKE-based workflows"
b0ab667 
This reverts commit b02b392.

Signed-off-by: Marcel Zieba <marcel.zieba@isovalent.com>
@marseel marseel force-pushed the pr/marseel/fix_operator_taints branch from 60f8954 to b0ab667 Compare July 15, 2025 14:10
@marseel
Copy link
Contributor Author

marseel commented Jul 15, 2025

/test

@marseel marseel marked this pull request as ready for review July 15, 2025 14:52
@marseel marseel requested review from a team as code owners July 15, 2025 14:52
@marseel marseel requested review from tommyp1ckles and gandro July 15, 2025 14:52
gandro
gandro approved these changes Jul 15, 2025
View reviewed changes
Copy link
Member

@gandro gandro left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Simple. I like it!

giorio94
giorio94 approved these changes Jul 15, 2025
View reviewed changes
Copy link
Member

@giorio94 giorio94 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks!

@giorio94 giorio94 enabled auto-merge July 15, 2025 15:44
@giorio94 giorio94 added this pull request to the merge queue Jul 15, 2025
Merged via the queue into main with commit 638073a Jul 15, 2025
438 of 442 checks passed
@giorio94 giorio94 deleted the pr/marseel/fix_operator_taints branch July 15, 2025 18:57
This was referenced Jul 17, 2025
Merged
Merged
@joestringer joestringer added the release-blocker/1.18 This issue will prevent the release of the next version of Cilium. label Jul 17, 2025
@nbusseneau nbusseneau mentioned this pull request Jul 18, 2025
Merged
23 tasks
@nbusseneau nbusseneau added backport-pending/1.18 The backport for Cilium 1.18.x for this PR is in progress. and removed needs-backport/1.18 This PR / issue needs backporting to the v1.18 branch labels Jul 18, 2025
@github-actions github-actions bot added backport-done/1.18 The backport for Cilium 1.18.x for this PR is done. and removed backport-pending/1.18 The backport for Cilium 1.18.x for this PR is in progress. labels Jul 21, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@gandro gandro gandro approved these changes

@joestringer joestringer joestringer approved these changes

@giorio94 giorio94 giorio94 approved these changes

@tommyp1ckles tommyp1ckles Awaiting requested review from tommyp1ckles tommyp1ckles is a code owner automatically assigned from cilium/sig-k8s

@hemanthmalla hemanthmalla Awaiting requested review from hemanthmalla hemanthmalla is a code owner automatically assigned from cilium/docs-structure

@aanm aanm Awaiting requested review from aanm aanm is a code owner automatically assigned from cilium/github-sec

@christarazi christarazi Awaiting requested review from christarazi christarazi is a code owner automatically assigned from cilium/ci-structure

Assignees
No one assigned
Labels
backport-done/1.18 The backport for Cilium 1.18.x for this PR is done. kind/bug This is a bug in the Cilium logic. release-blocker/1.18 This issue will prevent the release of the next version of Cilium. release-note/minor This PR changes functionality that users may find relevant to operating Cilium.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@marseel @gandro @joestringer @giorio94 @nbusseneau