Skip to content
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

✨ Add CRDs to built-in types #3018

Merged
merged 2 commits into from
Oct 16, 2023
Merged

✨ Add CRDs to built-in types #3018

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d6da02e
Add CRDs to built-in types
mjudeikis Oct 9, 2023
bb058ec
crd status field
mjudeikis Oct 9, 2023
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
5 changes: 4 additions & 1 deletion pkg/crdpuller/discovery.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -495,7 +495,10 @@ func (sc *SchemaConverter) VisitKind(k *proto.Kind) {
}

func (sc *SchemaConverter) VisitReference(r proto.Reference) {
reference := r.Reference()
reference := r.Reference() // recursive CRDs are not supported
if reference == "io.k8s.apiextensions-apiserver.pkg.apis.apiextensions.v1.JSONSchemaProps" {
return
}
Copy link
Member

Choose a reason for hiding this comment

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

what's the consequence of this? Who wants to crdpull CRDs?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

need to test crd pulling case :/ tbh this was very quick PR. Needs more testing. And this feedback kelps to identify the areas for testing :)

Copy link
Member

Choose a reason for hiding this comment

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

Note that pulling the CRD type, not CRDs (= instances), is very meta 😄

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I think this does not impact CRD pulling. We already converts APIS into CRDs
Tested crd-puller and it just worked. Might be some edge cases but not sure how to identify those without knowing what I'm looking for ;)

if sc.visited.Has(reference) {
*sc.errors = append(*sc.errors, fmt.Errorf("recursive schema are not supported: %s", reference))
return
Expand Down
8 changes: 2 additions & 6 deletions pkg/informer/informer_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@ limitations under the License.
package informer

import (
"reflect"
"strings"
"testing"

Expand Down Expand Up @@ -84,6 +83,7 @@ func TestBuiltInInformableTypes(t *testing.T) {
{Group: "authorization.k8s.io", Version: "v1", Kind: "SelfSubjectAccessReview"}: {},
{Group: "authorization.k8s.io", Version: "v1", Kind: "SelfSubjectRulesReview"}: {},
{Group: "authorization.k8s.io", Version: "v1", Kind: "SubjectAccessReview"}: {},
{Group: "apiextensions.k8s.io", Version: "v1", Kind: "ConversionReview"}: {},
}

gvsToIgnore := map[schema.GroupVersion]struct{}{
Expand All @@ -92,6 +92,7 @@ func TestBuiltInInformableTypes(t *testing.T) {

// These are alpha/beta versions that are not preferred (they all have v1)
{Group: "admissionregistration.k8s.io", Version: "v1beta1"}: {},
{Group: "apiextensions.k8s.io", Version: "v1beta1"}: {},
{Group: "authentication.k8s.io", Version: "v1beta1"}: {},
{Group: "authorization.k8s.io", Version: "v1beta1"}: {},
{Group: "certificates.k8s.io", Version: "v1alpha1"}: {},
Expand All @@ -103,11 +104,6 @@ func TestBuiltInInformableTypes(t *testing.T) {
}

allKnownTypes := kcpscheme.Scheme.AllKnownTypes()

// CRDs are not included in the genericcontrolplane scheme (because they're part of the apiextensions apiserver),
// so we have to manually add them
allKnownTypes[schema.GroupVersionKind{Group: "apiextensions.k8s.io", Version: "v1", Kind: "CustomResourceDefinition"}] = reflect.TypeOf(struct{}{})
Copy link
Member

Choose a reason for hiding this comment

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

isn't that still the case?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I don't think so. We add this to schema bellow? No?


for gvk := range allKnownTypes {
if kindsToIgnore.Has(gvk.Kind) {
continue
Expand Down
2 changes: 2 additions & 0 deletions pkg/server/scheme/scheme.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ limitations under the License.
package scheme

import (
apiextensionsinstall "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/install"
"k8s.io/apimachinery/pkg/runtime"
"k8s.io/apimachinery/pkg/runtime/serializer"
admissionregistrationinstall "k8s.io/kubernetes/pkg/apis/admissionregistration/install"
Expand All @@ -33,6 +34,7 @@ func init() {
install.Install(Scheme)
authenticationinstall.Install(Scheme)
authorizationinstall.Install(Scheme)
apiextensionsinstall.Install(Scheme)
Copy link
Member

Choose a reason for hiding this comment

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

this is the line I missed.

certificatesinstall.Install(Scheme)
coordinationinstall.Install(Scheme)
rbacinstall.Install(Scheme)
Expand Down
11 changes: 11 additions & 0 deletions pkg/virtual/apiexport/schemas/builtin/builtin.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -255,4 +255,15 @@ var BuiltInAPIs = []internalapis.InternalAPI{
Instance: &admissionregistrationv1alpha1.ValidatingAdmissionPolicyBinding{},
ResourceScope: apiextensionsv1.ClusterScoped,
},
{
Names: apiextensionsv1.CustomResourceDefinitionNames{
Plural: "customresourcedefinitions",
Singular: "customresourcedefinition",
Kind: "CustomResourceDefinition",
},
GroupVersion: schema.GroupVersion{Group: "apiextensions.k8s.io", Version: "v1"},
Instance: &apiextensionsv1.CustomResourceDefinition{},
ResourceScope: apiextensionsv1.ClusterScoped,
HasStatus: true,
},
}