Update NGINX Ingress Controller to 3.6.1 (#330)

Makefile

@@ -3,7 +3,7 @@
 # To re-generate a bundle for another specific version without changing the standard setup, you can:
 # - use the VERSION as arg of the bundle target (e.g make bundle VERSION=0.0.2)
 # - use environment variables to overwrite this value (e.g export VERSION=0.0.2)
-VERSION ?= 2.3.0
+VERSION ?= 2.3.1
 
 # CHANNELS define the bundle channels used in the bundle.
 # Add a new line here if you would like to change its default config. (E.g CHANNELS = "candidate,fast,stable")

README.md

@@ -17,7 +17,7 @@ The following table shows the relation between the versions of the two projects:
 
 | NGINX Ingress Controller | NGINX Ingress Operator |
 | ------------------------ | ---------------------- |
-| 3.6.x                    | 2.3.0                  |
+| 3.6.x                    | 2.3.1                  |
 | 3.5.x                    | 2.2.2                  |
 | 3.4.x                    | 2.1.2                  |
 | 3.3.x                    | 2.0.2                  |
@@ -75,7 +75,7 @@ See [upgrade docs](./docs/upgrades.md)
 
 We publish NGINX Ingress Operator releases on GitHub. See our [releases page](https://github.com/nginxinc/nginx-ingress-helm-operator/releases).
 
-The latest stable release is [2.3.0](https://github.com/nginxinc/nginx-ingress-helm-operator/releases/tag/v2.3.0). For production use, we recommend that you choose the latest stable release.
+The latest stable release is [2.3.1](https://github.com/nginxinc/nginx-ingress-helm-operator/releases/tag/v2.3.1). For production use, we recommend that you choose the latest stable release.
 
 ## Development
 

bundle/manifests/nginx-ingress-operator.clusterserviceversion.yaml

@@ -77,7 +77,7 @@ metadata:
               "image": {
                 "pullPolicy": "IfNotPresent",
                 "repository": "nginx/nginx-ingress",
-                "tag": "3.6.0-ubi"
+                "tag": "3.6.1-ubi"
               },
               "includeYear": false,
               "ingressClass": {
@@ -220,8 +220,8 @@ metadata:
     capabilities: Basic Install
     categories: Monitoring, Networking
     certified: "true"
-    containerImage: quay.io/nginx/nginx-ingress-operator:2.3.0
-    createdAt: "2024-06-26T10:41:53Z"
+    containerImage: quay.io/nginx/nginx-ingress-operator:2.3.1
+    createdAt: "2024-07-04T14:57:13Z"
     description: The NGINX Ingress Operator is a Kubernetes/OpenShift component which
       deploys and manages one or more NGINX/NGINX Plus Ingress Controllers
     features.operators.openshift.io/cnf: "false"
@@ -244,7 +244,7 @@ metadata:
     operatorframework.io/arch.arm64: supported
     operatorframework.io/arch.ppc64le: supported
     operatorframework.io/arch.s390x: supported
-  name: nginx-ingress-operator.v2.3.0
+  name: nginx-ingress-operator.v2.3.1
   namespace: placeholder
 spec:
   apiservicedefinitions: {}
@@ -448,7 +448,7 @@ spec:
                 - --metrics-bind-address=127.0.0.1:8080
                 - --leader-elect
                 - --leader-election-id=nginx-ingress-operator
-                image: quay.io/nginx/nginx-ingress-operator:2.3.0
+                image: quay.io/nginx/nginx-ingress-operator:2.3.1
                 livenessProbe:
                   httpGet:
                     path: /healthz
@@ -539,4 +539,4 @@ spec:
   minKubeVersion: 1.23.0
   provider:
     name: NGINX Inc
-  version: 2.3.0
+  version: 2.3.1

config/manager/kustomization.yaml

@@ -5,4 +5,4 @@ kind: Kustomization
 images:
 - name: controller
   newName: quay.io/nginx/nginx-ingress-operator
-  newTag: 2.3.0
+  newTag: 2.3.1

config/manifests/bases/nginx-ingress-operator.clusterserviceversion.yaml

@@ -6,7 +6,7 @@ metadata:
     capabilities: Basic Install
     categories: Monitoring, Networking
     certified: "true"
-    containerImage: quay.io/nginx/nginx-ingress-operator:2.3.0
+    containerImage: quay.io/nginx/nginx-ingress-operator:2.3.1
     createdAt: placeholder
     description: The NGINX Ingress Operator is a Kubernetes/OpenShift component which
       deploys and manages one or more NGINX/NGINX Plus Ingress Controllers
@@ -185,7 +185,7 @@ spec:
                 - --metrics-bind-address=127.0.0.1:8080
                 - --leader-elect
                 - --leader-election-id=nginx-ingress-operator
-                image: quay.io/nginx/nginx-ingress-operator:2.3.0
+                image: quay.io/nginx/nginx-ingress-operator:2.3.1
                 livenessProbe:
                   httpGet:
                     path: /healthz
@@ -291,4 +291,4 @@ spec:
   minKubeVersion: 1.23.0
   provider:
     name: NGINX Inc
-  version: 2.3.0
+  version: 2.3.1

config/samples/charts_v1alpha1_nginxingress.yaml

@@ -35,7 +35,7 @@ spec:
     customPorts: []
     image:
       repository: nginx/nginx-ingress
-      tag: "3.6.0-ubi"
+      tag: "3.6.1-ubi"
       # digest: "sha256:CHANGEME"
       pullPolicy: IfNotPresent
     lifecycle: {}

docs/manual-installation.md

@@ -7,14 +7,14 @@ This will deploy the operator in the `nginx-ingress-operator-system` namespace.
    1. Clone the `nginx-ingress-operator` repo:
 
    ```shell
-   git clone https://github.com/nginxinc/nginx-ingress-helm-operator/ --branch v2.3.0
+   git clone https://github.com/nginxinc/nginx-ingress-helm-operator/ --branch v2.3.1
    cd nginx-ingress-helm-operator/
    ```
 
    2. To deploy the Operator and associated resources to all environments, run:
 
    ```shell
-   make deploy IMG=nginx/nginx-ingress-operator:2.3.0
+   make deploy IMG=nginx/nginx-ingress-operator:2.3.1
    ```
 
 2. Check that the Operator is running:
@@ -30,11 +30,11 @@ This will deploy the operator in the `nginx-ingress-operator-system` namespace.
 
 In order to deploy NGINX Ingress Controller instances into OpenShift environments, a new SCC is required to be created on the cluster which will be used to bind the specific required capabilities to the NGINX Ingress service account(s). To do so for NIC deployments, please run the following command (assuming you are logged in with administrator access to the cluster):
 
-`kubectl apply -f https://raw.githubusercontent.com/nginxinc/nginx-ingress-helm-operator/v2.3.0/resources/scc.yaml`
+`kubectl apply -f https://raw.githubusercontent.com/nginxinc/nginx-ingress-helm-operator/v2.3.1/resources/scc.yaml`
 
 Alternatively, to create an SCC for NIC daemonsets, please run this command:
 
-`kubectl apply -f https://raw.githubusercontent.com/nginxinc/nginx-ingress-helm-operator/v2.3.0/resources/scc-daemonset.yaml`
+`kubectl apply -f https://raw.githubusercontent.com/nginxinc/nginx-ingress-helm-operator/v2.3.1/resources/scc-daemonset.yaml`
 
 You can now deploy the NGINX Ingress Controller instances.
 

docs/nginx-ingress-controller.md

@@ -47,7 +47,7 @@ spec:
     customPorts: []
     image:
       repository: nginx/nginx-ingress
-      tag: "3.6.0-ubi"
+      tag: "3.6.1-ubi"
       # digest: "sha256:CHANGEME"
       pullPolicy: IfNotPresent
     lifecycle: {}

docs/openshift-installation.md

@@ -23,10 +23,10 @@ Additional steps:
 
 In order to deploy NGINX Ingress Controller instances into OpenShift environments, a new SCC is required to be created on the cluster which will be used to bind the specific required capabilities to the NGINX Ingress service account(s). To do so for NIC deployments, please run the following command (assuming you are logged in with administrator access to the cluster):
 
-`kubectl apply -f https://raw.githubusercontent.com/nginxinc/nginx-ingress-helm-operator/v2.3.0/resources/scc.yaml`
+`kubectl apply -f https://raw.githubusercontent.com/nginxinc/nginx-ingress-helm-operator/v2.3.1/resources/scc.yaml`
 
 Alternatively, to create an SCC for NIC daemonsets, please run this command:
 
-`kubectl apply -f https://raw.githubusercontent.com/nginxinc/nginx-ingress-helm-operator/v2.3.0/resources/scc-daemonset.yaml`
+`kubectl apply -f https://raw.githubusercontent.com/nginxinc/nginx-ingress-helm-operator/v2.3.1/resources/scc-daemonset.yaml`
 
 You can now deploy the NGINX Ingress Controller instances.

examples/deployment-oss-min/nginx-ingress-controller.yaml

@@ -11,7 +11,7 @@ spec:
     image:
       pullPolicy: IfNotPresent
       repository: nginx/nginx-ingress
-      tag: 3.6.0-ubi
+      tag: 3.6.1-ubi
     ingressClass:
       name: nginx
     kind: deployment

examples/deployment-plus-min/nginx-ingress-controller.yaml

@@ -11,7 +11,7 @@ spec:
     image:
       pullPolicy: IfNotPresent
       repository: nginx/nginx-ingress
-      tag: 3.6.0-ubi
+      tag: 3.6.1-ubi
     ingressClass:
       name: nginx
     kind: deployment

helm-charts/nginx-ingress/Chart.yaml

@@ -1,8 +1,8 @@
 apiVersion: v2
-appVersion: 3.6.0
+appVersion: 3.6.1
 description: NGINX Ingress Controller
 home: https://github.com/nginxinc/kubernetes-ingress
-icon: https://raw.githubusercontent.com/nginxinc/kubernetes-ingress/v3.6.0/charts/nginx-ingress/chart-icon.png
+icon: https://raw.githubusercontent.com/nginxinc/kubernetes-ingress/v3.6.1/charts/nginx-ingress/chart-icon.png
 keywords:
 - ingress
 - nginx
@@ -12,6 +12,6 @@ maintainers:
   name: nginxinc
 name: nginx-ingress
 sources:
-- https://github.com/nginxinc/kubernetes-ingress/tree/v3.6.0/charts/nginx-ingress
+- https://github.com/nginxinc/kubernetes-ingress/tree/v3.6.1/charts/nginx-ingress
 type: application
-version: 1.3.0
+version: 1.3.1

helm-charts/nginx-ingress/README.md

@@ -51,10 +51,10 @@ kubectl apply -f crds/
 Alternatively, CRDs can be upgraded without pulling the chart by running:
 
 ```console
-kubectl apply -f https://raw.githubusercontent.com/nginxinc/kubernetes-ingress/v3.6.0/deploy/crds.yaml
+kubectl apply -f https://raw.githubusercontent.com/nginxinc/kubernetes-ingress/v3.6.1/deploy/crds.yaml
 ```
 
-In the above command, `v3.6.0` represents the version of NGINX Ingress Controller release rather than the Helm chart version.
+In the above command, `v3.6.1` represents the version of NGINX Ingress Controller release rather than the Helm chart version.
 
 > **Note**
 >
@@ -87,14 +87,14 @@ To install the chart with the release name my-release (my-release is the name th
 For NGINX:
 
 ```console
-helm install my-release oci://ghcr.io/nginxinc/charts/nginx-ingress --version 1.3.0
+helm install my-release oci://ghcr.io/nginxinc/charts/nginx-ingress --version 1.3.1
 ```
 
 For NGINX Plus: (assuming you have pushed the Ingress Controller image `nginx-plus-ingress` to your private registry
 `myregistry.example.com`)
 
 ```console
-helm install my-release oci://ghcr.io/nginxinc/charts/nginx-ingress --version 1.3.0 --set controller.image.repository=myregistry.example.com/nginx-plus-ingress --set controller.nginxplus=true
+helm install my-release oci://ghcr.io/nginxinc/charts/nginx-ingress --version 1.3.1 --set controller.image.repository=myregistry.example.com/nginx-plus-ingress --set controller.nginxplus=true
 ```
 
 This will install the latest `edge` version of the Ingress Controller from GitHub Container Registry. If you prefer to
@@ -109,7 +109,7 @@ CRDs](#upgrading-the-crds).
 To upgrade the release `my-release`:
 
 ```console
-helm upgrade my-release oci://ghcr.io/nginxinc/charts/nginx-ingress --version 1.3.0
+helm upgrade my-release oci://ghcr.io/nginxinc/charts/nginx-ingress --version 1.3.1
 ```
 
 ### Uninstalling the Chart
@@ -150,7 +150,7 @@ upgrading/deleting the CRDs.
 1. Pull the chart sources:
 
     ```console
-    helm pull oci://ghcr.io/nginxinc/charts/nginx-ingress --untar --version 1.3.0
+    helm pull oci://ghcr.io/nginxinc/charts/nginx-ingress --untar --version 1.3.1
     ```
 
 2. Change your working directory to nginx-ingress:
@@ -236,7 +236,7 @@ The steps you should follow depend on the Helm release name:
     Selector:               app=nginx-ingress-nginx-ingress
     ```
 
-2. Checkout the latest available tag using `git checkout v3.6.0`
+2. Checkout the latest available tag using `git checkout v3.6.1`
 
 3. Navigate to `/kubernates-ingress/charts/nginx-ingress`
 
@@ -288,7 +288,7 @@ reviewing its events:
     Selector:               app=<helm_release_name>-nginx-ingress
     ```
 
-2. Checkout the latest available tag using `git checkout v3.6.0`
+2. Checkout the latest available tag using `git checkout v3.6.1`
 
 3. Navigate to `/kubernates-ingress/charts/nginx-ingress`
 
@@ -355,7 +355,7 @@ The following tables lists the configurable parameters of the NGINX Ingress Cont
 |`controller.logLevel` | The log level of the Ingress Controller. | 1 |
 |`controller.image.digest` | The image digest of the Ingress Controller. | None |
 |`controller.image.repository` | The image repository of the Ingress Controller. | nginx/nginx-ingress |
-|`controller.image.tag` | The tag of the Ingress Controller image. | 3.6.0 |
+|`controller.image.tag` | The tag of the Ingress Controller image. | 3.6.1 |
 |`controller.image.pullPolicy` | The pull policy for the Ingress Controller image. | IfNotPresent |
 |`controller.lifecycle` | The lifecycle of the Ingress Controller pods. | {} |
 |`controller.customConfigMap` | The name of the custom ConfigMap used by the Ingress Controller. If set, then the default config is ignored. | "" |
@@ -386,7 +386,7 @@ The following tables lists the configurable parameters of the NGINX Ingress Cont
 |`controller.initContainerResources` | The resources of the init container which is used when `readOnlyRootFilesystem` is enabled by either setting `controller.securityContext.readOnlyRootFilesystem` or `controller.readOnlyRootFilesystem`to `true`. | requests: cpu=100m,memory=128Mi |
 |`controller.replicaCount` | The number of replicas of the Ingress Controller deployment. | 1 |
 |`controller.ingressClass.name` | A class of the Ingress Controller. An IngressClass resource with the name equal to the class must be deployed. Otherwise, the Ingress Controller will fail to start. The Ingress Controller only processes resources that belong to its class - i.e. have the "ingressClassName" field resource equal to the class. The Ingress Controller processes all the VirtualServer/VirtualServerRoute/TransportServer resources that do not have the "ingressClassName" field for all versions of Kubernetes. | nginx |
-|`controller.ingressClass.create` | Creates a new IngressClass object with the name `controller.ingressClass.name`. Set to `false` to use an existing ingressClass created using `kubectl` with the same name. If you use `helm upgrade`, do not change the values from the previous release as helm will delete IngressClass objects managed by helm. If you are upgrading from a release earlier than 3.6.0, do not set the value to false. | true |
+|`controller.ingressClass.create` | Creates a new IngressClass object with the name `controller.ingressClass.name`. Set to `false` to use an existing ingressClass created using `kubectl` with the same name. If you use `helm upgrade`, do not change the values from the previous release as helm will delete IngressClass objects managed by helm. If you are upgrading from a release earlier than 3.6.1, do not set the value to false. | true |
 |`controller.ingressClass.setAsDefaultIngress` | New Ingresses without an `"ingressClassName"` field specified will be assigned the class specified in `controller.ingressClass.name`. Requires `controller.ingressClass.create`. | false |
 |`controller.watchNamespace` | Comma separated list of namespaces the Ingress Controller should watch for resources. By default the Ingress Controller watches all namespaces. Mutually exclusive with `controller.watchNamespaceLabel`. Please note that if configuring multiple namespaces using the Helm cli `--set` option, the string needs to wrapped in double quotes and the commas escaped using a backslash - e.g. `--set controller.watchNamespace="default\,nginx-ingress"`. | "" |
 |`controller.watchNamespaceLabel` | Configures the Ingress Controller to watch only those namespaces with label foo=bar. By default the Ingress Controller watches all namespaces. Mutually exclusive with `controller.watchNamespace`. | "" |