Skip to content

Commit 801d2f3

Browse files
shaun-nxshaun-nx
authored
Merge branch 'main' into tests/cel-clientsettingspolicies
2 parents 94a8dd0 + 0651c28 commit 801d2f3

File tree

14 files changed

+42
-40
lines changed

14 files changed

+42
-40
lines changed

‎.github/workflows/build.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ jobs:
8282

8383
- name: Authenticate to Google Cloud
8484
id: auth
85-
uses: google-github-actions/auth@140bb5113ffb6b65a7e9b937a81fa96cf5064462 # v2.1.11
85+
uses: google-github-actions/auth@b7593ed2efd1c1617e1b0254da33b86225adb2a5 # v2.1.12
8686
with:
8787
token_format: access_token
8888
workload_identity_provider: ${{ secrets.GCP_WORKLOAD_IDENTITY }}
@@ -99,7 +99,7 @@ jobs:
9999

100100
- name: Docker meta
101101
id: meta
102-
uses: docker/metadata-action@902fa8ec7d6ecbf8d84d538b9b233a880e428804 # v5.7.0
102+
uses: docker/metadata-action@c1e51972afc2121e065aed6d45c65596fe445f3f # v5.8.0
103103
with:
104104
context: ${{ inputs.tag != '' && 'git' || 'workflow' }}
105105
images: |

‎.github/workflows/ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -171,7 +171,7 @@ jobs:
171171
- name: Build binary
172172
uses: goreleaser/goreleaser-action@9c156ee8a17a598857849441385a2041ef570552 # v6.3.0
173173
with:
174-
version: v2.11.1 # renovate: datasource=github-tags depName=goreleaser/goreleaser
174+
version: v2.11.2 # renovate: datasource=github-tags depName=goreleaser/goreleaser
175175
args: ${{ github.ref_type == 'tag' && 'release' || 'build --snapshot' }} --clean
176176
env:
177177
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

‎.github/workflows/conformance.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ jobs:
5252

5353
- name: NGF Docker meta
5454
id: ngf-meta
55-
uses: docker/metadata-action@902fa8ec7d6ecbf8d84d538b9b233a880e428804 # v5.7.0
55+
uses: docker/metadata-action@c1e51972afc2121e065aed6d45c65596fe445f3f # v5.8.0
5656
with:
5757
images: |
5858
name=ghcr.io/nginx/nginx-gateway-fabric
@@ -65,7 +65,7 @@ jobs:
6565
6666
- name: NGINX Docker meta
6767
id: nginx-meta
68-
uses: docker/metadata-action@902fa8ec7d6ecbf8d84d538b9b233a880e428804 # v5.7.0
68+
uses: docker/metadata-action@c1e51972afc2121e065aed6d45c65596fe445f3f # v5.8.0
6969
with:
7070
images: |
7171
name=ghcr.io/nginx/nginx-gateway-fabric/${{ inputs.image == 'plus' && 'nginx-plus' || inputs.image }}
@@ -79,7 +79,7 @@ jobs:
7979
- name: Build binary
8080
uses: goreleaser/goreleaser-action@9c156ee8a17a598857849441385a2041ef570552 # v6.3.0
8181
with:
82-
version: v2.11.1 # renovate: datasource=github-tags depName=goreleaser/goreleaser
82+
version: v2.11.2 # renovate: datasource=github-tags depName=goreleaser/goreleaser
8383
args: build --single-target --snapshot --clean
8484
env:
8585
TELEMETRY_ENDPOINT: "" # disables sending telemetry

‎.github/workflows/functional.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ jobs:
4646

4747
- name: NGF Docker meta
4848
id: ngf-meta
49-
uses: docker/metadata-action@902fa8ec7d6ecbf8d84d538b9b233a880e428804 # v5.7.0
49+
uses: docker/metadata-action@c1e51972afc2121e065aed6d45c65596fe445f3f # v5.8.0
5050
with:
5151
images: |
5252
name=ghcr.io/nginx/nginx-gateway-fabric
@@ -59,7 +59,7 @@ jobs:
5959
6060
- name: NGINX Docker meta
6161
id: nginx-meta
62-
uses: docker/metadata-action@902fa8ec7d6ecbf8d84d538b9b233a880e428804 # v5.7.0
62+
uses: docker/metadata-action@c1e51972afc2121e065aed6d45c65596fe445f3f # v5.8.0
6363
with:
6464
images: |
6565
name=ghcr.io/nginx/nginx-gateway-fabric/${{ inputs.image == 'plus' && 'nginx-plus' || inputs.image }}
@@ -73,7 +73,7 @@ jobs:
7373
- name: Build binary
7474
uses: goreleaser/goreleaser-action@9c156ee8a17a598857849441385a2041ef570552 # v6.3.0
7575
with:
76-
version: v2.11.1 # renovate: datasource=github-tags depName=goreleaser/goreleaser
76+
version: v2.11.2 # renovate: datasource=github-tags depName=goreleaser/goreleaser
7777
args: build --single-target --snapshot --clean
7878
env:
7979
TELEMETRY_ENDPOINT: otel-collector-opentelemetry-collector.collector.svc.cluster.local:4317

‎.github/workflows/helm.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ jobs:
3535

3636
- name: NGF Docker meta
3737
id: ngf-meta
38-
uses: docker/metadata-action@902fa8ec7d6ecbf8d84d538b9b233a880e428804 # v5.7.0
38+
uses: docker/metadata-action@c1e51972afc2121e065aed6d45c65596fe445f3f # v5.8.0
3939
with:
4040
images: |
4141
name=ghcr.io/nginx/nginx-gateway-fabric
@@ -48,7 +48,7 @@ jobs:
4848
4949
- name: NGINX Docker meta
5050
id: nginx-meta
51-
uses: docker/metadata-action@902fa8ec7d6ecbf8d84d538b9b233a880e428804 # v5.7.0
51+
uses: docker/metadata-action@c1e51972afc2121e065aed6d45c65596fe445f3f # v5.8.0
5252
with:
5353
images: |
5454
name=ghcr.io/nginx/nginx-gateway-fabric/${{ inputs.image == 'plus' && 'nginx-plus' || inputs.image }}

‎.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.0 # renovate: datasource=github-tags depName=golangci/golangci-lint
43+
version: v2.3.1 # renovate: datasource=github-tags depName=golangci/golangci-lint
4444

4545
njs-lint:
4646
name: NJS Lint

‎.github/workflows/nfr.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ jobs:
8686

8787
- name: Authenticate to Google Cloud
8888
id: auth
89-
uses: google-github-actions/auth@140bb5113ffb6b65a7e9b937a81fa96cf5064462 # v2.1.11
89+
uses: google-github-actions/auth@b7593ed2efd1c1617e1b0254da33b86225adb2a5 # v2.1.12
9090
with:
9191
token_format: access_token
9292
workload_identity_provider: ${{ secrets.GCP_WORKLOAD_IDENTITY }}

‎.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.0
42+
rev: v2.3.1
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.0
26+
GOLANGCI_LINT_VERSION = v2.3.1
2727
# renovate: datasource=docker depName=kindest/node
2828
KIND_K8S_VERSION = v1.33.2
2929
# renovate: datasource=github-tags depName=norwoodj/helm-docs

‎go.mod

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,14 +11,14 @@ require (
1111
github.com/nginx/telemetry-exporter v0.1.4
1212
github.com/onsi/ginkgo/v2 v2.23.4
1313
github.com/onsi/gomega v1.38.0
14-
github.com/prometheus/client_golang v1.22.0
14+
github.com/prometheus/client_golang v1.23.0
1515
github.com/spf13/cobra v1.9.1
1616
github.com/spf13/pflag v1.0.7
1717
go.opentelemetry.io/otel v1.37.0
1818
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.37.0
1919
go.uber.org/zap v1.27.0
2020
golang.org/x/text v0.27.0
21-
google.golang.org/grpc v1.74.0
21+
google.golang.org/grpc v1.74.2
2222
google.golang.org/protobuf v1.36.6
2323
gopkg.in/evanphx/json-patch.v4 v4.12.0
2424
k8s.io/api v0.33.3
@@ -59,9 +59,9 @@ require (
5959
github.com/modern-go/reflect2 v1.0.2 // indirect
6060
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
6161
github.com/pkg/errors v0.9.1 // indirect
62-
github.com/prometheus/client_model v0.6.1 // indirect
63-
github.com/prometheus/common v0.62.0 // indirect
64-
github.com/prometheus/procfs v0.16.0 // indirect
62+
github.com/prometheus/client_model v0.6.2 // indirect
63+
github.com/prometheus/common v0.65.0 // indirect
64+
github.com/prometheus/procfs v0.16.1 // indirect
6565
github.com/x448/float16 v0.8.4 // indirect
6666
go.opentelemetry.io/auto/sdk v1.1.0 // indirect
6767
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.37.0 // indirect

0 commit comments

Comments
 (0)