Skip to content

CORS-3601: Bump api, client-go, library-go for k8s 1.31#9067

Merged
openshift-merge-bot[bot] merged 3 commits intoopenshift:masterfrom
jcpowermac:bump-to-k8s-131
Oct 4, 2024
Merged

CORS-3601: Bump api, client-go, library-go for k8s 1.31#9067
openshift-merge-bot[bot] merged 3 commits intoopenshift:masterfrom
jcpowermac:bump-to-k8s-131

Conversation

@jcpowermac
Copy link
Copy Markdown
Contributor

@jcpowermac jcpowermac commented Oct 2, 2024

go get github.com/openshift/client-go@master
go get github.com/openshift/machine-api-operator@master
go get sigs.k8s.io/controller-runtime@v0.19.0

go mod tidy;go mod vendor;go mod verify

@jcpowermac
Copy link
Copy Markdown
Contributor Author

If anyone needs api changes for 4.18 they will run into issues since pkgs have been updated

example

 vendor/sigs.k8s.io/controller-runtime/pkg/webhook/admission/webhook.go:158:9: not enough arguments in call to fn
	have (interface{})
	want (context.Context, interface{})
# sigs.k8s.io/controller-runtime/pkg/internal/controller
vendor/sigs.k8s.io/controller-runtime/pkg/internal/controller/controller.go:103:9: not enough arguments in call to fn
	have (interface{})
	want (context.Context, interface{}) 

@openshift-ci openshift-ci Bot requested review from barbacbd and rwsu October 2, 2024 17:29
@jcpowermac
Copy link
Copy Markdown
Contributor Author

machine-api-operator has been recently changed as well
openshift/machine-api-operator#1292

which additionally caused an issue when using updated commits of api, client-go and library-go

@jcpowermac jcpowermac changed the title Bump api, client-go, library-go for k8s 1.31 no-jira: Bump api, client-go, library-go for k8s 1.31 Oct 3, 2024
@openshift-ci-robot
Copy link
Copy Markdown
Contributor

@jcpowermac: This pull request explicitly references no jira issue.

Details

In response to this:

go get github.com/openshift/client-go@master
go get github.com/openshift/machine-api-operator@master
go get sigs.k8s.io/controller-runtime@v0.19.0

go mod tidy;go mod vendor;go mod verify

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 openshift-eng/jira-lifecycle-plugin repository.

@openshift-ci-robot openshift-ci-robot added the jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. label Oct 3, 2024
@jcpowermac
Copy link
Copy Markdown
Contributor Author

/assign @patrickdillon @r4f4

@patrickdillon patrickdillon changed the title no-jira: Bump api, client-go, library-go for k8s 1.31 CORS-3601: Bump api, client-go, library-go for k8s 1.31 Oct 3, 2024
@openshift-ci-robot
Copy link
Copy Markdown
Contributor

openshift-ci-robot commented Oct 3, 2024

@jcpowermac: This pull request references CORS-3601 which is a valid jira issue.

Warning: The referenced jira issue has an invalid target version for the target branch this PR targets: expected the sub-task to target the "4.18.0" version, but no target version was set.

Details

In response to this:

go get github.com/openshift/client-go@master
go get github.com/openshift/machine-api-operator@master
go get sigs.k8s.io/controller-runtime@v0.19.0

go mod tidy;go mod vendor;go mod verify

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 openshift-eng/jira-lifecycle-plugin repository.

@r4f4
Copy link
Copy Markdown
Contributor

r4f4 commented Oct 3, 2024

Can you also update the k8s tools used when building capi in https://github.com/openshift/installer/blob/master/hack/build-cluster-api.sh#L8 ?

I think it's safer if we can keep them in sync.

@patrickdillon
Copy link
Copy Markdown
Contributor

/approve

@openshift-ci
Copy link
Copy Markdown
Contributor

openshift-ci Bot commented Oct 3, 2024

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: patrickdillon

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Details 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 the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Oct 3, 2024
@jcpowermac
Copy link
Copy Markdown
Contributor Author

Can you also update the k8s tools used when building capi in https://github.com/openshift/installer/blob/master/hack/build-cluster-api.sh#L8 ?

I think it's safer if we can keep them in sync.

Updated, I also tested the build local, didn't see any issues but all the tests will rerun anyways

Copy link
Copy Markdown
Contributor

@r4f4 r4f4 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 Oct 3, 2024
@jcpowermac
Copy link
Copy Markdown
Contributor Author

Took a look at the jira and noticed the note about informing hive
fyi: @2uasimojo @jstuever @lleshchi

@openshift-ci-robot
Copy link
Copy Markdown
Contributor

/retest-required

Remaining retests: 0 against base HEAD cc5c347 and 2 for PR HEAD c646b3e in total

@openshift-ci
Copy link
Copy Markdown
Contributor

openshift-ci Bot commented Oct 4, 2024

@jcpowermac: The following tests failed, say /retest to rerun all failed tests or /retest-required to rerun all mandatory failed tests:

Test name Commit Details Required Rerun command
ci/prow/e2e-metal-ipi-ovn-swapped-hosts c646b3e link false /test e2e-metal-ipi-ovn-swapped-hosts
ci/prow/e2e-external-aws-ccm c646b3e link false /test e2e-external-aws-ccm
ci/prow/e2e-vsphere-ovn-techpreview c646b3e link false /test e2e-vsphere-ovn-techpreview
ci/prow/e2e-aws-ovn-shared-vpc-custom-security-groups c646b3e link false /test e2e-aws-ovn-shared-vpc-custom-security-groups
ci/prow/e2e-azurestack c646b3e link false /test e2e-azurestack
ci/prow/e2e-aws-ovn-heterogeneous c646b3e link false /test e2e-aws-ovn-heterogeneous
ci/prow/e2e-metal-ipi-ovn c646b3e link false /test e2e-metal-ipi-ovn
ci/prow/e2e-metal-assisted c646b3e link false /test e2e-metal-assisted

Full PR test history. Your PR dashboard.

Details

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-sigs/prow repository. I understand the commands that are listed here.

@openshift-merge-bot openshift-merge-bot Bot merged commit fbfb547 into openshift:master Oct 4, 2024
@openshift-bot
Copy link
Copy Markdown
Contributor

[ART PR BUILD NOTIFIER]

Distgit: ose-installer-altinfra
This PR has been included in build ose-installer-altinfra-container-v4.18.0-202410040439.p0.gfbfb547.assembly.stream.el9.
All builds following this will include this PR.

@openshift-bot
Copy link
Copy Markdown
Contributor

[ART PR BUILD NOTIFIER]

Distgit: ose-installer-terraform-providers
This PR has been included in build ose-installer-terraform-providers-container-v4.18.0-202410040439.p0.gfbfb547.assembly.stream.el9.
All builds following this will include this PR.

@openshift-bot
Copy link
Copy Markdown
Contributor

[ART PR BUILD NOTIFIER]

Distgit: ose-baremetal-installer
This PR has been included in build ose-baremetal-installer-container-v4.18.0-202410040439.p0.gfbfb547.assembly.stream.el9.
All builds following this will include this PR.

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. jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. lgtm Indicates that a PR is ready to be merged.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants