Improve documentation and examples [ci skip]

deploy/README.md

@@ -95,13 +95,13 @@ This example creates an ELB with just two listeners, one in port 80 and another
 If the ingress controller uses RBAC run:
 
 ```console
-kubectl apply -f provider/aws/patch-service-with-rbac.yaml
+kubectl apply -f provider/patch-service-with-rbac.yaml
 ```
 
 If not run:
 
 ```console
-kubectl apply -f provider/aws/patch-service-without-rbac.yaml
+kubectl apply -f provider/patch-service-without-rbac.yaml
 ```
 
 ### GCE - GKE
@@ -111,6 +111,20 @@ curl https://raw.githubusercontent.com/kubernetes/ingress-nginx/master/deploy/pr
     | kubectl apply -f -
 ```
 
+If the ingress controller uses RBAC run:
+
+```console
+kubectl apply -f provider/patch-service-with-rbac.yaml
+```
+
+If not run:
+
+```console
+kubectl apply -f provider/patch-service-without-rbac.yaml
+```
+
+**Important Note:** proxy protocol is not supported in GCE/GKE
+
 ### Azure
 
 ```console
@@ -118,6 +132,20 @@ curl https://raw.githubusercontent.com/kubernetes/ingress-nginx/master/deploy/pr
     | kubectl apply -f -
 ```
 
+If the ingress controller uses RBAC run:
+
+```console
+kubectl apply -f provider/patch-service-with-rbac.yaml
+```
+
+If not run:
+
+```console
+kubectl apply -f provider/patch-service-without-rbac.yaml
+```
+
+**Important Note:** proxy protocol is not supported in GCE/GKE
+
 ### Baremetal
 
 Using [NodePort](https://kubernetes.io/docs/concepts/services-networking/service/#type-nodeport):
@@ -127,13 +155,6 @@ curl https://raw.githubusercontent.com/kubernetes/ingress-nginx/master/deploy/pr
     | kubectl apply -f -
 ```
 
-Using HostPort:
-
-```console
-curl https://raw.githubusercontent.com/kubernetes/ingress-nginx/master/deploy/provider/baremetal/service-hostport.yaml \
-    | kubectl apply -f -
-```
-
 ## Using Helm
 
 NGINX Ingress controller can be installed via [Helm](https://helm.sh/) using the chart [stable/nginx](https://github.com/kubernetes/charts/tree/master/stable/nginx-ingress) from the official charts repository. 

deploy/provider/baremetal/service-hostport.yml

@@ -1,17 +0,0 @@
-apiVersion: v1
-kind: Service
-metadata:
-  name: ingress-nginx
-  namespace: ingress-nginx
-spec:
-  ports:
-  - name: http
-    hostPort: 80
-    targetPort: 80
-    protocol: TCP
-  - name: https
-    hostPort: 443
-    targetPort: 443
-    protocol: TCP
-  selector:
-    app: ingress-nginx

deploy/provider/baremetal/service-nodeport.yml

@@ -7,9 +7,11 @@ spec:
   type: NodePort
   ports:
   - name: http
+    port: 80
     targetPort: 80
     protocol: TCP
   - name: https
+    port: 443
     targetPort: 443
     protocol: TCP
   selector: