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.

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

Make MaxItems values consistent between JSON schema and provider schema #527

Merged

Conversation

sergenyalcin
Copy link
Collaborator

@sergenyalcin sergenyalcin commented May 16, 2024

Description of your changes

During tests of the `Convert all singleton lists in the MR APIs to embedded objects' PRs, we observed an issue regarding the inconsistency between the JSON schema and provider schema.

The GetProvider function returns provider configuration in the providers. This function has a parameter generationProvider. If it is set to true, the JSON schema is used to obtain provider configuration. If it is false, the Go schema is used.

In theory, the two schemas are equivalent. However, during tests, we observed inconsistencies in some fields MaxItems values. This means that we use different schemas during generation and reconciliation.

This causes issues with the conversion of singleton lists to embedded objects. This type of change may also cause bigger problems.

This PR makes MaxItems values consistent between JSON schema and provider schema by manipulating the resource schemas.

I have:

  • Read and followed Crossplane's contribution process.
  • Run make reviewable to ensure this PR is ready for review.
  • Added backport release-x.y labels to auto-backport this PR if necessary.

How has this code been tested

Signed-off-by: Sergen Yalçın <yalcinsergen97@gmail.com>
@sergenyalcin sergenyalcin force-pushed the configure-max-items branch from 8649013 to 50b5ae4 Compare May 16, 2024 14:12
@sergenyalcin
Copy link
Collaborator Author

/test-examples="examples/composer/v1beta2/environment.yaml"

@sergenyalcin
Copy link
Collaborator Author

/test-examples="examples/compute/v1beta2/instancefromtemplate.yaml"

@sergenyalcin
Copy link
Collaborator Author

/test-examples="examples/container/v1beta2/nodepool.yaml"

Copy link
Collaborator

@ulucinar ulucinar left a comment

Choose a reason for hiding this comment

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

Thanks @sergenyalcin, lgtm. Could you please leave a comment for the failing uptest run as we discussed offline?

@sergenyalcin
Copy link
Collaborator Author

This test failed because of timeout issue. The creation of the resource takes more than one hour. However, I checked the Console and the creation started. So it is good to go now. About the check-examples job please see this comment: #508 (comment)

@sergenyalcin sergenyalcin merged commit c82aec4 into crossplane-contrib:main May 16, 2024
10 of 12 checks passed
@sergenyalcin sergenyalcin deleted the configure-max-items branch May 16, 2024 15:08
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants