diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml
index 6782f52..c7eb59a 100644
--- a/.github/workflows/main.yaml
+++ b/.github/workflows/main.yaml
@@ -45,6 +45,12 @@ jobs:
working-directory: usernetes
run: |
vagrant up
+ #
+ # Enabling cgroup delegation seems to need rebooting since Fedora 34: https://github.com/rootless-containers/rootlesscontaine.rs/issues/32
+ # We shouldn't need this reboot.
+ vagrant halt
+ vagrant up
+ #
vagrant ssh-config > ~/vagrant-ssh-config
- name: "Smoke test (containerd, w/ systemd-delegated cgroupfs)"
run: ssh -F ~/vagrant-ssh-config default /vagrant/hack/smoketest-binaries.sh --cri=containerd
@@ -53,6 +59,12 @@ jobs:
run: |
vagrant destroy -f
vagrant up
+ #
+ # Enabling cgroup delegation seems to need rebooting since Fedora 34: https://github.com/rootless-containers/rootlesscontaine.rs/issues/32
+ # We shouldn't need this reboot.
+ vagrant halt
+ vagrant up
+ #
vagrant ssh-config > ~/vagrant-ssh-config
- name: "Smoke test (CRI-O, w/ systemd-delegated cgroupfs)"
run: ssh -F ~/vagrant-ssh-config default /vagrant/hack/smoketest-binaries.sh --cri=crio
diff --git a/Dockerfile b/Dockerfile
index af7977a..b3188ee 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -29,7 +29,7 @@ ARG CFSSL_RELEASE=1.5.0
ARG ALPINE_RELEASE=3.13
ARG GO_RELEASE=1.16
-ARG FEDORA_RELEASE=33
+ARG FEDORA_RELEASE=34
### Common base images (common-*)
FROM alpine:${ALPINE_RELEASE} AS common-alpine
diff --git a/README.md b/README.md
index 8e417c4..552b4a5 100644
--- a/README.md
+++ b/README.md
@@ -117,7 +117,7 @@ exampleuser:231072:65536
```
### Distribution-specific hint
-Recommended host distributions are Ubuntu 20.10 and Fedora 33.
+Recommended host distributions are Ubuntu 21.04 and Fedora 34.
#### Debian GNU/Linux
* Add `kernel.unprivileged_userns_clone=1` to `/etc/sysctl.conf` (or `/etc/sysctl.d`) and run `sudo sysctl -p`
diff --git a/Vagrantfile b/Vagrantfile
index 80f30c7..8d81c2e 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -2,7 +2,7 @@
# vi: set ft=ruby :
Vagrant.configure("2") do |config|
- config.vm.box = "fedora/33-cloud-base"
+ config.vm.box = "fedora/34-cloud-base"
memory = 4096
cpus = 2
config.vm.provider :virtualbox do |v|