Skip to content

Commit befc9ec

Browse files
majst01majst01
authored
Do not disable cgroupv2 (#266)
1 parent 3c385bf commit befc9ec

File tree

6 files changed

+17
-17
lines changed

6 files changed

+17
-17
lines changed

‎cmd/install.go

-1
Original file line numberDiff line numberDiff line change
@@ -257,7 +257,6 @@ func (i *installer) buildCMDLine() string {
257257
"net.ifnames=0",
258258
"biosdevname=0",
259259
"nvme_core.io_timeout=300", // 300 sec should be enough for firewalls to be replaced
260-
"systemd.unified_cgroup_hierarchy=0",
261260
}
262261

263262
mdUUID, found := i.findMDUUID()

‎cmd/install_test.go

+8-8
Original file line numberDiff line numberDiff line change
@@ -597,8 +597,8 @@ func Test_installer_buildCMDLine(t *testing.T) {
597597
ExitCode: 0,
598598
},
599599
},
600-
// CMDLINE="console=${CONSOLE} root=UUID=${ROOT_UUID} init=/sbin/init net.ifnames=0 biosdevname=0 nvme_core.io_timeout=300 systemd.unified_cgroup_hierarchy=0"
601-
want: "console=ttyS1,115200n8 root=UUID=543eb7f8-98d4-d986-e669-824dbebe69e5 init=/sbin/init net.ifnames=0 biosdevname=0 nvme_core.io_timeout=300 systemd.unified_cgroup_hierarchy=0",
600+
// CMDLINE="console=${CONSOLE} root=UUID=${ROOT_UUID} init=/sbin/init net.ifnames=0 biosdevname=0 nvme_core.io_timeout=300"
601+
want: "console=ttyS1,115200n8 root=UUID=543eb7f8-98d4-d986-e669-824dbebe69e5 init=/sbin/init net.ifnames=0 biosdevname=0 nvme_core.io_timeout=300",
602602
},
603603
{
604604
name: "with raid",
@@ -617,8 +617,8 @@ func Test_installer_buildCMDLine(t *testing.T) {
617617
ExitCode: 0,
618618
},
619619
},
620-
// CMDLINE="console=${CONSOLE} root=UUID=${ROOT_UUID} init=/sbin/init net.ifnames=0 biosdevname=0 nvme_core.io_timeout=300 systemd.unified_cgroup_hierarchy=0"
621-
want: "console=ttyS1,115200n8 root=UUID=ace079b5-06be-4429-bbf0-081ea4d7d0d9 init=/sbin/init net.ifnames=0 biosdevname=0 nvme_core.io_timeout=300 systemd.unified_cgroup_hierarchy=0 rdloaddriver=raid0 rdloaddriver=raid1 rd.md.uuid=543eb7f8:98d4d986:e669824d:bebe69e5",
620+
// CMDLINE="console=${CONSOLE} root=UUID=${ROOT_UUID} init=/sbin/init net.ifnames=0 biosdevname=0 nvme_core.io_timeout=300"
621+
want: "console=ttyS1,115200n8 root=UUID=ace079b5-06be-4429-bbf0-081ea4d7d0d9 init=/sbin/init net.ifnames=0 biosdevname=0 nvme_core.io_timeout=300 rdloaddriver=raid0 rdloaddriver=raid1 rd.md.uuid=543eb7f8:98d4d986:e669824d:bebe69e5",
622622
},
623623
}
624624
for _, tt := range tests {
@@ -891,7 +891,7 @@ func Test_installer_grubInstall(t *testing.T) {
891891
fsMocks: func(fs afero.Fs) {
892892
require.NoError(t, afero.WriteFile(fs, "/etc/metal/install.yaml", []byte(sampleInstallYAML), 0700))
893893
},
894-
cmdline: "console=ttyS1,115200n8 root=UUID=ace079b5-06be-4429-bbf0-081ea4d7d0d9 init=/sbin/init net.ifnames=0 biosdevname=0 nvme_core.io_timeout=300 systemd.unified_cgroup_hierarchy=0",
894+
cmdline: "console=ttyS1,115200n8 root=UUID=ace079b5-06be-4429-bbf0-081ea4d7d0d9 init=/sbin/init net.ifnames=0 biosdevname=0 nvme_core.io_timeout=300",
895895
oss: osUbuntu,
896896
execMocks: []fakeexecparams{
897897
{
@@ -914,7 +914,7 @@ func Test_installer_grubInstall(t *testing.T) {
914914
GRUB_TIMEOUT=5
915915
GRUB_DISTRIBUTOR=metal-ubuntu
916916
GRUB_CMDLINE_LINUX_DEFAULT=""
917-
GRUB_CMDLINE_LINUX="console=ttyS1,115200n8 root=UUID=ace079b5-06be-4429-bbf0-081ea4d7d0d9 init=/sbin/init net.ifnames=0 biosdevname=0 nvme_core.io_timeout=300 systemd.unified_cgroup_hierarchy=0"
917+
GRUB_CMDLINE_LINUX="console=ttyS1,115200n8 root=UUID=ace079b5-06be-4429-bbf0-081ea4d7d0d9 init=/sbin/init net.ifnames=0 biosdevname=0 nvme_core.io_timeout=300"
918918
GRUB_TERMINAL=serial
919919
GRUB_SERIAL_COMMAND="serial --speed=115200 --unit=1 --word=8"
920920
`,
@@ -924,7 +924,7 @@ GRUB_SERIAL_COMMAND="serial --speed=115200 --unit=1 --word=8"
924924
fsMocks: func(fs afero.Fs) {
925925
require.NoError(t, afero.WriteFile(fs, "/etc/metal/install.yaml", []byte(sampleInstallWithRaidYAML), 0700))
926926
},
927-
cmdline: "console=ttyS1,115200n8 root=UUID=ace079b5-06be-4429-bbf0-081ea4d7d0d9 init=/sbin/init net.ifnames=0 biosdevname=0 nvme_core.io_timeout=300 systemd.unified_cgroup_hierarchy=0",
927+
cmdline: "console=ttyS1,115200n8 root=UUID=ace079b5-06be-4429-bbf0-081ea4d7d0d9 init=/sbin/init net.ifnames=0 biosdevname=0 nvme_core.io_timeout=300",
928928
oss: osUbuntu,
929929
execMocks: []fakeexecparams{
930930
{
@@ -972,7 +972,7 @@ GRUB_SERIAL_COMMAND="serial --speed=115200 --unit=1 --word=8"
972972
GRUB_TIMEOUT=5
973973
GRUB_DISTRIBUTOR=metal-ubuntu
974974
GRUB_CMDLINE_LINUX_DEFAULT=""
975-
GRUB_CMDLINE_LINUX="console=ttyS1,115200n8 root=UUID=ace079b5-06be-4429-bbf0-081ea4d7d0d9 init=/sbin/init net.ifnames=0 biosdevname=0 nvme_core.io_timeout=300 systemd.unified_cgroup_hierarchy=0"
975+
GRUB_CMDLINE_LINUX="console=ttyS1,115200n8 root=UUID=ace079b5-06be-4429-bbf0-081ea4d7d0d9 init=/sbin/init net.ifnames=0 biosdevname=0 nvme_core.io_timeout=300"
976976
GRUB_TERMINAL=serial
977977
GRUB_SERIAL_COMMAND="serial --speed=115200 --unit=1 --word=8"
978978
`,

‎debian/Dockerfile

+2-1
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,8 @@ RUN set -ex \
9292
&& curl -fLsS ${DOCKER_URL}/linux/${DOCKER_APT_OS}/gpg | apt-key add - \
9393
&& echo "deb [arch=amd64] ${DOCKER_URL}/linux/${DOCKER_APT_OS} ${DOCKER_APT_CHANNEL} stable" > /etc/apt/sources.list.d/docker.list \
9494
&& apt-get update \
95-
&& apt-get install --yes --no-install-recommends containerd.io \
95+
# FIXME remove once containerd v1.7.25 is released, 1.7.24 is broken because runc < 1.2.4 breaks TAP/TUN devices required for vpn-shoot
96+
&& apt-get install --yes --no-install-recommends containerd.io=1.7.23-1 \
9697
# Install crictl to be able to manipulate containers managed with containerd
9798
&& curl -fLsS https://github.com/kubernetes-sigs/cri-tools/releases/download/${CRI_VERSION}/crictl-${CRI_VERSION}-linux-amd64.tar.gz -o /tmp/crictl-${CRI_VERSION}-linux-amd64.tar.gz \
9899
&& tar -xf /tmp/crictl-${CRI_VERSION}-linux-amd64.tar.gz -C /usr/local/bin \

‎debian/docker-make.debian.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ builds:
2929
- SEMVER_MAJOR_MINOR=12
3030
- SEMVER=${SEMVER_MAJOR_MINOR}${SEMVER_PATCH}
3131
# see https://packages.debian.org/bookworm/kernel/ for available versions
32-
- KERNEL_VERSION=6.1.0-28
32+
- KERNEL_VERSION=6.1.0-29
3333
after:
3434
- cd ../ && OS_NAME=${OS_NAME} CIS_VERSION=${CIS_VERSION} ./test.sh quay.io/metalstack/${OS_NAME}:${SEMVER}
3535
- OS_NAME=${OS_NAME} SEMVER_MAJOR_MINOR=${SEMVER_MAJOR_MINOR} SEMVER_PATCH=${SEMVER_PATCH} ../export.sh

‎go.mod

+2-2
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,10 @@ require (
1111
github.com/metal-stack/metal-go v0.39.4
1212
github.com/metal-stack/metal-hammer v0.13.10
1313
github.com/metal-stack/metal-lib v0.19.0
14-
github.com/metal-stack/metal-networker v0.45.3
14+
github.com/metal-stack/metal-networker v0.45.4
1515
github.com/metal-stack/v v1.0.3
1616
github.com/olekukonko/tablewriter v0.0.5
17-
github.com/spf13/afero v1.11.0
17+
github.com/spf13/afero v1.12.0
1818
github.com/stretchr/testify v1.10.0
1919
gopkg.in/yaml.v3 v3.0.1
2020
)

‎go.sum

+4-4
Original file line numberDiff line numberDiff line change
@@ -134,8 +134,8 @@ github.com/metal-stack/metal-hammer v0.13.10 h1:p1L2rGeABbjv8jRnua7dYF8nDjLZ+Boh
134134
github.com/metal-stack/metal-hammer v0.13.10/go.mod h1:cOdArIOW1VBICPX3dlpyg1Wf3PsMeGjyw7mJJmCTqeU=
135135
github.com/metal-stack/metal-lib v0.19.0 h1:4yBnp/jPGgX9KeCje3A4MFL2oDjgjOjgsIK391LltRI=
136136
github.com/metal-stack/metal-lib v0.19.0/go.mod h1:fCMaWwVGA/xAoGvBk72/nfzqBkHly0iOzrWpc55Fau4=
137-
github.com/metal-stack/metal-networker v0.45.3 h1:GALlPsSMYw70vuQLcmwEEX9VNJVWkZk/4pP7eERD/VU=
138-
github.com/metal-stack/metal-networker v0.45.3/go.mod h1:DUjaql5THUSJd/7M1ZlcYgX/bllp1IhXwOFM+Nvkaus=
137+
github.com/metal-stack/metal-networker v0.45.4 h1:WJ/l+kKzL+/pamPl7DjYd1q+goHqjJ1sAhFgvzDVyfk=
138+
github.com/metal-stack/metal-networker v0.45.4/go.mod h1:DUjaql5THUSJd/7M1ZlcYgX/bllp1IhXwOFM+Nvkaus=
139139
github.com/metal-stack/v v1.0.3 h1:Sh2oBlnxrCUD+mVpzfC8HiqL045YWkxs0gpTvkjppqs=
140140
github.com/metal-stack/v v1.0.3/go.mod h1:YTahEu7/ishwpYKnp/VaW/7nf8+PInogkfGwLcGPdXg=
141141
github.com/mitchellh/mapstructure v1.5.0 h1:jeMsZIYE/09sWLaz43PL7Gy6RuMjD2eJVyuac5Z2hdY=
@@ -161,8 +161,8 @@ github.com/sigma/bdoor v0.0.0-20160202064022-babf2a4017b0/go.mod h1:WBu7REWbxC/s
161161
github.com/sigma/vmw-guestinfo v0.0.0-20160204083807-95dd4126d6e8/go.mod h1:JrRFFC0veyh0cibh0DAhriSY7/gV3kDdNaVUOmfx01U=
162162
github.com/smartystreets/assertions v1.2.0/go.mod h1:tcbTF8ujkAEcZ8TElKY+i30BzYlVhC/LOxJk7iOWnoo=
163163
github.com/smartystreets/goconvey v1.7.2/go.mod h1:Vw0tHAZW6lzCRk3xgdin6fKYcG+G3Pg9vgXWeJpQFMM=
164-
github.com/spf13/afero v1.11.0 h1:WJQKhtpdm3v2IzqG8VMqrr6Rf3UYpEF239Jy9wNepM8=
165-
github.com/spf13/afero v1.11.0/go.mod h1:GH9Y3pIexgf1MTIWtNGyogA5MwRIDXGUr+hbWNoBjkY=
164+
github.com/spf13/afero v1.12.0 h1:UcOPyRBYczmFn6yvphxkn9ZEOY65cpwGKb5mL36mrqs=
165+
github.com/spf13/afero v1.12.0/go.mod h1:ZTlWwG4/ahT8W7T0WQ5uYmjI9duaLQGy3Q2OAl4sk/4=
166166
github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
167167
github.com/stretchr/objx v0.5.2 h1:xuMeJ0Sdp5ZMRXx/aWO6RZxdr3beISkG5/G/aIRr3pY=
168168
github.com/stretchr/objx v0.5.2/go.mod h1:FRsXN1f5AsAjCGJKqEizvkpNtU+EGNCLh3NxZ/8L+MA=

0 commit comments

Comments
 (0)