Merge pull request #15513 from aledbf/fix-serviceloadbalancer-tests

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

test/e2e/testing-manifests/netexecrc.yaml

+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

test/e2e/testing-manifests/netexecsvc.yaml

+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