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

bump k8s to 1.25 and go to 1.19 #260

Conversation

laxmikantbpandhare
Copy link
Member

@laxmikantbpandhare laxmikantbpandhare commented Aug 31, 2022

Ready for review.

@openshift-ci openshift-ci bot added the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Aug 31, 2022
@laxmikantbpandhare laxmikantbpandhare marked this pull request as ready for review September 6, 2022 19:49
@openshift-ci openshift-ci bot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Sep 6, 2022
@everettraven
Copy link
Contributor

@laxmikantbpandhare It seems the verify check is failing when running a git diff from the generated code. I think you may be able to fix this by running make generate and then committing the changes.

@laxmikantbpandhare
Copy link
Member Author

I tried that command already but did not get anything for commit.

laxmikantbhaskarpandhare@lpandhar-mac api % make generate
/Users/laxmikantbhaskarpandhare/go/src/github.com/operator-frameowrk/api/bin/controller-gen object:headerFile=./hack/boilerplate.go.txt paths=./...
laxmikantbhaskarpandhare@lpandhar-mac api % git status
On branch update-1.25
nothing to commit, working tree clean
laxmikantbhaskarpandhare@lpandhar-mac api % 

@openshift-merge-robot openshift-merge-robot added needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. and removed needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. labels Sep 7, 2022
@everettraven
Copy link
Contributor

@laxmikantbpandhare it looks like the verify check is still failing based on some formatting errors. I think doing a make format may resolve these.

@laxmikantbpandhare
Copy link
Member Author

Ah! yeah it was still failing. I made changes to it.

Copy link
Contributor

@everettraven everettraven left a comment

Choose a reason for hiding this comment

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

/lgtm

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Sep 8, 2022
Copy link
Member

@jmrodri jmrodri left a comment

Choose a reason for hiding this comment

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

/lgtm

@awgreene
Copy link
Member

Seems like the go-apidiff test is failing due to this change and can be ignored.

@awgreene
Copy link
Member

If there are no major objections, I would like to see #261 merge first, as it isn't clear how much work it will be to update OLM to use the new k8s and go versions.

/hold

@openshift-ci openshift-ci bot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Sep 12, 2022
@laxmikantbpandhare
Copy link
Member Author

If there are no major objections, I would like to see #261 merge first, as it isn't clear how much work it will be to update OLM to use the new k8s and go versions.

/hold

@awgreene - this will impact SDK effort operator-framework/operator-sdk#5937. @jmrodri @theishshah - Can we wait for this?

@anik120
Copy link
Contributor

anik120 commented Sep 12, 2022

Fyi #261 is just waiting on an approve label, which should be there soon. So we won't have to wait long for that.

@anik120
Copy link
Contributor

anik120 commented Sep 13, 2022

#261 has merged. Fyi I'm cutting a new release so that we can use that in OLM.

/hold cancel

@openshift-ci openshift-ci bot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Sep 13, 2022
@awgreene
Copy link
Member

/approve

@openshift-ci
Copy link

openshift-ci bot commented Sep 13, 2022

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: awgreene, laxmikantbpandhare

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:

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

@openshift-ci openshift-ci bot added approved Indicates a PR has been approved by an approver from all required OWNERS files. and removed lgtm Indicates that a PR is ready to be merged. labels Sep 13, 2022
@openshift-merge-robot openshift-merge-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Sep 13, 2022
@openshift-merge-robot openshift-merge-robot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Sep 13, 2022
updated

format

defs
@laxmikantbpandhare
Copy link
Member Author

Squashed commits and rebased after merge of #261

@theishshah
Copy link
Member

/lgtm

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Sep 15, 2022
@laxmikantbpandhare laxmikantbpandhare requested review from awgreene and removed request for gallettilance September 15, 2022 19:13
@joelanford
Copy link
Member

/override go-apidiff

@openshift-ci
Copy link

openshift-ci bot commented Sep 15, 2022

@joelanford: Overrode contexts on behalf of joelanford: go-apidiff

In response to this:

/override go-apidiff

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@openshift-merge-robot openshift-merge-robot merged commit ff2dbc5 into operator-framework:master Sep 15, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. lgtm Indicates that a PR is ready to be merged.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

8 participants