8000 Merge branch 'main' into feat/wildcardhostname · nginx/kubernetes-ingress@3ae9c3b · GitHub
[go: up one dir, main page]
Skip to content

Commit 3ae9c3b

Browse files
shaun-nxshaun-nx
authored
Merge branch 'main' into feat/wildcardhostname
2 parents 7905670 + a8c2590 commit 3ae9c3b

File tree

100 files changed

+277
-114
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

100 files changed

+277
-114
lines changed

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ Read [this doc](https://docs.nginx.com/nginx-ingress-controller/intro/nginx-plus
4343

4444
1. Install the NGINX Ingress Controller using the Kubernetes [manifests](https://docs.nginx.com/nginx-ingress-controller/installation/installation-with-manifests/) or the [helm chart](https://docs.nginx.com/nginx-ingress-controller/installation/installation-with-helm/).
4545
1. Configure load balancing for a simple web application:
46-
* Use the Ingress resource. See the [Cafe example](https://github.com/nginxinc/kubernetes-ingress/tree/main/examples/complete-example).
46+
* Use the Ingress resource. See the [Cafe example](https://github.com/nginxinc/kubernetes-ingress/tree/main/examples/ingress-resources/complete-example).
4747
* Or the VirtualServer resource. See the [Basic configuration](https://github.com/nginxinc/kubernetes-ingress/tree/main/examples/custom-resources/basic-configuration) example.
4848
1. See additional configuration [examples](https://github.com/nginxinc/kubernetes-ingress/tree/main/examples).
4949
1. Learn more about all available configuration and customization in the [docs](https://docs.nginx.com/nginx-ingress-controller/).

‎deployments/helm-chart/README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -230,7 +230,7 @@ Parameter | Description | Default
230230
`controller.reportIngressStatus.annotations` | The annotations of the leader election configmap. | {}
231231
`controller.pod.annotations` | The annotations of the Ingress Controller pod. | {}
232232
`controller.pod.extraLabels` | The additional extra labels of the Ingress Controller pod. | {}
233-
`controller.appprotect.enable` | Enables the App Protect module in the Ingress Controller. | false
233+
`controller.appprotect.enable` | Enables the App Protect WAF module in the Ingress Controller. | false
234234
`controller.appprotectdos.enable` | Enables the App Protect DoS module in the Ingress Controller. | false
235235
`controller.appprotectdos.debug` | Enable debugging for App Protect DoS. | false
236236
`controller.appprotectdos.maxDaemons` | Max number of ADMD instances. | 1

‎deployments/helm-chart/values.yaml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,11 @@ controller:
1212
# Timeout in milliseconds which the Ingress Controller will wait for a successful NGINX reload after a change or at the initial start.
1313
nginxReloadTimeout: 60000
1414

15-
## Support for App Protect
15+
## Support for App Protect WAF
1616
appprotect:
17-
## Enable the App Protect module in the Ingress Controller.
17+
## Enable the App Protect WAF module in the Ingress Controller.
1818
enable: false
19-
## Sets log level for App Protect. Allowed values: fatal, error, warn, info, debug, trace
19+
## Sets log level for App Protect WAF. Allowed values: fatal, error, warn, info, debug, trace
2020
# logLevel: fatal
2121

2222
## Support for App Protect Dos

‎docs/content/app-protect-dos/configuration.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ docs: "DOCS-580"
99
---
1010

1111
This document describes how to configure the NGINX App Protect DoS module
12-
> Check out the complete [NGINX Ingress Controller with App Protect DoS example resources on GitHub](https://github.com/nginxinc/kubernetes-ingress/tree/v2.3.0/examples/appprotect-dos).
12+
> Check out the complete [NGINX Ingress Controller with App Protect DoS example for VirtualServer](https://github.com/nginxinc/kubernetes-ingress/tree/v2.3.0/examples/custom-resources/app-protect-dos) and the [NGINX Ingress Controller with App Protect DoS example for Ingress](https://github.com/nginxinc/kubernetes-ingress/tree/v2.3.0/examples/ingress-resources/app-protect-dos).
1313
1414
## App Protect DoS Configuration
1515

‎docs/content/app-protect-dos/dos-protected.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ If you try to create (or update) a resource that violates the structural schema
7171
* Example of `kubectl` validation:
7272
```
7373
$ kubectl apply -f apdos-protected.yaml
74-
error: error validating "examples/appprotect-dos/apdos-protected.yaml": error validating data: ValidationError(DosProtectedResource.spec.enable): invalid type for com.f5.appprotectdos.v1beta1.DosProtectedResource.spec.enable: got "string", expected "boolean"; if you choose to ignore these errors, turn validation off with --validate=false
74+
error: error validating "examples/app-protect-dos/apdos-protected.yaml": error validating data: ValidationError(DosProtectedResource.spec.enable): invalid type for com.f5.appprotectdos.v1beta1.DosProtectedResource.spec.enable: got "string", expected "boolean"; if you choose to ignore these errors, turn validation off with --validate=false
7575
```
7676
* Example of Kubernetes API server validation:
7777
```

‎docs/content/app-protect-dos/installation.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ toc: true
77
docs: "DOCS-583"
88
---
99

10-
> **Note**: The NGINX Kubernetes Ingress Controller integration with NGINX App Protect requires the use of NGINX Plus.
10+
> **Note**: The NGINX Kubernetes Ingress Controller integration with NGINX App Protect DoS requires the use of NGINX Plus.
1111
1212
This document provides an overview of the steps required to use NGINX App Protect DoS with your NGINX Ingress Controller deployment. You can visit the linked documents to find additional information and instructions.
1313

@@ -63,4 +63,4 @@ Take the steps below to set up and deploy the NGINX Ingress Controller and App P
6363
3. Enable the App Protect Dos module by adding the `enable-app-protect-dos` [cli argument](/nginx-ingress-controller/configuration/global-configuration/command-line-arguments/#cmdoption-enable-app-protect-dos) to your Deployment or DaemonSet file.
6464
4. [Deploy the Ingress Controller](/nginx-ingress-controller/installation/installation-with-manifests/#3-deploy-the-ingress-controller).
6565
66-
For more information, see the [Configuration guide](/nginx-ingress-controller/app-protect-dos/configuration),the [NGINX Ingress Controller with App Protect DoS example for Ingress](https://github.com/nginxinc/kubernetes-ingress/tree/v2.3.0/examples/appprotect-dos) and the [NGINX Ingress Controller with App Protect DoS example for VirtualServer](https://github.com/nginxinc/kubernetes-ingress/tree/v2.3.0/examples/custom-resources/dos).
66+
For more information, see the [Configuration guide](/nginx-ingress-controller/app-protect-dos/configuration),the [NGINX Ingress Controller with App Protect DoS example for VirtualServer](https://github.com/nginxinc/kubernetes-ingress/tree/v2.3.0/examples/custom-resources/app-protect-dos) and the [NGINX Ingress Controller with App Protect DoS example for Ingress](https://github.com/nginxinc/kubernetes-ingress/tree/v2.3.0/examples/ingress-resources/app-protect-dos).

‎docs/content/app-protect/_index.md‎ renamed to ‎docs/content/app-protect-waf/_index.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
title: Using with NGINX App Protect
33
description: Learn how to use NGINX Ingress Controller for Kubernetes with NGINX App Protect.
44
weight: 1600
5+
aliases: ["/nginx-ingress-controller/app-protect/"]
56
menu:
67
docs:
78
parent: NGINX Ingress Controller

0 commit comments

Comments
 (0)
0