Skip to content

Commit 6a6e14c

Browse files
authored
Merge branch 'release-1.3' into docs/release-1.3.0
2 parents a30333f + 07657cc commit 6a6e14c

34 files changed

+701
-76
lines changed

.github/workflows/conformance.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ jobs:
8080
uses: goreleaser/goreleaser-action@286f3b13b1b49da4ac219696163fb8c1c93e1200 # v6.0.0
8181
with:
8282
version: latest
83-
args: build --snapshot --clean
83+
args: build --single-target --snapshot --clean
8484
env:
8585
TELEMETRY_ENDPOINT: "" # disables sending telemetry
8686
TELEMETRY_ENDPOINT_INSECURE: "false"

.github/workflows/functional.yml

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ jobs:
6868
uses: goreleaser/goreleaser-action@286f3b13b1b49da4ac219696163fb8c1c93e1200 # v6.0.0
6969
with:
7070
version: latest
71-
args: build --snapshot --clean
71+
args: build --single-target --snapshot --clean
7272
env:
7373
TELEMETRY_ENDPOINT: otel-collector-opentelemetry-collector.collector.svc.cluster.local:4317
7474
TELEMETRY_ENDPOINT_INSECURE: "true"
@@ -98,6 +98,14 @@ jobs:
9898
NGINX_CONF_DIR=internal/mode/static/nginx/conf
9999
BUILD_AGENT=gha
100100
101+
- name: Install cloud-provider-kind
102+
run: |
103+
curl -fsSL -O https://github.com/kubernetes-sigs/cloud-provider-kind/releases/download/v0.2.0/cloud-provider-kind_0.2.0_linux_amd64.tar.gz
104+
tar -xvf cloud-provider-kind_0.2.0_linux_amd64.tar.gz
105+
106+
- name: Run cloud-provider-kind
107+
run: ./cloud-provider-kind & > cloud-provider-kind.log 2>&1
108+
101109
- name: Deploy Kubernetes
102110
id: k8s
103111
run: |
@@ -108,12 +116,12 @@ jobs:
108116
run: |
109117
ngf_prefix=ghcr.io/nginxinc/nginx-gateway-fabric
110118
ngf_tag=${{ steps.ngf-meta.outputs.version }}
111-
make test${{ inputs.image == 'plus' && '-with-plus' || ''}} PREFIX=${ngf_prefix} TAG=${ngf_tag} GINKGO_LABEL=telemetry
119+
make test${{ inputs.image == 'plus' && '-with-plus' || ''}} PREFIX=${ngf_prefix} TAG=${ngf_tag} GINKGO_LABEL=telemetry GW_SERVICE_TYPE=LoadBalancer
112120
working-directory: ./tests
113121

114122
- name: Run functional tests
115123
run: |
116124
ngf_prefix=ghcr.io/nginxinc/nginx-gateway-fabric
117125
ngf_tag=${{ steps.ngf-meta.outputs.version }}
118-
make test${{ inputs.image == 'plus' && '-with-plus' || ''}} PREFIX=${ngf_prefix} TAG=${ngf_tag}
126+
make test${{ inputs.image == 'plus' && '-with-plus' || ''}} PREFIX=${ngf_prefix} TAG=${ngf_tag} GW_SERVICE_TYPE=LoadBalancer
119127
working-directory: ./tests

build/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ RUN make build
1111

1212
FROM golang:1.22 as ca-certs-provider
1313

14-
FROM alpine:3.19 as capabilizer
14+
FROM alpine:3.20 as capabilizer
1515
RUN apk add --no-cache libcap
1616

1717
FROM capabilizer as local-capabilizer

build/Dockerfile.nginxplus

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ FROM scratch as nginx-files
55
ADD --link --chown=101:1001 https://cs.nginx.com/static/keys/nginx_signing.rsa.pub nginx_signing.rsa.pub
66

77

8-
FROM alpine:3.19
8+
FROM alpine:3.20
99

1010
ARG NGINX_PLUS_VERSION=R32
1111
ARG NJS_DIR
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
# Client Settings Policy
22

3-
This directory contains YAML files of ClientSettingsPolicies.
3+
This directory contains the YAML files used in the [ClientSettingsPolicy](https://docs.nginx.com/nginx-gateway-fabric/how-to/traffic-management/client-settings/) guide.

examples/client-settings-policy/csp-grpcroute.yaml

Lines changed: 0 additions & 14 deletions
This file was deleted.

examples/client-settings-policy/csp-httproutes.yaml

Lines changed: 0 additions & 38 deletions
This file was deleted.
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,11 @@
11
apiVersion: gateway.nginx.org/v1alpha1
22
kind: ClientSettingsPolicy
33
metadata:
4-
name: gw
5-
namespace: default
4+
name: gateway-client-settings
65
spec:
76
targetRef:
87
group: gateway.networking.k8s.io
98
kind: Gateway
109
name: gateway
1110
body:
12-
maxSize: 10m
13-
timeout: 30s
14-
keepAlive:
15-
requests: 100
16-
time: 5s
17-
timeout:
18-
server: 2s
19-
header: 1s
11+
maxSize: "50" # sizes without a unit are bytes.

examples/client-settings-policy/gateway.yaml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,3 @@ spec:
99
port: 80
1010
protocol: HTTP
1111
hostname: "*.example.com"
12-
- name: http2
13-
port: 8080
14-
protocol: HTTP
15-
hostname: "*.example.org"
Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
apiVersion: gateway.nginx.org/v1alpha1
2+
kind: ClientSettingsPolicy
3+
metadata:
4+
name: grpc-client-settings
5+
spec:
6+
targetRef:
7+
group: gateway.networking.k8s.io
8+
kind: GRPCRoute
9+
name: my-grpc-route
10+
body:
11+
maxSize: "75" # sizes without a unit are bytes.
Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
apiVersion: gateway.nginx.org/v1alpha1
2+
kind: ClientSettingsPolicy
3+
metadata:
4+
name: tea-client-settings
5+
spec:
6+
targetRef:
7+
group: gateway.networking.k8s.io
8+
kind: HTTPRoute
9+
name: tea
10+
body:
11+
maxSize: "75" # sizes without a unit are bytes.

site/content/how-to/monitoring/tracing.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,10 @@ NGINX Gateway Fabric supports tracing using [OpenTelemetry](https://opentelemetr
1313

1414
This guide explains how to enable tracing on HTTPRoutes using NGINX Gateway Fabric. It uses the OpenTelemetry Collector and Jaeger to process and collect the traces.
1515

16+
{{< important >}}
17+
Tracing cannot be enabled for [HTTPRoute matches](https://gateway-api.sigs.k8s.io/reference/spec/#gateway.networking.k8s.io/v1.HTTPRouteMatch) with `headers`, `params`, or `method` matchers defined. It will be added in a future release.
18+
{{< /important >}}
19+
1620
## Install the Collectors
1721

1822
The first step is to install the collectors. NGINX Gateway Fabric will be configured to export to the OpenTelemetry Collector, which is configured to export to Jaeger. This model allows the visualization collector (Jaeger) to be swapped with something else, or to add more collectors without needing to reconfigure NGINX Gateway Fabric. It is also possible to configure NGINX Gateway Fabric to export directly to Jaeger.

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

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -109,3 +109,31 @@ If using NGINX Gateway Fabric with NGINX Plus as the data plane, you will see th
109109
#### Resolution
110110

111111
To resolve this issue, enable Usage Reporting by following the [Usage Reporting]({{< relref "installation/usage-reporting.md" >}}) guide.
112+
113+
### 413 Request Entity Too Large
114+
115+
#### Description
116+
117+
If you receive the following error:
118+
119+
```text
120+
<html>
121+
<head><title>413 Request Entity Too Large</title></head>
122+
<body>
123+
<center><h1>413 Request Entity Too Large</h1></center>
124+
<hr><center>nginx/1.25.5</center>
125+
</body>
126+
</html>
127+
```
128+
129+
Or view the following error message in the NGINX logs:
130+
131+
```text
132+
2024/05/30 21:48:22 [error] 138#138: *43 client intended to send too large body: 112 bytes, client: 127.0.0.1, server: cafe.example.com, request: "POST /coffee HTTP/1.1", host: "cafe.example.com:8080"
133+
```
134+
135+
The request body exceeds the [client_max_body_size](https://nginx.org/en/docs/http/ngx_http_core_module.html#client_max_body_size).
136+
137+
#### Resolution
138+
139+
You can configure the `client_max_body_size` using the `ClientSettingsPolicy` API. Read the [Client Settings Policy]({{< relref "how-to/traffic-management/client-settings.md" >}}) documentation for more information.

0 commit comments

Comments
 (0)