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

Jump to bottom

Bump kubebuilder to 3.15.0 (with merge conflicts resolved) #90

Merged
merged 2 commits into from
Oct 15, 2024
Merged

Bump kubebuilder to 3.15.0 (with merge conflicts resolved) #90

merged 2 commits into from
Oct 15, 2024

Conversation

Neo2308
Copy link
Contributor

@Neo2308 Neo2308 commented Aug 27, 2024

Contains the changes from the below PR along with merge conflicts resolved.
Ref: #77

@Neo2308
Copy link
Contributor Author

Neo2308 commented Sep 3, 2024

@acornett21 / @joelanford can you help fix the test failures?

@openshift-merge-robot openshift-merge-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Oct 8, 2024
@acornett21
Copy link
Contributor

@Neo2308 We can probably drop this right? Since we need to go to kubebuilder v4 to get k8s 1.30, correct?

@Neo2308
Copy link
Contributor Author

Neo2308 commented Oct 8, 2024

@acornett21 we could drop this, but since this already has some of the major changes that are needed when moving to kubebuilder v4, it would be easier to get this merged and make the extra changes on top of it.

@openshift-merge-robot openshift-merge-robot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Oct 8, 2024
acornett21
acornett21 reviewed Oct 8, 2024
View reviewed changes
Copy link
Contributor

@acornett21 acornett21 left a comment

Choose a reason for hiding this comment

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

Just a couple of small comments.

pkg/plugins/ansible/v1/init.go Show resolved Hide resolved
testdata/memcached-molecule-operator/config/prometheus/monitor.yaml Show resolved Hide resolved
@Neo2308 Neo2308 mentioned this pull request Oct 9, 2024
Open
4 tasks
@joelanford
Copy link
Member

I'm pretty sure @Neo2308's responses to the review questions are correct, but my memory is fuzzy. I had some conversations with @camilamacedo86 in the upstream kubebuilder channel after I made my original PR and I think further changes came in 3.15.1 and 4.x releases.

To be honest, I've long since evicted this from my cache, and I don't have time right now to load all this back in.

@acornett21
Copy link
Contributor

I think further changes came in 3.15.1 and 4.x releases.

@joelanford further changes for sure, we are trying to layer them on in smaller chunks. Thanks for the reply.

@acornett21 acornett21 merged commit 9a6d15a into operator-framework:main Oct 15, 2024
5 checks passed
@acornett21 acornett21 mentioned this pull request Oct 15, 2024
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@acornett21 acornett21 acornett21 approved these changes

@anik120 anik120 Awaiting requested review from anik120

@theishshah theishshah Awaiting requested review from theishshah

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@Neo2308 @acornett21 @joelanford @openshift-merge-robot