Merge branch 'main' into chore/use-draft-release

nginx · Mar 21, 2023 · d33cd6b · d33cd6b
2 parents a511ed5 + 3db26cb
commit d33cd6b
Show file tree

Hide file tree

Showing 34 changed files with 812 additions and 325 deletions.
diff --git a/.github/release.yml b/.github/release.yml
@@ -3,18 +3,15 @@ changelog:
     labels:
       - skip changelog
   categories:
-    - title: 🚀 Features
-      labels:
-        - enhancement
     - title: 💣 Breaking Changes
       labels:
         - change
+    - title: 🚀 Features
+      labels:
+        - enhancement
     - title: 🐛 Bug Fixes
       labels:
         - bug
-    - title: 📝 Documentation
-      labels:
-        - documentation
     - title: 📦 Helm Chart
       labels:
         - helm_chart
@@ -24,6 +21,9 @@ changelog:
     - title: 🔨 Maintenance
       labels:
         - chore
+    - title: 📝 Documentation
+      labels:
+        - documentation
     - title: ⬆️ Dependencies
       labels:
         - dependencies

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -40,7 +40,7 @@ repos:
         types: [go]
         pass_filenames: false
   - repo: https://github.com/golangci/golangci-lint
-    rev: v1.51.2
+    rev: v1.52.0
     hooks:
       - id: golangci-lint
         args: [--new-from-patch=/tmp/diff.patch]

diff --git a/deployments/common/crds/k8s.nginx.org_policies.yaml b/deployments/common/crds/k8s.nginx.org_policies.yaml
@@ -92,6 +92,8 @@ spec:
                   properties:
                     clientCertSecret:
                       type: string
+                    crlFileName:
+                      type: string
                     verifyClient:
                       type: string
                     verifyDepth:

diff --git a/deployments/helm-chart-dos-arbitrator/.helmignore b/deployments/helm-chart-dos-arbitrator/.helmignore
diff --git a/deployments/helm-chart-dos-arbitrator/Chart.yaml b/deployments/helm-chart-dos-arbitrator/Chart.yaml
diff --git a/deployments/helm-chart-dos-arbitrator/README.md b/deployments/helm-chart-dos-arbitrator/README.md
diff --git a/deployments/helm-chart-dos-arbitrator/chart-icon.png b/deployments/helm-chart-dos-arbitrator/chart-icon.png
diff --git a/deployments/helm-chart-dos-arbitrator/templates/_helpers.tpl b/deployments/helm-chart-dos-arbitrator/templates/_helpers.tpl
diff --git a/deployments/helm-chart-dos-arbitrator/templates/controller-deployment.yaml b/deployments/helm-chart-dos-arbitrator/templates/controller-deployment.yaml
diff --git a/deployments/helm-chart-dos-arbitrator/templates/controller-service.yaml b/deployments/helm-chart-dos-arbitrator/templates/controller-service.yaml
diff --git a/deployments/helm-chart-dos-arbitrator/values.yaml b/deployments/helm-chart-dos-arbitrator/values.yaml
diff --git a/deployments/helm-chart/README.md b/deployments/helm-chart/README.md
@@ -13,7 +13,7 @@ This chart deploys the NGINX Ingress Controller in your Kubernetes cluster.
     - Alternatively, pull an Ingress Controller image with NGINX Plus and push it to your private registry by following the instructions from [here](https://docs.nginx.com/nginx-ingress-controller/installation/pulling-ingress-controller-image).
     - Alternatively, you can build an Ingress Controller image with NGINX Plus and push it to your private registry by following the instructions from [here](https://docs.nginx.com/nginx-ingress-controller/installation/building-ingress-controller-image).
     - Update the `controller.image.repository` field of the `values-plus.yaml` accordingly.
-  - If you’d like to use App Protect DoS, please install App Protect DoS Arbitrator helm chart. Make sure to install in the same namespace as the NGINX Ingress Controller. Note that if you install multiple NGINX Ingress Controllers in the same namespace, they will need to share the same Arbitrator because it is not possible to install more than one Arbitrator in a single namespace.
+  - If you’d like to use App Protect DoS, please install App Protect DoS Arbitrator [helm chart](https://github.com/nginxinc/nap-dos-arbitrator-helm-chart). Make sure to install in the same namespace as the NGINX Ingress Controller. Note that if you install multiple NGINX Ingress Controllers in the same namespace, they will need to share the same Arbitrator because it is not possible to install more than one Arbitrator in a single namespace.
 
 ## CRDs
 

diff --git a/deployments/helm-chart/crds/k8s.nginx.org_policies.yaml b/deployments/helm-chart/crds/k8s.nginx.org_policies.yaml
@@ -92,6 +92,8 @@ spec:
                   properties:
                     clientCertSecret:
                       type: string
+                    crlFileName:
+                      type: string
                     verifyClient:
                       type: string
                     verifyDepth:

diff --git a/docs/content/app-protect-dos/installation-with-helm-dos-arbitrator.md b/docs/content/app-protect-dos/installation-with-helm-dos-arbitrator.md
diff --git a/docs/content/app-protect-dos/installation.md b/docs/content/app-protect-dos/installation.md
@@ -23,13 +23,26 @@ This document provides an overview of the steps required to use NGINX App Protec
     $ cd kubernetes-ingress/deployments
     ```
 
-## Create the namespace and service account
+## Install the App Protect DoS Arbitrator
+
+### Helm Chart
+
+The App Protect DoS Arbitrator can be installed using the [NGINX App Protect DoS Helm Chart](https://github.com/nginxinc/nap-dos-arbitrator-helm-chart).
+If you have the NGINX Helm Repository already added, you can install the App Protect DoS Arbitrator by running the following command:
 
 ```bash
-  kubectl apply -f common/ns-and-sa.yaml
+helm install my-release-dos nginx-stable/nginx-appprotect-dos-arbitrator
 ```
 
-## Install the App Protect DoS Arbitrator
+### YAML Manifests
+
+Alternatively, you can install the App Protect DoS Arbitrator using the YAML manifests provided in the Ingress Controller repo.
+
+- Create the namespace and service account
+
+```bash
+  kubectl apply -f common/ns-and-sa.yaml
+```
 
 - Deploy the app protect dos arbitrator
     ```bash