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=1a1521755c273405a95d3dc21f70de0259eb9c83;hb=3803859c341dc62bdcd79ba94be585592a94672b;hp=7c6efb893c313ecb32f95613865d9c86624187d9;hpb=6be690a94ce6d07750a9783f31f36f8ae3854703;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 7c6efb89..1a152175 100644 --- a/ric-platform/50-RIC-Platform/helm/appmgr/templates/appconfig.yaml +++ b/ric-platform/50-RIC-Platform/helm/appmgr/templates/appconfig.yaml @@ -20,10 +20,11 @@ kind: ConfigMap metadata: name: {{ include "common.configmapname.appmgr" . }}-appconfig data: - {{- $restport := default ":8080" (printf ":%.0f" .Values.appmgr.containerPort) | quote -}} + {{- $restport := default ":8080" (printf ":%.0f" .Values.appmgr.service.http.containerPort) | 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 -}} - {{- (.Files.Glob "resources/appmgr.yaml").AsConfig | 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 }} + {{- $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 }}