Merge branch 'master' into chore/fail-fast

deployments/helm-chart-dos-arbitrator/README.md

@@ -9,19 +9,18 @@ This chart deploys the NGINX App Protect Dos Arbitrator in your Kubernetes clust
   - A [Kubernetes Version Supported by the Ingress Controller](https://docs.nginx.com/nginx-ingress-controller/technical-specifications/#supported-kubernetes-versions)
   - Helm 3.0+.
   - Git.
-  
+
 ## Getting the Chart Sources
 
 This step is required if you're installing the chart using its sources. Additionally, the step is also required for managing the custom resource definitions (CRDs), which the Ingress Controller requires by default, or for upgrading/deleting the CRDs.
 
 1. Clone the Ingress controller repo:
     ```console
-    $ git clone https://github.com/nginxinc/kubernetes-ingress/
+    $ git clone https://github.com/nginxinc/kubernetes-ingress.git --branch v2.1.1
     ```
 2. Change your working directory to /deployments/helm-chart-dos-arbitrator:
     ```console
     $ cd kubernetes-ingress/deployments/helm-chart-dos-arbitrator
-    $ git checkout v2.1.0
     ```
 
 ## Adding the Helm Repository

deployments/helm-chart/README.md

@@ -23,12 +23,13 @@ This step is required if you're installing the chart using its sources. Addition
 
 1. Clone the Ingress controller repo:
     ```console
-    $ git clone https://github.com/nginxinc/kubernetes-ingress/
+    $ git clone https://github.com/nginxinc/kubernetes-ingress --branch v2.1.1
     ```
+    **Note**: If you want to use the experimental repository (`edge`), remove the `--branch` flag and value.
+
 2. Change your working directory to /deployments/helm-chart:
     ```console
     $ cd kubernetes-ingress/deployments/helm-chart
-    $ git checkout v2.1.1
     ```
 
 ## Adding the Helm Repository
@@ -40,6 +41,8 @@ $ helm repo add nginx-stable https://helm.nginx.com/stable
 $ helm repo update
 ```
 
+**Note**: If you want to use the experimental repository, replace `stable` with `edge`.
+
 ## Installing the Chart
 
 ### Installing the CRDs
@@ -62,7 +65,7 @@ For NGINX Plus: (assuming you have pushed the Ingress controller image `nginx-pl
 $ helm install my-release nginx-stable/nginx-ingress --set controller.image.repository=myregistry.example.com/nginx-plus-ingress --set controller.nginxplus=true
 ```
 
-**Note**: If you wish to use the experimental repository, replace `stable` with `edge` and add the `--devel` flag.
+**Note**: If you want to use the experimental repository, replace `stable` with `edge` and add the `--devel` flag.
 
 ### Installing Using Chart Sources
 
@@ -78,7 +81,7 @@ For NGINX Plus:
 $ helm install my-release -f values-plus.yaml .
 ```
 
-**Note**: If you wish to use the experimental repository, replace the value in the `tag` field inside the yaml files with `edge`.
+**Note**: If you want to use the experimental repository, replace the value in the `tag` field inside the yaml files with `edge`.
 
 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.
 

docs/content/app-protect-dos/installation-with-helm-dos-arbitrator.md

@@ -19,12 +19,11 @@ This step is required if you're installing the chart using its sources. Addition
 
 1. Clone the Ingress controller repo:
     ```console
-    $ git clone https://github.com/nginxinc/kubernetes-ingress/
+    $ git clone https://github.com/nginxinc/kubernetes-ingress.git --branch v2.1.1
     ```
 2. Change your working directory to /deployments/helm-chart-dos-arbitrator:
     ```console
     $ cd kubernetes-ingress/deployments/helm-chart-dos-arbitrator
-    $ git checkout v2.1.1
     ```
 
 ## Adding the Helm Repository

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

@@ -19,9 +19,8 @@ This document provides an overview of the steps required to use NGINX App Protec
     * It is also possible to build your own image and push it to your private Docker registry by following the instructions from [here](/nginx-ingress-controller/installation/building-ingress-controller-image).
 2. Clone the Ingress controller repo:
     ```
-    $ git clone https://github.com/nginxinc/kubernetes-ingress/
+    $ git clone https://github.com/nginxinc/kubernetes-ingress.git --branch v2.1.1
     $ cd kubernetes-ingress
-    $ git checkout v2.1.1
     ```
 
 ## Create the namespace and service account

docs/content/installation/building-ingress-controller-image.md

@@ -32,9 +32,8 @@ We build the image using the make utility and the provided `Makefile`. Let’s c
 
 1. Clone the Ingress Controller repo:
     ```
-    $ git clone https://github.com/nginxinc/kubernetes-ingress/
+    $ git clone https://github.com/nginxinc/kubernetes-ingress.git --branch v2.1.1
     $ cd kubernetes-ingress
-    $ git checkout v2.1.1
     ```
 
 1. Build the image:

docs/content/installation/installation-with-helm.md

@@ -1,6 +1,6 @@
 ---
 title: Installation with Helm
-description: "This document describes how to install the NGINX Ingress Controller in your Kubernetes cluster using Helm." 
+description: "This document describes how to install the NGINX Ingress Controller in your Kubernetes cluster using Helm."
 weight: 1900
 doctypes: [""]
 toc: true
@@ -28,12 +28,11 @@ This step is required if you're installing the chart using its sources. Addition
 
 1. Clone the Ingress controller repo:
     ```console
-    $ git clone https://github.com/nginxinc/kubernetes-ingress/
+    $ git clone https://github.com/nginxinc/kubernetes-ingress.git --branch v2.1.1
     ```
 2. Change your working directory to /deployments/helm-chart:
     ```console
     $ cd kubernetes-ingress/deployments/helm-chart
-    $ git checkout v2.1.1
     ```
 
 ## Adding the Helm Repository

docs/content/installation/installation-with-manifests.md

@@ -21,9 +21,8 @@ This document describes how to install the NGINX Ingress Controller in your Kube
     * It is also possible to build your own image and push it to your private Docker registry by following the instructions from [here](/nginx-ingress-controller/installation/building-ingress-controller-image).
 2. Clone the Ingress controller repo and change into the deployments folder:
     ```
-    $ git clone https://github.com/nginxinc/kubernetes-ingress/
+    $ git clone https://github.com/nginxinc/kubernetes-ingress.git --branch v2.1.1
     $ cd kubernetes-ingress/deployments
-    $ git checkout v2.1.1
     ```
 
 ## 1. Configure RBAC

go.mod

@@ -12,10 +12,10 @@ require (
 	github.com/nginxinc/nginx-prometheus-exporter v0.10.0
 	github.com/prometheus/client_golang v1.12.1
 	github.com/spiffe/go-spiffe v1.1.0
-	k8s.io/api v0.23.4
-	k8s.io/apimachinery v0.23.4
-	k8s.io/client-go v0.23.4
-	k8s.io/code-generator v0.23.4
+	k8s.io/api v0.23.5
+	k8s.io/apimachinery v0.23.5
+	k8s.io/client-go v0.23.5
+	k8s.io/code-generator v0.23.5
 	sigs.k8s.io/controller-tools v0.8.0
 )
 

go.sum

@@ -962,20 +962,20 @@ honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt
 honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k=
 honnef.co/go/tools v0.0.1-2020.1.4/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k=
 k8s.io/api v0.23.0/go.mod h1:8wmDdLBHBNxtOIytwLstXt5E9PddnZb0GaMcqsvDBpg=
-k8s.io/api v0.23.4 h1:85gnfXQOWbJa1SiWGpE9EEtHs0UVvDyIsSMpEtl2D4E=
-k8s.io/api v0.23.4/go.mod h1:i77F4JfyNNrhOjZF7OwwNJS5Y1S9dpwvb9iYRYRczfI=
+k8s.io/api v0.23.5 h1:zno3LUiMubxD/V1Zw3ijyKO3wxrhbUF1Ck+VjBvfaoA=
+k8s.io/api v0.23.5/go.mod h1:Na4XuKng8PXJ2JsploYYrivXrINeTaycCGcYgF91Xm8=
 k8s.io/apiextensions-apiserver v0.23.0 h1:uii8BYmHYiT2ZTAJxmvc3X8UhNYMxl2A0z0Xq3Pm+WY=
 k8s.io/apiextensions-apiserver v0.23.0/go.mod h1:xIFAEEDlAZgpVBl/1VSjGDmLoXAWRG40+GsWhKhAxY4=
 k8s.io/apimachinery v0.23.0/go.mod h1:fFCTTBKvKcwTPFzjlcxp91uPFZr+JA0FubU4fLzzFYc=
-k8s.io/apimachinery v0.23.4 h1:fhnuMd/xUL3Cjfl64j5ULKZ1/J9n8NuQEgNL+WXWfdM=
-k8s.io/apimachinery v0.23.4/go.mod h1:BEuFMMBaIbcOqVIJqNZJXGFTP4W6AycEpb5+m/97hrM=
+k8s.io/apimachinery v0.23.5 h1:Va7dwhp8wgkUPWsEXk6XglXWU4IKYLKNlv8VkX7SDM0=
+k8s.io/apimachinery v0.23.5/go.mod h1:BEuFMMBaIbcOqVIJqNZJXGFTP4W6AycEpb5+m/97hrM=
 k8s.io/apiserver v0.23.0/go.mod h1:Cec35u/9zAepDPPFyT+UMrgqOCjgJ5qtfVJDxjZYmt4=
 k8s.io/client-go v0.23.0/go.mod h1:hrDnpnK1mSr65lHHcUuIZIXDgEbzc7/683c6hyG4jTA=
-k8s.io/client-go v0.23.4 h1:YVWvPeerA2gpUudLelvsolzH7c2sFoXXR5wM/sWqNFU=
-k8s.io/client-go v0.23.4/go.mod h1:PKnIL4pqLuvYUK1WU7RLTMYKPiIh7MYShLshtRY9cj0=
+k8s.io/client-go v0.23.5 h1:zUXHmEuqx0RY4+CsnkOn5l0GU+skkRXKGJrhmE2SLd8=
+k8s.io/client-go v0.23.5/go.mod h1:flkeinTO1CirYgzMPRWxUCnV0G4Fbu2vLhYCObnt/r4=
 k8s.io/code-generator v0.23.0/go.mod h1:vQvOhDXhuzqiVfM/YHp+dmg10WDZCchJVObc9MvowsE=
-k8s.io/code-generator v0.23.4 h1:MmDMH74oo8YD4r+KdUzd/VVmXUeXf5u0owLI9wZWP5Y=
-k8s.io/code-generator v0.23.4/go.mod h1:S0Q1JVA+kSzTI1oUvbKAxZY/DYbA/ZUb4Uknog12ETk=
+k8s.io/code-generator v0.23.5 h1:xn3a6J5pUL49AoH6SPrOFtnB5cvdMl76f/bEY176R3c=
+k8s.io/code-generator v0.23.5/go.mod h1:S0Q1JVA+kSzTI1oUvbKAxZY/DYbA/ZUb4Uknog12ETk=
 k8s.io/component-base v0.23.0/go.mod h1:DHH5uiFvLC1edCpvcTDV++NKULdYYU6pR9Tt3HIKMKI=
 k8s.io/gengo v0.0.0-20210813121822-485abfe95c7c h1:GohjlNKauSai7gN4wsJkeZ3WAJx4Sh+oT/b5IYn5suA=
 k8s.io/gengo v0.0.0-20210813121822-485abfe95c7c/go.mod h1:FiNAH4ZV3gBg2Kwh89tzAEV2be7d5xI0vBa/VySYy3E=

perf-tests/requirements.txt

@@ -5,7 +5,7 @@ pytest==7.1.0
 ipaddress==1.0.23 # >= 1.0.17
 cffi==1.15.0
 certifi==2021.10.8
-urllib3==1.26.8
+urllib3==1.26.9
 pytest-html==3.1.1
 pytest-repeat==0.9.1
 locust==2.8.4

tests/requirements.txt

@@ -2,7 +2,7 @@ PyYAML==6.0
 requests==2.27.1
 forcediphttpsadapter==1.0.2
 kubernetes==23.3.0
-pytest==7.1.0
+pytest==7.1.1
 ipaddress==1.0.23 # >= 1.0.17
 cffi==1.15.0
 pyOpenSSL==22.0.0