Merge branch 'main' into main

yluf5 · web-flow · commit a80e47ae65d9 · 2025-06-30T08:45:38.000-07:00
diff --git a/content/agent/installation-upgrade/installation-unprivileged.md b/content/agent/installation-upgrade/installation-unprivileged.md
@@ -4,6 +4,7 @@ weight: 450
 toc: true
 type: how-to
 product: Agent
+docs: DOCS-1781
 ---
 
 ## Overview
diff --git a/content/nap-dos/releases/about-1.2.0.md b/content/nap-dos/releases/about-1.2.0.md
@@ -2,7 +2,7 @@
 title: NGINX App Protect DoS Arbitrator 1.2.0
 toc: true
 weight: 61
-docs: DOCS-000
+docs: DOCS-1782
 ---
 
 Here you can find the release information for F5 NGINX App Protect DoS Arbitrator v1.2.0
diff --git a/content/nap-dos/releases/about-4.4.md b/content/nap-dos/releases/about-4.4.md
@@ -2,7 +2,7 @@
 title: NGINX App Protect DoS 4.4
 toc: true
 weight: 80
-docs: DOCS-1361
+docs: DOCS-1785
 ---
 
 Here you can find the release information for F5 NGINX App Protect DoS v4.4. NGINX App Protect DoS provides behavioral protection against Denial of Service (DoS) for your web applications.
diff --git a/content/nap-dos/releases/about-4.5.md b/content/nap-dos/releases/about-4.5.md
@@ -2,7 +2,7 @@
 title: NGINX App Protect DoS 4.5
 toc: true
 weight: 70
-docs: DOCS-000
+docs: DOCS-1784
 ---
 
 Here you can find the release information for F5 NGINX App Protect DoS v4.5  
diff --git a/content/nap-dos/releases/about-4.6.md b/content/nap-dos/releases/about-4.6.md
@@ -2,7 +2,7 @@
 title: NGINX App Protect DoS 4.6
 toc: true
 weight: 60
-docs: DOCS-000
+docs: DOCS-1783
 ---
 
 Here you can find the release information for F5 NGINX App Protect DoS v4.6  
diff --git a/content/nap-waf/v4/releases/about-1.2.md b/content/nap-waf/v4/releases/about-1.2.md
@@ -4,7 +4,7 @@ weight: 1020
 toc: true
 type: reference
 product: NAP-WAF
-docs: DOCS-000
+docs: DOCS-1791
 ---
 
 June 30, 2020
diff --git a/content/nap-waf/v4/releases/about-4.10.md b/content/nap-waf/v4/releases/about-4.10.md
@@ -4,7 +4,7 @@ weight: 130
 toc: true
 type: reference
 product: NAP-WAF
-docs: DOCS-000
+docs: DOCS-1787
 ---
 
 May 29, 2024
diff --git a/content/nap-waf/v4/releases/about-4.11.md b/content/nap-waf/v4/releases/about-4.11.md
@@ -4,7 +4,7 @@ weight: 120
 toc: true
 type: reference
 product: NAP-WAF
-docs: DOCS-000
+docs: DOCS-1786
 ---
 
 September 25, 2024
diff --git a/content/nap-waf/v4/releases/about-4.12.md b/content/nap-waf/v4/releases/about-4.12.md
@@ -4,7 +4,7 @@ weight: 110
 toc: true
 type: reference
 product: NAP-WAF
-docs: DOCS-000
+docs: DOCS-1788
 ---
 
 November 19th, 2024
diff --git a/content/nap-waf/v4/releases/about-4.13.md b/content/nap-waf/v4/releases/about-4.13.md
@@ -4,7 +4,7 @@ weight: 100
 toc: true
 type: reference
 product: NAP-WAF
-docs: DOCS-000
+docs: DOCS-1790
 ---
 
 January 30th, 2025
diff --git a/content/nap-waf/v4/releases/about-4.14.md b/content/nap-waf/v4/releases/about-4.14.md
@@ -4,7 +4,7 @@ weight: 90
 toc: true
 type: reference
 product: NAP-WAF
-docs: DOCS-000
+docs: DOCS-1792
 ---
 
 April 1st, 2025
diff --git a/content/nap-waf/v4/releases/about-4.15.md b/content/nap-waf/v4/releases/about-4.15.md
@@ -4,6 +4,7 @@ weight: 80
 toc: true
 nd-content-type: reference
 nd-product: NAP-WAF
+docs: DOCS-1789
 ---
 
 June 24th, 2025
diff --git a/content/nap-waf/v5/admin-guide/deploy-with-helm.md b/content/nap-waf/v5/admin-guide/deploy-with-helm.md
@@ -4,6 +4,7 @@ weight: 300
 toc: true
 type: how-to
 product: NAP-WAF
+docs: DOCS-1793
 ---
 
 ## Overview
diff --git a/content/nap-waf/v5/releases/about-5.2.md b/content/nap-waf/v5/releases/about-5.2.md
@@ -4,7 +4,7 @@ weight: 890
 toc: true
 type: reference
 product: NAP-WAF
-docs: DOCS-000
+docs: DOCS-1796
 ---
 
 May 29, 2024
diff --git a/content/nap-waf/v5/releases/about-5.3.md b/content/nap-waf/v5/releases/about-5.3.md
@@ -4,7 +4,7 @@ weight: 880
 toc: true
 type: reference
 product: NAP-WAF
-docs: DOCS-000
+docs: DOCS-1799
 ---
 
 September 25, 2024
diff --git a/content/nap-waf/v5/releases/about-5.4.md b/content/nap-waf/v5/releases/about-5.4.md
@@ -4,7 +4,7 @@ weight: 870
 toc: true
 type: reference
 product: NAP-WAF
-docs: DOCS-000
+docs: DOCS-1798
 ---
 
 November 19th, 2024
diff --git a/content/nap-waf/v5/releases/about-5.5.md b/content/nap-waf/v5/releases/about-5.5.md
@@ -4,7 +4,7 @@ weight: 860
 toc: true
 type: reference
 product: NAP-WAF
-docs: DOCS-000
+docs: DOCS-1795
 ---
 
 January 30th, 2025
diff --git a/content/nap-waf/v5/releases/about-5.6.md b/content/nap-waf/v5/releases/about-5.6.md
@@ -4,7 +4,7 @@ weight: 850
 toc: true
 type: reference
 product: NAP-WAF
-docs: DOCS-000
+docs: DOCS-1797
 ---
 
 April 1st, 2025
diff --git a/content/nap-waf/v5/releases/about-5.7.md b/content/nap-waf/v5/releases/about-5.7.md
@@ -4,6 +4,7 @@ weight: 840
 toc: true
 nd-content-type: reference
 nd-product: NAP-WAF
+docs: DOCS-1794
 ---
 
 June 24th, 2025
diff --git a/content/nginxaas-azure/loadbalancer-kubernetes.md b/content/nginxaas-azure/loadbalancer-kubernetes.md
@@ -150,7 +150,8 @@ Install the NLK controller using `helm install`. Be sure your kubectl context is
 ```bash
 helm install nlk oci://registry-1.docker.io/nginxcharts/nginxaas-loadbalancer-kubernetes --version 1.1.1 \
   --set "nlk.dataplaneApiKey=${keyValue}" \
-  --set "nlk.config.nginxHosts=${dataplaneAPIEndpoint}nplus"
+  --set "nlk.config.nginxHosts=${dataplaneAPIEndpoint}nplus" \
+  --set "nlk.config.tls.mode=ca-tls"
 ```
 
 ##### Install the AKS Extension using the Azure CLI
@@ -173,7 +174,8 @@ az k8s-extension create \
   --plan-publisher f5-networks \
   --release-namespace nlk \
   --config nlk.dataplaneApiKey=${keyValue} \
-  --config nlk.config.nginxHosts=${dataplaneAPIEndpoint}nplus
+  --config nlk.config.nginxHosts=${dataplaneAPIEndpoint}nplus \
+  --config nlk.config.tls.mode=ca-tls
 ```
 
 ##### Install the AKS Extension using the Azure portal
@@ -296,6 +298,7 @@ spec:
 | `nlk.config.logLevel` | How verbose should the NLK controller logs be. | Possible values are `debug`, `info`, `warn`, `error`. Default: `info`. |
 | `nlk.config.nginxHosts` | The NGINX Plus APIs to send upstream updates to. | Should be set to `{{dataplaneApiEndpoint}}nplus`.|
 | `nlk.config.serviceAnnotationMatch` | The value to match on a Service's `nginx.com/nginxaas` annotation. Useful when configuring multiple NLK controllers to update separate NGINXaaS deployemnts. | Default: `nginxaas`. |
+| `nlk.config.tls.mode` | The TLS mode to use when forming connections with the data plane API server. | Should be set to `ca-tls` to enforce TLS with the data plane API server.|
 | `nlk.dataplaneApiKey`   | The NGINXaaS data plane API key that will authorize the controller to talk to your NGINXaaS deployment.           |                                                                                         |
 
 ### Multiple AKS clusters
diff --git a/content/nic/configuration/_index.md b/content/nic/configuration/_index.md
@@ -1,4 +1,5 @@
 ---
 title: Configuration
 weight: 1400
+url: /nginx-ingress-controller/configuration
 ---
diff --git a/content/nic/installation/_index.md b/content/nic/installation/_index.md
@@ -2,6 +2,7 @@
 title: Installation
 description:
 weight: 400
+url: /nginx-ingress-controller/installation
 menu:
   docs:
     parent: NGINX Ingress Controller
diff --git a/content/nic/logging-and-monitoring/_index.md b/content/nic/logging-and-monitoring/_index.md
@@ -2,6 +2,7 @@
 title: Logging And Monitoring
 description:
 weight: 1500
+url: /nginx-ingress-controller/logging-and-monitoring
 menu:
   docs:
     parent: NGINX Ingress Controller
diff --git a/content/nic/overview/_index.md b/content/nic/overview/_index.md
@@ -2,6 +2,7 @@
 title: Overview
 description:
 weight: 100
+url: /nginx-ingress-controller/overview
 menu:
   docs:
     parent: NGINX Ingress Controller
diff --git a/content/nic/troubleshooting/_index.md b/content/nic/troubleshooting/_index.md
@@ -2,6 +2,7 @@
 title: Troubleshooting
 description:
 weight: 1800
+url: /nginx-ingress-controller/troubleshooting
 menu:
   docs:
     parent: NGINX Ingress Controller
diff --git a/content/solutions/about-subscription-licenses.md b/content/solutions/about-subscription-licenses.md
@@ -5,7 +5,7 @@ weight: 2
 type:
 - reference
 product: Solutions
-docs: DOCS-000
+docs: DOCS-1780
 ---
 
 ## Overview
