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=311283a184515529ac845c8bdcb2f689e0962027;hb=refs%2Fchanges%2F34%2F1234%2F9;hp=0985e505873fa9a6c82905928f9ac9473baea6ea;hpb=033ab424056c2de6bdbc22479e961aeebbaddd37;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 0985e505..311283a1 100644
--- a/ric-platform/50-RIC-Platform/helm/appmgr/templates/appconfig.yaml
+++ b/ric-platform/50-RIC-Platform/helm/appmgr/templates/appconfig.yaml
@@ -14,16 +14,19 @@
 #   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:
-  name: {{ include "appmgr.fullname" . }}-appconfig
+  name: {{ include "common.configmapname.appmgr" . }}-appconfig
 data:
-  {{- $restport := default ":8080" (printf ":%.0f" .Values.containerPort) | quote -}}
-  {{- $helmrepo := include "common.helmrepository" . | quote -}}
-  {{- $reponame := default "helm-repo" .Values.reponame | quote -}}
-  {{- $tiller := include "common.helmrepositorytiller" . | quote -}}
-  {{- $tillernamespace := include "common.helmrepositorytillernamespace" . | quote -}}
-  {{- $tillerport := include "common.helmrepositorytillerport" . | quote -}}
-  {{- (.Files.Glob "resources/xapp-manager.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 }}
+    {{- $restport := (printf ":%s" (include "common.serviceport.appmgr.http" .) ) | quote -}}
+    {{- $helmrepo := include "common.helmrepository" . | quote -}}
+    {{- $reponame := default "helm-repo" .Values.appmgr.reponame | 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__" $tillerservice | replace "__TILLER_NAMESPACE__" $tillerdeploynamespace | replace "__TILLER_PORT__" $tillerport | nindent 2 }}