Skip to content

Commit 2d38d5c

Browse files
committed
k# This is a combination of 2 commits.
chore: fix Windows test failure fix windows tests
1 parent 45e5508 commit 2d38d5c

File tree

5 files changed

+19
-4
lines changed

5 files changed

+19
-4
lines changed

.github/workflows/pluto.yaml

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

2020
- name: Check deploy folder
2121
run: |
22-
pluto detect-files -d deploy
22+
pluto detect-files -d deploy --ignore-deprecations --ignore-removals
2323
2424
- name: Check example folder
2525
run: |

.github/workflows/trivy.yaml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,12 @@ jobs:
99
name: Build
1010
runs-on: ubuntu-18.04
1111
steps:
12+
- name: Set up Go 1.x
13+
uses: actions/setup-go@v2
14+
with:
15+
go-version: ^1.16
16+
id: go
17+
1218
- name: Checkout code
1319
uses: actions/checkout@v2
1420

.github/workflows/windows.yaml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,11 @@ jobs:
1111
platform: [windows-latest]
1212
runs-on: ${{ matrix.platform }}
1313
steps:
14-
- name: Install Go
15-
uses: actions/setup-go@v1
14+
- name: Set up Go 1.x
15+
uses: actions/setup-go@v2
1616
with:
17-
go-version: ${{ matrix.go-version }}
17+
go-version: ^1.16
18+
id: go
1819
- name: Checkout code
1920
uses: actions/checkout@v2
2021
- name: Build Test

pkg/mounter/safe_mounter_v1beta_windows.go

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -255,6 +255,10 @@ func (mounter *csiProxyMounterV1Beta) MountSensitiveWithoutSystemd(source string
255255
return fmt.Errorf("MountSensitiveWithoutSystemd not implemented for CSIProxyMounterV1Beta")
256256
}
257257

258+
func (mounter *csiProxyMounterV1Beta) MountSensitiveWithoutSystemdWithMountFlags(source string, target string, fstype string, options []string, sensitiveOptions []string, mountFlags []string) error {
259+
return mounter.MountSensitive(source, target, fstype, options, sensitiveOptions /* sensitiveOptions */)
260+
}
261+
258262
// NewCSIProxyMounter - creates a new CSI Proxy mounter struct which encompassed all the
259263
// clients to the CSI proxy - filesystem, disk and volume clients.
260264
func NewCSIProxyMounterV1Beta() (*csiProxyMounterV1Beta, error) {

pkg/mounter/safe_mounter_windows.go

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -280,6 +280,10 @@ func (mounter *csiProxyMounter) MountSensitiveWithoutSystemd(source string, targ
280280
return fmt.Errorf("MountSensitiveWithoutSystemd not implemented for CSIProxyMounter")
281281
}
282282

283+
func (mounter *csiProxyMounter) MountSensitiveWithoutSystemdWithMountFlags(source string, target string, fstype string, options []string, sensitiveOptions []string, mountFlags []string) error {
284+
return mounter.MountSensitive(source, target, fstype, options, sensitiveOptions /* sensitiveOptions */)
285+
}
286+
283287
// NewCSIProxyMounter - creates a new CSI Proxy mounter struct which encompassed all the
284288
// clients to the CSI proxy - filesystem, disk and volume clients.
285289
func NewCSIProxyMounter() (*csiProxyMounter, error) {

0 commit comments

Comments
 (0)