Merge "Move e2etest cluster resources to parent directory"

[icn.git] / deploy / cluster / templates / kubeadmcontrolplane.yaml

diff --git a/deploy/cluster/templates/kubeadmcontrolplane.yaml b/deploy/cluster/templates/kubeadmcontrolplane.yaml
index a05377f..3342c73 100644 (file)
--- a/deploy/cluster/templates/kubeadmcontrolplane.yaml
+++ b/deploy/cluster/templates/kubeadmcontrolplane.yaml
@@ -36,7 +36,7 @@ spec:
     - add-apt-repository "deb [arch=amd64] https://download.docker.com/linux/ubuntu $(lsb_release -cs) stable"
     - curl -s https://packages.cloud.google.com/apt/doc/apt-key.gpg | apt-key add -
     - add-apt-repository "deb https://apt.kubernetes.io/ kubernetes-xenial main"
-    - apt update -y
+    - apt-get update -y
     - apt-get install -y ca-certificates
 {{- if .Values.keepalived }}
     - apt-get install -y keepalived
@@ -56,6 +56,11 @@ spec:
     # ClusterResourceSet.  However instead of apply, replace must be
     # used to harden K8s.
     - /usr/local/bin/harden_k8s.sh
+{{- if eq (int .Values.numWorkerMachines) 0 }}
+    # Allow scheduling Pods on the control plane when there are no
+    # workers.
+    - kubectl --kubeconfig=/etc/kubernetes/admin.conf taint nodes --all node-role.kubernetes.io/master-
+{{- end }}
     # This must be done after kubeadm as the cabpk provider relies on
     # files in /var/run, which won't persist after a reboot
     - /usr/local/bin/set_kernel_cmdline.sh