From 03b2e09a104ca46ff78e1c075af2a8e6b7824eba Mon Sep 17 00:00:00 2001 From: dean-coakley Date: Tue, 6 Nov 2018 12:17:26 +0000 Subject: [PATCH] Remove values-plus and Update install instructions --- deployments/helm-chart/README.md | 10 ++-------- deployments/helm-chart/values-plus.yaml | 6 ------ 2 files changed, 2 insertions(+), 14 deletions(-) delete mode 100644 deployments/helm-chart/values-plus.yaml diff --git a/deployments/helm-chart/README.md b/deployments/helm-chart/README.md index 65eafe5ac3..4728fd25c0 100644 --- a/deployments/helm-chart/README.md +++ b/deployments/helm-chart/README.md @@ -11,7 +11,8 @@ This chart deploys the NGINX Ingress controller in your Kubernetes cluster. - Git. - If you’d like to use NGINX Plus: - Build an Ingress controller image with NGINX Plus and push it to your private registry by following the instructions from [here](../../build/README.md). - - Update the `controller.image.repository` field of the `values-plus.yaml` accordingly. + - Update the `controller.image.repository` field of the `values.yaml` accordingly. + - Set `controller.nginxplus` to true in `values.yaml`. ## Installing the Chart @@ -24,17 +25,10 @@ This chart deploys the NGINX Ingress controller in your Kubernetes cluster. $ cd kubernetes-ingress/deployments/helm-chart ``` 3. To install the chart with the release name my-release (my-release is the name that you choose): - - For NGINX: ``` $ helm install --name my-release . ``` - For NGINX Plus: - ``` - $ helm install --name my-release -f values-plus.yaml . - ``` - The command deploys the Ingress controller in your Kubernetes cluster in the default configuration. The configuration section lists the parameters that can be configured during installation. When deploying the Ingress controller, make sure to use your own TLS certificate and key for the default server rather than the default pre-generated ones. Read the [Configuration](#Configuration) section below to see how to configure a TLS certificate and key for the default server. Note that the default server returns the Not Found page with the 404 status code for all requests for domains for which there are no Ingress rules defined. diff --git a/deployments/helm-chart/values-plus.yaml b/deployments/helm-chart/values-plus.yaml deleted file mode 100644 index c93fecded8..0000000000 --- a/deployments/helm-chart/values-plus.yaml +++ /dev/null @@ -1,6 +0,0 @@ -controller: - nginxplus: true - image: - repository: nginx-plus-ingress - tag: "edge" - pullPolicy: IfNotPresent