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

Jump to bottom

[v1.15] bgpv1: Disable PodCIDR Reconciler for unsupported IPAM modes #31354

Merged
merged 1 commit into from Mar 13, 2024
Merged

[v1.15] bgpv1: Disable PodCIDR Reconciler for unsupported IPAM modes #31354

merged 1 commit into from Mar 13, 2024

Conversation

YutaroHayakawa
Copy link
Member

Manual backport of #31181.

bgpv1: Disable PodCIDR Reconciler for unsupported IPAM modes

@YutaroHayakawa
bgpv1: Disable PodCIDR Reconciler for unsupported IPAM modes
6ed901a 
[ upstream commit 2764994 ]

[ backporter's note: Discarded document changes. We'll backport it
  together with other recent document changes. ]

PodCIDR shouldn't take any effect for the unsupported IPAM modes. Modify
ExportPodCIDRReconciler's constructor to not provide ConfigReconciler
for unsupported IPAMs.

Signed-off-by: Yutaro Hayakawa <yutaro.hayakawa@isovalent.com>
@maintainer-s-little-helper maintainer-s-little-helper bot added backport/1.15 This PR represents a backport for Cilium 1.15.x of a PR that was merged to main. kind/backports This PR provides functionality previously merged into master. labels Mar 12, 2024
@YutaroHayakawa YutaroHayakawa marked this pull request as ready for review March 12, 2024 15:21
@YutaroHayakawa YutaroHayakawa requested a review from a team as a code owner March 12, 2024 15:22
@YutaroHayakawa YutaroHayakawa mentioned this pull request Mar 12, 2024
Merged
@YutaroHayakawa
Copy link
Member Author

Travis: #31006

@YutaroHayakawa
Copy link
Member Author

/test-backport-1.15

rastislavs
rastislavs approved these changes Mar 13, 2024
View reviewed changes
Copy link
Contributor

@rastislavs rastislavs left a comment

Choose a reason for hiding this comment

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

LGTM

@YutaroHayakawa
Copy link
Member Author

Cilium Cluster Mesh upgrade: #30964
Conformance EKS: #24988

@maintainer-s-little-helper maintainer-s-little-helper bot added the ready-to-merge This PR has passed all tests and received consensus from code owners to merge. label Mar 13, 2024
@jrajahalme jrajahalme merged commit 8c7376f into cilium:v1.15 Mar 13, 2024
61 checks passed
@jrajahalme jrajahalme mentioned this pull request Mar 13, 2024
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jrajahalme jrajahalme jrajahalme approved these changes

@rastislavs rastislavs rastislavs approved these changes

Assignees
No one assigned
Labels
backport/1.15 This PR represents a backport for Cilium 1.15.x of a PR that was merged to main. kind/backports This PR provides functionality previously merged into master. ready-to-merge This PR has passed all tests and received consensus from code owners to merge.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@YutaroHayakawa @jrajahalme @rastislavs