diff --git a/cloud/google/machineactuator.go b/cloud/google/machineactuator.go index f4e39f4cfaaf..60f8df6d4122 100644 --- 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 index 21f97fa8842f..92e5d05073bd 100644 --- 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.