From 5473b20187ca332b12bc9776928f3082a6867d83 Mon Sep 17 00:00:00 2001
From: wrider <lji@research.att.com>
Date: Wed, 26 Jun 2019 18:54:16 -0400
Subject: [PATCH 1/1] Minor fixes

Change-Id: Icb5b38b4b01ecf2b2a95731d042caf1a5a66a039
Signed-off-by: wrider <lji@research.att.com>
---
 ric-platform/50-RIC-Platform/bin/install                     |  6 ++++--
 .../helm/a1mediator/templates/ingress-a1mediator.yaml        |  4 ++--
 .../50-RIC-Platform/helm/appmgr/templates/deployment.yaml    |  4 ++++
 .../helm/appmgr/templates/ingress-appmgr.yaml                |  4 ++--
 .../50-RIC-Platform/helm/common/templates/_servicename.tpl   |  2 +-
 .../helm/kong-xapp/templates/ingress-xapp.yaml               | 12 ------------
 6 files changed, 13 insertions(+), 19 deletions(-)
 delete mode 100644 ric-platform/50-RIC-Platform/helm/kong-xapp/templates/ingress-xapp.yaml

diff --git a/ric-platform/50-RIC-Platform/bin/install b/ric-platform/50-RIC-Platform/bin/install
index 75590bee..eee5e52c 100755
--- a/ric-platform/50-RIC-Platform/bin/install
+++ b/ric-platform/50-RIC-Platform/bin/install
@@ -53,13 +53,15 @@ helm package -d /tmp $DIR/../helm/common
 for component in $RICPLT_COMPONENTS; do
   echo "Preparing chart for comonent $component"
 
-  if [ $component = "kong-platform" ]; then 
+  if [ $component = "kong-platform" ]; then
+     mkdir -p $DIR/../helm/$component/charts
      helm dep up $DIR/../helm/$component
      helm install --namespace ricplt --name "${RELEASE_NAME}-$component" $DIR/../helm/$component --set postgresql.enabled=false --set env.database=off
      continue
   fi
 
-  if [ $component = "kong-xapp" ]; then 
+  if [ $component = "kong-xapp" ]; then
+     mkdir -p $DIR/../helm/$component/charts 
      helm dep up $DIR/../helm/$component
      helm install --namespace ricxapp --name "${RELEASE_NAME}-$component" $DIR/../helm/$component --set postgresql.enabled=false --set env.database=off
      continue
diff --git a/ric-platform/50-RIC-Platform/helm/a1mediator/templates/ingress-a1mediator.yaml b/ric-platform/50-RIC-Platform/helm/a1mediator/templates/ingress-a1mediator.yaml
index 8147541a..c0658d3c 100644
--- a/ric-platform/50-RIC-Platform/helm/a1mediator/templates/ingress-a1mediator.yaml
+++ b/ric-platform/50-RIC-Platform/helm/a1mediator/templates/ingress-a1mediator.yaml
@@ -8,5 +8,5 @@ spec:
       paths:
       - path: /a1mediator
         backend:
-          serviceName: {{ include "a1mediator.fullname" . }}
-          servicePort: {{ .Values.httpservice.port }}
\ No newline at end of file
+          serviceName: {{ include "common.servicename.a1mediator" . }}
+          servicePort: {{ .Values.httpservice.port }}
diff --git a/ric-platform/50-RIC-Platform/helm/appmgr/templates/deployment.yaml b/ric-platform/50-RIC-Platform/helm/appmgr/templates/deployment.yaml
index dbcd3152..acce1325 100644
--- a/ric-platform/50-RIC-Platform/helm/appmgr/templates/deployment.yaml
+++ b/ric-platform/50-RIC-Platform/helm/appmgr/templates/deployment.yaml
@@ -38,6 +38,10 @@ spec:
         release: {{ .Release.Name }}
     spec:
       hostname: {{ .Chart.Name }}
+      hostAliases:
+        - ip: "137.135.91.204"
+          hostnames:
+            - "snapshot.helm.ranco-dev-tools.eastus.cloudapp.azure.com"
       imagePullSecrets:
         - name: {{ include "common.repositoryCred" . }}
       containers:
diff --git a/ric-platform/50-RIC-Platform/helm/appmgr/templates/ingress-appmgr.yaml b/ric-platform/50-RIC-Platform/helm/appmgr/templates/ingress-appmgr.yaml
index d2342a50..1f3d49f5 100644
--- a/ric-platform/50-RIC-Platform/helm/appmgr/templates/ingress-appmgr.yaml
+++ b/ric-platform/50-RIC-Platform/helm/appmgr/templates/ingress-appmgr.yaml
@@ -8,5 +8,5 @@ spec:
       paths:
       - path: /appmgr
         backend:
-          serviceName: {{ include "appmgr.fullname" . }}
-          servicePort: {{ .Values.appmgr.service.port }}
\ No newline at end of file
+          serviceName: {{ include "common.servicename.appmgr" . }}
+          servicePort: {{ .Values.appmgr.service.port }}
diff --git a/ric-platform/50-RIC-Platform/helm/common/templates/_servicename.tpl b/ric-platform/50-RIC-Platform/helm/common/templates/_servicename.tpl
index 20e381af..4e93d432 100644
--- a/ric-platform/50-RIC-Platform/helm/common/templates/_servicename.tpl
+++ b/ric-platform/50-RIC-Platform/helm/common/templates/_servicename.tpl
@@ -34,7 +34,7 @@
 {{- end -}}
 
 {{- define "common.servicename.dbaas" -}}
-  {{- $name := ( include "common.fullname.dbaas" . ) -}}
+  {{- $name := ( include "common.name.dbaas" . ) -}}
   {{- printf "service-%s" $name | trunc 63 | trimSuffix "-" -}}
 {{- end -}}
 
diff --git a/ric-platform/50-RIC-Platform/helm/kong-xapp/templates/ingress-xapp.yaml b/ric-platform/50-RIC-Platform/helm/kong-xapp/templates/ingress-xapp.yaml
deleted file mode 100644
index 54d7abf7..00000000
--- a/ric-platform/50-RIC-Platform/helm/kong-xapp/templates/ingress-xapp.yaml
+++ /dev/null
@@ -1,12 +0,0 @@
-apiVersion: extensions/v1beta1
-kind: Ingress
-metadata:
-  name: ric-ingress-xapp
-spec:
-  rules:
-  - http:
-      paths:
-      - path: /anr
-        backend:
-          serviceName: r0-xapp-anr
-          servicePort: 9999
\ No newline at end of file
-- 
2.16.6