Skip to content

Commit 8e5bffe

Browse files
committed
Merge remote-tracking branch 'upstream/master'
Conflicts: go.mod NOTE(stephenfin): Conflict was due to a trivial difference in go version (1.24.0 vs 1.24)
2 parents 87e2700 + d8076b0 commit 8e5bffe

File tree

508 files changed

+77530
-3819
lines changed

Some content is hidden

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

508 files changed

+77530
-3819
lines changed

.github/workflows/codeql-analysis.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -38,17 +38,17 @@ jobs:
3838

3939
steps:
4040
- name: Set up Go 1.x
41-
uses: actions/setup-go@v5
41+
uses: actions/setup-go@v6
4242
with:
4343
go-version: ^1.18
4444
id: go
4545

4646
- name: Checkout repository
47-
uses: actions/checkout@v4
47+
uses: actions/checkout@v5
4848

4949
# Initializes the CodeQL tools for scanning.
5050
- name: Initialize CodeQL
51-
uses: github/codeql-action/init@v3
51+
uses: github/codeql-action/init@v4
5252
with:
5353
languages: ${{ matrix.language }}
5454
# If you wish to specify custom queries, you can do so here or in a config file.
@@ -63,4 +63,4 @@ jobs:
6363
make all
6464
6565
- name: Perform CodeQL Analysis
66-
uses: github/codeql-action/analyze@v3
66+
uses: github/codeql-action/analyze@v4

.github/workflows/codespell.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ jobs:
88
name: Check for spelling errors
99
runs-on: ubuntu-latest
1010
steps:
11-
- uses: actions/checkout@v4
11+
- uses: actions/checkout@v5
1212
- uses: codespell-project/actions-codespell@master
1313
with:
1414
check_filenames: true

.github/workflows/darwin.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,12 @@ jobs:
88
runs-on: macos-latest
99
steps:
1010
- name: Set up Go 1.x
11-
uses: actions/setup-go@v5
11+
uses: actions/setup-go@v6
1212
with:
1313
go-version: ^1.16
1414
id: go
1515
- name: Check out code into the Go module directory
16-
uses: actions/checkout@v4
16+
uses: actions/checkout@v5
1717
- name: Run unit tests
1818
run: |
1919
go version

.github/workflows/linux.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,13 @@ jobs:
1111
steps:
1212

1313
- name: Set up Go 1.x
14-
uses: actions/setup-go@v5
14+
uses: actions/setup-go@v6
1515
with:
1616
go-version: ^1.17
1717
id: go
1818

1919
- name: Check out code into the Go module directory
20-
uses: actions/checkout@v4
20+
uses: actions/checkout@v5
2121

2222
- name: Build Test
2323
run: |

.github/workflows/pluto.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111
steps:
1212

1313
- name: Checkout
14-
uses: actions/checkout@v4
14+
uses: actions/checkout@v5
1515

1616
# https://pluto.docs.fairwinds.com/advanced/#display-options
1717
- name: Download pluto

.github/workflows/shellcheck.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
name: Shellcheck
1717
runs-on: ubuntu-latest
1818
steps:
19-
- uses: actions/checkout@v4
19+
- uses: actions/checkout@v5
2020
- name: Run ShellCheck
2121
uses: ludeeus/action-shellcheck@master
2222
env:

.github/workflows/static.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ jobs:
88
runs-on: ubuntu-latest
99
steps:
1010
- name: Set up Go 1.x
11-
uses: actions/setup-go@v5
11+
uses: actions/setup-go@v6
1212
with:
1313
go-version: ^1.19
1414
- uses: actions/checkout@master

.github/workflows/trivy.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,12 @@ jobs:
1010
runs-on: ubuntu-latest
1111
steps:
1212
- name: Checkout code
13-
uses: actions/checkout@v4
13+
uses: actions/checkout@v5
1414

1515
- name: Install go
16-
uses: actions/setup-go@v5
16+
uses: actions/setup-go@v6
1717
with:
18-
go-version: 1.24.4
18+
go-version: 1.24.9
1919

2020
- name: Build an image from Dockerfile
2121
run: |

.github/workflows/windows.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,11 @@ jobs:
1111
runs-on: ${{ matrix.platform }}
1212
steps:
1313
- name: Install Go
14-
uses: actions/setup-go@v5
14+
uses: actions/setup-go@v6
1515
with:
1616
go-version: ${{ matrix.go }}
1717
- name: Checkout code
18-
uses: actions/checkout@v4
18+
uses: actions/checkout@v5
1919
- name: Run Windows Unit Tests
2020
run: |
2121
go version

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
# See the License for the specific language governing permissions and
1313
# limitations under the License.
1414

15-
FROM registry.k8s.io/build-image/debian-base:bookworm-v1.0.5
15+
FROM registry.k8s.io/build-image/debian-base:bookworm-v1.0.6
1616

1717
ARG ARCH
1818
ARG binary=./bin/${ARCH}/nfsplugin

0 commit comments

Comments
 (0)