X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=kubernetes%2Fmulticloud%2Ftemplates%2Fservice.yaml;h=3f950db0389be72b477a9c46419eac6b55eae363;hb=687f528514a0fb7a54d677aae837cadea9072dbc;hp=9f18c5e2368f7c4d4506642eb92d8707ba7da6c1;hpb=f39bd633c0acea07c3502a984178afa65f6c2b52;p=oom.git

diff --git a/kubernetes/multicloud/templates/service.yaml b/kubernetes/multicloud/templates/service.yaml
index 9f18c5e236..3f950db038 100644
--- a/kubernetes/multicloud/templates/service.yaml
+++ b/kubernetes/multicloud/templates/service.yaml
@@ -1,5 +1,6 @@
 {{/*
 # Copyright © 2017 Amdocs, Bell Canada
+# Modifications Copyright © 2018 AT&T
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -17,12 +18,12 @@
 apiVersion: v1
 kind: Service
 metadata:
-  name: {{ .Values.service.name }}
+  name: {{ .Values.service.portName }}
   namespace: {{ include "common.namespace" . }}
   labels:
     app: {{ include "common.name" . }}
     chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
-    release: {{ .Release.Name }}
+    release: {{ include "common.release" . }}
     heritage: {{ .Release.Service }}
   annotations:
     msb.onap.org/service-info: '[
@@ -31,22 +32,32 @@ metadata:
       "version": "v0",
       "url": "/api/multicloud/v0",
       "protocol": "REST",
-      "port": {{ .Values.service.externalPort }},
+      "port": "{{ .Values.service.externalPort }}",
+      "enable_ssl": {{ .Values.config.ssl_enabled }},
+      "visualRange": "1"
+    },
+    {
+      "serviceName": "multicloud",
+      "version": "v1",
+      "url": "/api/multicloud/v1",
+      "protocol": "REST",
+      "port": "{{ .Values.service.externalPort }}",
+      "enable_ssl": {{ .Values.config.ssl_enabled }},
       "visualRange": "1"
     }
     ]'
 spec:
   ports:
   {{if eq .Values.service.type "NodePort" -}}
-  - name: {{ .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: {{ .Values.service.name }}
+    name: {{ .Values.service.portName }}
   {{- end}}
   selector:
     app: {{ include "common.name" . }}
-    release: {{ .Release.Name }}
+    release: {{ include "common.release" . }}
   type: {{ .Values.service.type }}