[GitHub] rabbah closed pull request #403: Enable TravisCI testing with Kubernetes 1.12

[GitBox <gi...@apache.org>]

rabbah closed pull request #403: Enable TravisCI testing with Kubernetes 1.12
URL: https://github.com/apache/incubator-openwhisk-deploy-kube/pull/403
 
 
   

This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:

As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):

diff --git a/.travis.yml b/.travis.yml
index 976a1bb..a56efb6 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -15,6 +15,7 @@ env:
     - TRAVIS_KUBE_VERSION=1.10 OW_INCLUDE_SYSTEM_TESTS=true OW_CONTAINER_FACTORY=docker
     - TRAVIS_KUBE_VERSION=1.10 OW_INCLUDE_SYSTEM_TESTS=false OW_CONTAINER_FACTORY=kubernetes
     - TRAVIS_KUBE_VERSION=1.11 OW_INCLUDE_SYSTEM_TESTS=true OW_CONTAINER_FACTORY=docker
+    - TRAVIS_KUBE_VERSION=1.12 OW_INCLUDE_SYSTEM_TESTS=true OW_CONTAINER_FACTORY=docker
 
 services:
   - docker
diff --git a/docs/k8s-dind-cluster.md b/docs/k8s-dind-cluster.md
index 5c0318e..659b3df 100644
--- a/docs/k8s-dind-cluster.md
+++ b/docs/k8s-dind-cluster.md
@@ -39,8 +39,8 @@ There are "fixed" scripts
 [available](https://github.com/kubernetes-sigs/kubeadm-dind-cluster/tree/master/fixed)
 for each major release of Kubernetes.
 Our TravisCI testing uses kubeadm-dind-cluster.sh on an ubuntu 16.04
-host.  The `fixed` `dind-cluster` scripts for Kubernetes version 1.10
-and 1.11 are known to work for deploying OpenWhisk.
+host.  The `fixed` `dind-cluster` scripts for Kubernetes version 1.10,
+1.11, and 1.12 are known to work for deploying OpenWhisk.
 
 ### Creating the Kubernetes Cluster
 
diff --git a/docs/k8s-technical-requirements.md b/docs/k8s-technical-requirements.md
index 448e60d..f19cc06 100644
--- a/docs/k8s-technical-requirements.md
+++ b/docs/k8s-technical-requirements.md
@@ -21,11 +21,8 @@
 
 The Kubernetes cluster on which you are deploying OpenWhisk must meet
 the following requirements:
-* [Kubernetes](https://github.com/kubernetes/kubernetes) version
-  1.9+. However, version 1.9.4 will not work for OpenWhisk due to a
-  bug with volume mount subpaths
-  (see[[kubernetes-61076](https://github.com/kubernetes/kubernetes/issues/61076)]). This
-  bug will surface as a failure when deploying the nginx container.
+* [Kubernetes](https://github.com/kubernetes/kubernetes) version 1.10+.
+  Our automated testing currently covers Kubernetes versions 1.10, 1.11 and 1.12.
 * The ability to create Ingresses to make a Kubernetes service
   available outside of the cluster so you can actually use OpenWhisk.
 * Unless you disable persistence (see
diff --git a/helm/openwhisk/README.md b/helm/openwhisk/README.md
index c2810e1..8520a8e 100644
--- a/helm/openwhisk/README.md
+++ b/helm/openwhisk/README.md
@@ -57,7 +57,7 @@ The chart requires one or more Kubernetes worker nodes to be designated to be us
 
 ## Prerequisites
 
-* Kubernetes 1.10 - 1.11.*
+* Kubernetes 1.10 - 1.12.*
 
 ### Image Policy Requirements
 
diff --git a/tools/travis/deploy-chart.sh b/tools/travis/deploy-chart.sh
index 5f4e88a..d44e583 100755
--- a/tools/travis/deploy-chart.sh
+++ b/tools/travis/deploy-chart.sh
@@ -84,8 +84,8 @@ jobHealthCheck () {
   PASSED=false
   TIMEOUT=0
   until $PASSED || [ $TIMEOUT -eq $TIMEOUT_STEP_LIMIT ]; do
-    KUBE_SUCCESSFUL_JOB=$(kubectl -n openwhisk get jobs -o wide | grep "$1" | awk '{print $3}')
-    if [ "$KUBE_SUCCESSFUL_JOB" == "1" ]; then
+    KUBE_DEPLOY_STATUS=$(kubectl -n openwhisk get pods -l name="$1" -o wide | grep "$1" | awk '{print $3}')
+    if [ "$KUBE_DEPLOY_STATUS" == "Completed" ]; then
       PASSED=true
       echo "The job $1 has completed"
       break
@@ -100,7 +100,7 @@ jobHealthCheck () {
   if [ "$PASSED" == "false" ]; then
     echo "Failed to finish running $1"
     # Dump all namespaces in case the problem is with a pod in the kube-system namespace
-    kubectl get jobs --all-namespaces -o wide --show-all
+    kubectl get pods --all-namespaces -o wide
 
     kubectl -n openwhisk logs jobs/$1
     exit 1
@@ -130,7 +130,7 @@ verifyHealthyInvoker () {
 
   if [ "$PASSED" == "false" ]; then
     # Dump all namespaces in case the problem is with a pod in the kube-system namespace
-    kubectl get pods --all-namespaces -o wide --show-all
+    kubectl get pods --all-namespaces -o wide
     echo "No healthy invokers available"
 
     exit 1


 

----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
users@infra.apache.org


With regards,
Apache Git Services