X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=ric-platform%2F50-RIC-Platform%2Fhelm%2Fappmgr%2Ftemplates%2Fappconfig.yaml;fp=ric-platform%2F50-RIC-Platform%2Fhelm%2Fappmgr%2Ftemplates%2Fappconfig.yaml;h=311283a184515529ac845c8bdcb2f689e0962027;hb=f1e9d069ec4ae0e35202b1d508f2652986036342;hp=84866edfb09ab972bd3f7c2331417577f293c287;hpb=44fb7269ad17f3e307ab32bc85e737bf9ce1339f;p=it%2Fdep.git diff --git a/ric-platform/50-RIC-Platform/helm/appmgr/templates/appconfig.yaml b/ric-platform/50-RIC-Platform/helm/appmgr/templates/appconfig.yaml index 84866edf..311283a1 100644 --- a/ric-platform/50-RIC-Platform/helm/appmgr/templates/appconfig.yaml +++ b/ric-platform/50-RIC-Platform/helm/appmgr/templates/appconfig.yaml @@ -25,8 +25,8 @@ data: {{- $restport := (printf ":%s" (include "common.serviceport.appmgr.http" .) ) | quote -}} {{- $helmrepo := include "common.helmrepository" . | quote -}} {{- $reponame := default "helm-repo" .Values.appmgr.reponame | quote -}} - {{- $tiller := include "common.servicename.tiller" $ctx | quote -}} - {{- $tillernamespace := include "common.tillerNameSpace" $ctx | quote -}} + {{- $tillerdeploynamespace := include "common.tillerDeployNameSpace" $ctx -}} + {{- $tillerservice := include "common.servicename.tiller" $ctx -}} {{- $tillerport := include "common.tillerPort" $ctx | quote -}} {{- $xappnamespace := include "common.namespace.xapp" . | quote -}} - {{- (.Files.Glob "resources/appmgr.yaml").AsConfig | replace "__XAPP_NAMESPACE__" $xappnamespace | replace "__HELM_REPO__" $helmrepo | replace "__REST_PORT__" $restport | replace "__REPO_NAME__" $reponame | replace "__TILLER_SERVICE__" $tiller | replace "__TILLER_NAMESPACE__" $tillernamespace | replace "__TILLER_PORT__" $tillerport | nindent 2 }} + {{- (.Files.Glob "resources/appmgr.yaml").AsConfig | replace "__XAPP_NAMESPACE__" $xappnamespace | replace "__HELM_REPO__" $helmrepo | replace "__REST_PORT__" $restport | replace "__REPO_NAME__" $reponame | replace "__TILLER_SERVICE__" $tillerservice | replace "__TILLER_NAMESPACE__" $tillerdeploynamespace | replace "__TILLER_PORT__" $tillerport | nindent 2 }}