Skip to content

🐛 drop all non-selected versions from CRDs when creating APIResourceSchemas #21

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Feb 10, 2025
Merged

🐛 drop all non-selected versions from CRDs when creating APIResourceSchemas #21

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 13 additions & 2 deletions internal/controller/apiresourceschema/controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ import (
"encoding/json"
"fmt"
"reflect"
"slices"
"strings"

"github.com/kcp-dev/logicalcluster/v3"
Expand Down Expand Up @@ -146,7 +147,7 @@ func (r *Reconciler) reconcile(ctx context.Context, log *zap.SugaredLogger, pubR
err = r.kcpClient.Get(wsCtx, types.NamespacedName{Name: arsName}, ars, &ctrlruntimeclient.GetOptions{})

if apierrors.IsNotFound(err) {
if err := r.createAPIResourceSchema(wsCtx, log, r.apiExportName, projectedCRD, arsName); err != nil {
if err := r.createAPIResourceSchema(wsCtx, log, r.apiExportName, projectedCRD, arsName, pubResource.Spec.Resource.Version); err != nil {
return nil, fmt.Errorf("failed to create APIResourceSchema: %w", err)
}
} else if err != nil {
Expand All @@ -169,7 +170,17 @@ func (r *Reconciler) reconcile(ctx context.Context, log *zap.SugaredLogger, pubR
return nil, nil
}

func (r *Reconciler) createAPIResourceSchema(ctx context.Context, log *zap.SugaredLogger, apigroup string, projectedCRD *apiextensionsv1.CustomResourceDefinition, arsName string) error {
func (r *Reconciler) createAPIResourceSchema(ctx context.Context, log *zap.SugaredLogger, apigroup string, projectedCRD *apiextensionsv1.CustomResourceDefinition, arsName string, selectedVersion string) error {
// At this moment we ignore every non-selected version in the CRD, as we have not fully
// decided on how to support the API version lifecycle yet. Having multiple versions in
// the CRD will make kcp require a `conversion` to also be configured. Since we cannot
// enforce that and want to instead work with existing CRDs as best as we can, we chose
// this option (instead of error'ing out if a conversion is missing).
projectedCRD.Spec.Conversion = nil
projectedCRD.Spec.Versions = slices.DeleteFunc(projectedCRD.Spec.Versions, func(v apiextensionsv1.CustomResourceDefinitionVersion) bool {
return v.Name != selectedVersion
})

// prefix is irrelevant as the reconciling framework will use arsName anyway
converted, err := kcpdevv1alpha1.CRDToAPIResourceSchema(projectedCRD, "irrelevant")
if err != nil {
Expand Down