From f93128b2d99da510e8546c53ca6b1f55e50e1df6 Mon Sep 17 00:00:00 2001
From: mickymiek <meunie_m@etna-alternance.net>
Date: Tue, 9 Oct 2018 12:25:22 +0200
Subject: [PATCH] make sure integration tests works on k8s 1.12

Signed-off-by: mickymiek <meunie_m@etna-alternance.net>
---
 Jenkinsfile              |  3 ++-
 tests/scripts/kubeadm.sh | 14 ++++++++++----
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index f0aedd040..5f2cb4c9e 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -71,7 +71,8 @@ pipeline {
                         "aws_1.8.x": "v1.8.5",
                         "gce_1.9.x": "v1.9.9",
                         "aws_1.10.x": "v1.10.5",
-                        "aws_1.11.x": "v1.11.1"
+                        "aws_1.11.x": "v1.11.1",
+                        "aws_1.12.x": "v1.12.0"
                     ]
                     testruns = [:]
                     for (kv in mapToList(data)) {
diff --git a/tests/scripts/kubeadm.sh b/tests/scripts/kubeadm.sh
index 6c5515fe8..c221820eb 100755
--- a/tests/scripts/kubeadm.sh
+++ b/tests/scripts/kubeadm.sh
@@ -7,6 +7,12 @@ tarfile="${WORK_DIR}/tests/${tarname}"
 
 export KUBE_VERSION=${KUBE_VERSION:-"v1.8.5"}
 
+if [[ $KUBE_VERSION == v1.12* ]] ; then
+    skippreflightcheck=--ignore-preflight-errors=all
+else
+    skippreflightcheck=--skip-preflight-checks
+fi
+
 usage(){
     echo "usage:" >&2
     echo "  $0 up " >&2
@@ -28,7 +34,7 @@ EOF
         sudo systemctl daemon-reload
     fi
 
-    sudo kubeadm init --skip-preflight-checks --kubernetes-version ${KUBE_VERSION}
+    sudo kubeadm init $skippreflightcheck --kubernetes-version ${KUBE_VERSION}
 
     sudo cp /etc/kubernetes/admin.conf $HOME/
     sudo chown $(id -u):$(id -g) $HOME/admin.conf
@@ -70,8 +76,8 @@ EOF
         sudo systemctl daemon-reload
     fi
 
-    echo "kubeadm join ${1} ${2} ${3} ${4} ${5} --skip-preflight-checks"
-    sudo kubeadm join ${1} ${2} ${3} ${4} ${5} --skip-preflight-checks || true
+    echo "kubeadm join ${1} ${2} ${3} ${4} ${5} $skippreflightcheck"
+    sudo kubeadm join ${1} ${2} ${3} ${4} ${5} $skippreflightcheck || true
 }
 
 #wait for all nodes in the cluster to be ready status
@@ -112,7 +118,7 @@ wait_for_ready(){
 
 kubeadm_reset() {
     kubectl delete -f "https://cloud.weave.works/k8s/net?k8s-version=$(kubectl version | base64 | tr -d '\n')"
-    sudo kubeadm reset --skip-preflight-checks
+    sudo kubeadm reset $skippreflightcheck
     sudo rm /usr/local/bin/kube*
     sudo rm kubectl
     rm $HOME/admin.conf