Merge "kubelet-config custom parameters are missing after k8s upgrade"

This commit is contained in:
Zuul 2023-04-25 13:51:35 +00:00 committed by Gerrit Code Review
commit 7e37642a0f
3 changed files with 0 additions and 6 deletions

View File

@ -1,4 +0,0 @@
---
kind: KubeletConfiguration
apiVersion: kubelet.config.k8s.io/v1beta1
# no customizations

View File

@ -2,7 +2,6 @@ usr/lib/systemd/system/kubelet.service
etc/kubernetes/config
etc/kubernetes/kubelet
etc/kubernetes/kubelet.kubeconfig
etc/kubernetes/kubelet_override.yaml
etc/kubernetes/proxy
etc/systemd/system.conf.d/kubernetes-accounting.conf
usr/lib/tmpfiles.d/kubernetes.conf

View File

@ -43,7 +43,6 @@ override_dh_install:
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 -v -m 644 -t ${DEBIAN_DESTDIR}/etc/${_k8s_name} debian/kubelet_override.yaml
# install config files
install -v -d -m 0755 ${DEBIAN_DESTDIR}/usr/lib/tmpfiles.d