From 14815c546ce45ea7190b6be6e2a2077b46435ee2 Mon Sep 17 00:00:00 2001 From: Elvin Efendi Date: Tue, 25 Sep 2018 21:21:16 -0400 Subject: [PATCH] update docs --- docs/examples/static-ip/nginx-ingress-controller.yaml | 1 - docs/user-guide/cli-arguments.md | 4 ++-- docs/user-guide/multiple-ingress.md | 1 - 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/docs/examples/static-ip/nginx-ingress-controller.yaml b/docs/examples/static-ip/nginx-ingress-controller.yaml index 6664d0ddd..18ed2d467 100644 --- a/docs/examples/static-ip/nginx-ingress-controller.yaml +++ b/docs/examples/static-ip/nginx-ingress-controller.yaml @@ -54,5 +54,4 @@ spec: fieldPath: metadata.namespace args: - /nginx-ingress-controller - - --default-backend-service=$(POD_NAMESPACE)/default-http-backend - --publish-service=$(POD_NAMESPACE)/nginx-ingress-lb diff --git a/docs/user-guide/cli-arguments.md b/docs/user-guide/cli-arguments.md index 54c922fd2..6ef03108d 100644 --- a/docs/user-guide/cli-arguments.md +++ b/docs/user-guide/cli-arguments.md @@ -10,8 +10,8 @@ They are set in the container spec of the `nginx-ingress-controller` Deployment | `--annotations-prefix string` | Prefix of the Ingress annotations specific to the NGINX controller. (default "nginx.ingress.kubernetes.io") | | `--apiserver-host string` | Address of the Kubernetes API server. Takes the form "protocol://address:port". If not specified, it is assumed the program runs inside a Kubernetes cluster and local discovery is attempted. | | `--configmap string` | Name of the ConfigMap containing custom global configurations for the controller. | -| `--default-backend-service string` | Service used to serve HTTP requests not matching any known server name (catch-all). Takes the form "namespace/name". The controller configures NGINX to forward requests to the first port of this Service. | -| `--default-server-port int` | Port to use for exposing the default server (catch-all). (default 8181) | +| `--default-backend-service string` | Service used to serve HTTP requests not matching any known server name (catch-all). Takes the form "namespace/name". The controller configures NGINX to forward requests to the first port of this Service. If not specified, 404 page will be returned diretly from Nginx.| +| `--default-server-port int` | When `default-backend-service` is not specified or specified service does not have any endpoint, a local endpoint with this port will be used to serve 404 page from inside Nginx. | | `--default-ssl-certificate string` | Secret containing a SSL certificate to be used by the default HTTPS server (catch-all). Takes the form "namespace/name". | | `--election-id string` | Election id to use for Ingress status updates. (default "ingress-controller-leader") | | `--enable-dynamic-certificates` | Dynamically serves certificates instead of reloading NGINX when certificates are created, updated, or deleted. Currently does not support OCSP stapling, so --enable-ssl-chain-completion must be turned off. Assuming the certificate is generated with a 2048 bit RSA key/cert pair, this feature can store roughly 5000 certificates. This is an experiemental feature that currently is not ready for production use. Feature backed by OpenResty Lua libraries. (disabled by default) | diff --git a/docs/user-guide/multiple-ingress.md b/docs/user-guide/multiple-ingress.md index e83220177..7a5acf830 100644 --- a/docs/user-guide/multiple-ingress.md +++ b/docs/user-guide/multiple-ingress.md @@ -43,7 +43,6 @@ spec: - name: nginx-ingress-internal-controller args: - /nginx-ingress-controller - - '--default-backend-service=ingress/nginx-ingress-default-backend' - '--election-id=ingress-controller-leader-internal' - '--ingress-class=nginx-internal' - '--configmap=ingress/nginx-ingress-internal-controller'