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 2021151: Sync master 27 12 21 #610

Merged
merged 3 commits into from
Dec 27, 2021

Conversation

SchSeba
Copy link
Contributor

@SchSeba SchSeba commented Dec 27, 2021

No description provided.

SchSeba and others added 3 commits December 27, 2021 16:41
This commit allow to still pause the MCP when running on OCP.
This is needed when you have only 1 node in the cluster and the drainSkip is true

Signed-off-by: Sebastian Sch <sebassch@gmail.com>
Signed-off-by: Sebastian Sch <sebassch@gmail.com>
Signed-off-by: Zenghui Shi <zshi@redhat.com>
@openshift-ci openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Dec 27, 2021
@SchSeba SchSeba changed the title Sync master 27 12 21 Bug 2021151: Sync master 27 12 21 Dec 27, 2021
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Dec 27, 2021

@SchSeba: This pull request references Bugzilla bug 2021151, 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.10.0) matches configured target release for branch (4.10.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 @zhaozhanqi

In response to this:

Bug 2021151: Sync master 27 12 21

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 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. labels Dec 27, 2021
@pliurh
Copy link
Contributor

pliurh commented Dec 27, 2021

/lgtm

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Dec 27, 2021
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Dec 27, 2021

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: pliurh, SchSeba

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

openshift-ci bot commented Dec 27, 2021

@SchSeba: all tests passed!

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-merge-robot openshift-merge-robot merged commit a8f01b0 into openshift:master Dec 27, 2021
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Dec 27, 2021

@SchSeba: Some pull requests linked via external trackers have merged:

The following pull requests linked via external trackers have not merged:

These pull request must merge or be unlinked from the Bugzilla bug in order for it to move to the next state. Once unlinked, request a bug refresh with /bugzilla refresh.

Bugzilla bug 2021151 has not been moved to the MODIFIED state.

In response to this:

Bug 2021151: Sync master 27 12 21

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.

@SchSeba
Copy link
Contributor Author

SchSeba commented Jan 30, 2022

/cherry-pick release-4.9

@openshift-cherrypick-robot

@SchSeba: #610 failed to apply on top of branch "release-4.9":

Applying: Support pause MCP on SNO
Applying: Add the DisableDrain when running one a single node
Applying: Add switchdev-after-networkmanager services to k8s plugin
error: mode change for bindata/manifests/switchdev-config/files/switchdev-configuration-after-NM.sh.yaml, which is not in current HEAD
error: could not build fake ancestor
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0003 Add switchdev-after-networkmanager services to k8s plugin
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

In response to this:

/cherry-pick release-4.9

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.

zeeke pushed a commit to zeeke/sriov-network-operator that referenced this pull request Feb 8, 2024
openstack: Fix `nil` HostManager in `openstackContext`
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-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. lgtm Indicates that a PR is ready to be merged.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants