From: Todd Malsbary Date: Thu, 2 Dec 2021 19:16:53 +0000 (-0800) Subject: Eliminate warning about apt stable CLI interface X-Git-Url: https://gerrit.akraino.org/r/gitweb?a=commitdiff_plain;h=11184272883dff3c057a550adc3e8a2a20f5b7bf;hp=7f5b95aaf15bca22ac6506ac5e1b5db0d0437222;p=icn.git Eliminate warning about apt stable CLI interface Signed-off-by: Todd Malsbary Change-Id: I1210f93a462e251b7bab364aad61fe9c7f237e37 --- diff --git a/deploy/cluster/templates/kubeadmconfigtemplate.yaml b/deploy/cluster/templates/kubeadmconfigtemplate.yaml index c56ed0f..0172dc7 100644 --- a/deploy/cluster/templates/kubeadmconfigtemplate.yaml +++ b/deploy/cluster/templates/kubeadmconfigtemplate.yaml @@ -24,7 +24,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 - /usr/local/bin/install-container-runtime.sh - apt-get install -y kubelet={{ .Values.kubeVersion }} kubeadm={{ .Values.kubeVersion }} kubectl={{ .Values.kubeVersion }} diff --git a/deploy/cluster/templates/kubeadmcontrolplane.yaml b/deploy/cluster/templates/kubeadmcontrolplane.yaml index 003144f..8292ff7 100644 --- a/deploy/cluster/templates/kubeadmcontrolplane.yaml +++ b/deploy/cluster/templates/kubeadmcontrolplane.yaml @@ -33,7 +33,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