X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=kubernetes%2Fdmaap%2Fcomponents%2Fdmaap-dr-prov%2Ftemplates%2Fservice.yaml;h=d33cb297db2782244ebe9d50a2c7c68cce9b4146;hb=e346a97490358e693ae8ee7869745887e8fc3824;hp=691c9dcc9f6ed1a30034026c68d5364a9a7f3054;hpb=efeefc26e58229d193603960c1ea4266eccfdd14;p=oom.git

diff --git a/kubernetes/dmaap/components/dmaap-dr-prov/templates/service.yaml b/kubernetes/dmaap/components/dmaap-dr-prov/templates/service.yaml
index 691c9dcc9f..d33cb297db 100644
--- a/kubernetes/dmaap/components/dmaap-dr-prov/templates/service.yaml
+++ b/kubernetes/dmaap/components/dmaap-dr-prov/templates/service.yaml
@@ -15,46 +15,48 @@
 apiVersion: v1
 kind: Service
 metadata:
-  name: {{.Values.config.dmaapDrProv.name}}
+  name: {{ default "dmaap-dr-prov" .Values.global.dmaapDrProvName }}
   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:
     service.alpha.kubernetes.io/tolerate-unready-endpoints: "true"
     msb.onap.org/service-info: '[
       {
-          "serviceName": "{{.Values.config.dmaapDrProv.name}}",
+          "serviceName": "{{ .Values.global.dmaapDrProvName }}",
           "version": "v1",
           "url": "/",
           "protocol": "REST",
-          "port": "{{.Values.config.dmaapDrProv.externalPort}}",
+          "port": "{{ .Values.global.dmaapDrProvExtPort2 }}",
           "visualRange":"1"
       }
       ]'
 
 spec:
-  type: {{.Values.config.dmaapDrProv.servicetype}}
+  type: {{ .Values.config.dmaapDrProv.servicetype }}
   ports:
-    {{if eq .Values.config.dmaapDrProv.servicetype "NodePort" -}}
-    - port: {{.Values.config.dmaapDrProv.externalPort}}
-      targetPort: {{.Values.config.dmaapDrProv.internalPort}}
-      nodePort: {{ .Values.global.nodePortPrefix | default .Values.nodePortPrefix }}{{.Values.config.dmaapDrProv.nodePort}}
-      name: {{.Values.config.dmaapDrProv.name}}
-    - port: {{.Values.config.dmaapDrProv.externalPort2}}
-      targetPort: {{.Values.config.dmaapDrProv.internalPort2}}
-      nodePort: {{ .Values.global.nodePortPrefix | default .Values.nodePortPrefix }}{{.Values.config.dmaapDrProv.nodePort2}}
-      name: {{.Values.config.dmaapDrProv.name}}2
+    {{- if eq .Values.config.dmaapDrProv.servicetype "NodePort" -}}
+    {{- if .Values.global.allow_http }}
+    - port: {{ .Values.global.dmaapDrProvExtPort }}
+      targetPort: {{ .Values.config.dmaapDrProv.internalPort }}
+      nodePort: {{ .Values.global.nodePortPrefix | default .Values.nodePortPrefix }}{{ .Values.config.dmaapDrProv.nodePort }}
+      name: {{ .Values.config.dmaapDrProv.portName }}
+    {{- end}}
+    - port: {{ .Values.global.dmaapDrProvExtPort2 }}
+      targetPort: {{ .Values.config.dmaapDrProv.internalPort2 }}
+      nodePort: {{ .Values.global.nodePortPrefix | default .Values.nodePortPrefix }}{{ .Values.config.dmaapDrProv.nodePort2 }}
+      name: {{ .Values.config.dmaapDrProv.portName }}2
     {{- else -}}
-    - port: {{.Values.config.dmaapDrProv.externalPort}}
-      targetPort: {{.Values.config.dmaapDrProv.internalPort}}
-      name: {{.Values.config.dmaapDrProv.name}}
-    - port: {{.Values.config.dmaapDrProv.externalPort2}}
-      targetPort: {{.Values.config.dmaapDrProv.internalPort2}}
-      name: {{.Values.config.dmaapDrProv.name}}2
+    - port: {{ .Values.global.dmaapDrProvExtPort }}
+      targetPort: {{ .Values.config.dmaapDrProv.internalPort }}
+      name: {{ .Values.config.dmaapDrProv.portName }}
+    - port: {{ .Values.global.dmaapDrProvExtPort2 }}
+      targetPort: {{ .Values.config.dmaapDrProv.internalPort2 }}
+      name: {{ .Values.config.dmaapDrProv.portName }}2
     {{- end}}
   selector:
     app: {{ include "common.name" . }}
-    release: {{ .Release.Name }}
\ No newline at end of file
+    release: {{ include "common.release" . }}
\ No newline at end of file