From 0c54f18e22c1a6039eb0c0d24b2cfd27a847b133 Mon Sep 17 00:00:00 2001
From: Bin Yang <bin.yang@windriver.com>
Date: Tue, 9 Oct 2018 03:27:40 +0000
Subject: Add v1 service endpoints for MultiCloud components

Change-Id: Ic0f2d65b6d84a505eded4825fabdabef50c5ce4c
Issue-ID: OOM-1461
Signed-off-by: Bin Yang <bin.yang@windriver.com>
---
 .../charts/multicloud-windriver/templates/service.yaml     | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

(limited to 'kubernetes/multicloud/charts/multicloud-windriver/templates')

diff --git a/kubernetes/multicloud/charts/multicloud-windriver/templates/service.yaml b/kubernetes/multicloud/charts/multicloud-windriver/templates/service.yaml
index f876bb97ac..c1128bbf47 100644
--- a/kubernetes/multicloud/charts/multicloud-windriver/templates/service.yaml
+++ b/kubernetes/multicloud/charts/multicloud-windriver/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" . }}
@@ -32,7 +32,7 @@ metadata:
       "version": "v0",
       "url": "/api/multicloud-titanium_cloud/v0",
       "protocol": "REST",
-      "port": "{{ .Values.service.internalPort }}",
+      "port": "{{ .Values.service.externalPort }}",
       "visualRange": "1"
     },
     {
@@ -40,7 +40,7 @@ metadata:
       "version": "v0",
       "url": "/api/multicloud-titaniumcloud/v0",
       "protocol": "REST",
-      "port": "{{ .Values.service.internalPort }}",
+      "port": "{{ .Values.service.externalPort }}",
       "visualRange": "1"
     },
     {
@@ -48,7 +48,7 @@ metadata:
       "version": "v1",
       "url": "/api/multicloud-titaniumcloud/v1",
       "protocol": "REST",
-      "port": "{{ .Values.service.internalPort }}",
+      "port": "{{ .Values.service.externalPort }}",
       "visualRange": "1"
     }
     ]'
@@ -56,13 +56,13 @@ metadata:
 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" . }}
-- 
cgit 1.2.3-korg