calico

terraform/control-plane1.bu

@@ -250,14 +250,12 @@ systemd:
         StandardOutput=journal+console
         StandardError=journal+console
 
-        ExecStart=/bin/sh -c 'echo "kubelet.service start"'
         #EnvironmentFile=/run/metadata/coreos
         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
         ExecStart=/opt/bin/kubelet $KUBELET_KUBECONFIG_ARGS $KUBELET_CONFIG_ARGS $KUBELET_KUBEADM_ARGS $KUBELET_EXTRA_ARGS
-        ExecStart=/bin/sh -c 'echo "kubelet started"'
         Restart=always
         StartLimitInterval=0
         RestartSec=10
@@ -271,6 +269,7 @@ systemd:
         Description=Kubeadm Init Cluster
         After=network-online.target containerd.service kubelet.service
         Wants=network-online.target
+        ConditionPathExists=/var/lib/kubelet
         ConditionPathExists=!/etc/kubernetes/kubelet.conf
 
         [Service]
@@ -306,7 +305,8 @@ systemd:
         [Unit]
         Wants=kubeadm-init.target
         After=kubeadm-init.target
-        ConditionSucceeded=kubeadm-init.service
+        ConditionPathExists=/home/core/.kube/config
+
         [Service]
         StandardOutput=journal+console
         StandardError=journal+console