Skip to content

Commit ed23179

Browse files
authored
Merge branch 'nginx:main' into tests/add-update-move-ks-client
2 parents d2b5ee3 + d5ef155 commit ed23179

File tree

102 files changed

+1983
-19
lines changed

Some content is hidden

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

102 files changed

+1983
-19
lines changed

.github/workflows/build.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -171,15 +171,15 @@ jobs:
171171
fail-build: false
172172

173173
- name: Upload scan result to GitHub Security tab
174-
uses: github/codeql-action/upload-sarif@48ab28a6f5dbc2a99bf1e0131198dd8f1df78169 # v3.28.0
174+
uses: github/codeql-action/upload-sarif@b6a472f63d85b9c78a3ac5e89422239fc15e9b3c # v3.28.1
175175
continue-on-error: true
176176
with:
177177
sarif_file: ${{ steps.scan.outputs.sarif }}
178178
category: build-${{ inputs.image }}
179179
if: always()
180180

181181
- name: Upload Scan Results
182-
uses: actions/upload-artifact@6f51ac03b9356f520e9adb1b1b7802705f340c2b # v4.5.0
182+
uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 # v4.6.0
183183
continue-on-error: true
184184
with:
185185
name: scan-results-${{ inputs.image }}

.github/workflows/ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ jobs:
9999
token: ${{ secrets.CODECOV_TOKEN }}
100100

101101
- name: Upload Coverage Report
102-
uses: actions/upload-artifact@6f51ac03b9356f520e9adb1b1b7802705f340c2b # v4.5.0
102+
uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 # v4.6.0
103103
with:
104104
name: cover-${{ github.run_id }}.html
105105
path: ${{ github.workspace }}/cover.html

.github/workflows/codeql-analysis.yml

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

4545
# Initializes the CodeQL tools for scanning.
4646
- name: Initialize CodeQL
47-
uses: github/codeql-action/init@48ab28a6f5dbc2a99bf1e0131198dd8f1df78169 # v3.28.0
47+
uses: github/codeql-action/init@b6a472f63d85b9c78a3ac5e89422239fc15e9b3c # v3.28.1
4848
with:
4949
languages: ${{ matrix.language }}
5050
build-mode: ${{ matrix.build-mode }}
5151
queries: security-and-quality
5252

5353
- name: Perform CodeQL Analysis
54-
uses: github/codeql-action/analyze@48ab28a6f5dbc2a99bf1e0131198dd8f1df78169 # v3.28.0
54+
uses: github/codeql-action/analyze@b6a472f63d85b9c78a3ac5e89422239fc15e9b3c # v3.28.1
5555
with:
5656
category: "/language:${{matrix.language}}"

.github/workflows/conformance.yml

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

165165
- name: Upload profile to GitHub
166166
if: ${{ inputs.enable-experimental }}
167-
uses: actions/upload-artifact@6f51ac03b9356f520e9adb1b1b7802705f340c2b # v4.5.0
167+
uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 # v4.6.0
168168
with:
169169
name: conformance-profile-${{ inputs.image }}-${{ inputs.k8s-version }}
170170
path: ./tests/conformance-profile.yaml

.github/workflows/lint.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ jobs:
7878
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
7979

8080
- name: Lint Actions
81-
uses: reviewdog/action-actionlint@af17f9e3640ac863dbcc515d45f5f35d708d0faf # v1.62.0
81+
uses: reviewdog/action-actionlint@f3dcc52bc6039e5d736486952379dce3e869e8a2 # v1.63.0
8282
with:
8383
actionlint_flags: -shellcheck ""
8484

@@ -114,7 +114,7 @@ jobs:
114114
- name: Set up chart-testing
115115
uses: helm/chart-testing-action@e6669bcd63d7cb57cb4380c33043eebe5d111992 # v2.6.1
116116
with:
117-
version: 3.11.0 # renovate: datasource=github-tags depName=helm/chart-testing
117+
version: 3.12.0 # renovate: datasource=github-tags depName=helm/chart-testing
118118

119119
- name: Run chart-testing
120120
run: ct lint --print-config --config .ct.yaml

.github/workflows/nfr.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,7 @@ jobs:
147147
fi
148148
149149
- name: Upload Artifacts
150-
uses: actions/upload-artifact@6f51ac03b9356f520e9adb1b1b7802705f340c2b # v4.5.0
150+
uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 # v4.6.0
151151
with:
152152
name: results-${{ matrix.type }}
153153
path: tests/results/**/*-${{ matrix.type }}.*

.github/workflows/renovate-build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ jobs:
6767
6868
- name: Commit changes
6969
id: commit
70-
uses: stefanzweifel/git-auto-commit-action@8621497c8c39c72f3e2a999a26b4ca1b5058a842 # v5.0.1
70+
uses: stefanzweifel/git-auto-commit-action@e348103e9026cc0eee72ae06630dbe30c8bf7a79 # v5.1.0
7171
with:
7272
commit_message: "Update files for renovate"
7373
commit_author: "renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>"

.github/workflows/scorecards.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,14 +52,14 @@ jobs:
5252
# Upload the results as artifacts (optional). Commenting out will disable uploads of run results in SARIF
5353
# format to the repository Actions tab.
5454
- name: "Upload artifact"
55-
uses: actions/upload-artifact@6f51ac03b9356f520e9adb1b1b7802705f340c2b # v4.5.0
55+
uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 # v4.6.0
5656
with:
5757
name: SARIF file
5858
path: results.sarif
5959
retention-days: 5
6060

6161
# Upload the results to GitHub's code scanning dashboard.
6262
- name: "Upload to code-scanning"
63-
uses: github/codeql-action/upload-sarif@48ab28a6f5dbc2a99bf1e0131198dd8f1df78169 # v3.28.0
63+
uses: github/codeql-action/upload-sarif@b6a472f63d85b9c78a3ac5e89422239fc15e9b3c # v3.28.1
6464
with:
6565
sarif_file: results.sarif

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ CONTROLLER_TOOLS_VERSION = v0.17.1
3535
# renovate: datasource=docker depName=node
3636
NODE_VERSION = 22
3737
# renovate: datasource=docker depName=quay.io/helmpack/chart-testing
38-
CHART_TESTING_VERSION = v3.11.0
38+
CHART_TESTING_VERSION = v3.12.0
3939
# renovate: datasource=github-tags depName=dadav/helm-schema
4040
HELM_SCHEMA_VERSION = 0.18.1
4141

go.mod

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ require (
2424
k8s.io/apimachinery v0.32.0
2525
k8s.io/client-go v0.32.0
2626
k8s.io/klog/v2 v2.130.1
27-
sigs.k8s.io/controller-runtime v0.19.3
27+
sigs.k8s.io/controller-runtime v0.19.4
2828
sigs.k8s.io/gateway-api v1.2.1
2929
)
3030

@@ -35,6 +35,7 @@ require (
3535
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
3636
github.com/emicklei/go-restful/v3 v3.12.0 // indirect
3737
github.com/evanphx/json-patch/v5 v5.9.0 // indirect
38+
github.com/fsnotify/fsnotify v1.7.0 // indirect
3839
github.com/fxamacker/cbor/v2 v2.7.0 // indirect
3940
github.com/go-logfmt/logfmt v0.5.1 // indirect
4041
github.com/go-logr/stdr v1.2.2 // indirect

0 commit comments

Comments
 (0)