From 35ca6d552a4252341bc3caa7d17b4b51950f3f6b Mon Sep 17 00:00:00 2001 From: nginx-bot Date: Fri, 13 Dec 2024 11:09:07 +0000 Subject: [PATCH 01/11] Release 4.0.0 --- README.md | 4 +-- charts/nginx-ingress/Chart.yaml | 4 +-- 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 | 29 +++++++++++++++++++ site/layouts/shortcodes/nic-helm-version.html | 2 +- .../shortcodes/nic-operator-version.html | 2 +- site/layouts/shortcodes/nic-version.html | 2 +- 15 files changed, 54 insertions(+), 25 deletions(-) diff --git a/README.md b/README.md index f8652c3204..bb233cfc9e 100644 --- a/README.md +++ b/README.md @@ -125,7 +125,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.2](https://github.com/nginxinc/kubernetes-ingress/releases/tag/v3.7.2). For production +The latest stable release is [4.0.0](https://github.com/nginxinc/kubernetes-ingress/releases/tag/v4.0.0). 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 @@ -145,7 +145,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.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 [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/). | +| Latest stable release | For production use | Use the 4.0.0 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 4.0.0 images from the [F5 Container Registry](https://docs.nginx.com/nginx-ingress-controller/installation/pulling-ingress-controller-image/) 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/v4.0.0/deployments). [Helm chart](https://github.com/nginxinc/kubernetes-ingress/tree/v4.0.0/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 ea97012f9c..4e51e13877 100644 --- a/charts/nginx-ingress/Chart.yaml +++ b/charts/nginx-ingress/Chart.yaml @@ -5,10 +5,10 @@ appVersion: 4.0.0 kubeVersion: ">= 1.23.0-0" type: application description: NGINX Ingress Controller -icon: https://raw.githubusercontent.com/nginxinc/kubernetes-ingress/v3.7.2/charts/nginx-ingress/chart-icon.png +icon: https://raw.githubusercontent.com/nginxinc/kubernetes-ingress/v4.0.0/charts/nginx-ingress/chart-icon.png home: https://github.com/nginxinc/kubernetes-ingress sources: - - https://github.com/nginxinc/kubernetes-ingress/tree/v3.7.2/charts/nginx-ingress + - https://github.com/nginxinc/kubernetes-ingress/tree/v4.0.0/charts/nginx-ingress keywords: - ingress - nginx diff --git a/charts/nginx-ingress/values-icp.yaml b/charts/nginx-ingress/values-icp.yaml index d4047c389b..c07addffd0 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.2" + tag: "4.0.0" 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 4a0f44a0ac..91e3493750 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.2" + tag: "4.0.0" diff --git a/charts/nginx-ingress/values.schema.json b/charts/nginx-ingress/values.schema.json index 37fa09e886..66a2a0fbf3 100644 --- a/charts/nginx-ingress/values.schema.json +++ b/charts/nginx-ingress/values.schema.json @@ -674,10 +674,10 @@ }, "tag": { "type": "string", - "default": "3.7.2", + "default": "4.0.0", "title": "The tag of the Ingress Controller image", "examples": [ - "3.7.2" + "4.0.0" ] }, "digest": { @@ -714,7 +714,7 @@ "examples": [ { "repository": "nginx/nginx-ingress", - "tag": "3.7.2", + "tag": "4.0.0", "pullPolicy": "IfNotPresent" } ] @@ -1865,7 +1865,7 @@ "customPorts": [], "image": { "repository": "nginx/nginx-ingress", - "tag": "3.7.2", + "tag": "4.0.0", "digest": "", "pullPolicy": "IfNotPresent" }, @@ -2479,7 +2479,7 @@ "customPorts": [], "image": { "repository": "nginx/nginx-ingress", - "tag": "3.7.2", + "tag": "4.0.0", "digest": "", "pullPolicy": "IfNotPresent" }, diff --git a/charts/nginx-ingress/values.yaml b/charts/nginx-ingress/values.yaml index 9fc4bb2dea..09f89f295f 100644 --- a/charts/nginx-ingress/values.yaml +++ b/charts/nginx-ingress/values.yaml @@ -170,7 +170,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.2" + # tag: "4.0.0" ## 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 9b879032f9..a3b502d47b 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.2 + - image: nginx/nginx-ingress:4.0.0 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.2 +# - image: nginx/nginx-ingress:4.0.0 # 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 339775eefb..61f83c6e7e 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.2 + - image: nginx-plus-ingress:4.0.0 imagePullPolicy: IfNotPresent name: nginx-plus-ingress ports: @@ -100,7 +100,7 @@ spec: #- -enable-prometheus-metrics #- -global-configuration=$(POD_NAMESPACE)/nginx-configuration # initContainers: -# - image: nginx/nginx-ingress:3.7.2 +# - image: nginx/nginx-ingress:4.0.0 # 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 d1095a047b..4e4d268470 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.2 + - image: nginx/nginx-ingress:4.0.0 imagePullPolicy: IfNotPresent name: nginx-ingress ports: @@ -97,7 +97,7 @@ spec: #- -enable-prometheus-metrics #- -global-configuration=$(POD_NAMESPACE)/nginx-configuration # initContainers: -# - image: nginx/nginx-ingress:3.7.2 +# - image: nginx/nginx-ingress:4.0.0 # 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 9900c5f992..85313316ce 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.2 + - image: nginx-plus-ingress:4.0.0 imagePullPolicy: IfNotPresent name: nginx-plus-ingress ports: @@ -104,7 +104,7 @@ spec: #- -enable-service-insight #- -global-configuration=$(POD_NAMESPACE)/nginx-configuration # initContainers: -# - image: nginx/nginx-ingress:3.7.2 +# - image: nginx/nginx-ingress:4.0.0 # 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 bcbc329d8a..c181c9cc4b 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.2 + - image: nginx-plus-ingress:4.0.0 imagePullPolicy: IfNotPresent name: nginx-plus-ingress ports: @@ -321,7 +321,7 @@ spec: securityContext: ... containers: - - image: nginx-plus-ingress:3.7.2 + - image: nginx-plus-ingress:4.0.0 imagePullPolicy: IfNotPresent name: nginx-plus-ingress ports: diff --git a/site/content/releases.md b/site/content/releases.md index cbb810d778..ff085c9e30 100644 --- a/site/content/releases.md +++ b/site/content/releases.md @@ -6,6 +6,35 @@ doctypes: title: Releases toc: true weight: 2100 +## 4.0.0 + +16 Dec 2024 + +### Breaking Changes + +### Features + +### Fixes + +### Helm Chart + +### Dependencies + +### Upgrade + +- For NGINX, use the 4.0.0 images from our +[DockerHub](https://hub.docker.com/r/nginx/nginx-ingress/tags?page=1&ordering=last_updated&name=4.0.0), +[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 4.0.0 images from the F5 Container registry or build your own image using the 4.0.0 source code +- For Helm, use version 2.0.0 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.32. + --- {{< note >}} diff --git a/site/layouts/shortcodes/nic-helm-version.html b/site/layouts/shortcodes/nic-helm-version.html index c9929e36a8..359a5b952d 100644 --- a/site/layouts/shortcodes/nic-helm-version.html +++ b/site/layouts/shortcodes/nic-helm-version.html @@ -1 +1 @@ -1.4.2 \ No newline at end of file +2.0.0 \ 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 acdc3f1b0b..fad066f801 100644 --- a/site/layouts/shortcodes/nic-operator-version.html +++ b/site/layouts/shortcodes/nic-operator-version.html @@ -1 +1 @@ -2.4.2 \ No newline at end of file +2.5.0 \ No newline at end of file diff --git a/site/layouts/shortcodes/nic-version.html b/site/layouts/shortcodes/nic-version.html index 47b6be3faf..0c89fc927e 100644 --- a/site/layouts/shortcodes/nic-version.html +++ b/site/layouts/shortcodes/nic-version.html @@ -1 +1 @@ -3.7.2 \ No newline at end of file +4.0.0 \ No newline at end of file From a1bb4f0daab5b5047c928265d7073e9c57251a82 Mon Sep 17 00:00:00 2001 From: Paul Abel Date: Fri, 13 Dec 2024 12:25:47 +0000 Subject: [PATCH 02/11] fix release notes hugo structure --- site/content/releases.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/site/content/releases.md b/site/content/releases.md index ff085c9e30..7e257b6fca 100644 --- a/site/content/releases.md +++ b/site/content/releases.md @@ -6,6 +6,8 @@ doctypes: title: Releases toc: true weight: 2100 + +--- ## 4.0.0 16 Dec 2024 From 938cbf719324b36b5d70ec510383de12fd7d072e Mon Sep 17 00:00:00 2001 From: Paul Abel Date: Mon, 16 Dec 2024 12:27:28 +0000 Subject: [PATCH 03/11] update release notes --- site/content/releases.md | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/site/content/releases.md b/site/content/releases.md index 7e257b6fca..59f5f8f974 100644 --- a/site/content/releases.md +++ b/site/content/releases.md @@ -13,14 +13,30 @@ weight: 2100 16 Dec 2024 ### Breaking Changes +- [6520](https://github.com/nginxinc/kubernetes-ingress/pull/6520) Add LogLevel & LogFormat flags +- [6800](https://github.com/nginxinc/kubernetes-ingress/pull/6800) Deprecate v1alpha1 CRDs for GlobalConfiguration, Policy & TransportServer +- [6903](https://github.com/nginxinc/kubernetes-ingress/pull/6903) Add license secret and mgmt config map ### Features +- [6474](https://github.com/nginxinc/kubernetes-ingress/pull/6474) Add glog slog handler +- [6605](https://github.com/nginxinc/kubernetes-ingress/pull/6605) TransportServer SNI +- [6819](https://github.com/nginxinc/kubernetes-ingress/pull/6819) Add events to configmap +- [6878](https://github.com/nginxinc/kubernetes-ingress/pull/6878) Add events when special secrets update +- [6921](https://github.com/nginxinc/kubernetes-ingress/pull/6921) Add additional mgmt config parameters ### Fixes +- [6583](https://github.com/nginxinc/kubernetes-ingress/pull/6583) Generate valid yaml for ReadOnly FS +- [6635](https://github.com/nginxinc/kubernetes-ingress/pull/6635) UpstreamServer Fields Logs Displayed as Memory Addresses +- [6661](https://github.com/nginxinc/kubernetes-ingress/pull/6661) Revert to original main-template without pod downtime +- [6733](https://github.com/nginxinc/kubernetes-ingress/pull/6733) Add nil check to apikey suppliedIn +- [6780](https://github.com/nginxinc/kubernetes-ingress/pull/6780) Use default VS and TS templates when CfgMap obj is deleted ### Helm Chart +- [6667](https://github.com/nginxinc/kubernetes-ingress/pull/6667) Helm schema examples ### Dependencies +- [6485](https://github.com/nginxinc/kubernetes-ingress/pull/6485), [6497](https://github.com/nginxinc/kubernetes-ingress/pull/6497), [6512](https://github.com/nginxinc/kubernetes-ingress/pull/6512), [6533](https://github.com/nginxinc/kubernetes-ingress/pull/6533), [6543](https://github.com/nginxinc/kubernetes-ingress/pull/6543), [6557](https://github.com/nginxinc/kubernetes-ingress/pull/6557), [6580](https://github.com/nginxinc/kubernetes-ingress/pull/6580), [6607](https://github.com/nginxinc/kubernetes-ingress/pull/6607), [6638](https://github.com/nginxinc/kubernetes-ingress/pull/6638), [6654](https://github.com/nginxinc/kubernetes-ingress/pull/6654), [6657](https://github.com/nginxinc/kubernetes-ingress/pull/6657), [6676](https://github.com/nginxinc/kubernetes-ingress/pull/6676), [6685](https://github.com/nginxinc/kubernetes-ingress/pull/6685), [6699](https://github.com/nginxinc/kubernetes-ingress/pull/6699), [6697](https://github.com/nginxinc/kubernetes-ingress/pull/6697), [6719](https://github.com/nginxinc/kubernetes-ingress/pull/6719), [6717](https://github.com/nginxinc/kubernetes-ingress/pull/6717), [6747](https://github.com/nginxinc/kubernetes-ingress/pull/6747), [6743](https://github.com/nginxinc/kubernetes-ingress/pull/6743), [6775](https://github.com/nginxinc/kubernetes-ingress/pull/6775), [6789](https://github.com/nginxinc/kubernetes-ingress/pull/6789), [6762](https://github.com/nginxinc/kubernetes-ingress/pull/6762), [6786](https://github.com/nginxinc/kubernetes-ingress/pull/6786), [6845](https://github.com/nginxinc/kubernetes-ingress/pull/6845), [6864](https://github.com/nginxinc/kubernetes-ingress/pull/6864), [6880](https://github.com/nginxinc/kubernetes-ingress/pull/6880), [6862](https://github.com/nginxinc/kubernetes-ingress/pull/6862), [6897](https://github.com/nginxinc/kubernetes-ingress/pull/6897), [6890](https://github.com/nginxinc/kubernetes-ingress/pull/6890), [6905](https://github.com/nginxinc/kubernetes-ingress/pull/6905), [6906](https://github.com/nginxinc/kubernetes-ingress/pull/6906), [6909](https://github.com/nginxinc/kubernetes-ingress/pull/6909), [6919](https://github.com/nginxinc/kubernetes-ingress/pull/6919), [6936](https://github.com/nginxinc/kubernetes-ingress/pull/6936), [6945](https://github.com/nginxinc/kubernetes-ingress/pull/6945), [6971](https://github.com/nginxinc/kubernetes-ingress/pull/6971) & [6982](https://github.com/nginxinc/kubernetes-ingress/pull/6982) Bump the Docker dependencies +- [6483](https://github.com/nginxinc/kubernetes-ingress/pull/6483), [6496](https://github.com/nginxinc/kubernetes-ingress/pull/6496), [6522](https://github.com/nginxinc/kubernetes-ingress/pull/6522), [6540](https://github.com/nginxinc/kubernetes-ingress/pull/6540), [6559](https://github.com/nginxinc/kubernetes-ingress/pull/6559), [6589](https://github.com/nginxinc/kubernetes-ingress/pull/6589), [6614](https://github.com/nginxinc/kubernetes-ingress/pull/6614), [6643](https://github.com/nginxinc/kubernetes-ingress/pull/6643), [6669](https://github.com/nginxinc/kubernetes-ingress/pull/6669), [6683](https://github.com/nginxinc/kubernetes-ingress/pull/6683), [6704](https://github.com/nginxinc/kubernetes-ingress/pull/6704), [6712](https://github.com/nginxinc/kubernetes-ingress/pull/6712), [6728](https://github.com/nginxinc/kubernetes-ingress/pull/6728), [6745](https://github.com/nginxinc/kubernetes-ingress/pull/6745), [6767](https://github.com/nginxinc/kubernetes-ingress/pull/6767), [6782](https://github.com/nginxinc/kubernetes-ingress/pull/6782), [6815](https://github.com/nginxinc/kubernetes-ingress/pull/6815), [6826](https://github.com/nginxinc/kubernetes-ingress/pull/6826), [6835](https://github.com/nginxinc/kubernetes-ingress/pull/6835), [6842](https://github.com/nginxinc/kubernetes-ingress/pull/6842), [6861](https://github.com/nginxinc/kubernetes-ingress/pull/6861), [6916](https://github.com/nginxinc/kubernetes-ingress/pull/6916), [6908](https://github.com/nginxinc/kubernetes-ingress/pull/6908), [6931](https://github.com/nginxinc/kubernetes-ingress/pull/6931), [6969](https://github.com/nginxinc/kubernetes-ingress/pull/6969), [6973](https://github.com/nginxinc/kubernetes-ingress/pull/6973), [6988](https://github.com/nginxinc/kubernetes-ingress/pull/6988) & [6994](https://github.com/nginxinc/kubernetes-ingress/pull/6994) Bump the go dependencies ### Upgrade From 3aa0b9e7bf7496c42011866ce4bf413596214242 Mon Sep 17 00:00:00 2001 From: Paul Abel Date: Mon, 16 Dec 2024 13:39:55 +0000 Subject: [PATCH 04/11] update operator to 3.0.0 --- site/layouts/shortcodes/nic-operator-version.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/site/layouts/shortcodes/nic-operator-version.html b/site/layouts/shortcodes/nic-operator-version.html index fad066f801..56fea8a08d 100644 --- a/site/layouts/shortcodes/nic-operator-version.html +++ b/site/layouts/shortcodes/nic-operator-version.html @@ -1 +1 @@ -2.5.0 \ No newline at end of file +3.0.0 \ No newline at end of file From 8670c943a9128a2bb6cfa435b9c4d0e8271e60ee Mon Sep 17 00:00:00 2001 From: Paul Abel Date: Mon, 16 Dec 2024 14:05:40 +0000 Subject: [PATCH 05/11] include upgrade docs in release notes --- site/content/releases.md | 1 + 1 file changed, 1 insertion(+) diff --git a/site/content/releases.md b/site/content/releases.md index 59f5f8f974..061d380504 100644 --- a/site/content/releases.md +++ b/site/content/releases.md @@ -46,6 +46,7 @@ weight: 2100 [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 4.0.0 images from the F5 Container registry or build your own image using the 4.0.0 source code - For Helm, use version 2.0.0 of the chart. +- [Upgrading to v4]({{< relref "installation/installing-nic/upgrade-to-v4" >}}) ### Supported Platforms From 6cc1ae06d7eeaffcaee18ce1fea461cc0e220106 Mon Sep 17 00:00:00 2001 From: Paul Abel Date: Mon, 16 Dec 2024 14:24:44 +0000 Subject: [PATCH 06/11] update techspecs --- site/content/technical-specifications.md | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/site/content/technical-specifications.md b/site/content/technical-specifications.md index 554569285c..60c8584123 100644 --- a/site/content/technical-specifications.md +++ b/site/content/technical-specifications.md @@ -28,7 +28,8 @@ We test NGINX Ingress Controller on a range of Kubernetes platforms for each rel {{< bootstrap-table "table table-bordered table-striped table-responsive" >}} | NIC Version | Supported Kubernetes Version | NIC Helm Chart Version | NIC Operator Version | NGINX / NGINX Plus version | | --- | --- | --- | --- | --- | -| {{< nic-version >}} | 1.25 - 1.31 | {{< nic-helm-version >}} | {{< nic-operator-version >}} | 1.27.2 / R32 P1 | +| {{< nic-version >}} | 1.25 - 1.32 | {{< nic-helm-version >}} | {{< nic-operator-version >}} | 1.27.3 / R33 P1 | +| 3.7.2 | 1.25 - 1.31 | 1.4.2 | 2.4.2 | 1.27.2 / R32 P1 | | 3.6.2 | 1.25 - 1.31 | 1.3.2 | 2.3.2 | 1.27.1 / R32 P1 | | 3.5.2 | 1.23 - 1.30 | 1.2.2 | 2.2.2 | 1.27.0 / R32 | | 3.4.3 | 1.23 - 1.29 | 1.1.3 | 2.1.2 | 1.25.4 / R31 P1 | @@ -48,13 +49,13 @@ We provide the following Docker images, which include NGINX or NGINX Plus bundle ### Images with NGINX -_All images include NGINX 1.27.2._ +_All images include NGINX 1.27.3._ {{< bootstrap-table "table table-bordered table-responsive" >}} |
Name
|
Base image
|
Third-party modules
| DockerHub image | Architectures | | ---| --- | --- | --- | --- | -|Alpine-based image | ``nginx:1.27.2-alpine``,
based on on ``alpine:3.20`` | NGINX OpenTracing module

OpenTracing library

OpenTracing tracers for Jaeger

Zipkin and Datadog | ``nginx/nginx-ingress:{{< nic-version >}}-alpine`` | arm/v7
arm64
amd64
ppc64le
s390x | -|Debian-based image | ``nginx:1.27.2``,
based on on ``debian:12-slim`` | NGINX OpenTracing module

OpenTracing library

OpenTracing tracers for Jaeger

Zipkin and Datadog | ``nginx/nginx-ingress:{{< nic-version >}}`` | arm/v7
arm64
amd64
ppc64le
s390x | +|Alpine-based image | ``nginx:1.27.3-alpine``,
based on on ``alpine:3.20`` | NGINX OpenTracing module

OpenTracing library

OpenTracing tracers for Jaeger

Zipkin and Datadog | ``nginx/nginx-ingress:{{< nic-version >}}-alpine`` | arm/v7
arm64
amd64
ppc64le
s390x | +|Debian-based image | ``nginx:1.27.3``,
based on on ``debian:12-slim`` | NGINX OpenTracing module

OpenTracing library

OpenTracing tracers for Jaeger

Zipkin and Datadog | ``nginx/nginx-ingress:{{< nic-version >}}`` | arm/v7
arm64
amd64
ppc64le
s390x | |Ubi-based image | ``redhat/ubi9-minimal`` | | ``nginx/nginx-ingress:{{< nic-version >}}-ubi`` | arm64
amd64
ppc64le
s390x | {{% /bootstrap-table %}} @@ -62,7 +63,7 @@ _All images include NGINX 1.27.2._ ### Images with NGINX Plus -_NGINX Plus images include NGINX Plus R32._ +_NGINX Plus images include NGINX Plus R33._ --- From 65f6896162e0f54c3975e5f0321a0d842e39708b Mon Sep 17 00:00:00 2001 From: Paul Abel Date: Mon, 16 Dec 2024 14:27:52 +0000 Subject: [PATCH 07/11] remove unsupported architectures --- site/content/technical-specifications.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/site/content/technical-specifications.md b/site/content/technical-specifications.md index 60c8584123..1c8f56e5e4 100644 --- a/site/content/technical-specifications.md +++ b/site/content/technical-specifications.md @@ -76,14 +76,14 @@ NGINX Plus images are available through the F5 Container registry `private-regis | ---| ---| --- | --- | --- | |Alpine-based image | ``alpine:3.20`` | NGINX Plus JavaScript and OpenTracing modules

OpenTracing tracers for Jaeger

Zipkin and Datadog | `nginx-ic/nginx-plus-ingress:{{< nic-version >}}-alpine` | arm64
amd64 | |Alpine-based image with FIPS inside | ``alpine:3.20`` | NGINX Plus JavaScript and OpenTracing modules

OpenTracing tracers for Jaeger

Zipkin and Datadog

FIPS module and OpenSSL configuration | `nginx-ic/nginx-plus-ingress:{{< nic-version >}}-alpine-fips` | arm64
amd64 | -|Alpine-based image with NGINX App Protect WAF & FIPS inside | ``alpine:3.17`` | NGINX App Protect WAF

NGINX Plus JavaScript and OpenTracing modules

OpenTracing tracers for Jaeger

Zipkin and Datadog

FIPS module and OpenSSL configuration | `nginx-ic-nap/nginx-plus-ingress:{{< nic-version >}}-alpine-fips` | arm64
amd64 | -|Alpine-based image with NGINX App Protect WAF v5 & FIPS inside | ``alpine:3.17`` | NGINX App Protect WAF v5

NGINX Plus JavaScript and OpenTracing modules

OpenTracing tracers for Jaeger

Zipkin and Datadog

FIPS module and OpenSSL configuration | `nginx-ic-nap-v5/nginx-plus-ingress:{{< nic-version >}}-alpine-fips` | arm64
amd64 | +|Alpine-based image with NGINX App Protect WAF & FIPS inside | ``alpine:3.17`` | NGINX App Protect WAF

NGINX Plus JavaScript and OpenTracing modules

OpenTracing tracers for Jaeger

Zipkin and Datadog

FIPS module and OpenSSL configuration | `nginx-ic-nap/nginx-plus-ingress:{{< nic-version >}}-alpine-fips` | amd64 | +|Alpine-based image with NGINX App Protect WAF v5 & FIPS inside | ``alpine:3.17`` | NGINX App Protect WAF v5

NGINX Plus JavaScript and OpenTracing modules

OpenTracing tracers for Jaeger

Zipkin and Datadog

FIPS module and OpenSSL configuration | `nginx-ic-nap-v5/nginx-plus-ingress:{{< nic-version >}}-alpine-fips` | amd64 | |Debian-based image | ``debian:12-slim`` | NGINX Plus JavaScript and OpenTracing modules

OpenTracing tracers for Jaeger

Zipkin and Datadog | `nginx-ic/nginx-plus-ingress:{{< nic-version >}}` | arm64
amd64 | |Debian-based image with NGINX App Protect WAF | ``debian:12-slim`` | NGINX App Protect WAF

NGINX Plus JavaScript and OpenTracing modules

OpenTracing tracers for Jaeger

Zipkin and Datadog | `nginx-ic-nap/nginx-plus-ingress:{{< nic-version >}}` | amd64 | |Debian-based image with NGINX App Protect WAF v5 | ``debian:12-slim`` | NGINX App Protect WAF v5

NGINX Plus JavaScript and OpenTracing modules

OpenTracing tracers for Jaeger

Zipkin and Datadog | `nginx-ic-nap-v5/nginx-plus-ingress:{{< nic-version >}}` | amd64 | |Debian-based image with NGINX App Protect DoS | ``debian:12-slim`` | NGINX App Protect DoS

NGINX Plus JavaScript and OpenTracing modules

OpenTracing tracers for Jaeger

Zipkin and Datadog | `nginx-ic-dos/nginx-plus-ingress:{{< nic-version >}}` | amd64 | |Debian-based image with NGINX App Protect WAF and DoS | ``debian:12-slim`` | NGINX App Protect WAF and DoS

NGINX Plus JavaScript and OpenTracing modules

OpenTracing tracers for Jaeger

Zipkin and Datadog | `nginx-ic-nap-dos/nginx-plus-ingress:{{< nic-version >}}` | amd64 | -|Ubi-based image | ``redhat/ubi9-minimal`` | NGINX Plus JavaScript module | `nginx-ic/nginx-plus-ingress:{{< nic-version >}}-ubi` | arm64
amd64
s390x | +|Ubi-based image | ``redhat/ubi9-minimal`` | NGINX Plus JavaScript module | `nginx-ic/nginx-plus-ingress:{{< nic-version >}}-ubi` | arm64
amd64 | |Ubi-based image with NGINX App Protect WAF | ``redhat/ubi9`` | NGINX App Protect WAF and NGINX Plus JavaScript module | `nginx-ic-nap/nginx-plus-ingress:{{< nic-version >}}-ubi` | amd64 | |Ubi-based image with NGINX App Protect WAF v5 | ``redhat/ubi9`` | NGINX App Protect WAF v5 and NGINX Plus JavaScript module | `nginx-ic-nap-v5/nginx-plus-ingress:{{< nic-version >}}-ubi` | amd64 | |Ubi-based image with NGINX App Protect DoS | ``redhat/ubi8`` | NGINX App Protect DoS and NGINX Plus JavaScript module | `nginx-ic-dos/nginx-plus-ingress:{{< nic-version >}}-ubi` | amd64 | From c30f198274d2c44eacaf1bec276a7ba202fa7f13 Mon Sep 17 00:00:00 2001 From: Paul Abel Date: Mon, 16 Dec 2024 14:49:33 +0000 Subject: [PATCH 08/11] minor updates --- site/content/releases.md | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/site/content/releases.md b/site/content/releases.md index 061d380504..04992bba06 100644 --- a/site/content/releases.md +++ b/site/content/releases.md @@ -13,16 +13,14 @@ weight: 2100 16 Dec 2024 ### Breaking Changes -- [6520](https://github.com/nginxinc/kubernetes-ingress/pull/6520) Add LogLevel & LogFormat flags +- [6903](https://github.com/nginxinc/kubernetes-ingress/pull/6903) & [6921](https://github.com/nginxinc/kubernetes-ingress/pull/6921) Add support for NGINX Plus R33 +- [6520](https://github.com/nginxinc/kubernetes-ingress/pull/6520) & [6474](https://github.com/nginxinc/kubernetes-ingress/pull/6474) Add LogLevel & LogFormat flags - [6800](https://github.com/nginxinc/kubernetes-ingress/pull/6800) Deprecate v1alpha1 CRDs for GlobalConfiguration, Policy & TransportServer -- [6903](https://github.com/nginxinc/kubernetes-ingress/pull/6903) Add license secret and mgmt config map ### Features -- [6474](https://github.com/nginxinc/kubernetes-ingress/pull/6474) Add glog slog handler - [6605](https://github.com/nginxinc/kubernetes-ingress/pull/6605) TransportServer SNI - [6819](https://github.com/nginxinc/kubernetes-ingress/pull/6819) Add events to configmap - [6878](https://github.com/nginxinc/kubernetes-ingress/pull/6878) Add events when special secrets update -- [6921](https://github.com/nginxinc/kubernetes-ingress/pull/6921) Add additional mgmt config parameters ### Fixes - [6583](https://github.com/nginxinc/kubernetes-ingress/pull/6583) Generate valid yaml for ReadOnly FS From 3631f4efb38b6c8a8b836ec4fdfb8186273fb684 Mon Sep 17 00:00:00 2001 From: Paul Abel Date: Mon, 16 Dec 2024 14:50:29 +0000 Subject: [PATCH 09/11] update structured logging text --- site/content/releases.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/site/content/releases.md b/site/content/releases.md index 04992bba06..da613a5fc3 100644 --- a/site/content/releases.md +++ b/site/content/releases.md @@ -14,7 +14,7 @@ weight: 2100 ### Breaking Changes - [6903](https://github.com/nginxinc/kubernetes-ingress/pull/6903) & [6921](https://github.com/nginxinc/kubernetes-ingress/pull/6921) Add support for NGINX Plus R33 -- [6520](https://github.com/nginxinc/kubernetes-ingress/pull/6520) & [6474](https://github.com/nginxinc/kubernetes-ingress/pull/6474) Add LogLevel & LogFormat flags +- [6520](https://github.com/nginxinc/kubernetes-ingress/pull/6520) & [6474](https://github.com/nginxinc/kubernetes-ingress/pull/6474) Add structured logging - [6800](https://github.com/nginxinc/kubernetes-ingress/pull/6800) Deprecate v1alpha1 CRDs for GlobalConfiguration, Policy & TransportServer ### Features From b4215bd6444b5b241d8fb3bc11f1c99c51d6e523 Mon Sep 17 00:00:00 2001 From: Paul Abel Date: Mon, 16 Dec 2024 14:55:03 +0000 Subject: [PATCH 10/11] add 1.32.0 helm schema update --- site/content/releases.md | 1 + 1 file changed, 1 insertion(+) diff --git a/site/content/releases.md b/site/content/releases.md index da613a5fc3..323b8f4654 100644 --- a/site/content/releases.md +++ b/site/content/releases.md @@ -31,6 +31,7 @@ weight: 2100 ### Helm Chart - [6667](https://github.com/nginxinc/kubernetes-ingress/pull/6667) Helm schema examples +- [6998](https://github.com/nginxinc/kubernetes-ingress/pull/6998) Update kubernetes version to v1.32.0 in helm schema ### Dependencies - [6485](https://github.com/nginxinc/kubernetes-ingress/pull/6485), [6497](https://github.com/nginxinc/kubernetes-ingress/pull/6497), [6512](https://github.com/nginxinc/kubernetes-ingress/pull/6512), [6533](https://github.com/nginxinc/kubernetes-ingress/pull/6533), [6543](https://github.com/nginxinc/kubernetes-ingress/pull/6543), [6557](https://github.com/nginxinc/kubernetes-ingress/pull/6557), [6580](https://github.com/nginxinc/kubernetes-ingress/pull/6580), [6607](https://github.com/nginxinc/kubernetes-ingress/pull/6607), [6638](https://github.com/nginxinc/kubernetes-ingress/pull/6638), [6654](https://github.com/nginxinc/kubernetes-ingress/pull/6654), [6657](https://github.com/nginxinc/kubernetes-ingress/pull/6657), [6676](https://github.com/nginxinc/kubernetes-ingress/pull/6676), [6685](https://github.com/nginxinc/kubernetes-ingress/pull/6685), [6699](https://github.com/nginxinc/kubernetes-ingress/pull/6699), [6697](https://github.com/nginxinc/kubernetes-ingress/pull/6697), [6719](https://github.com/nginxinc/kubernetes-ingress/pull/6719), [6717](https://github.com/nginxinc/kubernetes-ingress/pull/6717), [6747](https://github.com/nginxinc/kubernetes-ingress/pull/6747), [6743](https://github.com/nginxinc/kubernetes-ingress/pull/6743), [6775](https://github.com/nginxinc/kubernetes-ingress/pull/6775), [6789](https://github.com/nginxinc/kubernetes-ingress/pull/6789), [6762](https://github.com/nginxinc/kubernetes-ingress/pull/6762), [6786](https://github.com/nginxinc/kubernetes-ingress/pull/6786), [6845](https://github.com/nginxinc/kubernetes-ingress/pull/6845), [6864](https://github.com/nginxinc/kubernetes-ingress/pull/6864), [6880](https://github.com/nginxinc/kubernetes-ingress/pull/6880), [6862](https://github.com/nginxinc/kubernetes-ingress/pull/6862), [6897](https://github.com/nginxinc/kubernetes-ingress/pull/6897), [6890](https://github.com/nginxinc/kubernetes-ingress/pull/6890), [6905](https://github.com/nginxinc/kubernetes-ingress/pull/6905), [6906](https://github.com/nginxinc/kubernetes-ingress/pull/6906), [6909](https://github.com/nginxinc/kubernetes-ingress/pull/6909), [6919](https://github.com/nginxinc/kubernetes-ingress/pull/6919), [6936](https://github.com/nginxinc/kubernetes-ingress/pull/6936), [6945](https://github.com/nginxinc/kubernetes-ingress/pull/6945), [6971](https://github.com/nginxinc/kubernetes-ingress/pull/6971) & [6982](https://github.com/nginxinc/kubernetes-ingress/pull/6982) Bump the Docker dependencies From 6576f27d820f8ce17f8a4b5d9fdcafddfaf801f7 Mon Sep 17 00:00:00 2001 From: Paul Abel Date: Mon, 16 Dec 2024 15:51:42 +0000 Subject: [PATCH 11/11] Add release description --- site/content/releases.md | 25 ++++++++++++++++++++----- 1 file changed, 20 insertions(+), 5 deletions(-) diff --git a/site/content/releases.md b/site/content/releases.md index 323b8f4654..7a90f4c48b 100644 --- a/site/content/releases.md +++ b/site/content/releases.md @@ -12,10 +12,25 @@ weight: 2100 16 Dec 2024 +With added support for [NGINX R33](https://docs.nginx.com/nginx/releases/#nginxplusrelease-33-r33), deployments of F5 NGINX Ingress Controller using NGINX Plus now require a valid JSON Web Token to run. +Please see the [Upgrading to v4]({{< relref "installation/installing-nic/upgrade-to-v4#create-license-secret" >}}) for full details on setting up your license `Secret`. + +API Version `v1alpha1` of `GlobalConfiguration`, `Policy` and `TransportServer` resources are now deprecated. +Please see [Update custom resource apiVersion]({{< relref "installation/installing-nic/upgrade-to-v4#update-custom-resource-apiversion" >}}) for full details on updating your resources. + +Updates have been made to our logging library. For a while, F5 NGINX Ingress Controller has been using the [golang/glog](https://github.com/golang/glog). For this release, we have moved to the native golang library [log/slog](https://pkg.go.dev/log/slog). +This change was made for these reasons: +1. By using a standard library, we ensure that updates are more consistent, and any known vulnerabilities are more likely to be addressed in a timely manner. +2. By moving to `log/slog`, we enable support for a wider range of logging formats, as well as allowing log outputs to be displayed in a Structured format, and for faster log parsing. + +Layer 4 applications got some love this release, with added support for SNI based routing with our TransportServer resource! +In scenarios where you have multiple applications hosted on a single node, this feature enables routing to those applications through the host header. +For more details on what this feature does, and how to configure it yourself, please look to our [examples section in Github](https://github.com/nginxinc/kubernetes-ingress/tree/v4.0.0/examples/custom-resources/transport-server-sni#transportserver-sni) + ### Breaking Changes - [6903](https://github.com/nginxinc/kubernetes-ingress/pull/6903) & [6921](https://github.com/nginxinc/kubernetes-ingress/pull/6921) Add support for NGINX Plus R33 -- [6520](https://github.com/nginxinc/kubernetes-ingress/pull/6520) & [6474](https://github.com/nginxinc/kubernetes-ingress/pull/6474) Add structured logging - [6800](https://github.com/nginxinc/kubernetes-ingress/pull/6800) Deprecate v1alpha1 CRDs for GlobalConfiguration, Policy & TransportServer +- [6520](https://github.com/nginxinc/kubernetes-ingress/pull/6520) & [6474](https://github.com/nginxinc/kubernetes-ingress/pull/6474) Add structured logging ### Features - [6605](https://github.com/nginxinc/kubernetes-ingress/pull/6605) TransportServer SNI @@ -55,6 +70,10 @@ versions: 1.25-1.32. --- +## 3.7.2 + +25 Nov 2024 + {{< 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. @@ -75,10 +94,6 @@ If a resource of `kind: GlobalConfiguration`, `kind: Policy` or `kind: Transport 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 - ### Fixes - [6838](https://github.com/nginxinc/kubernetes-ingress/pull/6838) Update oidc_template and conf