Skip to content

Commit bc59765

Browse files
authored
Merge branch 'main' into update-n1console-diff-certs
2 parents 1707032 + ab61442 commit bc59765

File tree

4 files changed

+27
-15
lines changed

4 files changed

+27
-15
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+

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

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

content/ngf/how-to/traffic-security/integrating-cert-manager.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ Follow the steps in this guide to:
3232

3333
## Secure traffic using Let's Encrypt and cert-manager
3434

35-
{{<img src="img/cert-manager-gateway-workflow.png" alt="cert-manager ACME challenge and certificate management with Gateway API">}}
35+
{{<img src="ngf/img/cert-manager-gateway-workflow.png" alt="cert-manager ACME challenge and certificate management with Gateway API">}}
3636

3737
The diagram above shows a simplified representation of the cert-manager ACME challenge and certificate issuance process using Gateway API. Please note that not all of the kubernetes objects created in this process are represented in this diagram.
3838

0 commit comments

Comments
 (0)