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.

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

helm: Update pod affinity for cilium-envoy #31150

Merged
merged 1 commit into from
Mar 13, 2024

Conversation

sayboras
Copy link
Member

@sayboras sayboras commented Mar 5, 2024

This commit is to avoid cilium-envoy running on the node without cilium
agent.

Relates: #25081, #30034
Fixes: #31149
Signed-off-by: Tam Mach tam.mach@cilium.io

@maintainer-s-little-helper maintainer-s-little-helper bot added the dont-merge/needs-release-note-label The author needs to describe the release impact of these changes. label Mar 5, 2024
@sayboras sayboras added release-note/bug This PR fixes an issue in a previous release of Cilium. needs-backport/1.14 This PR / issue needs backporting to the v1.14 branch needs-backport/1.15 This PR / issue needs backporting to the v1.15 branch labels Mar 5, 2024
@maintainer-s-little-helper maintainer-s-little-helper bot removed dont-merge/needs-release-note-label The author needs to describe the release impact of these changes. labels Mar 5, 2024
@maintainer-s-little-helper maintainer-s-little-helper bot added this to Needs backport from main in 1.15.2 Mar 5, 2024
@maintainer-s-little-helper maintainer-s-little-helper bot added this to Needs backport from main in 1.14.8 Mar 5, 2024
@sayboras
Copy link
Member Author

sayboras commented Mar 5, 2024

/test

@sayboras sayboras force-pushed the tam/cilium-envoy-pod-affinity branch 4 times, most recently from a18ede6 to faefad3 Compare March 5, 2024 02:37
@sayboras
Copy link
Member Author

sayboras commented Mar 5, 2024

/test

@sayboras sayboras force-pushed the tam/cilium-envoy-pod-affinity branch from faefad3 to 7b9c29a Compare March 5, 2024 03:10
@sayboras
Copy link
Member Author

sayboras commented Mar 5, 2024

/test

@sayboras sayboras marked this pull request as ready for review March 5, 2024 08:35
@sayboras sayboras requested review from a team as code owners March 5, 2024 08:35
@sayboras sayboras requested review from joamaki and squeed March 5, 2024 08:35
install/kubernetes/cilium/values.yaml.tmpl Outdated Show resolved Hide resolved
@sayboras
Copy link
Member Author

Convert to draft to address review comments.

@sayboras sayboras marked this pull request as draft March 12, 2024 03:31
@sayboras sayboras force-pushed the tam/cilium-envoy-pod-affinity branch from 7b9c29a to 5b3de7f Compare March 12, 2024 03:56
@sayboras
Copy link
Member Author

/test

@sayboras sayboras force-pushed the tam/cilium-envoy-pod-affinity branch from 5b3de7f to 62cca9c Compare March 12, 2024 04:09
@sayboras
Copy link
Member Author

/test

@sayboras sayboras force-pushed the tam/cilium-envoy-pod-affinity branch from 62cca9c to e2eb48a Compare March 12, 2024 04:31
@sayboras sayboras force-pushed the tam/cilium-envoy-pod-affinity branch from 44d1133 to d747c54 Compare March 12, 2024 05:37
@sayboras
Copy link
Member Author

/test

This commit is to avoid cilium-envoy running on the node without cilium
agent. Two main changes are:

- nodeAffinity to make sure that cilium-envoy will not be scheduled on
  node without cilium agent
- podAffinity with requiredDuringSchedulingIgnoredDuringExecution to
  cilium agent

Relates: cilium#25081, cilium#30034
Fixes: cilium#31149
Signed-off-by: Tam Mach <tam.mach@cilium.io>
@sayboras sayboras force-pushed the tam/cilium-envoy-pod-affinity branch from d747c54 to d5289f0 Compare March 12, 2024 05:38
@sayboras sayboras requested review from aanm and squeed March 12, 2024 05:39
@sayboras sayboras marked this pull request as ready for review March 12, 2024 05:39
@sayboras
Copy link
Member Author

/test

@jrajahalme jrajahalme removed this from Needs backport from main in 1.15.2 Mar 13, 2024
@thorn3r thorn3r added this to Needs backport from main in 1.14.9 Mar 13, 2024
@thorn3r thorn3r removed this from Needs backport from main in 1.14.8 Mar 13, 2024
@aanm aanm added this pull request to the merge queue Mar 13, 2024
Merged via the queue into cilium:main with commit 44aeb53 Mar 13, 2024
62 checks passed
@sayboras sayboras deleted the tam/cilium-envoy-pod-affinity branch March 14, 2024 00:05
@gandro gandro mentioned this pull request Mar 19, 2024
21 tasks
@gandro gandro added backport-pending/1.15 The backport for Cilium 1.15.x for this PR is in progress. and removed needs-backport/1.15 This PR / issue needs backporting to the v1.15 branch labels Mar 19, 2024
@gandro gandro mentioned this pull request Mar 19, 2024
10 tasks
@gandro gandro added backport-pending/1.14 The backport for Cilium 1.14.x for this PR is in progress. and removed needs-backport/1.14 This PR / issue needs backporting to the v1.14 branch labels Mar 19, 2024
@github-actions github-actions bot added backport-done/1.14 The backport for Cilium 1.14.x for this PR is done. backport-done/1.15 The backport for Cilium 1.15.x for this PR is done. and removed backport-pending/1.14 The backport for Cilium 1.14.x for this PR is in progress. backport-pending/1.15 The backport for Cilium 1.15.x for this PR is in progress. labels Mar 20, 2024
@jrajahalme jrajahalme moved this from Needs backport from main to Backport done to v1.14 in 1.14.9 Mar 26, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport-done/1.14 The backport for Cilium 1.14.x for this PR is done. backport-done/1.15 The backport for Cilium 1.15.x for this PR is done. release-note/bug This PR fixes an issue in a previous release of Cilium.
Projects
No open projects
1.14.9
Backport done to v1.14
Status: Released
Status: Released
Development

Successfully merging this pull request may close these issues.

Should cilium-envoy tolerations differ from cilium-agent?
5 participants