commit 0c54f18e22c1a6039eb0c0d24b2cfd27a847b133
author Bin Yang <bin.yang@windriver.com> Tue Oct 09 03:27:40 2018 +0000
committer Bin Yang <bin.yang@windriver.com> Tue Oct 09 03:52:06 2018 +0000
tree 7d2393a5aad3fb7b770a7d003f3d12c976d86523
parent b1cc7ae3d635d0d54bb57928dbf85398fa414196

Add v1 service endpoints for MultiCloud components

Change-Id: Ic0f2d65b6d84a505eded4825fabdabef50c5ce4c
Issue-ID: OOM-1461
Signed-off-by: Bin Yang <bin.yang@windriver.com>

kubernetes/multicloud/charts/multicloud-ocata/templates/service.yaml

diff --git a/kubernetes/multicloud/charts/multicloud-ocata/templates/service.yaml b/kubernetes/multicloud/charts/multicloud-ocata/templates/service.yaml
index cbe426e..fda5ece 100644
--- a/kubernetes/multicloud/charts/multicloud-ocata/templates/service.yaml
+++ b/kubernetes/multicloud/charts/multicloud-ocata/templates/service.yaml
@@ -18,7 +18,7 @@
 apiVersion: v1
 kind: Service
 metadata:
-  name: {{ .Values.service.name }}
+  name: {{ include "common.servicename" . }}
   namespace: {{ include "common.namespace" . }}
   labels:
     app: {{ include "common.name" . }}
@@ -34,18 +34,26 @@
       "protocol": "REST",
       "port": "{{ .Values.service.externalPort }}",
       "visualRange": "1"
+    },
+    {
+      "serviceName": "multicloud-ocata",
+      "version": "v1",
+      "url": "/api/multicloud-ocata/v1",
+      "protocol": "REST",
+      "port": "{{ .Values.service.externalPort }}",
+      "visualRange": "1"
     }
     ]'
 spec:
   ports:
   {{if eq .Values.service.type "NodePort" -}}
-  - name: http-{{ .Values.service.name }}
-    port: {{ .Values.service.externalPort }}
+  - port: {{ .Values.service.externalPort }}
     nodePort: {{ .Values.global.nodePortPrefix | default .Values.nodePortPrefix }}{{ .Values.service.nodePort }}
+    name: {{ .Values.service.portName }}
   {{- else -}}
   - port: {{ .Values.service.externalPort }}
     targetPort: {{ .Values.service.internalPort }}
-    name: http-{{ .Values.service.name }}
+    name: {{ .Values.service.portName }}
   {{- end}}
   selector:
     app: {{ include "common.name" . }}

kubernetes/multicloud/charts/multicloud-ocata/values.yaml

diff --git a/kubernetes/multicloud/charts/multicloud-ocata/values.yaml b/kubernetes/multicloud/charts/multicloud-ocata/values.yaml
index 699b908..dcb7df4 100644
--- a/kubernetes/multicloud/charts/multicloud-ocata/values.yaml
+++ b/kubernetes/multicloud/charts/multicloud-ocata/values.yaml
@@ -59,6 +59,7 @@
 service:
   type: NodePort
   name: multicloud-ocata
+  portName: multicloud-ocata
   externalPort: 9006
   internalPort: 9006
   nodePort: 93
@@ -84,4 +85,4 @@
     requests:
       cpu: 20m
       memory: 2Gi
-  unlimited: {}
\ No newline at end of file
+  unlimited: {}