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

Jump to bottom

Use runtime.slice and system.slice cgroup settings in k8s variants #1684

Merged
merged 6 commits into from
Aug 9, 2021
Merged

Use runtime.slice and system.slice cgroup settings in k8s variants #1684

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
e4efd02
Add runtime group/slice and assign containerd and kubelet
Aug 2, 2021
7b823c3
Update kubelet-config setting kubeReservedCgroup
Aug 2, 2021
228a321
Remove slice from After and Wants for containerd service
Aug 3, 2021
cfed16c
Set config setting systemReservedCgroup to /system
Aug 4, 2021
34fed14
Create {cpuset,hugetlb}/runtime.slice directory tmpfiles
Aug 6, 2021
9f630a6
Create {cpuset,hugetlb}/system.slice directory tmpfiles
Aug 6, 2021
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
1 change: 1 addition & 0 deletions packages/containerd/containerd.service
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ After=network-online.target configured.target
Wants=network-online.target configured.target

[Service]
Slice=runtime.slice
EnvironmentFile=/etc/network/proxy.env
ExecStart=/usr/bin/containerd
Type=notify
Expand Down
1 change: 1 addition & 0 deletions packages/kubernetes-1.17/kubelet-config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,7 @@ kubeReserved:
{{~/if}}
{{~/if}}
ephemeral-storage: "{{default "1Gi" settings.kubernetes.kube-reserved.ephemeral-storage}}"
kubeReservedCgroup: "/runtime"
cyrus-mc marked this conversation as resolved.
Show resolved Hide resolved
{{~#if settings.kubernetes.system-reserved}}
systemReserved:
{{~#each settings.kubernetes.system-reserved}}
Expand Down
1 change: 1 addition & 0 deletions packages/kubernetes-1.17/kubelet.service
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ Wants=configured.target
BindsTo=containerd.service

[Service]
Slice=runtime.slice
Type=notify
EnvironmentFile=/etc/network/proxy.env
EnvironmentFile=/etc/kubernetes/kubelet/env
Expand Down
1 change: 1 addition & 0 deletions packages/kubernetes-1.18/kubelet-config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,7 @@ kubeReserved:
{{~/if}}
{{~/if}}
ephemeral-storage: "{{default "1Gi" settings.kubernetes.kube-reserved.ephemeral-storage}}"
kubeReservedCgroup: "/runtime"
{{~#if settings.kubernetes.system-reserved}}
systemReserved:
{{~#each settings.kubernetes.system-reserved}}
Expand Down
1 change: 1 addition & 0 deletions packages/kubernetes-1.18/kubelet.service
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ Wants=configured.target
BindsTo=containerd.service

[Service]
Slice=runtime.slice
Type=notify
EnvironmentFile=/etc/network/proxy.env
EnvironmentFile=/etc/kubernetes/kubelet/env
Expand Down
1 change: 1 addition & 0 deletions packages/kubernetes-1.19/kubelet-config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,7 @@ kubeReserved:
{{~/if}}
{{~/if}}
ephemeral-storage: "{{default "1Gi" settings.kubernetes.kube-reserved.ephemeral-storage}}"
kubeReservedCgroup: "/runtime"
{{~#if settings.kubernetes.system-reserved}}
systemReserved:
{{~#each settings.kubernetes.system-reserved}}
Expand Down
1 change: 1 addition & 0 deletions packages/kubernetes-1.19/kubelet.service
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ Wants=configured.target
BindsTo=containerd.service

[Service]
Slice=runtime.slice
Type=notify
EnvironmentFile=/etc/network/proxy.env
EnvironmentFile=/etc/kubernetes/kubelet/env
Expand Down
1 change: 1 addition & 0 deletions packages/kubernetes-1.20/kubelet-config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,7 @@ kubeReserved:
{{~/if}}
{{~/if}}
ephemeral-storage: "{{default "1Gi" settings.kubernetes.kube-reserved.ephemeral-storage}}"
kubeReservedCgroup: "/runtime"
{{~#if settings.kubernetes.system-reserved}}
systemReserved:
{{~#each settings.kubernetes.system-reserved}}
Expand Down
1 change: 1 addition & 0 deletions packages/kubernetes-1.20/kubelet.service
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ Wants=configured.target
BindsTo=containerd.service

[Service]
Slice=runtime.slice
Type=notify
EnvironmentFile=/etc/network/proxy.env
EnvironmentFile=/etc/kubernetes/kubelet/env
Expand Down
1 change: 1 addition & 0 deletions packages/kubernetes-1.21/kubelet-config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,7 @@ kubeReserved:
{{~/if}}
{{~/if}}
ephemeral-storage: "{{default "1Gi" settings.kubernetes.kube-reserved.ephemeral-storage}}"
kubeReservedCgroup: "/runtime"
{{~#if settings.kubernetes.system-reserved}}
systemReserved:
{{~#each settings.kubernetes.system-reserved}}
Expand Down
1 change: 1 addition & 0 deletions packages/kubernetes-1.21/kubelet.service
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ Wants=configured.target
BindsTo=containerd.service

[Service]
Slice=runtime.slice
Type=notify
EnvironmentFile=/etc/network/proxy.env
EnvironmentFile=/etc/kubernetes/kubelet/env
Expand Down
6 changes: 5 additions & 1 deletion packages/release/release.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,9 @@ Source1060: capture-kernel-dump.service
Source1061: disable-kexec-load.service
Source1062: load-crash-kernel.service

# systemd cgroups/slices
Source1080: runtime.slice

BuildArch: noarch
Requires: %{_cross_os}acpid
Requires: %{_cross_os}audit
Expand Down Expand Up @@ -111,7 +114,7 @@ install -d %{buildroot}%{_cross_unitdir}
install -p -m 0644 \
%{S:1001} %{S:1002} %{S:1003} %{S:1004} %{S:1005} \
%{S:1006} %{S:1007} %{S:1008} %{S:1009} %{S:1010} %{S:1011} \
%{S:1015} %{S:1040} %{S:1041} %{S:1060} %{S:1061} %{S:1062} \
%{S:1015} %{S:1040} %{S:1041} %{S:1060} %{S:1061} %{S:1062} %{S:1080} \
%{buildroot}%{_cross_unitdir}

LOWERPATH=$(systemd-escape --path %{_cross_sharedstatedir}/kernel-devel/lower)
Expand Down Expand Up @@ -166,6 +169,7 @@ ln -s %{_cross_unitdir}/preconfigured.target %{buildroot}%{_cross_unitdir}/defau
%{_cross_unitdir}/*-kernels.mount
%{_cross_unitdir}/*-licenses.mount
%{_cross_unitdir}/var-lib-bottlerocket.mount
%{_cross_unitdir}/runtime.slice
%{_cross_unitdir}/set-hostname.service
%dir %{_cross_templatedir}
%{_cross_templatedir}/motd
Expand Down
4 changes: 4 additions & 0 deletions packages/release/runtime.slice
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
[Unit]
Description=Kubernetes and container runtime slice
Documentation=man:systemd.special(7)
Before=slices.target