From d4f2b5d06090460f319d1ed4b86795f9fbfad390 Mon Sep 17 00:00:00 2001
From: Manuel de Brito Fontes <aledbf@gmail.com>
Date: Tue, 15 May 2018 11:57:39 -0400
Subject: [PATCH] Fix and simplify local dev workflow and execution of e2e
 tests

---
 .travis.yml                                      | 2 +-
 Makefile                                         | 5 -----
 hack/build-dev-env.sh                            | 9 ++++-----
 test/manifests/ingress-controller/with-rbac.yaml | 2 +-
 4 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 0cd2c7b09..101b755f2 100644
--- a/.travis.yml
+++ b/.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
diff --git a/Makefile b/Makefile
index c5b6b3c5e..2a28174ed 100644
--- a/Makefile
+++ b/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
diff --git a/hack/build-dev-env.sh b/hack/build-dev-env.sh
index f90e35645..39994443e 100755
--- a/hack/build-dev-env.sh
+++ b/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}
diff --git a/test/manifests/ingress-controller/with-rbac.yaml b/test/manifests/ingress-controller/with-rbac.yaml
index c8d49b229..cb77f94a2 100644
--- a/test/manifests/ingress-controller/with-rbac.yaml
+++ b/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