From a4f3467f9ba050869d60eba119c44f3f18106b94 Mon Sep 17 00:00:00 2001
From: Manuel Alejandro de Brito Fontes <aledbf@gmail.com>
Date: Sat, 25 Jan 2020 20:17:26 -0300
Subject: [PATCH] Cleanup dev-env script (#4932)

---
 build/dev-env.sh                   | 3 +--
 build/run-in-docker.sh             | 4 ++++
 deploy/minikube/kustomization.yaml | 1 -
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/build/dev-env.sh b/build/dev-env.sh
index d2e2b4112..e535af5c4 100755
--- a/build/dev-env.sh
+++ b/build/dev-env.sh
@@ -36,8 +36,7 @@ DEV_IMAGE=${REGISTRY}/nginx-ingress-controller:${TAG}
 { [ "$(minikube status | grep -c Running)" -ge 2 ] && minikube status | grep -qE ': Configured$|Correctly Configured'; } \
   || minikube start \
     --extra-config=kubelet.sync-frequency=1s \
-    --extra-config=apiserver.authorization-mode=RBAC \
-    --kubernetes-version=v1.15.0
+    --extra-config=apiserver.authorization-mode=RBAC
 
 # shellcheck disable=SC2046
 eval $(minikube docker-env --shell bash)
diff --git a/build/run-in-docker.sh b/build/run-in-docker.sh
index 4088151bc..74ebebb09 100755
--- a/build/run-in-docker.sh
+++ b/build/run-in-docker.sh
@@ -25,6 +25,10 @@ set -o pipefail
 # temporal directory for the /etc/ingress-controller directory
 INGRESS_VOLUME=$(mktemp -d)
 
+if [[ "$OSTYPE" == darwin* ]]; then
+  INGRESS_VOLUME=/private$INGRESS_VOLUME
+fi
+
 function cleanup {
   rm -rf "${INGRESS_VOLUME}"
 }
diff --git a/deploy/minikube/kustomization.yaml b/deploy/minikube/kustomization.yaml
index 34ea278ad..5f857e6e1 100644
--- a/deploy/minikube/kustomization.yaml
+++ b/deploy/minikube/kustomization.yaml
@@ -6,5 +6,4 @@ bases:
 - ../cluster-wide
 images:
 - name: quay.io/kubernetes-ingress-controller/nginx-ingress-controller
-  newName: ingress-controller/nginx-ingress-controller
   newTag: dev