Merge branch 'main' into custom-landing

Author: lamATnginx

.github/workflows/ossf_scorecard.yml

@@ -34,7 +34,7 @@ jobs:
           persist-credentials: false
 
       - name: Run analysis
-        uses: ossf/scorecard-action@f49aabe0b5af0936a0987cfb85d86b75731b0186 # v2.4.1
+        uses: ossf/scorecard-action@05b42c624433fc40578a4040d5cf5e36ddca8cde # v2.4.2
         with:
           results_file: results.sarif
           results_format: sarif

_banners/ngf-2.0-release.md

@@ -0,0 +1,7 @@
+{{< banner "notice" "NGINX Gateway Fabric 2.0 is now available" >}}
+
+NGINX Gateway Fabric 2.0 has released! Follow [these instructions]({{< ref "/ngf/install/upgrade-version.md#upgrade-from-v1x-to-v2x" >}}) to upgrade from 1.x to 2.0.
+
+For 1.x, checkout [an older version]({{< ref "/ngf/install/upgrade-version.md#access-nginx-gateway-fabric-1x-documentation" >}}) of documentation.
+
+{{< /banner >}}

content/agent/configuration/configure-nginx-agent-features.md

@@ -5,6 +5,7 @@ weight: 150
 toc: true
 type:
 - how-to
+docs: DOCS-1678
 ---
 
 ## Overview
@@ -47,7 +48,7 @@ The following table lists the NGINX Agent features.
     ssh user@your-nginx-instance
 ```
 
-2. **Edit NGINX Agent configuration:** 
+2. **Edit NGINX Agent configuration:**
 
 ```
     sudo vim /etc/nginx-agent/nginx-agent.conf
@@ -60,7 +61,7 @@ The following table lists the NGINX Agent features.
       - metrics
       - metrics-throttle
       - dataplane-status
-``` 
+```
 
 4. **Restart the NGINX Agent service:** Restart the NGINX Agent service to enable changes.
 
@@ -73,7 +74,7 @@ Once the steps have been completed, users will be able to view metrics data bein
     ssh user@your-nginx-instance
 ```
 
-2. **Edit NGINX Agent configuration:** 
+2. **Edit NGINX Agent configuration:**
 
 ```
     sudo vim /etc/nginx-agent/nginx-agent.conf
@@ -86,9 +87,9 @@ Once the steps have been completed, users will be able to view metrics data bein
       - nginx-config-async
       - dataplane-status
       - file-watcher
-``` 
+```
 
 4. **Restart the NGINX Agent service:** Restart the NGINX Agent service to enable changes.
 
-Once the steps have been completed, users will be able to publish NGINX configurations but metrics data will not be collected by the NGINX Agent. 
+Once the steps have been completed, users will be able to publish NGINX configurations but metrics data will not be collected by the NGINX Agent.
 

content/agent/configuration/health-checks.md

@@ -5,6 +5,7 @@ weight: 400
 toc: true
 type:
 - how-to
+docs: DOCS-1677
 ---
 
 ## Overview

content/agent/installation-upgrade/upgrade.md

@@ -12,9 +12,7 @@ type:
 
 Learn how to upgrade NGINX Agent.
 
-## Upgrade NGINX Agent from version v2.31.0 or greater
-
-{{< note >}} Starting from version v2.31.0, NGINX Agent will automatically restart itself during an upgrade. {{< /note >}}
+## Upgrade NGINX Agent
 
 To upgrade NGINX Agent, follow these steps:
 
@@ -41,43 +39,48 @@ To upgrade NGINX Agent, follow these steps:
         sudo apt-get install -y --only-upgrade nginx-agent -o Dpkg::Options::="--force-confold"
         ```
 
+## Upgrade NGINX Agent to a Specific Version 
 
+To upgrade NGINX Agent to a specific **v2.x version**, follow these steps: 
 
-## Upgrade NGINX Agent from a version less than v2.31.0
-
-To upgrade NGINX Agent, take the following steps:
+#### Steps to Upgrade: 
 
-1. Open an SSH connection to the server where you’ve installed NGINX Agent and log in.
+1. Open an SSH connection to the server running  NGINX Agent and log in.
 
-1. Make a backup copy of the following locations to ensure that you can successfully recover if the upgrade has issues:
+1. Back up the following files and directories to ensure you can restore the environment in case of issues during the upgrade: 
 
     - `/etc/nginx-agent`
-    - `config_dirs` values for any configuration specified in `/etc/nginx-agent/nginx-agent.conf`
-
-1. Stop NGINX Agent:
+    - Any `config_dirs` directory specified in `/etc/nginx-agent/nginx-agent.conf`.
 
-    ```shell
-    sudo systemctl stop nginx-agent
-    ```
-
-1. Install the updated version of NGINX Agent:
-
-    - CentOS, RHEL, RPM-Based
+1. Perform the version-controlled upgrade. 
 
+   - Debian, Ubuntu, Deb-Based
+        
         ```shell
-        sudo yum -y makecache
-        sudo yum update -y nginx-agent
+        sudo apt-get update
+        sudo apt-get install -y nginx-agent=<specific-version> -o Dpkg::Options::="--force-confold"
         ```
-
-    - Debian, Ubuntu, Deb-Based
-
+        
+        Example (to upgrade to version 2.41.1~noble): 
+        
         ```shell
-        sudo apt-get update
-        sudo apt-get install -y --only-upgrade nginx-agent -o Dpkg::Options::="--force-confold"
+        sudo apt-get install -y nginx-agent=2.41.1~noble -o Dpkg::Options::="--force-confold"
         ```
 
-1. Start NGINX Agent:
+    - CentOS, RHEL, RPM-Based        
+       
+        ```shell
+        sudo yum install -y nginx-agent-<specific-version>
+        ```
+        
+        Example (to upgrade to version `2.41.1`): 
+    
+        ```shell
+        sudo yum install -y nginx-agent-2.41.1
+        ```
 
+1. Verify the installed version:    
+    
     ```shell
-    sudo systemctl start nginx-agent
+    sudo nginx-agent --version
     ```

content/includes/ngf/installation/helm/pulling-the-chart.md

@@ -2,11 +2,9 @@
 docs: "DOCS-1439"
 ---
 
-Pull the latest stable release of the NGINX Gateway Fabric chart:
+```shell
+helm pull oci://ghcr.io/nginx/charts/nginx-gateway-fabric --untar
+cd nginx-gateway-fabric
+```
 
-   ```shell
-   helm pull oci://ghcr.io/nginx/charts/nginx-gateway-fabric --untar
-   cd nginx-gateway-fabric
-   ```
-
-   If you want the latest version from the **main** branch, add `--version 0.0.0-edge` to your pull command.
+For the latest version from the **main** branch, add _--version 0.0.0-edge_ to your pull command.

content/includes/ngf/installation/install-gateway-api-experimental-features.md

@@ -17,7 +17,7 @@ kubectl kustomize "https://github.com/nginx/nginx-gateway-fabric/config/crd/gate
 To enable experimental features on NGINX Gateway Fabric:
 
 Using Helm: Set `nginxGateway.gwAPIExperimentalFeatures.enable` to true. An example can be found
-in the [Installation with Helm]({{< ref "/ngf/installation/installing-ngf/helm.md#custom-installation-options" >}}) guide.
+in the [Installation with Helm]({{< ref "/ngf/install/helm.md#custom-installation-options" >}}) guide.
 
 Using Kubernetes manifests: Add the `--gateway-api-experimental-features` command-line flag to the deployment manifest args.
-An example can be found in the [Installation with Kubernetes manifests]({{< ref "/ngf/installation/installing-ngf/manifests.md#3-deploy-nginx-gateway-fabric" >}}) guide.
+An example can be found in the [Installation with Kubernetes manifests]({{< ref "/ngf/install/manifests.md#3-deploy-nginx-gateway-fabric" >}}) guide.

content/includes/ngf/installation/nginx-plus/docker-registry-secret.md

@@ -2,7 +2,7 @@
 docs: "DOCS-000"
 ---
 
-{{< note >}} If you would rather pull the NGINX Plus image and push to a private registry, you can skip this specific step and instead follow [this step]({{< ref "/ngf/installation/nginx-plus-jwt.md#pulling-an-image-for-local-use" >}}). {{< /note >}}
+{{< note >}} If you would rather pull the NGINX Plus image and push to a private registry, you can skip this specific step and instead follow [this step]({{< ref "/ngf/install/nginx-plus.md#pulling-an-image-for-local-use" >}}). {{< /note >}}
 
 If the `nginx-gateway` namespace does not yet exist, create it:
 

content/includes/nim/tech-specs/nim-app-protect-support.md

@@ -8,7 +8,7 @@ NGINX Instance Manager supports the following versions of [NGINX App Protect WAF
 
 | NGINX Instance Manager | NGINX App Protect WAF              |
 |------------------------|------------------------------------|
-| 2.17.0–2.19.1          | Release 4.8.0–4.14.0, 5.1.0–5.6.0 |
+| 2.17.0–2.19.2          | Release 4.8.0–4.14.0, 5.1.0–5.6.0 |
 | 2.15.1–2.16.0          | Release 4.8.0–4.10.0              |
 | 2.14.1–2.15.0          | Release 4.4.0–4.7.0               |
 | 2.13.0–2.14.0          | Release 4.3.0–4.5.0               |

content/ngf/_index.md

@@ -1,4 +1,10 @@
 ---
 title: "NGINX Gateway Fabric"
 url: /nginx-gateway-fabric/
+cascade:
+    banner:
+        enabled: true
+        type: deprecation
+        start-date: 2025-05-30
+        md: /_banners/ngf-2.0-release.md
 ---