✨ Generate embedded ObjectMeta with schemapatch as well

[markusthoemmes]

Quite similar to #557, this applies the very same options now available on the CRD generator to be available on the schemapatch command. Since this option only really affects the generation of the schema anyway, it seems like it should be available on both equally.

[k8s-ci-robot]

Welcome @markusthoemmes!

It looks like this is your first PR to kubernetes-sigs/controller-tools 🎉. Please refer to our pull request process documentation to help your PR have a smooth ride to approval.

You will be prompted by a bot to use commands during the review process. Do not be afraid to follow the prompts! It is okay to experiment. Here is the bot commands documentation.

You can also check if kubernetes-sigs/controller-tools has its own contribution guidelines.

You may want to refer to our testing guide if you run into trouble with your tests not passing.

If you are having difficulty getting your pull request seen, please follow the recommended escalation practices. Also, for tips and tricks in the contribution process you may want to read the Kubernetes contributor cheat sheet. We want to make sure your contribution gets all the attention it needs!

Thank you, and welcome to Kubernetes. 😃

[markusthoemmes]

/assign @DirectXMan12

[DirectXMan12]

this doesn't seem quite right, because top-level metadata is actually allowed to contain a couple validations, and this is one of the things schemapatch enables.

[markusthoemmes]

Interesting, I basically copied the approach over from the crd generator, where this exact change is done unconditionally as well 🤔.

See

controller-tools/pkg/crd/gen.go

Lines 137 to 138 in 97ee66c

	// Prevent the top level metadata for the CRD to be generate regardless of the intention in the arguments
	FixTopLevelMetadata(crdRaw)

and

controller-tools/pkg/crd/gen.go

Lines 281 to 290 in 97ee66c

	func FixTopLevelMetadata(crd apiext.CustomResourceDefinition) {
	for _, v := range crd.Spec.Versions {
	if v.Schema != nil && v.Schema.OpenAPIV3Schema != nil && v.Schema.OpenAPIV3Schema.Properties != nil {
	schemaProperties := v.Schema.OpenAPIV3Schema.Properties
	if _, ok := schemaProperties["metadata"]; ok {
	schemaProperties["metadata"] = apiext.JSONSchemaProps{Type: "object"}
	}
	}
	}
	}

Could you elaborate on why this should be different in schemapatch?

[DirectXMan12]

oh hmm this might've been me reviewing too fast. My thought was that maybe people had put in place custom validation, but schemapatch is gonna overwrite that anyway. nevermind :-)

[DirectXMan12]

/lgtm
/approve

[k8s-ci-robot]

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: DirectXMan12, markusthoemmes

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

• OWNERS [DirectXMan12]

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment