remove apiresourceschemas

Author: mjudeikis

apiserviceexport.yaml

@@ -0,0 +1,11 @@
+apiVersion: kube-bind.io/v1alpha2
+kind: APIServiceExportRequest
+metadata:
+  name: mangodbs.mangodb.com
+spec:
+  resources:
+  - group: mangodb.com
+    resource: mangodbs
+    versions:
+    - v1alpha1
+status: {}

backend/controllers/serviceexportrequest/serviceexportrequest_reconcile.go

@@ -22,7 +22,6 @@ import (
 	"strings"
 	"time"
 
-	"github.com/davecgh/go-spew/spew"
 	apiextensionsv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
 	apierrors "k8s.io/apimachinery/pkg/api/errors"
 	"k8s.io/apimachinery/pkg/api/meta"
@@ -55,7 +54,6 @@ type reconciler struct {
 }
 
 func (r *reconciler) reconcile(ctx context.Context, mapper meta.RESTMapper, cl client.Client, cache cache.Cache, req *kubebindv1alpha2.APIServiceExportRequest) error {
-	spew.Dump(req)
 	if err := r.ensureBoundSchemas(ctx, mapper, cl, cache, req); err != nil {
 		return err
 	}
@@ -120,7 +118,6 @@ func (r *reconciler) ensureBoundSchemas(ctx context.Context, mapper meta.RESTMap
 			}
 			plural := names.(map[string]interface{})["plural"]
 
-			spew.Dump("checking", group, plural, "against", res.Group, res.Resource)
 			if group == res.Group && plural == res.Resource {
 				boundSchema, err := helpers.UnstructuredToBoundSchema(item)
 				if err != nil {

deploy/crd/kube-bind.io_apiresourceschemas.yaml

@@ -2,4 +2,4 @@
 - op: add
   path: /spec/conversion
   value:
-    strategy: None
+    strategy: None

deploy/crd/kube-bind.io_boundapiresourceschemas.yaml

@@ -47,11 +47,6 @@ spec:
     schema: v250809-5ed76a1.apiconversions.kube-bind.io
     storage:
       crd: {}
-  - group: kube-bind.io
-    name: apiresourceschemas
-    schema: v250809-5ed76a1.apiresourceschemas.kube-bind.io
-    storage:
-      crd: {}
   - group: kube-bind.io
     name: apiservicebindings
     schema: v250809-5ed76a1.apiservicebindings.kube-bind.io
@@ -72,11 +67,6 @@ spec:
     schema: v250809-5ed76a1.apiservicenamespaces.kube-bind.io
     storage:
       crd: {}
-  - group: kube-bind.io
-    name: boundapiresourceschemas
-    schema: v250809-5ed76a1.boundapiresourceschemas.kube-bind.io
-    storage:
-      crd: {}
   - group: kube-bind.io
     name: boundschemas
     schema: v250902-878858c.boundschemas.kube-bind.io

deploy/patches/kube-bind.io_boundapiresourceschemas.yaml-patch

@@ -169,11 +169,9 @@ func BoundSchemaToCRD(schema *kubebindv1alpha2.BoundSchema) *apiextensionsv1.Cus
 			Subresources:             &version.Subresources,
 		}
 		if len(version.Schema.Raw) > 0 {
-			var jsonSchema apiextensionsv1.JSONSchemaProps
+			var jsonSchema apiextensionsv1.CustomResourceValidation
 			if err := json.Unmarshal(version.Schema.Raw, &jsonSchema); err == nil {
-				crdVersion.Schema = &apiextensionsv1.CustomResourceValidation{
-					OpenAPIV3Schema: &jsonSchema,
-				}
+				crdVersion.Schema = &jsonSchema
 			}
 		}