Skip to content

Commit c2286c3

Browse files
shaun-nxshaun-nx
authored
Merge branch 'main' into tests/cel-observabilitypolicy
2 parents 697c92d + 94a2edc commit c2286c3

30 files changed

+1235
-184
lines changed

‎.github/workflows/ci.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -161,15 +161,15 @@ jobs:
161161
if: ${{ github.event_name == 'push' && github.ref != 'refs/heads/main' }}
162162

163163
- name: Download Syft
164-
uses: anchore/sbom-action/download-syft@7b36ad622f042cab6f59a75c2ac24ccb256e9b45 # v0.20.4
164+
uses: anchore/sbom-action/download-syft@da167eac915b4e86f08b264dbdbc867b61be6f0c # v0.20.5
165165
if: github.ref_type == 'tag'
166166

167167
- name: Install Cosign
168168
uses: sigstore/cosign-installer@d58896d6a1865668819e1d91763c7751a165e159 # v3.9.2
169169
if: github.ref_type == 'tag'
170170

171171
- name: Build binary
172-
uses: goreleaser/goreleaser-action@9c156ee8a17a598857849441385a2041ef570552 # v6.3.0
172+
uses: goreleaser/goreleaser-action@e435ccd777264be153ace6237001ef4d979d3a7a # v6.4.0
173173
with:
174174
version: v2.11.2 # renovate: datasource=github-tags depName=goreleaser/goreleaser
175175
args: ${{ github.ref_type == 'tag' && 'release' || 'build --snapshot' }} --clean

‎.github/workflows/conformance.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ jobs:
7777
type=ref,event=branch,suffix=-rc,enable=${{ startsWith(github.ref, 'refs/heads/release') }}
7878
7979
- name: Build binary
80-
uses: goreleaser/goreleaser-action@9c156ee8a17a598857849441385a2041ef570552 # v6.3.0
80+
uses: goreleaser/goreleaser-action@e435ccd777264be153ace6237001ef4d979d3a7a # v6.4.0
8181
with:
8282
version: v2.11.2 # renovate: datasource=github-tags depName=goreleaser/goreleaser
8383
args: build --single-target --snapshot --clean

‎.github/workflows/functional.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ jobs:
7171
type=ref,event=branch,suffix=-rc,enable=${{ startsWith(github.ref, 'refs/heads/release') }}
7272
7373
- name: Build binary
74-
uses: goreleaser/goreleaser-action@9c156ee8a17a598857849441385a2041ef570552 # v6.3.0
74+
uses: goreleaser/goreleaser-action@e435ccd777264be153ace6237001ef4d979d3a7a # v6.4.0
7575
with:
7676
version: v2.11.2 # renovate: datasource=github-tags depName=goreleaser/goreleaser
7777
args: build --single-target --snapshot --clean

‎.github/workflows/lint.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ jobs:
4040
uses: golangci/golangci-lint-action@4afd733a84b1f43292c63897423277bb7f4313a9 # v8.0.0
4141
with:
4242
working-directory: ${{ matrix.directory }}
43-
version: v2.3.1 # renovate: datasource=github-tags depName=golangci/golangci-lint
43+
version: v2.4.0 # renovate: datasource=github-tags depName=golangci/golangci-lint
4444

4545
njs-lint:
4646
name: NJS Lint

‎.pre-commit-config.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ repos:
3939
- javascript
4040

4141
- repo: https://github.com/golangci/golangci-lint
42-
rev: v2.3.1
42+
rev: v2.4.0
4343
hooks:
4444
- id: golangci-lint-full
4545
name: golangci-lint-root

‎Makefile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ GO_LINKER_FLAGS = $(GO_LINKER_FLAGS_OPTIMIZATIONS) $(GO_LINKER_FlAGS_VARS)
2323

2424
# tools versions
2525
# renovate: datasource=github-tags depName=golangci/golangci-lint
26-
GOLANGCI_LINT_VERSION = v2.3.1
26+
GOLANGCI_LINT_VERSION = v2.4.0
2727
# renovate: datasource=docker depName=kindest/node
2828
KIND_K8S_VERSION = v1.33.2
2929
# renovate: datasource=github-tags depName=norwoodj/helm-docs

‎build/Dockerfile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# syntax=docker/dockerfile:1.17
2-
FROM golang:1.24 AS builder
2+
FROM golang:1.25 AS builder
33

44
WORKDIR /go/src/github.com/nginx/nginx-gateway-fabric
55

@@ -9,7 +9,7 @@ RUN go mod download
99
COPY . /go/src/github.com/nginx/nginx-gateway-fabric
1010
RUN make build
1111

12-
FROM golang:1.24 AS ca-certs-provider
12+
FROM golang:1.25 AS ca-certs-provider
1313

1414
FROM scratch AS common
1515
# CA certs are needed for telemetry report so that NGF can verify the server's certificate.

‎debug/Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# syntax=docker/dockerfile:1.17
22
# This Dockerfile builds an image with the dlv debugger. See the debugging guide in the developer docs for details
33
# on how to use it.
4-
FROM golang:1.24-alpine AS builder
4+
FROM golang:1.25-alpine AS builder
55

66
RUN go install github.com/go-delve/delve/cmd/dlv@latest
77

‎go.mod‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,10 @@ require (
2121
google.golang.org/grpc v1.74.2
2222
google.golang.org/protobuf v1.36.7
2323
gopkg.in/evanphx/json-patch.v4 v4.13.0
24-
k8s.io/api v0.33.3
25-
k8s.io/apiextensions-apiserver v0.33.3
26-
k8s.io/apimachinery v0.33.3
27-
k8s.io/client-go v0.33.3
24+
k8s.io/api v0.33.4
25+
k8s.io/apiextensions-apiserver v0.33.4
26+
k8s.io/apimachinery v0.33.4
27+
k8s.io/client-go v0.33.4
2828
k8s.io/klog/v2 v2.130.1
2929
sigs.k8s.io/controller-runtime v0.21.0
3030
sigs.k8s.io/gateway-api v1.3.0

‎go.sum‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -312,14 +312,14 @@ gopkg.in/ini.v1 v1.67.0 h1:Dgnx+6+nfE+IfzjUEISNeydPJh9AXNNsWbGP9KzCsOA=
312312
gopkg.in/ini.v1 v1.67.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k=
313313
gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
314314
gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
315-
k8s.io/api v0.33.3 h1:SRd5t//hhkI1buzxb288fy2xvjubstenEKL9K51KBI8=
316-
k8s.io/api v0.33.3/go.mod h1:01Y/iLUjNBM3TAvypct7DIj0M0NIZc+PzAHCIo0CYGE=
317-
k8s.io/apiextensions-apiserver v0.33.3 h1:qmOcAHN6DjfD0v9kxL5udB27SRP6SG/MTopmge3MwEs=
318-
k8s.io/apiextensions-apiserver v0.33.3/go.mod h1:oROuctgo27mUsyp9+Obahos6CWcMISSAPzQ77CAQGz8=
319-
k8s.io/apimachinery v0.33.3 h1:4ZSrmNa0c/ZpZJhAgRdcsFcZOw1PQU1bALVQ0B3I5LA=
320-
k8s.io/apimachinery v0.33.3/go.mod h1:BHW0YOu7n22fFv/JkYOEfkUYNRN0fj0BlvMFWA7b+SM=
321-
k8s.io/client-go v0.33.3 h1:M5AfDnKfYmVJif92ngN532gFqakcGi6RvaOF16efrpA=
322-
k8s.io/client-go v0.33.3/go.mod h1:luqKBQggEf3shbxHY4uVENAxrDISLOarxpTKMiUuujg=
315+
k8s.io/api v0.33.4 h1:oTzrFVNPXBjMu0IlpA2eDDIU49jsuEorGHB4cvKupkk=
316+
k8s.io/api v0.33.4/go.mod h1:VHQZ4cuxQ9sCUMESJV5+Fe8bGnqAARZ08tSTdHWfeAc=
317+
k8s.io/apiextensions-apiserver v0.33.4 h1:rtq5SeXiDbXmSwxsF0MLe2Mtv3SwprA6wp+5qh/CrOU=
318+
k8s.io/apiextensions-apiserver v0.33.4/go.mod h1:mWXcZQkQV1GQyxeIjYApuqsn/081hhXPZwZ2URuJeSs=
319+
k8s.io/apimachinery v0.33.4 h1:SOf/JW33TP0eppJMkIgQ+L6atlDiP/090oaX0y9pd9s=
320+
k8s.io/apimachinery v0.33.4/go.mod h1:BHW0YOu7n22fFv/JkYOEfkUYNRN0fj0BlvMFWA7b+SM=
321+
k8s.io/client-go v0.33.4 h1:TNH+CSu8EmXfitntjUPwaKVPN0AYMbc9F1bBS8/ABpw=
322+
k8s.io/client-go v0.33.4/go.mod h1:LsA0+hBG2DPwovjd931L/AoaezMPX9CmBgyVyBZmbCY=
323323
k8s.io/klog/v2 v2.130.1 h1:n9Xl7H1Xvksem4KFG4PYbdQCQxqc/tTUyrgXaOhHSzk=
324324
k8s.io/klog/v2 v2.130.1/go.mod h1:3Jpz1GvMt720eyJH1ckRHK1EDfpxISzJ7I9OYgaDtPE=
325325
k8s.io/kube-openapi v0.0.0-20250318190949-c8a335a9a2ff h1:/usPimJzUKKu+m+TE36gUyGcf03XZEP0ZIKgKj35LS4=

0 commit comments

Comments
 (0)