Skip to content

Conversation

giorio94
Copy link
Member

@giorio94 giorio94 commented Nov 12, 2024

Once this PR is merged, a GitHub action will update the labels of these PRs:

 35646 35679

[ upstream commit 03bde2b ]

Simplify locally testing Cilium configured in kvstore mode via the
introduction of a dedicated `kind-kvstore-install-cilium` target,
which takes care of setting up an etcd pod running in host network
(pinned to a control plane node) and configuring Cilium to target it.

The creation and deletion of the etcd pod is delegated to the dedicated
`kind-kvstore-start` and `kind-kvstore-stop` commands.

Signed-off-by: Marco Iorio <marco.iorio@isovalent.com>
@giorio94 giorio94 added kind/backports This PR provides functionality previously merged into master. backport/1.16 This PR represents a backport for Cilium 1.16.x of a PR that was merged to main. labels Nov 12, 2024
@giorio94 giorio94 force-pushed the pr/v1.16-backport-2024-11-12-09-55 branch from f95494b to 3327561 Compare November 12, 2024 09:13
@giorio94
Copy link
Member Author

/test-backport-1.16

@giorio94 giorio94 force-pushed the pr/v1.16-backport-2024-11-12-09-55 branch from 3327561 to 9e1d504 Compare November 12, 2024 11:09
[ upstream commit 535e7f1 ]

[ backporter's notes: hit minor conflicts due to different surrounding
  context, adapted as appropriate. Additionally skipped testing kvstore
  in combination with WireGuard, as v1.15 and earlier are affected by
  bugs potentially causing connection disruption upon agent restart
  in this combination (#31985, #31979). ]

Modify a few matrix entries of the Cilium E2E Upgrade workflow to
configure Cilium in kvstore mode, to cover this functionality here
as well in addition to the clustermesh workflows. In detail, the
etcd instance is executed as a pod running in host network, which
is setup via the `kind-kvstore-start` makefile target. The matrix
entries are selected trying to cover the most common combinations,
that is native-routing/tunneling, KPR off/on and wireguard off/on,
and avoiding incompatible options (mainly Egress Gateway).

Signed-off-by: Marco Iorio <marco.iorio@isovalent.com>
[ upstream commit 2056fa9 ]

[ backporter's notes: hit minor conflicts due to different surrounding
  context, adapted as appropriate. ]

Modify a few matrix entries of the Conformance IPSec and IPSec Upgrade
workflows to configure Cilium in kvstore mode, to cover this functionality
here as well in addition to the E2E and clustermesh workflows. In detail,
the etcd instance is executed as a pod running in host network, which
is setup via the `kind-kvstore-start` makefile target. The matrix entries
are selected to cover both native routing and tunneling, while avoiding
incompatible options (mainly Egress Gateway and Mutual Auth).

Signed-off-by: Marco Iorio <marco.iorio@isovalent.com>
@giorio94 giorio94 force-pushed the pr/v1.16-backport-2024-11-12-09-55 branch from 9e1d504 to 83a28ce Compare November 12, 2024 11:22
@giorio94
Copy link
Member Author

/test-backport-1.16

@giorio94 giorio94 marked this pull request as ready for review November 12, 2024 11:22
@giorio94 giorio94 requested review from a team as code owners November 12, 2024 11:22
@giorio94 giorio94 requested review from aanm and brlbil November 12, 2024 11:22
@aanm aanm enabled auto-merge November 13, 2024 08:50
@giorio94 giorio94 added dont-merge/blocked Another PR must be merged before this one. and removed dont-merge/blocked Another PR must be merged before this one. labels Nov 13, 2024
@aanm aanm added this pull request to the merge queue Nov 13, 2024
Merged via the queue into v1.16 with commit a7d4aed Nov 13, 2024
285 checks passed
@aanm aanm deleted the pr/v1.16-backport-2024-11-12-09-55 branch November 13, 2024 10:54
@maintainer-s-little-helper maintainer-s-little-helper bot added ready-to-merge This PR has passed all tests and received consensus from code owners to merge. labels Nov 13, 2024
@maintainer-s-little-helper maintainer-s-little-helper bot added ready-to-merge This PR has passed all tests and received consensus from code owners to merge. labels Nov 13, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport/1.16 This PR represents a backport for Cilium 1.16.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
Development

Successfully merging this pull request may close these issues.

3 participants