X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=ric-common%2FCommon-Template%2Fhelm%2Fric-common%2Ftemplates%2F_name.tpl;h=d2f17e96cfb5ac2c560601591a9f34ecf483caaf;hb=refs%2Fchanges%2F34%2F1234%2F9;hp=f712184490d67cd478c3bf01f9272d366f30b126;hpb=e29b9bed3c1581f35e7f3bc5e5ab162897bc9e6b;p=it%2Fdep.git

diff --git a/ric-common/Common-Template/helm/ric-common/templates/_name.tpl b/ric-common/Common-Template/helm/ric-common/templates/_name.tpl
index f7121844..d2f17e96 100644
--- a/ric-common/Common-Template/helm/ric-common/templates/_name.tpl
+++ b/ric-common/Common-Template/helm/ric-common/templates/_name.tpl
@@ -35,7 +35,8 @@
 
 {{- define "common.fullname.appmgr" -}}
   {{- $name := ( include "common.name.appmgr" . ) -}}
-  {{- printf "%s-%s" .Release.Namespace $name | trunc 63 | trimSuffix "-" -}}
+  {{- $namespace := ( include "common.namespace.platform" . ) -}}
+  {{- printf "%s-%s" $namespace $name | trunc 63 | trimSuffix "-" -}}
 {{- end -}}
 
 
@@ -53,7 +54,8 @@
 
 {{- define "common.fullname.dbaas" -}}
   {{- $name := ( include "common.name.dbaas" . ) -}}
-  {{- printf "%s-%s" .Release.Namespace $name | trunc 63 | trimSuffix "-" -}}
+  {{- $namespace := ( include "common.namespace.platform" . ) -}}
+  {{- printf "%s-%s" $namespace $name | trunc 63 | trimSuffix "-" -}}
 {{- end -}}
 
 
@@ -81,25 +83,28 @@
 
 {{- define "common.fullname.e2mgr" -}}
   {{- $name := ( include "common.name.e2mgr" . ) -}}
-  {{- printf "%s-%s" .Release.Namespace $name | trunc 63 | trimSuffix "-" -}}
+  {{- $namespace := ( include "common.namespace.platform" . ) -}}
+  {{- printf "%s-%s" $namespace $name | trunc 63 | trimSuffix "-" -}}
 {{- end -}}
 
-{{- define "common.name.e2term" -}}
-  {{- if .Values.e2term -}}
-    {{- if .Values.e2term.nameOverride -}}
-      {{- printf "%s" .Values.e2term.nameOverride -}}
+
+{{- define "common.name.rsm" -}}
+  {{- if .Values.rsm -}}
+    {{- if .Values.rsm.nameOverride -}}
+      {{- printf "%s" .Values.rsm.nameOverride -}}
     {{- else -}}
-      {{- printf "e2term" -}}
+      {{- printf "rsm" -}}
     {{- end -}}
   {{- else -}}
-    {{- printf "e2term" -}}
+    {{- printf "rsm" -}}
   {{- end -}}
 {{- end -}}
 
 
-{{- define "common.fullname.e2term" -}}
-  {{- $name := ( include "common.name.e2term" . ) -}}
-  {{- printf "%s-%s" .Release.Namespace $name | trunc 63 | trimSuffix "-" -}}
+{{- define "common.fullname.rsm" -}}
+  {{- $name := ( include "common.name.rsm" . ) -}}
+  {{- $namespace := ( include "common.namespace.platform" . ) -}}
+  {{- printf "%s-%s" $namespace $name | trunc 63 | trimSuffix "-" -}}
 {{- end -}}
 
 
@@ -108,8 +113,6 @@
 
 
 
-
-
 {{- define "common.name.rtmgr" -}}
   {{- if .Values.rtmgr -}}
     {{- if .Values.rtmgr.nameOverride -}}
@@ -125,7 +128,32 @@
 
 {{- define "common.fullname.rtmgr" -}}
   {{- $name := ( include "common.name.rtmgr" . ) -}}
-  {{- printf "%s-%s" .Release.Namespace $name | trunc 63 | trimSuffix "-" -}}
+  {{- $namespace := ( include "common.namespace.platform" . ) -}}
+  {{- printf "%s-%s" $namespace $name | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+
+
+
+
+
+
+{{- define "common.name.submgr" -}}
+  {{- if .Values.submgr -}}
+    {{- if .Values.submgr.nameOverride -}}
+      {{- printf "%s" .Values.submgr.nameOverride -}}
+    {{- else -}}
+      {{- printf "submgr" -}}
+    {{- end -}}
+  {{- else -}}
+    {{- printf "submgr" -}}
+  {{- end -}}
+{{- end -}}
+
+
+{{- define "common.fullname.submgr" -}}
+  {{- $name := ( include "common.name.submgr" . ) -}}
+  {{- $namespace := ( include "common.namespace.platform" . ) -}}
+  {{- printf "%s-%s" $namespace $name | trunc 63 | trimSuffix "-" -}}
 {{- end -}}
 
 
@@ -148,7 +176,48 @@
 
 {{- define "common.fullname.a1mediator" -}}
   {{- $name := ( include "common.name.a1mediator" . ) -}}
-  {{- printf "%s-%s" .Release.Namespace $name | trunc 63 | trimSuffix "-" -}}
+  {{- $namespace := ( include "common.namespace.platform" . ) -}}
+  {{- printf "%s-%s" $namespace $name | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+
+
+{{- define "common.name.vespamgr" -}}
+  {{- if .Values.vespamgr -}}
+    {{- if .Values.vespamgr.nameOverride -}}
+      {{- printf "%s" .Values.vespamgr.nameOverride -}}
+    {{- else -}}
+      {{- printf "vespamgr" -}}
+    {{- end -}}
+  {{- else -}}
+    {{- printf "vespamgr" -}}
+  {{- end -}}
+{{- end -}}
+
+
+{{- define "common.fullname.vespamgr" -}}
+  {{- $name := ( include "common.name.vespamgr" . ) -}}
+  {{- $namespace := ( include "common.namespace.platform" . ) -}}
+  {{- printf "%s-%s" $namespace $name | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+
+
+{{- define "common.name.jaegeradapter" -}}
+  {{- if .Values.jaegeradapter -}}
+    {{- if .Values.jaegeradapter.nameOverride -}}
+      {{- printf "%s" .Values.jaegeradapter.nameOverride -}}
+    {{- else -}}
+      {{- printf "jaegeradapter" -}}
+    {{- end -}}
+  {{- else -}}
+    {{- printf "jaegeradapter" -}}
+  {{- end -}}
+{{- end -}}
+ 
+
+{{- define "common.fullname.jaegeradapter" -}}
+  {{- $name := ( include "common.name.jaegeradapter" . ) -}}
+  {{- $namespace := ( include "common.namespace.platform" . ) -}}
+  {{- printf "%s-%s" $namespace $name | trunc 63 | trimSuffix "-" -}}
 {{- end -}}
 
 
@@ -168,13 +237,87 @@
 
 {{- define "common.fullname.nexus" -}}
   {{- $name := ( include "common.name.nexus" . ) -}}
-  {{- printf "%s-%s" .Release.Namespace $name | trunc 63 | trimSuffix "-" -}}
+  {{- $namespace := ( include "common.namespace.infra" . ) -}}
+  {{- printf "%s-%s" $namespace $name | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+
+{{- define "common.name.chartmuseum" -}}
+  {{- if .Values.chartmuseum -}}
+    {{- if .Values.chartmuseum.nameOverride -}}
+      {{- printf "%s" .Values.chartmuseum.nameOverride -}}
+    {{- else -}}
+      {{- printf "chartmuseum" -}}
+    {{- end -}}
+  {{- else -}}
+    {{- printf "chartmuseum" -}}
+  {{- end -}}
+{{- end -}}
+
+
+{{- define "common.fullname.chartmuseum" -}}
+  {{- $name := ( include "common.name.chartmuseum" . ) -}}
+  {{- $namespace := ( include "common.namespace.infra" . ) -}}
+  {{- printf "%s-%s" $namespace $name | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+
+{{- define "common.name.dashboard" -}}
+  {{- if .Values.dashboard -}}
+    {{- if .Values.dashboard.nameOverride -}}
+      {{- printf "%s" .Values.dashboard.nameOverride -}}
+    {{- else -}}
+      {{- printf "dashboard" -}}
+    {{- end -}}
+  {{- else -}}
+    {{- printf "dashboard" -}}
+  {{- end -}}
 {{- end -}}
 
 
+{{- define "common.fullname.dashboard" -}}
+  {{- $name := ( include "common.name.dashboard" . ) -}}
+  {{- $namespace := ( include "common.namespace.aux" . ) -}}
+  {{- printf "%s-%s" $namespace $name | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+
+{{- define "common.name.messagerouter" -}}
+  {{- if .Values.messagerouter -}}
+    {{- if .Values.messagerouter.nameOverride -}}
+      {{- printf "%s" .Values.messagerouter.nameOverride -}}
+    {{- else -}}
+      {{- printf "messagerouter" -}}
+    {{- end -}}
+  {{- else -}}
+    {{- printf "messagerouter" -}}
+  {{- end -}}
+{{- end -}}
+
 
+{{- define "common.fullname.messagerouter" -}}
+  {{- $name := ( include "common.name.messagerouter" . ) -}}
+  {{- $namespace := ( include "common.namespace.aux" . ) -}}
+  {{- printf "%s-%s" $namespace $name | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
 
 
+{{- define "common.name.ves" -}}
+  {{- if .Values.ves -}}
+    {{- if .Values.ves.nameOverride -}}
+      {{- printf "%s" .Values.ves.nameOverride -}}
+    {{- else -}}
+      {{- printf "ves" -}}
+    {{- end -}}
+  {{- else -}}
+    {{- printf "ves" -}}
+  {{- end -}}
+{{- end -}}
+
+
+{{- define "common.fullname.ves" -}}
+  {{- $name := ( include "common.name.ves" . ) -}}
+  {{- $namespace := ( include "common.namespace.aux" . ) -}}
+  {{- printf "%s-%s" $namespace $name | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+
 {{- define "common.name" -}}
   {{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" -}}
 {{- end -}}