X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=kubernetes%2Fso%2Ftemplates%2Fservice.yaml;h=5a83d566ac3a59c216037e73fe1fe63fbd29cab2;hb=e4aac7a3c577b7bb9eaae93387d482f952ee4b72;hp=a813a180302b3d2a5b48ca211ff477e6616354ca;hpb=6fb58c9d01d89d405f8abf13f12f2d1bd1b2fcd9;p=oom.git

diff --git a/kubernetes/so/templates/service.yaml b/kubernetes/so/templates/service.yaml
index a813a18030..5a83d566ac 100755
--- a/kubernetes/so/templates/service.yaml
+++ b/kubernetes/so/templates/service.yaml
@@ -1,3 +1,4 @@
+{{/*
 # Copyright © 2018 AT&T USA
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -11,6 +12,7 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
+*/}}
 apiVersion: v1
 kind: Service
 metadata:
@@ -19,367 +21,367 @@ metadata:
   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: '[
          {
-        "serviceName": "so/apih",
+        "serviceName": "so",
         "version": "v1",
         "url": "/onap/so/infra/cloudResources/{version:[vV][1]}/operationalEnvironments",
         "protocol": "REST",
-        "port": "{{ .Values.service.externalPort }}",
+        "port": "{{ .Values.service.internalPort }}",
         "visualRange":"0",
         "lb_policy":"ip_hash"
          },
          {
-        "serviceName": "so/apih",
+        "serviceName": "so",
         "version": "v1",
         "url": "/onap/so/infra/cloudResources/{version:[vV][1]}/operationalEnvironments/{operationalEnvironmentId}/activate",
         "protocol": "REST",
-        "port": "{{ .Values.service.externalPort }}",
+        "port": "{{ .Values.service.internalPort }}",
         "visualRange":"0",
         "lb_policy":"ip_hash"
          },
           {
-        "serviceName": "so/apih",
+        "serviceName": "so",
         "version": "v1",
         "url": "/onap/so/infra/cloudResources/{version:[vV][1]}/operationalEnvironments/{operationalEnvironmentId}/deactivate",
         "protocol": "REST",
-        "port": "{{ .Values.service.externalPort }}",
+        "port": "{{ .Values.service.internalPort }}",
         "visualRange":"0",
         "lb_policy":"ip_hash"
          },
          {
-        "serviceName": "so/apih",
+        "serviceName": "so",
         "version": "v1",
         "url": "/onap/so/infra/cloudResourcesRequests/{version:[vV][1]}/{requestId}/unlock",
         "protocol": "REST",
-        "port": "{{ .Values.service.externalPort }}",
+        "port": "{{ .Values.service.internalPort }}",
         "visualRange":"0",
         "lb_policy":"ip_hash"
          },
          {
-        "serviceName": "so/apih",
+        "serviceName": "so",
         "version": "v1",
         "url": "/onap/so/infra/cloudResourcesRequests/{version:[vV][1]}",
         "protocol": "REST",
-        "port": "{{ .Values.service.externalPort }}",
+        "port": "{{ .Values.service.internalPort }}",
         "visualRange":"0",
         "lb_policy":"ip_hash"
          },
           {
-        "serviceName": "so/apih",
+        "serviceName": "so",
         "version": "v1",
         "url": "/onap/so/infra/orchestrationRequests/{version:[vV][4-7]}/{requestId}",
         "protocol": "REST",
-        "port": "{{ .Values.service.externalPort }}",
+        "port": "{{ .Values.service.internalPort }}",
         "visualRange":"0",
         "lb_policy":"ip_hash"
          },
           {
-        "serviceName": "so/apih",
+        "serviceName": "so",
         "version": "v1",
         "url": "/onap/so/infra/orchestrationRequests/{version:[vV][4-7]}",
         "protocol": "REST",
-        "port": "{{ .Values.service.externalPort }}",
+        "port": "{{ .Values.service.internalPort }}",
         "visualRange":"0",
         "lb_policy":"ip_hash"
          },
           {
-        "serviceName": "so/apih",
+        "serviceName": "so",
         "version": "v1",
         "url": "/onap/so/infra/orchestrationRequests/{version:[vV][4-7]}/{requestId}/unlock",
         "protocol": "REST",
-        "port": "{{ .Values.service.externalPort }}",
+        "port": "{{ .Values.service.internalPort }}",
         "visualRange":"0",
         "lb_policy":"ip_hash"
          },
          {
-        "serviceName": "so/apih",
+        "serviceName": "so",
         "version": "v1",
         "url": "/onap/so/infra/serviceInstantiation/{version:[vV][5-7]}/serviceInstances",
         "protocol": "REST",
-        "port": "{{ .Values.service.externalPort }}",
+        "port": "{{ .Values.service.internalPort }}",
         "visualRange":"0",
         "lb_policy":"ip_hash"
          },
          {
-        "serviceName": "so/apih",
+        "serviceName": "so",
         "version": "v1",
         "url": "/onap/so/infra/serviceInstantiation/{version:[vV][5-7]}/serviceInstances/{serviceInstanceId}/activate",
         "protocol": "REST",
-        "port": "{{ .Values.service.externalPort }}",
+        "port": "{{ .Values.service.internalPort }}",
         "visualRange":"0",
         "lb_policy":"ip_hash"
          },
           {
-        "serviceName": "so/apih",
+        "serviceName": "so",
         "version": "v1",
         "url": "/onap/so/infra/serviceInstantiation/{version:[vV][5-7]}/serviceInstances/{serviceInstanceId}/deactivate",
         "protocol": "REST",
-        "port": "{{ .Values.service.externalPort }}",
+        "port": "{{ .Values.service.internalPort }}",
         "visualRange":"0",
         "lb_policy":"ip_hash"
          },
          {
-        "serviceName": "so/apih",
+        "serviceName": "so",
         "version": "v1",
         "url": "/onap/so/infra/serviceInstantiationRequests/{version:[vV][5-7]}/serviceInstances/{serviceInstanceId}",
         "protocol": "REST",
-        "port": "{{ .Values.service.externalPort }}",
+        "port": "{{ .Values.service.internalPort }}",
         "visualRange":"0",
         "lb_policy":"ip_hash"
          },
          {
-        "serviceName": "so/apih",
+        "serviceName": "so",
         "version": "v1",
         "url": "/onap/so/infra/serviceInstantiationRequests/{version:[vV][7]}/serviceInstances/assign",
         "protocol": "REST",
-        "port": "{{ .Values.service.externalPort }}",
+        "port": "{{ .Values.service.internalPort }}",
         "visualRange":"0",
         "lb_policy":"ip_hash"
          },
           {
-        "serviceName": "so/apih",
+        "serviceName": "so",
         "version": "v1",
         "url": "/onap/so/infra/serviceInstantiation/{version:[vV][7]}/serviceInstances/{serviceInstanceId}/unassign",
         "protocol": "REST",
-        "port": "{{ .Values.service.externalPort }}",
+        "port": "{{ .Values.service.internalPort }}",
         "visualRange":"0",
         "lb_policy":"ip_hash"
          },
           {
-        "serviceName": "so/apih",
+        "serviceName": "so",
         "version": "v1",
         "url": "/onap/so/infra/serviceInstantiation/{version:[vV][5-7]}/serviceInstances/{serviceInstanceId}/configurations",
         "protocol": "REST",
-        "port": "{{ .Values.service.externalPort }}",
+        "port": "{{ .Values.service.internalPort }}",
         "visualRange":"0",
         "lb_policy":"ip_hash"
          },
           {
-        "serviceName": "so/apih",
+        "serviceName": "so",
         "version": "v1",
         "url": "/onap/so/infra/serviceInstantiation/{version:[vV][5-7]}/serviceInstances/{serviceInstanceId}/configurations/{configurationInstanceId}",
         "protocol": "REST",
-        "port": "{{ .Values.service.externalPort }}",
+        "port": "{{ .Values.service.internalPort }}",
         "visualRange":"0",
         "lb_policy":"ip_hash"
          },
          {
-        "serviceName": "so/apih",
+        "serviceName": "so",
         "version": "v1",
         "url": "/onap/so/infra/serviceInstantiation/{version:[vV][5-7]}/serviceInstances/{serviceInstanceId}/configurations/{configurationInstanceId}/enablePort",
         "protocol": "REST",
-        "port": "{{ .Values.service.externalPort }}",
+        "port": "{{ .Values.service.internalPort }}",
         "visualRange":"0",
         "lb_policy":"ip_hash"
          },
          {
-        "serviceName": "so/apih",
+        "serviceName": "so",
         "version": "v1",
         "url": "/onap/so/infra/serviceInstantiation/{version:[vV][5-7]}/serviceInstances/{serviceInstanceId}/configurations/{configurationInstanceId}/disablePort",
         "protocol": "REST",
-        "port": "{{ .Values.service.externalPort }}",
+        "port": "{{ .Values.service.internalPort }}",
         "visualRange":"0",
         "lb_policy":"ip_hash"
          },
           {
-        "serviceName": "so/apih",
+        "serviceName": "so",
         "version": "v1",
         "url": "/onap/so/infra/serviceInstantiation/{version:[vV][5-7]}/serviceInstances/{serviceInstanceId}/configurations/{configurationInstanceId}/activate",
         "protocol": "REST",
-        "port": "{{ .Values.service.externalPort }}",
+        "port": "{{ .Values.service.internalPort }}",
         "visualRange":"0",
         "lb_policy":"ip_hash"
          },
          {
-        "serviceName": "so/apih",
+        "serviceName": "so",
         "version": "v1",
         "url": "/onap/so/infra/serviceInstantiationRequests/{version:[vV][5-7]}/serviceInstances/{serviceInstanceId}/configurations/{configurationInstanceId}/deactivate",
         "protocol": "REST",
-        "port": "{{ .Values.service.externalPort }}",
+        "port": "{{ .Values.service.internalPort }}",
         "visualRange":"0",
         "lb_policy":"ip_hash"
          },
          {
-        "serviceName": "so/apih",
+        "serviceName": "so",
         "version": "v1",
         "url": "/onap/so/infra/serviceInstantiationRequests/{version:[vV][6-7]}/serviceInstances/{serviceInstanceId}/addRelationships",
         "protocol": "REST",
-        "port": "{{ .Values.service.externalPort }}",
+        "port": "{{ .Values.service.internalPort }}",
         "visualRange":"0",
         "lb_policy":"ip_hash"
          },
           {
-        "serviceName": "so/apih",
+        "serviceName": "so",
         "version": "v1",
         "url": "/onap/so/infra/serviceInstantiation/{version:[vV][6-7]}/serviceInstances/{serviceInstanceId}/removeRelationships",
         "protocol": "REST",
-        "port": "{{ .Values.service.externalPort }}",
+        "port": "{{ .Values.service.internalPort }}",
         "visualRange":"0",
         "lb_policy":"ip_hash"
          },
           {
-        "serviceName": "so/apih",
+        "serviceName": "so",
         "version": "v1",
         "url": "/onap/so/infra/serviceInstantiation/{version:[vV][5-7]}/serviceInstances/{serviceInstanceId}/vnfs",
         "protocol": "REST",
-        "port": "{{ .Values.service.externalPort }}",
+        "port": "{{ .Values.service.internalPort }}",
         "visualRange":"0",
         "lb_policy":"ip_hash"
          },
           {
-        "serviceName": "so/apih",
+        "serviceName": "so",
         "version": "v1",
         "url": "/onap/so/infra/serviceInstantiation/{version:[vV][5-7]}/serviceInstances/{serviceInstanceId}/vnfs/{vnfInstanceId}/replace",
         "protocol": "REST",
-        "port": "{{ .Values.service.externalPort }}",
+        "port": "{{ .Values.service.internalPort }}",
         "visualRange":"0",
         "lb_policy":"ip_hash"
          },
          {
-        "serviceName": "so/apih",
+        "serviceName": "so",
         "version": "v1",
         "url": "/onap/so/infra/serviceInstantiation/{version:[vV][5-7]}/serviceInstances/{serviceInstanceId}/vnfs/{vnfInstanceId}",
         "protocol": "REST",
-        "port": "{{ .Values.service.externalPort }}",
+        "port": "{{ .Values.service.internalPort }}",
         "visualRange":"0",
         "lb_policy":"ip_hash"
          },
          {
-        "serviceName": "so/apih",
+        "serviceName": "so",
         "version": "v1",
         "url": "/onap/so/infra/serviceInstantiation/{version:[vV][6-7]}/serviceInstances/{serviceInstanceId}/vnfs/{vnfInstanceId}/applyUpdatedConfig",
         "protocol": "REST",
-        "port": "{{ .Values.service.externalPort }}",
+        "port": "{{ .Values.service.internalPort }}",
         "visualRange":"0",
         "lb_policy":"ip_hash"
          },
           {
-        "serviceName": "so/apih",
+        "serviceName": "so",
         "version": "v1",
         "url": "/onap/so/infra/serviceInstantiation/{version:[vV][5-7]}/serviceInstances/{serviceInstanceId}/vnfs/{vnfInstanceId}",
         "protocol": "REST",
-        "port": "{{ .Values.service.externalPort }}",
+        "port": "{{ .Values.service.internalPort }}",
         "visualRange":"0",
         "lb_policy":"ip_hash"
          },
          {
-        "serviceName": "so/apih",
+        "serviceName": "so",
         "version": "v1",
         "url": "/onap/so/infra/serviceInstantiationRequests/{version:[vV][5-7]}/serviceInstances/{serviceInstanceId}/vnfs/{vnfInstanceId}/vfModules",
         "protocol": "REST",
-        "port": "{{ .Values.service.externalPort }}",
+        "port": "{{ .Values.service.internalPort }}",
         "visualRange":"0",
         "lb_policy":"ip_hash"
          },
          {
-        "serviceName": "so/apih",
+        "serviceName": "so",
         "version": "v1",
         "url": "/onap/so/infra/serviceInstantiationRequests/{version:[vV][5-7]}/serviceInstances/{serviceInstanceId}/vnfs/{vnfInstanceId}/vfModules/{vfmoduleInstanceId}/replace",
         "protocol": "REST",
-        "port": "{{ .Values.service.externalPort }}",
+        "port": "{{ .Values.service.internalPort }}",
         "visualRange":"0",
         "lb_policy":"ip_hash"
          },
           {
-        "serviceName": "so/apih",
+        "serviceName": "so",
         "version": "v1",
         "url": "/onap/so/infra/serviceInstantiationRequests/{version:[vV][5-7]}/serviceInstances/{serviceInstanceId}/vnfs/{vnfInstanceId}/vfModules/{vfmoduleInstanceId}",
         "protocol": "REST",
-        "port": "{{ .Values.service.externalPort }}",
+        "port": "{{ .Values.service.internalPort }}",
         "visualRange":"0",
         "lb_policy":"ip_hash"
          },
           {
-        "serviceName": "so/apih",
+        "serviceName": "so",
         "version": "v1",
         "url": "/onap/so/infra/serviceInstantiationRequests/{version:[vV][6-7]}/serviceInstances/{serviceInstanceId}/vnfs/{vnfInstanceId}/inPlaceSoftwareUpdate",
         "protocol": "REST",
-        "port": "{{ .Values.service.externalPort }}",
+        "port": "{{ .Values.service.internalPort }}",
         "visualRange":"0",
         "lb_policy":"ip_hash"
          },
           {
-        "serviceName": "so/apih",
+        "serviceName": "so",
         "version": "v1",
         "url": "/onap/so/infra/serviceInstantiationRequests/{version:[vV][5-7]}/serviceInstances/{serviceInstanceId}/vnfs/{vnfInstanceId}/vfModules/{vfmoduleInstanceId}",
         "protocol": "REST",
-        "port": "{{ .Values.service.externalPort }}",
+        "port": "{{ .Values.service.internalPort }}",
         "visualRange":"0",
         "lb_policy":"ip_hash"
          },
          {
-        "serviceName": "so/apih",
+        "serviceName": "so",
         "version": "v1",
         "url": "/onap/so/infra/serviceInstantiation/{version:[vV][7]}/serviceInstances/{serviceInstanceId}/vnfs/{vnfInstanceId}/vfModules/{vfmoduleInstanceId}/deactivateAndCloudDelete",
         "protocol": "REST",
-        "port": "{{ .Values.service.externalPort }}",
+        "port": "{{ .Values.service.internalPort }}",
         "visualRange":"0",
         "lb_policy":"ip_hash"
          },
          {
-        "serviceName": "so/apih",
+        "serviceName": "so",
         "version": "v1",
         "url": "/onap/so/infra/serviceInstantiation/{version:[vV][7]}/serviceInstances/{serviceInstanceId}/vnfs/{vnfInstanceId}/vfModules/scaleOut",
         "protocol": "REST",
-        "port": "{{ .Values.service.externalPort }}",
+        "port": "{{ .Values.service.internalPort }}",
         "visualRange":"0",
         "lb_policy":"ip_hash"
          },
           {
-        "serviceName": "so/apih",
+        "serviceName": "so",
         "version": "v1",
         "url": "/onap/so/infra/serviceInstantiation/{version:[vV][5-7]}/serviceInstances/{serviceInstanceId}/vnfs/{vnfInstanceId}/volumeGroups",
         "protocol": "REST",
-        "port": "{{ .Values.service.externalPort }}",
+        "port": "{{ .Values.service.internalPort }}",
         "visualRange":"0",
         "lb_policy":"ip_hash"
          },
          {
-        "serviceName": "so/apih",
+        "serviceName": "so",
         "version": "v1",
         "url": "/onap/so/infra/serviceInstantiationRequests/{version:[vV][5-7]}/serviceInstances/{serviceInstanceId}/vnfs/{vnfInstanceId}/volumeGroups/{volumeGroupInstanceId}",
         "protocol": "REST",
-        "port": "{{ .Values.service.externalPort }}",
+        "port": "{{ .Values.service.internalPort }}",
         "visualRange":"0",
         "lb_policy":"ip_hash"
          },
          {
-        "serviceName": "so/apih",
+        "serviceName": "so",
         "version": "v1",
         "url": "/onap/so/infra/serviceInstantiationRequests/{version:[vV][5-7]}/serviceInstances/{serviceInstanceId}/vnfs/{vnfInstanceId}/volumeGroups/{volumeGroupInstanceId}",
         "protocol": "REST",
-        "port": "{{ .Values.service.externalPort }}",
+        "port": "{{ .Values.service.internalPort }}",
         "visualRange":"0",
         "lb_policy":"ip_hash"
          },
           {
-        "serviceName": "so/apih",
+        "serviceName": "so",
         "version": "v1",
         "url": "/onap/so/infra/serviceInstantiation/{version:[vV][5-7]}/serviceInstances/{serviceInstanceId}/networks",
         "protocol": "REST",
-        "port": "{{ .Values.service.externalPort }}",
+        "port": "{{ .Values.service.internalPort }}",
         "visualRange":"0",
         "lb_policy":"ip_hash"
          },
           {
-        "serviceName": "so/apih",
+        "serviceName": "so",
         "version": "v1",
         "url": "/onap/so/infra/serviceInstantiationRequests/{version:[vV][5-7]}/serviceInstances/{serviceInstanceId}/networks/{networkInstanceId}",
         "protocol": "REST",
-        "port": "{{ .Values.service.externalPort }}",
+        "port": "{{ .Values.service.internalPort }}",
         "visualRange":"0",
         "lb_policy":"ip_hash"
          },
           {
-        "serviceName": "so/apih",
+        "serviceName": "so",
         "version": "v1",
         "url": "/onap/so/infra/serviceInstantiationRequests/{version:[vV][5-7]}/serviceInstances/{serviceInstanceId}/networks/{networkInstanceId}",
         "protocol": "REST",
-        "port": "{{ .Values.service.externalPort }}",
+        "port": "{{ .Values.service.internalPort }}",
         "visualRange":"0",
         "lb_policy":"ip_hash"
          }
@@ -390,12 +392,12 @@ spec:
     {{if eq .Values.service.type "NodePort" -}}
     - port: {{ .Values.service.internalPort }}
       nodePort: {{ .Values.global.nodePortPrefix | default .Values.nodePortPrefix }}{{ .Values.service.nodePort }}
-      name: {{ .Values.service.portName }}
+      name: {{ .Values.service.portName }}{{ if (include "common.needTLS" .) }}s{{ end }}
     {{- else -}}
     - port: {{ .Values.service.externalPort }}
       targetPort: {{ .Values.service.internalPort }}
-      name: {{ .Values.service.portName }}
+      name: {{ .Values.service.portName }}{{ if (include "common.needTLS" .) }}s{{ end }}
     {{- end}}
   selector:
     app: {{ include "common.name" . }}
-    release: {{ .Release.Name }}
\ No newline at end of file
+    release: {{ include "common.release" . }}