Merge "Integrate appmgr with common template. Add ingress controller entries in the...

[it/dep.git] / ric-platform / 50-RIC-Platform / helm / appmgr / templates / service.yaml

diff --git a/ric-platform/50-RIC-Platform/helm/appmgr/templates/service.yaml b/ric-platform/50-RIC-Platform/helm/appmgr/templates/service.yaml
index 5304628..6c1241a 100644 (file)
--- a/ric-platform/50-RIC-Platform/helm/appmgr/templates/service.yaml
+++ b/ric-platform/50-RIC-Platform/helm/appmgr/templates/service.yaml
@@ -18,7 +18,7 @@
 apiVersion: v1
 kind: Service
 metadata:
-  name: {{ include "appmgr.fullname" . }}
+  name: {{ include "common.servicename.appmgr" . }}
   namespace: {{ include "common.namespace" . }}
   labels:
     app: {{ include "common.namespace" . }}-{{ include "common.name" . }}
@@ -26,12 +26,12 @@ metadata:
     release: {{ .Release.Name }}
     heritage: {{ .Release.Service }} 
 spec:
-  type: {{ .Values.service.type }}
+  type: {{ .Values.appmgr.service.type }}
   ports:
-    - port: {{ .Values.service.appmgr.port }}
-      protocol: {{ .Values.service.appmgr.protocol }}
-      name: "{{ .Values.service.appmgr.name }}"
-      {{ if (eq .Values.service.type "NodePort") }}nodePort: {{ .Values.service.appmgr.extport }} {{ end }}
+    - port: {{ .Values.appmgr.service.port }}
+      protocol: {{ .Values.appmgr.service.protocol }}
+      name: "{{ .Values.appmgr.service.name }}"
+      {{ if (eq .Values.appmgr.service.type "NodePort") }}nodePort: {{ .Values.appmgr.service.extport }} {{ end }}
   selector:
     app: {{ include "common.namespace" . }}-{{ include "common.name" . }}
     release: {{ .Release.Name }}