Skip to content

Commit 05e8c7a

Browse files
authored
Merge branch 'main' into docs/proposals/observability-policy
2 parents 14457ff + 2277050 commit 05e8c7a

Some content is hidden

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

49 files changed

+3222
-3454
lines changed

.github/workflows/build.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ jobs:
4646
key: nginx-gateway-fabric-${{ github.run_id }}-${{ github.run_number }}
4747

4848
- name: Docker Buildx
49-
uses: docker/setup-buildx-action@2b51285047da1547ffb1b2203d8be4c0af6b1f20 # v3.2.0
49+
uses: docker/setup-buildx-action@d70bba72b1f3fd22344832f00baa16ece964efeb # v3.3.0
5050
with:
5151
driver-opts: network=host
5252

@@ -152,7 +152,7 @@ jobs:
152152
fail-build: false
153153

154154
- name: Upload scan result to GitHub Security tab
155-
uses: github/codeql-action/upload-sarif@4355270be187e1b672a7a1c7c7bae5afdc1ab94a # v3.24.10
155+
uses: github/codeql-action/upload-sarif@df5a14dc28094dc936e103b37d749c6628682b60 # v3.25.0
156156
continue-on-error: true
157157
with:
158158
sarif_file: ${{ steps.scan.outputs.sarif }}

.github/workflows/ci.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ jobs:
7373
run: make unit-test
7474

7575
- name: Upload coverage reports to Codecov
76-
uses: codecov/codecov-action@7afa10ed9b269c561c2336fd862446844e0cbf71 # v4.2.0
76+
uses: codecov/codecov-action@84508663e988701840491b86de86b666e8a86bed # v4.3.0
7777
with:
7878
token: ${{ secrets.CODECOV_TOKEN }}
7979

@@ -101,7 +101,7 @@ jobs:
101101
run: npm --prefix ${{ github.workspace }}/internal/mode/static/nginx/modules install-ci-test
102102

103103
- name: Upload coverage reports to Codecov
104-
uses: codecov/codecov-action@7afa10ed9b269c561c2336fd862446844e0cbf71 # v4.2.0
104+
uses: codecov/codecov-action@84508663e988701840491b86de86b666e8a86bed # v4.3.0
105105
with:
106106
token: ${{ secrets.CODECOV_TOKEN }}
107107

@@ -141,7 +141,7 @@ jobs:
141141
if: github.ref_type == 'tag'
142142

143143
- name: Install Cosign
144-
uses: sigstore/cosign-installer@e1523de7571e31dbe865fd2e80c5c7c23ae71eb4 # v3.4.0
144+
uses: sigstore/cosign-installer@59acb6260d9c0ba8f4a2f9d9b48431a222b68e20 # v3.5.0
145145
if: github.ref_type == 'tag'
146146

147147
- name: Build binary
@@ -245,7 +245,7 @@ jobs:
245245
key: nginx-gateway-fabric-${{ github.run_id }}-${{ github.run_number }}
246246

247247
- name: Docker Buildx
248-
uses: docker/setup-buildx-action@2b51285047da1547ffb1b2203d8be4c0af6b1f20 # v3.2.0
248+
uses: docker/setup-buildx-action@d70bba72b1f3fd22344832f00baa16ece964efeb # v3.3.0
249249

250250
- name: NGF Docker meta
251251
id: ngf-meta

.github/workflows/codeql-analysis.yml

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

4545
# Initializes the CodeQL tools for scanning.
4646
- name: Initialize CodeQL
47-
uses: github/codeql-action/init@4355270be187e1b672a7a1c7c7bae5afdc1ab94a # v3.24.10
47+
uses: github/codeql-action/init@df5a14dc28094dc936e103b37d749c6628682b60 # v3.25.0
4848
with:
4949
languages: ${{ matrix.language }}
5050
# If you wish to specify custom queries, you can do so here or in a config file.
@@ -63,7 +63,7 @@ jobs:
6363
# Autobuild attempts to build any compiled languages (C/C++, C#, Go, Java, or Swift).
6464
# If this step fails, then you should remove it and run the build manually (see below)
6565
- name: Autobuild
66-
uses: github/codeql-action/autobuild@4355270be187e1b672a7a1c7c7bae5afdc1ab94a # v3.24.10
66+
uses: github/codeql-action/autobuild@df5a14dc28094dc936e103b37d749c6628682b60 # v3.25.0
6767

6868
# ℹ️ Command-line programs to run using the OS shell.
6969
# 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun
@@ -76,6 +76,6 @@ jobs:
7676
# ./location_of_script_within_repo/buildscript.sh
7777

7878
- name: Perform CodeQL Analysis
79-
uses: github/codeql-action/analyze@4355270be187e1b672a7a1c7c7bae5afdc1ab94a # v3.24.10
79+
uses: github/codeql-action/analyze@df5a14dc28094dc936e103b37d749c6628682b60 # v3.25.0
8080
with:
8181
category: "/language:${{matrix.language}}"

.github/workflows/conformance.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ jobs:
3737
key: nginx-gateway-fabric-${{ github.run_id }}-${{ github.run_number }}
3838

3939
- name: Docker Buildx
40-
uses: docker/setup-buildx-action@2b51285047da1547ffb1b2203d8be4c0af6b1f20 # v3.2.0
40+
uses: docker/setup-buildx-action@d70bba72b1f3fd22344832f00baa16ece964efeb # v3.3.0
4141

4242
- name: NGF Docker meta
4343
id: ngf-meta

.github/workflows/functional.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ jobs:
3434
run: echo "GOPATH=$(go env GOPATH)" >> $GITHUB_ENV
3535

3636
- name: Docker Buildx
37-
uses: docker/setup-buildx-action@2b51285047da1547ffb1b2203d8be4c0af6b1f20 # v3.2.0
37+
uses: docker/setup-buildx-action@d70bba72b1f3fd22344832f00baa16ece964efeb # v3.3.0
3838

3939
- name: NGF Docker meta
4040
id: ngf-meta

.github/workflows/lint.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ jobs:
7777
- name: Checkout Repository
7878
uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2
7979

80-
- uses: reviewdog/action-actionlint@c6ee1eb0a5d47b2af53a203652b5dac0b6c4016e # v1.43.0
80+
- uses: reviewdog/action-actionlint@9d8b58041eed1373f173e91b9a3db5a844197236 # v1.44.0
8181
with:
8282
actionlint_flags: -shellcheck ""
8383

@@ -88,7 +88,7 @@ jobs:
8888
- name: Checkout Repository
8989
uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2
9090

91-
- uses: DavidAnson/markdownlint-cli2-action@510b996878fc0d1a46c8a04ec86b06dbfba09de7 # v15.0.0
91+
- uses: DavidAnson/markdownlint-cli2-action@b4c9feab76d8025d1e83c653fa3990936df0e6c8 # v16.0.0
9292
with:
9393
config: ${{ github.workspace }}/.markdownlint-cli2.yaml
9494
globs: "**/*.md"

.github/workflows/nfr.yml

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

5858
- name: Docker Buildx
5959
if: ${{ inputs.nginx_plus == true }}
60-
uses: docker/setup-buildx-action@2b51285047da1547ffb1b2203d8be4c0af6b1f20 # v3.2.0
60+
uses: docker/setup-buildx-action@d70bba72b1f3fd22344832f00baa16ece964efeb # v3.3.0
6161

6262
- name: NGINX Docker meta
6363
id: nginx-meta
@@ -158,7 +158,7 @@ jobs:
158158
rm -rf scripts/vars.env
159159
160160
- name: Open a PR with the results
161-
uses: peter-evans/create-pull-request@70a41aba780001da0a30141984ae2a0c95d8704e # v6.0.2
161+
uses: peter-evans/create-pull-request@c55203cfde3e5c11a452d352b4393e68b85b4533 # v6.0.3
162162
with:
163163
token: ${{ secrets.NGINX_PAT }}
164164
commit-message: NFR Test Results for NGF version ${{ inputs.version }} ${{ inputs.nginx_plus == true && '(Plus)' || ''}}

.github/workflows/release-pr.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ jobs:
8181
make generate-manifests
8282
8383
- name: Create Pull Request
84-
uses: peter-evans/create-pull-request@70a41aba780001da0a30141984ae2a0c95d8704e # v6.0.2
84+
uses: peter-evans/create-pull-request@c55203cfde3e5c11a452d352b4393e68b85b4533 # v6.0.3
8585
with:
8686
token: ${{ secrets.NGINX_PAT }}
8787
commit-message: Release ${{ inputs.version }}

.github/workflows/scorecards.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,6 @@ jobs:
6060

6161
# Upload the results to GitHub's code scanning dashboard.
6262
- name: "Upload to code-scanning"
63-
uses: github/codeql-action/upload-sarif@4355270be187e1b672a7a1c7c7bae5afdc1ab94a # v3.24.10
63+
uses: github/codeql-action/upload-sarif@df5a14dc28094dc936e103b37d749c6628682b60 # v3.25.0
6464
with:
6565
sarif_file: results.sarif

go.mod

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -16,26 +16,26 @@ require (
1616
github.com/onsi/ginkgo/v2 v2.17.1
1717
github.com/onsi/gomega v1.32.0
1818
github.com/prometheus/client_golang v1.19.0
19-
github.com/prometheus/common v0.52.2
19+
github.com/prometheus/common v0.52.3
2020
github.com/spf13/cobra v1.8.0
2121
github.com/spf13/pflag v1.0.5
2222
github.com/tsenart/vegeta/v12 v12.11.1
23-
go.opentelemetry.io/otel v1.24.0
24-
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.24.0
23+
go.opentelemetry.io/otel v1.25.0
24+
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.25.0
2525
go.uber.org/zap v1.27.0
2626
k8s.io/api v0.29.3
2727
k8s.io/apiextensions-apiserver v0.29.3
2828
k8s.io/apimachinery v0.29.3
2929
k8s.io/client-go v0.29.3
30-
sigs.k8s.io/controller-runtime v0.17.2
30+
sigs.k8s.io/controller-runtime v0.17.3
3131
sigs.k8s.io/controller-tools v0.14.0
3232
sigs.k8s.io/gateway-api v1.0.0
3333
sigs.k8s.io/yaml v1.4.0
3434
)
3535

3636
require (
3737
github.com/beorn7/perks v1.0.1 // indirect
38-
github.com/cenkalti/backoff/v4 v4.2.1 // indirect
38+
github.com/cenkalti/backoff/v4 v4.3.0 // indirect
3939
github.com/cespare/xxhash/v2 v2.2.0 // indirect
4040
github.com/davecgh/go-spew v1.1.1 // indirect
4141
github.com/emicklei/go-restful/v3 v3.11.0 // indirect
@@ -78,16 +78,16 @@ require (
7878
github.com/prometheus/client_model v0.6.0 // indirect
7979
github.com/prometheus/procfs v0.12.0 // indirect
8080
github.com/rs/dnscache v0.0.0-20211102005908-e0241e321417 // indirect
81-
github.com/stretchr/testify v1.8.4 // indirect
82-
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.24.0 // indirect
83-
go.opentelemetry.io/otel/metric v1.24.0 // indirect
84-
go.opentelemetry.io/otel/sdk v1.24.0 // indirect
85-
go.opentelemetry.io/otel/trace v1.24.0 // indirect
81+
github.com/stretchr/testify v1.9.0 // indirect
82+
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.25.0 // indirect
83+
go.opentelemetry.io/otel/metric v1.25.0 // indirect
84+
go.opentelemetry.io/otel/sdk v1.25.0 // indirect
85+
go.opentelemetry.io/otel/trace v1.25.0 // indirect
8686
go.opentelemetry.io/proto/otlp v1.1.0 // indirect
8787
go.uber.org/multierr v1.11.0 // indirect
8888
golang.org/x/exp v0.0.0-20231006140011-7918f672742d // indirect
8989
golang.org/x/mod v0.16.0 // indirect
90-
golang.org/x/net v0.22.0 // indirect
90+
golang.org/x/net v0.23.0 // indirect
9191
golang.org/x/oauth2 v0.18.0 // indirect
9292
golang.org/x/sync v0.6.0 // indirect
9393
golang.org/x/sys v0.18.0 // indirect
@@ -97,9 +97,9 @@ require (
9797
golang.org/x/tools v0.19.0 // indirect
9898
gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
9999
google.golang.org/appengine v1.6.8 // indirect
100-
google.golang.org/genproto/googleapis/api v0.0.0-20240102182953-50ed04b92917 // indirect
101-
google.golang.org/genproto/googleapis/rpc v0.0.0-20240102182953-50ed04b92917 // indirect
102-
google.golang.org/grpc v1.61.1 // indirect
100+
google.golang.org/genproto/googleapis/api v0.0.0-20240227224415-6ceb2ff114de // indirect
101+
google.golang.org/genproto/googleapis/rpc v0.0.0-20240401170217-c3f982113cda // indirect
102+
google.golang.org/grpc v1.63.0 // indirect
103103
google.golang.org/protobuf v1.33.0 // indirect
104104
gopkg.in/inf.v0 v0.9.1 // indirect
105105
gopkg.in/yaml.v2 v2.4.0 // indirect

0 commit comments

Comments
 (0)