Merge pull request #216 from linkernetworks/johnlin/add-vortex-webapp

[Task] VX-239 add vortex portal webapp
linkernetworks · Aug 2, 2018 · ba4183f · ba4183f
2 parents dd9dbd2 + 41ef3ef
commit ba4183f
Show file tree

Hide file tree

Showing 5 changed files with 35 additions and 13 deletions.
diff --git a/deploy/helm/apps/charts/vortex-server/templates/deployment.yaml b/deploy/helm/apps/charts/vortex-server/templates/deployment.yaml
@@ -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
diff --git a/deploy/helm/apps/charts/vortex-server/templates/service.yaml b/deploy/helm/apps/charts/vortex-server/templates/service.yaml
@@ -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
-
-
diff --git a/deploy/helm/apps/charts/vortex-server/values.yaml b/deploy/helm/apps/charts/vortex-server/values.yaml
@@ -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
diff --git a/deploy/kubernetes/apps/vortex/vortex-server/deployment.yaml b/deploy/kubernetes/apps/vortex/vortex-server/deployment.yaml
@@ -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
+
diff --git a/deploy/kubernetes/apps/vortex/vortex-server/service.yaml b/deploy/kubernetes/apps/vortex/vortex-server/service.yaml
@@ -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