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.

Sign up for GitHub

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

[Task] VX-239 add vortex portal webapp #216

Merged
merged 1 commit into from
Aug 2, 2018
Merged

[Task] VX-239 add vortex portal webapp #216

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 5 additions & 1 deletion deploy/helm/apps/charts/vortex-server/templates/deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,11 @@ spec:
spec:
serviceAccountName: vortex-admin
containers:
- name: vortex-webapp
image: sdnvortex/vortex-portal:{{ .Values.image.webappTag }}
ports:
- containerPort: 8080
- name: vortex-server
image: sdnvortex/vortex:{{ .Values.image.tag }}
image: sdnvortex/vortex:{{ .Values.image.apiserverTag }}
ports:
- containerPort: 7890
16 changes: 10 additions & 6 deletions deploy/helm/apps/charts/vortex-server/templates/service.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,15 @@ metadata:
spec:
type: NodePort
ports:
- protocol: TCP
port: {{ .Values.service.ports.port }}
targetPort: {{ .Values.service.ports.targetPort }}
nodePort: {{ .Values.service.ports.nodePort }}
- name: apiserver
protocol: TCP
port: {{ .Values.service.ports.apiserverPort }}
targetPort: {{ .Values.service.ports.apiserverTargetPort }}
nodePort: {{ .Values.service.ports.apiserverNodePort }}
- name: webapp
protocol: TCP
port: {{ .Values.service.ports.webappPort }}
targetPort: {{ .Values.service.ports.webappTargetPort }}
nodePort: {{ .Values.service.ports.webappNodePort }}
selector:
app: vortex-server


12 changes: 8 additions & 4 deletions deploy/helm/apps/charts/vortex-server/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,17 @@ global:

replicaCount: 1
image:
tag: v0.1.7
apiserverTag: v0.1.7
webappTag: develop

service:
ports:
port: 7890
targetPort: 7890
nodePort: 32326
apiserverPort: 7890
apiserverTargetPort: 7890
apiserverNodePort: 32326
webappPort: 8080
webappTargetPort: 8080
webappNodePort: 32767

auth:
enabled: false
5 changes: 5 additions & 0 deletions deploy/kubernetes/apps/vortex/vortex-server/deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,12 @@ spec:
spec:
serviceAccountName: vortex-admin
containers:
- name: vortex-webapp
image: sdnvortex/vortex-portal:develop
ports:
- containerPort: 8080
- name: vortex-server
image: sdnvortex/vortex:v0.1.7
ports:
- containerPort: 7890

9 changes: 7 additions & 2 deletions deploy/kubernetes/apps/vortex/vortex-server/service.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,14 @@ spec:
selector:
app: vortex-server
ports:
- protocol: TCP
- name: apiserver
protocol: TCP
port: 7890
targetPort: 7890
nodePort: 32326
name: vortex-server
- name: webapp
protocol: TCP
port: 8080
targetPort: 8080
nodePort: 32767
type: NodePort