Update documentation and examples [ci skip]

docs/examples/customization/custom-configuration/README.md

@@ -4,7 +4,7 @@ Using a [ConfigMap](https://kubernetes.io/docs/user-guide/configmap/) is possibl
 For example, if we want to change the timeouts we need to create a ConfigMap:
 
 ```
-$ cat nginx-load-balancer-conf.yaml
+$ cat configmap.yaml
 apiVersion: v1
 data:
   proxy-connect-timeout: "10"
@@ -16,9 +16,8 @@ metadata:
 ```
 
 ```
-$ kubectl create -f nginx-load-balancer-conf.yaml
+curl https://raw.githubusercontent.com/kubernetes/ingress-nginx/master/docs/customization/cutom-configuration/configmap.yaml \
+    | kubectl apply -f -
 ```
 
-Please check the example `nginx-custom-configuration.yaml`
-
 If the Configmap it is updated, NGINX will be reloaded with the new configuration.

docs/examples/customization/custom-configuration/configmap.yaml

@@ -1,10 +1,10 @@
 apiVersion: v1
 kind: ConfigMap
 metadata:
-  name: nginx-custom-configuration
+  name: nginx-configuration
+  namespace: ingress-nginx
   labels:
-    k8s-app: nginx-ingress-controller
-  namespace: kube-system
+    app: ingress-nginx
 data:
   proxy-connect-timeout: "10"
   proxy-read-timeout: "120"

docs/examples/customization/custom-configuration/nginx-custom-configuration.yaml

@@ -1,56 +0,0 @@
-apiVersion: extensions/v1beta1
-kind: Deployment
-metadata:
-  name: nginx-ingress-controller
-  labels:
-    k8s-app: nginx-ingress-controller
-  namespace: kube-system
-spec:
-  replicas: 1
-  template:
-    metadata:
-      labels:
-        k8s-app: nginx-ingress-controller
-      annotations:
-        prometheus.io/port: '10254'
-        prometheus.io/scrape: 'true'
-    spec:
-      # hostNetwork makes it possible to use ipv6 and to preserve the source IP correctly regardless of docker configuration
-      # however, it is not a hard dependency of the nginx-ingress-controller itself and it may cause issues if port 10254 already is taken on the host
-      # that said, since hostPort is broken on CNI (https://github.com/kubernetes/kubernetes/issues/31307) we have to use hostNetwork where CNI is used
-      # like with kubeadm
-      # hostNetwork: true
-      terminationGracePeriodSeconds: 60
-      containers:
-      - image: gcr.io/google_containers/nginx-ingress-controller:0.9.0-beta.15
-        name: nginx-ingress-controller
-        readinessProbe:
-          httpGet:
-            path: /healthz
-            port: 10254
-            scheme: HTTP
-        livenessProbe:
-          httpGet:
-            path: /healthz
-            port: 10254
-            scheme: HTTP
-          initialDelaySeconds: 10
-          timeoutSeconds: 1
-        ports:
-        - containerPort: 80
-          hostPort: 80
-        - containerPort: 443
-          hostPort: 443
-        env:
-          - name: POD_NAME
-            valueFrom:
-              fieldRef:
-                fieldPath: metadata.name
-          - name: POD_NAMESPACE
-            valueFrom:
-              fieldRef:
-                fieldPath: metadata.namespace
-        args:
-        - /nginx-ingress-controller
-        - --default-backend-service=$(POD_NAMESPACE)/default-http-backend
-        - --configmap=$(POD_NAMESPACE)/nginx-custom-configuration