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

chore(build): upgrade Operator SDK to v1.31.0 #629

Merged
merged 11 commits into from
Sep 27, 2023

Conversation

aali309
Copy link
Contributor

@aali309 aali309 commented Sep 18, 2023

Welcome to Cryostat! 👋

Before contributing, make sure you have:

  • Read the contributing guidelines
  • Linked a relevant issue which this PR resolves
  • Linked any other relevant issues, PR's, or documentation, if any
  • Resolved all conflicts, if any
  • Rebased your branch PR on top of the latest upstream main branch
  • Attached at least one of the following labels to the PR: [chore, ci, docs, feat, fix, test]
  • Signed all commits: git commit -S -m "YOUR_COMMIT_MESSAGE"

Fixes: #614

Description of the change:

This change upgrades Operator SDK v1.28.0. to the newest available version at the moment (v1.31.0.)

Motivation for the change:

upgrade to the latest available version

How to manually test:

  1. Insert steps here...
  2. ...

@aali309 aali309 added chore Refactor, rename, cleanup, etc. build safe-to-test labels Sep 18, 2023
@aali309 aali309 self-assigned this Sep 18, 2023
Copy link
Member

@tthvo tthvo left a comment

Choose a reason for hiding this comment

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

Looks like Makefile was updated such that operator-sdk can be installed and referenced from ./bin. Tho, it seems to ignore if there is a system installation.

https://github.com/operator-framework/operator-sdk/blob/e67da35ef4fff3e471a208904b2a142b27ae32b1/testdata/go/v3/memcached-operator/Makefile#L214

We should sync with these changes?

@ebaron
Copy link
Member

ebaron commented Sep 20, 2023

Looks like Makefile was updated such that operator-sdk can be installed and referenced from ./bin. Tho, it seems to ignore if there is a system installation.

https://github.com/operator-framework/operator-sdk/blob/e67da35ef4fff3e471a208904b2a142b27ae32b1/testdata/go/v3/memcached-operator/Makefile#L214

We should sync with these changes?

I think this is a good idea. Let's bring in this block into our Makefile: https://github.com/operator-framework/operator-sdk/blob/8f24aa560c1b8a8ea7bbc062016347b4012e499c/testdata/go/v3/memcached-operator/Makefile#L213-L228

Then anywhere we call operator-sdk in the Makefile, we should replace it with $(OPERATOR_SDK) and add the new operator-sdk target as a prerequisite for the target containing the operator-sdk call.

Once that's done we can remove the setup-operator-sdk step from our GitHub workflow:

- uses: jpkrohling/[email protected]
with:
operator-sdk-version: v1.28.0

Edit: We'll need this block too: https://github.com/operator-framework/operator-sdk/blob/8f24aa560c1b8a8ea7bbc062016347b4012e499c/testdata/go/v3/memcached-operator/Makefile#L49-L51

@tthvo
Copy link
Member

tthvo commented Sep 20, 2023

Sounds good! Make sense to me!

Copy link
Member

@ebaron ebaron left a comment

Choose a reason for hiding this comment

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

Thanks for doing this extra bit @aali309. The only thing I see missing is to add the new operator-sdk target as a prerequisite for targets like test-scorecard that use the new $(OPERATOR_SDK) variable.

Something like:
test-scorecard: check_cert_manager kustomize operator-sdk

Makefile Show resolved Hide resolved
Makefile Show resolved Hide resolved
Makefile Show resolved Hide resolved
Copy link
Member

@tthvo tthvo left a comment

Choose a reason for hiding this comment

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

Looks good to me!

@aali309
Copy link
Contributor Author

aali309 commented Sep 27, 2023

ping @ebaron @andrewazores

andrewazores
andrewazores previously approved these changes Sep 27, 2023
Makefile Show resolved Hide resolved
Makefile Outdated Show resolved Hide resolved
Makefile Outdated Show resolved Hide resolved
Makefile Outdated Show resolved Hide resolved
Makefile Outdated Show resolved Hide resolved
Copy link
Member

@ebaron ebaron left a comment

Choose a reason for hiding this comment

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

Looks good. Thanks @aali309!

@aali309
Copy link
Contributor Author

aali309 commented Sep 27, 2023

Looks good. Thanks @aali309!

No man thanks to you @ebaron @andrewazores and @tthvo

@ebaron ebaron merged commit a85a750 into cryostatio:main Sep 27, 2023
@aali309 aali309 deleted the upgradeOperatorSDK branch September 27, 2023 19:56
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
build chore Refactor, rename, cleanup, etc. safe-to-test
Projects
No open projects
Status: Done
Development

Successfully merging this pull request may close these issues.

[Task] Upgrade Operator SDK to v1.31 (or newer)
4 participants