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

Sync upstream: 2021-7-22 #545

Merged
merged 5 commits into from
Jul 22, 2021
Merged

Conversation

pliurh
Copy link
Contributor

@pliurh pliurh commented Jul 22, 2021

No description provided.

pliurh and others added 4 commits July 22, 2021 00:08
1. use json format for config file
2. split VF creation and switchdev configuration in configure-switchdev.sh
…ction

Network Resource Injector (NRI) has switches to config map to enable
optional features such as enableHugePageDownApi,
enableHonorExistingResources etc. This commit allows Operator to
create controlSwitch configmap for NRI and removes injectHugepageDownApi
from webhook-server container arguments.
@pliurh pliurh requested a review from zshi-redhat July 22, 2021 04:10
@openshift-ci openshift-ci bot requested a review from fedepaol July 22, 2021 04:11
@openshift-ci openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jul 22, 2021
@pliurh
Copy link
Contributor Author

pliurh commented Jul 22, 2021

/hold

@openshift-ci openshift-ci bot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Jul 22, 2021
@pliurh
Copy link
Contributor Author

pliurh commented Jul 22, 2021

/unhold

@openshift-ci openshift-ci bot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Jul 22, 2021
@zshi-redhat
Copy link
Contributor

/lgtm

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

openshift-ci bot commented Jul 22, 2021

[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:

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

@openshift-merge-robot openshift-merge-robot merged commit 5c2581d into openshift:master Jul 22, 2021
zeeke pushed a commit to zeeke/sriov-network-operator that referenced this pull request Nov 23, 2023
Logs `sriov-network-config-daemon` by default
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. lgtm Indicates that a PR is ready to be merged.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants