Fix tiller not being able to talk to kubeapi server issue. Fix appmgr not using xappt...

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

diff --git a/ric-platform/50-RIC-Platform/helm/appmgr/templates/env.yaml b/ric-platform/50-RIC-Platform/helm/appmgr/templates/env.yaml
index 69ef4a1..e87d3e1 100644 (file)
--- a/ric-platform/50-RIC-Platform/helm/appmgr/templates/env.yaml
+++ b/ric-platform/50-RIC-Platform/helm/appmgr/templates/env.yaml
@@ -30,10 +30,14 @@ data:
   RMR_RTG_SVC: {{ include "common.serviceport.appmgr.rmr.route" . | quote }}
 {{- $certPath := .Values.appmgr.appcertpath | default "/opt/ric/certificates" }}
 {{- $secretPath := .Values.appmgr.appsecretpath | default "/opt/ric/secret" }}
+{{- $servicename := include "common.servicename.tiller" $ctx }}
+{{- $servicenamespace := include "common.tillerDeployNameSpace" $ctx }}
+{{- $serviceport := include "common.tillerPort" $ctx }}
+  HELM_HOST: {{ printf "%s.%s:%s" $servicename $servicenamespace $serviceport | quote }}
 {{- if eq (include "common.tillerTLSVerify" $ctx) "true" }}
   HELM_TLS_VERIFY: "true"
   HELM_TLS_CA_CERT: "{{ $secretPath }}/tiller-ca.cert"
-  HELM_TLS_HOSTNAME: {{ include "common.servicename.tiller" $ctx | quote }}
+  HELM_TLS_HOSTNAME: {{ $servicename | quote }}
 {{- end }}
 {{- if eq (include "common.tillerTLSAuthenticate" $ctx) "true"  }}
   HELM_TLS_ENABLED: "true"