[release-4.19] OCPBUGS-62003: Machine-config controller should actively manage cordon while draining

[djoshy]

Manual cherry-pick of #5281

/cherry-pick release-4.18

[openshift-ci-robot]

@djoshy: This pull request references Jira Issue OCPBUGS-62003, which is valid. The bug has been moved to the POST state.

7 validation(s) were run on this bug

• bug is open, matching expected state (open)
• bug target version (4.19.z) matches configured target version for branch (4.19.z)
• bug is in the state New, which is one of the valid states (NEW, ASSIGNED, POST)
• release note text is set and does not match the template
• dependent bug Jira Issue OCPBUGS-61516 is in the state Verified, which is one of the valid states (VERIFIED, RELEASE PENDING, CLOSED (ERRATA), CLOSED (CURRENT RELEASE), CLOSED (DONE), CLOSED (DONE-ERRATA))
• dependent Jira Issue OCPBUGS-61516 targets the "4.20.0" version, which is one of the valid target versions: 4.20.0
• bug has dependents

Requesting review from QA contact:
/cc @sergiordlr

The bug has been updated to refer to the pull request using the external bug tracker.

In response to this:

Manual cherry-pick of #5281

/cherry-pick release-4.18

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 openshift-eng/jira-lifecycle-plugin repository.

[isabella-janssen]

/lgtm
/label backport-risk-assessed

Looks like a clean backport!

[openshift-ci]

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: djoshy, isabella-janssen

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:

• OWNERS [djoshy,isabella-janssen]

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

[djoshy]

/cherry-pick release-4.18

/retest-required

[openshift-cherrypick-robot]

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

In response to this:

/cherry-pick release-4.18

/retest-required

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-sigs/prow repository.

[djoshy]

/test all

[ptalgulk01]

/verified later by @ptalgulk01

[openshift-ci-robot]

@ptalgulk01: Only users can be targets for the /verified later command.

In response to this:

/verified later by @ptalgulk01

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 openshift-eng/jira-lifecycle-plugin repository.

[djoshy]

/retest-required

[djoshy]

/verified later @ptalgulk01

[openshift-ci-robot]

@djoshy: This PR has been marked to be verified later by @ptalgulk01.

In response to this:

/verified later @ptalgulk01

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 openshift-eng/jira-lifecycle-plugin repository.

[openshift-ci-robot]

/retest-required

Remaining retests: 0 against base HEAD ca1d6fa and 2 for PR HEAD 2e999ed in total

[openshift-ci]

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

Test name	Commit	Details	Required	Rerun command
ci/prow/bootstrap-unit	2e999ed	link	false	/test bootstrap-unit
ci/prow/e2e-gcp-mco-disruptive	2e999ed	link	false	/test e2e-gcp-mco-disruptive
ci/prow/e2e-aws-mco-disruptive	2e999ed	link	false	/test e2e-aws-mco-disruptive
ci/prow/e2e-azure-ovn-upgrade-out-of-change	2e999ed	link	false	/test e2e-azure-ovn-upgrade-out-of-change

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

[djoshy]

/retest-required

[openshift-ci-robot]

@djoshy: Jira Issue OCPBUGS-62003: All pull requests linked via external trackers have merged:

• openshift/machine-config-operator#5300

This pull request has the verified-later tag and will need to be manually moved to VERIFIED after testing. Jira Issue OCPBUGS-62003 has been moved to the MODIFIED state.

In response to this:

Manual cherry-pick of #5281

/cherry-pick release-4.18

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 openshift-eng/jira-lifecycle-plugin repository.

[openshift-cherrypick-robot]

@djoshy: #5300 failed to apply on top of branch "release-4.18":

Applying: drain: re-cordon nodes if needed
Using index info to reconstruct a base tree...
M	pkg/controller/drain/drain_controller.go
Falling back to patching base and 3-way merge...
Auto-merging pkg/controller/drain/drain_controller.go
CONFLICT (content): Merge conflict in pkg/controller/drain/drain_controller.go
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config advice.mergeConflict false"
Patch failed at 0001 drain: re-cordon nodes if needed

In response to this:

/cherry-pick release-4.18

/retest-required

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-sigs/prow repository.