diff --git a/build/rpms/10-kubeadm.conf b/build/rpms/10-kubeadm.conf index a989fe7e5dc..8472af6aa24 100644 --- a/build/rpms/10-kubeadm.conf +++ b/build/rpms/10-kubeadm.conf @@ -1,4 +1,5 @@ [Service] +EnvironmentFile=-/etc/sysconfig/kubelet Environment="KUBELET_KUBECONFIG_ARGS=--bootstrap-kubeconfig=/etc/kubernetes/bootstrap-kubelet.conf --kubeconfig=/etc/kubernetes/kubelet.conf" Environment="KUBELET_SYSTEM_PODS_ARGS=--pod-manifest-path=/etc/kubernetes/manifests --allow-privileged=true" Environment="KUBELET_NETWORK_ARGS=--network-plugin=cni --cni-conf-dir=/etc/cni/net.d --cni-bin-dir=/opt/cni/bin" diff --git a/build/rpms/kubeadm.spec b/build/rpms/kubeadm.spec index 08e8ad44f96..0430ceaca7e 100644 --- a/build/rpms/kubeadm.spec +++ b/build/rpms/kubeadm.spec @@ -18,6 +18,7 @@ install -m 755 -d %{buildroot}%{_sysconfdir}/systemd/system/ install -m 755 -d %{buildroot}%{_sysconfdir}/systemd/system/kubelet.service.d/ install -p -m 755 -t %{buildroot}%{_bindir} kubeadm install -p -m 755 -t %{buildroot}%{_sysconfdir}/systemd/system/kubelet.service.d/ 10-kubeadm.conf +install -p -m 755 -t %{buildroot}%{_sysconfdir}/sysconfig/ kubelet %files %{_bindir}/kubeadm diff --git a/build/rpms/kubelet b/build/rpms/kubelet new file mode 100644 index 00000000000..b6c7084e3a1 --- /dev/null +++ b/build/rpms/kubelet @@ -0,0 +1 @@ +KUBELET_EXTRA_ARGS=