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.

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

Bug 1886062: Backport klog v2 changes to 4.6 #391

Merged
merged 3 commits into from Jan 21, 2021
Merged

Bug 1886062: Backport klog v2 changes to 4.6 #391

merged 3 commits into from Jan 21, 2021

Conversation

abhat
Copy link
Contributor

@abhat abhat commented Dec 18, 2020

Rebased and re-vendorized after commit 4efbb59 already brought
in klog v2 into vendor.

Signed-off-by: Thomas F Herbert therbert@redhat.com
(cherry picked from commit 40ec945)

tfherbert and others added 3 commits December 18, 2020 15:01
@tfherbert @abhat
Changes klog to klog v2 consistent with upstream kubernetes.
157e6c4 
Rebased and re-vendorized after commit 4efbb59 already brought
in klog v2 into vendor.

Signed-off-by: Thomas F Herbert <therbert@redhat.com>
(cherry picked from commit 40ec945)
@abhat
Update klog -> klog/v2
c137797 
Signed-off-by: Aniket Bhat <anbhat@redhat.com>
@abhat
Bump vendor klog
905eb2f 
Signed-off-by: Aniket Bhat <anbhat@redhat.com>
@openshift-ci-robot openshift-ci-robot added the bugzilla/severity-high Referenced Bugzilla bug's severity is high for the branch this PR is targeting. label Dec 18, 2020
@openshift-ci-robot
Copy link
Contributor

@abhat: This pull request references Bugzilla bug 1886062, which is invalid:

  • expected dependent Bugzilla bug 1883461 to target a release in 4.7.0, but it targets "4.6.0" instead

Comment /bugzilla refresh to re-evaluate validity if changes to the Bugzilla bug are made, or edit the title of this pull request to link to a different bug.

In response to this:

Bug 1886062: Backport klog v2 changes to 4.6

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 openshift-ci-robot added the bugzilla/invalid-bug Indicates that a referenced Bugzilla bug is invalid for the branch this PR is targeting. label Dec 18, 2020
@openshift-ci-robot openshift-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Dec 18, 2020
@abhat
Copy link
Contributor Author

abhat commented Dec 18, 2020

/bugzilla refresh

@openshift-ci-robot
Copy link
Contributor

@abhat: This pull request references Bugzilla bug 1886062, which is invalid:

  • expected dependent Bugzilla bug 1909290 to be in one of the following states: VERIFIED, RELEASE_PENDING, CLOSED (ERRATA), but it is ON_QA instead

Comment /bugzilla refresh to re-evaluate validity if changes to the Bugzilla bug are made, or edit the title of this pull request to link to a different bug.

In response to this:

/bugzilla refresh

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.

@abhat
Copy link
Contributor Author

abhat commented Dec 18, 2020

/retest

@abhat
Copy link
Contributor Author

abhat commented Dec 22, 2020

/test e2e-vsphere-ovn
/test e2e-azure-ovn

@abhat
Copy link
Contributor Author

abhat commented Dec 22, 2020

/test e2e-vsphere-ovn

aojea
aojea reviewed Dec 23, 2020
View reviewed changes
go-controller/vendor/modules.txt
@@ -586,9 +588,11 @@ k8s.io/client-go/util/testing
k8s.io/client-go/util/workqueue
# k8s.io/klog v1.0.0
k8s.io/klog
# k8s.io/klog/v2 v2.0.0
Copy link
Contributor

Choose a reason for hiding this comment

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

🤔 why is still the klog v1.0.0 dependency there?
I think it should go away after the update, no?

Copy link
Contributor

@tfherbert tfherbert Dec 23, 2020 •
edited

Choose a reason for hiding this comment

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

No, I don't think so. Much vendor code is still using klog v1. v2 is in a subdirectory so both dependencies should co-exist.

@aojea
Copy link
Contributor

aojea commented Dec 23, 2020

/lgtm

@openshift-ci-robot openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Dec 23, 2020
@openshift-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: abhat, aojea

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

/bugzilla refresh

Recalculating validity in case the underlying Bugzilla bug has changed.

@openshift-ci-robot openshift-ci-robot added bugzilla/valid-bug Indicates that a referenced Bugzilla bug is valid for the branch this PR is targeting. and removed bugzilla/invalid-bug Indicates that a referenced Bugzilla bug is invalid for the branch this PR is targeting. labels Dec 24, 2020
@openshift-ci-robot
Copy link
Contributor

@openshift-bot: This pull request references Bugzilla bug 1886062, which is valid. The bug has been moved to the POST state.

6 validation(s) were run on this bug
  • bug is open, matching expected state (open)
  • bug target release (4.6.z) matches configured target release for branch (4.6.z)
  • bug is in the state ASSIGNED, which is one of the valid states (NEW, ASSIGNED, ON_DEV, POST, POST)
  • dependent bug Bugzilla bug 1909290 is in the state VERIFIED, which is one of the valid states (VERIFIED, RELEASE_PENDING, CLOSED (ERRATA))
  • dependent Bugzilla bug 1909290 targets the "4.7.0" release, which is one of the valid target releases: 4.7.0
  • bug has dependents

In response to this:

/bugzilla refresh

Recalculating validity in case the underlying Bugzilla bug has changed.

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.

@russellb russellb added cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. and removed cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. labels Jan 8, 2021
@russellb
Copy link
Member

russellb commented Jan 8, 2021

(patch manager) 4.6 blocker identified, so pulling unmerged patches from the queue

@openshift-bot
Copy link
Contributor

/retest

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

3 similar comments
@openshift-bot
Copy link
Contributor

/retest

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

@openshift-bot
Copy link
Contributor

/retest

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

@openshift-bot
Copy link
Contributor

/retest

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

@openshift-bot
Copy link
Contributor

/retest

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

10 similar comments
@openshift-bot
Copy link
Contributor

/retest

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

@openshift-bot
Copy link
Contributor

/retest

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

@openshift-bot
Copy link
Contributor

/retest

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

@openshift-bot
Copy link
Contributor

/retest

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

@openshift-bot
Copy link
Contributor

/retest

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

@openshift-bot
Copy link
Contributor

/retest

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

@openshift-bot
Copy link
Contributor

/retest

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

@openshift-bot
Copy link
Contributor

/retest

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

@openshift-bot
Copy link
Contributor

/retest

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

@openshift-bot
Copy link
Contributor

/retest

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

@tfherbert
Copy link
Contributor

What is the status of this backport to 4.6? Can it be merged yet?
The bugzilla 1886062 has a needinfo flag.

@crawford crawford added the cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. label Jan 21, 2021
@openshift-merge-robot openshift-merge-robot merged commit bccb84c into openshift:release-4.6 Jan 21, 2021
@openshift-ci-robot
Copy link
Contributor

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

Bugzilla bug 1886062 has been moved to the MODIFIED state.

In response to this:

Bug 1886062: Backport klog v2 changes to 4.6

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
Reviewers

@aojea aojea aojea left review comments

@tfherbert tfherbert tfherbert left review comments

@dcbw dcbw Awaiting requested review from dcbw

Assignees

@aojea aojea

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. 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. cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. lgtm Indicates that a PR is ready to be merged.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
8 participants
@abhat @openshift-ci-robot @aojea @openshift-bot @russellb @tfherbert @crawford @openshift-merge-robot