From ee6eadab97e48956d43db6f2f79a02dc24eefb63 Mon Sep 17 00:00:00 2001 From: Kaustubh Dhokte Date: Fri, 29 Apr 2022 06:27:46 +0000 Subject: [PATCH] Debian: Correct "sanitize reserved cpus list before kubelet starts" This change makes a correction in kubeadm.conf for k8s 1.21.8 on Debian originally committed in https://review.opendev.org/c/starlingx/integ/+/827384 /etc/sysconfig does not exist on Debian. Kubelet service environment variables file location is /etc/default/ on StarlingX Debian. Test Plan: Package builds successfully Closes-Bug: 1955608 Signed-off-by: Kaustubh Dhokte Change-Id: Ic3f7f6a514088a3ccbd7f99c0433a8144e8d0ade --- kubernetes/kubernetes-1.21.8/debian/deb_folder/kubeadm.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kubernetes/kubernetes-1.21.8/debian/deb_folder/kubeadm.conf b/kubernetes/kubernetes-1.21.8/debian/deb_folder/kubeadm.conf index bf77a80ca..d8b77e9dc 100644 --- a/kubernetes/kubernetes-1.21.8/debian/deb_folder/kubeadm.conf +++ b/kubernetes/kubernetes-1.21.8/debian/deb_folder/kubeadm.conf @@ -9,7 +9,7 @@ EnvironmentFile=-/var/lib/kubelet/kubeadm-flags.env EnvironmentFile=-/etc/default/kubelet ExecStart= ExecStart=/usr/bin/kubelet $KUBELET_KUBECONFIG_ARGS $KUBELET_CONFIG_ARGS $KUBELET_KUBEADM_ARGS $KUBELET_EXTRA_ARGS -ExecStartPre=-/usr/local/sbin/sanitize_kubelet_reserved_cpus.sh /etc/sysconfig/kubelet +ExecStartPre=-/usr/local/sbin/sanitize_kubelet_reserved_cpus.sh /etc/default/kubelet ExecStartPre=-/usr/bin/kubelet-cgroup-setup.sh ExecStartPost=/bin/bash -c 'echo $MAINPID > /var/run/kubelet.pid;' ExecStopPost=/bin/rm -f /var/run/kubelet.pid