Drop support for v1beta1 ConversionReview requests

Signed-off-by: Leonardo Cecchi <[email protected]>

Author: leonardoce

client/config/crd/groupsnapshot.storage.k8s.io_volumegroupsnapshotcontents.yaml

@@ -20,7 +20,7 @@ spec:
   conversion:
     strategy: Webhook
     webhook:
-      conversionReviewVersions: ["v1","v1beta1"]
+      conversionReviewVersions: ["v1"]
       clientConfig:
         service:
           namespace: default

deploy/kubernetes/webhook-example/create-cert.sh

@@ -53,6 +53,8 @@ fi
 
 csrName=${service}.${namespace}
 tmpdir=$(mktemp -d)
+trap 'rm -r -- "${tmpdir}"' EXIT
+
 echo "creating certs in tmpdir ${tmpdir} "
 
 cat <<EOF >> ${tmpdir}/csr.conf

deploy/kubernetes/webhook-example/patch-ca-bundle.sh

@@ -7,9 +7,7 @@ set -o errexit
 set -o nounset
 set -o pipefail
 
-CA_BUNDLE=$(kubectl config view --raw -o json | jq -r '.clusters[0].cluster."certificate-authority-data"' | tr -d '"')
+CA_BUNDLE=$( kubectl get secret snapshot-conversion-webhook-secret -o json | jq -r '.data."tls.crt"' )
 JSON_PATCH="{\"spec\":{\"conversion\": {\"webhook\": {\"clientConfig\": {\"caBundle\": \"${CA_BUNDLE}\"}}}}}"
 
-kubectl patch crd volumegroupsnapshotclasses.groupsnapshot.storage.k8s.io -p "${JSON_PATCH}"
 kubectl patch crd volumegroupsnapshotcontents.groupsnapshot.storage.k8s.io -p "${JSON_PATCH}"
-kubectl patch crd volumegroupsnapshots.groupsnapshot.storage.k8s.io -p "${JSON_PATCH}"

pkg/sidecar-controller/groupsnapshot_helper.go

@@ -603,9 +603,9 @@ func (ctrl *csiSnapshotSideCarController) updateGroupSnapshotContentStatus(
 			newStatus.VolumeSnapshotInfoList = append(newStatus.VolumeSnapshotInfoList, crdv1beta2.VolumeSnapshotInfo{
 				VolumeHandle:   snapshot.SourceVolumeId,
 				SnapshotHandle: snapshot.SnapshotId,
-				CreationTime:   utils.CsiTimestampToKubernetes(snapshot.CreationTime),
+				CreationTime:   utils.CSITimestampToKubernetes(snapshot.CreationTime),
 				ReadyToUse:     &snapshot.ReadyToUse,
-				RestoreSize:    utils.CsiSizeToKubernetes(snapshot.SizeBytes),
+				RestoreSize:    utils.CSISizeToKubernetes(snapshot.SizeBytes),
 			})
 		}
 
@@ -632,9 +632,9 @@ func (ctrl *csiSnapshotSideCarController) updateGroupSnapshotContentStatus(
 				newStatus.VolumeSnapshotInfoList = append(newStatus.VolumeSnapshotInfoList, crdv1beta2.VolumeSnapshotInfo{
 					VolumeHandle:   snapshot.SourceVolumeId,
 					SnapshotHandle: snapshot.SnapshotId,
-					CreationTime:   utils.CsiTimestampToKubernetes(snapshot.CreationTime),
+					CreationTime:   utils.CSITimestampToKubernetes(snapshot.CreationTime),
 					ReadyToUse:     &snapshot.ReadyToUse,
-					RestoreSize:    utils.CsiSizeToKubernetes(snapshot.SizeBytes),
+					RestoreSize:    utils.CSISizeToKubernetes(snapshot.SizeBytes),
 				})
 			}
 			updated = true

pkg/utils/conversion.go

@@ -18,9 +18,9 @@ package utils
 
 import "google.golang.org/protobuf/types/known/timestamppb"
 
-// CsiTimestampToKubernetes converts a CSI timestamp in the format
+// CSITimestampToKubernetes converts a CSI timestamp in the format
 // used by the Snapshot API
-func CsiTimestampToKubernetes(creationTime *timestamppb.Timestamp) *int64 {
+func CSITimestampToKubernetes(creationTime *timestamppb.Timestamp) *int64 {
 	if creationTime == nil {
 		return nil
 	}
@@ -29,9 +29,9 @@ func CsiTimestampToKubernetes(creationTime *timestamppb.Timestamp) *int64 {
 	return &result
 }
 
-// CsiSizeToKubernetes converts the size to the format used by
+// CSISizeToKubernetes converts the size to the format used by
 // the Snapshot API
-func CsiSizeToKubernetes(sizeBytes int64) *int64 {
+func CSISizeToKubernetes(sizeBytes int64) *int64 {
 	if sizeBytes == 0 {
 		return nil
 	}

pkg/utils/conversion_test.go

@@ -23,22 +23,22 @@ import (
 )
 
 func TestCsiSizeToKubernetes(t *testing.T) {
-	if CsiSizeToKubernetes(0) != nil {
+	if CSISizeToKubernetes(0) != nil {
 		t.Error("Expected nil")
 	}
 
-	if *CsiSizeToKubernetes(123) != 123 {
+	if *CSISizeToKubernetes(123) != 123 {
 		t.Error("Wrong size conversion")
 	}
 }
 
 func TestCsiTimestampToKubernetes(t *testing.T) {
-	if CsiTimestampToKubernetes(nil) != nil {
+	if CSITimestampToKubernetes(nil) != nil {
 		t.Error("Expected nil")
 	}
 
 	now := timestamppb.Now()
-	if *CsiTimestampToKubernetes(now) != now.AsTime().UnixNano() {
+	if *CSITimestampToKubernetes(now) != now.AsTime().UnixNano() {
 		t.Error("Expected correct time conversion")
 	}
 }

pkg/webhook/framework.go

@@ -39,7 +39,7 @@ import (
 )
 
 // convertFunc is the user defined function for any conversion. The code in this file is a
-// template that can be use for any CR conversion given this function.
+// template that can be used for any CR conversion given this function.
 type convertFunc func(Object *unstructured.Unstructured, version string) (*unstructured.Unstructured, metav1.Status)
 
 func statusErrorWithMessage(msg string, params ...interface{}) metav1.Status {
@@ -55,37 +55,6 @@ func statusSucceed() metav1.Status {
 	}
 }
 
-// doConversionV1beta1 converts the requested objects in the v1beta1 ConversionRequest using the given conversion function and
-// returns a conversion response. Failures are reported with the Reason in the conversion response.
-func doConversionV1beta1(convertRequest *v1beta1.ConversionRequest, convert convertFunc) *v1beta1.ConversionResponse {
-	var convertedObjects []runtime.RawExtension
-	for _, obj := range convertRequest.Objects {
-		cr := unstructured.Unstructured{}
-		if err := cr.UnmarshalJSON(obj.Raw); err != nil {
-			klog.Error(err)
-			return &v1beta1.ConversionResponse{
-				Result: metav1.Status{
-					Message: fmt.Sprintf("failed to unmarshall object (%v) with error: %v", string(obj.Raw), err),
-					Status:  metav1.StatusFailure,
-				},
-			}
-		}
-		convertedCR, status := convert(&cr, convertRequest.DesiredAPIVersion)
-		if status.Status != metav1.StatusSuccess {
-			klog.Error(status.String())
-			return &v1beta1.ConversionResponse{
-				Result: status,
-			}
-		}
-		convertedCR.SetAPIVersion(convertRequest.DesiredAPIVersion)
-		convertedObjects = append(convertedObjects, runtime.RawExtension{Object: convertedCR})
-	}
-	return &v1beta1.ConversionResponse{
-		ConvertedObjects: convertedObjects,
-		Result:           statusSucceed(),
-	}
-}
-
 // doConversionV1 converts the requested objects in the v1 ConversionRequest using the given conversion function and
 // returns a conversion response. Failures are reported with the Reason in the conversion response.
 func doConversionV1(convertRequest *v1.ConversionRequest, convert convertFunc) *v1.ConversionResponse {
@@ -145,21 +114,6 @@ func serve(w http.ResponseWriter, r *http.Request, convert convertFunc) {
 
 	var responseObj runtime.Object
 	switch *gvk {
-	case v1beta1.SchemeGroupVersion.WithKind("ConversionReview"):
-		convertReview, ok := obj.(*v1beta1.ConversionReview)
-		if !ok {
-			msg := fmt.Sprintf("Expected v1beta1.ConversionReview but got: %T", obj)
-			klog.Errorf("%s", msg)
-			http.Error(w, msg, http.StatusBadRequest)
-			return
-		}
-		convertReview.Response = doConversionV1beta1(convertReview.Request, convert)
-		convertReview.Response.UID = convertReview.Request.UID
-		klog.V(2).Info(fmt.Sprintf("sending response: %v", convertReview.Response))
-
-		// reset the request, it is not needed in a response.
-		convertReview.Request = &v1beta1.ConversionRequest{}
-		responseObj = convertReview
 	case v1.SchemeGroupVersion.WithKind("ConversionReview"):
 		convertReview, ok := obj.(*v1.ConversionReview)
 		if !ok {