From f82f739e5adf43c470c04895c1cbb608e0611f4f Mon Sep 17 00:00:00 2001 From: Bart Smykla Date: Mon, 30 Jan 2023 12:02:41 +0100 Subject: [PATCH 1/7] chore: bump just ubuntu for vm_images in CI Signed-off-by: Bart Smykla --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 3ff3e5168b18..a137442ce6b0 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -9,7 +9,7 @@ reusable: - &golang_image "cimg/go:1.18.9" vm_images: - - &ubuntu_vm_image "ubuntu-2004:202111-01" + - &ubuntu_vm_image "ubuntu-2204:2022.10.2" # See https://circleci.com/docs/2.0/configuration-reference/#commands-requires-version-21. commands: From d1cac033a980aa36964f5bb14e50621e862effaa Mon Sep 17 00:00:00 2001 From: Bart Smykla Date: Mon, 30 Jan 2023 12:38:40 +0100 Subject: [PATCH 2/7] chore: bump in ci min. version of k8s to 1.20.15 Signed-off-by: Bart Smykla --- .circleci/config.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index a137442ce6b0..9c58d063fbd2 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -315,7 +315,7 @@ jobs: if [[ "<< parameters.target >>" == "test/e2e" ]]; then skip "we do not run legacy E2E on branch by default. To run them add ci/run-e2e-legacy label" fi - if [[ "<< parameters.cniNetworkPlugin >>" == "calico" || "<< parameters.k8sVersion >>" == "kindIpv6" || "<< parameters.k8sVersion >>" == "v1.19.16-k3s1" || "<< parameters.arch >>" == "arm64" ]]; then + if [[ "<< parameters.cniNetworkPlugin >>" == "calico" || "<< parameters.k8sVersion >>" == "kindIpv6" || "<< parameters.k8sVersion >>" == "v1.20.15-k3s1" || "<< parameters.arch >>" == "arm64" ]]; then skip "Not running tests on PRs with kindIpv6, oldK8s, calico and arm64" fi fi @@ -503,7 +503,7 @@ workflows: matrix: alias: test/e2e-legacy parameters: - k8sVersion: [ v1.19.16-k3s1, v1.21.7-k3s1, kind, kindIpv6 ] + k8sVersion: [ v1.20.15-k3s1, v1.21.7-k3s1, kind, kindIpv6 ] arch: [ amd64, arm64 ] parallelism: 3 target: test/e2e @@ -513,7 +513,7 @@ workflows: matrix: alias: test/e2e parameters: - k8sVersion: [ v1.19.16-k3s1, v1.21.7-k3s1, kind, kindIpv6 ] + k8sVersion: [ v1.20.15-k3s1, v1.21.7-k3s1, kind, kindIpv6 ] target: [ test/e2e-kubernetes, test/e2e-universal, test/e2e-multizone ] arch: [ amd64, arm64 ] parallelism: 1 From 5b2cf06835533f747e93f9e4f0f102f959068543 Mon Sep 17 00:00:00 2001 From: Bart Smykla Date: Mon, 30 Jan 2023 13:34:54 +0100 Subject: [PATCH 3/7] chore: temporary change parallelism to 1 in CI Signed-off-by: Bart Smykla --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 9c58d063fbd2..491c71d6c21b 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -505,7 +505,7 @@ workflows: parameters: k8sVersion: [ v1.20.15-k3s1, v1.21.7-k3s1, kind, kindIpv6 ] arch: [ amd64, arm64 ] - parallelism: 3 + parallelism: 1 target: test/e2e requires: [ build-<< matrix.arch >>, check ] - e2e: From 2e27db18f89cf0816d09402b5ad4c6ce94252d4c Mon Sep 17 00:00:00 2001 From: Bart Smykla Date: Mon, 30 Jan 2023 14:02:39 +0100 Subject: [PATCH 4/7] chore: temp coment out k3d options Signed-off-by: Bart Smykla --- mk/k3d.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mk/k3d.mk b/mk/k3d.mk index fe1ae8a44539..8ff61e59647c 100644 --- a/mk/k3d.mk +++ b/mk/k3d.mk @@ -56,7 +56,7 @@ ifdef CI ifeq ($(GOOS),linux) ifneq (,$(findstring e2e-legacy,$(CIRCLE_JOB))) K3D_CLUSTER_CREATE_OPTS += --volume "/sys/fs/bpf:/sys/fs/bpf:shared" - K3D_CLUSTER_CREATE_OPTS += --volume "/sys/fs/cgroup:/sys/fs/cgroup:rw" +# K3D_CLUSTER_CREATE_OPTS += --volume "/sys/fs/cgroup:/sys/fs/cgroup:rw" endif endif endif From 96e75bb2e6b54f8e09ac593288261d2d4a745195 Mon Sep 17 00:00:00 2001 From: Bart Smykla Date: Wed, 15 Feb 2023 12:26:52 +0100 Subject: [PATCH 5/7] chore: remove unnecessary comment Signed-off-by: Bart Smykla --- mk/k3d.mk | 1 - 1 file changed, 1 deletion(-) diff --git a/mk/k3d.mk b/mk/k3d.mk index e9106d9958c0..3d7136b14944 100644 --- a/mk/k3d.mk +++ b/mk/k3d.mk @@ -56,7 +56,6 @@ ifdef CI ifeq ($(GOOS),linux) ifneq (,$(findstring e2e-legacy,$(CIRCLE_JOB))) K3D_CLUSTER_CREATE_OPTS += --volume "/sys/fs/bpf:/sys/fs/bpf:shared" -# K3D_CLUSTER_CREATE_OPTS += --volume "/sys/fs/cgroup:/sys/fs/cgroup:rw" endif endif endif From 55ed7061c4455c3e570c58486c04a4e6141d5008 Mon Sep 17 00:00:00 2001 From: Bart Smykla Date: Wed, 15 Feb 2023 12:53:33 +0100 Subject: [PATCH 6/7] fix(ci): add step to set docker daemon dns Signed-off-by: Bart Smykla --- .circleci/config.yml | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/.circleci/config.yml b/.circleci/config.yml index 2d0cabd63dc8..6afee6f69814 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -54,6 +54,15 @@ commands: # if GOPATH is not set, `golang-ci` fails with an obscure message # "ERRO Running error: context loading failed: failed to load program with go/packages: could not determine GOARCH and Go compiler" echo 'export GOPATH=$HOME/go' >> $BASH_ENV + - run: + name: "Set DNS server for docker daemon" + command: | + cat \<<'EOF' | sudo tee /etc/docker/daemon.json + { + "dns": ["8.8.8.8", "1.1.1.1"] + } + EOF + sudo service docker restart - run: name: "Update runc" # See https://github.com/rancher/k3d/issues/807 (runc's default version on the instance fails k3d) From 057e9a172327fc44873b63db4c199e6bd390d18b Mon Sep 17 00:00:00 2001 From: Bart Smykla Date: Wed, 15 Feb 2023 12:55:07 +0100 Subject: [PATCH 7/7] chore: set upstream target chain to DOCKER_OUTPUT Signed-off-by: Bart Smykla --- test/framework/universal_app.go | 1 + 1 file changed, 1 insertion(+) diff --git a/test/framework/universal_app.go b/test/framework/universal_app.go index 427a90a846e9..aea0aff62cd5 100644 --- a/test/framework/universal_app.go +++ b/test/framework/universal_app.go @@ -490,6 +490,7 @@ func (s *UniversalApp) setupTransparent(cpIp string, builtindns bool, experiment if builtindns { args = append(args, "--redirect-dns", + "--redirect-dns-upstream-target-chain", "DOCKER_OUTPUT", ) }