Merge pull request #120 from linkernetworks/johnlin/bump-to-0.3.0

bump network controller to v0.3.0 Former-commit-id: ea42e7cace2f40bae3d638501041f32ae57920ff [formerly d7b6858] Former-commit-id: 410f449de8fa1a9fa4498e8339f118cc7460f538
linkernetworks · Jul 19, 2018 · dfe21b9 · dfe21b9
2 parents 786fdb2 + 1694002
commit dfe21b9
Show file tree

Hide file tree

Showing 8 changed files with 13 additions and 56 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -18,7 +18,7 @@ notifications:
 before_install:
   - go get -u github.com/kardianos/govendor
   - sudo apt-get install -y git build-essential openvswitch-switch socat
-  - docker run -d -v /run/openvswitch/db.sock:/var/run/openvswitch/db.sock -p 50051:50051 sdnvortex/network-controller:v0.2.1 /go/bin/server -tcp=0.0.0.0:50051
+  - docker run -d -v /run/openvswitch/db.sock:/var/run/openvswitch/db.sock -p 50051:50051 sdnvortex/network-controller:v0.3.0 /go/bin/server -tcp=0.0.0.0:50051
 
 install:
   - make pre-build

diff --git a/deploy/helm/apps/network-controller/templates/tcp-daemonset.yaml b/deploy/helm/apps/network-controller/templates/tcp-daemonset.yaml
@@ -17,7 +17,7 @@ spec:
         effect: NoSchedule
       containers:
       - name: network-controller-server-tcp
-        image: sdnvortex/network-controller:latest
+        image: sdnvortex/network-controller:{{ .Values.global.tag }}
         securityContext:
           privileged: true
         command: ["/go/bin/server"]

diff --git a/deploy/helm/apps/network-controller/templates/unix-daemonset.yaml b/deploy/helm/apps/network-controller/templates/unix-daemonset.yaml
@@ -17,7 +17,7 @@ spec:
         effect: NoSchedule
       containers:
       - name: network-controller-server-unix
-        image: sdnvortex/network-controller:latest
+        image: sdnvortex/network-controller:{{ .Values.global.tag }}
         securityContext:
           privileged: true
         command: ["/go/bin/server"]

diff --git a/deploy/helm/apps/network-controller/values.yaml b/deploy/helm/apps/network-controller/values.yaml
@@ -1,45 +1,2 @@
-# Default values for network-controller.
-# This is a YAML-formatted file.
-# Declare variables to be passed into your templates.
-
-replicaCount: 1
-
-image:
-  repository: nginx
-  tag: stable
-  pullPolicy: IfNotPresent
-
-service:
-  type: ClusterIP
-  port: 80
-
-ingress:
-  enabled: false
-  annotations: {}
-    # kubernetes.io/ingress.class: nginx
-    # kubernetes.io/tls-acme: "true"
-  path: /
-  hosts:
-    - chart-example.local
-  tls: []
-  #  - secretName: chart-example-tls
-  #    hosts:
-  #      - chart-example.local
-
-resources: {}
-  # We usually recommend not to specify default resources and to leave this as a conscious
-  # choice for the user. This also increases chances charts run on environments with little
-  # resources, such as Minikube. If you do want to specify resources, uncomment the following
-  # lines, adjust them as necessary, and remove the curly braces after 'resources:'.
-  # limits:
-  #  cpu: 100m
-  #  memory: 128Mi
-  # requests:
-  #  cpu: 100m
-  #  memory: 128Mi
-
-nodeSelector: {}
-
-tolerations: []
-
-affinity: {}
+global:
+  tag: v0.3.0
diff --git a/deploy/kubernetes/apps/network-controller/server/tcp-daemonset.yaml b/deploy/kubernetes/apps/network-controller/server/tcp-daemonset.yaml
@@ -17,7 +17,7 @@ spec:
         effect: NoSchedule
       containers:
       - name: network-controller-server-tcp
-        image: sdnvortex/network-controller:latest
+        image: sdnvortex/network-controller:v0.3.0
         securityContext:
           privileged: true
         command: ["/go/bin/server"]

diff --git a/deploy/kubernetes/apps/network-controller/server/unix-daemonset.yaml b/deploy/kubernetes/apps/network-controller/server/unix-daemonset.yaml
@@ -17,7 +17,7 @@ spec:
         effect: NoSchedule
       containers:
       - name: network-controller-server-unix
-        image: sdnvortex/network-controller:latest
+        image: sdnvortex/network-controller:v0.3.0
         securityContext:
           privileged: true
         command: ["/go/bin/server"]

diff --git a/src/pod/pod.go b/src/pod/pod.go
@@ -123,7 +123,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.2.1",
+			Image:   "sdnvortex/network-controller:v0.3.0",
 			Command: []string{"/go/bin/client"},
 			Args:    generateClientCommand(v),
 			Env: []corev1.EnvVar{

diff --git a/vendor/vendor.json b/vendor/vendor.json
@@ -267,12 +267,12 @@
 			"revisionTime": "2018-05-24T10:14:37Z"
 		},
 		{
-			"checksumSHA1": "yn+Mnhby5jor32R9p/Oi2mhBXS8=",
+			"checksumSHA1": "5B2koV6vKlEKqyTXLBBrr8qpsMI=",
 			"path": "github.com/linkernetworks/network-controller/messages",
-			"revision": "6732f1138d000319d734c9f1d0bb27a7c7bb05a3",
-			"revisionTime": "2018-07-06T02:29:06Z",
-			"version": "=v0.2.1",
-			"versionExact": "v0.2.1"
+			"revision": "60522ed136801f7f769f33ecb700bfdbc06d0b59",
+			"revisionTime": "2018-07-19T03:03:19Z",
+			"version": "=v0.3.0",
+			"versionExact": "v0.3.0"
 		},
 		{
 			"checksumSHA1": "V89FgGKA+7A70mAedEvmhDSCIyQ=",