From 6fa567e0f718a8bbdaa6b784a4c3c37cf8e0c20a Mon Sep 17 00:00:00 2001 From: Akihiro Suda Date: Thu, 6 May 2021 17:15:01 +0900 Subject: [PATCH] update components and README Signed-off-by: Akihiro Suda --- Dockerfile | 18 +++++++++--------- README.md | 3 ++- 2 files changed, 11 insertions(+), 10 deletions(-) diff --git a/Dockerfile b/Dockerfile index b3188ee..5266c69 100644 --- a/Dockerfile +++ b/Dockerfile @@ -4,14 +4,14 @@ ### Version definitions # use ./hack/show-latest-commits.sh to get the latest commits -# 2021-04-15T05:58:47Z -ARG ROOTLESSKIT_COMMIT=2416b0b1799b3888c570c590da3cb27c13d2eb0f -# 2021-04-24T20:46:00Z -ARG CONTAINERD_COMMIT=56f1b3fef84d72f76ca65151854c9c9d1461e0f8 -# 2021-04-25T13:18:28Z -ARG CRIO_COMMIT=d3dbaec060e33870e5cb5c3f7ec4207837804b00 -# 2021-04-26T07:03:01Z -ARG KUBE_NODE_COMMIT=e640a01219736dd051dc3a9b8ac4630ec18b6b25 +# 2021-04-29T20:26:51Z +ARG ROOTLESSKIT_COMMIT=e2839766a691861fe65c391c237c7adacad858ee +# 2021-05-05T17:18:34Z +ARG CONTAINERD_COMMIT=14316794ad0a33b8688078f770655c9203e4d80d +# 2021-05-06T03:35:41Z +ARG CRIO_COMMIT=4d40e65acb9639d167f78ac90e3691e1029934ea +# 2021-05-06T07:45:15Z +ARG KUBE_NODE_COMMIT=4e1432700e5df2295dd12451d80fa145f770d128 # Version definitions (cont.) ARG SLIRP4NETNS_RELEASE=v1.1.9 @@ -19,7 +19,7 @@ ARG CONMON_RELEASE=2.0.27 ARG CRUN_RELEASE=0.19.1 ARG FUSE_OVERLAYFS_RELEASE=v1.5.0 ARG CONTAINERD_FUSE_OVERLAYFS_RELEASE=1.0.2 -ARG KUBE_MASTER_RELEASE=v1.21.0 +ARG KUBE_MASTER_RELEASE=v1.22.0-alpha.1 # Kube's build script requires KUBE_GIT_VERSION to be set to a semver string ARG KUBE_GIT_VERSION=v1.22.0-usernetes ARG CNI_PLUGINS_RELEASE=v0.9.1 diff --git a/README.md b/README.md index 552b4a5..ce605a5 100644 --- a/README.md +++ b/README.md @@ -296,7 +296,6 @@ Connecting to 10.5.7.3 (10.5.7.3:80) To enable cgroups (resource limits), the host needs to be running with cgroup v2. If `/sys/fs/cgroup/cgroup.controllers` is present on your system, you are using v2, otherwise you are using v1. -As of 2020, Fedora is the only well-known Linux distributon that uses cgroup v2 by default. Fedora uses cgroup v2 by default since Fedora 31. #### Enable cgroup v2 To enable cgroup v2, add `systemd.unified_cgroup_hierarchy=1` to the `GRUB_CMDLINE_LINUX` line in `/etc/default/grub` and run `sudo update-grub`. @@ -323,6 +322,8 @@ EOF # systemctl daemon-reload ``` +You have to re-login or reboot the host after changing the systemd configuration. Rebooting is recommended. + #### Run Usernetes installer The installer script (`install.sh`) does not need a special flag to enable rootless cgroup.