diff --git a/cmd/nginx-ingress/flags.go b/cmd/nginx-ingress/flags.go index 177f3c3877..532edaa5b7 100644 --- a/cmd/nginx-ingress/flags.go +++ b/cmd/nginx-ingress/flags.go @@ -246,10 +246,6 @@ func parseFlags() { glog.Fatal("NGINX App Protect Dos memory support is for NGINX Plus and App Protect Dos is enable") } - if *spireAgentAddress != "" && !*nginxPlus { - glog.Fatal("spire-agent-address support is for NGINX Plus only") - } - if *enableInternalRoutes && *spireAgentAddress == "" { glog.Fatal("enable-internal-routes flag requires spire-agent-address") } diff --git a/deployments/helm-chart/values-nsm.yaml b/deployments/helm-chart/values-nsm.yaml index 213c67ae7d..60e91a91e6 100644 --- a/deployments/helm-chart/values-nsm.yaml +++ b/deployments/helm-chart/values-nsm.yaml @@ -1,8 +1,4 @@ controller: - nginxplus: true - image: - repository: nginx-plus-ingress - tag: "2.4.2" enableLatencyMetrics: true nginxServiceMesh: enable: true diff --git a/deployments/helm-chart/values.yaml b/deployments/helm-chart/values.yaml index 318f27634e..ea94d6d11a 100644 --- a/deployments/helm-chart/values.yaml +++ b/deployments/helm-chart/values.yaml @@ -448,7 +448,6 @@ serviceInsight: nginxServiceMesh: ## Enables integration with NGINX Service Mesh. - ## Requires controller.nginxplus enable: false ## Enables NGINX Service Mesh workload to route egress traffic through the Ingress Controller. diff --git a/docs/content/configuration/global-configuration/command-line-arguments.md b/docs/content/configuration/global-configuration/command-line-arguments.md index a31e1cd6d5..93ff48d1b9 100644 --- a/docs/content/configuration/global-configuration/command-line-arguments.md +++ b/docs/content/configuration/global-configuration/command-line-arguments.md @@ -370,8 +370,6 @@ Format: `/` Specifies the address of a running Spire agent. **For use with NGINX Service Mesh only**. -Requires [-nginx-plus](#cmdoption-nginx-plus). - * If the argument is set, but the Ingress Controller is unable to connect to the Spire Agent, the Ingress Controller will fail to start.   @@ -381,9 +379,9 @@ Requires [-nginx-plus](#cmdoption-nginx-plus). Enable support for internal routes with NGINX Service Mesh. **For use with NGINX Service Mesh only**. -Requires [-nginx-plus](#cmdoption-nginx-plus) and [-spire-agent-address](#cmdoption-spire-agent-address). +Requires [-spire-agent-address](#cmdoption-spire-agent-address). -* If the argument is set, but `nginx-plus` is set to false, or the `spire-agent-address` is not provided, the Ingress Controller will fail to start. +* If the argument is set, but `spire-agent-address` is not provided, the Ingress Controller will fail to start.