Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

bump network controller to v0.3.0 #120

Merged
merged 2 commits into from
Jul 19, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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"]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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"]
Expand Down
47 changes: 2 additions & 45 deletions deploy/helm/apps/network-controller/values.yaml
Original file line number Diff line number Diff line change
@@ -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
Original file line number Diff line number Diff line change
Expand Up @@ -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"]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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"]
Expand Down
2 changes: 1 addition & 1 deletion src/pod/pod.go
Original file line number Diff line number Diff line change
Expand Up @@ -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{
Expand Down
10 changes: 5 additions & 5 deletions vendor/vendor.json
Original file line number Diff line number Diff line change
Expand Up @@ -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=",
Expand Down