Skip to content

Commit 053ae9b

Browse files
committed
Merge branch 'revamp-spec-summary-table' of https://github.com/ChisomUma/ngixdocsopensourcecontribution into revamp-spec-summary-table
2 parents e93f26d + 85fee31 commit 053ae9b

File tree

7 files changed

+16
-15
lines changed

7 files changed

+16
-15
lines changed

.github/workflows/coveo.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ jobs:
8484

8585
- name: Retrieve secrets from Keyvault
8686
id: keyvault
87-
uses: azure/cli@089eac9d8cc39f5d003e94f8b65efc51076c9cbd
87+
uses: azure/cli@9f7ce6f37c31b777ec6c6b6d1dfe7db79f497956
8888
with:
8989
inlineScript: |
9090
secrets_get=(productionHostname previewHostname resourceGroupName cdnProfileName cdnName accountName)

.github/workflows/linkchecker.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ jobs:
8484
- name: Retrieve secrets from Keyvault
8585
if: env.isProduction != 'true'
8686
id: keyvault
87-
uses: azure/cli@089eac9d8cc39f5d003e94f8b65efc51076c9cbd
87+
uses: azure/cli@9f7ce6f37c31b777ec6c6b6d1dfe7db79f497956
8888
with:
8989
inlineScript: |
9090
secrets_get=(frontdoorUsername frontdoorPassword)

.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@192325c86100d080feab897ff886c34abd4c83a3 # v3.29.5
59+
uses: github/codeql-action/upload-sarif@3599b3baa15b485a2e49ef411a7a4bb2452e7f93 # v3.29.5
6060
with:
6161
sarif_file: results.sarif

content/includes/agent/installation/update-container.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ To migrate NGINX Agent containers, we provide a script to convert NGINX Agent v2
1010
To upgrade the configuration, you can follow this example:
1111

1212
```shell
13-
wget https://raw.githubusercontent.com/nginx/agent/refs/heads/v3/scripts/packages/upgrade-agent-config.sh
13+
wget https://raw.githubusercontent.com/nginx/agent/refs/heads/main/scripts/packages/upgrade-agent-config.sh
1414
./upgrade-agent-config.sh --v2-config-file=./nginx-agent-v2.conf --v3-config-file=nginx-agent-v3.conf
1515
```
1616

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ graph TB
3939

4040
Using this architecture, the **coffee** application is not accessible outside the cluster. We want to expose this application on the hostname "cafe.example.com" so that clients outside the cluster can access it.
4141

42-
Install NGINX Gateway Fabric and create two Gateway API resources: a [gateway](https://gateway-api.sigs.k8s.io/references/spec/#gateway.networking.k8s.io/v1.Gateway) and an [HTTPRoute](https://gateway-api.sigs.k8s.io/references/spec/#gateway.networking.k8s.io/v1.HTTPRoute).
42+
Install NGINX Gateway Fabric and create two Gateway API resources: a [gateway](https://gateway-api.sigs.k8s.io/reference/spec/#gateway) and an [HTTPRoute](https://gateway-api.sigs.k8s.io/reference/spec/#httproute).
4343

4444
Using these resources we will configure a simple routing rule to match all HTTP traffic with the hostname "cafe.example.com" and route it to the **coffee** service.
4545

@@ -240,10 +240,10 @@ In a production environment, you should have a DNS record for the external IP ad
240240

241241
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" >}}).
242242

243-
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.
243+
We specify a [listener](https://gateway-api.sigs.k8s.io/reference/spec/#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.
244244

245245
By default, Gateways only allow routes (such as HTTPRoutes) to attach if they are in the same namespace as the Gateway. If you want to change this behavior, you can set
246-
the [**allowedRoutes**](https://gateway-api.sigs.k8s.io/references/spec/#gateway.networking.k8s.io/v1.AllowedRoutes) field.
246+
the [**allowedRoutes**](https://gateway-api.sigs.k8s.io/reference/spec/#allowedroutes) field.
247247

248248
Next you will create the HTTPRoute by copying and pasting the following into your terminal:
249249

@@ -269,11 +269,11 @@ spec:
269269
EOF
270270
```
271271

272-
To attach the **coffee** HTTPRoute to the **cafe** Gateway, we specify the Gateway name in the [**parentRefs**](https://gateway-api.sigs.k8s.io/references/spec/#gateway.networking.k8s.io/v1.CommonRouteSpec) field. The attachment will succeed if the hostnames and protocol in the HTTPRoute are allowed by at least one of the Gateway's listeners.
272+
To attach the **coffee** HTTPRoute to the **cafe** Gateway, we specify the Gateway name in the [**parentRefs**](https://gateway-api.sigs.k8s.io/reference/spec/#parentreference) field. The attachment will succeed if the hostnames and protocol in the HTTPRoute are allowed by at least one of the Gateway's listeners.
273273

274-
The [**hostnames**](https://gateway-api.sigs.k8s.io/references/spec/#gateway.networking.k8s.io/v1.HTTPRouteSpec) field allows you to list the hostnames that the HTTPRoute matches. In this case, incoming requests handled by the **http** listener with the HTTP host header "cafe.example.com" will match this HTTPRoute and will be routed according to the rules in the spec.
274+
The [**hostnames**](https://gateway-api.sigs.k8s.io/reference/spec/#hostname) field allows you to list the hostnames that the HTTPRoute matches. In this case, incoming requests handled by the **http** listener with the HTTP host header "cafe.example.com" will match this HTTPRoute and will be routed according to the rules in the spec.
275275

276-
The [**rules**](https://gateway-api.sigs.k8s.io/references/spec/#gateway.networking.k8s.io/v1.HTTPRouteRule) field defines routing rules for the HTTPRoute. A rule is selected if the request satisfies one of the rule's **matches**. To forward traffic for all paths to the coffee service we specify a match with the PathPrefix "/" and target the coffee service using the **backendRef** field.
276+
The [**rules**](https://gateway-api.sigs.k8s.io/reference/spec/#httprouterule) field defines routing rules for the HTTPRoute. A rule is selected if the request satisfies one of the rule's **matches**. To forward traffic for all paths to the coffee service we specify a match with the PathPrefix "/" and target the coffee service using the **backendRef** field.
277277

278278
---
279279

content/nginx/technical-specs.md

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,14 +27,15 @@ Dynamic modules are supported on the [same distributions as NGINX Plus](#support
2727
|--------------|------------|-------|---------|---------------|------------|---------------|
2828
| **AlmaLinux** |||||||
2929
| **Alpine Linux 3.17 & 3.18** |||||||
30-
| **Alpine Linux 3.19** | ✓ (x86_64 only) ||||||
30+
| **Alpine Linux 3.19, 3.20, 3.21, 3.22 | ✓ (x86_64 only) ||||||
3131
| **Amazon Linux 2** |||||||
3232
| **Amazon Linux 2023** | ✓ (x86_64 only) ||||||
3333
| **Debian 11 & 12** | ✓ (x86_64 only) ||||||
3434
| **FreeBSD** |||||||
35-
| **Oracle Linux 8** | ✓ (x86_64 only) | (Oracle Linux: ❌) |||||
36-
| **RHEL 8 & 9** | ✓ (x86_64 only) | (RHEL: ❌)|||||
37-
| **Rocky Linux 8** || (Rocky Linux 8.0+: ❌)|||||
35+
| **Oracle Linux 8** | ✓ (x86_64 only) ||||||
36+
| **RHEL 8 & 9** | ✓ (x86_64 only) ||||||
37+
| **RHEL 10** |||||||
38+
| **Rocky Linux 8** |||||||
3839
| **Rocky Linux 9** | ✓ (x86_64 only) ||||||
3940
| **SLES** |||||||
4041
| **Ubuntu 20.04** |||||||

content/nic/configuration/virtualserver-and-virtualserverroute-resources.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ spec:
5151
- path: ~ ^/decaf/.*\\.jpg$
5252
action:
5353
pass: coffee
54-
- path: = /green/tea
54+
- path: =/green/tea
5555
action:
5656
pass: tea
5757
```

0 commit comments

Comments
 (0)