Merge pull request #1 from anguslees/pr-22

nginx-ingress-controller now runs in kubeapps namespace

.travis.yml

@@ -49,8 +49,8 @@ script:
     kubecfg validate -v kubeapps.jsonnet || :
   - ./kubeapps.sh up
   # We can't port-forward in Travis, so instead we patch the service type to node port
-  - kubectl patch -n kube-system svc nginx-ingress -p '{"spec":{"type":"NodePort"}}' && sleep 5
-  - ./tests.sh $(minikube service --namespace kube-system nginx-ingress --url)
+  - kubectl patch -n kubeapps svc nginx-ingress -p '{"spec":{"type":"NodePort"}}' && sleep 5
+  - ./tests.sh $(minikube service --namespace kubeapps nginx-ingress --url)
 
 after_success:
   - kubectl get all --all-namespaces

kubeapps.sh

@@ -32,7 +32,7 @@ case "$subcommand" in
         kubectl rollout status -n kubeapps deployment/kubeapps-dashboard-ui
         # FIXME: We don't wait for the API to rollout as it times out
         # kubectl rollout status -n kubeapps deployment/kubeapps-dashboard-api
-        kubectl rollout status -n kube-system deployment/nginx-ingress-controller
+        kubectl rollout status -n kubeapps deployment/nginx-ingress-controller
         ;;
     down)
         # This assumes kubeapps.jsonnet is in sync with what's
@@ -46,9 +46,9 @@ case "$subcommand" in
         exec kubecfg show kubeapps.jsonnet "$@"
         ;;
     dashboard)
-        podname=$(kubectl get pods --namespace kube-system -l name=nginx-ingress-controller -o jsonpath="{.items[0].metadata.name}")
+        podname=$(kubectl get pods --namespace kubeapps -l name=nginx-ingress-controller -o jsonpath="{.items[0].metadata.name}")
         echo "Visit http://localhost:8002 in your browser"
-        exec kubectl port-forward --namespace kube-system "$podname" 8002:80
+        exec kubectl port-forward --namespace kubeapps "$podname" 8002:80
         ;;
     *)
         echo "Unknown subcommand: $subcommand" >&2