settings: templatize containerd/config.toml, specify sandbox_image

Converts the containerd/config.toml to a template, and specifies
`sandbox-image` option in containerd

Renamed pod_infra_container_image to pause_container_image in `pluto`.

packages/containerd/containerd-config.toml → packages/containerd/containerd-config-toml

@@ -10,6 +10,10 @@ disabled_plugins = [
 [grpc]
 address = "/run/containerd/containerd.sock"
 
+[plugins."io.containerd.grpc.v1.cri"]
+# Pause container image is specified here, shares the same image as kubelet's pod-infra-container-image
+sandbox_image = "{{settings.kubernetes.pod-infra-container-image}}"
+
 [plugins."io.containerd.grpc.v1.cri".containerd]
 default_runtime_name = "runc"
 

packages/containerd/containerd.spec

@@ -15,7 +15,7 @@ License: ASL 2.0
 URL: https://%{goimport}
 Source0: https://%{goimport}/archive/v%{gover}/%{gorepo}-%{gover}.tar.gz
 Source1: containerd.service
-Source2: containerd-config.toml
+Source2: containerd-config-toml
 Source3: containerd-tmpfiles.conf
 BuildRequires: git
 BuildRequires: gcc-%{_cross_target}
@@ -64,8 +64,9 @@ done
 install -d %{buildroot}%{_cross_unitdir}
 install -p -m 0644 %{S:1} %{buildroot}%{_cross_unitdir}/containerd.service
 
+install -d %{buildroot}%{_cross_templatedir}
 install -d %{buildroot}%{_cross_factorydir}%{_cross_sysconfdir}/containerd
-install -p -m 0644 %{S:2} %{buildroot}%{_cross_factorydir}%{_cross_sysconfdir}/containerd/config.toml
+install -p -m 0644 %{S:2} %{buildroot}%{_cross_templatedir}/containerd-config-toml
 
 install -d %{buildroot}%{_cross_tmpfilesdir}
 install -p -m 0644 %{S:3} %{buildroot}%{_cross_tmpfilesdir}/containerd.conf
@@ -78,7 +79,7 @@ install -p -m 0644 %{S:3} %{buildroot}%{_cross_tmpfilesdir}/containerd.conf
 %{_cross_bindir}/ctr
 %{_cross_unitdir}/containerd.service
 %dir %{_cross_factorydir}%{_cross_sysconfdir}/containerd
-%{_cross_factorydir}%{_cross_sysconfdir}/containerd/config.toml
+%{_cross_templatedir}/containerd-config-toml
 %{_cross_tmpfilesdir}/containerd.conf
 
 %changelog

workspaces/api/storewolf/defaults.toml

@@ -25,7 +25,7 @@ val = ["hostname"]
 # Kubernetes.
 
 [services.kubernetes]
-configuration-files = ["kubelet-env", "kubelet-config", "kubelet-kubeconfig", "kubernetes-ca-crt"]
+configuration-files = ["kubelet-env", "kubelet-config", "kubelet-kubeconfig", "kubernetes-ca-crt", "containerd-config-toml"]
 restart-commands = []
 
 [configuration-files.kubelet-env]
@@ -44,6 +44,10 @@ template-path = "/usr/share/templates/kubelet-kubeconfig"
 path = "/etc/kubernetes/pki/ca.crt"
 template-path = "/usr/share/templates/kubernetes-ca-crt"
 
+[configuration-files.containerd-config-toml]
+path = "/etc/containerd/config.toml"
+template-path = "/usr/share/templates/containerd-config-toml"
+
 [[metadata]]
 key = "settings.kubernetes.max-pods"
 md = "setting-generator"