Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

NSM OSS integration #3376

Merged
merged 5 commits into from
Dec 21, 2022
+2 −13
Merged

NSM OSS integration #3376

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
95b3a5f
Remove N+ check when passing a spire spireAgentAddress
chase-kiefer Dec 16, 2022
aadc0f4
Remove limiting values from values-nsm
chase-kiefer Dec 16, 2022
a0f6a82
Remove inaccurate flag documentation
chase-kiefer Dec 16, 2022
5c5ba31
Remove inaccurate helm comment
chase-kiefer Dec 16, 2022
56c6428
Merge branch 'main' into nsm-oss-integration
chase-kiefer Dec 20, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 0 additions & 4 deletions cmd/nginx-ingress/flags.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")
}
Expand Down
4 changes: 0 additions & 4 deletions deployments/helm-chart/values-nsm.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,4 @@
controller:
nginxplus: true
image:
repository: nginx-plus-ingress
tag: "2.4.2"
enableLatencyMetrics: true
nginxServiceMesh:
enable: true
Expand Down
1 change: 0 additions & 1 deletion deployments/helm-chart/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
6 changes: 2 additions & 4 deletions docs/content/configuration/global-configuration/command-line-arguments.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -370,8 +370,6 @@ Format: `<namespace>/<name>`

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.

&nbsp;
Expand All @@ -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.

&nbsp;
<a name="cmdoption-enable-latency-metrics"></a>
Expand Down