Merge branch 'main' into Update-docs-issue147

Author: ADubhlaoich

_banners/agent-v3-release.md

@@ -1,7 +1,7 @@
 {{< banner "notice" "NGINX Agent 3.0 is now available" >}}
 
 
-F5 NGINX One Console and NGINX Instance Manager (NIM) do not currently support Agent 3.x. If you are using NGINX One Console or NGINX Instance Manager in your environment, upgrade to the latest Agent 2.x version by following the [Upgrade NGINX Agent](/nginx-agent/installation-upgrade/upgrade/) guide.
+F5 NGINX Instance Manager (NIM) does not currently support Agent 3.x. NGINX Instance Manager customers can upgrade to the latest Agent 2.x version by following the [Upgrade NGINX Agent](/nginx-agent/installation-upgrade/upgrade/) guide.
 
 Please see the [Technical specifications](/nginx-agent/technical-specifications/) for product compatibility.
 

content/includes/agent/about.md

@@ -40,4 +40,4 @@ Additionally, it collects system-level data, including CPU usage, memory consump
 deep observability into NGINX's behavior, enabling teams to troubleshoot issues effectively, optimize performance, and
 maintain high availability.
 
-Collected metrics can be seamlessly exported to NGINX One Console or integrated with third-party data aggregators.
+By default, the OpenTelemetry Collector is configured to send metrics to NGINX One Console.

content/ngf/install/manifests.md

@@ -54,13 +54,13 @@ Deploying NGINX Gateway Fabric with Kubernetes manifests takes only a few steps.
 #### Stable release
 
 ```shell
-kubectl apply -f https://raw.githubusercontent.com/nginx/nginx-gateway-fabric/v{{< version-ngf >}}/deploy/crds.yaml
+kubectl apply --server-side -f https://raw.githubusercontent.com/nginx/nginx-gateway-fabric/v{{< version-ngf >}}/deploy/crds.yaml
 ```
 
 #### Edge version
 
 ```shell
-kubectl apply -f https://raw.githubusercontent.com/nginx/nginx-gateway-fabric/main/deploy/crds.yaml
+kubectl apply --server-side -f https://raw.githubusercontent.com/nginx/nginx-gateway-fabric/main/deploy/crds.yaml
 ```
 
 ### Deploy NGINX Gateway Fabric

content/ngf/install/upgrade-version.md

@@ -53,7 +53,7 @@ kubectl kustomize "https://github.com/nginx/nginx-gateway-fabric/config/crd/gate
 Run the following command to upgrade the CRDs:
 
 ```shell
-kubectl apply -f https://raw.githubusercontent.com/nginx/nginx-gateway-fabric/v{{< version-ngf >}}/deploy/crds.yaml
+kubectl apply --server-side -f https://raw.githubusercontent.com/nginx/nginx-gateway-fabric/v{{< version-ngf >}}/deploy/crds.yaml
 ```
 
 {{< note >}}
@@ -157,7 +157,7 @@ For customization options during the Helm installation process, view the [Instal
 Apply the new CRDs with the following command:
 
 ```shell
-kubectl apply -f https://raw.githubusercontent.com/nginx/nginx-gateway-fabric/v{{< version-ngf >}}/deploy/crds.yaml
+kubectl apply --server-side -f https://raw.githubusercontent.com/nginx/nginx-gateway-fabric/v{{< version-ngf >}}/deploy/crds.yaml
 ```
 
 Next, install the latest stable release of NGINX Gateway Fabric in the `nginx-gateway` namespace with the following command:

content/ngf/troubleshooting.md

@@ -512,6 +512,21 @@ It indicates that `proxy_protocol` is enabled for the gateway listeners, but the
 
 - Send valid proxy information with requests being handled by your application.
 
+#### Custom Resource Definition is invalid due to being too large 
+
+If you apply the NGINX Gateway Fabric CRDs and see the following error:
+
+```text
+The CustomResourceDefinition "nginxproxies.gateway.nginx.org" is invalid: metadata.annotations: Too long: may not be more than 262144 bytes
+```
+
+This is a known issue with Kubernetes, more specifically the client-side-apply annotation limit with kubectl, and our recommended workaround 
+is to use kubectl's server-side apply when installing the NGINX Gateway Fabric CRDs. To do this, you can use the `--server-side` flag when applying the CRDs:
+
+```shell
+kubectl apply --server-side -f https://raw.githubusercontent.com/nginx/nginx-gateway-fabric/v{{< version-ngf >}}/deploy/crds.yaml
+```
+
 ### See also
 
 You can view the [Kubernetes Troubleshooting Guide](https://kubernetes.io/docs/tasks/debug/debug-application/) for more debugging guidance.

content/nginx-one/agent/containers/run-agent-container.md

@@ -29,13 +29,10 @@ container image and create a configuration file.
 
 ### Pull the NGINX Agent container image
 
-The NGINX Agent container image must be downloaded from a trusted source such as Docker Hub or a private container registry.
-
 Run the following command to pull the official image:
 
 ```bash
-<!-- Registry HERE -->
-docker pull <Registry HERE>:latest
+docker pull private-registry.nginx.com/nginx-plus/agentv3:latest
 ```
 
 Ensure you are using the correct image version. Replace `latest` with the desired version tag if necessary.

content/nginx-one/connect-instances/connect-nginx-plus-container-images-to-nginx-one.md

@@ -42,13 +42,13 @@ sudo docker login private-registry.nginx.com --username=YOUR_JWT_HERE --password
 
 ### Pull the NGINX Plus image
 
-Pull the NGINX Plus image from the private registry. Replace `VERSION_TAG` with the desired version, such as `alpine`, `debian`, or `ubi`.
+Pull the NGINX Plus image from the private registry. Replace `<version-tag>` with the desired version, such as `alpine`, `debian`, or `ubi`.
 
 ```sh
-sudo docker pull private-registry.nginx.com/nginx-plus/agent:VERSION_TAG
+docker pull private-registry.nginx.com/nginx-plus/agentv3:<version-tag>
 ```
 
-You must specify a version tag. The `latest` tag is not supported. Learn more in the [Deploying NGINX and NGINX Plus on Docker]({{< ref "/nginx/admin-guide/installing-nginx/installing-nginx-docker.md#pull-the-image" >}}) guide.
+You must specify a version tag that matches your distribution. The `latest` tag is not supported. Learn more in the [Deploying NGINX and NGINX Plus on Docker]({{< ref "/nginx/admin-guide/installing-nginx/installing-nginx-docker.md#pull-the-image" >}}) guide.
 
 <br>
 
@@ -62,7 +62,7 @@ sudo docker pull private-registry.nginx.com/nginx-plus/agent:debian
 
 ### Start the NGINX Plus container
 
-Start the Docker container to connect it to NGINX One. Replace `YOUR_NGINX_ONE_DATA_PLANE_KEY_HERE` with your data plane key and `VERSION_TAG` with the version tag you pulled.
+Start the Docker container to connect it to NGINX One. Replace `YOUR_NGINX_ONE_DATA_PLANE_KEY_HERE` with your data plane key and `version-tag` with the version tag you pulled.
 
 **For NGINX Plus R33 or later**:
 
@@ -79,7 +79,7 @@ sudo docker run \
 --env=NGINX_AGENT_TLS_ENABLE=true \
 --restart=always \
 --runtime=runc \
--d private-registry.nginx.com/nginx-plus/agent:<VERSION_TAG>
+-d private-registry.nginx.com/nginx-plus/agent:<version-tag>
 ```
 
 <br>

content/nginx-one/nginx-configs/config-sync-groups/manage-config-sync-groups.md

@@ -162,14 +162,9 @@ When adding a new NGINX instance that is not yet registered with NGINX One, you
    - From the **OS Type** list, choose the appropriate operating system for your Docker image.
    - After selecting the OS, run the provided command to pull the Docker image.
 
-   **Note**: Subject to availability, you can modify the `agent: <VERSION_TAG>` to match the specific NGINX Plus version, OS type, and OS version you need. For example, you might use `agent: r32-ubi-9`. For more details on version tags and how to pull an image, see [Deploying NGINX and NGINX Plus on Docker]({{< ref "nginx/admin-guide/installing-nginx/installing-nginx-docker.md#pull-the-image" >}}).
+   **Note**: Subject to availability, you can modify the `agentv3:<version-tag>` to match the specific NGINX Plus version, OS type, and OS version you need. For example, you might use `agentv3:r32-ubi-9`. For more details on version tags and how to pull an image, see [Deploying NGINX and NGINX Plus on Docker]({{< ref "nginx/admin-guide/installing-nginx/installing-nginx-docker.md#pull-the-image" >}}).
 
 
-   - From the **OS Type** list, choose the appropriate operating system for your Docker image.
-   - After selecting the OS, run the provided command to pull the Docker image.
-
-   **Note**: Subject to availability, you can modify the `agent: <VERSION_TAG>` to match the specific NGINX Plus version, OS type, and OS version you need. For example, you might use `agent: r32-ubi-9`. For more details on version tags and how to pull an image, see [Deploying NGINX and NGINX Plus on Docker]({{< ref "nginx/admin-guide/installing-nginx/installing-nginx-docker.md#pull-the-image" >}}).
-
 10. Run the provided command, which includes the data plane key, in your NGINX instance terminal to start the Docker container.
 
 11. Select **Done** to complete the process.

content/nginx/admin-guide/installing-nginx/installing-nginx-docker.md

@@ -156,24 +156,36 @@ For NGINX Plus, run:
 docker pull private-registry.nginx.com/nginx-plus/base:<version-tag>
 ```
 
-For NGINX Plus with NGINX Agent, run:
+For NGINX Plus with NGINX Agent version 2, run:
 
 ```shell
 docker pull private-registry.nginx.com/nginx-plus/agent:<version-tag>
 ```
 
+For NGINX Plus with NGINX Agent version 3, run:
+
+```shell
+docker pull private-registry.nginx.com/nginx-plus/agentv3:<version-tag>
+```
+
 For NGINX Plus installed from `nginx` user (rootless installation), run:
 
 ```shell
 docker pull private-registry.nginx.com/nginx-plus/rootless-base:<version-tag>
 ```
 
-For NGINX Plus with NGINX Agent installed from `nginx` user (rootless installation), run:
+For NGINX Plus with NGINX Agent version 2 installed from `nginx` user (rootless installation), run:
 
 ```shell
 docker pull private-registry.nginx.com/nginx-plus/rootless-agent:<version-tag>
 ```
 
+For NGINX Plus with NGINX Agent version 3 installed from `nginx` user (rootless installation), run:
+
+```shell
+docker pull private-registry.nginx.com/nginx-plus/rootless-agentv3:<version-tag>
+```
+
 For NGINX modules, run:<!-- Is this enough info?-->
 
 ```shell