Merge pull request #309 from linkernetworks/johnlin/upgrade-nc-048

[Upgrade] upgrade network controller to v0.4.8
linkernetworks · Sep 1, 2018 · 2297c9a · 2297c9a
2 parents b003aa3 + 607f388
commit 2297c9a
Show file tree

Hide file tree

Showing 7 changed files with 23 additions and 15 deletions.
diff --git a/deploy/helm/config/development.yaml b/deploy/helm/config/development.yaml
@@ -19,7 +19,7 @@ apps:
   # vortex/deploy/helm/apps/charts/network-controller
   network-controller:
     controller:
-      imageTag: v0.4.7
+      imageTag: v0.4.8
       tcpCPU: 50m
       unixCPU: 50m
   # vortex/deploy/helm/apps/charts/prometheus

diff --git a/deploy/helm/config/production.yaml b/deploy/helm/config/production.yaml
@@ -19,7 +19,7 @@ apps:
   # vortex/deploy/helm/apps/charts/network-controller
   network-controller:
     controller:
-      imageTag: v0.4.7
+      imageTag: v0.4.8
       tcpCPU: 100m
       unixCPU: 100m
   # vortex/deploy/helm/apps/charts/prometheus

diff --git a/deploy/helm/config/testing.yaml b/deploy/helm/config/testing.yaml
@@ -19,7 +19,7 @@ apps:
   # vortex/deploy/helm/apps/charts/network-controller
   network-controller:
     controller:
-      imageTag: v0.4.7
+      imageTag: v0.4.8
       tcpCPU: 50m
       unixCPU: 50m
   # vortex/deploy/helm/apps/charts/prometheus

diff --git a/src/deployment/deployment.go b/src/deployment/deployment.go
@@ -127,7 +127,7 @@ func generateInitContainer(networks []entity.DeploymentNetwork) ([]corev1.Contai
 	for i, v := range networks {
 		containers = append(containers, corev1.Container{
 			Name:    fmt.Sprintf("init-network-client-%d", i),
-			Image:   "sdnvortex/network-controller:v0.4.7",
+			Image:   "sdnvortex/network-controller:v0.4.8",
 			Command: []string{"/go/bin/client"},
 			Args:    generateClientCommand(v),
 			Env: []corev1.EnvVar{

diff --git a/src/ovscontroller/ovs_system.go b/src/ovscontroller/ovs_system.go
@@ -3,10 +3,10 @@ package ovscontroller
 import (
 	"net"
 
+	"github.com/linkernetworks/network-controller/utils"
 	"github.com/linkernetworks/vortex/src/entity"
 	"github.com/linkernetworks/vortex/src/networkcontroller"
 	"github.com/linkernetworks/vortex/src/serviceprovider"
-	"github.com/linkernetworks/vortex/src/utils"
 	"gopkg.in/mgo.v2/bson"
 )
 
@@ -28,8 +28,8 @@ func DumpPorts(sp *serviceprovider.Container, nodeName string, bridgeName string
 	//We need to find a mapping for veth to podName
 	//1. lookup the mongodb to find all deployments which bridge name is equal to bridgeName
 	//2. lookup all current pods which is belogs to above deployments
-	//3. use the pod's UID and the interfae of each entity.DeploymentNetowrk to geneate the vethxxxxxx
-	//4. use the vethxxx as the key to combine the podName/interfaace and the OVSPorts
+	//3. use the pod's UID and the interfae of each entity.DeploymentNetowrk to geneate the vetxXXXXXX
+	//4. use the vtxXXXXXXXXX as the key to combine the podName/interfaace and the OVSPorts
 	session := sp.Mongo.NewSession()
 	defer session.Close()
 
@@ -67,14 +67,14 @@ func DumpPorts(sp *serviceprovider.Container, nodeName string, bridgeName string
 			continue
 		}
 
-		//3. use the pod's UID and the interfae of each entity.DeploymentNetowrk to geneate the vethxxxxxx
+		//3. use the pod's UID and the interfae of each entity.DeploymentNetowrk to geneate the vtxXXXXXXXXX
 		//for each deploymentNetwork, we get the vethname via veth+sha256(podUID + interfaceName in container)[0:8]
 		uid := v.ObjectMeta.UID
 		for _, k := range deploy.Networks {
-			veth := "veth" + utils.SHA256String(string(uid) + k.IfName)[0:8]
+			vethName := utils.GenerateVethName(string(uid), k.IfName)
 			//Use the veth name as the key and the PodName/InterfaceName in the value, we will add those inforamtion
 			//to OVSPortInfo later.
-			interfaces[veth] = &portData{
+			interfaces[vethName] = &portData{
 				v.Name,
 				k,
 			}

diff --git a/src/pod/pod.go b/src/pod/pod.go
@@ -125,7 +125,7 @@ func generateInitContainer(networks []entity.PodNetwork) ([]corev1.Container, er
 	for i, v := range networks {
 		containers = append(containers, corev1.Container{
 			Name:    fmt.Sprintf("init-network-client-%d", i),
-			Image:   "sdnvortex/network-controller:v0.4.7",
+			Image:   "sdnvortex/network-controller:v0.4.8",
 			Command: []string{"/go/bin/client"},
 			Args:    generateClientCommand(v),
 			Env: []corev1.EnvVar{

diff --git a/vendor/vendor.json b/vendor/vendor.json
@@ -263,10 +263,18 @@
 		{
 			"checksumSHA1": "QAOy7z8HT9JxBXbIhPjTjdLusVU=",
 			"path": "github.com/linkernetworks/network-controller/messages",
-			"revision": "ab932c09f38fb545d892db529a99a9d9bc6e257a",
-			"revisionTime": "2018-08-31T03:13:05Z",
-			"version": "v0.4.7",
-			"versionExact": "v0.4.7"
+			"revision": "76cb2946e17ea2ab9e92dce65c96f87e96e25302",
+			"revisionTime": "2018-09-01T07:38:16Z",
+			"version": "=v0.4.8",
+			"versionExact": "v0.4.8"
+		},
+		{
+			"checksumSHA1": "PKUmbmBhKwMo6Cj7j0KUZQ6Ecsk=",
+			"path": "github.com/linkernetworks/network-controller/utils",
+			"revision": "76cb2946e17ea2ab9e92dce65c96f87e96e25302",
+			"revisionTime": "2018-09-01T07:38:16Z",
+			"version": "=v0.4.8",
+			"versionExact": "v0.4.8"
 		},
 		{
 			"checksumSHA1": "8bkCE7r0DcTaPDbKbwaI34Bmrbw=",