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=02275f020cc49a750e6eff091b4f405222112e5b;hb=563da71692a22c4ad04089f756fcebb86944e787;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..02275f02 100644 --- a/ric-platform/50-RIC-Platform/helm/appmgr/templates/appconfig.yaml +++ b/ric-platform/50-RIC-Platform/helm/appmgr/templates/appconfig.yaml @@ -18,12 +18,12 @@ 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 := 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 }}