Networking part2 [WIP DO NOT MERGE]

Makefile

@@ -10,7 +10,7 @@ PREFIX ?= ${DESTDIR}/usr/local
 BINDIR ?= ${PREFIX}/bin
 LIBEXECDIR ?= ${PREFIX}/libexec
 MANDIR ?= ${PREFIX}/share/man
-ETCDIR ?= ${DESTDIR}/etc
+ETCDIR ?= ${PREFIX}/../etc
 ETCDIR_LIBPOD ?= ${ETCDIR}/crio
 BUILDTAGS ?= seccomp $(shell hack/btrfs_tag.sh) $(shell hack/libdm_tag.sh) $(shell hack/btrfs_installed_tag.sh) $(shell hack/ostree_tag.sh) $(shell hack/selinux_tag.sh)
 
@@ -135,7 +135,7 @@ docs/%.1: docs/%.1.md .gopathok
 
 docs: $(MANPAGES)
 
-install: .gopathok install.bin install.man
+install: .gopathok install.bin install.man install.cni
 
 install.bin:
 	install ${SELINUXOPT} -D -m 755 bin/kpod $(BINDIR)/kpod
@@ -153,6 +153,10 @@ install.completions:
 	install ${SELINUXOPT} -d -m 755 ${BASHINSTALLDIR}
 	install ${SELINUXOPT} -m 644 -D completions/bash/kpod ${BASHINSTALLDIR}
 
+install.cni:
+	install ${SELINUXOPT} -D -m 644 cni/98-kpod-loopback.conf ${ETCDIR}/cni/net.d/98-kpod-loopback.conf
+	install ${SELINUXOPT}  -m 644 cni/99-kpod-bridge.conf ${ETCDIR}/cni/net.d/99-kpod-bridge.conf
+
 uninstall:
 	rm -f $(LIBEXECDIR)/crio/conmon
 	for i in $(filter %.1,$(MANPAGES)); do \

cmd/kpod/common.go

@@ -341,7 +341,8 @@ var createFlags = []cli.Flag{
 	},
 	cli.StringFlag{
 		Name:  "network",
-		Usage: "Connect a container to a network (default 'default')",
+		Usage: "Connect a container to a network",
+		Value: "bridge",
 	},
 	cli.StringSliceFlag{
 		Name:  "network-alias",

cmd/kpod/spec.go

@@ -73,14 +73,11 @@ func addNetNS(config *createConfig, g *generate.Generator) error {
 	netMode := config.NetMode
 	if netMode.IsHost() {
 		return g.RemoveLinuxNamespace(libpod.NetNamespace)
-	}
-	if netMode.IsNone() {
-		return libpod.ErrNotImplemented
-	}
-	if netMode.IsBridge() {
+	} else if netMode.IsNone() {
 		return libpod.ErrNotImplemented
-	}
-	if netMode.IsContainer() {
+	} else if netMode.IsBridge() {
+		return nil
+	} else if netMode.IsContainer() {
 		ctr, err := config.Runtime.LookupContainer(netMode.ConnectedContainer())
 		if err != nil {
 			return errors.Wrapf(err, "container %q not found", netMode.ConnectedContainer())
@@ -93,6 +90,8 @@ func addNetNS(config *createConfig, g *generate.Generator) error {
 		if err := g.AddOrReplaceLinuxNamespace(libpod.NetNamespace, nsPath); err != nil {
 			return err
 		}
+	} else {
+		return errors.Errorf("unknown network mode")
 	}
 	return nil
 }
@@ -531,8 +530,9 @@ func (c *createConfig) GetContainerCreateOptions() ([]libpod.CtrCreateOption, er
 		options = append(options, libpod.WithName(c.Name))
 	}
 	// TODO parse ports into libpod format and include
-	// TODO should not happen if --net=host
-	options = append(options, libpod.WithNetNS([]ocicni.PortMapping{}))
+	if c.NetMode.IsBridge() {
+		options = append(options, libpod.WithNetNS([]ocicni.PortMapping{}))
+	}
 
 	return options, nil
 }

cni/98-kpod-loopback.conf

@@ -0,0 +1,4 @@
+{
+    "cniVersion": "0.2.0",
+    "type": "loopback"
+}

cni/99-kpod-bridge.conf

@@ -0,0 +1,15 @@
+{
+    "cniVersion": "0.3.0",
+    "name": "kpod",
+    "type": "bridge",
+    "bridge": "cni0",
+    "isGateway": true,
+    "ipMasq": true,
+    "ipam": {
+        "type": "host-local",
+        "subnet": "10.88.0.0/16",
+        "routes": [
+            { "dst": "0.0.0.0/0" }
+        ]
+    }
+}

test/helpers.bash

@@ -104,7 +104,7 @@ if [ -e /usr/sbin/selinuxenabled ] && /usr/sbin/selinuxenabled; then
     filelabel=$(awk -F'"' '/^file.*=.*/ {print $2}' /etc/selinux/${SELINUXTYPE}/contexts/lxc_contexts)
     chcon -R ${filelabel} $TESTDIR
 fi
-LIBPOD_CNI_CONFIG="$TESTDIR/cni/net.d/"
+LIBPOD_CNI_CONFIG="/etc/cni/net.d/"
 LIBPOD_CNI_PLUGIN=${LIBPOD_CNI_PLUGIN:-/opt/cni/bin/}
 POD_CIDR="10.88.0.0/16"
 POD_CIDR_MASK="10.88.*.*"
@@ -193,36 +193,6 @@ function is_apparmor_enabled() {
 	echo 0
 }
 
-function prepare_network_conf() {
-	mkdir -p $LIBPOD_CNI_CONFIG
-	cat >$LIBPOD_CNI_CONFIG/10-crio.conf <<-EOF
-{
-    "cniVersion": "0.2.0",
-    "name": "crionet",
-    "type": "bridge",
-    "bridge": "cni0",
-    "isGateway": true,
-    "ipMasq": true,
-    "ipam": {
-        "type": "host-local",
-        "subnet": "10.20.40.0/24",
-        "routes": [
-            { "dst": "0.0.0.0/0"  }
-        ]
-    }
-}
-EOF
-
-	cat >$LIBPOD_CNI_CONFIG/99-loopback.conf <<-EOF
-{
-    "cniVersion": "0.2.0",
-    "type": "loopback"
-}
-EOF
-
-	echo 0
-}
-
 function prepare_plugin_test_args_network_conf() {
 	mkdir -p $LIBPOD_CNI_CONFIG
 	cat >$LIBPOD_CNI_CONFIG/10-plugin-test-args.conf <<-EOF
@@ -240,6 +210,7 @@ function prepare_plugin_test_args_network_conf() {
             { "dst": "0.0.0.0/0"  }
         ]
     }
+    skip ""
 }
 EOF
 

test/kpod_attach.bats

@@ -7,7 +7,6 @@ function teardown() {
 }
 
 function setup() {
-    prepare_network_conf
     copy_images
 }
 

test/kpod_create.bats

@@ -3,7 +3,6 @@
 load helpers
 
 function setup() {
-    prepare_network_conf
     copy_images
 }
 

test/kpod_diff.bats

@@ -3,7 +3,6 @@
 load helpers
 
 function setup() {
-    prepare_network_conf
     copy_images
 }
 

test/kpod_exec.bats

@@ -7,7 +7,6 @@ function teardown() {
 }
 
 function setup() {
-    prepare_network_conf
     copy_images
 }
 

test/kpod_export.bats

@@ -7,7 +7,6 @@ function teardown() {
 }
 
 function setup() {
-    prepare_network_conf
     copy_images
 }
 

test/kpod_history.bats

@@ -7,7 +7,6 @@ function teardown() {
 }
 
 function setup() {
-    prepare_network_conf
     copy_images
 }
 

test/kpod_images.bats

@@ -4,10 +4,6 @@ load helpers
 
 IMAGE="busybox"
 
-function setup() {
-    prepare_network_conf
-}
-
 function teardown() {
     cleanup_test
 }

test/kpod_import.bats

@@ -9,7 +9,6 @@ function teardown() {
 }
 
 function setup() {
-    prepare_network_conf
     copy_images
 }
 

test/kpod_inspect.bats

@@ -7,7 +7,6 @@ function teardown() {
 }
 
 function setup() {
-    prepare_network_conf
     copy_images
 }
 

test/kpod_kill.bats

@@ -7,7 +7,6 @@ function teardown() {
 }
 
 function setup() {
-    prepare_network_conf
     copy_images
 }
 

test/kpod_load.bats

@@ -3,7 +3,6 @@
 load helpers
 
 function setup() {
-    prepare_network_conf
     copy_images
 }
 

test/kpod_logs.bats

@@ -7,7 +7,6 @@ function teardown() {
 }
 
 function setup() {
-    prepare_network_conf
     copy_images
 }
 

test/kpod_mount.bats

@@ -9,7 +9,6 @@ function teardown() {
 }
 
 function setup() {
-    prepare_network_conf
     copy_images
 }
 

test/kpod_networking.bats

@@ -0,0 +1,23 @@
+#!/usr/bin/env bats
+
+load helpers
+
+function teardown() {
+    cleanup_test
+}
+
+function setup() {
+    copy_images
+}
+
+@test "test network connection with default bridge" {
+    run ${KPOD_BINARY} ${KPOD_OPTIONS} run -dt ${ALPINE} wget www.yahoo.com
+    echo "$output"
+    [ "$status" -eq 0 ]
+}
+
+@test "test network connection with host" {
+    run ${KPOD_BINARY} ${KPOD_OPTIONS} run -dt --network host ${ALPINE} wget www.yahoo.com
+    echo "$output"
+    [ "$status" -eq 0 ]
+}

test/kpod_pause.bats

@@ -3,7 +3,6 @@
 load helpers
 
 function setup() {
-    prepare_network_conf
     copy_images
 }
 

test/kpod_ps.bats

@@ -4,7 +4,6 @@ load helpers
 
 IMAGE="redis:alpine"
 function setup() {
-    prepare_network_conf
     copy_images
 }
 

test/kpod_push.bats

@@ -7,7 +7,6 @@ function teardown() {
 }
 
 function setup() {
-    prepare_network_conf
     copy_images
 }
 

test/kpod_rm.bats

@@ -3,7 +3,6 @@
 load helpers
 
 function setup() {
-    prepare_network_conf
     copy_images
 }
 

test/kpod_run.bats

@@ -7,7 +7,6 @@ function teardown() {
 }
 
 function setup() {
-    prepare_network_conf
     copy_images
 }
 

test/kpod_run_ns.bats

@@ -7,7 +7,6 @@ function teardown() {
 }
 
 function setup() {
-    prepare_network_conf
     copy_images
 }
 

test/kpod_save.bats

@@ -7,7 +7,6 @@ function teardown() {
 }
 
 function setup() {
-    prepare_network_conf
     copy_images
 }
 

test/kpod_start.bats

@@ -3,7 +3,6 @@
 load helpers
 
 function setup() {
-    prepare_network_conf
     copy_images
 }
 

test/kpod_stats.bats

@@ -7,7 +7,6 @@ function teardown() {
 }
 
 function setup() {
-    prepare_network_conf
     copy_images
 }
 

test/kpod_stop.bats

@@ -7,7 +7,6 @@ function teardown() {
 }
 
 function setup() {
-    prepare_network_conf
     copy_images
 }
 

test/kpod_top.bats

@@ -7,7 +7,6 @@ function teardown() {
 }
 
 function setup() {
-    prepare_network_conf
     copy_images
 }
 

test/kpod_wait.bats

@@ -3,7 +3,6 @@
 load helpers
 
 function setup() {
-    prepare_network_conf
     copy_images
 }