From f07b4cfa0325d0102d99c4e6b49e1bd40188fa2a Mon Sep 17 00:00:00 2001
From: Divesh Angula <divesh.angula@quantum.com>
Date: Mon, 30 Oct 2017 14:23:55 -0700
Subject: [PATCH] kubeadm join update for 1.8  - update default values for load
 test.

review changes
---
 tests/pipeline/Jenkinsfile.k8sSetup   |  4 ++--
 tests/pipeline/Jenkinsfile.longhaul   |  2 +-
 tests/pipeline/Jenkinsfile.regression |  2 +-
 tests/scripts/kubeadm.sh              | 11 ++++++-----
 4 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/tests/pipeline/Jenkinsfile.k8sSetup b/tests/pipeline/Jenkinsfile.k8sSetup
index a1feaddff..88e61f4eb 100644
--- a/tests/pipeline/Jenkinsfile.k8sSetup
+++ b/tests/pipeline/Jenkinsfile.k8sSetup
@@ -6,8 +6,8 @@ pipeline {
           choice(name: 'node', choices: 'gce-reg\ngce-load', description: 'select env to run tests in ')
           choice(name: 'key', choices: 'master\nPR', description: 'Select master or a PR to run tests aganist - defaults to master')
           string(name: 'PR', defaultValue: '', description: 'PR number, required if key value is set to PR')
-          string(name: 'version', defaultValue: 'v0.5.0-111.ga4a1a98', description: 'Version to run tests against')
-          string(name: 'kube_version', defaultValue: 'v1.7.5', description: 'Version of kubernetes to  tests against')
+          string(name: 'version', defaultValue: '', description: 'Version to run tests against')
+          string(name: 'kube_version', defaultValue: 'v1.8.2', description: 'Version of kubernetes to  tests against')
       }
 
     agent { label "${params.node}-master" }
diff --git a/tests/pipeline/Jenkinsfile.longhaul b/tests/pipeline/Jenkinsfile.longhaul
index 56452b49c..be5215181 100644
--- a/tests/pipeline/Jenkinsfile.longhaul
+++ b/tests/pipeline/Jenkinsfile.longhaul
@@ -6,7 +6,7 @@ pipeline {
           choice(name: 'node', choices: 'gce-reg\ngce-load', description: 'select env to run tests in ')
           choice(name: 'key', choices: 'master\nPR', description: 'Select master or a PR to run tests aganist - defaults to master')
           string(name: 'PR', defaultValue: '', description: 'PR number, required if key value is set to PR')
-          string(name: 'version', defaultValue: 'v0.5.0-111.ga4a1a98', description: 'Version to run tests against')
+          string(name: 'version', defaultValue: '', description: 'Version to run tests against')
           string(name: 'Load_test', defaultValue: 'TestBlockLongHaul', description: 'select a load test to run ')
           string(name: 'testCount', defaultValue: '10', description: 'Number of times to repeat test per run')
           string(name: 'load_factor', defaultValue: '20', description: 'load factor - number of concurrent threads running per test')
diff --git a/tests/pipeline/Jenkinsfile.regression b/tests/pipeline/Jenkinsfile.regression
index 2b7ef8d95..4c69e96f6 100644
--- a/tests/pipeline/Jenkinsfile.regression
+++ b/tests/pipeline/Jenkinsfile.regression
@@ -6,7 +6,7 @@ pipeline {
           choice(name: 'node', choices: 'gce-reg\ngce-load', description: 'select env to run tests in ')
           choice(name: 'key', choices: 'master\nPR', description: 'Select master or a PR to run tests aganist - defaults to master')
           string(name: 'PR', defaultValue: '', description: 'PR number, required if key value is set to PR')
-          string(name: 'version', defaultValue: 'v0.5.0-111.ga4a1a98', description: 'Version to run tests against')
+          string(name: 'version', defaultValue: '', description: 'Version to run tests against')
       }
 
     agent { label "${params.node}-master" }
diff --git a/tests/scripts/kubeadm.sh b/tests/scripts/kubeadm.sh
index fd732393b..116f49331 100755
--- a/tests/scripts/kubeadm.sh
+++ b/tests/scripts/kubeadm.sh
@@ -11,7 +11,8 @@ usage(){
     echo "usage:" >&2
     echo "  $0 up " >&2
     echo "  $0 install master" >&2
-    echo "  $0 install node --token <token> <master-ip>:<master-port>" >&2
+    echo "  $0 install node --token <token> <master-ip>:<master-port> (for k8s 1.7 and older)" >&2
+    echo "  $0 install node --token <token> <master-ip>:<master-port> --discovery-token-ca-cert-hash sha256:<hash>" >&2
     echo "  $0 wait <number of nodes>" >&2
     echo "  $0 clean" >&2
 }
@@ -59,8 +60,8 @@ EOF
 #install k8s node
 install_node(){
     echo "inside install node function"
-    echo "kubeadm join ${1} ${2} ${3} --skip-preflight-checks"
-    sudo kubeadm join ${1} ${2} ${3} --skip-preflight-checks || true
+    echo "kubeadm join ${1} ${2} ${3} ${4} ${5} --skip-preflight-checks"
+    sudo kubeadm join ${1} ${2} ${3} ${4} ${5} --skip-preflight-checks || true
 }
 
 #wait for all nodes in the cluster to be ready status
@@ -130,8 +131,8 @@ case "${1:-}" in
             install_master
         ;;
         node)
-            if [ "$#" -eq 5 ]; then
-                install_node $3 $4 $5
+            if [ "$#" -eq 5 ] || [ "$#" -eq 7 ]; then
+                install_node $3 $4 $5 $6 $7
             else
                 echo "invalid arguments for install node"
                 usage