Skip to content

vendor: Bump openshift/api for targeted edge blocking#680

Merged
openshift-merge-robot merged 1 commit intoopenshift:masterfrom
wking:targeted-edge-blocking-version-bump
Oct 21, 2021
Merged

vendor: Bump openshift/api for targeted edge blocking#680
openshift-merge-robot merged 1 commit intoopenshift:masterfrom
wking:targeted-edge-blocking-version-bump

Conversation

@wking
Copy link
Copy Markdown
Member

@wking wking commented Oct 20, 2021

Pulling in openshift/api#1011. Pulling out of #663 to get the CRD in place while I work out the CVO handling. Having the CRD in place makes things like oc testing easier, because you can scale down the CVO and then manipulate the ClusterVersion resource directly.

Generated with:

 $ go get github.com/openshift/api@00988ef88ee072cf39fda7558c44737e8ff2b71d
...
go get: upgraded github.com/google/go-cmp v0.5.2 => v0.5.5
go get: upgraded github.com/openshift/api v0.0.0-20210517065120-b325f58df679 => v0.0.0-20210923172539-00988ef88ee0
go get: upgraded golang.org/x/net v0.0.0-20210224082022-3d97a244fca7 => v0.0.0-20210520170846-37e1c6afe023
go get: upgraded k8s.io/api v0.21.1 => v0.22.1
go get: upgraded k8s.io/apimachinery v0.21.1 => v0.22.1
go get: upgraded k8s.io/klog/v2 v2.8.0 => v2.9.0

And because splitting Kube components between 0.21 and 0.22 leads to function-signature mismatches, move everything else to 0.22 too:

$ sed -i 's/v0.21.1/v0.22.1/' go.mod

Then update the vendor directory and stage for commit:

$ go mod vendor
$ go mod tidy
$ git add -A go.* vendor

Pulling in [1].  Generated with:

 $ go get github.com/openshift/api@00988ef88ee072cf39fda7558c44737e8ff2b71d
  ...
  go get: upgraded github.com/google/go-cmp v0.5.2 => v0.5.5
  go get: upgraded github.com/openshift/api v0.0.0-20210517065120-b325f58df679 => v0.0.0-20210923172539-00988ef88ee0
  go get: upgraded golang.org/x/net v0.0.0-20210224082022-3d97a244fca7 => v0.0.0-20210520170846-37e1c6afe023
  go get: upgraded k8s.io/api v0.21.1 => v0.22.1
  go get: upgraded k8s.io/apimachinery v0.21.1 => v0.22.1
  go get: upgraded k8s.io/klog/v2 v2.8.0 => v2.9.0

And because splitting Kube components between 0.21 and 0.22 leads to
function-signature mismatches, move everything else to 0.22 too:

  $ sed -i 's/v0.21.1/v0.22.1/' go.mod

Then update the vendor directory and stage for commit:

  $ go mod vendor
  $ go mod tidy
  $ git add -A go.* vendor

[1]: openshift/api#1011
@openshift-ci openshift-ci Bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Oct 20, 2021
Copy link
Copy Markdown
Member

@LalatenduMohanty LalatenduMohanty 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 21, 2021
@openshift-ci
Copy link
Copy Markdown
Contributor

openshift-ci Bot commented Oct 21, 2021

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: LalatenduMohanty, wking

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 [LalatenduMohanty,wking]

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

@openshift-bot
Copy link
Copy Markdown
Contributor

/retest-required

Please review the full test history for this PR and help us cut down flakes.

1 similar comment
@openshift-bot
Copy link
Copy Markdown
Contributor

/retest-required

Please review the full test history for this PR and help us cut down flakes.

@openshift-merge-robot openshift-merge-robot merged commit a78bd0d into openshift:master Oct 21, 2021
@wking wking deleted the targeted-edge-blocking-version-bump branch October 22, 2021 03:42
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.

4 participants