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 1763695: [release-4.2] pkg/daemon: drain before applying changes #1194

Merged
merged 1 commit into from
Jan 9, 2020

Conversation

runcom
Copy link
Member

@runcom runcom commented Oct 20, 2019

backport of #1200

Signed-off-by: Antonio Murdaca [email protected]

@openshift-ci-robot
Copy link
Contributor

@runcom: No Bugzilla bug is referenced in the title of this pull request.
To reference a bug, add 'Bug XXX:' to the title of this pull request and request another bug refresh with /bugzilla refresh.

In response to this:

pkg/daemon: drain before applying changes

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 size/M Denotes a PR that changes 30-99 lines, ignoring generated files. label Oct 20, 2019
@openshift-ci-robot openshift-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Oct 20, 2019
@cgwalters
Copy link
Member

/approve
I am not sure why we didn't do this from the very start. It seems a lot safer.
That said, I do think a longer term fix is #1190 - but that's harder (and actually would only apply to RHCOS, but we'd still want to drain classic RHEL first).

@cgwalters
Copy link
Member

Hm, is there no master equivalent of this PR?

@cgwalters
Copy link
Member

Also worth a least a summary of why we need this in the commit message - something like:

Since the MCO owns writing kubelet static pod configurations, we need to drain before attempting to change them so that e.g. the etcd-quorum-guard's PDB has a chance to operate. This would have also mitigated a bug in 4.1 to 4.2 upgrades - see #1177

@runcom runcom changed the title pkg/daemon: drain before applying changes Bug 1762536: pkg/daemon: drain before applying changes Oct 20, 2019
@openshift-ci-robot
Copy link
Contributor

@runcom: This pull request references Bugzilla bug 1762536, which is invalid:

  • expected the bug to target the "4.2.z" release, but it targets "4.3.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 1762536: pkg/daemon: drain before applying changes

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 Oct 20, 2019
@runcom runcom added do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. and removed do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. labels Oct 20, 2019
@openshift-ci-robot
Copy link
Contributor

@runcom: This pull request references Bugzilla bug 1762536, which is invalid:

  • expected the bug to target the "4.2.z" release, but it targets "4.3.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 1762536: pkg/daemon: drain before applying changes

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.

@runcom runcom changed the title Bug 1762536: pkg/daemon: drain before applying changes Bug 1763695: [release-4.2] pkg/daemon: drain before applying changes Oct 21, 2019
@openshift-ci-robot
Copy link
Contributor

@runcom: This pull request references Bugzilla bug 1763695, which is invalid:

  • expected dependent Bugzilla bug 1762536 to be in one of the following states: VERIFIED, RELEASE_PENDING, CLOSED (ERRATA), but it is POST 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 1763695: [release-4.2] pkg/daemon: drain before applying changes

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.

@runcom
Copy link
Member Author

runcom commented Oct 21, 2019

/cherrypick release-4.1

4.1 BZ here: https://bugzilla.redhat.com/show_bug.cgi?id=1763696

@openshift-cherrypick-robot

@runcom: once the present PR merges, I will cherry-pick it on top of release-4.1 in a new PR and assign it to you.

In response to this:

/cherrypick release-4.1

4.1 BZ here: https://bugzilla.redhat.com/show_bug.cgi?id=1763696

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

@runcom: This pull request references Bugzilla bug 1763695, which is invalid:

  • expected dependent Bugzilla bug 1762536 to be in one of the following states: VERIFIED, RELEASE_PENDING, CLOSED (ERRATA), but it is POST 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 1763695: [release-4.2] pkg/daemon: drain before applying changes

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.

@cgwalters
Copy link
Member

/lgtm

@openshift-ci-robot openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Oct 22, 2019
@cgwalters
Copy link
Member

Does this one need to have been explicitly created as a cherry-pick of the master PR? Maybe it doesn't matter and we just need an architect to do the label dance.

@openshift-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: cgwalters, runcom

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

@runcom
Copy link
Member Author

runcom commented Oct 23, 2019

Patch manager will add the label to pick this up, we're waiting on this to let it soak a bit in master

@eparis
Copy link
Member

eparis commented Oct 25, 2019

This will not be able to merge until BZ 1762536 has been VERIFIED by QE. And after that someone runs /bugzilla refresh

@ashcrow ashcrow requested review from cgwalters and removed request for ashcrow October 25, 2019 19:54
@kikisdeliveryservice
Copy link
Contributor

/bugzilla refresh

@openshift-ci-robot
Copy link
Contributor

@kikisdeliveryservice: This pull request references Bugzilla bug 1763695, which is invalid:

  • expected dependent Bugzilla bug 1762536 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.

@kikisdeliveryservice
Copy link
Contributor

/bugzilla refresh

@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 18, 2019
@openshift-ci-robot
Copy link
Contributor

@kikisdeliveryservice: This pull request references Bugzilla bug 1763695, which is valid.

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.

@sdodson sdodson added the cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. label Dec 19, 2019
@openshift-merge-robot openshift-merge-robot merged commit 4f0e309 into openshift:release-4.2 Jan 9, 2020
@openshift-ci-robot
Copy link
Contributor

@runcom: All pull requests linked via external trackers have merged. Bugzilla bug 1763695 has been moved to the MODIFIED state.

In response to this:

Bug 1763695: [release-4.2] pkg/daemon: drain before applying changes

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-cherrypick-robot

@runcom: #1194 failed to apply on top of branch "release-4.1":

error: Failed to merge in the changes.
Using index info to reconstruct a base tree...
M	pkg/daemon/daemon.go
M	pkg/daemon/update.go
Falling back to patching base and 3-way merge...
Auto-merging pkg/daemon/update.go
CONFLICT (content): Merge conflict in pkg/daemon/update.go
Auto-merging pkg/daemon/daemon.go
CONFLICT (content): Merge conflict in pkg/daemon/daemon.go
Patch failed at 0001 pkg/daemon: drain before applying changes

In response to this:

/cherrypick release-4.1

4.1 BZ here: https://bugzilla.redhat.com/show_bug.cgi?id=1763696

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.

@kikisdeliveryservice
Copy link
Contributor

@runcom your cherry pick to 4.1 failed..

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/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. size/M Denotes a PR that changes 30-99 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

8 participants