update to crds for require schema elements. required for kube ver 1.1…

…6 or crd v1
kudobuilder · Oct 3, 2019 · f6a9ac1 · f6a9ac1
1 parent c341195
commit f6a9ac1
Showing 1 changed file with 6 additions and 5 deletions.
diff --git a/pkg/kudoctl/cmd/init/crds.go b/pkg/kudoctl/cmd/init/crds.go
@@ -93,7 +93,7 @@ func generateOperator() *apiextv1beta1.CustomResourceDefinition {
 		"description":       apiextv1beta1.JSONSchemaProps{Type: "string"},
 		"kubernetesVersion": apiextv1beta1.JSONSchemaProps{Type: "string"},
 		"kudoVersion":       apiextv1beta1.JSONSchemaProps{Type: "string"},
-		"maintainers": apiextv1beta1.JSONSchemaProps{
+		"maintainers": apiextv1beta1.JSONSchemaProps{Type: "object",
 			Items: &apiextv1beta1.JSONSchemaPropsOrArray{Schema: &apiextv1beta1.JSONSchemaProps{
 				Type:       "object",
 				Properties: maintainers,
@@ -109,9 +109,10 @@ func generateOperator() *apiextv1beta1.CustomResourceDefinition {
 		"spec":       apiextv1beta1.JSONSchemaProps{Properties: specProps, Type: "object"},
 		"status":     apiextv1beta1.JSONSchemaProps{Type: "object"},
 	}
-
+	// preserveFields := false
+	// crd.Spec.PreserveUnknownFields = &preserveFields
 	crd.Spec.Validation = &apiextv1beta1.CustomResourceValidation{
-		OpenAPIV3Schema: &apiextv1beta1.JSONSchemaProps{
+		OpenAPIV3Schema: &apiextv1beta1.JSONSchemaProps{Type: "object",
 			Properties: validationProps,
 		},
 	}
@@ -180,7 +181,7 @@ func generateOperatorVersion() *apiextv1beta1.CustomResourceDefinition {
 	}
 
 	crd.Spec.Validation = &apiextv1beta1.CustomResourceValidation{
-		OpenAPIV3Schema: &apiextv1beta1.JSONSchemaProps{
+		OpenAPIV3Schema: &apiextv1beta1.JSONSchemaProps{Type: "object",
 			Properties: validationProps,
 		},
 	}
@@ -233,7 +234,7 @@ func generateInstance() *apiextv1beta1.CustomResourceDefinition {
 	}
 
 	crd.Spec.Validation = &apiextv1beta1.CustomResourceValidation{
-		OpenAPIV3Schema: &apiextv1beta1.JSONSchemaProps{
+		OpenAPIV3Schema: &apiextv1beta1.JSONSchemaProps{Type: "object",
 			Properties: validationProps,
 		},
 	}