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

Add default CNI network for running wth podman #7754

Merged
merged 1 commit into from
Apr 19, 2020

Conversation

afbjorklund
Copy link
Collaborator

Forgot to add this after #6664

For #7709

@k8s-ci-robot k8s-ci-robot added cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. labels Apr 17, 2020
@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: afbjorklund

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

@k8s-ci-robot k8s-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Apr 17, 2020
@@ -29,6 +29,8 @@ endef

define PODMAN_INSTALL_TARGET_CMDS
$(INSTALL) -Dm755 $(@D)/bin/podman $(TARGET_DIR)/usr/bin/podman
$(INSTALL) -d -m 755 $(TARGET_DIR)/etc/cni/net.d/
$(INSTALL) -m 644 cni/87-podman-bridge.conflist $(TARGET_DIR)/etc/cni/net.d/87-podman-bridge.conflist
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

is this something we could add to ubuntu image too ? kicbase?

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

As far as I know, it is already included (provided by podman package):

docker@minikube:~$ dpkg -S /etc/cni/net.d/87-podman-bridge.conflist 
podman: /etc/cni/net.d/87-podman-bridge.conflist

If you do a sudo make install in libpod, it will be included by default.

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Seems to work OK there, with the provided CNI:

docker@minikube:~$ sudo podman run -it busybox
Trying to pull docker.io/library/busybox...
Getting image source signatures
Copying blob e2334dd9fee4 done  
Copying config be5888e67b done  
Writing manifest to image destination
Storing signatures
/ # 

So this was only a missing file on the minikube VM

@medyagh
Copy link
Member

medyagh commented Apr 17, 2020

/ok-to-test

@k8s-ci-robot k8s-ci-robot added the ok-to-test Indicates a non-member PR verified by an org member that is safe to test. label Apr 17, 2020
@medyagh
Copy link
Member

medyagh commented Apr 17, 2020

/retest-this-please

@kubernetes kubernetes deleted a comment from minikube-pr-bot Apr 17, 2020
@kubernetes kubernetes deleted a comment from minikube-pr-bot Apr 19, 2020
@minikube-pr-bot
Copy link

kvm2 Driver
docker Driver

@afbjorklund afbjorklund merged commit a44d9a1 into kubernetes:master Apr 19, 2020
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. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. ok-to-test Indicates a non-member PR verified by an org member that is safe to test. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants