From b07ee101738fbb4066c03c8e8c6ac993f4fd55dd Mon Sep 17 00:00:00 2001
From: Peter Jausovec <peterj@microsoft.com>
Date: Thu, 5 Jan 2017 14:02:23 -0800
Subject: [PATCH] =?UTF-8?q?Fix=20the=20son=20files,=20so=20when=20hitting?=
 =?UTF-8?q?=20the=20expose=20IP,=20you=20get=20the=20default=20backend=20(?=
 =?UTF-8?q?if=20no=20ingress=20rules=20are=20defined/endpoint=20doesn?=
 =?UTF-8?q?=E2=80=99t=20exist)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../kubernetes/ingress/default-backend-svc.json          | 9 ++++++---
 .../kubernetes/ingress/nginx-ingress-lb-svc.json         | 5 ++++-
 .../kubernetes/ingress/nginx-ingress-lb.json             | 5 -----
 3 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/src/tasks/dockerDeploy/kubernetes/ingress/default-backend-svc.json b/src/tasks/dockerDeploy/kubernetes/ingress/default-backend-svc.json
index e630e5c..c80d35b 100644
--- a/src/tasks/dockerDeploy/kubernetes/ingress/default-backend-svc.json
+++ b/src/tasks/dockerDeploy/kubernetes/ingress/default-backend-svc.json
@@ -3,9 +3,9 @@
     "spec": {
         "ports": [
             {
-                "targetPort": 80,
+                "targetPort": 8080,
                 "protocol": "TCP",
-                "port": 8080,
+                "port": 80,
                 "name": "default-http-backend"
             }
         ],
@@ -15,6 +15,9 @@
     },
     "apiVersion": "v1",
     "metadata": {
-        "name": "default-http-backend"
+        "name": "default-http-backend",
+        "labels": {
+            "app": "default-http-backend"
+        }
     }
 }
\ No newline at end of file
diff --git a/src/tasks/dockerDeploy/kubernetes/ingress/nginx-ingress-lb-svc.json b/src/tasks/dockerDeploy/kubernetes/ingress/nginx-ingress-lb-svc.json
index 29a92cc..c6f4b57 100644
--- a/src/tasks/dockerDeploy/kubernetes/ingress/nginx-ingress-lb-svc.json
+++ b/src/tasks/dockerDeploy/kubernetes/ingress/nginx-ingress-lb-svc.json
@@ -22,6 +22,9 @@
     },
     "apiVersion": "v1",
     "metadata": {
-        "name": "nginx-ingress-lb"
+        "name": "nginx-ingress-lb",
+        "labels": {
+            "k8s-app": "nginx-ingress-lb"
+        }
     }
 }
\ No newline at end of file
diff --git a/src/tasks/dockerDeploy/kubernetes/ingress/nginx-ingress-lb.json b/src/tasks/dockerDeploy/kubernetes/ingress/nginx-ingress-lb.json
index 7556fde..371a0df 100644
--- a/src/tasks/dockerDeploy/kubernetes/ingress/nginx-ingress-lb.json
+++ b/src/tasks/dockerDeploy/kubernetes/ingress/nginx-ingress-lb.json
@@ -9,11 +9,6 @@
   },
   "spec": {
     "replicas": 1,
-    "selector": {
-      "matchLabels": {
-        "k8s-app": "nginx-ingress-lb"
-      }
-    },
     "template": {
       "metadata": {
         "labels": {