Bug 1914066: Sync to upstream 1-26

[pliurh]

No description provided.

[openshift-ci-robot]

@pliurh: This pull request references Bugzilla bug 1914066, which is invalid:

• expected the bug to target the "4.7.0" release, but it targets "4.8.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 1914066: Sync to upstream 1-26

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.

[pliurh]

/bugzilla refresh

[openshift-ci-robot]

@pliurh: This pull request references Bugzilla bug 1914066, which is valid. The bug has been moved to the POST state. 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.7.0) matches configured target release for branch (4.7.0)
• bug is in the state ASSIGNED, which is one of the valid states (NEW, ASSIGNED, ON_DEV, POST, POST)

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.

[zshi-redhat]

@pliurh looks like some of these commits were already backported?

[pliurh]

@pliurh looks like some of these commits were already backported?

I don't know why github lists those commits in this PR. Here's what I can see from my local branch.

# git log --pretty=oneline
261a74ac7ca27768fae267e6975c19fcf3e79b8d (HEAD -> sync, pliurh/sync) Merge branch 'upstream' into sync
ce45f3ccc8e170962f1329b322084528fa7f94fd (npwg/master, upstream) Merge pull request #51 from moshe010/fix_deploy_k8s
7253cae8abd1b282c7f4e123791efc8bd42fa985 add CLUSTER_TYPE=kubernetes to deploy-setup-k8s
4beb329db0b9a9e0aabfe7c1342d40043fb9114d Merge pull request #47 from zshi-redhat/sriov-plugin-node-affinity
4b0bafaa0addf43dddf05f52c650d77e6d6da5e7 nodeAffinity is not correctly updated with DeepDerivative
ed21518f97b5599657339bf00d7ee4bade0ef406 Merge pull request #46 from Mmduh-483/link-type-selector
03736fd9e97b12cca9d74ce5d187f2afc52b4822 Generate device plugin LinkType selector from NodePolicy LinkType
34219822e5425e970a26bdf4278150f63a3f0c1d (origin/release-4.8, origin/release-4.7, origin/master, origin/HEAD, pkg/daemon/daemon.go) Merge pull request #462 from openshift-bot/art-consistency-openshift-4.7-sriov-network-config-daemon

[zshi-redhat]

@pliurh looks like some of these commits were already backported?

I don't know why github lists those commits in this PR. Here's what I can see from my local branch.

# git log --pretty=oneline
261a74ac7ca27768fae267e6975c19fcf3e79b8d (HEAD -> sync, pliurh/sync) Merge branch 'upstream' into sync
ce45f3ccc8e170962f1329b322084528fa7f94fd (npwg/master, upstream) Merge pull request #51 from moshe010/fix_deploy_k8s
7253cae8abd1b282c7f4e123791efc8bd42fa985 add CLUSTER_TYPE=kubernetes to deploy-setup-k8s
4beb329db0b9a9e0aabfe7c1342d40043fb9114d Merge pull request #47 from zshi-redhat/sriov-plugin-node-affinity
4b0bafaa0addf43dddf05f52c650d77e6d6da5e7 nodeAffinity is not correctly updated with DeepDerivative
ed21518f97b5599657339bf00d7ee4bade0ef406 Merge pull request #46 from Mmduh-483/link-type-selector
03736fd9e97b12cca9d74ce5d187f2afc52b4822 Generate device plugin LinkType selector from NodePolicy LinkType
34219822e5425e970a26bdf4278150f63a3f0c1d (origin/release-4.8, origin/release-4.7, origin/master, origin/HEAD, pkg/daemon/daemon.go) Merge pull request #462 from openshift-bot/art-consistency-openshift-4.7-sriov-network-config-daemon

I have to use cherry-pick instead of merge to get clean backport: #465

[pliurh]

The problem with using cherry-pick is that the id of the commits will be changed.

[zshi-redhat]

/lgtm

[openshift-ci-robot]

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: pliurh, zshi-redhat

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 [pliurh,zshi-redhat]

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

[openshift-ci-robot]

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

• openshift/sriov-network-operator#464

Bugzilla bug 1914066 has been moved to the MODIFIED state.

In response to this:

Bug 1914066: Sync to upstream 1-26

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.