diff --git a/10-kubeadm.conf b/10-kubeadm.conf new file mode 100644 index 0000000..cf82c3d --- /dev/null +++ b/10-kubeadm.conf @@ -0,0 +1,16 @@ +[Service] +Environment="KUBELET_KUBECONFIG_ARGS=--bootstrap-kubeconfig=/etc/kubernetes/bootstrap-kubelet.conf --kubeconfig=/etc/kubernetes/kubelet.conf --fail-swap-on=false" +Environment="KUBELET_SYSTEM_PODS_ARGS=--pod-manifest-path=/etc/kubernetes/manifests" +Environment="KUBELET_DNS_ARGS=--cluster-dns=10.96.0.10 --cluster-domain=cluster.local" +Environment="KUBELET_AUTHZ_ARGS=--authorization-mode=Webhook --client-ca-file=/etc/kubernetes/pki/ca.crt" +Environment="KUBELET_EXTRA_ARGS=--cgroup-driver=systemd" + +# 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 + +ExecStart= +ExecStart=/usr/bin/kubelet $KUBELET_KUBECONFIG_ARGS $KUBELET_SYSTEM_PODS_ARGS $KUBELET_DNS_ARGS $KUBELET_AUTHZ_ARGS $KUBELET_EXTRA_ARGS $KUBELET_KUBEADM_ARGS + +Restart=always +StartLimitInterval=0 +RestartSec=10 diff --git a/kubeadm.conf b/kubeadm.conf deleted file mode 100644 index cf82c3d..0000000 --- a/kubeadm.conf +++ /dev/null @@ -1,16 +0,0 @@ -[Service] -Environment="KUBELET_KUBECONFIG_ARGS=--bootstrap-kubeconfig=/etc/kubernetes/bootstrap-kubelet.conf --kubeconfig=/etc/kubernetes/kubelet.conf --fail-swap-on=false" -Environment="KUBELET_SYSTEM_PODS_ARGS=--pod-manifest-path=/etc/kubernetes/manifests" -Environment="KUBELET_DNS_ARGS=--cluster-dns=10.96.0.10 --cluster-domain=cluster.local" -Environment="KUBELET_AUTHZ_ARGS=--authorization-mode=Webhook --client-ca-file=/etc/kubernetes/pki/ca.crt" -Environment="KUBELET_EXTRA_ARGS=--cgroup-driver=systemd" - -# 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 - -ExecStart= -ExecStart=/usr/bin/kubelet $KUBELET_KUBECONFIG_ARGS $KUBELET_SYSTEM_PODS_ARGS $KUBELET_DNS_ARGS $KUBELET_AUTHZ_ARGS $KUBELET_EXTRA_ARGS $KUBELET_KUBEADM_ARGS - -Restart=always -StartLimitInterval=0 -RestartSec=10 diff --git a/template/kubernetes-template.spec b/template/kubernetes-template.spec index c3b12c1..f5070c7 100644 --- a/template/kubernetes-template.spec +++ b/template/kubernetes-template.spec @@ -58,7 +58,7 @@ Source110: environ-kubelet.kubeconfig Source111: environ-proxy Source112: environ-scheduler Source113: kubernetes-accounting.conf -Source114: kubeadm.conf +Source114: 10-kubeadm.conf Source115: kubernetes.conf Source116: %{repo}.sysusers @@ -350,7 +350,7 @@ fi %{_mandir}/man1/kubeadm-* %{_bindir}/kubeadm %dir %{_unitdir}/kubelet.service.d -%config(noreplace) %{_unitdir}/kubelet.service.d/kubeadm.conf +%config(noreplace) %{_unitdir}/kubelet.service.d/10-kubeadm.conf ############################################## %files client