Bug 1948719: update k8s dependencies to 1.21 #209

elmiko · 2021-04-16T19:17:31Z

This change updates the go.mod and related vendor files to the
kubernetes 1.21 baseline. This was achieved by updating some of the
entries in go.mod and then running make vendor.

The updates to go.mod were as follows:

github.com/openshift/machine-api-operator master

Then ran make vendor to produce output.

openshift-ci-robot · 2021-04-16T19:17:36Z

@elmiko: This pull request references Bugzilla bug 1948719, which is valid. The bug has been updated to refer to the pull request using the external bug tracker.

3 validation(s) were run on this bug

bug is open, matching expected state (open)
bug target release (4.8.0) matches configured target release for branch (4.8.0)
bug is in the state POST, which is one of the valid states (NEW, ASSIGNED, ON_DEV, POST, POST)

Requesting review from QA contact:
/cc @sunzhaohua2

Details

In response to this:

Bug 1948719: update k8s dependencies to 1.21

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.

elmiko · 2021-04-16T19:23:02Z

govet is failing here, but passing locally. not quite sure why
/test govet

JoelSpeed · 2021-04-19T13:09:42Z

This is broken due to the Azure/AWS dependencies being out of date, these will need updating too

elmiko · 2021-04-20T19:05:16Z

i re-updated the vendor here, but i think that was premature. we need to wait for openshift/cluster-api-provider-azure#214 and openshift/cluster-api-provider-gcp#159 to merge, then re-vendor here. iiuc
/hold

lobziik · 2021-04-21T12:20:24Z

Also bunch of fixes needed due to runtime client changes :(

p.s. https://paste.centos.org/view/3c5e736c - patch

elmiko · 2021-04-21T13:02:14Z

thanks @lobziik! when the other PRs merge and i update this, i will add the changes from your patch.

elmiko · 2021-04-22T20:16:54Z

updated

re-vendored with newly merged changes from dependencies
added fixes for runtime.Object -> runtimeclient.Object
removed unused function DeleteObjectsByLabels

elmiko · 2021-04-22T20:39:12Z

minor fixup for go vet errors, also reflowed the commits to make it easier to fix

elmiko · 2021-04-23T13:11:41Z

/retest

JoelSpeed · 2021-04-27T09:19:59Z

/approve

Dependencies have been updated, no longer need the hold
/hold cancel

/retest

lobziik · 2021-04-27T09:21:59Z

/lgtm

openshift-ci-robot · 2021-04-27T09:32:40Z

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: JoelSpeed

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:

~~OWNERS~~ [JoelSpeed]

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

JoelSpeed · 2021-05-12T16:09:36Z

@elmiko The dependent PR has merged, could you try updating the MAO dependency here with the latest changes and see if it passes the tests? Feel free to hold cancel once you've pushed the changes

elmiko · 2021-05-12T16:11:27Z

thanks @JoelSpeed , i missed that other dep. i will update shortly.

This change updates the go.mod and related vendor files to the kubernetes 1.21 baseline. This was achieved by updating some of the entries in go.mod and then running make vendor. The updates to go.mod were as follows: ``` github.com/openshift/api master github.com/openshift/cluster-autoscaler-operator master github.com/openshift/cluster-api-provider-gcp master github.com/openshift/machine-api-operator master replace sigs.k8s.io/cluster-api-provider-aws => github.com/openshift/cluster-api-provider-aws master replace sigs.k8s.io/cluster-api-provider-azure => github.com/openshift/cluster-api-provider-azure master ``` Then ran `make vendor` to produce output.

@lobziik

This function had errors after the dependency update and is no longer used in the tests. thanks to @lobziik for the patch

@lobziik

This change adds a few fixes that are needed for the dependency update. They are mostly changing `runtime.Object` references into `runtimeclient.Object`. thanks to @lobziik for the patch

elmiko · 2021-05-12T16:35:41Z

updated

revendored from other mao deps again

given that this change set now includes the updates that were added in #211, i am going to change that PR so we don't have duplicates.

openshift-ci · 2021-05-12T16:37:03Z

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: JoelSpeed

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:

~~OWNERS~~ [JoelSpeed]

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

JoelSpeed · 2021-05-12T16:38:15Z

/lgtm
/hold cancel

this brings the version past the 0.9.0-alpha

JoelSpeed · 2021-05-13T09:04:59Z

/lgtm
/retest

JoelSpeed · 2021-05-13T12:12:39Z

/retest

openshift-ci · 2021-05-13T14:55:12Z

@elmiko: Some pull requests linked via external trackers have merged:

The following pull requests linked via external trackers have not merged:

openshift/cluster-api-provider-aws#408 is open

These pull request must merge or be unlinked from the Bugzilla bug in order for it to move to the next state. Once unlinked, request a bug refresh with /bugzilla refresh.

Bugzilla bug 1948719 has not been moved to the MODIFIED state.

Details

In response to this:

Bug 1948719: update k8s dependencies to 1.21

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-ci-robot added bugzilla/severity-high Referenced Bugzilla bug's severity is high for the branch this PR is targeting. bugzilla/valid-bug Indicates that a referenced Bugzilla bug is valid for the branch this PR is targeting. labels Apr 16, 2021

openshift-ci-robot requested review from JoelSpeed, alexander-demicev and sunzhaohua2 April 16, 2021 19:17

This was referenced Apr 20, 2021

Bug 1948719: update dependencies to 1.21 openshift/cluster-api-provider-aws#399

Merged

Bug 1948719: update dependencies to 1.21 openshift/cluster-machine-approver#115

Merged

elmiko force-pushed the bz1948719-1.21deps branch from ea53a63 to d6c8fb9 Compare April 20, 2021 19:00

openshift-ci-robot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Apr 20, 2021

openshift-ci-robot mentioned this pull request Apr 21, 2021

Bug 1948719: update makefile to ensure that CGO_ENABLE is set properly openshift/cluster-api-provider-aws#401

Merged

This was referenced Apr 21, 2021

Bug 1948719: update k8s dependencies to 1.21 openshift/cluster-api-provider-gcp#159

Merged

Bug 1948719: update k8s dependencies to 1.21 openshift/cluster-api-provider-azure#214

Merged

elmiko force-pushed the bz1948719-1.21deps branch from d6c8fb9 to af19bb1 Compare April 22, 2021 20:16

elmiko force-pushed the bz1948719-1.21deps branch from af19bb1 to 5ee52f4 Compare April 22, 2021 20:38

openshift-ci-robot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Apr 27, 2021

openshift-ci-robot assigned lobziik Apr 27, 2021

openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Apr 27, 2021

openshift-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Apr 27, 2021

openshift-ci bot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label May 7, 2021

elmiko added 3 commits May 12, 2021 12:27

remove unused function DeleteObjectsByLabels

395eff3

This function had errors after the dependency update and is no longer used in the tests. thanks to @lobziik for the patch

fixups for k8s 1.21 dependency update

d9491e6

This change adds a few fixes that are needed for the dependency update. They are mostly changing `runtime.Object` references into `runtimeclient.Object`. thanks to @lobziik for the patch

elmiko force-pushed the bz1948719-1.21deps branch from 5ee52f4 to d9491e6 Compare May 12, 2021 16:34

openshift-ci bot removed the lgtm Indicates that a PR is ready to be merged. label May 12, 2021

elmiko mentioned this pull request May 12, 2021

Bug 1954177: revert pending webhook tests #211

Merged

openshift-ci bot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label May 12, 2021

openshift-ci bot assigned JoelSpeed May 12, 2021

openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label May 12, 2021

update vendor for controller-runtime

1c147c3

this brings the version past the 0.9.0-alpha

openshift-ci bot removed the lgtm Indicates that a PR is ready to be merged. label May 12, 2021

openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label May 13, 2021

openshift-ci bot mentioned this pull request May 13, 2021

Bug 1948719: update controller-runtime dependency openshift/cluster-api-provider-azure#217

Merged

openshift-merge-robot merged commit 43e5219 into openshift:master May 13, 2021

elmiko deleted the bz1948719-1.21deps branch May 13, 2021 15:15

Bug 1948719: update k8s dependencies to 1.21 #209

Bug 1948719: update k8s dependencies to 1.21 #209

Uh oh!

Conversation

elmiko commented Apr 16, 2021

Uh oh!

openshift-ci-robot commented Apr 16, 2021

Uh oh!

elmiko commented Apr 16, 2021 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

JoelSpeed commented Apr 19, 2021

Uh oh!

elmiko commented Apr 20, 2021

Uh oh!

lobziik commented Apr 21, 2021 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

elmiko commented Apr 21, 2021

Uh oh!

elmiko commented Apr 22, 2021

Uh oh!

elmiko commented Apr 22, 2021

Uh oh!

elmiko commented Apr 23, 2021

Uh oh!

JoelSpeed commented Apr 27, 2021

Uh oh!

lobziik commented Apr 27, 2021

Uh oh!

openshift-ci-robot commented Apr 27, 2021

Uh oh!

JoelSpeed commented May 12, 2021

Uh oh!

elmiko commented May 12, 2021

Uh oh!

elmiko commented May 12, 2021 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

openshift-ci bot commented May 12, 2021

Uh oh!

JoelSpeed commented May 12, 2021

Uh oh!

JoelSpeed commented May 13, 2021

Uh oh!

JoelSpeed commented May 13, 2021

Uh oh!

openshift-ci bot commented May 13, 2021

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

6 participants

elmiko commented Apr 16, 2021 •

edited

Loading

lobziik commented Apr 21, 2021 •

edited

Loading

elmiko commented May 12, 2021 •

edited

Loading