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

Makefile: remove install.cni #10803

Merged
merged 1 commit into from
Jun 29, 2021

Conversation

lsm5
Copy link
Member

@lsm5 lsm5 commented Jun 28, 2021

We no longer need to install /etc/cni/net.d/87-podman-bridge.conflist
so install.cni isn't needed either.

Signed-off-by: Lokesh Mandvekar [email protected]

@mheon @rhatdan @baude PTAL

@lsm5
Copy link
Member Author

lsm5 commented Jun 28, 2021

/assign @mheon

@rhatdan
Copy link
Member

rhatdan commented Jun 28, 2021

Looks like you need to remove it from rpm spec file as well

We no longer need to install /etc/cni/net.d/87-podman-bridge.conflist
so install.cni isn't needed either.

Signed-off-by: Lokesh Mandvekar <[email protected]>
@lsm5 lsm5 force-pushed the remove-cni-conflist branch from a050023 to 1edada4 Compare June 28, 2021 18:52
@lsm5
Copy link
Member Author

lsm5 commented Jun 28, 2021

Looks like you need to remove it from rpm spec file as well

done

@mheon
Copy link
Member

mheon commented Jun 28, 2021

LGTM
/approve

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Jun 28, 2021

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: lsm5, mheon

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 openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jun 28, 2021
@rhatdan
Copy link
Member

rhatdan commented Jun 28, 2021

/lgtm
/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 Jun 28, 2021
@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Jun 28, 2021
@TomSweeneyRedHat
Copy link
Member

TomSweeneyRedHat commented Jun 29, 2021

Changes LGTM, but it looks like a network related test is failing which is suspicious.

@lsm5
Copy link
Member Author

lsm5 commented Jun 29, 2021

Changes LGTM, but it looks like a network related test is failing which is suspicious.

looks like a flake. @rhatdan good for hold removal.

@lsm5
Copy link
Member Author

lsm5 commented Jun 29, 2021

/hold remove

@lsm5
Copy link
Member Author

lsm5 commented Jun 29, 2021

/hold cancel

@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 Jun 29, 2021
@openshift-merge-robot openshift-merge-robot merged commit 599b7d7 into containers:master Jun 29, 2021
@lsm5 lsm5 deleted the remove-cni-conflist branch March 16, 2023 11:25
@github-actions github-actions bot added the locked - please file new issue/PR Assist humans wanting to comment on an old issue or PR with locked comments. label Sep 6, 2023
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Sep 6, 2023
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
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. locked - please file new issue/PR Assist humans wanting to comment on an old issue or PR with locked comments.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants