c9b781b7c0
The script will run everytime before the kubelet service is started. It reads the reserved-cpus list for the kubelet from the service environment file and sanitizes it on the basis of online CPUs. If none of the reserved cpus is online, it removes the --reserved-cpus flag from the environment file which allows the kubelet to choose CPUs itself. Sanitizing the reserved-cpus list everytime before the kubelet starts assures that the kubelet will not fail to start due to unavailability of one or more CPUs in the list. By enabling or disabling CPU hyperthreading, available CPUs change. This change will make sure changing CPU hyperthreading setting will not lead to kubelet start failure after the system boots up. Test Plan: (On AIO-SX) PASS: Initial Hyperthreading state: enabled Host-lock->Reboot->Disable CPU hyperthreading and reboot->Host-unlock Observe kubelet does not fail to start before host-unlock. All pods states are as expected. Host-unlock succeeds. PASS: Initial Hyperthreading state: disabled Host-lock->Reboot->Enable CPU hyperthreading and reboot->Host-unlock Observe kubelet does not fail to start before host-unlock. All pods states are as expected. Host-unlock succeeds. PASS: Manually restart the Kubelet service. Observe that the kubelet does not fail to start. All pods states are as expected. PASS: Host-lock->Host unlock (without any config change). Observe that the kubelet does not fail to start. All pods states are as expected. PASS: Packages built successfully on both Debian and CentOS. Closes-Bug: 1955608 Change-Id: I699c5c36a56a50d4c48faa816edad69c17058079 Signed-off-by: Kaustubh Dhokte <kaustubh.dhokte@windriver.com>
73 lines
2.8 KiB
Makefile
Executable File
73 lines
2.8 KiB
Makefile
Executable File
#!/usr/bin/make -f
|
|
# See debhelper(7) (uncomment to enable)
|
|
# output every command that modifies files on the build system.
|
|
#export DH_VERBOSE = 1
|
|
|
|
_k8s_name := kubernetes
|
|
_bindir := /usr/bin
|
|
_local_sbindir := /usr/local/sbin
|
|
_curr_stage1 := /usr/local/kubernetes/current/stage1
|
|
_curr_stage2 := /usr/local/kubernetes/current/stage2
|
|
|
|
DEBIAN_DESTDIR := $(CURDIR)/debian/tmp
|
|
|
|
|
|
stage_link = ln -v -sf ${1}${2}/${3} ${DEBIAN_DESTDIR}${2}/${3}
|
|
|
|
%:
|
|
dh $@ --builddirectory=contrib
|
|
|
|
override_dh_auto_build:
|
|
mkdir -pv contrib
|
|
cp -rv init contrib
|
|
|
|
override_dh_install:
|
|
# Current staged directories
|
|
install -v -m 755 -d ${DEBIAN_DESTDIR}${_curr_stage1}
|
|
install -v -m 755 -d ${DEBIAN_DESTDIR}${_curr_stage2}
|
|
|
|
# Symlink targets
|
|
install -v -m 755 -d ${DEBIAN_DESTDIR}${_bindir}
|
|
install -v -m 755 -d ${DEBIAN_DESTDIR}/etc/systemd/system/kubelet.service.d
|
|
install -v -m 755 -d ${DEBIAN_DESTDIR}/usr/share/bash-completion/completions
|
|
$(call stage_link,${_curr_stage1},${_bindir},kubeadm)
|
|
$(call stage_link,${_curr_stage2},/etc/systemd/system/kubelet.service.d,kubeadm.conf)
|
|
$(call stage_link,${_curr_stage2},/usr/share/bash-completion/completions,kubectl)
|
|
$(call stage_link,${_curr_stage2},${_bindir},kubelet-cgroup-setup.sh)
|
|
$(call stage_link,${_curr_stage2},${_bindir},kubelet)
|
|
$(call stage_link,${_curr_stage2},${_bindir},kubectl)
|
|
|
|
# install environment files
|
|
install -v -d -m 0755 ${DEBIAN_DESTDIR}/etc/${_k8s_name}
|
|
install -v -m 644 -t ${DEBIAN_DESTDIR}/etc/${_k8s_name} contrib/init/systemd/environ/config
|
|
install -v -m 644 -t ${DEBIAN_DESTDIR}/etc/${_k8s_name} contrib/init/systemd/environ/kubelet
|
|
install -v -m 644 -t ${DEBIAN_DESTDIR}/etc/${_k8s_name} contrib/init/systemd/environ/kubelet.kubeconfig
|
|
install -v -m 644 -t ${DEBIAN_DESTDIR}/etc/${_k8s_name} contrib/init/systemd/environ/proxy
|
|
|
|
# install config files
|
|
install -v -d -m 0755 ${DEBIAN_DESTDIR}/usr/lib/tmpfiles.d
|
|
install -v -p -m 0644 -t ${DEBIAN_DESTDIR}/usr/lib/tmpfiles.d contrib/init/systemd/tmpfiles.d/kubernetes.conf
|
|
mkdir -p ${DEBIAN_DESTDIR}/run
|
|
install -v -d -m 0755 ${DEBIAN_DESTDIR}/run/${_k8s_name}/
|
|
|
|
# install service files
|
|
install -v -d -m 0755 ${DEBIAN_DESTDIR}/usr/lib/systemd/system
|
|
install -v -m 0644 -t ${DEBIAN_DESTDIR}/usr/lib/systemd/system contrib/init/systemd/kubelet.service
|
|
|
|
# install the place the kubelet defaults to put volumes (/var/lib/kubelet)
|
|
install -v -d ${DEBIAN_DESTDIR}/var/lib/kubelet
|
|
|
|
# enable CPU and Memory accounting
|
|
install -v -d -m 0755 ${DEBIAN_DESTDIR}/etc/systemd/system.conf.d
|
|
install -v -p -m 0644 -t ${DEBIAN_DESTDIR}/etc/systemd/system.conf.d debian/kubernetes-accounting.conf
|
|
|
|
# install scripts
|
|
install -v -m 0700 -d ${DEBIAN_DESTDIR}${_local_sbindir}
|
|
install -v -m 0700 -d ${DEBIAN_DESTDIR}${_local_sbindir}/sanitize_kubelet_reserved_cpus.sh
|
|
|
|
dh_install
|
|
|
|
override_dh_usrlocal:
|
|
|
|
override_dh_auto_test:
|