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

chore: bump just ubuntu for vm_images in CI #5865

Closed
wants to merge 9 commits into from
Closed

chore: bump just ubuntu for vm_images in CI #5865

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
f82f739
chore: bump just ubuntu for vm_images in CI
bartsmykla Jan 30, 2023
d1cac03
chore: bump in ci min. version of k8s to 1.20.15
bartsmykla Jan 30, 2023
5b2cf06
chore: temporary change parallelism to 1 in CI
bartsmykla Jan 30, 2023
2e27db1
chore: temp coment out k3d options
bartsmykla Jan 30, 2023
9dc5d64
Merge branch 'master' into chore/bump-just-ubuntu-in-vm-images-in-ci
bartsmykla Feb 6, 2023
335a038
Merge branch 'master' into chore/bump-just-ubuntu-in-vm-images-in-ci
bartsmykla Feb 15, 2023
96e75bb
chore: remove unnecessary comment
bartsmykla Feb 15, 2023
55ed706
fix(ci): add step to set docker daemon dns
bartsmykla Feb 15, 2023
057e9a1
chore: set upstream target chain to DOCKER_OUTPUT
bartsmykla Feb 15, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 10 additions & 1 deletion .circleci/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ reusable:
- &golang_image "cimg/go:1.18.10"

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:
Expand Down Expand Up @@ -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)
Expand Down
1 change: 0 additions & 1 deletion mk/k3d.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions test/framework/universal_app.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
)
}

Expand Down