version bump for kind, helm, and kubectl (#601)
diff --git a/.travis.yml b/.travis.yml
index 123e5d7..aaecce6 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -23,10 +23,10 @@
- secure: d7CuMXbhT83W2x78qiLwgogX1+3aPicd1PlTwwNNDN6QSkImbxareyKThnsqlHIiNj3o5l5DBuiYjy7wrF/xD1g8BQMmTwm99DRx5q3CI3Im3VCi/ZK8SaNjuOy24d7cf5k2tB/87Gk7zmKsMDYm+fpCl+GpgUmIEeIwthiAxuXSDWZ8eQPIptmxj56DeFRNouvXG+dEUtBfWiwN27UPxNKExCixFnegmdtffLbz6hhst7BHr5Ry9acbycre98PCwWZcu9lxFs+SJ1kvnzX2iue4otmDkF1WkJjxaOFPJVs/D3YItg+neLCSxjwBskPed+Fct8bOjcM/uVROJPNIq5icBmaPX2isH0lvtxOeVw/dmioWYXYPN9ygBOe4eO/vtPllN0bcAUo5xl9jXev8ciAozYrYpHVh9Fplfd81rcYTeYzALmRJBdoiWoc3KQGzwGc9sB1ffmy+KWgG9T0zbnS4fALSR4PSzyNlKSLXw9vuvdNP0OBYtO+6yTJXavIxqmDoj64Lb93n+uGPatnaIGPTKEEBMJTSjsgYVEfxzzZuxUT9Ldkf2lzqvN2PCllGoMqxkgsdb8i4v4QgRaMWBDbKa5Va4k0O4dnhRmtdbJavOSKN6fECJbyfoJlV1VvJGxk5znVLRznBmUPBKbNccyPZJULugKD3QIh4q8Q5jBU=
- secure: CJtnU94HTDqd4A6uvhFl8IpnmU+wTdlzb8bPBFUl/lI/VKXiRrYpgJdKUro5xEoxFKuqMprLhbyf66niyWLTIeogjUAEu/h/o2dBVeGgSGKoqC0hQgqvnxKFeGlzFJ0XuEs3vbStJGRnQszGsfnnDrscJtR0x9X+1w4aBKI7iPyyuFtVkDD1UsmBbSi+M8FTeq7G7A0reMDaey7uog3CFCpIMl4geshcohQEcKEGbnXQZoLPFpb7cBOE83VXBJ7Y7Dgf/U4keiLovvnuJThGKZm/SVV2KlELmBmtmbx3rMT6Vb5k9ChSdRWapromNnnzmJBIQ5Scc2mwV3A93/SMha1F3IlYpDKs5djfTw8jZfVnuiou7HhTaRjHkmmcwP12/k30gLe2kw0Vezg1TCY4zgtOpcmCxc8RHEy0ceA74rKvRi8LbexTCwX+iAMQFn/pSrh/OqAq/50JbLyczcoO1zXWS38txUQNLW8i+XllhCg9pjkjyfBeGjOOcWiVIz9rWJd2XufjSXDcj6xoZHtkh1XDt1CnVkpsYKtyyZucQnhUM9ebmaWqbSW2+bpqC/2hI+G+kOyyCesGdB1q+VmN1augMMs6RgWjk4yw5dyLAshATSoUlE8KH2cDcJL19r4ECaQ99PSLwxoB89yfPoJiNc42vwxRdsLmB1BMNyPa81Y=
matrix:
- - TRAVIS_KUBE_VERSION=v1.14.10 OW_INCLUDE_SYSTEM_TESTS=true OW_CONTAINER_FACTORY=kubernetes
- - TRAVIS_KUBE_VERSION=v1.14.10 OW_INCLUDE_SYSTEM_TESTS=false OW_CONTAINER_FACTORY=kubernetes OW_LEAN_MODE=true
- - TRAVIS_KUBE_VERSION=v1.15.7 OW_INCLUDE_SYSTEM_TESTS=false OW_CONTAINER_FACTORY=kubernetes
- - TRAVIS_KUBE_VERSION=v1.16.4 OW_INCLUDE_SYSTEM_TESTS=false OW_CONTAINER_FACTORY=kubernetes
+ - TRAVIS_KUBE_VERSION=v1.14 OW_INCLUDE_SYSTEM_TESTS=true OW_CONTAINER_FACTORY=kubernetes
+ - TRAVIS_KUBE_VERSION=v1.14 OW_INCLUDE_SYSTEM_TESTS=false OW_CONTAINER_FACTORY=kubernetes OW_LEAN_MODE=true
+ - TRAVIS_KUBE_VERSION=v1.15 OW_INCLUDE_SYSTEM_TESTS=false OW_CONTAINER_FACTORY=kubernetes
+ - TRAVIS_KUBE_VERSION=v1.16 OW_INCLUDE_SYSTEM_TESTS=false OW_CONTAINER_FACTORY=kubernetes
services:
- docker
diff --git a/README.md b/README.md
index 62a55b6..259c767 100644
--- a/README.md
+++ b/README.md
@@ -138,7 +138,7 @@
deployment and management of applications on Kubernetes clusters.
The OpenWhisk Helm chart requires the Helm 3.
-Our automated testing currently uses Helm v3.0.1.
+Our automated testing currently uses Helm v3.2.0
Follow the Helm [install instructions](https://github.com/kubernetes/helm)
for your platform to install Helm v3.0.1 or newer.
diff --git a/docs/k8s-kind.md b/docs/k8s-kind.md
index fd5a0a0..bdb4c63 100644
--- a/docs/k8s-kind.md
+++ b/docs/k8s-kind.md
@@ -36,7 +36,7 @@
Download the latest stable release of `kind` for your platform from
https://github.com/kubernetes-sigs/kind/releases. Our TravisCI testing
-currently uses kind v0.7.0 on an ubuntu 18.04 host.
+currently uses kind v0.8.1 on an ubuntu 18.04 host.
### Creating the Kubernetes Cluster
diff --git a/tools/travis/collect-logs.sh b/tools/travis/collect-logs.sh
index 9b6f6fe..bdea73b 100755
--- a/tools/travis/collect-logs.sh
+++ b/tools/travis/collect-logs.sh
@@ -23,9 +23,6 @@
cd $ROOTDIR
-# kind puts config file in non-standard place; must set KUBECONFIG
-export KUBECONFIG="$(kind get kubeconfig-path)"
-
echo "Gathering logs to upload to https://app.box.com/v/openwhisk-travis-logs"
mkdir logs
diff --git a/tools/travis/setup.sh b/tools/travis/setup.sh
index afa9c5b..d97aa8d 100755
--- a/tools/travis/setup.sh
+++ b/tools/travis/setup.sh
@@ -18,9 +18,10 @@
set -x
-HELM_VERSION=v3.0.3
-KIND_VERSION=v0.7.0
-KUBECTL_VERSION=v1.16.7
+HELM_VERSION=v3.2.0
+# When changing KIND_VERSION, you must also update the case statement of KIND_NODE_TAG in start-kind.sh
+KIND_VERSION=v0.8.1
+KUBECTL_VERSION=v1.16.9
WSK_CLI_VERSION=latest
# Download and install command line tools
diff --git a/tools/travis/start-kind.sh b/tools/travis/start-kind.sh
index 8dd8884..5dae1af 100755
--- a/tools/travis/start-kind.sh
+++ b/tools/travis/start-kind.sh
@@ -28,8 +28,18 @@
- role: worker
EOF
+# Map from Kubernetes major versions to the kind node image tag
+case $TRAVIS_KUBE_VERSION in
+ v1.14) KIND_NODE_TAG=v1.14.10@sha256:6cd43ff41ae9f02bb46c8f455d5323819aec858b99534a290517ebc181b443c6 ;;
+ v1.15) KIND_NODE_TAG=v1.15.11@sha256:6cc31f3533deb138792db2c7d1ffc36f7456a06f1db5556ad3b6927641016f50 ;;
+ v1.16) KIND_NODE_TAG=v1.16.9@sha256:7175872357bc85847ec4b1aba46ed1d12fa054c83ac7a8a11f5c268957fd5765 ;;
+ v1.17) KIND_NODE_TAG=v1.17.5@sha256:ab3f9e6ec5ad8840eeb1f76c89bb7948c77bbf76bcebe1a8b59790b8ae9a283a ;;
+ v1.18) KIND_NODE_TAG=v1.18.2@sha256:7b27a6d0f2517ff88ba444025beae41491b016bc6af573ba467b70c5e8e0d85f ;;
+ *) echo "Unsupported Kubernetes version $TRAVIS_KUBE_VERSION"; exit 1 ;;
+esac
+
# Boot cluster
-kind create cluster --config mycluster.yaml --name kind --image kindest/node:${TRAVIS_KUBE_VERSION} --wait 10m || exit 1
+kind create cluster --config mycluster.yaml --name kind --image kindest/node:${KIND_NODE_TAG} --wait 10m || exit 1
echo "Kubernetes cluster is deployed and reachable"
kubectl describe nodes
