From: Kuralamudhan Ramakrishnan <kuralamudhan.ramakrishnan@intel.com>
Date: Tue, 7 Dec 2021 21:12:58 +0000 (+0000)
Subject: Merge "Eliminate warning about apt stable CLI interface"
X-Git-Url: https://gerrit.akraino.org/r/gitweb?a=commitdiff_plain;ds=sidebyside;h=94477fb85941f8cb6392fbe5bc8144f6764aace0;hp=-c;p=icn.git

Merge "Eliminate warning about apt stable CLI interface"
---

94477fb85941f8cb6392fbe5bc8144f6764aace0
diff --combined deploy/cluster/templates/kubeadmcontrolplane.yaml
index a17e95b,8292ff7..3342c73
--- a/deploy/cluster/templates/kubeadmcontrolplane.yaml
+++ b/deploy/cluster/templates/kubeadmcontrolplane.yaml
@@@ -22,9 -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 }}
@@@ -36,7 -33,7 +36,7 @@@
      - 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,11 -53,6 +56,11 @@@
      # 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