From bbf3b6d0c0c4203f1c58593ca377e194c2d74a81 Mon Sep 17 00:00:00 2001 From: Alex Fenlon Date: Fri, 24 Oct 2025 11:33:42 +0100 Subject: [PATCH 1/2] feat: Add NIC WAF shortcode for easier updating versions --- content/includes/nic/compatibility-tables/nic-nap.md | 2 +- .../installing-nic/deploy-with-nap-using-helm.md | 6 +++--- layouts/shortcodes/nic-waf-release-version.html | 1 + layouts/shortcodes/nic-waf-version.html | 1 + 4 files changed, 6 insertions(+), 4 deletions(-) create mode 100644 layouts/shortcodes/nic-waf-release-version.html create mode 100644 layouts/shortcodes/nic-waf-version.html diff --git a/content/includes/nic/compatibility-tables/nic-nap.md b/content/includes/nic/compatibility-tables/nic-nap.md index 1646cac4a..b0ba0670e 100644 --- a/content/includes/nic/compatibility-tables/nic-nap.md +++ b/content/includes/nic/compatibility-tables/nic-nap.md @@ -3,7 +3,7 @@ The following table shows compatibility between NGINX Ingress Controller (NIC) a {{< bootstrap-table "table table-striped table-responsive" >}} | NIC Version | NAP-WAF Version | Config Manager | Enforcer | | ------------------- | --------------- | -------------- | -------- | -| {{< nic-version >}} | 35+5.527 | 5.9.0 | 5.9.0 | +| {{< nic-version >}} | {{< nic-waf-version >}} | {{< nic-waf-release-version >}} | {{< nic-waf-release-version >}} | | 5.1.1 | 35+5.498 | 5.8.0 | 5.8.0 | | 5.0.0 | 34+5.342 | 5.6.0 | 5.6.0 | | 4.0.1 | 33+5.264 | 5.5.0 | 5.5.0 | diff --git a/content/nic/installation/installing-nic/deploy-with-nap-using-helm.md b/content/nic/installation/installing-nic/deploy-with-nap-using-helm.md index 231bc2e2c..f60f3f70f 100644 --- a/content/nic/installation/installing-nic/deploy-with-nap-using-helm.md +++ b/content/nic/installation/installing-nic/deploy-with-nap-using-helm.md @@ -44,7 +44,7 @@ This is accomplished with the following steps: Pull the `waf-compiler` image with: ```shell -docker pull private-registry.nginx.com/nap/waf-compiler:5.9.0 +docker pull private-registry.nginx.com/nap/waf-compiler:{{}} ``` Download the [provided WAF Policy JSON](https://raw.githubusercontent.com/nginx/kubernetes-ingress/main/tests/data/ap-waf-v5/wafv5.json): @@ -53,13 +53,13 @@ Download the [provided WAF Policy JSON](https://raw.githubusercontent.com/nginx/ curl -L https://raw.githubusercontent.com/nginx/kubernetes-ingress/main/tests/data/ap-waf-v5/wafv5.json -o /tmp/wafv5.json ``` -Use your pulled NAP Docker image (`private-registry.nginx.com/nap/waf-compiler:5.9.0`) to compile the policy bundle: +Use your pulled NAP Docker image (`private-registry.nginx.com/nap/waf-compiler:{{}}`) to compile the policy bundle: ```shell # Using your newly created image docker run --rm \ -v /tmp:/tmp \ - private-registry.nginx.com/nap/waf-compiler:5.9.0 \ + private-registry.nginx.com/nap/waf-compiler:{{}} \ -p /tmp/wafv5.json \ -o /tmp/compiled_policy.tgz ``` diff --git a/layouts/shortcodes/nic-waf-release-version.html b/layouts/shortcodes/nic-waf-release-version.html new file mode 100644 index 000000000..cf5136119 --- /dev/null +++ b/layouts/shortcodes/nic-waf-release-version.html @@ -0,0 +1 @@ +5.9.0 \ No newline at end of file diff --git a/layouts/shortcodes/nic-waf-version.html b/layouts/shortcodes/nic-waf-version.html new file mode 100644 index 000000000..898b4edb0 --- /dev/null +++ b/layouts/shortcodes/nic-waf-version.html @@ -0,0 +1 @@ +35+5.527 \ No newline at end of file From aa6f2d6d06e3bdf798e5e2c1f43d03ee6d71c9a4 Mon Sep 17 00:00:00 2001 From: Alex Fenlon Date: Fri, 24 Oct 2025 15:42:23 +0100 Subject: [PATCH 2/2] remove waf version --- content/includes/nic/compatibility-tables/nic-nap.md | 2 +- layouts/shortcodes/nic-waf-version.html | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) delete mode 100644 layouts/shortcodes/nic-waf-version.html diff --git a/content/includes/nic/compatibility-tables/nic-nap.md b/content/includes/nic/compatibility-tables/nic-nap.md index b0ba0670e..e40c6b79d 100644 --- a/content/includes/nic/compatibility-tables/nic-nap.md +++ b/content/includes/nic/compatibility-tables/nic-nap.md @@ -3,7 +3,7 @@ The following table shows compatibility between NGINX Ingress Controller (NIC) a {{< bootstrap-table "table table-striped table-responsive" >}} | NIC Version | NAP-WAF Version | Config Manager | Enforcer | | ------------------- | --------------- | -------------- | -------- | -| {{< nic-version >}} | {{< nic-waf-version >}} | {{< nic-waf-release-version >}} | {{< nic-waf-release-version >}} | +| {{< nic-version >}} | 35+{{< appprotect-compiler-version>}} | {{< nic-waf-release-version >}} | {{< nic-waf-release-version >}} | | 5.1.1 | 35+5.498 | 5.8.0 | 5.8.0 | | 5.0.0 | 34+5.342 | 5.6.0 | 5.6.0 | | 4.0.1 | 33+5.264 | 5.5.0 | 5.5.0 | diff --git a/layouts/shortcodes/nic-waf-version.html b/layouts/shortcodes/nic-waf-version.html deleted file mode 100644 index 898b4edb0..000000000 --- a/layouts/shortcodes/nic-waf-version.html +++ /dev/null @@ -1 +0,0 @@ -35+5.527 \ No newline at end of file