mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-07-23 11:50:44 +00:00
Correct rebase issues
This commit is contained in:
parent
701b42ca2b
commit
38071e74cf
@ -1403,6 +1403,9 @@ var _ = utils.SIGDescribe("CSI mock volume", func() {
|
||||
ginkgo.By("Checking CSI driver logs")
|
||||
err = checkPodLogs(m.cs, m.config.DriverNamespace.Name, driverPodName, driverContainerName, pod, false, false, false, test.deployCSIDriverObject && csiServiceAccountTokenEnabled, numNodePublishVolume)
|
||||
framework.ExpectNoError(err)
|
||||
})
|
||||
}
|
||||
})
|
||||
// These tests *only* work on a cluster which has the CSIVolumeFSGroupPolicy feature enabled.
|
||||
ginkgo.Context("CSI FSGroupPolicy [LinuxOnly]", func() {
|
||||
tests := []struct {
|
||||
|
@ -138,6 +138,7 @@ func PatchCSIDeployment(f *framework.Framework, o PatchCSIOptions, object interf
|
||||
}
|
||||
if o.RequiresRepublish != nil {
|
||||
object.Spec.RequiresRepublish = o.RequiresRepublish
|
||||
}
|
||||
if o.FSGroupPolicy != nil {
|
||||
object.Spec.FSGroupPolicy = o.FSGroupPolicy
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user