Skip to content

Commit

Permalink
Merge pull request #2754 from AkihiroSuda/fedora36
Browse files Browse the repository at this point in the history
CI: update Fedora to 36
  • Loading branch information
k8s-ci-robot authored May 19, 2022
2 parents dcd0279 + aa7bb9e commit 440899b
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 3 deletions.
3 changes: 3 additions & 0 deletions .github/workflows/cgroup2.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,9 @@ jobs:
- name: Set up Rootless Podman
if: ${{ matrix.provider == 'podman' && matrix.rootless == 'rootless' }}
run: |
# Restart the user session to ensure the cgroup delegation
# ref: https://github.com/kubernetes-sigs/kind/pull/2754#issuecomment-1124027063
"$HELPER" sudo loginctl terminate-user vagrant || true
# We have modprobe ip6_tables in Vagrantfile, but it seems we have to modprobe it once again
"$HELPER" sudo modprobe ip6_tables
# Disable selinux on rootless podman
Expand Down
6 changes: 3 additions & 3 deletions hack/ci/Vagrantfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@

# Vagrant box for testing kind with cgroup v2
Vagrant.configure("2") do |config|
# `config.vm.box = "fedora/35-cloud-base"` seems flaky,
# `config.vm.box = "fedora/36-cloud-base"` seems flaky,
# so we specify the URL explicitly.
# Mirrors can be found at here: https://admin.fedoraproject.org/mirrormanager/mirrors/Fedora/35/x86_64
# Mirrors can be found at here: https://admin.fedoraproject.org/mirrormanager/mirrors/Fedora/36/x86_64
config.vm.box = "dummy"
config.vm.box_url = "https://iad.mirror.rackspace.com/fedora/releases/35/Cloud/x86_64/images/Fedora-Cloud-Base-Vagrant-35-1.2.x86_64.vagrant-virtualbox.box"
config.vm.box_url = "https://iad.mirror.rackspace.com/fedora/releases/36/Cloud/x86_64/images/Fedora-Cloud-Base-Vagrant-36-1.5.x86_64.vagrant-virtualbox.box"
memory = 2048
cpus = 2
config.vm.provider :virtualbox do |v|
Expand Down

0 comments on commit 440899b

Please sign in to comment.