diff --git a/content/includes/nic/compatibility-tables/nic-k8s.md b/content/includes/nic/compatibility-tables/nic-k8s.md new file mode 100644 index 000000000..79308a803 --- /dev/null +++ b/content/includes/nic/compatibility-tables/nic-k8s.md @@ -0,0 +1,17 @@ +NGINX Ingress Controller supports the following versions of [NGINX Plus]({{< ref "/nginx/" >}}) and [Kubernetes](https://kubernetes.io/): + +{{< table >}} + +| NIC version | Kubernetes versions tested | NIC Helm Chart version | NIC Operator version | NGINX / NGINX Plus version | End of Technical Support | +| --- | --- | --- | --- | --- | --- | +| {{< nic-version >}} | 1.27 - 1.34 | {{< nic-helm-version >}} | {{< nic-operator-version >}} | 1.29.1 / R35 | - | +| 5.1.1 | 1.25 - 1.33 | 2.2.2 | 3.2.3 | 1.29.1 / R35 | Aug 15, 2027 | +| 5.0.0 | 1.25 - 1.32 | 2.1.0 | 3.1.0 | 1.27.4 / R34 | Apr 16, 2027 | +| 4.0.1 | 1.25 - 1.32 | 2.0.1 | 3.0.1 | 1.27.4 / R33 P2 | Feb 7, 2027 | +| 3.7.2 | 1.25 - 1.31 | 1.4.2 | 2.4.2 | 1.27.2 / R32 P1 | Nov 25, 2026 | +| 3.6.2 | 1.25 - 1.31 | 1.3.2 | 2.3.2 | 1.27.1 / R32 P1 | Aug 19, 2026 | +| 3.5.2 | 1.23 - 1.30 | 1.2.2 | 2.2.2 | 1.27.0 / R32 | May 31, 2026 | +| 3.4.3 | 1.23 - 1.29 | 1.1.3 | 2.1.2 | 1.25.4 / R31 P1 | Feb 19, 2026 | +| 3.3.2 | 1.22 - 1.28 | 1.0.2 | 2.0.2 | 1.25.3 / R30 | Nov 1, 2025 | + +{{< /table >}} \ No newline at end of file diff --git a/content/includes/nic/compatibility-tables/nic-nap.md b/content/includes/nic/compatibility-tables/nic-nap.md index e40c6b79d..cf465893a 100644 --- a/content/includes/nic/compatibility-tables/nic-nap.md +++ b/content/includes/nic/compatibility-tables/nic-nap.md @@ -1,6 +1,7 @@ -The following table shows compatibility between NGINX Ingress Controller (NIC) and F5 WAF for NGINX (NAP-WAF) versions: +NGINX Ingress Controller supports the following versions of [F5 WAF for NGINX](https://docs.nginx.com/waf/): + +{{< table >}} -{{< bootstrap-table "table table-striped table-responsive" >}} | NIC Version | NAP-WAF Version | Config Manager | Enforcer | | ------------------- | --------------- | -------------- | -------- | | {{< nic-version >}} | 35+{{< appprotect-compiler-version>}} | {{< nic-waf-release-version >}} | {{< nic-waf-release-version >}} | @@ -9,4 +10,5 @@ The following table shows compatibility between NGINX Ingress Controller (NIC) a | 4.0.1 | 33+5.264 | 5.5.0 | 5.5.0 | | 3.7.2 | 32+5.1 | 5.3.0 | 5.3.0 | | 3.6.2 | 32+5.48 | 5.2.0 | 5.2.0 | -{{% /bootstrap-table %}} + +{{< /table >}} diff --git a/content/nic/changelog/_index.md b/content/nic/changelog/_index.md index fcb527b44..c8de195ea 100644 --- a/content/nic/changelog/_index.md +++ b/content/nic/changelog/_index.md @@ -12,6 +12,18 @@ This changelog lists all of the information for F5 NGINX Ingress Controller rele For older releases, check the changelogs for previous years: [2024]({{< ref "/nic/changelog/2024.md" >}}), [2023]({{< ref "/nic/changelog/2023.md" >}}), [2022]({{< ref "/nic/changelog/2022.md" >}}), [2021]({{< ref "/nic/changelog/2021.md" >}}), [2020]({{< ref "/nic/changelog/2020.md" >}}), [2019]({{< ref "/nic/changelog/2019.md" >}}). +{{< details summary="NGINX Ingress Controller compatibility matrix" open=false >}} + +{{< include "/nic/compatibility-tables/nic-k8s.md" >}} + +### Supported F5 WAF for NGINX versions + +{{}}To use F5 WAF for NGINX with NGINX Ingress Controller, you must have NGINX Plus.{{< /call-out >}} + +{{< include "/nic/compatibility-tables/nic-nap.md" >}} + +{{< /details >}} + ## 5.2.1 10 Oct 2025 diff --git a/content/nic/technical-specifications.md b/content/nic/technical-specifications.md index 8bb751679..c89ed8b0e 100644 --- a/content/nic/technical-specifications.md +++ b/content/nic/technical-specifications.md @@ -19,21 +19,7 @@ We provide technical support for NGINX Ingress Controller on any Kubernetes plat We provide technical support for F5 customers who are using the most recent version of NGINX Ingress Controller, and any version released within two years of the current release. -{{< table >}} - -| NIC version | Kubernetes versions tested | NIC Helm Chart version | NIC Operator version | NGINX / NGINX Plus version | End of Technical Support | -| --- | --- | --- | --- | --- | --- | -| {{< nic-version >}} | 1.27 - 1.34 | {{< nic-helm-version >}} | {{< nic-operator-version >}} | 1.29.1 / R35 | - | -| 5.1.1 | 1.25 - 1.33 | 2.2.2 | 3.2.3 | 1.29.1 / R35 | Aug 15, 2027 | -| 5.0.0 | 1.25 - 1.32 | 2.1.0 | 3.1.0 | 1.27.4 / R34 | Apr 16, 2027 | -| 4.0.1 | 1.25 - 1.32 | 2.0.1 | 3.0.1 | 1.27.4 / R33 P2 | Feb 7, 2027 | -| 3.7.2 | 1.25 - 1.31 | 1.4.2 | 2.4.2 | 1.27.2 / R32 P1 | Nov 25, 2026 | -| 3.6.2 | 1.25 - 1.31 | 1.3.2 | 2.3.2 | 1.27.1 / R32 P1 | Aug 19, 2026 | -| 3.5.2 | 1.23 - 1.30 | 1.2.2 | 2.2.2 | 1.27.0 / R32 | May 31, 2026 | -| 3.4.3 | 1.23 - 1.29 | 1.1.3 | 2.1.2 | 1.25.4 / R31 P1 | Feb 19, 2026 | -| 3.3.2 | 1.22 - 1.28 | 1.0.2 | 2.0.2 | 1.25.3 / R30 | Nov 1, 2025 | - -{{< /table >}} +{{< include "/nic/compatibility-tables/nic-k8s.md" >}} ## Supported Docker images @@ -92,3 +78,9 @@ You can customize an existing Dockerfile or use it as a reference to create a ne ## Supported Helm versions NGINX Ingress Controller can be [installed]({{< ref "/nic/install/helm.md" >}}) using Helm 3.0 or later. + +## Supported F5 WAF for NGINX versions + +{{}}To use F5 WAF for NGINX with NGINX Ingress Controller, you must have NGINX Plus.{{< /call-out >}} + +{{< include "/nic/compatibility-tables/nic-nap.md" >}}