This is an automated email from the ASF dual-hosted git repository.
csantanapr pushed a commit to branch master
in repository
https://gitbox.apache.org/repos/asf/incubator-openwhisk-deploy-kube.git
The following commit(s) were added to refs/heads/master by this push:
new 7abe30c Get dind-cluster.sh from kubeadm-dind 0.1 release (#442)
7abe30c is described below
commit 7abe30c201d512220262540178f416f205fe8a57
Author: David Grove <[email protected]>
AuthorDate: Mon Mar 11 20:19:27 2019 -0400
Get dind-cluster.sh from kubeadm-dind 0.1 release (#442)
* Get dind-cluster.sh from kubeadm-dind 0.1 release
* patch around bug in dind-cluster-v1.12.sh
---
tools/travis/dind-cluster-v12.patch | 11 +++++++++++
tools/travis/start-kubeadm-dind.sh | 6 +++++-
2 files changed, 16 insertions(+), 1 deletion(-)
diff --git a/tools/travis/dind-cluster-v12.patch
b/tools/travis/dind-cluster-v12.patch
new file mode 100644
index 0000000..dfb51ff
--- /dev/null
+++ b/tools/travis/dind-cluster-v12.patch
@@ -0,0 +1,11 @@
+--- dind-cluster.sh 2019-03-11 17:37:22.000000000 -0400
++++ dind-cluster.sh 2019-03-11 17:38:23.000000000 -0400
+@@ -1099,7 +1099,7 @@
+ --server="http://${host}:$(dind::apiserver-port)" \
+ --insecure-skip-tls-verify=true
+ "${kubectl}" config set-context "$context_name" --cluster="$cluster_name"
+- if [[ ${DIND_LABEL} = ${DEFAULT_DIND_LABEL} ]]; then
++ if [[ "${DIND_LABEL}" = "${DEFAULT_DIND_LABEL}" ]]; then
+ # Single cluster mode
+ "${kubectl}" config use-context "$context_name"
+ fi
diff --git a/tools/travis/start-kubeadm-dind.sh
b/tools/travis/start-kubeadm-dind.sh
index 0f18dfd..bdcd889 100755
--- a/tools/travis/start-kubeadm-dind.sh
+++ b/tools/travis/start-kubeadm-dind.sh
@@ -5,7 +5,11 @@
set -x
# Install kubernetes-dind-cluster and boot it
-wget
https://cdn.rawgit.com/kubernetes-sigs/kubeadm-dind-cluster/master/fixed/dind-cluster-v$TRAVIS_KUBE_VERSION.sh
-O $HOME/dind-cluster.sh && chmod +x $HOME/dind-cluster.sh && USE_HAIRPIN=true
$HOME/dind-cluster.sh up
+wget
https://github.com/kubernetes-sigs/kubeadm-dind-cluster/releases/download/v0.1.0/dind-cluster-v$TRAVIS_KUBE_VERSION.sh
-O $HOME/dind-cluster.sh && chmod +x $HOME/dind-cluster.sh
+if [[ "$TRAVIS_KUBE_VERSION" == "1.12" ]]; then
+ patch $HOME/dind-cluster.sh ./tools/travis/dind-cluster-v12.patch
+fi
+USE_HAIRPIN=true $HOME/dind-cluster.sh up
# Install kubectl in /usr/local/bin so subsequent scripts can find it
sudo cp $HOME/.kubeadm-dind-cluster/kubectl-v$TRAVIS_KUBE_VERSION*
/usr/local/bin/kubectl
