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
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions deploy/iso/minikube-iso/package/podman/podman.mk
Original file line number Diff line number Diff line change
Expand Up @@ -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

endef

$(eval $(generic-package))