whentimeslows/website
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #6962 from tianshapjq/patch-3

Browse Source 
remove empty ExecStart
This commit is contained in:
Joseph Heck
2018-01-18 18:58:21 -08:00
committed by GitHub
parent 9232add553 ddbac32908
commit 654900c583
1 changed files with 1 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
docs/reference/setup-tools/kubeadm/kubeadm-init.md
+1 -2
View File
@@ -241,7 +241,6 @@ Environment="KUBELET_DNS_ARGS=--cluster-dns=10.96.0.10 --cluster-domain=cluster.
Environment="KUBELET_AUTHZ_ARGS=--authorization-mode=Webhook --client-ca-file=/etc/kubernetes/pki/ca.crt" Environment="KUBELET_AUTHZ_ARGS=--authorization-mode=Webhook --client-ca-file=/etc/kubernetes/pki/ca.crt"
Environment="KUBELET_CADVISOR_ARGS=--cadvisor-port=0" Environment="KUBELET_CADVISOR_ARGS=--cadvisor-port=0"
Environment="KUBELET_CERTIFICATE_ARGS=--rotate-certificates=true --cert-dir=/var/lib/kubelet/pki" Environment="KUBELET_CERTIFICATE_ARGS=--rotate-certificates=true --cert-dir=/var/lib/kubelet/pki"
ExecStart=
ExecStart=/usr/bin/kubelet $KUBELET_KUBECONFIG_ARGS $KUBELET_SYSTEM_PODS_ARGS $KUBELET_NETWORK_ARGS $KUBELET_DNS_ARGS $KUBELET_AUTHZ_ARGS $KUBELET_CADVISOR_ARGS $KUBELET_CERTIFICATE_ARGS $KUBELET_EXTRA_ARGS ExecStart=/usr/bin/kubelet $KUBELET_KUBECONFIG_ARGS $KUBELET_SYSTEM_PODS_ARGS $KUBELET_NETWORK_ARGS $KUBELET_DNS_ARGS $KUBELET_AUTHZ_ARGS $KUBELET_CADVISOR_ARGS $KUBELET_CERTIFICATE_ARGS $KUBELET_EXTRA_ARGS
``` ```
@@ -383,7 +382,7 @@ In summary, `kubeadm init --feature-gates=SelfHosting=true` works as follows:
1. Creates DaemonSets in the `kube-system` namespace and waits for the 1. Creates DaemonSets in the `kube-system` namespace and waits for the
resulting Pods to be running. resulting Pods to be running.
1. Once self-hosted Pods are operational, it's associated static Pods are deleted 1. Once self-hosted Pods are operational, their associated static Pods are deleted
and kubeadm moves on to install the next component. This triggers kubelet to and kubeadm moves on to install the next component. This triggers kubelet to
stop those static Pods. stop those static Pods.