Refactor validate CRD to fix conversion error

1. Fix conversion error due to incompatible type
1. Refactor validate CRD code to reduce duplication
2. Support v1.CRD type

Signed-off-by: Vu Dinh <[email protected]>

Author: dinhxuanvu

pkg/validation/internal/crd.go

@@ -8,18 +8,18 @@ import (
 
 	"k8s.io/apiextensions-apiserver/pkg/apis/apiextensions"
 	"k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/install"
+	"k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
 	"k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1"
 	"k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/validation"
 	"k8s.io/apimachinery/pkg/conversion"
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/apimachinery/pkg/runtime/schema"
-	"k8s.io/client-go/kubernetes/scheme"
 )
 
-var Scheme = scheme.Scheme
+var scheme = runtime.NewScheme()
 
 func init() {
-	install.Install(Scheme)
+	install.Install(scheme)
 }
 
 var CRDValidator interfaces.Validator = interfaces.ValidatorFunc(validateCRDs)
@@ -28,31 +28,54 @@ func validateCRDs(objs ...interface{}) (results []errors.ManifestResult) {
 	for _, obj := range objs {
 		switch v := obj.(type) {
 		case *v1beta1.CustomResourceDefinition:
-			results = append(results, validateCRD(v))
+			results = append(results, validateV1Beta1CRD(v))
+		case *v1.CustomResourceDefinition:
+			results = append(results, validateV1CRD(v))
 		}
 	}
 	return results
 }
 
-func validateCRD(crd runtime.Object) (result errors.ManifestResult) {
-	unversionedCRD := apiextensions.CustomResourceDefinition{}
-	err := Scheme.Converter().Convert(&crd, &unversionedCRD, conversion.SourceToDest, nil)
+func validateV1Beta1CRD(crd *v1beta1.CustomResourceDefinition) (result errors.ManifestResult) {
+	internalCRD := &apiextensions.CustomResourceDefinition{}
+	v1beta1.SetDefaults_CustomResourceDefinition(crd)
+	v1beta1.SetDefaults_CustomResourceDefinitionSpec(&crd.Spec)
+	err := scheme.Converter().Convert(crd, internalCRD, conversion.SourceToDest, nil)
 	if err != nil {
-		result.Add(errors.ErrInvalidParse("error converting versioned crd to unversioned crd", err))
+		result.Add(errors.ErrInvalidParse("error converting crd", err))
 		return result
 	}
+
 	gv := crd.GetObjectKind().GroupVersionKind().GroupVersion()
-	result = validateCRDUnversioned(&unversionedCRD, gv)
-	result.Name = unversionedCRD.GetName()
+	result = validateInternalCRD(internalCRD, gv)
 	return result
 }
 
-func validateCRDUnversioned(crd *apiextensions.CustomResourceDefinition, gv schema.GroupVersion) (result errors.ManifestResult) {
+func validateV1CRD(crd *v1.CustomResourceDefinition) (result errors.ManifestResult) {
+	internalCRD := &apiextensions.CustomResourceDefinition{}
+	v1.SetDefaults_CustomResourceDefinition(crd)
+	v1.SetDefaults_CustomResourceDefinitionSpec(&crd.Spec)
+	err := scheme.Converter().Convert(crd, internalCRD, conversion.SourceToDest, nil)
+	if err != nil {
+		result.Add(errors.ErrInvalidParse("error converting crd", err))
+		return result
+	}
+
+	gv := crd.GetObjectKind().GroupVersionKind().GroupVersion()
+	result = validateInternalCRD(internalCRD, gv)
+	return result
+}
+
+func validateInternalCRD(crd *apiextensions.CustomResourceDefinition, gv schema.GroupVersion) (result errors.ManifestResult) {
 	errList := validation.ValidateCustomResourceDefinition(crd, gv)
 	for _, err := range errList {
 		if !strings.Contains(err.Field, "openAPIV3Schema") && !strings.Contains(err.Field, "status") {
 			result.Add(errors.NewError(errors.ErrorType(err.Type), err.Error(), err.Field, err.BadValue))
 		}
 	}
+
+	if result.HasError() {
+		result.Name = crd.GetName()
+	}
 	return result
 }