Merge "Update docker version"

[it/dep.git] / ric-platform / 50-RIC-Platform / helm / appmgr / templates / appconfig.yaml

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 7c6efb8..1a15217 100644 (file)
--- 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 }}