From 89ded27ec1cd3068086424468f7b6fa160ab5fd6 Mon Sep 17 00:00:00 2001
From: Pascal Morillon <pascal.morillon@irisa.fr>
Date: Thu, 9 May 2019 14:33:47 +0200
Subject: [PATCH 1/2] Kubernetes and docker upgrades

---
 tasks/kube.rb            | 2 +-
 veertuosa/install_k8s.sh | 7 ++++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/tasks/kube.rb b/tasks/kube.rb
index 9b30177..92deb61 100644
--- a/tasks/kube.rb
+++ b/tasks/kube.rb
@@ -36,7 +36,7 @@ namespace :kube do
   task :deployFlannel do
     ip = clusterDesc()['master']['kubemaster']
     on(ip, :user => 'root') do
-      "kubectl apply -f https://raw.githubusercontent.com/coreos/flannel/bc79dd1505b0c8681ece4de4c0d86c5cd2643275/Documentation/kube-flannel.yml"
+      "kubectl apply -f https://raw.githubusercontent.com/coreos/flannel/a70459be0084506e4ec919aa1c114638878db11b/Documentation/kube-flannel.yml"
     end
   end
 
diff --git a/veertuosa/install_k8s.sh b/veertuosa/install_k8s.sh
index e124f4b..066336b 100644
--- a/veertuosa/install_k8s.sh
+++ b/veertuosa/install_k8s.sh
@@ -1,7 +1,8 @@
 #!/usr/bin/env bash
 set -e
 
-KUBE_VERSION="1.13.2-00"
+KUBE_VERSION="1.14.1-00"
+CNI_VERSION="0.7.5-00"
 
 # Install needed packages
 apt update && apt install apt-transport-https ca-certificates curl software-properties-common vim ceph-common -y
@@ -9,14 +10,14 @@ apt update && apt install apt-transport-https ca-certificates curl software-prop
 # Install Docker
 curl -fsSL https://download.docker.com/linux/debian/gpg | apt-key add -
 add-apt-repository "deb https://download.docker.com/linux/$(. /etc/os-release; echo "$ID") $(lsb_release -cs) stable"
-apt-get update && apt-get install -y docker-ce=$(apt-cache madison docker-ce | grep 18.06.1 | head -1 | awk '{print $3}')
+apt-get update && apt-get install -y docker-ce=$(apt-cache madison docker-ce | grep 18.06.3 | head -1 | awk '{print $3}')
 
 # Install Kubernetes APT repo
 curl -s https://packages.cloud.google.com/apt/doc/apt-key.gpg | apt-key add
 echo "deb http://apt.kubernetes.io/ kubernetes-xenial main" > /etc/apt/sources.list.d/kubernetes.list
 
 # Install Kubernetes
-apt update && apt install kubeadm=$KUBE_VERSION kubectl=$KUBE_VERSION kubelet=$KUBE_VERSION -y
+apt update && apt install kubeadm=$KUBE_VERSION kubectl=$KUBE_VERSION kubelet=$KUBE_VERSION kubernetes-cni=$CNI_VERSION -y
 
 # Disable swp
 swapoff -a
-- 
GitLab


From 9173f0d0cc7cdf015624aee2c5ab1eb2fb432f93 Mon Sep 17 00:00:00 2001
From: Pascal Morillon <pascal.morillon@irisa.fr>
Date: Thu, 9 May 2019 14:43:50 +0200
Subject: [PATCH 2/2] Update documentation

---
 docs/requirements.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/requirements.md b/docs/requirements.md
index c277a93..abb9577 100644
--- a/docs/requirements.md
+++ b/docs/requirements.md
@@ -30,7 +30,7 @@ oarsub -S ./veertuosa/generate_image.sh
 
 This OAR job will create a virtual image based on Debian 9 with :
 
-* Kubernetes 1.13.2 and pre-pulled k8s containers.
+* Kubernetes 1.14.1 and pre-pulled k8s containers.
 * [Helm](http://helm.sh).
 
 At the end of this OAR job, the image will be available at `./veertuosa/images/g5k8s.qcow2`.
-- 
GitLab