github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-23 19:56:01 +00:00
Code Issues Projects Releases Wiki Activity

Correct rebase issues

Browse Source
This commit is contained in:
Christian Huffman 2020-11-12 17:09:49 -05:00
parent 701b42ca2b
commit 38071e74cf
2 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
test/e2e/storage/csi_mock_volume.go
View File

@ -1403,6 +1403,9 @@ var _ = utils.SIGDescribe("CSI mock volume", func() {
ginkgo.By("Checking CSI driver logs") ginkgo.By("Checking CSI driver logs")
err = checkPodLogs(m.cs, m.config.DriverNamespace.Name, driverPodName, driverContainerName, pod, false, false, false, test.deployCSIDriverObject && csiServiceAccountTokenEnabled, numNodePublishVolume) err = checkPodLogs(m.cs, m.config.DriverNamespace.Name, driverPodName, driverContainerName, pod, false, false, false, test.deployCSIDriverObject && csiServiceAccountTokenEnabled, numNodePublishVolume)
framework.ExpectNoError(err) framework.ExpectNoError(err)
})
}
})
// These tests *only* work on a cluster which has the CSIVolumeFSGroupPolicy feature enabled. // These tests *only* work on a cluster which has the CSIVolumeFSGroupPolicy feature enabled.
ginkgo.Context("CSI FSGroupPolicy [LinuxOnly]", func() { ginkgo.Context("CSI FSGroupPolicy [LinuxOnly]", func() {
tests := []struct { tests := []struct {

1
test/e2e/storage/utils/deployment.go
View File

@ -138,6 +138,7 @@ func PatchCSIDeployment(f *framework.Framework, o PatchCSIOptions, object interf
} }
if o.RequiresRepublish != nil { if o.RequiresRepublish != nil {
object.Spec.RequiresRepublish = o.RequiresRepublish object.Spec.RequiresRepublish = o.RequiresRepublish
}
if o.FSGroupPolicy != nil { if o.FSGroupPolicy != nil {
object.Spec.FSGroupPolicy = o.FSGroupPolicy object.Spec.FSGroupPolicy = o.FSGroupPolicy
} }