Fix some bugs that produce wrong service name

[it/dev.git] / xapp_onboarder / xapp_onboarder / resources / xapp-std / templates / service.yaml

diff --git a/xapp_onboarder/xapp_onboarder/resources/xapp-std/templates/service-http.yaml b/xapp_onboarder/xapp_onboarder/resources/xapp-std/templates/service.yaml
similarity index 87%
rename from xapp_onboarder/xapp_onboarder/resources/xapp-std/templates/service-http.yaml
rename to xapp_onboarder/xapp_onboarder/resources/xapp-std/templates/service.yaml
index df12f36..97fb35e 100644 (file)
--- a/xapp_onboarder/xapp_onboarder/resources/xapp-std/templates/service-http.yaml
+++ b/xapp_onboarder/xapp_onboarder/resources/xapp-std/templates/service.yaml
@@ -17,7 +17,7 @@
 apiVersion: v1
 kind: Service
 metadata:
-  name: {{ include "ricxapp.servicename.http" . }}
+  name: {{ include "ricxapp.servicename" . }}
   namespace: {{ include "ricxapp.namespace" . }}
   labels:
     app: {{ include "ricxapp.namespace" . }}-{{ include "ricxapp.name" . }}
@@ -27,15 +27,11 @@ metadata:
 spec:
   type: ClusterIP
   ports:
-  {{- range .Values.containers }}
-  {{- if .ports }}
-    {{- if .ports.http }}
-    - port: {{  .ports.http  }}
-      targetPort: http-{{ .name }}
+  {{- range .Values.messaging.ports  }}
+    - port: {{ .port }}
+      targetPort: {{ .name }}
       protocol: TCP
-      name: http-{{ .name }}
-    {{- end }}
-  {{- end }}
+      name: {{ .name }}
   {{- end }}
   selector:
     app: {{ include "ricxapp.namespace" . }}-{{ include "ricxapp.name" . }}