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

✨ Update CRDs to v1alpha2 #336

Merged
merged 1 commit into from
Jun 18, 2024
Merged

✨ Update CRDs to v1alpha2 #336

merged 1 commit into from
Jun 18, 2024

Conversation

jmontleon
Copy link
Member

No description provided.

@jmontleon
Copy link
Member Author

@shawn-hurley can you help verify this is correct for adding a new CRD version?

I'm a little iffy. According to https://docs.openshift.com/container-platform/4.15/operators/operator_sdk/osdk-generating-csvs.html

We should Add a new entry in the CRD resource under the versions section of your CSV. There is no versions section of a CSV that I am aware of. There is spec.versions[] in the CRD with served and storage that I believe they're talking about.

And then Ensure the referencing version of the CRD in the owned section of your CSV is updated if the CSV intends to use the new version:.

I guess we just list the new version?

- description: Tackle
displayName: Tackle
kind: Tackle
name: tackles.tackle.konveyor.io
version: v1alpha1
- description: Tackle
Copy link
Member Author

Choose a reason for hiding this comment

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

It seems if 'served' is true for a version then make bundle will generate an entry here. I tested this by changing served to false for tackles and we ended up with only v1alpha2 instead of both.

@jmontleon jmontleon force-pushed the v1alpha2 branch 5 times, most recently from 4e393fe to 15a0665 Compare June 17, 2024 21:08
Signed-off-by: Jason Montleon <jmontleo@redhat.com>
@jmontleon
Copy link
Member Author

jmontleon commented Jun 18, 2024

The tests are failling from:

 TASK [Remove Admin Addon CR] ******************************** 
fatal: [localhost]: FAILED! => {"changed": false, "msg": "Failed to find exact match for tackle.konveyor.io/v1alpha1.Addon by [kind, name, singularName, shortNames]"}

This is fixed by:
https://github.com/konveyor/operator/pull/336/files#diff-0a8079fab6ffd92e79e1f91e6bd25cfe01ddc6744210bce9799e5267589d5f54R457

But tests will not pass until everything is merged because the bundle is still using image: quay.io/konveyor/tackle2-operator:latest.

@djzager fyi we have an issue where operator role changes don't get tested. We probably need to build the container image replace it when building the bundle for tests to properly account for changes.

Copy link
Contributor

@jortel jortel left a comment

Choose a reason for hiding this comment

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

LGTM

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