From 7ba8cd1c09cd59ece9925d21b87f7d64f2272ad8 Mon Sep 17 00:00:00 2001
From: Zhe <zhehuang@research.att.com>
Date: Wed, 1 Apr 2020 22:25:41 -0400
Subject: [PATCH] Replace under scores in xapp helm resource files that create
 helm chart rendering errors

Issue-ID: RIC-215
Signed-off-by: Zhe <zhehuang@research.att.com>
Change-Id: I274b62559d67bc01baf909260bba31ee57e55900
---
 .../xapp_onboarder/resources/xapp-std/templates/deployment.yaml   | 6 +++---
 .../xapp_onboarder/resources/xapp-std/templates/service-http.yaml | 4 ++--
 .../xapp_onboarder/resources/xapp-std/templates/service-rmr.yaml  | 8 ++++----
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/xapp_onboarder/xapp_onboarder/resources/xapp-std/templates/deployment.yaml b/xapp_onboarder/xapp_onboarder/resources/xapp-std/templates/deployment.yaml
index 48be8c5..6b24b9a 100644
--- a/xapp_onboarder/xapp_onboarder/resources/xapp-std/templates/deployment.yaml
+++ b/xapp_onboarder/xapp_onboarder/resources/xapp-std/templates/deployment.yaml
@@ -54,17 +54,17 @@ spec:
           {{- if .ports }}
           ports:
             {{- if .ports.http }}
-            - name: http_{{ .name }}
+            - name: http-{{ .name }}
               containerPort: {{ .ports.http }}
               protocol: TCP
             {{- end }}
             {{- if .ports.rmr_data }}
-            - name: rmrdata_{{ .name }}
+            - name: rmrdata-{{ .name }}
               containerPort: {{ .ports.rmr_data }}
               protocol: TCP
             {{- end }}
             {{- if .ports.rmr_route }}
-            - name: rmrroute_{{ .name }}
+            - name: rmrroute-{{ .name }}
               containerPort: {{ .ports.rmr_route }}
               protocol: TCP
             {{- end }}
diff --git a/xapp_onboarder/xapp_onboarder/resources/xapp-std/templates/service-http.yaml b/xapp_onboarder/xapp_onboarder/resources/xapp-std/templates/service-http.yaml
index dc6a69d..df12f36 100644
--- a/xapp_onboarder/xapp_onboarder/resources/xapp-std/templates/service-http.yaml
+++ b/xapp_onboarder/xapp_onboarder/resources/xapp-std/templates/service-http.yaml
@@ -31,9 +31,9 @@ spec:
   {{- if .ports }}
     {{- if .ports.http }}
     - port: {{  .ports.http  }}
-      targetPort: http_{{ .name }}
+      targetPort: http-{{ .name }}
       protocol: TCP
-      name: http_{{ .name }}
+      name: http-{{ .name }}
     {{- end }}
   {{- end }}
   {{- end }}
diff --git a/xapp_onboarder/xapp_onboarder/resources/xapp-std/templates/service-rmr.yaml b/xapp_onboarder/xapp_onboarder/resources/xapp-std/templates/service-rmr.yaml
index 9b0c1ed..9a5d102 100644
--- a/xapp_onboarder/xapp_onboarder/resources/xapp-std/templates/service-rmr.yaml
+++ b/xapp_onboarder/xapp_onboarder/resources/xapp-std/templates/service-rmr.yaml
@@ -31,15 +31,15 @@ spec:
   {{- if .ports }}
     {{- if .ports.rmr_data }}
     - port: {{ .ports.rmr_data }}
-      targetPort: rmrdata_{{ .name }}
+      targetPort: rmrdata-{{ .name }}
       protocol: TCP
-      name: rmrdata_{{ .name }}
+      name: rmrdata-{{ .name }}
     {{- end }}
     {{- if .ports.rmr_route }}
     - port: {{ .ports.rmr_route }}
-      targetPort: rmrroute_{{ .name }}
+      targetPort: rmrroute-{{ .name }}
       protocol: TCP
-      name: rmrroute_{{ .name }}
+      name: rmrroute-{{ .name }}
     {{- end }}
   {{- end }}
   {{- end }}
-- 
2.16.6