Merge pull request #1006 from xing-yang/cherrypick_webhook_fix

k8s-ci-robot · web-flow · commit fd67ef5890bf · 2024-02-09T14:51:45.000-08:00
Add nil check for SourceVolumeMode in the ValidationWebHook
diff --git a/pkg/validation-webhook/snapshot.go b/pkg/validation-webhook/snapshot.go
@@ -246,8 +246,12 @@ func checkSnapshotContentImmutableFieldsV1(snapcontent, oldSnapcontent *volumesn
 	}
 
 	if preventVolumeModeConversion {
-		if !reflect.DeepEqual(snapcontent.Spec.SourceVolumeMode, oldSnapcontent.Spec.SourceVolumeMode) {
+		if oldSnapcontent.Spec.SourceVolumeMode != nil && snapcontent.Spec.SourceVolumeMode != nil && !reflect.DeepEqual(snapcontent.Spec.SourceVolumeMode, oldSnapcontent.Spec.SourceVolumeMode) {
 			return fmt.Errorf("Spec.SourceVolumeMode is immutable but was changed from %v to %v", *oldSnapcontent.Spec.SourceVolumeMode, *snapcontent.Spec.SourceVolumeMode)
+		} else if oldSnapcontent.Spec.SourceVolumeMode == nil && snapcontent.Spec.SourceVolumeMode != nil {
+			return fmt.Errorf("Spec.SourceVolumeMode is immutable but was changed from nil to %v", *snapcontent.Spec.SourceVolumeMode)
+		} else if oldSnapcontent.Spec.SourceVolumeMode != nil && snapcontent.Spec.SourceVolumeMode == nil {
+			return fmt.Errorf("Spec.SourceVolumeMode is immutable but was changed from %v to nil", *oldSnapcontent.Spec.SourceVolumeMode)
 		}
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -246,8 +246,12 @@ func checkSnapshotContentImmutableFieldsV1(snapcontent, oldSnapcontent *volumesn`
`246`	`246`	`}`
`247`	`247`
`248`	`248`	`if preventVolumeModeConversion {`
`249`		`- if !reflect.DeepEqual(snapcontent.Spec.SourceVolumeMode, oldSnapcontent.Spec.SourceVolumeMode) {`
	`249`	`+ if oldSnapcontent.Spec.SourceVolumeMode != nil && snapcontent.Spec.SourceVolumeMode != nil && !reflect.DeepEqual(snapcontent.Spec.SourceVolumeMode, oldSnapcontent.Spec.SourceVolumeMode) {`
`250`	`250`	`return fmt.Errorf("Spec.SourceVolumeMode is immutable but was changed from %v to %v", oldSnapcontent.Spec.SourceVolumeMode, snapcontent.Spec.SourceVolumeMode)`
	`251`	`+ } else if oldSnapcontent.Spec.SourceVolumeMode == nil && snapcontent.Spec.SourceVolumeMode != nil {`
	`252`	`+ return fmt.Errorf("Spec.SourceVolumeMode is immutable but was changed from nil to %v", *snapcontent.Spec.SourceVolumeMode)`
	`253`	`+ } else if oldSnapcontent.Spec.SourceVolumeMode != nil && snapcontent.Spec.SourceVolumeMode == nil {`
	`254`	`+ return fmt.Errorf("Spec.SourceVolumeMode is immutable but was changed from %v to nil", *oldSnapcontent.Spec.SourceVolumeMode)`
`251`	`255`	`}`
`252`	`256`	`}`
`253`	`257`