From 53f64918fa18999bf126784dbda821bc9f3fd697 Mon Sep 17 00:00:00 2001
From: subnetmarco <88.marco@gmail.com>
Date: Tue, 14 Apr 2020 23:18:55 -0700
Subject: [PATCH] chore(tests): updating Minikube and Kubernetes verions
 Signed-off-by: subnetmarco <88.marco@gmail.com>

---
 .travis.yml                               |  8 +++---
 all-in-one/jaeger-all-in-one-template.yml |  2 +-
 jaeger-production-template.yml            |  2 +-
 travis/install-start-minikube.sh          | 32 +++++++++++------------
 4 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 4ef230c..765d6fd 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,15 +1,17 @@
-dist: trusty
+dist: xenial
 sudo: required
 
 language: java
 jdk:
-  - oraclejdk8
+  - openjdk8
 
 services:
   - docker
 
 before_install:
-# install nsenter which is required for port forwarding
+  # install conntrack which is required for minikube
+  - sudo apt-get -qq -y install conntrack
+  # install nsenter which is required for port forwarding
   - travis/ubuntu-compile-nsenter.sh && sudo cp $HOME/nsenter/util-linux-2.30.2/nsenter /usr/bin
   - travis/install-start-minikube.sh && export PATH=`pwd`:${PATH} # set minikube and kubectl to PATH
   - kubectl get all --all-namespaces
diff --git a/all-in-one/jaeger-all-in-one-template.yml b/all-in-one/jaeger-all-in-one-template.yml
index 0981141..1dd27d1 100644
--- a/all-in-one/jaeger-all-in-one-template.yml
+++ b/all-in-one/jaeger-all-in-one-template.yml
@@ -1,5 +1,5 @@
 #
-# Copyright 2017-2019 The Jaeger Authors
+# Copyright 2017-2020 The Jaeger Authors
 #
 # Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
 # in compliance with the License. You may obtain a copy of the License at
diff --git a/jaeger-production-template.yml b/jaeger-production-template.yml
index f82900f..d1f70b4 100644
--- a/jaeger-production-template.yml
+++ b/jaeger-production-template.yml
@@ -1,5 +1,5 @@
 #
-# Copyright 2017-2019 The Jaeger Authors
+# Copyright 2017-2020 The Jaeger Authors
 #
 # Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
 # in compliance with the License. You may obtain a copy of the License at
diff --git a/travis/install-start-minikube.sh b/travis/install-start-minikube.sh
index dd8d867..4a54921 100755
--- a/travis/install-start-minikube.sh
+++ b/travis/install-start-minikube.sh
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 #
-# Copyright 2017-2018 The Jaeger Authors
+# Copyright 2017-2020 The Jaeger Authors
 #
 # Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
 # in compliance with the License. You may obtain a copy of the License at
@@ -13,25 +13,23 @@
 # the License.
 #
 
-curl -Lo minikube https://storage.googleapis.com/minikube/releases/v0.25.0/minikube-linux-amd64 && chmod +x minikube
-curl -Lo kubectl  https://storage.googleapis.com/kubernetes-release/release/v1.9.0/bin/linux/amd64/kubectl && chmod +x kubectl
-
+export CHANGE_MINIKUBE_NONE_USER=true
 export MINIKUBE_WANTUPDATENOTIFICATION=false
 export MINIKUBE_WANTREPORTERRORPROMPT=false
 export MINIKUBE_HOME=$HOME
 export CHANGE_MINIKUBE_NONE_USER=true
-mkdir $HOME/.kube || true
-touch $HOME/.kube/config
-
 export KUBECONFIG=$HOME/.kube/config
-sudo -E ./minikube start --vm-driver=none
 
-# this for loop waits until kubectl can access the api server that minikube has created
-for i in {1..150} # timeout for 5 minutes
-do
-   ./kubectl get po &> /dev/null
-   if [ $? -ne 1 ]; then
-      break
-  fi
-  sleep 2
-done
+curl -Lo minikube https://storage.googleapis.com/minikube/releases/v1.8.1/minikube-linux-amd64 && chmod +x minikube && sudo mv minikube /usr/local/bin/
+curl -Lo kubectl https://storage.googleapis.com/kubernetes-release/release/v1.18.1/bin/linux/amd64/kubectl && chmod +x kubectl && sudo mv kubectl /usr/local/bin/
+
+mkdir -p $HOME/.kube $HOME/.minikube
+touch $KUBECONFIG
+
+sudo minikube start --profile=minikube --vm-driver=none --kubernetes-version=v1.18.1
+minikube update-context --profile=minikube
+
+eval "$(minikube docker-env --profile=minikube)" && export DOCKER_CLI='docker'
+
+# Wait for kube-dns to be ready.
+JSONPATH='{range .items[*]}{@.metadata.name}:{range @.status.conditions[*]}{@.type}={@.status};{end}{end}'; until kubectl -n kube-system get pods -lk8s-app=kube-dns -o jsonpath="$JSONPATH" 2>&1 | grep -q "Ready=True"; do sleep 1;echo "waiting for kube-dns to be available"; kubectl get pods --all-namespaces; done