From f0dd7bf41222899fa7a6f595d12542a8c132c36a Mon Sep 17 00:00:00 2001 From: AlexFenlon <68860435+AlexFenlon@users.noreply.github.com> Date: Mon, 21 Jul 2025 11:09:01 +0000 Subject: [PATCH] Update NGINX Ingress Controller to 5.1.0 --- Makefile | 2 +- README.md | 4 ++-- ...inx-ingress-operator.clusterserviceversion.yaml | 8 ++++---- config/manager/kustomization.yaml | 2 +- config/manifests/bases/kustomization.yaml | 2 +- docs/manual-installation.md | 14 +++++++------- docs/openshift-installation.md | 4 ++-- 7 files changed, 18 insertions(+), 18 deletions(-) diff --git a/Makefile b/Makefile index 5348078f..11d7880d 100644 --- a/Makefile +++ b/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 ?= 3.2.1 +VERSION ?= 3.2.2 # 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") diff --git a/README.md b/README.md index fc73635b..64168bb0 100644 --- a/README.md +++ b/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 | | ------------------------ | ---------------------- | -| 5.1.x | 3.2.1 | +| 5.1.x | 3.2.2 | | 5.0.x | 3.1.0 | | 4.0.x | 3.0.1 | | 3.7.x | 2.4.2 | @@ -79,7 +79,7 @@ See [upgrade docs](./docs/upgrades.md) We publish NGINX Ingress Operator releases on GitHub. See our [releases page](https://github.com/nginx/nginx-ingress-helm-operator/releases). -The latest stable release is [3.2.1](https://github.com/nginx/nginx-ingress-helm-operator/releases/tag/v3.2.1). For production use, we recommend that you choose the latest stable release. +The latest stable release is [3.2.2](https://github.com/nginx/nginx-ingress-helm-operator/releases/tag/v3.2.2). For production use, we recommend that you choose the latest stable release. ## Development diff --git a/bundle/manifests/nginx-ingress-operator.clusterserviceversion.yaml b/bundle/manifests/nginx-ingress-operator.clusterserviceversion.yaml index b1b2ec8a..8baf98e1 100644 --- a/bundle/manifests/nginx-ingress-operator.clusterserviceversion.yaml +++ b/bundle/manifests/nginx-ingress-operator.clusterserviceversion.yaml @@ -223,7 +223,7 @@ metadata: capabilities: Basic Install categories: Monitoring, Networking certified: "true" - containerImage: quay.io/nginx/nginx-ingress-operator:3.2.1 + containerImage: quay.io/nginx/nginx-ingress-operator:3.2.2 createdAt: "2025-07-14T09:46:03Z" description: The NGINX Ingress Operator is a Kubernetes/OpenShift component which deploys and manages one or more NGINX/NGINX Plus Ingress Controllers @@ -245,7 +245,7 @@ metadata: labels: operatorframework.io/arch.amd64: supported operatorframework.io/arch.arm64: supported - name: nginx-ingress-operator.v3.2.1 + name: nginx-ingress-operator.v3.2.2 namespace: placeholder spec: apiservicedefinitions: {} @@ -466,7 +466,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:3.2.1 + image: quay.io/nginx/nginx-ingress-operator:3.2.2 livenessProbe: httpGet: path: /healthz @@ -523,4 +523,4 @@ spec: minKubeVersion: 1.26.0 provider: name: NGINX Inc - version: 3.2.1 + version: 3.2.2 diff --git a/config/manager/kustomization.yaml b/config/manager/kustomization.yaml index dda99335..af3e2d12 100644 --- a/config/manager/kustomization.yaml +++ b/config/manager/kustomization.yaml @@ -5,4 +5,4 @@ kind: Kustomization images: - name: controller newName: quay.io/nginx/nginx-ingress-operator - newTag: 3.2.1 + newTag: 3.2.2 diff --git a/config/manifests/bases/kustomization.yaml b/config/manifests/bases/kustomization.yaml index e78842b3..4cbc7310 100644 --- a/config/manifests/bases/kustomization.yaml +++ b/config/manifests/bases/kustomization.yaml @@ -3,4 +3,4 @@ resources: apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization commonAnnotations: - containerImage: quay.io/nginx/nginx-ingress-operator:3.2.1 + containerImage: quay.io/nginx/nginx-ingress-operator:3.2.2 diff --git a/docs/manual-installation.md b/docs/manual-installation.md index 044ab585..dfbd2c3a 100644 --- a/docs/manual-installation.md +++ b/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/nginx/nginx-ingress-helm-operator/ --branch v3.2.1 + git clone https://github.com/nginx/nginx-ingress-helm-operator/ --branch v3.2.2 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:3.2.1 + make deploy IMG=nginx/nginx-ingress-operator:3.2.2 ``` 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/nginx/nginx-ingress-helm-operator/v3.2.1/resources/scc.yaml` +`kubectl apply -f https://raw.githubusercontent.com/nginx/nginx-ingress-helm-operator/v3.2.2/resources/scc.yaml` Alternatively, to create an SCC for NIC daemonsets, please run this command: -`kubectl apply -f https://raw.githubusercontent.com/nginx/nginx-ingress-helm-operator/v3.2.1/resources/scc-daemonset.yaml` +`kubectl apply -f https://raw.githubusercontent.com/nginx/nginx-ingress-helm-operator/v3.2.2/resources/scc-daemonset.yaml` You can now deploy the NGINX Ingress Controller instances. @@ -44,19 +44,19 @@ You can now deploy the NGINX Ingress Controller instances. You can use the operator (including the kube-rbac-proxy) images from your own private registry. 1. Tag the images for your private registry ```shell - docker tag quay.io/nginx/nginx-ingress-operator:3.2.1 /nginx-ingress-operator:3.2.1 + docker tag quay.io/nginx/nginx-ingress-operator:3.2.2 /nginx-ingress-operator:3.2.2 docker tag quay.io/brancz/kube-rbac-proxy:v0.18.0 /kube-rbac-proxy:v0.18.0 ``` 2. Push the image to your private registry ```shell - docker push /nginx-ingress-operator:3.2.1 + docker push /nginx-ingress-operator:3.2.2 docker push /kube-rbac-proxy:v0.18.0 ``` 3. Follow step 1 above but in step 1.2 you can run ```shell - make deploy IMG=/nginx-ingress-operator:3.2.1 KRP_IMAGE_BASE=/kube-rbac-proxy + make deploy IMG=/nginx-ingress-operator:3.2.2 KRP_IMAGE_BASE=/kube-rbac-proxy ``` **Note: If you need to use a different `kube-rbac-proxy` version than the default, use the `KRP_IMAGE_TAG` variable** diff --git a/docs/openshift-installation.md b/docs/openshift-installation.md index 6022147f..61b81248 100644 --- a/docs/openshift-installation.md +++ b/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/nginx/nginx-ingress-helm-operator/v3.2.1/resources/scc.yaml` +`kubectl apply -f https://raw.githubusercontent.com/nginx/nginx-ingress-helm-operator/v3.2.2/resources/scc.yaml` Alternatively, to create an SCC for NIC daemonsets, please run this command: -`kubectl apply -f https://raw.githubusercontent.com/nginx/nginx-ingress-helm-operator/v3.2.1/resources/scc-daemonset.yaml` +`kubectl apply -f https://raw.githubusercontent.com/nginx/nginx-ingress-helm-operator/v3.2.2/resources/scc-daemonset.yaml` You can now deploy the NGINX Ingress Controller instances.