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

v1.13 Backports 2023-05-12 #25409

Merged
merged 2 commits into from
May 15, 2023
Merged

v1.13 Backports 2023-05-12 #25409

merged 2 commits into from
May 15, 2023

Conversation

brb
Copy link
Member

@brb brb commented May 12, 2023

v1.13 backports 2023-05-12

Once this PR is merged, you can update the PR labels via:

$ for pr in 24250 24713; do contrib/backporting/set-labels.py $pr done 1.13; done

Blocked by #25412.

lmb and others added 2 commits May 12, 2023 12:32
[ upstream commit 4310b5e ]

Both veth in a pair require an XDP program installed for XDP_TX
to work. Since the host side veth created by kind doesn't have
an XDP program attached we can't run any tests in CI that require
XDP_TX.

The workaround itself is just an ip link set and ethtool away,
the problem is figuring out which interfaces we need to do the
magic to.

Use the approach used by kind-network-plugins and create our own
docker network with a specific name for the bridge device. We
can then iterate all children of the bridge and do our fixups.

We tell kind to use our own network by setting the (undocumented?)
KIND_EXPERIMENTAL_DOCKER_NETWORK environment variable.

See https://github.com/aojea/kind-networking-plugins

Signed-off-by: Lorenz Bauer <lmb@isovalent.com>
Signed-off-by: Martynas Pumputis <m@lambda.lt>
[ upstream commit 03eeda7 ]

We are using our Kind provisioning script to create K8s clusters when testing
in the CI. Recently, we discovered that on some kernels a default DNS resolver,
which is dockerd, is troublesome for the BPF host routing, which we want to
test in the CI (#23283).

Fix this by patching the coredns configmap after creating a kind cluster to
point to the 8.8.8.8 resolver. Alternative fixes (may still be applied later):

  * Pass a custom /etc/resolv.conf to kubelet via --resolv-conf in the Kind /
    kubeadm config.

  * Override /etc/resolv.conf of Kind nodes after creating a cluster (no race
    condition, as CoreDNS pods won't be started, as a CNI is not ready).

  * Patch Kind to allow users to specify custom DNS entries (i.e., docker run
    --dns="1.1.1.1,8.8.8.8").

Fixes: #23283
Fixes: #23330

Signed-off-by: Anton Protopopov <aspsk@isovalent.com>
Signed-off-by: Martynas Pumputis <m@lambda.lt>
@brb brb added kind/backports This PR provides functionality previously merged into master. backport/1.13 This PR represents a backport for Cilium 1.13.x of a PR that was merged to main. labels May 12, 2023
@brb
Copy link
Member Author

brb commented May 12, 2023

/ci-e2e-1.13

@brb brb mentioned this pull request May 12, 2023
14 tasks
@brb brb force-pushed the pr/v1.13-backport-2023-05-12-3 branch from 07f0ed1 to 9629727 Compare May 12, 2023 15:04
@brb
Copy link
Member Author

brb commented May 13, 2023

/ci-e2e-1.13

@brb brb marked this pull request as ready for review May 13, 2023 06:12
@brb brb requested a review from a team as a code owner May 13, 2023 06:12
@brb
Copy link
Member Author

brb commented May 13, 2023

/test-backport-1.13

Job 'Cilium-PR-K8s-1.25-kernel-4.19' hit: #25255 (88.51% similarity)

@aanm aanm merged commit 6f224ad into v1.13 May 15, 2023
96 of 98 checks passed
@aanm aanm deleted the pr/v1.13-backport-2023-05-12-3 branch May 15, 2023 08:20
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport/1.13 This PR represents a backport for Cilium 1.13.x of a PR that was merged to main. kind/backports This PR provides functionality previously merged into master.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants