Skip to content

Commit f1b1df6

Browse files
authored
Merge branch 'main' into docs/authentication-filter-proposal-functional-tests
2 parents 4163a49 + 153cd97 commit f1b1df6

File tree

83 files changed

+494
-478
lines changed

Some content is hidden

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

83 files changed

+494
-478
lines changed

.github/workflows/build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -193,7 +193,7 @@ jobs:
193193
fail-build: false
194194

195195
- name: Upload scan result to GitHub Security tab
196-
uses: github/codeql-action/upload-sarif@fdbfb4d2750291e159f0156def62b853c2798ca2 # v4.31.5
196+
uses: github/codeql-action/upload-sarif@cf1bb45a277cb3c205638b2cd5c984db1c46a412 # v4.31.7
197197
if: ${{ !inputs.dry_run }}
198198
continue-on-error: true
199199
with:

.github/workflows/ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -294,7 +294,7 @@ jobs:
294294
- name: Build binary
295295
uses: goreleaser/goreleaser-action@e435ccd777264be153ace6237001ef4d979d3a7a # v6.4.0
296296
with:
297-
version: v2.13.0 # renovate: datasource=github-tags depName=goreleaser/goreleaser
297+
version: v2.13.1 # renovate: datasource=github-tags depName=goreleaser/goreleaser
298298
args: ${{ (inputs.is_production_release && (inputs.dry_run == false || inputs.dry_run == null)) && 'release' || 'build --snapshot' }} --clean
299299
env:
300300
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/conformance.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ jobs:
107107
- name: Build binary
108108
uses: goreleaser/goreleaser-action@e435ccd777264be153ace6237001ef4d979d3a7a # v6.4.0
109109
with:
110-
version: v2.13.0 # renovate: datasource=github-tags depName=goreleaser/goreleaser
110+
version: v2.13.1 # renovate: datasource=github-tags depName=goreleaser/goreleaser
111111
args: build --single-target --snapshot --clean
112112
env:
113113
TELEMETRY_ENDPOINT: "" # disables sending telemetry

.github/workflows/functional.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ jobs:
8787
- name: Build binary
8888
uses: goreleaser/goreleaser-action@e435ccd777264be153ace6237001ef4d979d3a7a # v6.4.0
8989
with:
90-
version: v2.13.0 # renovate: datasource=github-tags depName=goreleaser/goreleaser
90+
version: v2.13.1 # renovate: datasource=github-tags depName=goreleaser/goreleaser
9191
args: build --single-target --snapshot --clean
9292
env:
9393
TELEMETRY_ENDPOINT: otel-collector-opentelemetry-collector.collector.svc.cluster.local:4317

.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@fdbfb4d2750291e159f0156def62b853c2798ca2 # v4.31.5
63+
uses: github/codeql-action/upload-sarif@cf1bb45a277cb3c205638b2cd5c984db1c46a412 # v4.31.7
6464
with:
6565
sarif_file: results.sarif

.pre-commit-config.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ repos:
5252
# Rules are in .markdownlint-cli2.yaml file
5353
# See https://github.com/DavidAnson/markdownlint/blob/main/doc/Rules.md for rule descriptions
5454
- repo: https://github.com/DavidAnson/markdownlint-cli2
55-
rev: v0.19.1
55+
rev: v0.20.0
5656
hooks:
5757
- id: markdownlint-cli2
5858

internal/controller/nginx/modules/package-lock.json

Lines changed: 64 additions & 61 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

internal/controller/nginx/modules/package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@
1010
"clean": "rm -rf node_modules coverage"
1111
},
1212
"devDependencies": {
13-
"@vitest/coverage-v8": "^4.0.14",
14-
"prettier": "3.7.3",
15-
"vitest": "^4.0.14"
13+
"@vitest/coverage-v8": "^4.0.15",
14+
"prettier": "3.7.4",
15+
"vitest": "^4.0.15"
1616
},
1717
"type": "module"
1818
}

tests/framework/collector.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ const (
1313
collectorChartReleaseName = "otel-collector"
1414
//nolint:lll
1515
// renovate: datasource=helm depName=opentelemetry-collector registryUrl=https://open-telemetry.github.io/opentelemetry-helm-charts
16-
collectorChartVersion = "0.140.0"
16+
collectorChartVersion = "0.141.0"
1717
)
1818

1919
// InstallCollector installs the otel-collector.

0 commit comments

Comments
 (0)