Merge "Eliminate warning about apt stable CLI interface"

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

diff --git a/deploy/cluster/templates/kubeadmcontrolplane.yaml b/deploy/cluster/templates/kubeadmcontrolplane.yaml
index 8292ff7..3342c73 100644 (file)
--- a/deploy/cluster/templates/kubeadmcontrolplane.yaml
+++ b/deploy/cluster/templates/kubeadmcontrolplane.yaml
@@ -22,6 +22,9 @@ spec:
       nodeRegistration:
         kubeletExtraArgs:
           node-labels: metal3.io/uuid={{ "{{" }} ds.meta_data.uuid {{ "}}" }}
+          cpu-manager-policy: static
+          topology-manager-policy: best-effort
+          kube-reserved: cpu=200m,memory=512Mi
         name: '{{ "{{" }} ds.meta_data.name {{ "}}" }}'
     preKubeadmCommands:
 {{- if .Values.networks }}
@@ -53,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