Skip to content

Commit 1600fec

Browse files
sjbermansjberman
authored
Merge branch 'main' into deps/update-deps
2 parents 340b0cf + 31bf78a commit 1600fec

File tree

76 files changed

+459
-458
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

76 files changed

+459
-458
lines changed

‎internal/mode/static/nginx/config/servers_template.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -149,10 +149,10 @@ server {
149149
{{- end }}
150150
{{ end }}
151151
server {
152-
listen unix:/var/run/nginx/nginx-502-server.sock;
152+
listen unix:/var/run/nginx/nginx-503-server.sock;
153153
access_log off;
154154
155-
return 502;
155+
return 503;
156156
}
157157
158158
server {

‎internal/mode/static/nginx/config/upstreams.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ import (
1313
var upstreamsTemplate = gotemplate.Must(gotemplate.New("upstreams").Parse(upstreamsTemplateText))
1414

1515
const (
16-
// nginx502Server is used as a backend for services that cannot be resolved (have no IP address).
17-
nginx502Server = "unix:/var/run/nginx/nginx-502-server.sock"
16+
// nginx503Server is used as a backend for services that cannot be resolved (have no IP address).
17+
nginx503Server = "unix:/var/run/nginx/nginx-503-server.sock"
1818
// nginx500Server is used as a server for the invalid backend ref upstream.
1919
nginx500Server = "unix:/var/run/nginx/nginx-500-server.sock"
2020
// invalidBackendRef is used as an upstream name for invalid backend references.
@@ -112,7 +112,7 @@ func (g GeneratorImpl) createUpstream(up dataplane.Upstream) http.Upstream {
112112
ZoneSize: zoneSize,
113113
Servers: []http.UpstreamServer{
114114
{
115-
Address: nginx502Server,
115+
Address: nginx503Server,
116116
},
117117
},
118118
}

‎internal/mode/static/nginx/config/upstreams_test.go‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ func TestExecuteUpstreams(t *testing.T) {
5858
"server 10.0.0.0:80;",
5959
"server 11.0.0.0:80;",
6060
"server [2001:db8::1]:80",
61-
"server unix:/var/run/nginx/nginx-502-server.sock;",
61+
"server unix:/var/run/nginx/nginx-503-server.sock;",
6262
}
6363

6464
upstreamResults := gen.executeUpstreams(dataplane.Configuration{Upstreams: stateUpstreams})
@@ -148,7 +148,7 @@ func TestCreateUpstreams(t *testing.T) {
148148
ZoneSize: ossZoneSize,
149149
Servers: []http.UpstreamServer{
150150
{
151-
Address: nginx502Server,
151+
Address: nginx503Server,
152152
},
153153
},
154154
},
@@ -194,7 +194,7 @@ func TestCreateUpstream(t *testing.T) {
194194
ZoneSize: ossZoneSize,
195195
Servers: []http.UpstreamServer{
196196
{
197-
Address: nginx502Server,
197+
Address: nginx503Server,
198198
},
199199
},
200200
},
@@ -210,7 +210,7 @@ func TestCreateUpstream(t *testing.T) {
210210
ZoneSize: ossZoneSize,
211211
Servers: []http.UpstreamServer{
212212
{
213-
Address: nginx502Server,
213+
Address: nginx503Server,
214214
},
215215
},
216216
},

‎site/content/how-to/monitoring/troubleshooting.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@ You can see logs for a crashed or killed container by adding the `-p` flag to th
139139
Understanding the NGINX configuration is key for fixing issues because it shows how NGINX handles requests. This helps tweak settings to make sure NGINX behaves the way you want it to for your application. To see your current configuration, you can open a shell in the _nginx_ container by following these [steps](#get-shell-access-to-nginx-container) and run `nginx -T`. To understand the usage of NGINX directives in the configuration file, consult this list of [NGINX directives](https://nginx.org/en/docs/dirindex.html).
140140

141141
In this section, we will see how the configuration gets updated as we configure different Services, Deployments and HTTPRoutes with NGINX Gateway Fabric. In the configuration file, you'll often find several server blocks, each assigned to specific ports and server names. NGINX selects the appropriate server for a request and evaluates the URI against the location directives within that block.
142-
When only a Gateway resource is defined, but no Services or HTTPRoutes are configured, NGINX generates a basic configuration. This includes a default server listening on the ports specified in the Gateway listeners, handling all incoming requests. Additionally, there are blocks to manage errors with status codes 500 or 502.
142+
When only a Gateway resource is defined, but no Services or HTTPRoutes are configured, NGINX generates a basic configuration. This includes a default server listening on the ports specified in the Gateway listeners, handling all incoming requests. Additionally, there are blocks to manage errors with status codes 500 or 503.
143143

144144
This is a default `server` block listening on port 80:
145145

‎tests/results/dp-perf/edge/edge-oss.md‎

Lines changed: 26 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -6,41 +6,40 @@ NGINX Plus: false
66

77
NGINX Gateway Fabric:
88

9-
- Commit: d7d6b0af0d56721b28aba24c1541d650ef6bc5a9
10-
- Date: 2024-09-30T23:47:54Z
9+
- Commit: 3a08fdafadfe0fb4a9c25679da1a1fcd6b181474
10+
- Date: 2024-10-15T13:45:52Z
1111
- Dirty: false
1212

1313
GKE Cluster:
1414

1515
- Node count: 12
16-
- k8s version: v1.30.3-gke.1969001
16+
- k8s version: v1.30.5-gke.1014001
1717
- vCPUs per node: 16
18-
- RAM per node: 65853964Ki
18+
- RAM per node: 65853972Ki
1919
- Max pods per node: 110
2020
- Zone: us-west1-b
2121
- Instance Type: n2d-standard-16
2222

2323
## Test1: Running latte path based routing
2424

2525
```text
26-
Requests [total, rate, throughput] 30000, 1000.03, 999.50
27-
Duration [total, attack, wait] 30s, 29.999s, 779.26µs
28-
Latencies [min, mean, 50, 90, 95, 99, max] 401.546µs, 729.594µs, 696.171µs, 808.825µs, 853.548µs, 993.26µs, 12.557ms
29-
Bytes In [total, mean] 4769865, 159.00
26+
Requests [total, rate, throughput] 30000, 1000.02, 1000.00
27+
Duration [total, attack, wait] 30s, 29.999s, 724.131µs
28+
Latencies [min, mean, 50, 90, 95, 99, max] 506.273µs, 701.347µs, 679.076µs, 779.282µs, 819.797µs, 976.515µs, 12.161ms
29+
Bytes In [total, mean] 4830000, 161.00
3030
Bytes Out [total, mean] 0, 0.00
31-
Success [ratio] 99.95%
32-
Status Codes [code:count] 200:29985 502:15
31+
Success [ratio] 100.00%
32+
Status Codes [code:count] 200:30000
3333
Error Set:
34-
502 Bad Gateway
3534
```
3635

3736
## Test2: Running coffee header based routing
3837

3938
```text
40-
Requests [total, rate, throughput] 30000, 1000.03, 1000.00
41-
Duration [total, attack, wait] 30s, 29.999s, 707.055µs
42-
Latencies [min, mean, 50, 90, 95, 99, max] 535.388µs, 765.759µs, 741.731µs, 856.44µs, 900.22µs, 1.028ms, 12.624ms
43-
Bytes In [total, mean] 4800000, 160.00
39+
Requests [total, rate, throughput] 30000, 1000.04, 1000.01
40+
Duration [total, attack, wait] 30s, 29.999s, 692.989µs
41+
Latencies [min, mean, 50, 90, 95, 99, max] 532.886µs, 721.993µs, 706.02µs, 812.366µs, 860.289µs, 1.018ms, 4.297ms
42+
Bytes In [total, mean] 4860000, 162.00
4443
Bytes Out [total, mean] 0, 0.00
4544
Success [ratio] 100.00%
4645
Status Codes [code:count] 200:30000
@@ -50,10 +49,10 @@ Error Set:
5049
## Test3: Running coffee query based routing
5150

5251
```text
53-
Requests [total, rate, throughput] 30000, 1000.01, 999.98
54-
Duration [total, attack, wait] 30.001s, 30s, 825.751µs
55-
Latencies [min, mean, 50, 90, 95, 99, max] 562.053µs, 766.667µs, 744.972µs, 859.534µs, 901.417µs, 1.02ms, 11.739ms
56-
Bytes In [total, mean] 5040000, 168.00
52+
Requests [total, rate, throughput] 30000, 1000.04, 1000.01
53+
Duration [total, attack, wait] 30s, 29.999s, 713.827µs
54+
Latencies [min, mean, 50, 90, 95, 99, max] 538.212µs, 722.813µs, 705.872µs, 813.629µs, 859.743µs, 1.009ms, 7.374ms
55+
Bytes In [total, mean] 5100000, 170.00
5756
Bytes Out [total, mean] 0, 0.00
5857
Success [ratio] 100.00%
5958
Status Codes [code:count] 200:30000
@@ -63,10 +62,10 @@ Error Set:
6362
## Test4: Running tea GET method based routing
6463

6564
```text
66-
Requests [total, rate, throughput] 30000, 1000.02, 999.99
67-
Duration [total, attack, wait] 30s, 29.999s, 794.715µs
68-
Latencies [min, mean, 50, 90, 95, 99, max] 550.188µs, 749.652µs, 735.445µs, 851.278µs, 896.326µs, 1.024ms, 5.942ms
69-
Bytes In [total, mean] 4710000, 157.00
65+
Requests [total, rate, throughput] 30000, 1000.01, 999.98
66+
Duration [total, attack, wait] 30s, 30s, 690.398µs
67+
Latencies [min, mean, 50, 90, 95, 99, max] 530.942µs, 709.483µs, 690.422µs, 800.878µs, 843.812µs, 975.935µs, 9.135ms
68+
Bytes In [total, mean] 4770000, 159.00
7069
Bytes Out [total, mean] 0, 0.00
7170
Success [ratio] 100.00%
7271
Status Codes [code:count] 200:30000
@@ -76,10 +75,10 @@ Error Set:
7675
## Test5: Running tea POST method based routing
7776

7877
```text
79-
Requests [total, rate, throughput] 30000, 1000.03, 1000.01
80-
Duration [total, attack, wait] 30s, 29.999s, 776.178µs
81-
Latencies [min, mean, 50, 90, 95, 99, max] 555.668µs, 750.151µs, 736.996µs, 847.199µs, 890.538µs, 1.003ms, 9.982ms
82-
Bytes In [total, mean] 4710000, 157.00
78+
Requests [total, rate, throughput] 30000, 1000.04, 1000.01
79+
Duration [total, attack, wait] 30s, 29.999s, 773.112µs
80+
Latencies [min, mean, 50, 90, 95, 99, max] 512.273µs, 709.133µs, 692.254µs, 793.501µs, 832.049µs, 968.373µs, 11.168ms
81+
Bytes In [total, mean] 4770000, 159.00
8382
Bytes Out [total, mean] 0, 0.00
8483
Success [ratio] 100.00%
8584
Status Codes [code:count] 200:30000

‎tests/results/dp-perf/edge/edge-plus.md‎

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,14 @@ NGINX Plus: true
66

77
NGINX Gateway Fabric:
88

9-
- Commit: d7d6b0af0d56721b28aba24c1541d650ef6bc5a9
10-
- Date: 2024-09-30T23:47:54Z
9+
- Commit: 3a08fdafadfe0fb4a9c25679da1a1fcd6b181474
10+
- Date: 2024-10-15T13:45:52Z
1111
- Dirty: false
1212

1313
GKE Cluster:
1414

1515
- Node count: 12
16-
- k8s version: v1.30.3-gke.1969001
16+
- k8s version: v1.30.5-gke.1014001
1717
- vCPUs per node: 16
1818
- RAM per node: 65853972Ki
1919
- Max pods per node: 110
@@ -23,23 +23,23 @@ GKE Cluster:
2323
## Test1: Running latte path based routing
2424

2525
```text
26-
Requests [total, rate, throughput] 29999, 1000.00, 999.98
27-
Duration [total, attack, wait] 30s, 29.999s, 613.524µs
28-
Latencies [min, mean, 50, 90, 95, 99, max] 493.667µs, 661.552µs, 643.908µs, 726.654µs, 763.9µs, 862.035µs, 16.392ms
29-
Bytes In [total, mean] 4829839, 161.00
26+
Requests [total, rate, throughput] 30000, 1000.02, 1000.00
27+
Duration [total, attack, wait] 30s, 29.999s, 621.777µs
28+
Latencies [min, mean, 50, 90, 95, 99, max] 493.496µs, 682.208µs, 666.971µs, 771.821µs, 812.592µs, 935.803µs, 9.613ms
29+
Bytes In [total, mean] 4800000, 160.00
3030
Bytes Out [total, mean] 0, 0.00
3131
Success [ratio] 100.00%
32-
Status Codes [code:count] 200:29999
32+
Status Codes [code:count] 200:30000
3333
Error Set:
3434
```
3535

3636
## Test2: Running coffee header based routing
3737

3838
```text
39-
Requests [total, rate, throughput] 30000, 1000.03, 1000.00
40-
Duration [total, attack, wait] 30s, 29.999s, 688.713µs
41-
Latencies [min, mean, 50, 90, 95, 99, max] 522.959µs, 689.862µs, 672.734µs, 764.478µs, 797.131µs, 890.809µs, 12.189ms
42-
Bytes In [total, mean] 4860000, 162.00
39+
Requests [total, rate, throughput] 30000, 1000.02, 1000.00
40+
Duration [total, attack, wait] 30s, 29.999s, 696.203µs
41+
Latencies [min, mean, 50, 90, 95, 99, max] 529.204µs, 709.079µs, 694.929µs, 791.712µs, 834.953µs, 960.962µs, 9.219ms
42+
Bytes In [total, mean] 4830000, 161.00
4343
Bytes Out [total, mean] 0, 0.00
4444
Success [ratio] 100.00%
4545
Status Codes [code:count] 200:30000
@@ -49,23 +49,23 @@ Error Set:
4949
## Test3: Running coffee query based routing
5050

5151
```text
52-
Requests [total, rate, throughput] 30000, 1000.03, 1000.00
53-
Duration [total, attack, wait] 30s, 29.999s, 670.956µs
54-
Latencies [min, mean, 50, 90, 95, 99, max] 531.378µs, 688.422µs, 674.945µs, 759.955µs, 793.679µs, 885.247µs, 14.82ms
55-
Bytes In [total, mean] 5100000, 170.00
52+
Requests [total, rate, throughput] 29999, 1000.00, 999.98
53+
Duration [total, attack, wait] 30s, 29.999s, 659.516µs
54+
Latencies [min, mean, 50, 90, 95, 99, max] 542.362µs, 719.357µs, 701.71µs, 805.054µs, 848.72µs, 980.33µs, 11.954ms
55+
Bytes In [total, mean] 5069831, 169.00
5656
Bytes Out [total, mean] 0, 0.00
5757
Success [ratio] 100.00%
58-
Status Codes [code:count] 200:30000
58+
Status Codes [code:count] 200:29999
5959
Error Set:
6060
```
6161

6262
## Test4: Running tea GET method based routing
6363

6464
```text
6565
Requests [total, rate, throughput] 30000, 1000.03, 1000.01
66-
Duration [total, attack, wait] 30s, 29.999s, 750.387µs
67-
Latencies [min, mean, 50, 90, 95, 99, max] 530.656µs, 682.96µs, 663.291µs, 755.22µs, 792.507µs, 882.755µs, 20.103ms
68-
Bytes In [total, mean] 4770000, 159.00
66+
Duration [total, attack, wait] 30s, 29.999s, 677.532µs
67+
Latencies [min, mean, 50, 90, 95, 99, max] 509.01µs, 703.22µs, 689.619µs, 790.875µs, 832.349µs, 970.323µs, 7.744ms
68+
Bytes In [total, mean] 4740000, 158.00
6969
Bytes Out [total, mean] 0, 0.00
7070
Success [ratio] 100.00%
7171
Status Codes [code:count] 200:30000
@@ -75,10 +75,10 @@ Error Set:
7575
## Test5: Running tea POST method based routing
7676

7777
```text
78-
Requests [total, rate, throughput] 30000, 1000.04, 1000.01
79-
Duration [total, attack, wait] 30s, 29.999s, 648.522µs
80-
Latencies [min, mean, 50, 90, 95, 99, max] 519.81µs, 675.008µs, 658.634µs, 742.332µs, 782.502µs, 869.715µs, 12.734ms
81-
Bytes In [total, mean] 4770000, 159.00
78+
Requests [total, rate, throughput] 30000, 1000.01, 999.99
79+
Duration [total, attack, wait] 30s, 30s, 687.367µs
80+
Latencies [min, mean, 50, 90, 95, 99, max] 520.251µs, 696.116µs, 682.682µs, 780.437µs, 820.818µs, 945.164µs, 8.67ms
81+
Bytes In [total, mean] 4740000, 158.00
8282
Bytes Out [total, mean] 0, 0.00
8383
Success [ratio] 100.00%
8484
Status Codes [code:count] 200:30000

‎tests/results/ngf-upgrade/edge/edge-oss.md‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -6,46 +6,46 @@ NGINX Plus: false
66

77
NGINX Gateway Fabric:
88

9-
- Commit: d7d6b0af0d56721b28aba24c1541d650ef6bc5a9
10-
- Date: 2024-09-30T23:47:54Z
9+
- Commit: 3a08fdafadfe0fb4a9c25679da1a1fcd6b181474
10+
- Date: 2024-10-15T13:45:52Z
1111
- Dirty: false
1212

1313
GKE Cluster:
1414

1515
- Node count: 12
16-
- k8s version: v1.30.3-gke.1969001
16+
- k8s version: v1.30.5-gke.1014001
1717
- vCPUs per node: 16
18-
- RAM per node: 65853964Ki
18+
- RAM per node: 65853972Ki
1919
- Max pods per node: 110
2020
- Zone: us-west1-b
2121
- Instance Type: n2d-standard-16
2222

23-
## Test: Send https /tea traffic
23+
## Test: Send http /coffee traffic
2424

2525
```text
2626
Requests [total, rate, throughput] 6000, 100.02, 100.01
27-
Duration [total, attack, wait] 59.991s, 59.991s, 868µs
28-
Latencies [min, mean, 50, 90, 95, 99, max] 673.831µs, 905.163µs, 871.482µs, 1.007ms, 1.058ms, 1.21ms, 12.461ms
29-
Bytes In [total, mean] 926034, 154.34
27+
Duration [total, attack, wait] 59.991s, 59.99s, 879.857µs
28+
Latencies [min, mean, 50, 90, 95, 99, max] 472.733µs, 846.68µs, 831.757µs, 948.108µs, 989.426µs, 1.13ms, 12.461ms
29+
Bytes In [total, mean] 968005, 161.33
3030
Bytes Out [total, mean] 0, 0.00
3131
Success [ratio] 100.00%
3232
Status Codes [code:count] 200:6000
3333
Error Set:
3434
```
3535

36-
![https-oss.png](https-oss.png)
36+
![http-oss.png](http-oss.png)
3737

38-
## Test: Send http /coffee traffic
38+
## Test: Send https /tea traffic
3939

4040
```text
4141
Requests [total, rate, throughput] 6000, 100.02, 100.01
42-
Duration [total, attack, wait] 59.991s, 59.99s, 738.617µs
43-
Latencies [min, mean, 50, 90, 95, 99, max] 611.455µs, 861.834µs, 832.286µs, 967.223µs, 1.017ms, 1.204ms, 12.717ms
44-
Bytes In [total, mean] 960000, 160.00
42+
Duration [total, attack, wait] 59.991s, 59.99s, 802.597µs
43+
Latencies [min, mean, 50, 90, 95, 99, max] 646.501µs, 872.011µs, 851.784µs, 961.79µs, 1.006ms, 1.137ms, 12.519ms
44+
Bytes In [total, mean] 930000, 155.00
4545
Bytes Out [total, mean] 0, 0.00
4646
Success [ratio] 100.00%
4747
Status Codes [code:count] 200:6000
4848
Error Set:
4949
```
5050

51-
![http-oss.png](http-oss.png)
51+
![https-oss.png](https-oss.png)

‎tests/results/ngf-upgrade/edge/edge-plus.md‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -6,46 +6,46 @@ NGINX Plus: true
66

77
NGINX Gateway Fabric:
88

9-
- Commit: d7d6b0af0d56721b28aba24c1541d650ef6bc5a9
10-
- Date: 2024-09-30T23:47:54Z
9+
- Commit: 3a08fdafadfe0fb4a9c25679da1a1fcd6b181474
10+
- Date: 2024-10-15T13:45:52Z
1111
- Dirty: false
1212

1313
GKE Cluster:
1414

1515
- Node count: 12
16-
- k8s version: v1.30.3-gke.1969001
16+
- k8s version: v1.30.5-gke.1014001
1717
- vCPUs per node: 16
1818
- RAM per node: 65853972Ki
1919
- Max pods per node: 110
2020
- Zone: us-west1-b
2121
- Instance Type: n2d-standard-16
2222

23-
## Test: Send https /tea traffic
23+
## Test: Send http /coffee traffic
2424

2525
```text
2626
Requests [total, rate, throughput] 6000, 100.02, 100.02
27-
Duration [total, attack, wait] 59.991s, 59.99s, 837.681µs
28-
Latencies [min, mean, 50, 90, 95, 99, max] 653.705µs, 925.365µs, 897.43µs, 1.065ms, 1.118ms, 1.26ms, 12.393ms
29-
Bytes In [total, mean] 931990, 155.33
27+
Duration [total, attack, wait] 59.991s, 59.99s, 913.585µs
28+
Latencies [min, mean, 50, 90, 95, 99, max] 660.737µs, 910.81µs, 889.797µs, 1.034ms, 1.093ms, 1.262ms, 14.865ms
29+
Bytes In [total, mean] 968001, 161.33
3030
Bytes Out [total, mean] 0, 0.00
3131
Success [ratio] 100.00%
3232
Status Codes [code:count] 200:6000
3333
Error Set:
3434
```
3535

36-
![https-plus.png](https-plus.png)
36+
![http-plus.png](http-plus.png)
3737

38-
## Test: Send http /coffee traffic
38+
## Test: Send https /tea traffic
3939

4040
```text
4141
Requests [total, rate, throughput] 6000, 100.02, 100.02
42-
Duration [total, attack, wait] 59.991s, 59.99s, 937.076µs
43-
Latencies [min, mean, 50, 90, 95, 99, max] 429.788µs, 877.933µs, 876.522µs, 1.03ms, 1.08ms, 1.189ms, 12.246ms
44-
Bytes In [total, mean] 966000, 161.00
42+
Duration [total, attack, wait] 59.991s, 59.99s, 939.801µs
43+
Latencies [min, mean, 50, 90, 95, 99, max] 484.682µs, 898.425µs, 890.482µs, 1.025ms, 1.079ms, 1.209ms, 13.209ms
44+
Bytes In [total, mean] 932025, 155.34
4545
Bytes Out [total, mean] 0, 0.00
4646
Success [ratio] 100.00%
4747
Status Codes [code:count] 200:6000
4848
Error Set:
4949
```
5050

51-
![http-plus.png](http-plus.png)
51+
![https-plus.png](https-plus.png)

‎tests/results/ngf-upgrade/edge/http-oss.png‎

-13 Bytes
Loading

‎tests/results/ngf-upgrade/edge/http-plus.png‎

17 Bytes
Loading

0 commit comments

Comments
 (0)