Add comment and remove extra enable/start docker in node script

kubernetes-sigs · Apr 30, 2018 · 78cd0e2 · 78cd0e2
1 parent 777f872
commit 78cd0e2
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/cloud/google/machineactuator.go b/cloud/google/machineactuator.go
@@ -266,6 +266,8 @@ func (gce *GCEClient) Create(cluster *clusterv1.Cluster, machine *clusterv1.Mach
 		if gce.machineClient == nil {
 			labels[BootstrapLabelKey] = "true"
 		}
+
+		// The service account is needed for the Kubernetes GCE cloud provider code. It is needed on the master VM.
 		serviceAccounts := []*compute.ServiceAccount{nil}
 		if util.IsMaster(machine) {
 			serviceAccounts = append(serviceAccounts,

diff --git a/gcp-deployer/machine_setup_configs.yaml b/gcp-deployer/machine_setup_configs.yaml
@@ -175,8 +175,6 @@ items:
       KUBEADM=$(getversion kubeadm ${KUBELET_VERSION}-)
       KUBECTL=$(getversion kubectl ${KUBELET_VERSION}-)
       apt-get install -y kubelet=${KUBELET} kubeadm=${KUBEADM} kubectl=${KUBECTL}
-      systemctl enable docker || true
-      systemctl start docker || true
       # kubeadm uses 10th IP as DNS server
       CLUSTER_DNS_SERVER=$(prips ${SERVICE_CIDR} | head -n 11 | tail -n 1)
       # Override network args to use kubenet instead of cni, and override Kubelet DNS args.