From: Ciprian Barbu <ciprian.barbu@enea.com>
Date: Wed, 27 Mar 2019 14:37:54 +0000 (+0000)
Subject: Merge "Fix broken kubernetes-cni dependency"
X-Git-Tag: 1.0.0~31
X-Git-Url: https://gerrit.akraino.org/r/gitweb?a=commitdiff_plain;h=20ba2ab66fea4a9019e6ae3cceab29489572552d;hp=83f75f426b1aeffb9d835845921b1b8740cdc80c;p=iec.git

Merge "Fix broken kubernetes-cni dependency"
---

diff --git a/src/foundation/scripts/k8s_common.sh b/src/foundation/scripts/k8s_common.sh
index e1e086d..0e9de86 100755
--- a/src/foundation/scripts/k8s_common.sh
+++ b/src/foundation/scripts/k8s_common.sh
@@ -2,6 +2,7 @@
 
 DOCKER_VERSION=18.06.1~ce~3-0~ubuntu
 KUBE_VERSION=1.13.0-00
+K8S_CNI_VERSION=0.6.0-00
 
 # Install Docker as Prerequisite
 curl -fsSL https://download.docker.com/linux/ubuntu/gpg | sudo apt-key add -
@@ -25,9 +26,10 @@ cat <<EOF | sudo tee /etc/apt/sources.list.d/kubernetes.list
 deb https://apt.kubernetes.io/ kubernetes-xenial main
 EOF
 sudo apt update
+# Minor fix for broken kubernetes-cni dependency in upstream xenial repo
 sudo apt install -y \
-  kubelet=${KUBE_VERSION} kubeadm=${KUBE_VERSION} kubectl=${KUBE_VERSION}
-sudo apt-mark hold kubelet kubeadm kubectl
+  kubernetes-cni=${K8S_CNI_VERSION} kubelet=${KUBE_VERSION} kubeadm=${KUBE_VERSION} kubectl=${KUBE_VERSION}
+sudo apt-mark hold kubernetes-cni kubelet kubeadm kubectl
 
 #Add extra flags to Kubelet
 if ! grep -q -e 'fail-swap-on' /etc/default/kubelet; then