Skip to content

Remove scheme validation & refac apiexport #55

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
Dec 3, 2025
Merged

Remove scheme validation & refac apiexport #55

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
11 changes: 6 additions & 5 deletions apiexport/provider.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,10 @@ import (

"k8s.io/apimachinery/pkg/fields"
"k8s.io/apimachinery/pkg/runtime"
"k8s.io/client-go/kubernetes/scheme"
"k8s.io/client-go/rest"
toolscache "k8s.io/client-go/tools/cache"
"k8s.io/utils/ptr"
"sigs.k8s.io/controller-runtime/pkg/cache"
"sigs.k8s.io/controller-runtime/pkg/client"
"sigs.k8s.io/controller-runtime/pkg/cluster"
Expand Down Expand Up @@ -92,15 +94,15 @@ type Options struct {
func New(cfg *rest.Config, endpointSliceName string, options Options) (*Provider, error) {
// Do the defaulting controller-runtime would do for those fields we need.
if options.Scheme == nil {
return nil, fmt.Errorf("scheme must be provided")
options.Scheme = scheme.Scheme
Copy link
Contributor

@mjudeikis mjudeikis Dec 1, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is open to discussion. The problem is that if one uses a dedicated schema object when initialising this code, it will not work as the schemas will not match. So, should we be explicit here and ask the user to provide the schema, or are we ok?

Copy link
Contributor Author

@EpicStep EpicStep Dec 2, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think in this case we can use the scheme from client-go, since controller-runtime has the same default:
https://github.com/kubernetes-sigs/controller-runtime/blob/main/pkg/cluster/cluster.go#L264

}

if options.ObjectToWatch == nil {
options.ObjectToWatch = &apisv1alpha1.APIBinding{}
}

if options.Log == nil {
l := log.Log.WithName("kcp-apiexport-cluster-provider")
options.Log = &l
options.Log = ptr.To(log.Log.WithName("kcp-apiexport-cluster-provider"))
}

c, err := cache.New(cfg, cache.Options{
Expand All @@ -115,10 +117,9 @@ func New(cfg *rest.Config, endpointSliceName string, options Options) (*Provider
return nil, err
}

clusters := clusters.New[cluster.Cluster]()
return &Provider{
// func to pass into iner provider to lifecycle clusters
clusters: &clusters,
clusters: ptr.To(clusters.New[cluster.Cluster]()),
providers: map[string]*provider.Provider{},

config: cfg,
Expand Down