From 6ee3fc82977342378c50234ceb8f565e16af7e7b Mon Sep 17 00:00:00 2001
From: Manuel de Brito Fontes <aledbf@gmail.com>
Date: Mon, 12 Oct 2015 21:25:43 -0300
Subject: [PATCH] Fix service-loadbalancer e2e tests

---
 test/e2e/testing-manifests/haproxyrc.yaml  |  2 --
 test/e2e/testing-manifests/netexecrc.yaml  | 20 ++++++++++++++++++++
 test/e2e/testing-manifests/netexecsvc.yaml | 15 +++++++++++++++
 3 files changed, 35 insertions(+), 2 deletions(-)
 create mode 100644 test/e2e/testing-manifests/netexecrc.yaml
 create mode 100644 test/e2e/testing-manifests/netexecsvc.yaml

diff --git a/test/e2e/testing-manifests/haproxyrc.yaml b/test/e2e/testing-manifests/haproxyrc.yaml
index 477ecf1cad7..528aa25a125 100644
--- a/test/e2e/testing-manifests/haproxyrc.yaml
+++ b/test/e2e/testing-manifests/haproxyrc.yaml
@@ -16,8 +16,6 @@ spec:
         app: service-loadbalancer
         version: v1
     spec:
-      nodeSelector:
-        role: loadbalancer
       containers:
       - image: gcr.io/google_containers/servicelb:0.1
         imagePullPolicy: Always
diff --git a/test/e2e/testing-manifests/netexecrc.yaml b/test/e2e/testing-manifests/netexecrc.yaml
new file mode 100644
index 00000000000..ecdcff159fc
--- /dev/null
+++ b/test/e2e/testing-manifests/netexecrc.yaml
@@ -0,0 +1,20 @@
+apiVersion: v1
+kind: ReplicationController
+metadata:
+  name: netexec
+spec:
+  # Assumes you have 3 nodes in your cluster.
+  replicas: 3
+  template:
+    metadata:
+      labels:
+        app: netexec
+    spec:
+      containers:
+      - name: netexec
+        image: gcr.io/google_containers/netexec:1.0
+        ports:
+        - containerPort: 8080
+          # This is to force these pods to land on different hosts.
+          # TODO: use the downward api and get podname instead.
+          hostPort: 81
diff --git a/test/e2e/testing-manifests/netexecsvc.yaml b/test/e2e/testing-manifests/netexecsvc.yaml
new file mode 100644
index 00000000000..1a1a3704e9b
--- /dev/null
+++ b/test/e2e/testing-manifests/netexecsvc.yaml
@@ -0,0 +1,15 @@
+apiVersion: v1
+kind: Service
+metadata:
+  name: netexec
+  labels:
+    app: netexec
+spec:
+  Type: NodePort
+  ports:
+  - port: 80
+    targetPort: 8080
+    protocol: TCP
+    name: http
+  selector:
+    app: netexec