Skip to content

Commit 3cd5a33

Browse files
committed
Merge branch 'main' into docs/ia-heuristics
2 parents 52df08c + 24cfa28 commit 3cd5a33

File tree

23 files changed

+212
-150
lines changed

23 files changed

+212
-150
lines changed

.github/workflows/ossf_scorecard.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,6 @@ jobs:
5656

5757
# Upload the results to GitHub's code scanning dashboard.
5858
- name: Upload SARIF results to code scanning
59-
uses: github/codeql-action/upload-sarif@fca7ace96b7d713c7035871441bd52efbe39e27e # v3.28.19
59+
uses: github/codeql-action/upload-sarif@ce28f5bb42b7a9f2c824e633a3f6ee835bab6858 # v3.29.0
6060
with:
6161
sarif_file: results.sarif

_banners/agent-v3-release.md

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
{{< banner "notice" "NGINX Agent 3.0 is now available" >}}
2+
3+
4+
F5 NGINX One Console does not currently support Agent 3.x. If you are using NGINX One Console in your environment, upgrade to the latest Agent 2.x version by following the [Upgrade NGINX Agent](/nginx-agent/installation-upgrade/upgrade/) guide.
5+
6+
Please see the [Technical specifications](/nginx-agent/technical-specifications/) for product compatibility.
7+
8+
9+
{{< /banner >}}

content/agent/_index.md

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,12 @@
11
---
22
title: NGINX Agent
3-
description: NGINX Agent is a companion daemon for your NGINX Open Source or NGINX
4-
Plus instance.
53
url: /nginx-agent/
64
cascade:
75
logo: NGINX-product-icon.png
6+
banner:
7+
enabled: true
8+
type: deprecation
9+
start-date: 2025-05-29
10+
end-date: 2025-09-09
11+
md: /_banners/agent-v3-release.md
812
---

content/agent/technical-specifications.md

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,17 @@ type:
1212

1313
This document provides technical specifications for NGINX Agent. It includes information on supported distributions, deployment environments, NGINX versions, sizing recommendations, and logging.
1414

15+
## NGINX Agent v3.0 Compatibility
16+
{{< bootstrap-table "table table-striped table-bordered" >}}
17+
| NGINX Product | Agent Version |
18+
|------------------------------|----------------|
19+
| **NGINX One Console** | 2.x |
20+
| **NGINX Gateway Fabric** | 3.x |
21+
| **NGINX Plus** | 2.x, 3.x |
22+
| **NGINX Ingress Controller** | 2.x |
23+
| **NGINX Instance Manager** | 2.x |
24+
{{< /bootstrap-table >}}
25+
1526
## Supported Distributions
1627

1728
NGINX Agent can run in most environments. We support the following distributions:

content/includes/ngf/installation/expose-nginx-gateway-fabric.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,4 +50,4 @@ There are two options for accessing NGINX Gateway Fabric depending on the type o
5050

5151
NGINX Gateway Fabric uses the created service to update the **Addresses** field in the **Gateway Status** resource. Using a **LoadBalancer** service sets this field to the IP address and/or hostname of that service. Without a service, the pod IP address is used.
5252

53-
This gateway is associated with the NGINX Gateway Fabric through the **gatewayClassName** field. The default installation of NGINX Gateway Fabric creates a **GatewayClass** with the name **nginx**. NGINX Gateway Fabric will only configure gateways with a **gatewayClassName** of **nginx** unless you change the name via the `--gatewayclass` [command-line flag]({{< ref "/ngf/reference/cli-help.md#static-mode">}}).
53+
This gateway is associated with the NGINX Gateway Fabric through the **gatewayClassName** field. The default installation of NGINX Gateway Fabric creates a **GatewayClass** with the name **nginx**. NGINX Gateway Fabric will only configure gateways with a **gatewayClassName** of **nginx** unless you change the name via the `--gatewayclass` [command-line flag]({{< ref "/ngf/reference/cli-help.md#controller">}}).

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
docs: "DOCS-000"
33
---
44

5-
{{< 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 >}}
5+
{{< 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#pull-an-image-for-local-use" >}}). {{< /note >}}
66

77
If the `nginx-gateway` namespace does not yet exist, create it:
88

content/ngf/overview/gateway-api-compatibility.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ For a description of each field, visit the [Gateway API documentation](https://g
5757

5858
{{< /bootstrap-table >}}
5959

60-
NGINX Gateway Fabric supports a single GatewayClass resource configured with the `--gatewayclass` flag of the [static-mode]({{< ref "/ngf/reference/cli-help.md#static-mode">}}) command.
60+
NGINX Gateway Fabric supports a single GatewayClass resource configured with the `--gatewayclass` flag of the [controller]({{< ref "/ngf/reference/cli-help.md#controller">}}) command.
6161

6262
**Fields**:
6363

@@ -87,7 +87,7 @@ NGINX Gateway Fabric supports a single GatewayClass resource configured with the
8787

8888
NGINX Gateway Fabric supports multiple Gateway resources. The Gateway resources must reference NGINX Gateway Fabric's corresponding GatewayClass.
8989

90-
See the [static-mode]({{< ref "/ngf/reference/cli-help.md#static-mode">}}) command for more information.
90+
See the [controller]({{< ref "/ngf/reference/cli-help.md#controller">}}) command for more information.
9191

9292
**Fields**:
9393

content/ngf/traffic-management/basic-routing.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,7 @@ In a production environment, you should have a DNS record for the external IP ad
148148

149149
{{< /note >}}
150150

151-
This Gateway is associated with NGINX Gateway Fabric through the **gatewayClassName** field. The default installation of NGINX Gateway Fabric creates a GatewayClass with the name **nginx**. NGINX Gateway Fabric will only configure Gateways with a **gatewayClassName** of **nginx** unless you change the name via the `--gatewayclass` [command-line flag]({{< ref "/ngf/reference/cli-help.md#static-mode" >}}).
151+
This Gateway is associated with NGINX Gateway Fabric through the **gatewayClassName** field. The default installation of NGINX Gateway Fabric creates a GatewayClass with the name **nginx**. NGINX Gateway Fabric will only configure Gateways with a **gatewayClassName** of **nginx** unless you change the name via the `--gatewayclass` [command-line flag]({{< ref "/ngf/reference/cli-help.md#controller" >}}).
152152

153153
We specify a [listener](https://gateway-api.sigs.k8s.io/references/spec/#gateway.networking.k8s.io/v1.Listener) on the Gateway to open an entry point on the cluster. In this case, since the coffee application accepts HTTP requests, we create an HTTP listener, named **http**, that listens on port 80.
154154

content/nginx-one/_index.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ cascade:
4040
{{</ card >}}
4141
{{</ card-section >}}
4242

43-
# Other Products
43+
# Other Components
4444
{{< card-section title="Kubernetes Solutions">}}
4545
{{< card title="NGINX Ingress Controller" titleUrl="/nginx-ingress-controller/" icon="NGINX-Ingress-Controller-product-icon">}}
4646
Kubernetes traffic management with API gateway, identity, and observability features.

content/nginx/admin-guide/load-balancer/http-load-balancer.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -427,7 +427,7 @@ http {
427427
listen 443 ssl;
428428
ssl_certificate /etc/nginx/ssl/company.com.crt;
429429
ssl_certificate_key /etc/nginx/ssl/company.com.key;
430-
ssl_protocols TLSv1 TLSv1.1 TLSv1.2;
430+
ssl_protocols TLSv1.2 TLSv1.3;
431431
432432
location / {
433433
proxy_pass https://exchange;

0 commit comments

Comments
 (0)