diff --git a/Makefile b/Makefile index 11d7880d..f70c00e0 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.2 +VERSION ?= 3.2.3 # 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 64168bb0..281816b3 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.2 | +| 5.1.x | 3.2.3 | | 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.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. +The latest stable release is [3.2.3](https://github.com/nginx/nginx-ingress-helm-operator/releases/tag/v3.2.3). 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 8baf98e1..c86959f6 100644 --- a/bundle/manifests/nginx-ingress-operator.clusterserviceversion.yaml +++ b/bundle/manifests/nginx-ingress-operator.clusterserviceversion.yaml @@ -77,7 +77,7 @@ metadata: "image": { "pullPolicy": "IfNotPresent", "repository": "nginx/nginx-ingress", - "tag": "5.1.0-ubi" + "tag": "5.1.1-ubi" }, "ingressClass": { "create": true, @@ -223,7 +223,7 @@ metadata: capabilities: Basic Install categories: Monitoring, Networking certified: "true" - containerImage: quay.io/nginx/nginx-ingress-operator:3.2.2 + containerImage: quay.io/nginx/nginx-ingress-operator:3.2.3 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.2 + name: nginx-ingress-operator.v3.2.3 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.2 + image: quay.io/nginx/nginx-ingress-operator:3.2.3 livenessProbe: httpGet: path: /healthz @@ -523,4 +523,4 @@ spec: minKubeVersion: 1.26.0 provider: name: NGINX Inc - version: 3.2.2 + version: 3.2.3 diff --git a/config/manager/kustomization.yaml b/config/manager/kustomization.yaml index af3e2d12..14d16687 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.2 + newTag: 3.2.3 diff --git a/config/manifests/bases/kustomization.yaml b/config/manifests/bases/kustomization.yaml index 4cbc7310..d5a35685 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.2 + containerImage: quay.io/nginx/nginx-ingress-operator:3.2.3 diff --git a/config/samples/charts_v1alpha1_nginxingress.yaml b/config/samples/charts_v1alpha1_nginxingress.yaml index 2394b9c6..6c9c8f4f 100644 --- a/config/samples/charts_v1alpha1_nginxingress.yaml +++ b/config/samples/charts_v1alpha1_nginxingress.yaml @@ -38,7 +38,7 @@ spec: customPorts: [] image: repository: nginx/nginx-ingress - tag: "5.1.0-ubi" + tag: "5.1.1-ubi" # digest: "sha256:CHANGEME" pullPolicy: IfNotPresent lifecycle: {} diff --git a/docs/manual-installation.md b/docs/manual-installation.md index dfbd2c3a..a5928bbe 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.2 + git clone https://github.com/nginx/nginx-ingress-helm-operator/ --branch v3.2.3 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.2 + make deploy IMG=nginx/nginx-ingress-operator:3.2.3 ``` 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.2/resources/scc.yaml` +`kubectl apply -f https://raw.githubusercontent.com/nginx/nginx-ingress-helm-operator/v3.2.3/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.2/resources/scc-daemonset.yaml` +`kubectl apply -f https://raw.githubusercontent.com/nginx/nginx-ingress-helm-operator/v3.2.3/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.2 /nginx-ingress-operator:3.2.2 + docker tag quay.io/nginx/nginx-ingress-operator:3.2.3 /nginx-ingress-operator:3.2.3 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.2 + docker push /nginx-ingress-operator:3.2.3 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.2 KRP_IMAGE_BASE=/kube-rbac-proxy + make deploy IMG=/nginx-ingress-operator:3.2.3 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/nginx-ingress-controller.md b/docs/nginx-ingress-controller.md index 21a95968..3800a101 100644 --- a/docs/nginx-ingress-controller.md +++ b/docs/nginx-ingress-controller.md @@ -50,7 +50,7 @@ spec: customPorts: [] image: repository: nginx/nginx-ingress - tag: "5.1.0-ubi" + tag: "5.1.1-ubi" # digest: "sha256:CHANGEME" pullPolicy: IfNotPresent lifecycle: {} diff --git a/docs/openshift-installation.md b/docs/openshift-installation.md index 61b81248..42bcd5e7 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.2/resources/scc.yaml` +`kubectl apply -f https://raw.githubusercontent.com/nginx/nginx-ingress-helm-operator/v3.2.3/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.2/resources/scc-daemonset.yaml` +`kubectl apply -f https://raw.githubusercontent.com/nginx/nginx-ingress-helm-operator/v3.2.3/resources/scc-daemonset.yaml` You can now deploy the NGINX Ingress Controller instances. diff --git a/examples/deployment-oss-min/nginx-ingress-controller.yaml b/examples/deployment-oss-min/nginx-ingress-controller.yaml index 40f72f3c..31c38e6e 100644 --- a/examples/deployment-oss-min/nginx-ingress-controller.yaml +++ b/examples/deployment-oss-min/nginx-ingress-controller.yaml @@ -11,7 +11,7 @@ spec: image: pullPolicy: IfNotPresent repository: nginx/nginx-ingress - tag: 5.1.0-ubi + tag: 5.1.1-ubi ingressClass: name: nginx kind: deployment diff --git a/examples/deployment-plus-min/nginx-ingress-controller.yaml b/examples/deployment-plus-min/nginx-ingress-controller.yaml index 7e6af815..ad417f87 100644 --- a/examples/deployment-plus-min/nginx-ingress-controller.yaml +++ b/examples/deployment-plus-min/nginx-ingress-controller.yaml @@ -11,7 +11,7 @@ spec: image: pullPolicy: IfNotPresent repository: nginx/nginx-ingress - tag: 5.1.0-ubi + tag: 5.1.1-ubi ingressClass: name: nginx kind: deployment diff --git a/helm-charts/nginx-ingress/Chart.yaml b/helm-charts/nginx-ingress/Chart.yaml index 8e3768b2..f5c399a9 100644 --- a/helm-charts/nginx-ingress/Chart.yaml +++ b/helm-charts/nginx-ingress/Chart.yaml @@ -1,8 +1,8 @@ apiVersion: v2 -appVersion: 5.1.0 +appVersion: 5.1.1 description: NGINX Ingress Controller home: https://github.com/nginx/kubernetes-ingress -icon: https://raw.githubusercontent.com/nginx/kubernetes-ingress/v5.1.0/charts/nginx-ingress/chart-icon.png +icon: https://raw.githubusercontent.com/nginx/kubernetes-ingress/v5.1.1/charts/nginx-ingress/chart-icon.png keywords: - ingress - nginx @@ -12,6 +12,6 @@ maintainers: name: nginx name: nginx-ingress sources: -- https://github.com/nginx/kubernetes-ingress/tree/v5.1.0/charts/nginx-ingress +- https://github.com/nginx/kubernetes-ingress/tree/v5.1.1/charts/nginx-ingress type: application -version: 2.2.1 +version: 2.2.2 diff --git a/helm-charts/nginx-ingress/values-icp.yaml b/helm-charts/nginx-ingress/values-icp.yaml index 772ea08e..6bedbf4a 100644 --- a/helm-charts/nginx-ingress/values-icp.yaml +++ b/helm-charts/nginx-ingress/values-icp.yaml @@ -4,7 +4,7 @@ controller: nginxplus: true image: repository: mycluster.icp:8500/kube-system/nginx-plus-ingress - tag: "5.1.0" + tag: "5.1.1" nodeSelector: beta.kubernetes.io/arch: "amd64" proxy: true diff --git a/helm-charts/nginx-ingress/values-plus.yaml b/helm-charts/nginx-ingress/values-plus.yaml index 0fca3723..ab6ebf3e 100644 --- a/helm-charts/nginx-ingress/values-plus.yaml +++ b/helm-charts/nginx-ingress/values-plus.yaml @@ -3,4 +3,4 @@ controller: nginxplus: true image: repository: nginx-plus-ingress - tag: "5.1.0" + tag: "5.1.1" diff --git a/helm-charts/nginx-ingress/values.schema.json b/helm-charts/nginx-ingress/values.schema.json index 9a5b27d9..20ce8d58 100644 --- a/helm-charts/nginx-ingress/values.schema.json +++ b/helm-charts/nginx-ingress/values.schema.json @@ -134,10 +134,11 @@ }, "interval": { "type": "string", - "pattern": "^[0-9]+[mhd]$", + "pattern": "^[0-9]+[smh]$", "default": "1h", "title": "The usage report interval Schema", "examples": [ + "60s", "1m", "1h", "24h" @@ -350,10 +351,10 @@ }, "tag": { "type": "string", - "default": "5.6.0", + "default": "5.8.0", "title": "The tag of the App Protect WAF v5 Enforcer image", "examples": [ - "5.6.0" + "5.8.0" ] }, "digest": { @@ -390,7 +391,7 @@ "examples": [ { "repository": "private-registry.nginx.com/nap/waf-enforcer", - "tag": "5.6.0", + "tag": "5.8.0", "pullPolicy": "IfNotPresent" } ] @@ -424,10 +425,10 @@ }, "tag": { "type": "string", - "default": "5.6.0", + "default": "5.8.0", "title": "The tag of the App Protect WAF v5 Config Manager image", "examples": [ - "5.6.0" + "5.8.0" ] }, "digest": { @@ -464,7 +465,7 @@ "examples": [ { "repository": "private-registry.nginx.com/nap/waf-config-mgr", - "tag": "5.6.0", + "tag": "5.8.0", "pullPolicy": "IfNotPresent" } ] @@ -697,10 +698,10 @@ }, "tag": { "type": "string", - "default": "5.1.0", + "default": "5.1.1", "title": "The tag of the Ingress Controller image", "examples": [ - "5.1.0" + "5.1.1" ] }, "digest": { @@ -737,7 +738,7 @@ "examples": [ { "repository": "nginx/nginx-ingress", - "tag": "5.1.0", + "tag": "5.1.1", "pullPolicy": "IfNotPresent" } ] @@ -1860,7 +1861,7 @@ "port": 50000, "image": { "repository": "private-registry.nginx.com/nap/waf-enforcer", - "tag": "5.6.0", + "tag": "5.8.0", "pullPolicy": "IfNotPresent" }, "securityContext": {} @@ -1868,7 +1869,7 @@ "configManager": { "image": { "repository": "private-registry.nginx.com/nap/waf-config-mgr", - "tag": "5.6.0", + "tag": "5.8.0", "pullPolicy": "IfNotPresent" }, "securityContext": { @@ -1908,7 +1909,7 @@ "customPorts": [], "image": { "repository": "nginx/nginx-ingress", - "tag": "5.1.0", + "tag": "5.1.1", "digest": "", "pullPolicy": "IfNotPresent" }, @@ -2503,7 +2504,7 @@ "port": 50000, "image": { "repository": "private-registry.nginx.com/nap/waf-enforcer", - "tag": "5.6.0", + "tag": "5.8.0", "pullPolicy": "IfNotPresent" }, "securityContext": {} @@ -2511,7 +2512,7 @@ "configManager": { "image": { "repository": "private-registry.nginx.com/nap/waf-config-mgr", - "tag": "5.6.0", + "tag": "5.8.0", "pullPolicy": "IfNotPresent" }, "securityContext": { @@ -2551,7 +2552,7 @@ "customPorts": [], "image": { "repository": "nginx/nginx-ingress", - "tag": "5.1.0", + "tag": "5.1.1", "digest": "", "pullPolicy": "IfNotPresent" }, diff --git a/helm-charts/nginx-ingress/values.yaml b/helm-charts/nginx-ingress/values.yaml index 2f781531..2eb1537a 100644 --- a/helm-charts/nginx-ingress/values.yaml +++ b/helm-charts/nginx-ingress/values.yaml @@ -24,7 +24,7 @@ controller: # usageReport: # endpoint: "product.connect.nginx.com" # Endpoint for usage report - # interval: 1h + # interval: 1h # Interval for usage report, must be between 60s and 24h, # proxyHost: "proxy.example.com:3138" # Proxy server for usage report, with optional port # proxyCredentialsSecretName: "proxy-credentials" # Secret containing proxy credentials, must contain a `username` and `password` field @@ -84,7 +84,7 @@ controller: repository: private-registry.nginx.com/nap/waf-enforcer ## The tag of the App Protect WAF v5 Enforcer image. - tag: "5.6.0" + tag: "5.8.0" ## The digest of the App Protect WAF v5 Enforcer image. ## If digest is specified it has precedence over tag and will be used instead # digest: "sha256:CHANGEME" @@ -100,7 +100,7 @@ controller: repository: private-registry.nginx.com/nap/waf-config-mgr ## The tag of the App Protect WAF v5 Configuration Manager image. - tag: "5.6.0" + tag: "5.8.0" ## The digest of the App Protect WAF v5 Configuration Manager image. ## If digest is specified it has precedence over tag and will be used instead # digest: "sha256:CHANGEME" @@ -172,7 +172,7 @@ controller: repository: nginx/nginx-ingress ## The tag of the Ingress Controller image. If not specified the appVersion from Chart.yaml is used as a tag. - # tag: "5.1.0" + # tag: "5.1.1" ## The digest of the Ingress Controller image. ## If digest is specified it has precedence over tag and will be used instead # digest: "sha256:CHANGEME" diff --git a/tests/nginx-ingress-controller-oss.yaml b/tests/nginx-ingress-controller-oss.yaml index 09b4224b..7a3f6b80 100644 --- a/tests/nginx-ingress-controller-oss.yaml +++ b/tests/nginx-ingress-controller-oss.yaml @@ -11,7 +11,7 @@ spec: image: pullPolicy: Always repository: nginx/nginx-ingress - tag: 5.1.0 + tag: 5.1.1 ingressClass: name: nginx kind: deployment