Skip to content

Commit

Permalink
Merge pull request #128 from linkernetworks/johnlin/server-yaml-version
Browse files Browse the repository at this point in the history
server yaml image tag

Former-commit-id: cf552c9a3f721d53826da1433b111bd2c8281f38 [formerly cf552c9a3f721d53826da1433b111bd2c8281f38 [formerly d9a9d50]]
Former-commit-id: 4eac43dee34ad115177e84702187ae8864abee91
Former-commit-id: ab2b988
  • Loading branch information
John-Lin authored Jul 19, 2018
2 parents 858c1c0 + 8f5cb23 commit 35a6dd4
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ govendor-sync:
src.build:
$(GO) build -v ./src/...
$(MKDIR_P) $(BUILD_FOLDER)/src/cmd/vortex/
$(GO) build -v -o $(BUILD_FOLDER)/src/cmd/vortex/vortex -ldflags="-X github.com/linkernetworks/vortex/src/version.version="$(SERVER_VERSION) ./src/cmd/vortex/...
$(GO) build -v -o $(BUILD_FOLDER)/src/cmd/vortex/vortex -ldflags="-X github.com/linkernetworks/vortex/src/version.version=$(SERVER_VERSION)" ./src/cmd/vortex/...

.PHONY: src.test
src.test:
Expand Down
2 changes: 1 addition & 1 deletion deploy/helm/apps/vortex-server/templates/deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,6 @@ spec:
spec:
containers:
- name: {{ .Chart.Name }}
image: sdnvortex/vortex:{{ .Values.global.tag }}
image: sdnvortex/vortex:{{ .Values.image.tag }}
ports:
- containerPort: 7890
4 changes: 2 additions & 2 deletions deploy/helm/apps/vortex-server/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ global:

replicaCount: 1
image:
tag: develop
tag: v0.1.0

service:
ports:
Expand All @@ -13,4 +13,4 @@ service:
nodePort: 32326

auth:
enabled: false
enabled: false
2 changes: 1 addition & 1 deletion deploy/kubernetes/apps/vortex/deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,6 @@ spec:
spec:
containers:
- name: vortex-server
image: sdnvortex/vortex:develop
image: sdnvortex/vortex:v0.1.0
ports:
- containerPort: 7890

0 comments on commit 35a6dd4

Please sign in to comment.