Skip to content

Commit 03da0a9

Browse files
authored
Merge branch 'main' into ai-assistant-changelog
2 parents 9832ca5 + aa2a665 commit 03da0a9

File tree

17 files changed

+977
-59
lines changed

17 files changed

+977
-59
lines changed

.github/CODEOWNERS

Lines changed: 22 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -15,19 +15,31 @@
1515

1616
# DocOps Writers
1717
* @nginx/nginx-docs
18+
1819
# DocOps Engineers
1920
.github/* @nginx/docs-engineering
20-
# NGINX Plus
21-
content/nginx/* @nginx/plus-docs-approvers
21+
2222
# NGINX Agent
23-
content/nginx/nms/agent/* @nginx/agent-docs-approvers
24-
# NGINX One
25-
content/nginx-one/* @nginx/one-docs-approvers
26-
# NGINX Instance Manager
27-
content/nms/nim/* @nginx/nim-docs-approvers
28-
content/nim/* @nginx/nim-docs-approvers
23+
content/nginx/nms/agent/* @nginx/nginx-agent
24+
25+
# NGINX App Protect DoS
26+
content/nap-dos/* @nginx/dos-docs-approvers
27+
2928
# NGINX App Protect WAF
3029
content/nap-waf/* @nginx/nap-docs-approvers
3130
data/nap-waf/* @nginx/nap-docs-approvers
32-
# NGINX App Protect DoS
33-
content/nap-dos/* @nginx/dos-docs-approvers
31+
32+
# NGINX Gateway Fabric
33+
content/ngf/* @nginx/nginx-gateway-fabric
34+
content/includes/ngf/* @nginx/nginx-gateway-fabric
35+
36+
# NGINX Instance Manager
37+
content/nms/nim/* @nginx/nim-docs-approvers
38+
content/nim/* @nginx/nim-docs-approvers
39+
40+
# NGINX Plus
41+
content/nginx/* @nginx/plus-docs-approvers
42+
43+
# NGINX One
44+
content/nginx-one/* @nginx/one-docs-approvers
45+

.github/pull_request_template.md

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -21,15 +21,15 @@ Closes #ISSUE
2121

2222
Before merging a pull request, run through this checklist and mark each as complete.
2323

24-
- [] I have read the [contributing guidelines](/CONTRIBUTING.md)
25-
- [] I have signed the [F5 Contributor License Agreement (CLA)](https://github.com/f5/.github/blob/main/CLA/cla-markdown.md)
26-
- [] I have ensured that documentation content adheres to [the style guide](/templates/style-guide.md)
27-
- [] If the change involves potentially sensitive changes, I have assessed the possible impact
28-
- [] If applicable, I have added tests that prove my fix is effective or that my feature works
29-
- [] If applicable, I have checked that any relevant tests pass after adding my changes
30-
- [] I have updated any relevant documentation ([`README.md`](/README.md) and [`CHANGELOG.md`](/CHANGELOG.md))
31-
- [] I have rebased my branch onto main
32-
- [] I will ensure my PR is targeting the main branch and pulling from my branch from my own fork
24+
- [ ] I have read the [contributing guidelines](/CONTRIBUTING.md)
25+
- [ ] I have signed the [F5 Contributor License Agreement (CLA)](https://github.com/f5/.github/blob/main/CLA/cla-markdown.md)
26+
- [ ] I have ensured that documentation content adheres to [the style guide](/templates/style-guide.md)
27+
- [ ] If the change involves potentially sensitive changes, I have assessed the possible impact
28+
- [ ] If applicable, I have added tests that prove my fix is effective or that my feature works
29+
- [ ] If applicable, I have checked that any relevant tests pass after adding my changes
30+
- [ ] I have updated any relevant documentation ([`README.md`](/README.md) and [`CHANGELOG.md`](/CHANGELOG.md))
31+
- [ ] I have rebased my branch onto main
32+
- [ ] I will ensure my PR is targeting the main branch and pulling from my branch from my own fork
3333

3434
Potentially sensitive changes include anything involving code, personally identify information (PII), live URLs or significant amounts of new or revised documentation.
3535

.github/workflows/fossa.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,6 @@ jobs:
2525
uses: actions/checkout@85e6279cec87321a52edac9c87bce653a07cf6c2 # v4.2.2
2626

2727
- name: Scan
28-
uses: fossas/fossa-action@09bcf127dc0ccb4b5a023f6f906728878e8610ba # v1.4.0
28+
uses: fossas/fossa-action@93a52ecf7c3ac7eb40f5de77fd69b1a19524de94 # v1.5.0
2929
with:
3030
api-key: ${{ secrets.FOSSA_TOKEN }}

.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@b6a472f63d85b9c78a3ac5e89422239fc15e9b3c # v3.28.1
59+
uses: github/codeql-action/upload-sarif@f6091c0113d1dcf9b98e269ee48e8a7e51b7bdd4 # v3.28.5
6060
with:
6161
sarif_file: results.sarif

.github/workflows/stale.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
pull-requests: write # for actions/stale to close stale PRs
1919
runs-on: ubuntu-latest
2020
steps:
21-
- uses: actions/stale@v9.0.0
21+
- uses: actions/stale@v9.1.0
2222
with:
2323
repo-token: ${{ secrets.GITHUB_TOKEN }}
2424
stale-issue-message: 'This issue is stale because it has been open for 90 days with no activity. Remove the stale label or add a comment to keep it open. If you do not take action, this will be closed in 10 days.'

content/ngf/how-to/_index.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
---
22
title: "How-to guides"
3+
url: /nginx-gateway-fabric/how-to/
34
weight: 400
45
---
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
---
22
title: "Monitoring and troubleshooting"
3+
url: /nginx-gateway-fabric/how-to/monitoring/
34
weight: 300
45
---

content/ngf/how-to/monitoring/prometheus.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ In the Grafana UI menu, go to `Connections` then `Data sources`. Add your Promet
7373

7474
Download the following sample dashboard and Import as a new Dashboard in the Grafana UI.
7575

76-
- {{< download "grafana-dashboard.json" "ngf-grafana-dashboard.json" >}}
76+
- {{< download "ngf/grafana-dashboard.json" "ngf-grafana-dashboard.json" >}}
7777

7878
---
7979

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
---
22
title: "Traffic management"
3+
url: /nginx-gateway-fabric/how-to/traffic-management/
34
weight: 100
45
---

content/ngf/how-to/traffic-management/routing-traffic-to-your-app.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ You can route traffic to your Kubernetes applications using the Gateway API and
3333

3434
The application we are going to use in this guide is a simple **coffee** application comprised of one service and two pods:
3535

36-
{{<img src="img/route-all-traffic-app.png" alt="This image shows a single 'coffee' Service connecting to two 'coffee' Pods.">}}
36+
{{<img src="ngf/img/route-all-traffic-app.png" alt="This image shows a single 'coffee' Service connecting to two 'coffee' Pods.">}}
3737

3838
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.
3939

@@ -108,15 +108,15 @@ service/coffee ClusterIP 198.51.100.1 <none> 80/TCP 77s
108108

109109
To route traffic to the **coffee** application, we will create a gateway and HTTPRoute. The following diagram shows the configuration we are creating in the next step:
110110

111-
{{<img src="img/route-all-traffic-config.png" alt="">}}
111+
{{<img src="ngf/img/route-all-traffic-config.png" alt="">}}
112112

113113
We need a gateway to create an entry point for HTTP traffic coming into the cluster. The **cafe** gateway we are going to create will open an entry point to the cluster on port 80 for HTTP traffic.
114114

115115
To route HTTP traffic from the gateway to the **coffee** service, we need to create an HTTPRoute named **coffee** and attach it to the gateway. This HTTPRoute will have a single routing rule that routes all traffic to the hostname "cafe.example.com" from the gateway to the **coffee** service.
116116

117117
Once NGINX Gateway Fabric processes the **cafe** gateway and **coffee** HTTPRoute, it will configure its data plane (NGINX) to route all HTTP requests sent to "cafe.example.com" to the pods that the **coffee** service targets:
118118

119-
{{<img src="img/route-all-traffic-flow.png" alt="Traffic Flow">}}
119+
{{<img src="ngf/img/route-all-traffic-flow.png" alt="Traffic Flow">}}
120120

121121
The **coffee** service is omitted from the diagram above because the NGINX Gateway Fabric routes directly to the pods that the **coffee** service targets.
122122

0 commit comments

Comments
 (0)