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

k8s: Fix Wireguard with IPAM != ClusterPool #15784

Merged
merged 1 commit into from
Apr 20, 2021

Conversation

gandro
Copy link
Member

@gandro gandro commented Apr 20, 2021

This removes a leftover if-condition from earlier versions of Wireguard
in Cilium where it needed to wait for the operator to allocate a
Wireguard tunnel IP (see #15565 for details). With the removal of
the operator logic, if-statement is not needed anymore for Wireguard
and is breaking other IPAM modes.

This fixes a bug where Cilium agent would indefinitely wait for K8s node
information when using Wireguard in combination with an IPAM mode other
than ClusterPool.

Fixes: 0ecab37 ("wireguard: Remove operator")

This removes a leftover if-condition from earlier versions of wireguard
in Cilium where it needed to wait for the operator to allocate a
Wireguard tunnel IP (see cilium#15565 for details).

This fixes a bug where Cilium agent would indefinitely wait for K8s node
information when using Wireguard in combination with an IPAM mode other
than ClusterPool.

Fixes: 0ecab37 ("wireguard: Remove operator")

Signed-off-by: Sebastian Wicki <sebastian@isovalent.com>
@gandro gandro added kind/bug This is a bug in the Cilium logic. release-note/misc This PR makes changes that have no direct user impact. release-blocker/1.10 labels Apr 20, 2021
@gandro gandro requested review from a team and nathanjsweet April 20, 2021 14:16
@maintainer-s-little-helper maintainer-s-little-helper bot added this to In progress in 1.10.0 Apr 20, 2021
@gandro gandro added this to the 1.10.0-rc.1 milestone Apr 20, 2021
@gandro gandro changed the title k8s: Fix wireguard with IPAM != ClusterPool k8s: Fix Wireguard with IPAM != ClusterPool Apr 20, 2021
@gandro
Copy link
Member Author

gandro commented Apr 20, 2021

test-me-please

@pchaigno pchaigno added the area/encryption Impacts encryption support such as IPSec, WireGuard, or kTLS. label Apr 20, 2021
@gandro gandro removed the request for review from nathanjsweet April 20, 2021 14:24
@gandro
Copy link
Member Author

gandro commented Apr 20, 2021

Marking as ready-to-merge. The quick-install pipeline will never run, since this branch is already based on #15695 which removed them.

@gandro gandro added the ready-to-merge This PR has passed all tests and received consensus from code owners to merge. label Apr 20, 2021
@pchaigno
Copy link
Member

The quick-install pipeline will never run, since this branch is already based on #15695 which removed them.

@aanm Could you mark them as not required anymore?

@pchaigno
Copy link
Member

ConformanceGKE failed with known flake #15619 and isn't required anyway. Other jobs are passing. All reviews are in. Merging.

@pchaigno pchaigno merged commit c0b999e into cilium:master Apr 20, 2021
1.10.0 automation moved this from In progress to Done Apr 20, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
area/encryption Impacts encryption support such as IPSec, WireGuard, or kTLS. kind/bug This is a bug in the Cilium logic. ready-to-merge This PR has passed all tests and received consensus from code owners to merge. release-note/misc This PR makes changes that have no direct user impact.
Projects
No open projects
Development

Successfully merging this pull request may close these issues.

None yet

5 participants