update network controller messages

linkernetworks · Jun 25, 2018 · 016c537 · 016c537
1 parent f2f062d
commit 016c537
Show file tree

Hide file tree

Showing 3 changed files with 58 additions and 17 deletions.
diff --git a/src/config/config.go b/src/config/config.go
@@ -37,7 +37,10 @@ func Read(path string) (c Config, err error) {
 	kubeconfig := filepath.Join(os.Getenv("HOME"), ".kube", "config")
 	c.Kubernetes, err = clientcmd.BuildConfigFromFlags("", kubeconfig)
 	if err != nil {
-		return c, fmt.Errorf("Failed to open the kubernetes config file: %v\n", err)
+		c.Kubernetes, err = rest.InClusterConfig()
+		if err != nil {
+			return c, fmt.Errorf("Failed to open the kubernetes config file: %v\n", err)
+		}
 	}
 	return c, nil
 }

diff --git a/src/networkcontroller/networkcontroller.go b/src/networkcontroller/networkcontroller.go
@@ -17,28 +17,18 @@ type NetworkController struct {
 }
 
 func New(kubeCtl *kubernetes.KubeCtl, network entity.Network) (*NetworkController, error) {
-	node, err := kubeCtl.GetNode(network.NodeName)
+	nodeIP, err := kubeCtl.GetNodeExternalIP(network.NodeName)
 	if err != nil {
 		return nil, err
 	}
 
-	var nodeIP string
-	for _, addr := range node.Status.Addresses {
-		if addr.Type == "ExternalIP" {
-			nodeIP = addr.Address
-			break
-		}
-	}
-
 	// Set up a connection to the server.
-	conn, err := grpc.Dial(nodeIP, grpc.WithInsecure())
+	conn, err := grpc.Dial(nodeIP+":50051", grpc.WithInsecure())
 	if err != nil {
 		return nil, err
 	}
-	defer conn.Close()
 
-	ctx, cancel := context.WithTimeout(context.Background(), time.Second)
-	defer cancel()
+	ctx, _ := context.WithTimeout(context.Background(), time.Second)
 
 	return &NetworkController{
 		KubeCtl:   kubeCtl,
@@ -49,6 +39,12 @@ func New(kubeCtl *kubernetes.KubeCtl, network entity.Network) (*NetworkControlle
 }
 
 func (nc *NetworkController) CreateNetwork() error {
+	_, err := nc.ClientCtl.CreateBridge(nc.Context, &pb.CreateBridgeRequest{
+		BridgeName: nc.Network.BridgeName})
+	if err != nil {
+		return err
+	}
+
 	for _, port := range nc.Network.PhysicalPorts {
 		_, err := nc.ClientCtl.AddPort(nc.Context, &pb.AddPortRequest{
 			BridgeName: nc.Network.BridgeName,

diff --git a/vendor/vendor.json b/vendor/vendor.json
@@ -212,6 +212,12 @@
 			"revision": "9cad4c3443a7200dd6400aef47183728de563a38",
 			"revisionTime": "2018-03-05T23:10:24Z"
 		},
+		{
+			"checksumSHA1": "HMoZ70PrmL9dN5Kxs0dyZa/Z5k4=",
+			"path": "github.com/imdario/mergo",
+			"revision": "9316a62528ac99aaecb4e47eadd6dc8aa6533d58",
+			"revisionTime": "2018-06-08T14:01:56Z"
+		},
 		{
 			"checksumSHA1": "NY84PNFBfNvxJgNEMVKUOJhcVsY=",
 			"path": "github.com/json-iterator/go",
@@ -249,10 +255,10 @@
 			"revisionTime": "2018-05-24T10:14:37Z"
 		},
 		{
-			"checksumSHA1": "68e1u3tVjplIegtHjz2c8TprPJg=",
+			"checksumSHA1": "LW/1Uv+eMT9YqO/xqieFOeUZaBI=",
 			"path": "github.com/linkernetworks/network-controller/messages",
-			"revision": "f5afd26f4118f700c1c09c33368b9a218b23b43d",
-			"revisionTime": "2018-06-22T09:58:49Z"
+			"revision": "45433e3247ddcc3455ab5cfeb870d69ba0024774",
+			"revisionTime": "2018-06-25T08:54:22Z"
 		},
 		{
 			"checksumSHA1": "6xm1f1JNGEKoELwN4GXy/9/0HoM=",
@@ -504,6 +510,12 @@
 			"revision": "06ad41a06c4a586951fb8040a697ecd39729640b",
 			"revisionTime": "2015-06-30T19:56:10Z"
 		},
+		{
+			"checksumSHA1": "OJI0OgC5V8gZtfS1e0CDYMhkDNc=",
+			"path": "github.com/spf13/pflag",
+			"revision": "3ebe029320b2676d667ae88da602a5f854788a8a",
+			"revisionTime": "2018-06-01T13:25:42Z"
+		},
 		{
 			"checksumSHA1": "c6pbpF7eowwO59phRTpF8cQ80Z0=",
 			"path": "github.com/stretchr/testify/assert",
@@ -1804,12 +1816,36 @@
 			"revision": "2e8676d253d96c12b1acbe8b67d7c58e392b8406",
 			"revisionTime": "2018-06-20T14:12:18Z"
 		},
+		{
+			"checksumSHA1": "/QeKYX2M+m1OFCDyH9PHYp6w510=",
+			"path": "k8s.io/client-go/tools/auth",
+			"revision": "57012a8ca3a79ba74a7857acc94c46e87e9aa47c",
+			"revisionTime": "2018-06-24T18:43:02Z"
+		},
+		{
+			"checksumSHA1": "TCBw/2DobQ3JpcvXy0hW3IbNWb8=",
+			"path": "k8s.io/client-go/tools/clientcmd",
+			"revision": "57012a8ca3a79ba74a7857acc94c46e87e9aa47c",
+			"revisionTime": "2018-06-24T18:43:02Z"
+		},
 		{
 			"checksumSHA1": "ynHaVRHZ3FI66y573C05GL3s0t4=",
 			"path": "k8s.io/client-go/tools/clientcmd/api",
 			"revision": "8d6e3480fc03b7337a24f349d35733190655e2ad",
 			"revisionTime": "2018-06-14T22:41:26Z"
 		},
+		{
+			"checksumSHA1": "6cVFBhDYvRiAwBf0QYbmUoLi5lQ=",
+			"path": "k8s.io/client-go/tools/clientcmd/api/latest",
+			"revision": "57012a8ca3a79ba74a7857acc94c46e87e9aa47c",
+			"revisionTime": "2018-06-24T18:43:02Z"
+		},
+		{
+			"checksumSHA1": "mljZDWeGawmlOeRGvIRaVqKZIc4=",
+			"path": "k8s.io/client-go/tools/clientcmd/api/v1",
+			"revision": "57012a8ca3a79ba74a7857acc94c46e87e9aa47c",
+			"revisionTime": "2018-06-24T18:43:02Z"
+		},
 		{
 			"checksumSHA1": "rRC9GCWXfyIXKHBCeKpw7exVybE=",
 			"path": "k8s.io/client-go/tools/metrics",
@@ -1846,6 +1882,12 @@
 			"revision": "8d6e3480fc03b7337a24f349d35733190655e2ad",
 			"revisionTime": "2018-06-14T22:41:26Z"
 		},
+		{
+			"checksumSHA1": "WRb0rXGx56fwcCisVW7GoI6gO/A=",
+			"path": "k8s.io/client-go/util/homedir",
+			"revision": "57012a8ca3a79ba74a7857acc94c46e87e9aa47c",
+			"revisionTime": "2018-06-24T18:43:02Z"
+		},
 		{
 			"checksumSHA1": "W6bJiNAwgNwNJC+y+TPtacgUGlY=",
 			"path": "k8s.io/client-go/util/integer",