Skip to content

Commit 133d380

Browse files
authored
Merge branch 'main' into tests/nfr-tests-edge
2 parents f9a2026 + 7b55423 commit 133d380

File tree

27 files changed

+192
-79
lines changed

27 files changed

+192
-79
lines changed

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ The following table lists the software versions NGINX Gateway Fabric supports.
6868

6969
| NGINX Gateway Fabric | Gateway API | Kubernetes | NGINX OSS | NGINX Plus | NGINX Agent |
7070
|----------------------|-------------|------------|-----------|------------|-------------|
71-
| Edge | 1.4.0 | 1.25+ | 1.29.3 | R36 | v3.5.1 |
71+
| Edge | 1.4.1 | 1.25+ | 1.29.3 | R36 | v3.5.1 |
7272
| 2.2.1 | 1.3.0 | 1.25+ | 1.29.2 | R35 | v3.5.0 |
7373
| 2.2.0 | 1.3.0 | 1.25+ | 1.29.2 | R35 | v3.3.2 |
7474
| 2.1.4 | 1.3.0 | 1.25+ | 1.29.1 | R35 | v3.3.1 |

build/ubi/Dockerfile

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ RUN make build
1111

1212
FROM golang:1.25 AS ca-certs-provider
1313

14-
FROM redhat/ubi9-minimal:9.7-1764578379 AS ngf-ubi-minimal
14+
FROM redhat/ubi9-minimal:9.7-1764794109 AS ngf-ubi-minimal
1515
# CA certs are needed for telemetry report so that NGF can verify the server's certificate.
1616
COPY --from=ca-certs-provider --link /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/
1717
USER 101:1001
@@ -33,11 +33,11 @@ COPY --link --chown=101:1001 LICENSE /licenses/
3333
ENTRYPOINT [ "/usr/bin/gateway" ]
3434

3535
FROM ngf-ubi-minimal AS container
36-
COPY --from=builder /go/src/github.com/nginxinc/nginx-gateway-fabric/build/out/gateway /usr/bin/gateway
36+
COPY --chmod=0755 --from=builder /go/src/github.com/nginxinc/nginx-gateway-fabric/build/out/gateway /usr/bin/gateway
3737

3838
FROM ngf-ubi-minimal AS local
39-
COPY ./build/out/gateway /usr/bin/gateway
39+
COPY --chmod=0755 ./build/out/gateway /usr/bin/gateway
4040

4141
FROM ngf-ubi-minimal AS goreleaser
4242
ARG TARGETARCH
43-
COPY dist/gateway_linux_$TARGETARCH*/gateway /usr/bin/gateway
43+
COPY --chmod=0755 dist/gateway_linux_$TARGETARCH*/gateway /usr/bin/gateway

build/ubi/Dockerfile.nginx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ ADD --link --chown=101:1001 build/ubi/repos/agent.repo agent.repo
88

99
FROM ghcr.io/nginx/dependencies/nginx-ubi:ubi9@sha256:1bde412ee491e03e686f3f8cebe22dad0526e007d0d34829c143f063dca8084f AS ubi9-packages
1010

11-
FROM redhat/ubi9-minimal:9.7-1764578379 AS ubi-nginx
11+
FROM redhat/ubi9-minimal:9.7-1764794109 AS ubi-nginx
1212

1313
# renovate: datasource=github-tags depName=nginx/agent
1414
ARG NGINX_AGENT_VERSION=v3.5.1

build/ubi/Dockerfile.nginxplus

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ ADD --link --chown=101:1001 build/ubi/repos/agent.repo agent.repo
88

99
FROM ghcr.io/nginx/dependencies/nginx-ubi:ubi9@sha256:1bde412ee491e03e686f3f8cebe22dad0526e007d0d34829c143f063dca8084f AS ubi9-packages
1010

11-
FROM redhat/ubi9-minimal:9.7-1764578379 AS ubi-nginx-plus
11+
FROM redhat/ubi9-minimal:9.7-1764794109 AS ubi-nginx-plus
1212

1313
ARG NGINX_PLUS_VERSION=R36
1414

cmd/gateway/validation.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import (
1212
)
1313

1414
const (
15-
// Regex from: https://github.com/kubernetes-sigs/gateway-api/blob/v1.4.0/apis/v1/shared_types.go#L675
15+
// Regex from: https://github.com/kubernetes-sigs/gateway-api/blob/v1.4.1/apis/v1/shared_types.go#L675
1616
controllerNameRegex = `^[a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*\/[A-Za-z0-9\/\-._~%!$&'()*+,;=:]+$` //nolint:lll
1717
)
1818

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
apiVersion: kustomize.config.k8s.io/v1beta1
22
kind: Kustomization
33
resources:
4-
- https://github.com/kubernetes-sigs/gateway-api/config/crd/experimental?timeout=120&ref=v1.4.0
4+
- https://github.com/kubernetes-sigs/gateway-api/config/crd/experimental?timeout=120&ref=v1.4.1
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
apiVersion: kustomize.config.k8s.io/v1beta1
22
kind: Kustomization
33
resources:
4-
- https://github.com/kubernetes-sigs/gateway-api/config/crd?timeout=120&ref=v1.4.0
4+
- https://github.com/kubernetes-sigs/gateway-api/config/crd?timeout=120&ref=v1.4.1

docs/proposals/authentication-filter.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Enhancement Proposal-4052: Authentiation Filter
1+
# Enhancement Proposal-4052: Authentication Filter
22

33
- Issue: https://github.com/nginx/nginx-gateway-fabric/issues/4052
44
- Status: Implementable

go.mod

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ require (
1313
github.com/onsi/ginkgo/v2 v2.27.2
1414
github.com/onsi/gomega v1.38.2
1515
github.com/prometheus/client_golang v1.23.2
16-
github.com/spf13/cobra v1.10.1
16+
github.com/spf13/cobra v1.10.2
1717
github.com/spf13/pflag v1.0.10
1818
go.opentelemetry.io/otel v1.38.0
1919
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.38.0
@@ -28,7 +28,7 @@ require (
2828
k8s.io/client-go v0.34.2
2929
k8s.io/klog/v2 v2.130.1
3030
sigs.k8s.io/controller-runtime v0.22.4
31-
sigs.k8s.io/gateway-api v1.4.0
31+
sigs.k8s.io/gateway-api v1.4.1
3232
sigs.k8s.io/gateway-api-inference-extension v1.1.0
3333
)
3434

go.sum

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -209,8 +209,8 @@ github.com/spf13/afero v1.15.0 h1:b/YBCLWAJdFWJTN9cLhiXXcD7mzKn9Dm86dNnfyQw1I=
209209
github.com/spf13/afero v1.15.0/go.mod h1:NC2ByUVxtQs4b3sIUphxK0NioZnmxgyCrfzeuq8lxMg=
210210
github.com/spf13/cast v1.10.0 h1:h2x0u2shc1QuLHfxi+cTJvs30+ZAHOGRic8uyGTDWxY=
211211
github.com/spf13/cast v1.10.0/go.mod h1:jNfB8QC9IA6ZuY2ZjDp0KtFO2LZZlg4S/7bzP6qqeHo=
212-
github.com/spf13/cobra v1.10.1 h1:lJeBwCfmrnXthfAupyUTzJ/J4Nc1RsHC/mSRU2dll/s=
213-
github.com/spf13/cobra v1.10.1/go.mod h1:7SmJGaTHFVBY0jW4NXGluQoLvhqFQM+6XSKD+P4XaB0=
212+
github.com/spf13/cobra v1.10.2 h1:DMTTonx5m65Ic0GOoRY2c16WCbHxOOw6xxezuLaBpcU=
213+
github.com/spf13/cobra v1.10.2/go.mod h1:7C1pvHqHw5A4vrJfjNwvOdzYu0Gml16OCs2GRiTUUS4=
214214
github.com/spf13/pflag v1.0.9/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
215215
github.com/spf13/pflag v1.0.10 h1:4EBh2KAYBwaONj6b2Ye1GiHfwjqyROoF4RwYO+vPwFk=
216216
github.com/spf13/pflag v1.0.10/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
@@ -356,8 +356,8 @@ k8s.io/utils v0.0.0-20250820121507-0af2bda4dd1d h1:wAhiDyZ4Tdtt7e46e9M5ZSAJ/MnPG
356356
k8s.io/utils v0.0.0-20250820121507-0af2bda4dd1d/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
357357
sigs.k8s.io/controller-runtime v0.22.4 h1:GEjV7KV3TY8e+tJ2LCTxUTanW4z/FmNB7l327UfMq9A=
358358
sigs.k8s.io/controller-runtime v0.22.4/go.mod h1:+QX1XUpTXN4mLoblf4tqr5CQcyHPAki2HLXqQMY6vh8=
359-
sigs.k8s.io/gateway-api v1.4.0 h1:ZwlNM6zOHq0h3WUX2gfByPs2yAEsy/EenYJB78jpQfQ=
360-
sigs.k8s.io/gateway-api v1.4.0/go.mod h1:AR5RSqciWP98OPckEjOjh2XJhAe2Na4LHyXD2FUY7Qk=
359+
sigs.k8s.io/gateway-api v1.4.1 h1:NPxFutNkKNa8UfLd2CMlEuhIPMQgDQ6DXNKG9sHbJU8=
360+
sigs.k8s.io/gateway-api v1.4.1/go.mod h1:AR5RSqciWP98OPckEjOjh2XJhAe2Na4LHyXD2FUY7Qk=
361361
sigs.k8s.io/gateway-api-inference-extension v1.1.0 h1:MqRYk+3LNUWB0MbTgTZVhmJGNDTvm8l3ze4MOlzR7MU=
362362
sigs.k8s.io/gateway-api-inference-extension v1.1.0/go.mod h1:BmJy8Hvc2EHl3Oa/Ka8/4RqwVHCCbX7BLndLdMNtugI=
363363
sigs.k8s.io/json v0.0.0-20250730193827-2d320260d730 h1:IpInykpT6ceI+QxKBbEflcR5EXP7sU1kvOlxwZh5txg=

0 commit comments

Comments
 (0)