Merge pull request #2514 from aledbf/simplify-workflow

Fix and simplify local dev workflow and execution of e2e tests

.travis.yml

@@ -63,8 +63,8 @@ jobs:
     before_script:
     - go get github.com/jteeuwen/go-bindata/...
     - go get github.com/onsi/ginkgo/ginkgo
-    - make e2e-image
     - test/e2e/up.sh
+    - make dev-env
     script:
     - make e2e-test
   # split builds to avoid job timeouts

Makefile

@@ -158,11 +158,6 @@ test:
 lua-test:
 	@busted $(BUSTED_ARGS) ./rootfs/etc/nginx/lua/test;
 
-.PHONY: e2e-image
-e2e-image: sub-container-amd64
-	$(DOCKER) tag $(MULTI_ARCH_IMG):$(TAG) $(IMGNAME):e2e
-	docker images
-
 .PHONY: e2e-test
 e2e-test:
 	@ginkgo version || go get -u github.com/onsi/ginkgo/ginkgo

hack/build-dev-env.sh

@@ -20,12 +20,11 @@ echo "NAMESPACE is set to ${NAMESPACE}"
 test $(minikube status | grep Running | wc -l) -eq 2 && $(minikube status | grep -q 'Correctly Configured') || minikube start
 eval $(minikube docker-env)
 
-echo "[dev-env] installing dependencies"
-dep version || go get -u github.com/golang/dep
-dep ensure
+export TAG=dev
+export REGISTRY=ingress-controller
 
 echo "[dev-env] building container"
-ARCH=amd64 TAG=dev REGISTRY=$USER/ingress-controller make build container
+ARCH=amd64 make build container
 
 echo "[dev-env] installing kubectl"
 kubectl version || brew install kubectl
@@ -44,4 +43,4 @@ kubectl set image \
     deployments \
     --namespace ingress-nginx \
     --selector app=ingress-nginx \
-    nginx-ingress-controller=index.docker.io/$USER/ingress-controller/nginx-ingress-controller:dev
+    nginx-ingress-controller=${REGISTRY}/nginx-ingress-controller:${TAG}

test/manifests/ingress-controller/with-rbac.yaml

@@ -16,7 +16,7 @@ spec:
       #serviceAccountName: nginx-ingress-serviceaccount
       containers:
         - name: nginx-ingress-controller
-          image: nginx-ingress-controller:e2e
+          image: ingress-controller/nginx-ingress-controller:dev
           args:
             - /nginx-ingress-controller
             - --default-backend-service=$(POD_NAMESPACE)/default-http-backend