From 407e95b9f7c41bc6e01b5f44d6f3bd2c8089e626 Mon Sep 17 00:00:00 2001 From: Alex Fenlon Date: Wed, 24 Sep 2025 14:48:43 +0100 Subject: [PATCH 1/2] fix: Update NIC NAP Helm guide to latest versions --- .../installing-nic/deploy-with-nap-using-helm.md | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) 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 054b4e887..e44ac19d8 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 @@ -35,12 +35,18 @@ This is accomplished with the following steps: --- +## Check compatibility between NGINX Ingress Controller and NGINX App Protect WAF versions + +{{< include "nic/compatibility-tables/nic-nap.md" >}} + +--- + ## Compile WAF Policy from JSON to Bundle Pull the `waf-compiler` image with: ```shell -docker pull private-registry.nginx.com/nap/waf-compiler:5.6.0 +docker pull private-registry.nginx.com/nap/waf-compiler:5.8.0 ``` Download the [provided WAF Policy JSON](https://raw.githubusercontent.com/nginx/kubernetes-ingress/main/tests/data/ap-waf-v5/wafv5.json): @@ -49,13 +55,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.6.0`) to compile the policy bundle: +Use your pulled NAP Docker image (`private-registry.nginx.com/nap/waf-compiler:5.8.0`) 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.6.0 \ + private-registry.nginx.com/nap/waf-compiler:5.8.0 \ -p /tmp/wafv5.json \ -o /tmp/compiled_policy.tgz ``` @@ -157,7 +163,7 @@ kubectl create secret \ Install the required CRDs for NGINX Ingress Controller: ```shell -kubectl apply -f https://raw.githubusercontent.com/nginx/kubernetes-ingress/v5.0.0/deploy/crds.yaml +kubectl apply -f https://raw.githubusercontent.com/nginx/kubernetes-ingress/v{{< nic-version >}}/deploy/crds.yaml ``` Using Helm, install NGINX Ingress Controller @@ -165,7 +171,7 @@ Using Helm, install NGINX Ingress Controller ```shell helm upgrade --install nic nginx-stable/nginx-ingress \ --set controller.image.repository="private-registry.nginx.com/nginx-ic-nap-v5/nginx-plus-ingress" \ - --set controller.image.tag="5.0.0-alpine-fips" \ + --set controller.image.tag="{{< nic-version >}}-alpine-fips" \ --set controller.nginxplus=true \ --set controller.appprotect.enable=true \ --set controller.appprotect.v5=true \ From 85079dc142ee8cd8f6ee955514936d9d63168824 Mon Sep 17 00:00:00 2001 From: AlexFenlon Date: Wed, 24 Sep 2025 14:56:30 +0100 Subject: [PATCH 2/2] Apply suggestions from code review Co-authored-by: Alan Dooley --- .../installation/installing-nic/deploy-with-nap-using-helm.md | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) 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 e44ac19d8..0f395b363 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 @@ -35,12 +35,10 @@ This is accomplished with the following steps: --- -## Check compatibility between NGINX Ingress Controller and NGINX App Protect WAF versions +## Check compatibility between NGINX Ingress Controller and F5 WAF for NGINX versions {{< include "nic/compatibility-tables/nic-nap.md" >}} ---- - ## Compile WAF Policy from JSON to Bundle Pull the `waf-compiler` image with: