From 7925c4bf9482288e0982cd0593694970a663ed6f Mon Sep 17 00:00:00 2001 From: nginx-bot Date: Mon, 25 Nov 2024 09:20:48 +0000 Subject: [PATCH 1/3] Release 3.7.2 --- .github/data/version.txt | 4 +-- README.md | 4 +-- charts/nginx-ingress/Chart.yaml | 8 ++--- charts/nginx-ingress/values-icp.yaml | 2 +- charts/nginx-ingress/values-plus.yaml | 2 +- charts/nginx-ingress/values.schema.json | 10 +++--- charts/nginx-ingress/values.yaml | 2 +- deployments/daemon-set/nginx-ingress.yaml | 4 +-- .../daemon-set/nginx-plus-ingress.yaml | 4 +-- deployments/deployment/nginx-ingress.yaml | 4 +-- .../deployment/nginx-plus-ingress.yaml | 4 +-- .../service-insight/README.md | 4 +-- site/content/releases.md | 32 +++++++++++++++++++ site/layouts/shortcodes/nic-helm-version.html | 2 +- .../shortcodes/nic-operator-version.html | 2 +- site/layouts/shortcodes/nic-version.html | 2 +- 16 files changed, 61 insertions(+), 29 deletions(-) diff --git a/.github/data/version.txt b/.github/data/version.txt index 4ad5af6304..31f5eba8ee 100644 --- a/.github/data/version.txt +++ b/.github/data/version.txt @@ -1,2 +1,2 @@ -IC_VERSION=3.7.1 -HELM_CHART_VERSION=1.4.1 +IC_VERSION=3.7.2 +HELM_CHART_VERSION=1.4.2 diff --git a/README.md b/README.md index e3f59d84af..6620d84561 100644 --- a/README.md +++ b/README.md @@ -120,7 +120,7 @@ In the case of NGINX, the Ingress Controller is deployed in a pod along with the We publish NGINX Ingress Controller releases on GitHub. See our [releases page](https://github.com/nginxinc/kubernetes-ingress/releases). -The latest stable release is [3.7.1](https://github.com/nginxinc/kubernetes-ingress/releases/tag/v3.7.1). For production +The latest stable release is [3.7.2](https://github.com/nginxinc/kubernetes-ingress/releases/tag/v3.7.2). For production use, we recommend that you choose the latest stable release. The edge version is useful for experimenting with new features that are not yet published in a stable release. To use @@ -140,7 +140,7 @@ your links to the correct versions: | Version | Description | Image for NGINX | Image for NGINX Plus | Installation Manifests and Helm Chart | Documentation and Examples | | ------- | ----------- | --------------- | -------------------- | ---------------------------------------| -------------------------- | -| Latest stable release | For production use | Use the 3.7.1 images from [DockerHub](https://hub.docker.com/r/nginx/nginx-ingress/), [GitHub Container](https://github.com/nginxinc/kubernetes-ingress/pkgs/container/kubernetes-ingress), [Amazon ECR Public Gallery](https://gallery.ecr.aws/nginx/nginx-ingress) or [Quay.io](https://quay.io/repository/nginx/nginx-ingress) or [build your own image](https://docs.nginx.com/nginx-ingress-controller/installation/build-ingress-controller-image/). | Use the 3.7.1 images from the [F5 Container Registry](https://docs.nginx.com/nginx-ingress-controller/installation/pulling-ingress-controller-image/) or the [AWS Marketplace](https://aws.amazon.com/marketplace/search/?CREATOR=741df81b-dfdc-4d36-b8da-945ea66b522c&FULFILLMENT_OPTION_TYPE=CONTAINER&filters=CREATOR%2CFULFILLMENT_OPTION_TYPE) or [Build your own image](https://docs.nginx.com/nginx-ingress-controller/installation/build-nginx-ingress-controller/). | [Manifests](https://github.com/nginxinc/kubernetes-ingress/tree/v3.7.1/deployments). [Helm chart](https://github.com/nginxinc/kubernetes-ingress/tree/v3.7.1/charts/nginx-ingress). | [Documentation](https://docs.nginx.com/nginx-ingress-controller/). [Examples](https://docs.nginx.com/nginx-ingress-controller/configuration/configuration-examples/). | +| Latest stable release | For production use | Use the 3.7.2 images from [DockerHub](https://hub.docker.com/r/nginx/nginx-ingress/), [GitHub Container](https://github.com/nginxinc/kubernetes-ingress/pkgs/container/kubernetes-ingress), [Amazon ECR Public Gallery](https://gallery.ecr.aws/nginx/nginx-ingress) or [Quay.io](https://quay.io/repository/nginx/nginx-ingress) or [build your own image](https://docs.nginx.com/nginx-ingress-controller/installation/build-ingress-controller-image/). | Use the 3.7.2 images from the [F5 Container Registry](https://docs.nginx.com/nginx-ingress-controller/installation/pulling-ingress-controller-image/) or the [AWS Marketplace](https://aws.amazon.com/marketplace/search/?CREATOR=741df81b-dfdc-4d36-b8da-945ea66b522c&FULFILLMENT_OPTION_TYPE=CONTAINER&filters=CREATOR%2CFULFILLMENT_OPTION_TYPE) or [Build your own image](https://docs.nginx.com/nginx-ingress-controller/installation/build-nginx-ingress-controller/). | [Manifests](https://github.com/nginxinc/kubernetes-ingress/tree/v3.7.2/deployments). [Helm chart](https://github.com/nginxinc/kubernetes-ingress/tree/v3.7.2/charts/nginx-ingress). | [Documentation](https://docs.nginx.com/nginx-ingress-controller/). [Examples](https://docs.nginx.com/nginx-ingress-controller/configuration/configuration-examples/). | | Edge/Nightly | For testing and experimenting | Use the edge or nightly images from [DockerHub](https://hub.docker.com/r/nginx/nginx-ingress/), [GitHub Container](https://github.com/nginxinc/kubernetes-ingress/pkgs/container/kubernetes-ingress), [Amazon ECR Public Gallery](https://gallery.ecr.aws/nginx/nginx-ingress) or [Quay.io](https://quay.io/repository/nginx/nginx-ingress) or [build your own image](https://docs.nginx.com/nginx-ingress-controller/installation/build-nginx-ingress-controller/). | [Build your own image](https://docs.nginx.com/nginx-ingress-controller/installation/build-nginx-ingress-controller/). | [Manifests](https://github.com/nginxinc/kubernetes-ingress/tree/main/deployments). [Helm chart](https://github.com/nginxinc/kubernetes-ingress/tree/main/charts/nginx-ingress). | [Documentation](https://github.com/nginxinc/kubernetes-ingress/tree/main/site/content). [Examples](https://github.com/nginxinc/kubernetes-ingress/tree/main/examples). | ## SBOM (Software Bill of Materials) diff --git a/charts/nginx-ingress/Chart.yaml b/charts/nginx-ingress/Chart.yaml index bf1933139a..89f967fe40 100644 --- a/charts/nginx-ingress/Chart.yaml +++ b/charts/nginx-ingress/Chart.yaml @@ -1,14 +1,14 @@ apiVersion: v2 name: nginx-ingress -version: 1.4.1 -appVersion: 3.7.1 +version: 1.4.2 +appVersion: 3.7.2 kubeVersion: ">= 1.23.0-0" type: application description: NGINX Ingress Controller -icon: https://raw.githubusercontent.com/nginxinc/kubernetes-ingress/v3.7.1/charts/nginx-ingress/chart-icon.png +icon: https://raw.githubusercontent.com/nginxinc/kubernetes-ingress/v3.7.2/charts/nginx-ingress/chart-icon.png home: https://github.com/nginxinc/kubernetes-ingress sources: - - https://github.com/nginxinc/kubernetes-ingress/tree/v3.7.1/charts/nginx-ingress + - https://github.com/nginxinc/kubernetes-ingress/tree/v3.7.2/charts/nginx-ingress keywords: - ingress - nginx diff --git a/charts/nginx-ingress/values-icp.yaml b/charts/nginx-ingress/values-icp.yaml index d94b20ed02..d4047c389b 100644 --- a/charts/nginx-ingress/values-icp.yaml +++ b/charts/nginx-ingress/values-icp.yaml @@ -4,7 +4,7 @@ controller: nginxplus: true image: repository: mycluster.icp:8500/kube-system/nginx-plus-ingress - tag: "3.7.1" + tag: "3.7.2" nodeSelector: beta.kubernetes.io/arch: "amd64" proxy: true diff --git a/charts/nginx-ingress/values-plus.yaml b/charts/nginx-ingress/values-plus.yaml index 4971d5da56..4a0f44a0ac 100644 --- a/charts/nginx-ingress/values-plus.yaml +++ b/charts/nginx-ingress/values-plus.yaml @@ -3,4 +3,4 @@ controller: nginxplus: true image: repository: nginx-plus-ingress - tag: "3.7.1" + tag: "3.7.2" diff --git a/charts/nginx-ingress/values.schema.json b/charts/nginx-ingress/values.schema.json index c9107b36e9..cf84a50d98 100644 --- a/charts/nginx-ingress/values.schema.json +++ b/charts/nginx-ingress/values.schema.json @@ -540,10 +540,10 @@ }, "tag": { "type": "string", - "default": "3.7.1", + "default": "3.7.2", "title": "The tag of the Ingress Controller image", "examples": [ - "3.7.1" + "3.7.2" ] }, "digest": { @@ -580,7 +580,7 @@ "examples": [ { "repository": "nginx/nginx-ingress", - "tag": "3.7.1", + "tag": "3.7.2", "pullPolicy": "IfNotPresent" } ] @@ -1731,7 +1731,7 @@ "customPorts": [], "image": { "repository": "nginx/nginx-ingress", - "tag": "3.7.1", + "tag": "3.7.2", "digest": "", "pullPolicy": "IfNotPresent" }, @@ -2346,7 +2346,7 @@ "customPorts": [], "image": { "repository": "nginx/nginx-ingress", - "tag": "3.7.1", + "tag": "3.7.2", "digest": "", "pullPolicy": "IfNotPresent" }, diff --git a/charts/nginx-ingress/values.yaml b/charts/nginx-ingress/values.yaml index 7aca213d6e..0386a94fec 100644 --- a/charts/nginx-ingress/values.yaml +++ b/charts/nginx-ingress/values.yaml @@ -134,7 +134,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: "3.7.1" + # tag: "3.7.2" ## 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/deployments/daemon-set/nginx-ingress.yaml b/deployments/daemon-set/nginx-ingress.yaml index 95e4c1c261..65a7fa8ca1 100644 --- a/deployments/daemon-set/nginx-ingress.yaml +++ b/deployments/daemon-set/nginx-ingress.yaml @@ -32,7 +32,7 @@ spec: # - name: nginx-log # emptyDir: {} containers: - - image: nginx/nginx-ingress:3.7.1 + - image: nginx/nginx-ingress:3.7.2 imagePullPolicy: IfNotPresent name: nginx-ingress ports: @@ -95,7 +95,7 @@ spec: #- -enable-prometheus-metrics #- -global-configuration=$(POD_NAMESPACE)/nginx-configuration # initContainers: -# - image: nginx/nginx-ingress:3.7.1 +# - image: nginx/nginx-ingress:3.7.2 # imagePullPolicy: IfNotPresent # name: init-nginx-ingress # command: ['cp', '-vdR', '/etc/nginx/.', '/mnt/etc'] diff --git a/deployments/daemon-set/nginx-plus-ingress.yaml b/deployments/daemon-set/nginx-plus-ingress.yaml index e5a63033f1..3172fd833c 100644 --- a/deployments/daemon-set/nginx-plus-ingress.yaml +++ b/deployments/daemon-set/nginx-plus-ingress.yaml @@ -32,7 +32,7 @@ spec: # - name: nginx-log # emptyDir: {} containers: - - image: nginx-plus-ingress:3.7.1 + - image: nginx-plus-ingress:3.7.2 imagePullPolicy: IfNotPresent name: nginx-plus-ingress ports: @@ -98,7 +98,7 @@ spec: #- -enable-prometheus-metrics #- -global-configuration=$(POD_NAMESPACE)/nginx-configuration # initContainers: -# - image: nginx/nginx-ingress:3.7.1 +# - image: nginx/nginx-ingress:3.7.2 # imagePullPolicy: IfNotPresent # name: init-nginx-ingress # command: ['cp', '-vdR', '/etc/nginx/.', '/mnt/etc'] diff --git a/deployments/deployment/nginx-ingress.yaml b/deployments/deployment/nginx-ingress.yaml index c2708186a2..36bd5860f1 100644 --- a/deployments/deployment/nginx-ingress.yaml +++ b/deployments/deployment/nginx-ingress.yaml @@ -33,7 +33,7 @@ spec: # - name: nginx-log # emptyDir: {} containers: - - image: nginx/nginx-ingress:3.7.1 + - image: nginx/nginx-ingress:3.7.2 imagePullPolicy: IfNotPresent name: nginx-ingress ports: @@ -96,7 +96,7 @@ spec: #- -enable-prometheus-metrics #- -global-configuration=$(POD_NAMESPACE)/nginx-configuration # initContainers: -# - image: nginx/nginx-ingress:3.7.1 +# - image: nginx/nginx-ingress:3.7.2 # imagePullPolicy: IfNotPresent # name: init-nginx-ingress # command: ['cp', '-vdR', '/etc/nginx/.', '/mnt/etc'] diff --git a/deployments/deployment/nginx-plus-ingress.yaml b/deployments/deployment/nginx-plus-ingress.yaml index 42e7b1dafd..9645bcef1a 100644 --- a/deployments/deployment/nginx-plus-ingress.yaml +++ b/deployments/deployment/nginx-plus-ingress.yaml @@ -33,7 +33,7 @@ spec: # - name: nginx-log # emptyDir: {} containers: - - image: nginx-plus-ingress:3.7.1 + - image: nginx-plus-ingress:3.7.2 imagePullPolicy: IfNotPresent name: nginx-plus-ingress ports: @@ -102,7 +102,7 @@ spec: #- -enable-service-insight #- -global-configuration=$(POD_NAMESPACE)/nginx-configuration # initContainers: -# - image: nginx/nginx-ingress:3.7.1 +# - image: nginx/nginx-ingress:3.7.2 # imagePullPolicy: IfNotPresent # name: init-nginx-ingress # command: ['cp', '-vdR', '/etc/nginx/.', '/mnt/etc'] diff --git a/examples/custom-resources/service-insight/README.md b/examples/custom-resources/service-insight/README.md index 84da0510d0..bcbc329d8a 100644 --- a/examples/custom-resources/service-insight/README.md +++ b/examples/custom-resources/service-insight/README.md @@ -32,7 +32,7 @@ spec: securityContext: ... containers: - - image: nginx-plus-ingress:3.7.1 + - image: nginx-plus-ingress:3.7.2 imagePullPolicy: IfNotPresent name: nginx-plus-ingress ports: @@ -321,7 +321,7 @@ spec: securityContext: ... containers: - - image: nginx-plus-ingress:3.7.1 + - image: nginx-plus-ingress:3.7.2 imagePullPolicy: IfNotPresent name: nginx-plus-ingress ports: diff --git a/site/content/releases.md b/site/content/releases.md index 05bfe23397..b6cc47b3b0 100644 --- a/site/content/releases.md +++ b/site/content/releases.md @@ -6,6 +6,38 @@ doctypes: title: Releases toc: true weight: 2100 +## 3.7.2 + +25 Nov 2024 + +### Breaking Changes + +### Features + +### Fixes + +### Helm Chart + +### Dependencies + +### Upgrade + +- For NGINX, use the 3.7.2 images from our +[DockerHub](https://hub.docker.com/r/nginx/nginx-ingress/tags?page=1&ordering=last_updated&name=3.7.2), +[GitHub Container](https://github.com/nginxinc/kubernetes-ingress/pkgs/container/kubernetes-ingress), +[Amazon ECR Public Gallery](https://gallery.ecr.aws/nginx/nginx-ingress) or [Quay.io](https://quay.io/repository/nginx/nginx-ingress). +- For NGINX Plus, use the 3.7.2 images from the F5 Container registry, +the [AWS Marketplace](https://aws.amazon.com/marketplace/search/?CREATOR=741df81b-dfdc-4d36-b8da-945ea66b522c&FULFILLMENT_OPTION_TYPE=CONTAINER&filters=CREATOR%2CFULFILLMENT_OPTION_TYPE), +the [GCP Marketplace](https://console.cloud.google.com/marketplace/browse?filter=partner:F5,%20Inc.&filter=solution-type:k8s&filter=category:networking) +or build your own image using the 3.7.2 source code +- For Helm, use version 1.4.2 of the chart. + +### Supported Platforms + +We will provide technical support for NGINX Ingress Controller on any Kubernetes platform that is currently supported by +its provider and that passes the Kubernetes conformance tests. This release was fully tested on the following Kubernetes +versions: 1.25-1.31. + --- {{< note >}} diff --git a/site/layouts/shortcodes/nic-helm-version.html b/site/layouts/shortcodes/nic-helm-version.html index 13175fdc43..c9929e36a8 100644 --- a/site/layouts/shortcodes/nic-helm-version.html +++ b/site/layouts/shortcodes/nic-helm-version.html @@ -1 +1 @@ -1.4.1 \ No newline at end of file +1.4.2 \ No newline at end of file diff --git a/site/layouts/shortcodes/nic-operator-version.html b/site/layouts/shortcodes/nic-operator-version.html index 58073ef8d7..acdc3f1b0b 100644 --- a/site/layouts/shortcodes/nic-operator-version.html +++ b/site/layouts/shortcodes/nic-operator-version.html @@ -1 +1 @@ -2.4.1 \ No newline at end of file +2.4.2 \ No newline at end of file diff --git a/site/layouts/shortcodes/nic-version.html b/site/layouts/shortcodes/nic-version.html index 5cdb444f3d..47b6be3faf 100644 --- a/site/layouts/shortcodes/nic-version.html +++ b/site/layouts/shortcodes/nic-version.html @@ -1 +1 @@ -3.7.1 \ No newline at end of file +3.7.2 \ No newline at end of file From 94d0782a0bcded13f23eef105641cb4136d7d5a8 Mon Sep 17 00:00:00 2001 From: Venktesh Date: Mon, 25 Nov 2024 10:42:54 +0000 Subject: [PATCH 2/3] move frontmatter break and notes --- site/content/releases.md | 59 ++++++++++++++++++++-------------------- 1 file changed, 30 insertions(+), 29 deletions(-) diff --git a/site/content/releases.md b/site/content/releases.md index b6cc47b3b0..adf6bb775a 100644 --- a/site/content/releases.md +++ b/site/content/releases.md @@ -6,6 +6,36 @@ doctypes: title: Releases toc: true weight: 2100 + +--- +{{< note >}} +FIPS compliant images are currently impacted by compatibility issues with a dependent library. + +We recommend against: +1. Patching older FIPS images, which could re-introduce the incompatible dependency. +2. Building new custom FIPS images. +{{< /note >}} + +{{< note >}} +In our next major release, `v4.0.0`, the default log library for NGINX Ingress Controller will be changed from `golang/glog` to `log/slog`. +This will mean that logs generated by NGINX Ingress Controller will be in a structured format with the option to choose a `string` or `json` output. +This will not affect logs generated by NGINX. +To ensure backwards compatibility, we will ensure the existing log format, `glog`, will be maintained through a configuration option for the next 3 releases. +{{< /note >}} + +{{< important >}} +CRD version removal notice. +In our next major release, `v4.0.0`, support for the following apiVersions for these listed CRDs will be dropped: +1. `k8s.nginx.org/v1alpha` for `GlobalConfiguration` +2. `k8s.nginx.org/v1alpha` for `Policy` +3. `k8s.nginx.org/v1alpha` for `TransportServer` + +Prior to upgrading, **please ensure** that any of these resources deployed as `apiVersion: k8s.nginx.org/v1alpha1` are upgraded to `apiVersion: k8s.nginx.org/v1` +If a resource of `kind: GlobalConfiguration`, `kind: Policy` or `kind: TransportServer` are deployed as `apiVersion: k8s.nginx.org/v1alpha1`, these resources will be **deleted** when upgrading from, at least, `v3.4.0` to `v4.0.0` + +When `v4.0.0` is released, the release notes will contain the required upgrade steps to go from `v3.X.X` to `v4.X.X` +{{< /important >}} + ## 3.7.2 25 Nov 2024 @@ -38,36 +68,7 @@ We will provide technical support for NGINX Ingress Controller on any Kubernetes its provider and that passes the Kubernetes conformance tests. This release was fully tested on the following Kubernetes versions: 1.25-1.31. - --- -{{< note >}} -FIPS compliant images are currently impacted by compatibility issues with a dependent library. - -We recommend against: -1. Patching older FIPS images, which could re-introduce the incompatible dependency. -2. Building new custom FIPS images. -{{< /note >}} - -{{< note >}} -In our next major release, `v4.0.0`, the default log library for NGINX Ingress Controller will be changed from `golang/glog` to `log/slog`. -This will mean that logs generated by NGINX Ingress Controller will be in a structured format with the option to choose a `string` or `json` output. -This will not affect logs generated by NGINX. -To ensure backwards compatibility, we will ensure the existing log format, `glog`, will be maintained through a configuration option for the next 3 releases. -{{< /note >}} - -{{< important >}} -CRD version removal notice. -In our next major release, `v4.0.0`, support for the following apiVersions for these listed CRDs will be dropped: -1. `k8s.nginx.org/v1alpha` for `GlobalConfiguration` -2. `k8s.nginx.org/v1alpha` for `Policy` -3. `k8s.nginx.org/v1alpha` for `TransportServer` - -Prior to upgrading, **please ensure** that any of these resources deployed as `apiVersion: k8s.nginx.org/v1alpha1` are upgraded to `apiVersion: k8s.nginx.org/v1` -If a resource of `kind: GlobalConfiguration`, `kind: Policy` or `kind: TransportServer` are deployed as `apiVersion: k8s.nginx.org/v1alpha1`, these resources will be **deleted** when upgrading from, at least, `v3.4.0` to `v4.0.0` - -When `v4.0.0` is released, the release notes will contain the required upgrade steps to go from `v3.X.X` to `v4.X.X` -{{< /important >}} - ## 3.7.1 06 Nov 2024 From b3fbac82818f50f29a5ee8787fc5197a6aba29e5 Mon Sep 17 00:00:00 2001 From: Paul Abel Date: Mon, 25 Nov 2024 10:52:57 +0000 Subject: [PATCH 3/3] update release notes --- site/content/releases.md | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/site/content/releases.md b/site/content/releases.md index adf6bb775a..6b8aa8c6d4 100644 --- a/site/content/releases.md +++ b/site/content/releases.md @@ -40,15 +40,12 @@ When `v4.0.0` is released, the release notes will contain the required upgrade s 25 Nov 2024 -### Breaking Changes - -### Features - ### Fixes - -### Helm Chart +- [6838](https://github.com/nginxinc/kubernetes-ingress/pull/6838) Update oidc_template and conf ### Dependencies +- [6779](https://github.com/nginxinc/kubernetes-ingress/pull/6779), [6790](https://github.com/nginxinc/kubernetes-ingress/pull/6790) & [6851](https://github.com/nginxinc/kubernetes-ingress/pull/6851) Bump the Docker dependencies +- [6791](https://github.com/nginxinc/kubernetes-ingress/pull/6791), [6849](https://github.com/nginxinc/kubernetes-ingress/pull/6849) & [6839](https://github.com/nginxinc/kubernetes-ingress/pull/6839) Bump the go dependencies ### Upgrade