Auto create cni default network

abhi · abhi · commit 648ea0241b50 · 2017-10-12T11:40:55.000-07:00
This commit contains changes related to dynamically
create networks depending on the CNI config and
the current network state in libnetwork instance

Signed-off-by: Abhinandan Prativadi &lt;abhi@docker.com&gt;

CNI libnetwork files

Signed-off-by: Abhinandan Prativadi &lt;abhi@docker.com&gt;
diff --git a/client/network.go b/client/network.go
@@ -85,7 +85,7 @@ func (cli *NetworkCli) CmdNetworkCreate(chain string, args ...string) error {
 	}
 
 	// Construct network create request body
-	nc := networkCreate{Name: cmd.Arg(0), NetworkType: *flDriver, ID: *flID, IPv4Conf: icList, DriverOpts: driverOpts, NetworkOpts: networkOpts}
+	nc := NetworkCreate{Name: cmd.Arg(0), NetworkType: *flDriver, ID: *flID, IPv4Conf: icList, DriverOpts: driverOpts, NetworkOpts: networkOpts}
 	obj, _, err := readBody(cli.call("POST", "/networks", nc, nil))
 	if err != nil {
 		return err
@@ -137,7 +137,7 @@ func (cli *NetworkCli) CmdNetworkLs(chain string, args ...string) error {
 		*last = 1
 	}
 
-	var networkResources []networkResource
+	var networkResources []NetworkResource
 	err = json.Unmarshal(obj, &networkResources)
 	if err != nil {
 		return err
@@ -189,7 +189,7 @@ func (cli *NetworkCli) CmdNetworkInfo(chain string, args ...string) error {
 	if err != nil {
 		return err
 	}
-	networkResource := &networkResource{}
+	networkResource := &NetworkResource{}
 	if err := json.NewDecoder(bytes.NewReader(obj)).Decode(networkResource); err != nil {
 		return err
 	}
@@ -222,7 +222,7 @@ func lookupNetworkID(cli *NetworkCli, nameID string) (string, error) {
 		return "", fmt.Errorf("name query failed for %s due to : statuscode(%d) %v", nameID, statusCode, string(obj))
 	}
 
-	var list []*networkResource
+	var list []*NetworkResource
 	err = json.Unmarshal(obj, &list)
 	if err != nil {
 		return "", err
diff --git a/client/service.go b/client/service.go
@@ -33,7 +33,7 @@ func lookupServiceID(cli *NetworkCli, nwName, svNameID string) (string, error) {
 	if err != nil {
 		return "", err
 	}
-	var nwList []networkResource
+	var nwList []NetworkResource
 	if err = json.Unmarshal(obj, &nwList); err != nil {
 		return "", err
 	}
@@ -46,7 +46,7 @@ func lookupServiceID(cli *NetworkCli, nwName, svNameID string) (string, error) {
 		if err != nil {
 			return "", err
 		}
-		networkResource := &networkResource{}
+		networkResource := &NetworkResource{}
 		if err := json.NewDecoder(bytes.NewReader(obj)).Decode(networkResource); err != nil {
 			return "", err
 		}
diff --git a/client/types.go b/client/types.go
@@ -10,8 +10,8 @@ import (
  Resources
 ************/
 
-// networkResource is the body of the "get network" http response message
-type networkResource struct {
+// NetworkResource is the body of the "get network" http response message
+type NetworkResource struct {
 	Name     string             `json:"name"`
 	ID       string             `json:"id"`
 	Type     string             `json:"type"`
@@ -42,8 +42,8 @@ type ipamConf struct {
 	AuxAddresses  map[string]string
 }
 
-// networkCreate is the expected body of the "create network" http request message
-type networkCreate struct {
+// NetworkCreate is the expected body of the "create network" http request message
+type NetworkCreate struct {
 	Name        string            `json:"name"`
 	ID          string            `json:"id"`
 	NetworkType string            `json:"network_type"`
diff --git a/config/config.go b/config/config.go
@@ -77,6 +77,10 @@ func ParseConfig(tomlCfgFile string) (*Config, error) {
 	if cfg.Cluster.Discovery == "" {
 		cfg.Cluster.Discovery = os.Getenv("DNET_DISCOVERY")
 	}
+	//TODO (ABHI): Handle this better. default to etcd for now
+	if !(strings.Contains(cfg.Cluster.Discovery, "etcd") || strings.Contains(cfg.Cluster.Discovery, "consul")) {
+		cfg.Cluster.Discovery = "etcd://" + cfg.Cluster.Discovery
+	}
 	fmt.Printf("cluster address=%s, discovery=%s \n", cfg.Cluster.Address, cfg.Cluster.Discovery)
 
 	if _, ok := cfg.Scopes[datastore.GlobalScope]; !ok {
diff --git a/install/Dockerfile.cniserver b/install/Dockerfile.cniserver
@@ -0,0 +1,14 @@
+FROM ubuntu:16.04
+
+RUN apt-get update \
+    && apt-get install -y\
+        net-tools \
+        iptables \
+ && rm -rf /var/lib/apt/lists/*
+
+COPY bin/cniserver /var/libnetwork/bin/
+COPY cniserver.sh /var/libnetwork/
+COPY bin/cnictl /var/libnetwork/bin/
+COPY net.conf  /var/libnetwork/config/
+
+ENTRYPOINT ["/var/libnetwork/cniserver.sh"]
diff --git a/install/Dockerfile.dnet b/install/Dockerfile.dnet
@@ -0,0 +1,13 @@
+FROM ubuntu:16.04
+
+RUN apt-get update \
+    && apt-get install -y\
+        net-tools \
+        iptables \
+ && rm -rf /var/lib/apt/lists/*
+
+COPY bin/dnet /var/libnetwork/bin/
+COPY dnet.sh /var/libnetwork/
+COPY config.toml /var/libnetwork/config/
+
+ENTRYPOINT ["/var/libnetwork/dnet.sh"]
diff --git a/install/cniserver b/install/cniserver
diff --git a/install/cniserver.sh b/install/cniserver.sh
@@ -0,0 +1,6 @@
+#!/bin/bash
+set -euo pipefail
+cp /var/libnetwork/bin/cnictl /opt/cni/bin/libnetwork-cni
+cp /var/libnetwork/config/net.conf /etc/cni/net.d/00-libnetwork-cni.conf
+
+/var/libnetwork/bin/cniserver  &> /home/libnetwork/cniserver.log
diff --git a/install/config.toml b/install/config.toml
@@ -0,0 +1,9 @@
+title = "LibNetwork Configuration file"
+
+[daemon]
+  debug = true
+  labels = ["com.docker.network.driver.overlay.hostmode=true"]
+[cluster]
+  discovery = ""
+[datastore]
+  embedded = false
diff --git a/install/config_working.toml b/install/config_working.toml
@@ -0,0 +1,17 @@
+title = "LibNetwork Configuration file"
+
+[daemon]
+  debug = true
+  labels = ["com.docker.network.driver.overlay.hostmode=true"]
+[cluster]
+  discovery = "etcd://localhost:2379"
+[datastore]
+  embedded = false
+[datastore.client]
+  provider = "etcd"
+  Address = "localhost:2379"
+[scopes]
+  [scopes.global]
+      [scopes.global.client]
+            provider = "etcd"
+                  address = "localhost:2379"
diff --git a/install/dnet.sh b/install/dnet.sh
@@ -0,0 +1,3 @@
+#!/bin/bash
+set -euo pipefail
+/var/libnetwork/bin/dnet -d -c /var/libnetwork/config/config.toml &> /home/libnetwork/dnet.log 
diff --git a/install/net.conf b/install/net.conf
@@ -0,0 +1,5 @@
+{
+	"cniVersion": "0.2.0",
+	"name": "orange",
+        "type": "libnetwork-cni"
+}
diff --git a/pkg/cniapi/api.go b/pkg/cniapi/api.go
@@ -56,7 +56,7 @@ func (l *LibNetCniClient) SetupPod(args *skel.CmdArgs) (*current.Result, error)
 	log.Infof("Received Setup Pod %+v", args)
 	podNetInfo, err := validatePodNetworkInfo(args)
 	if err != nil {
-		return nil, fmt.Errorf("failed to valid cni arguements, error: %v", err)
+		return nil, fmt.Errorf("failed to valid cni arguments, error: %v", err)
 	}
 	buf, err := json.Marshal(podNetInfo)
 	if err != nil {
@@ -110,7 +110,7 @@ func (l *LibNetCniClient) TearDownPod(args *skel.CmdArgs) error {
 	log.Infof("Received Teardown Pod request %+v", args)
 	podNetInfo, err := validatePodNetworkInfo(args)
 	if err != nil {
-		return fmt.Errorf("failed to valid cni arguements, error: %v", err)
+		return fmt.Errorf("failed to valid cni arguments, error: %v", err)
 	}
 	buf, err := json.Marshal(podNetInfo)
 	if err != nil {
diff --git a/pkg/server/cniserver/add_pod.go b/pkg/server/cniserver/add_pod.go
@@ -106,6 +106,14 @@ func createSandbox(ContainerID, netns string) (string, error) {
 
 func createEndpoint(ContainerID string, netConfig types.NetConf) (client.EndpointInfo, error) {
 	var ep client.EndpointInfo
+	// Create network if it doesnt exist. Need to handle refcount to delete
+	// network on last pod delete. Also handle different network types and option
+	if !networkExists(netConfig.Name) {
+		if err := createNetwork(netConfig.Name, "overlay"); err != nil {
+			return ep, err
+		}
+	}
+
 	sc := client.ServiceCreate{Name: ContainerID, Network: netConfig.Name, DisableResolution: true}
 	obj, _, err := readBody(httpCall("POST", "/services", sc, nil))
 	if err != nil {
@@ -123,3 +131,43 @@ func endpointJoin(sandboxID, endpointID, netns string) (retErr error) {
 
 	return err
 }
+
+func networkExists(networkName string) bool {
+	fmt.Printf("Check if %s network exists \n", networkName)
+	obj, statusCode, err := readBody(httpCall("GET", "/networks?name="+networkName, nil, nil))
+	if err != nil {
+		fmt.Printf("%s network does not exists \n", networkName)
+		return false
+	}
+	if statusCode != http.StatusOK {
+		fmt.Printf("%s network does not exists \n", networkName)
+		return false
+	}
+	var list []*client.NetworkResource
+	err = json.Unmarshal(obj, &list)
+	if err != nil {
+		return false
+	}
+	fmt.Printf("%s network exists \n", networkName)
+	return (len(list) != 0)
+}
+
+// createNetwork is a very simple utility to create a default network
+// if not present. This needs to be expanded into a more full utility function
+func createNetwork(networkName string, driver string) error {
+	fmt.Printf("Creating a network %s driver: %s \n", networkName, driver)
+	driverOpts := make(map[string]string)
+	driverOpts["hostaccess"] = ""
+	nc := client.NetworkCreate{Name: networkName, NetworkType: driver,
+		DriverOpts: driverOpts}
+	obj, _, err := readBody(httpCall("POST", "/networks", nc, nil))
+	if err != nil {
+		return err
+	}
+	var replyID string
+	err = json.Unmarshal(obj, &replyID)
+	if err != nil {
+		return err
+	}
+	return nil
+}

Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,7 @@ func lookupServiceID(cli *NetworkCli, nwName, svNameID string) (string, error) {`
`33`	`33`	`if err != nil {`
`34`	`34`	`return "", err`
`35`	`35`	`}`
`36`		`- var nwList []networkResource`
	`36`	`+ var nwList []NetworkResource`
`37`	`37`	`if err = json.Unmarshal(obj, &nwList); err != nil {`
`38`	`38`	`return "", err`
`39`	`39`	`}`
`@@ -46,7 +46,7 @@ func lookupServiceID(cli *NetworkCli, nwName, svNameID string) (string, error) {`
`46`	`46`	`if err != nil {`
`47`	`47`	`return "", err`
`48`	`48`	`}`
`49`		`- networkResource := &networkResource{}`
	`49`	`+ networkResource := &NetworkResource{}`
`50`	`50`	`if err := json.NewDecoder(bytes.NewReader(obj)).Decode(networkResource); err != nil {`
`51`	`51`	`return "", err`
`52`	`52`	`}`