Remove v1beta1 references from validation webhook

Author: RaunakShah

pkg/validation-webhook/snapshot.go

@@ -21,7 +21,6 @@ import (
 	"reflect"
 
 	volumesnapshotv1 "github.com/kubernetes-csi/external-snapshotter/client/v6/apis/volumesnapshot/v1"
-	volumesnapshotv1beta1 "github.com/kubernetes-csi/external-snapshotter/client/v6/apis/volumesnapshot/v1beta1"
 	storagelisters "github.com/kubernetes-csi/external-snapshotter/client/v6/listers/volumesnapshot/v1"
 	"github.com/kubernetes-csi/external-snapshotter/v6/pkg/utils"
 	v1 "k8s.io/api/admission/v1"
@@ -31,12 +30,8 @@ import (
 )
 
 var (
-	// SnapshotV1Beta1GVR is GroupVersionResource for v1beta1 VolumeSnapshots
-	SnapshotV1Beta1GVR = metav1.GroupVersionResource{Group: volumesnapshotv1beta1.GroupName, Version: "v1beta1", Resource: "volumesnapshots"}
 	// SnapshotV1GVR is GroupVersionResource for v1 VolumeSnapshots
 	SnapshotV1GVR = metav1.GroupVersionResource{Group: volumesnapshotv1.GroupName, Version: "v1", Resource: "volumesnapshots"}
-	// SnapshotContentV1Beta1GVR is GroupVersionResource for v1beta1 VolumeSnapshotContents
-	SnapshotContentV1Beta1GVR = metav1.GroupVersionResource{Group: volumesnapshotv1beta1.GroupName, Version: "v1beta1", Resource: "volumesnapshotcontents"}
 	// SnapshotContentV1GVR is GroupVersionResource for v1 VolumeSnapshotContents
 	SnapshotContentV1GVR = metav1.GroupVersionResource{Group: volumesnapshotv1.GroupName, Version: "v1", Resource: "volumesnapshotcontents"}
 	// SnapshotContentV1GVR is GroupVersionResource for v1 VolumeSnapshotContents
@@ -77,18 +72,6 @@ func (a admitter) Admit(ar v1.AdmissionReview) *v1.AdmissionResponse {
 
 	deserializer := codecs.UniversalDeserializer()
 	switch ar.Request.Resource {
-	case SnapshotV1Beta1GVR:
-		snapshot := &volumesnapshotv1beta1.VolumeSnapshot{}
-		if _, _, err := deserializer.Decode(raw, nil, snapshot); err != nil {
-			klog.Error(err)
-			return toV1AdmissionResponse(err)
-		}
-		oldSnapshot := &volumesnapshotv1beta1.VolumeSnapshot{}
-		if _, _, err := deserializer.Decode(oldRaw, nil, oldSnapshot); err != nil {
-			klog.Error(err)
-			return toV1AdmissionResponse(err)
-		}
-		return decideSnapshotV1beta1(snapshot, oldSnapshot, isUpdate)
 	case SnapshotV1GVR:
 		snapshot := &volumesnapshotv1.VolumeSnapshot{}
 		if _, _, err := deserializer.Decode(raw, nil, snapshot); err != nil {
@@ -101,18 +84,6 @@ func (a admitter) Admit(ar v1.AdmissionReview) *v1.AdmissionResponse {
 			return toV1AdmissionResponse(err)
 		}
 		return decideSnapshotV1(snapshot, oldSnapshot, isUpdate)
-	case SnapshotContentV1Beta1GVR:
-		snapcontent := &volumesnapshotv1beta1.VolumeSnapshotContent{}
-		if _, _, err := deserializer.Decode(raw, nil, snapcontent); err != nil {
-			klog.Error(err)
-			return toV1AdmissionResponse(err)
-		}
-		oldSnapcontent := &volumesnapshotv1beta1.VolumeSnapshotContent{}
-		if _, _, err := deserializer.Decode(oldRaw, nil, oldSnapcontent); err != nil {
-			klog.Error(err)
-			return toV1AdmissionResponse(err)
-		}
-		return decideSnapshotContentV1beta1(snapcontent, oldSnapcontent, isUpdate)
 	case SnapshotContentV1GVR:
 		snapcontent := &volumesnapshotv1.VolumeSnapshotContent{}
 		if _, _, err := deserializer.Decode(raw, nil, snapcontent); err != nil {
@@ -138,44 +109,12 @@ func (a admitter) Admit(ar v1.AdmissionReview) *v1.AdmissionResponse {
 		}
 		return decideSnapshotClassV1(snapClass, oldSnapClass, a.lister)
 	default:
-		err := fmt.Errorf("expect resource to be %s or %s", SnapshotV1Beta1GVR, SnapshotContentV1Beta1GVR)
+		err := fmt.Errorf("expect resource to be %s, %s or %s", SnapshotV1GVR, SnapshotContentV1GVR, SnapshotClassV1GVR)
 		klog.Error(err)
 		return toV1AdmissionResponse(err)
 	}
 }
 
-func decideSnapshotV1beta1(snapshot, oldSnapshot *volumesnapshotv1beta1.VolumeSnapshot, isUpdate bool) *v1.AdmissionResponse {
-	reviewResponse := &v1.AdmissionResponse{
-		Allowed: true,
-		Result:  &metav1.Status{},
-	}
-
-	if isUpdate {
-		// if it is an UPDATE and oldSnapshot is not valid, then don't enforce strict validation
-		// This allows no-op updates to occur on snapshot resources which fail strict validation
-		// Which allows the remover of finalizers and therefore deletion of this object
-		// Don't rely on the pointers to be nil, because the deserialization method will convert it to
-		// The empty struct value. Instead check the operation type.
-		if err := ValidateV1Beta1Snapshot(oldSnapshot); err != nil {
-			return reviewResponse
-		}
-
-		// if it is an UPDATE and oldSnapshot is valid, check immutable fields
-		if err := checkSnapshotImmutableFieldsV1beta1(snapshot, oldSnapshot); err != nil {
-			reviewResponse.Allowed = false
-			reviewResponse.Result.Message = err.Error()
-			return reviewResponse
-		}
-	}
-	// Enforce strict validation for CREATE requests. Immutable checks don't apply for CREATE requests.
-	// Enforce strict validation for UPDATE requests where old is valid and passes immutability check.
-	if err := ValidateV1Beta1Snapshot(snapshot); err != nil {
-		reviewResponse.Allowed = false
-		reviewResponse.Result.Message = err.Error()
-	}
-	return reviewResponse
-}
-
 func decideSnapshotV1(snapshot, oldSnapshot *volumesnapshotv1.VolumeSnapshot, isUpdate bool) *v1.AdmissionResponse {
 	reviewResponse := &v1.AdmissionResponse{
 		Allowed: true,
@@ -199,38 +138,6 @@ func decideSnapshotV1(snapshot, oldSnapshot *volumesnapshotv1.VolumeSnapshot, is
 	return reviewResponse
 }
 
-func decideSnapshotContentV1beta1(snapcontent, oldSnapcontent *volumesnapshotv1beta1.VolumeSnapshotContent, isUpdate bool) *v1.AdmissionResponse {
-	reviewResponse := &v1.AdmissionResponse{
-		Allowed: true,
-		Result:  &metav1.Status{},
-	}
-
-	if isUpdate {
-		// if it is an UPDATE and oldSnapcontent is not valid, then don't enforce strict validation
-		// This allows no-op updates to occur on snapshot resources which fail strict validation
-		// Which allows the remover of finalizers and therefore deletion of this object
-		// Don't rely on the pointers to be nil, because the deserialization method will convert it to
-		// The empty struct value. Instead check the operation type.
-		if err := ValidateV1Beta1SnapshotContent(oldSnapcontent); err != nil {
-			return reviewResponse
-		}
-
-		// if it is an UPDATE and oldSnapcontent is valid, check immutable fields
-		if err := checkSnapshotContentImmutableFieldsV1beta1(snapcontent, oldSnapcontent); err != nil {
-			reviewResponse.Allowed = false
-			reviewResponse.Result.Message = err.Error()
-			return reviewResponse
-		}
-	}
-	// Enforce strict validation for all CREATE requests. Immutable checks don't apply for CREATE requests.
-	// Enforce strict validation for UPDATE requests where old is valid and passes immutability check.
-	if err := ValidateV1Beta1SnapshotContent(snapcontent); err != nil {
-		reviewResponse.Allowed = false
-		reviewResponse.Result.Message = err.Error()
-	}
-	return reviewResponse
-}
-
 func decideSnapshotContentV1(snapcontent, oldSnapcontent *volumesnapshotv1.VolumeSnapshotContent, isUpdate bool) *v1.AdmissionResponse {
 	reviewResponse := &v1.AdmissionResponse{
 		Allowed: true,
@@ -298,27 +205,6 @@ func strPtrDereference(s *string) string {
 	return *s
 }
 
-func checkSnapshotImmutableFieldsV1beta1(snapshot, oldSnapshot *volumesnapshotv1beta1.VolumeSnapshot) error {
-	if snapshot == nil {
-		return fmt.Errorf("VolumeSnapshot is nil")
-	}
-	if oldSnapshot == nil {
-		return fmt.Errorf("old VolumeSnapshot is nil")
-	}
-
-	source := snapshot.Spec.Source
-	oldSource := oldSnapshot.Spec.Source
-
-	if !reflect.DeepEqual(source.PersistentVolumeClaimName, oldSource.PersistentVolumeClaimName) {
-		return fmt.Errorf("Spec.Source.PersistentVolumeClaimName is immutable but was changed from %s to %s", strPtrDereference(oldSource.PersistentVolumeClaimName), strPtrDereference(source.PersistentVolumeClaimName))
-	}
-	if !reflect.DeepEqual(source.VolumeSnapshotContentName, oldSource.VolumeSnapshotContentName) {
-		return fmt.Errorf("Spec.Source.VolumeSnapshotContentName is immutable but was changed from %s to %s", strPtrDereference(oldSource.VolumeSnapshotContentName), strPtrDereference(source.VolumeSnapshotContentName))
-	}
-
-	return nil
-}
-
 func checkSnapshotImmutableFieldsV1(snapshot, oldSnapshot *volumesnapshotv1.VolumeSnapshot) error {
 	if snapshot == nil {
 		return fmt.Errorf("VolumeSnapshot is nil")
@@ -340,26 +226,6 @@ func checkSnapshotImmutableFieldsV1(snapshot, oldSnapshot *volumesnapshotv1.Volu
 	return nil
 }
 
-func checkSnapshotContentImmutableFieldsV1beta1(snapcontent, oldSnapcontent *volumesnapshotv1beta1.VolumeSnapshotContent) error {
-	if snapcontent == nil {
-		return fmt.Errorf("VolumeSnapshotContent is nil")
-	}
-	if oldSnapcontent == nil {
-		return fmt.Errorf("old VolumeSnapshotContent is nil")
-	}
-
-	source := snapcontent.Spec.Source
-	oldSource := oldSnapcontent.Spec.Source
-
-	if !reflect.DeepEqual(source.VolumeHandle, oldSource.VolumeHandle) {
-		return fmt.Errorf("Spec.Source.VolumeHandle is immutable but was changed from %s to %s", strPtrDereference(oldSource.VolumeHandle), strPtrDereference(source.VolumeHandle))
-	}
-	if !reflect.DeepEqual(source.SnapshotHandle, oldSource.SnapshotHandle) {
-		return fmt.Errorf("Spec.Source.SnapshotHandle is immutable but was changed from %s to %s", strPtrDereference(oldSource.SnapshotHandle), strPtrDereference(source.SnapshotHandle))
-	}
-	return nil
-}
-
 func checkSnapshotContentImmutableFieldsV1(snapcontent, oldSnapcontent *volumesnapshotv1.VolumeSnapshotContent) error {
 	if snapcontent == nil {
 		return fmt.Errorf("VolumeSnapshotContent is nil")