diff --git a/docs/kubernetes/kubernetes-nginx-ingress-controller.yaml b/docs/kubernetes/kubernetes-nginx-ingress-controller.yaml index 3a24cd20..5ea9790a 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 @@ -52,19 +73,6 @@ spec: scheme: HTTP initialDelaySeconds: 10 timeoutSeconds: 1 - ports: - - containerPort: 25 - 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 +82,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