github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-25 04:33:26 +00:00
Code Issues Projects Releases Wiki Activity

Corrected CSIDriver validation rebase issues

Browse Source
This commit is contained in:
Christian Huffman 2020-11-12 16:45:26 -05:00
parent 8444823bed
commit 701b42ca2b
1 changed files with 0 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkg/apis/storage/validation/validation_test.go
View File

@ -1869,16 +1869,10 @@ func TestCSIDriverValidationUpdate(t *testing.T) {
attachNotRequired := false attachNotRequired := false
podInfoOnMount := true podInfoOnMount := true
notPodInfoOnMount := false notPodInfoOnMount := false
<<<<<<< HEAD
notRequiresRepublish := false notRequiresRepublish := false
=======
resourceVersion := "1" resourceVersion := "1"
<<<<<<< HEAD
>>>>>>> Relax validation for CSIVolumeFSGroupPolicy
=======
invalidFSGroupPolicy := storage.ReadWriteOnceWithFSTypeFSGroupPolicy invalidFSGroupPolicy := storage.ReadWriteOnceWithFSTypeFSGroupPolicy
invalidFSGroupPolicy = "invalid-mode" invalidFSGroupPolicy = "invalid-mode"
>>>>>>> Move CSIVolumeFSGroupPolicy to beta
old := storage.CSIDriver{ old := storage.CSIDriver{
ObjectMeta: metav1.ObjectMeta{Name: driverName, ResourceVersion: resourceVersion}, ObjectMeta: metav1.ObjectMeta{Name: driverName, ResourceVersion: resourceVersion},
Spec: storage.CSIDriverSpec{ Spec: storage.CSIDriverSpec{