Report information about errors deployments

.travis.yml

@@ -1,7 +1,7 @@
 sudo: required
 
 services:
-- docker
+  - docker
 
 language: go
 
@@ -9,21 +9,21 @@ notifications:
   email: true
 
 go:
-- 1.9
+  - 1.9
 
 go_import_path: k8s.io/ingress-nginx
 
-# New secure variables can be added using travis encrypt -r kubernetes/ingress-nginx K=V
+# New secure variables can be added using travis encrypt -r kubernetes/ingress-nginx --add K=V 
 env:
   global:
   - CHANGE_MINIKUBE_NONE_USER=true
   - KUBERNETES_VERSION=v1.7.5
   - DOCKER=docker
-  - secure: hCBTA21Q3XoAaVn+3qCkEcBxb5ob0DfDtF3XtgqkV6tHN76fPvuB0eko687nkumkIJsLmSBKjS1v2V/aW+syqj37OpaNrZ8NacpLi3Xso9DOQ/eI//NC2dkY0Yb002ca3A1FWG4urbKnqe1ecPNH981XIMjLr9iIRCtJlNtlUDnCuOLYnfbieXBYGN7EoknGuPFF48V2slxTfH6GkIWlKgtGsyuoKPahwOBuqeGEZ+auXBPvaFcW/vNqMh0kepPrOG7dPyRJvcDw2zvLX6NEYTtMJSRed8ZxVqpS+beg6xTTd84TRan8EWVnBsshfJCjKPAlfBCijDJDEBnqo2ZOwmt2i092kuLfvTrJm+leX6fcH67DczYV/UGzxTyZwyKLnlvi9ppxVpLnQujF/ZRhZ+Q9JvIGUu2/fa8+maa8UWyxZjFiiY0fnOzR5haJOvuD8LJZr4ceE+FacZDmMqk2tQdAo8V68ClyOPAkWx77XJ20exUDvfdu6kMaY+NHSmWl+jrTu/yOdmP3CveCFgdi/8v9YVeIBnMLC3EhX7qBFd0Xkqpmx6dq8fRuBALp7aUAkz/SzfZrhKFHEn9y3TLjHcNQLoVeEhpQhuiMNOJNbd8hS4Wl9cThr1VHLLwCwnoQeKzGYN1DcGmXApWwO8q1xdNeLNz7jFQq91WBdF/bncE=
-  - secure: hOdrI43DGag32BJ43nO+voUrqcNQ0HcLyGqYGPRHSmS+PRe2gEs//tBwJb35+Hub5QYbRBf/i9dEXltw7vuCfc2w2F42spYyp5cqXOGgWLgiEkNb5Ov/O07N1UhyCKA5FYIH4rci8CHr0mex2Z3xhP5M6w7uWfAE55Ia8DLpSBEEKao2UjQMEImCWyjyP8zlxFKCP68Ni1aqyORGExcubjhrUrilQv4nHyqGevmKmPh8BJ8bU9OxCk0FQ95b+31udDgK8Acr2BDihqp7VgSvaCQKR9pwHQQk09Bl7UqFx7/IANaUYzxAWlp6LNYowjfz7QzzKx4XYKKWX/AbrLz5j7wQkAxK2ol/pEFtcydJNrGLr4zmfHmU6m3971IUx1HyfoZ/Ezw88l/UmD4rVZ7r5j9WS7yVgYZOLiNAp8SiRzAS+RVIrDc7p6Cr4llVCw3iR3h7huQl7yp3QpOMFgvFDKVJukpVm8VbUZONA9gdo8Sq4RUnunIeGem8H71KU4b3bIhmVGqr1/TEQMKmnozsFWVgsXvykFz4gF1HfPQ3T5TdC5z6hYBkeHVcjLUCwejrYbr9RR7PvNPP+e+2rqkRYBg1eboyn6Gdz4kgFBxeJhJiiYLH/Mmr+8qIvrxI+6jJJrsAkddK3Ei+l6cc6xdyDSp5Wt6Q+i4llZojDVb0yFI=
+  - secure: LIS2XpZufWTcJ53jiRsSZy2Gi1EUJ1XmLg7z3f2ZHeMnyG2Jhk3GW4vod1FNru+PY4PWgddLdCdIl+jqOYXndFlbdAWF3/Oy5fEkYLXdYV7tdlHcPWDkqNFrfiyZ4guChN+b2Nk6FqU7o5fsZAIR7VAbgqNRF5XMo9Mhn/vhDCQRcnbXy7uq7JTrYUkqDbQoyYvT6b480GCY5gags1zp/xZfPDNZEe936o8i5IPTyiykRyNOXN/AH6kd3pR5e1xYgcvJ9KpSVPghcwFE7kJ4fOVMRhRG5ML+IyML+xD0jX43EMNoqRKZ/HS42kIMCInFbJEcxVde7DPNBZ7Y3GAqh7HO6qrE70Dn3ha6DID6zCoH2ArW39BxG4zempjn2VxYoMRGREyZszWQb++dwGoHmo5FHt6zvIrYBG0dA0H8ja9VkZkjFwtYTGHU1ooPzUfJK4O4VBayV8LqZibyZQR+GrmyQc0aagUY7J/fe4A2PJyI4DbkeZ7GX1ELj0ciDz4urQSzUc8l/T3aU3X+FuJItjgYtMLPmqcjA5uifDCtutE8Z9L2gSpanqUdvLSOozuxPho/KNl+2YlF7fXqPW3LnRf5mHD+NbOff306pvKlHJOb2Vmth+HBQ1XDzt/Cy5+sfwS3E0Vmh6UTq/NtkUXxwH10BDMF7FMVlQ4zdHQvyZ0= 
+  - secure: rKDoy9IYYYy0fYBs4+9mwuBVq/TcxfFwMfE0ywYWhUUdgzrUYSJAwpoe/96EQ4YmESUefwC2nDNq4G3XzJKYOWf83PaIveb9Z//zmMrCQXjDuDBDLpwV3sXSh7evXiVDohJz4ogBCeMRUCMKYsyKBM9yWfa/iu+yI92dbphpK9peOKW6yBc0uspJlln4swN3GS2WT9LVuPY2Azv9U2UqrXufOPDKG/qEb/Vrn4yZ2lR/50r2k45e9nSvDoByvr10V8ubM5Zc0iP0vBuAUVRdByv6N53Q4gaBGapY6SxhIjIPC/h0rNnuT9EXp7MWaPT5FmBxLt9wnyleT9QhZJnFyaBYqFgcz/DKifYQkryY4M5dLMo/Rt3yATyAy8Y0df1TOoV2dKdqwOOwQ8bXB1wDfyrGxmQj9HY4Ffnphx3wPE1a+Sjuh+S5Epm7XJbPx5pZJqNO2hd4sTbk0Xp3gpPbihny2r/jtNwHl0wpFCfOM68RNrsVRlIwG3UhzbZvblbQ/M/mmWCdgzINjt07I2SGCJxfKG0e98Q49SKUoDoOgQTTRDqTC9IgOEDxyfAkT0Vr6BtlP88Nsgnf6kmboyigBrRAiaDQGTxn3SP6LnQI3CeopaRDYvFZe/rTwPXE9XlKoTn9FTWnAqF3MuWaLslDcDKYEh7OaYJjF01piu6g4Nc= 
 
 after_success:
-- ".travis/publish.sh"
+  - .travis/publish.sh
 
 jobs:
   include:

.travis/ingress-controller.sh

@@ -20,10 +20,10 @@ source $DIR/common.sh
 
 IMAGE=$(make -s -C $DIR/../ image-info)
 
-if docker_tag_exists "aledbf/nginx-ingress-controller" $(echo $IMAGE | jq .tag); then
+if docker_tag_exists "kubernetes-ingress-controller/nginx-ingress-controller" $(echo $IMAGE | jq .tag); then
     echo "Image already published"
     exit 0
 fi
 
-echo "building aledbf/nginx-ingress-controller image..."
+echo "building kubernetes-ingress-controller/nginx-ingress-controller image..."
 make -C $DIR/../ release

.travis/nginx-slim.sh

@@ -20,7 +20,7 @@ source $DIR/common.sh
 
 IMAGE=$(make -s -C $DIR/../images/nginx-slim image-info)
 
-if docker_tag_exists "aledbf/nginx-slim" $(echo $IMAGE | jq .tag); then
+if docker_tag_exists "kubernetes-ingress-controller/nginx-slim" $(echo $IMAGE | jq .tag); then
     echo "Image already published"
     exit 0
 fi

.travis/ubuntu-slim.sh

@@ -20,7 +20,7 @@ source $DIR/common.sh
 
 IMAGE=$(make -s -C $DIR/../images/ubuntu-slim image-info)
 
-if docker_tag_exists "aledbf/ubuntu-slim" $(echo $IMAGE | jq .tag); then
+if docker_tag_exists "kubernetes-ingress-controller/ubuntu-slim" $(echo $IMAGE | jq .tag); then
     echo "Image already published"
     exit 0
 fi

Makefile

@@ -18,7 +18,7 @@ BUILDTAGS=
 
 # Use the 0.0 tag for testing, it shouldn't clobber any release builds
 TAG?=0.9.0-beta.15
-REGISTRY?=quay.io/aledbf
+REGISTRY?=quay.io/kubernetes-ingress-controller
 GOOS?=linux
 DOCKER?=gcloud docker --
 SED_I?=sed -i
@@ -49,7 +49,7 @@ IMAGE = $(REGISTRY)/$(IMGNAME)
 MULTI_ARCH_IMG = $(IMAGE)-$(ARCH)
 
 # Set default base image dynamically for each arch
-BASEIMAGE?=quay.io/aledbf/nginx-slim-$(ARCH):0.27
+BASEIMAGE?=quay.io/kubernetes-ingress-controller/nginx-slim-$(ARCH):0.27
 
 ifeq ($(ARCH),arm)
 	QEMUARCH=arm

images/custom-error-pages/Makefile

@@ -4,7 +4,7 @@ BUILDTAGS=
 
 # Use the 0.0 tag for testing, it shouldn't clobber any release builds
 TAG?=0.1
-REGISTRY?=aledbf
+REGISTRY?=quay.io/kubernetes-ingress-controller
 GOOS?=linux
 DOCKER?=gcloud docker --
 SED_I?=sed -i
@@ -47,9 +47,6 @@ ifeq ($(ARCH),ppc64le)
 	QEMUARCH=ppc64le
 	GOARCH=ppc64le
 endif
-#ifeq ($(ARCH),s390x)
-#        QEMUARCH=s390x
-#endif
 
 TEMP_DIR := $(shell mktemp -d)
 

images/nginx-slim/Makefile

@@ -14,7 +14,7 @@
 
 # 0.0.0 shouldn't clobber any released builds
 TAG ?= 0.27
-REGISTRY ?= quay.io/aledbf
+REGISTRY ?= quay.io/kubernetes-ingress-controller
 ARCH ?= $(shell go env GOARCH)
 DOCKER ?= gcloud docker --
 
@@ -33,7 +33,7 @@ IMAGE = $(REGISTRY)/$(IMGNAME)
 MULTI_ARCH_IMG = $(IMAGE)-$(ARCH)
 
 # Set default base image dynamically for each arch
-BASEIMAGE?=quay.io/aledbf/ubuntu-slim-$(ARCH):0.14
+BASEIMAGE?=quay.io/kubernetes-ingress-controller/ubuntu-slim-$(ARCH):0.14
 
 ifeq ($(ARCH),arm)
         QEMUARCH=arm

images/ubuntu-slim/Makefile

@@ -13,7 +13,7 @@
 # limitations under the License.
 
 TAG ?= 0.14
-REGISTRY = quay.io/aledbf
+REGISTRY = quay.io/kubernetes-ingress-controller
 ARCH ?= $(shell go env GOARCH)
 ALL_ARCH = amd64 arm arm64 ppc64le
 

test/e2e/up.sh

@@ -14,7 +14,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-JSONPATH='{range .items[*]}{@.metadata.name}:{range @.status.conditions[*]}{@.type}={@.status};{end}{end}'
+export JSONPATH='{range .items[*]}{@.metadata.name}:{range @.status.conditions[*]}{@.type}={@.status};{end}{end}'
 
 echo "downloading kubectl..."
 curl -Lo kubectl https://storage.googleapis.com/kubernetes-release/release/$KUBERNETES_VERSION/bin/linux/amd64/kubectl && \
@@ -50,12 +50,31 @@ kubectl set image \
     deployments \
     --namespace ingress-nginx \
 	--selector app=ingress-nginx \
-    nginx-ingress-controller=gcr.io/google_containers/nginx-ingress-controller:test
+    nginx-ingress-controller=quay.io/kubernetes-ingress-controller/nginx-ingress-controller:test
 
 sleep 5
 
 echo "waiting NGINX ingress pod..."
-until kubectl get pods -n ingress-nginx -l app=ingress-nginx -o jsonpath="$JSONPATH" 2>&1 | grep -q "Ready=True"; 
-do
-    sleep 1;
-done
+
+function waitForPod() {
+    until kubectl get pods -n ingress-nginx -l app=ingress-nginx -o jsonpath="$JSONPATH" 2>&1 | grep -q "Ready=True";
+    do
+        sleep 1;
+    done
+}
+
+export -f waitForPod
+
+timeout 10s bash -c waitForPod
+
+if kubectl get pods -n ingress-nginx -l app=ingress-nginx -o jsonpath="$JSONPATH" 2>&1 | grep -q "Ready=True";
+then
+    echo "Kubernetes deployments started"
+else
+    echo "Kubernetes deployments with issues:"
+    kubectl get pods -n ingress-nginx
+
+    echo "Reason:"
+    kubectl describe pods -n ingress-nginx
+    exit 1
+fi