starlingx/integ
Code Issues Proposed changes

Merge "Add kubeadm.conf to the kubernetes-unversioned package"

Browse Source
This commit is contained in:
Zuul 2025-05-12 19:11:20 +00:00 committed by Gerrit Code Review
commit bbae2773b3
20 changed files with 2 additions and 70 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
kubernetes/kubernetes-1.29.2/debian/deb_folder/kubernetes-1.29.2-kubeadm.dirs
View File

@ -1 +0,0 @@
usr/local/kubernetes/1.29.2/stage2/etc/systemd/system/kubelet.service.d/

1
kubernetes/kubernetes-1.29.2/debian/deb_folder/kubernetes-1.29.2-kubeadm.install
View File

@ -1,2 +1 @@
usr/local/kubernetes/1.29.2/stage1/usr/bin/kubeadm
usr/local/kubernetes/1.29.2/stage2/etc/systemd/system/kubelet.service.d/kubeadm.conf

2
kubernetes/kubernetes-1.29.2/debian/deb_folder/rules
View File

@ -69,8 +69,6 @@ override_dh_install:
# kube_version stage2
install -m 755 -d ${DEBIAN_DESTDIR}${_stage2}${_bindir}
install -d -m 0755 ${DEBIAN_DESTDIR}${_stage2}/etc/systemd/system/kubelet.service.d
install -p -m 0644 -t ${DEBIAN_DESTDIR}${_stage2}/etc/systemd/system/kubelet.service.d debian/kubeadm.conf
install -p -m 750 -t ${DEBIAN_DESTDIR}${_stage2}${_bindir} ${output_bindir}/kubelet
# remaining are not kube_version staged, i.e., kubernetes-master, kubernetes-misc

17
kubernetes/kubernetes-1.30.6/debian/deb_folder/kubeadm.conf
View File

@ -1,17 +0,0 @@
# Note: This dropin only works with kubeadm and kubelet v1.11+
[Service]
Environment="KUBELET_KUBECONFIG_ARGS=--bootstrap-kubeconfig=/etc/kubernetes/bootstrap-kubelet.conf --kubeconfig=/etc/kubernetes/kubelet.conf"
Environment="KUBELET_CONFIG_ARGS=--config=/var/lib/kubelet/config.yaml"
# This is a file that "kubeadm init" and "kubeadm join" generates at runtime, populating the KUBELET_KUBEADM_ARGS variable dynamically
EnvironmentFile=-/var/lib/kubelet/kubeadm-flags.env
# This is a file that the user can use for overrides of the kubelet args as a last resort. Preferably, the user should use
# the .NodeRegistration.KubeletExtraArgs object in the configuration files instead. KUBELET_EXTRA_ARGS should be sourced from this file.
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/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
StartLimitInterval=0
RestartSec=10

1
kubernetes/kubernetes-1.30.6/debian/deb_folder/kubernetes-1.30.6-kubeadm.dirs
View File

@ -1 +0,0 @@
usr/local/kubernetes/1.30.6/stage2/etc/systemd/system/kubelet.service.d/

1
kubernetes/kubernetes-1.30.6/debian/deb_folder/kubernetes-1.30.6-kubeadm.install
View File

@ -1,2 +1 @@
usr/local/kubernetes/1.30.6/stage1/usr/bin/kubeadm
usr/local/kubernetes/1.30.6/stage2/etc/systemd/system/kubelet.service.d/kubeadm.conf

2
kubernetes/kubernetes-1.30.6/debian/deb_folder/rules
View File

@ -69,8 +69,6 @@ override_dh_install:
# kube_version stage2
install -m 755 -d ${DEBIAN_DESTDIR}${_stage2}${_bindir}
install -d -m 0755 ${DEBIAN_DESTDIR}${_stage2}/etc/systemd/system/kubelet.service.d
install -p -m 0644 -t ${DEBIAN_DESTDIR}${_stage2}/etc/systemd/system/kubelet.service.d debian/kubeadm.conf
install -p -m 750 -t ${DEBIAN_DESTDIR}${_stage2}${_bindir} ${output_bindir}/kubelet
# specific cluster addons for optional use

17
kubernetes/kubernetes-1.31.5/debian/deb_folder/kubeadm.conf
View File

@ -1,17 +0,0 @@
# Note: This dropin only works with kubeadm and kubelet v1.11+
[Service]
Environment="KUBELET_KUBECONFIG_ARGS=--bootstrap-kubeconfig=/etc/kubernetes/bootstrap-kubelet.conf --kubeconfig=/etc/kubernetes/kubelet.conf"
Environment="KUBELET_CONFIG_ARGS=--config=/var/lib/kubelet/config.yaml"
# This is a file that "kubeadm init" and "kubeadm join" generates at runtime, populating the KUBELET_KUBEADM_ARGS variable dynamically
EnvironmentFile=-/var/lib/kubelet/kubeadm-flags.env
# This is a file that the user can use for overrides of the kubelet args as a last resort. Preferably, the user should use
# the .NodeRegistration.KubeletExtraArgs object in the configuration files instead. KUBELET_EXTRA_ARGS should be sourced from this file.
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/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
StartLimitInterval=0
RestartSec=10

1
kubernetes/kubernetes-1.31.5/debian/deb_folder/kubernetes-1.31.5-kubeadm.dirs
View File

@ -1 +0,0 @@
usr/local/kubernetes/1.31.5/stage2/etc/systemd/system/kubelet.service.d/

1
kubernetes/kubernetes-1.31.5/debian/deb_folder/kubernetes-1.31.5-kubeadm.install
View File

@ -1,2 +1 @@
usr/local/kubernetes/1.31.5/stage1/usr/bin/kubeadm
usr/local/kubernetes/1.31.5/stage2/etc/systemd/system/kubelet.service.d/kubeadm.conf

2
kubernetes/kubernetes-1.31.5/debian/deb_folder/rules
View File

@ -69,8 +69,6 @@ override_dh_install:
# kube_version stage2
install -m 755 -d ${DEBIAN_DESTDIR}${_stage2}${_bindir}
install -d -m 0755 ${DEBIAN_DESTDIR}${_stage2}/etc/systemd/system/kubelet.service.d
install -p -m 0644 -t ${DEBIAN_DESTDIR}${_stage2}/etc/systemd/system/kubelet.service.d debian/kubeadm.conf
install -p -m 750 -t ${DEBIAN_DESTDIR}${_stage2}${_bindir} ${output_bindir}/kubelet
# specific cluster addons for optional use

17
kubernetes/kubernetes-1.32.2/debian/deb_folder/kubeadm.conf
View File

@ -1,17 +0,0 @@
# Note: This dropin only works with kubeadm and kubelet v1.11+
[Service]
Environment="KUBELET_KUBECONFIG_ARGS=--bootstrap-kubeconfig=/etc/kubernetes/bootstrap-kubelet.conf --kubeconfig=/etc/kubernetes/kubelet.conf"
Environment="KUBELET_CONFIG_ARGS=--config=/var/lib/kubelet/config.yaml"
# This is a file that "kubeadm init" and "kubeadm join" generates at runtime, populating the KUBELET_KUBEADM_ARGS variable dynamically
EnvironmentFile=-/var/lib/kubelet/kubeadm-flags.env
# This is a file that the user can use for overrides of the kubelet args as a last resort. Preferably, the user should use
# the .NodeRegistration.KubeletExtraArgs object in the configuration files instead. KUBELET_EXTRA_ARGS should be sourced from this file.
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/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
StartLimitInterval=0
RestartSec=10

1
kubernetes/kubernetes-1.32.2/debian/deb_folder/kubernetes-1.32.2-kubeadm.dirs
View File

@ -1 +0,0 @@
usr/local/kubernetes/1.32.2/stage2/etc/systemd/system/kubelet.service.d/

1
kubernetes/kubernetes-1.32.2/debian/deb_folder/kubernetes-1.32.2-kubeadm.install
View File

@ -1,2 +1 @@
usr/local/kubernetes/1.32.2/stage1/usr/bin/kubeadm
usr/local/kubernetes/1.32.2/stage2/etc/systemd/system/kubelet.service.d/kubeadm.conf

2
kubernetes/kubernetes-1.32.2/debian/deb_folder/rules
View File

@ -69,8 +69,6 @@ override_dh_install:
# kube_version stage2
install -m 755 -d ${DEBIAN_DESTDIR}${_stage2}${_bindir}
install -d -m 0755 ${DEBIAN_DESTDIR}${_stage2}/etc/systemd/system/kubelet.service.d
install -p -m 0644 -t ${DEBIAN_DESTDIR}${_stage2}/etc/systemd/system/kubelet.service.d debian/kubeadm.conf
install -p -m 750 -t ${DEBIAN_DESTDIR}${_stage2}${_bindir} ${output_bindir}/kubelet
# specific cluster addons for optional use

0
kubernetes/kubernetes-1.29.2/debian/deb_folder/kubeadm.conf → kubernetes/kubernetes-unversioned/debian/deb_folder/kubeadm.conf
View File

1
kubernetes/kubernetes-unversioned/debian/deb_folder/kubernetes-unversioned.install
View File

@ -3,6 +3,7 @@ etc/kubernetes/config
etc/kubernetes/kubelet
etc/kubernetes/kubelet.kubeconfig
etc/kubernetes/proxy
etc/systemd/system/kubelet.service.d/kubeadm.conf
etc/systemd/system.conf.d/kubernetes-accounting.conf
usr/lib/tmpfiles.d/kubernetes.conf
usr/bin/kubelet-cgroup-setup.sh

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

@ -1,5 +1,4 @@
/var/lib/kubernetes/stage1/usr/bin/kubeadm /usr/bin/kubeadm
/var/lib/kubernetes/stage2/usr/bin/kubelet /usr/bin/kubelet
/var/lib/kubernetes/stage1/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/stage1/usr/share/bash-completion/completions/kubectl /usr/share/bash-completion/completions/kubectl

1
kubernetes/kubernetes-unversioned/debian/deb_folder/not-installed
View File

@ -1,5 +1,4 @@
usr/bin/kubeadm
usr/bin/kubelet
usr/bin/kubectl
etc/systemd/system/kubelet.service.d/kubeadm.conf
usr/share/bash-completion/completions/kubectl

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

@ -29,7 +29,6 @@ override_dh_install:
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,${_symlinkdir}/stage1,${_bindir},kubeadm)
$(call stage_link,${_symlinkdir}/stage2,/etc/systemd/system/kubelet.service.d,kubeadm.conf)
$(call stage_link,${_symlinkdir}/stage1,/usr/share/bash-completion/completions,kubectl)
$(call stage_link,${_symlinkdir}/stage2,${_bindir},kubelet)
$(call stage_link,${_symlinkdir}/stage1,${_bindir},kubectl)
@ -42,6 +41,7 @@ override_dh_install:
install -v -m 644 -t ${DEBIAN_DESTDIR}/etc/${_k8s_name} contrib/init/systemd/environ/proxy
# install config files
install -v -p -m 0644 -t ${DEBIAN_DESTDIR}/etc/systemd/system/kubelet.service.d debian/kubeadm.conf
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