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;h=84866edfb09ab972bd3f7c2331417577f293c287;hb=refs%2Fchanges%2F06%2F106%2F24;hp=894e2b1ef27d1fd0145e3598aa8095983f708569;hpb=3aac30b15cf0c89b543b4ad0ad7fc9a5a67c873a;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 894e2b1e..84866edf 100644
--- a/ric-platform/50-RIC-Platform/helm/appmgr/templates/appconfig.yaml
+++ b/ric-platform/50-RIC-Platform/helm/appmgr/templates/appconfig.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:
@@ -23,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.helmrepositorytiller" . | quote -}}
-    {{- $tillernamespace := include "common.helmrepositorytillernamespace" . | quote -}}
-    {{- $tillerport := include "common.helmrepositorytillerport" . | quote -}}
+    {{- $tiller := include "common.servicename.tiller" $ctx | quote -}}
+    {{- $tillernamespace := include "common.tillerNameSpace" $ctx | quote -}}
+    {{- $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 }}