Skip to content

Bump versions for k8s 1.24 #5843

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
Merged
merged 29 commits into from
Jun 10, 2022
Merged

Bump versions for k8s 1.24 #5843

merged 29 commits into from
Jun 10, 2022

Conversation

asmacdo
Copy link
Member

@asmacdo asmacdo commented Jun 9, 2022 •
edited by camilamacedo86
Loading

Passing off to @everettraven since I'll be out today. I will be on slack if there are any questions.

If the tests don't pass we will make this a feature branch, but for the sake of go.mod merge conflicts, lets try to avoid that if possible. IMO an admin-merge could be appropriate if the tests will be fixed quickly.

Signed-off-by: Austin Macdonald austin@redhat.com

Closes: #5833

@asmacdo
Bump versions for k8s 1.24
23ceb3c 
Signed-off-by: Austin Macdonald <austin@redhat.com>
@openshift-ci openshift-ci bot requested review from fabianvf and marc-obrien June 9, 2022 11:13
@asmacdo asmacdo mentioned this pull request Jun 9, 2022
Closed
13 tasks
@everettraven everettraven mentioned this pull request Jun 9, 2022
Closed
2 tasks
@everettraven
updates to resolve test failures
0cf7b68 
Signed-off-by: Bryce Palmer <bpalmer@redhat.com>
@everettraven
update changelog
1cf485a 
Signed-off-by: Bryce Palmer <bpalmer@redhat.com>
@everettraven
update sanity go version
668b932 
Signed-off-by: Bryce Palmer <bpalmer@redhat.com>
@everettraven everettraven added the release-blocker This issue blocks the parent release milestone label Jun 9, 2022
@everettraven everettraven added this to the v1.22.0 milestone Jun 9, 2022
camilamacedo86
camilamacedo86 reviewed Jun 9, 2022
View reviewed changes
camilamacedo86
camilamacedo86 reviewed Jun 9, 2022
View reviewed changes
camilamacedo86
camilamacedo86 reviewed Jun 9, 2022
View reviewed changes
camilamacedo86
camilamacedo86 reviewed Jun 9, 2022
View reviewed changes
camilamacedo86
camilamacedo86 reviewed Jun 9, 2022
View reviewed changes
camilamacedo86
camilamacedo86 requested changes Jun 9, 2022
View reviewed changes
Copy link
Contributor

@camilamacedo86 camilamacedo86 left a comment

Choose a reason for hiding this comment

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

Cool 🥇

Some nits;

a) we need to fix the changelog and ensure that it has only what impacts the end-users
also, changes in the scaffolds need migration steps

b) I do not think that we need/should change the Leader election here. We need to check how that will affect endusers, can we do a PR only for that?

@everettraven
Copy link
Contributor

everettraven commented Jun 9, 2022 •
edited
Loading

@camilamacedo86

a) we need to fix the changelog and ensure that it has only what impacts the end-users also, changes in the scaffolds need migration steps

I'll make some changes to the changelog to reflect this.

b) I do not think that we need/should change the Leader election here. We need to check how that will affect endusers, can we do a PR only for that?

Unfortunately I don't think we can do it in a separate PR as client-go/leaderelection/resourcelock that comes with v0.24.0 forces the change. My understanding is that this change should be a safe step in the migration to leases and only affect new operators and not older operators. I am open to discussing this further, but this needs to be a part of this PR.

As an extra note, our e2e tests have passed with the changes as well.

@everettraven
update to go 1.18
b896866 
Signed-off-by: Bryce Palmer <bpalmer@redhat.com>
@everettraven
updates for golangci-lint
c86b4f7 
Signed-off-by: Bryce Palmer <bpalmer@redhat.com>
@everettraven
update some go1.18 lint issues
5fcb47a 
Signed-off-by: Bryce Palmer <bpalmer@redhat.com>
@everettraven
commit go.mod
20b71e9 
Signed-off-by: Bryce Palmer <bpalmer@redhat.com>
@everettraven
update more lint problems
c192f3c 
Signed-off-by: Bryce Palmer <bpalmer@redhat.com>
@everettraven
update java plugin
0b0083c 
Signed-off-by: Bryce Palmer <bpalmer@redhat.com>
@openshift-ci openshift-ci bot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Jun 9, 2022
@everettraven
Copy link
Contributor

/hold

still a WIP

@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 Jun 9, 2022
@everettraven
Merge branch 'master' into 2142-bump-k8s124
4c9c554
@everettraven
update go.mod
cdd2ae2 
Signed-off-by: Bryce Palmer <bpalmer@redhat.com>
@openshift-ci openshift-ci bot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Jun 9, 2022
@everettraven
update actions to use go 1.18
b053e48 
Signed-off-by: Bryce Palmer <bpalmer@redhat.com>
camilamacedo86
camilamacedo86 reviewed Jun 9, 2022
View reviewed changes
camilamacedo86
camilamacedo86 reviewed Jun 9, 2022
View reviewed changes
@everettraven
more changelog
1ccecca 
Signed-off-by: Bryce Palmer <bpalmer@redhat.com>
camilamacedo86
camilamacedo86 reviewed Jun 9, 2022
View reviewed changes
@everettraven
address nits
b30c7a8 
Signed-off-by: Bryce Palmer <bpalmer@redhat.com>
camilamacedo86
camilamacedo86 approved these changes Jun 9, 2022
View reviewed changes
Copy link
Contributor

@camilamacedo86 camilamacedo86 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 Jun 9, 2022
@everettraven
Copy link
Contributor

@camilamacedo86 Thanks so much for all the help with the changelog!

@everettraven
Copy link
Contributor

/hold

We need to bump the OPM version in the Makefile scaffolds to be 1.23.0

@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 Jun 9, 2022
camilamacedo86
camilamacedo86 reviewed Jun 9, 2022
View reviewed changes
@asmacdo asmacdo mentioned this pull request Jun 10, 2022
Closed
@everettraven
update opm
d3af0c6 
Signed-off-by: Bryce Palmer <bpalmer@redhat.com>
@openshift-ci openshift-ci bot removed the lgtm Indicates that a PR is ready to be merged. label Jun 10, 2022
@asmacdo
Copy link
Member Author

asmacdo commented Jun 10, 2022

Also fixes #5854

@everettraven
update Go in docker images
7493c7a 
Signed-off-by: Bryce Palmer <bpalmer@redhat.com>
@everettraven everettraven linked an issue Jun 10, 2022 that may be closed by this pull request
Bump golang 1.17 -> 1.18 #5854
Closed
asmacdo
asmacdo commented Jun 10, 2022
View reviewed changes
Copy link
Member Author

@asmacdo asmacdo left a comment

Choose a reason for hiding this comment

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

some nits, dont hold bc of this review

camilamacedo86
camilamacedo86 reviewed Jun 10, 2022
View reviewed changes
@everettraven
update go in docs
729873c 
Signed-off-by: Bryce Palmer <bpalmer@redhat.com>
@everettraven
add newline to changelog
9e71934 
Signed-off-by: Bryce Palmer <bpalmer@redhat.com>
@everettraven
add opm detailed entries
9a5fbdd 
Signed-off-by: Bryce Palmer <bpalmer@redhat.com>
@everettraven
fix changelog failure
c7bb4f8 
Signed-off-by: Bryce Palmer <bpalmer@redhat.com>
@everettraven everettraven removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Jun 10, 2022
asmacdo
asmacdo commented Jun 10, 2022
View reviewed changes
Copy link
Member Author

@asmacdo asmacdo left a comment

Choose a reason for hiding this comment

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

LGTM (I cant approve because I am the OP)

the sanity/docs job is failing due to 1 broken link: https://v1-15-x.sdk.operatorframework.io/ which does work. This is 100% just a flake, I feel comfortable doing an admin merge to keep this moving.

@camilamacedo86
Copy link
Contributor

/lgtm

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Jun 10, 2022
@camilamacedo86
Copy link
Contributor

/approved

Great work !!!

@everettraven everettraven merged commit 025df62 into operator-framework:master Jun 10, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@camilamacedo86 camilamacedo86 camilamacedo86 approved these changes

@everettraven everettraven everettraven left review comments

@jmrodri jmrodri jmrodri approved these changes

@varshaprasad96 varshaprasad96 varshaprasad96 approved these changes

@fabianvf fabianvf Awaiting requested review from fabianvf

@marc-obrien marc-obrien Awaiting requested review from marc-obrien

Assignees

@jmrodri jmrodri

@camilamacedo86 camilamacedo86

@varshaprasad96 varshaprasad96

Labels
lgtm Indicates that a PR is ready to be merged. release-blocker This issue blocks the parent release milestone
Projects
None yet
Milestone
v1.22.0
Development

Successfully merging this pull request may close these issues.

Bump golang 1.17 -> 1.18
5 participants
@asmacdo @everettraven @jmrodri @camilamacedo86 @varshaprasad96