starlingx
/
integ
Code Issues Proposed changes

Merge "use symlinks instead of bind mounts for K8s versioning"

This commit is contained in:
Zuul 2024-05-03 20:31:29 +00:00 committed by Gerrit Code Review
parent 0ce84f0495 1fffbe7c9b
commit 326c7cf3cc
3 changed files with 16 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
kubernetes/kubernetes-unversioned/debian/deb_folder/kubernetes-unversioned.dirs
View File

@ -1,6 +1,5 @@
etc/systemd/system/kubelet.service.d
usr/share/bash-completion/completions
usr/local/kubernetes/current/stage1
usr/local/kubernetes/current/stage2
var/lib/kubelet
var/lib/kubernetes
run/kubernetes

12
kubernetes/kubernetes-unversioned/debian/deb_folder/kubernetes-unversioned.links
View File

@ -1,6 +1,6 @@
/usr/local/kubernetes/current/stage1/usr/bin/kubeadm /usr/bin/kubeadm
/usr/local/kubernetes/current/stage2/usr/bin/kubelet /usr/bin/kubelet
/usr/local/kubernetes/current/stage2/usr/bin/kubelet-cgroup-setup.sh /usr/bin/kubelet-cgroup-setup.sh
/usr/local/kubernetes/current/stage2/usr/bin/kubectl /usr/bin/kubectl
/usr/local/kubernetes/current/stage2/etc/systemd/system/kubelet.service.d/kubeadm.conf /etc/systemd/system/kubelet.service.d/kubeadm.conf
/usr/local/kubernetes/current/stage2/usr/share/bash-completion/completions/kubectl /usr/share/bash-completion/completions/kubectl
/var/lib/kubernetes/stage1/usr/bin/kubeadm /usr/bin/kubeadm
/var/lib/kubernetes/stage2/usr/bin/kubelet /usr/bin/kubelet
/var/lib/kubernetes/stage2/usr/bin/kubelet-cgroup-setup.sh /usr/bin/kubelet-cgroup-setup.sh
/var/lib/kubernetes/stage2/usr/bin/kubectl /usr/bin/kubectl
/var/lib/kubernetes/stage2/etc/systemd/system/kubelet.service.d/kubeadm.conf /etc/systemd/system/kubelet.service.d/kubeadm.conf
/var/lib/kubernetes/stage2/usr/share/bash-completion/completions/kubectl /usr/share/bash-completion/completions/kubectl

20
kubernetes/kubernetes-unversioned/debian/deb_folder/rules
View File

@ -6,8 +6,7 @@
_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
_symlinkdir := /var/lib/kubernetes
DEBIAN_DESTDIR := $(CURDIR)/debian/tmp
@ -22,20 +21,19 @@ override_dh_auto_build:
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}
# location for stage1 and state2 version symlinks
install -v -m 755 -d ${DEBIAN_DESTDIR}${_symlinkdir}
# 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)
$(call stage_link,${_symlinkdir}/stage1,${_bindir},kubeadm)
$(call stage_link,${_symlinkdir}/stage2,/etc/systemd/system/kubelet.service.d,kubeadm.conf)
$(call stage_link,${_symlinkdir}/stage2,/usr/share/bash-completion/completions,kubectl)
$(call stage_link,${_symlinkdir}/stage2,${_bindir},kubelet-cgroup-setup.sh)
$(call stage_link,${_symlinkdir}/stage2,${_bindir},kubelet)
$(call stage_link,${_symlinkdir}/stage2,${_bindir},kubectl)
# install environment files
install -v -d -m 0755 ${DEBIAN_DESTDIR}/etc/${_k8s_name}