X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=ric-platform%2F50-RIC-Platform%2Fhelm%2Fappmgr%2Ftemplates%2Fenv.yaml;h=e87d3e16471dd81b50a6e7a649cca95d012765b9;hb=3faa1eecb410bc1b7134797ddccb807f9868476b;hp=d371589b4e6ee4da57e6e7d3a0f8f9f51bd6add8;hpb=3803859c341dc62bdcd79ba94be585592a94672b;p=it%2Fdep.git

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 d371589b..e87d3e16 100644
--- a/ric-platform/50-RIC-Platform/helm/appmgr/templates/env.yaml
+++ b/ric-platform/50-RIC-Platform/helm/appmgr/templates/env.yaml
@@ -14,7 +14,9 @@
 #   See the License for the specific language governing permissions and        #
 #   limitations under the License.                                             #
 ################################################################################
-
+{{- $tillerKey := .Values.appmgr.tillerkey | default "ricxapp" }}
+{{- $topCtx :=  . }}
+{{- $ctx := dict "ctx" $topCtx "key" $tillerKey }}
 apiVersion: v1
 kind: ConfigMap
 metadata:
@@ -22,7 +24,23 @@ metadata:
 data:
   NAME: "xappmgr"
   DBAAS_SERVICE_HOST: {{ include "common.servicename.dbaas.tcp" . | quote }}
-  DBAAS_SERVICE_PORT: "6379"
+  DBAAS_SERVICE_PORT: {{ include "common.serviceport.dbaas.tcp" . | quote }}
   DBAAS_PORT_6379_TCP_ADDR: {{ include "common.servicename.dbaas.tcp" . | quote }}
-  DBAAS_PORT_6379_TCP_PORT: "6379"
-  RMR_RTG_SVC: "{{ .Values.appmgr.service.rmr.route.port }}"
+  DBAAS_PORT_6379_TCP_PORT: {{ include "common.serviceport.dbaas.tcp" . | quote }} 
+  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: {{ $servicename | quote }}
+{{- end }}
+{{- if eq (include "common.tillerTLSAuthenticate" $ctx) "true"  }}
+  HELM_TLS_ENABLED: "true"
+  HELM_TLS_CERT: "{{ $secretPath }}/helm-client.cert"
+  HELM_TLS_KEY: "{{ $secretPath }}/helm-client.key"
+{{- end }}