From 82ff7c421db737baf17dfaf1a3ac092508e7efd6 Mon Sep 17 00:00:00 2001
From: Vados <t3hmrman@gmail.com>
Date: Tue, 13 Mar 2018 20:51:36 +0900
Subject: [PATCH 1/2] Update NGINX Ingress controller configuration

---
 .../kubernetes-nginx-ingress-controller.yaml  | 55 +++++++++++--------
 1 file changed, 32 insertions(+), 23 deletions(-)

diff --git a/docs/kubernetes/kubernetes-nginx-ingress-controller.yaml b/docs/kubernetes/kubernetes-nginx-ingress-controller.yaml
index 3a24cd20..bca2fdc1 100644
--- a/docs/kubernetes/kubernetes-nginx-ingress-controller.yaml
+++ b/docs/kubernetes/kubernetes-nginx-ingress-controller.yaml
@@ -1,26 +1,40 @@
 ---
-apiVersion: v1
 kind: ConfigMap
+apiVersion: v1
 metadata:
-  name: nginx-ingress-conf
-  namespace: kube-system
+  name: nginx-configuration
+  namespace: ingress-nginx
   labels:
-    k8s-app: nginx-ingress-controller
+    app: ingress-nginx
+
+---
+kind: ConfigMap
+apiVersion: v1
+metadata:
+  name: udp-services
+  namespace: ingress-nginx
+
+---
+kind: ConfigMap
+apiVersion: v1
+metadata:
+  name: tcp-services
+  namespace: ingress-nginx
 data:
-  25: "default/smtp:25"
-  465: "default/smtp:465"
-  587: "default/smtp:587"
-  143: "default/imap:143"
-  993: "default/imap:993"
+  25: "mailu/smtp:25"
+  465: "mailu/smtp:465"
+  587: "mailu/smtp:587"
+  143: "mailu/imap:143"
+  993: "mailu/imap:993"
 
 ---
 apiVersion: extensions/v1beta1
 kind: Deployment
 metadata:
   name: nginx-ingress-controller
+  namespace: kube-system
   labels:
     k8s-app: nginx-ingress-controller
-  namespace: kube-system
 spec:
   replicas: 1
   template:
@@ -38,8 +52,15 @@ spec:
       # hostNetwork: true
       terminationGracePeriodSeconds: 60
       containers:
-      - image: gcr.io/google_containers/nginx-ingress-controller:0.9.0-beta.11
+      - image: gcr.io/google_containers/nginx-ingress-controller:0.11.0
         name: nginx-ingress-controller
+        args:
+          - /nginx-ingress-controller
+          - --default-backend-service=$(POD_NAMESPACE)/default-http-backend
+          - --configmap=$(POD_NAMESPACE)/nginx-configuration
+          - --tcp-services-configmap=$(POD_NAMESPACE)/tcp-services
+          - --udp-services-configmap=$(POD_NAMESPACE)/udp-services
+          - --annotations-prefix=nginx.ingress.kubernetes.io
         readinessProbe:
           httpGet:
             path: /healthz
@@ -57,14 +78,6 @@ spec:
           hostPort: 25
         - containerPort: 443
           hostPort: 443
-        - containerPort: 143
-          hostPort: 143
-        - containerPort: 465
-          hostPort: 465
-        - containerPort: 587
-          hostPort: 587
-        - containerPort: 993
-          hostPort: 993
         env:
           - name: POD_NAME
             valueFrom:
@@ -74,7 +87,3 @@ spec:
             valueFrom:
               fieldRef:
                 fieldPath: metadata.namespace
-        args:
-        - /nginx-ingress-controller
-        - --default-backend-service=$(POD_NAMESPACE)/default-http-backend
-        - --tcp-services-configmap=$(POD_NAMESPACE)/nginx-ingress-conf

From f2c74dd0144b86e622e8bdfb2dc891b61904279c Mon Sep 17 00:00:00 2001
From: Vados <t3hmrman@gmail.com>
Date: Tue, 13 Mar 2018 21:06:53 +0900
Subject: [PATCH 2/2] Remove `ports` option completely

Not needed since `hostNetwork: true`
---
 docs/kubernetes/kubernetes-nginx-ingress-controller.yaml | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/docs/kubernetes/kubernetes-nginx-ingress-controller.yaml b/docs/kubernetes/kubernetes-nginx-ingress-controller.yaml
index bca2fdc1..5ea9790a 100644
--- a/docs/kubernetes/kubernetes-nginx-ingress-controller.yaml
+++ b/docs/kubernetes/kubernetes-nginx-ingress-controller.yaml
@@ -73,11 +73,6 @@ spec:
             scheme: HTTP
           initialDelaySeconds: 10
           timeoutSeconds: 1
-        ports:
-        - containerPort: 25
-          hostPort: 25
-        - containerPort: 443
-          hostPort: 443
         env:
           - name: POD_NAME
             valueFrom: