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

Bug 1986437: Bump github.com/openshift/api #2685

Merged
merged 2 commits into from Aug 14, 2021

Conversation

Fedosin
Copy link
Contributor

@Fedosin Fedosin commented Jul 20, 2021

This change includes an important update for ExternalCloudProvider feature gate: openshift/api#961

Generated by go get -u github.com/openshift/api + go mod vendor

@elmiko
Copy link
Contributor

elmiko commented Jul 20, 2021

+1, this is needed to help the external cloud controller manager effort

@sinnykumari
Copy link
Contributor

You need to update openshift/api version at https://github.com/openshift/machine-config-operator/blob/master/go.mod#L70

Q. There seems to be lot of deps update, are they all result of just updating openshift/api to 20210720160326-96bb0f993a66 ?

@Fedosin
Copy link
Contributor Author

Fedosin commented Jul 21, 2021

/retest

@Fedosin
Copy link
Contributor Author

Fedosin commented Jul 21, 2021

@sinnykumari unfortunately now one of our dependencies is broken (klog) For more information: kubernetes/klog#253
So, this PR does two things: first it fixes the issue with klog, and then bumps openshift/api. For clarity I can split this PR into two commits.

@Fedosin
Copy link
Contributor Author

Fedosin commented Jul 21, 2021

Without additional changes it looks like this:

❯ go get -u github.com/openshift/api
# k8s.io/klog/v2
../../go/pkg/mod/k8s.io/klog/v2@v2.10.0/klog.go:705:10: invalid operation: logr != nil (mismatched types logr.Logger and nil)
../../go/pkg/mod/k8s.io/klog/v2@v2.10.0/klog.go:724:10: invalid operation: logr != nil (mismatched types logr.Logger and nil)
../../go/pkg/mod/k8s.io/klog/v2@v2.10.0/klog.go:742:10: invalid operation: logr != nil (mismatched types logr.Logger and nil)
../../go/pkg/mod/k8s.io/klog/v2@v2.10.0/klog.go:763:10: invalid operation: logr != nil (mismatched types logr.Logger and nil)
../../go/pkg/mod/k8s.io/klog/v2@v2.10.0/klog.go:782:11: invalid operation: loggr != nil (mismatched types logr.Logger and nil)
../../go/pkg/mod/k8s.io/klog/v2@v2.10.0/klog.go:783:3: undefined: logr.WithCallDepth
../../go/pkg/mod/k8s.io/klog/v2@v2.10.0/klog.go:794:11: invalid operation: loggr != nil (mismatched types logr.Logger and nil)
../../go/pkg/mod/k8s.io/klog/v2@v2.10.0/klog.go:795:3: undefined: logr.WithCallDepth
../../go/pkg/mod/k8s.io/klog/v2@v2.10.0/klog.go:915:9: invalid operation: log != nil (mismatched types logr.Logger and nil)
../../go/pkg/mod/k8s.io/klog/v2@v2.10.0/klog.go:919:4: undefined: logr.WithCallDepth
../../go/pkg/mod/k8s.io/klog/v2@v2.10.0/klog.go:919:4: too many errors

@sinnykumari
Copy link
Contributor

@sinnykumari unfortunately now one of our dependencies is broken (klog) For more information: kubernetes/klog#253
So, this PR does two things: first it fixes the issue with klog, and then bumps openshift/api. For clarity I can split this PR into two commits.

yes, splitting the commit makes more sense here.

@kikisdeliveryservice
Copy link
Contributor

/test e2e-metal-ipi
/test e2e-ovn-step-registry

@kikisdeliveryservice
Copy link
Contributor

kikisdeliveryservice commented Jul 22, 2021

Q: do we have anything tracking: kubernetes/klog#242 to remove that commit once that pr merges?

@kikisdeliveryservice
Copy link
Contributor

/test e2e-ovn-step-registry
/test e2e-aws-upgrade-single-node

@sinnykumari
Copy link
Contributor

In go.mod, you haven't updated replace section with updated versions of deps and as a result vendor file for deps like openshift/api, k8s.io/api, etc has not been pulled in. You would want to update deps mentioned in replace section so that it doesn't replace back to old one.

@openshift-ci openshift-ci bot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Jul 25, 2021
@openshift-ci openshift-ci bot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Jul 27, 2021
@Fedosin Fedosin changed the title Bump github.com/openshift/api Bug 1986437: Bump github.com/openshift/api Jul 27, 2021
@openshift-ci openshift-ci bot added the bugzilla/severity-medium Referenced Bugzilla bug's severity is medium for the branch this PR is targeting. label Jul 27, 2021
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Jul 27, 2021

@Fedosin: This pull request references Bugzilla bug 1986437, 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.9.0) matches configured target release for branch (4.9.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

In response to this:

Bug 1986437: Bump github.com/openshift/api

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 openshift-ci bot added the bugzilla/valid-bug Indicates that a referenced Bugzilla bug is valid for the branch this PR is targeting. label Jul 27, 2021
@openshift-ci openshift-ci bot requested a review from sunzhaohua2 July 27, 2021 14:52
@sinnykumari
Copy link
Contributor

I think you are getting confused when updating replace section. You should only update deps version in replace section of go.mod that actually has corresponding changes in this PR in require section of go.mod. See https://golang.org/ref/mod#go-mod-file-replace

go.mod Outdated Show resolved Hide resolved
Now we can't bump any dependency because of the issue in klog:
kubernetes/klog#253

To workaround it's recommended to replace github.com/go-logr/logr
in go.mod until the fix is released.
This change includes an important update for ExternalCloudProvider
feature gate: openshift/api#961
Copy link
Contributor

@JoelSpeed JoelSpeed left a comment

Choose a reason for hiding this comment

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

Go mod changes LGTM now, thanks @Fedosin
/lgtm

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Aug 12, 2021

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: Fedosin, JoelSpeed, sinnykumari

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 the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Aug 12, 2021
@openshift-bot
Copy link
Contributor

/retest-required

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

10 similar comments
@openshift-bot
Copy link
Contributor

/retest-required

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

@openshift-bot
Copy link
Contributor

/retest-required

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

@openshift-bot
Copy link
Contributor

/retest-required

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

@openshift-bot
Copy link
Contributor

/retest-required

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

@openshift-bot
Copy link
Contributor

/retest-required

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

@openshift-bot
Copy link
Contributor

/retest-required

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

@openshift-bot
Copy link
Contributor

/retest-required

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

@openshift-bot
Copy link
Contributor

/retest-required

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

@openshift-bot
Copy link
Contributor

/retest-required

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

@openshift-bot
Copy link
Contributor

/retest-required

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

@Fedosin
Copy link
Contributor Author

Fedosin commented Aug 12, 2021

/retest-required

@openshift-bot
Copy link
Contributor

/retest-required

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

10 similar comments
@openshift-bot
Copy link
Contributor

/retest-required

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

@openshift-bot
Copy link
Contributor

/retest-required

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

@openshift-bot
Copy link
Contributor

/retest-required

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

@openshift-bot
Copy link
Contributor

/retest-required

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

@openshift-bot
Copy link
Contributor

/retest-required

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

@openshift-bot
Copy link
Contributor

/retest-required

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

@openshift-bot
Copy link
Contributor

/retest-required

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

@openshift-bot
Copy link
Contributor

/retest-required

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

@openshift-bot
Copy link
Contributor

/retest-required

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

@openshift-bot
Copy link
Contributor

/retest-required

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

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Aug 14, 2021

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

Test name Commit Details Rerun command
ci/prow/e2e-aws-techpreview-featuregate ef46748 link /test e2e-aws-techpreview-featuregate
ci/prow/e2e-aws-workers-rhel7 ef46748 link /test e2e-aws-workers-rhel7
ci/prow/e2e-ovn-step-registry ef46748 link /test e2e-ovn-step-registry
ci/prow/e2e-aws-disruptive ef46748 link /test e2e-aws-disruptive
ci/prow/e2e-aws-upgrade-single-node ef46748 link /test e2e-aws-upgrade-single-node

Full PR test history. Your PR dashboard.

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

@openshift-bot
Copy link
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
Contributor

/retest-required

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

@openshift-ci openshift-ci bot merged commit ff908d9 into openshift:master Aug 14, 2021
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Aug 14, 2021

@Fedosin: All pull requests linked via external trackers have merged:

Bugzilla bug 1986437 has been moved to the MODIFIED state.

In response to this:

Bug 1986437: Bump github.com/openshift/api

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.

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. bugzilla/severity-medium Referenced Bugzilla bug's severity is medium 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. 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

7 participants