Relax validation for CSIVolumeFSGroupPolicy

2020-10-20 16:09:44 -04:00
parent 6d5cb36d36
commit 6b9348e878
3 changed files with 7 additions and 4 deletions
--- a/pkg/apis/storage/validation/validation_test.go
+++ b/pkg/apis/storage/validation/validation_test.go
@@ -1869,9 +1869,13 @@ func TestCSIDriverValidationUpdate(t *testing.T) {
 	attachNotRequired := false
 	podInfoOnMount := true
 	notPodInfoOnMount := false
+<<<<<<< HEAD
 	notRequiresRepublish := false
+=======
+	resourceVersion := "1"
+>>>>>>> Relax validation for CSIVolumeFSGroupPolicy
 	old := storage.CSIDriver{
-		ObjectMeta: metav1.ObjectMeta{Name: driverName},
+		ObjectMeta: metav1.ObjectMeta{Name: driverName, ResourceVersion: resourceVersion},
 		Spec: storage.CSIDriverSpec{
 			AttachRequired:    &attachNotRequired,
 			PodInfoOnMount:    &notPodInfoOnMount,