From df381e185dc70050fc0e91a0f7f5e047f170dd5c Mon Sep 17 00:00:00 2001 From: Michael Pleshakov Date: Tue, 1 May 2018 20:33:09 +0200 Subject: [PATCH] Update nginx ingress controllers doc --- docs/nginx-ingress-controllers.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/docs/nginx-ingress-controllers.md b/docs/nginx-ingress-controllers.md index df570fe234..733a259d83 100644 --- a/docs/nginx-ingress-controllers.md +++ b/docs/nginx-ingress-controllers.md @@ -17,7 +17,7 @@ The table below summarizes the key difference between nginxinc/kubernetes-ingres | NGINX version | [Custom](https://github.com/kubernetes/ingress-nginx/tree/master/images/nginx) NGINX build that includes several third-party modules | NGINX official mainline [build](https://github.com/nginxinc/docker-nginx) | NGINX Plus | | Commercial support | N/A | N/A | Included | | **Load balancing configuration** | -| Merging Ingress rules with the same host | Supported | Under consideration | Under consideration | +| Merging Ingress rules with the same host | Supported | Supported | Supported | | HTTP load balancing extensions - Annotations | See the [supported annotations](https://github.com/kubernetes/ingress-nginx/blob/master/docs/user-guide/annotations.md) | See the [supported annotations](https://github.com/nginxinc/kubernetes-ingress/tree/master/examples/customization) | See the [supported annotations](https://github.com/nginxinc/kubernetes-ingress/tree/master/examples/customization)| | HTTP load balancing extensions -- ConfigMap | See the [supported ConfigMap keys](https://github.com/kubernetes/ingress-nginx/blob/master/docs/user-guide/configmap.md) | See the [supported ConfigMap keys](https://github.com/nginxinc/kubernetes-ingress/tree/master/examples/customization) | See the [supported ConfigMap keys](https://github.com/nginxinc/kubernetes-ingress/tree/master/examples/customization) | | TCP/UDP | Supported via a ConfigMap | Not supported | Not supported | @@ -29,12 +29,12 @@ The table below summarizes the key difference between nginxinc/kubernetes-ingres | **Deployment** | | Command-line arguments *2 | See the [arguments](https://github.com/kubernetes/ingress-nginx/blob/master/docs/user-guide/cli-arguments.md) | See the [arguments](https://github.com/nginxinc/kubernetes-ingress/blob/master/nginx-controller/main.go#L27) | See the [arguments](https://github.com/nginxinc/kubernetes-ingress/blob/master/nginx-controller/main.go#L27) | | TLS certificate and key for the default server | Required as a command-line argument/ auto-generated | Required as a command-line argument | Required as a command-line argument | -| Helm chart | Supported | Coming soon | Coming soon | +| Helm chart | Supported | Supported | Supported | | **Operational** | | Reporting the IP address(es) of the Ingress controller into Ingress resources | Supported | Coming soon | Coming soon | | Extended Status | Supported via a third-party module | Not supported | Supported | -| Prometheus Integration | Supported | Not supported | Supported | -| Dynamic reconfiguration of endpoints (no configuration reloading) | Not supported | Not supported | Supported | +| Prometheus Integration | Supported | Not supported | Supported (in beta) | +| Dynamic reconfiguration of endpoints (no configuration reloading) | Supported with a third-party Lua module | Not supported | Supported | Notes: