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=f86bc241fb3131e99e9bf749ca7f3c1244473bdf;hpb=112e73d383b26192fea6e320ef3de6ef6bfdca0a;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 f86bc241..d2f17e96 100644
--- a/ric-common/Common-Template/helm/ric-common/templates/_name.tpl
+++ b/ric-common/Common-Template/helm/ric-common/templates/_name.tpl
@@ -87,21 +87,22 @@
   {{- 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" . ) -}}
+{{- define "common.fullname.rsm" -}}
+  {{- $name := ( include "common.name.rsm" . ) -}}
   {{- $namespace := ( include "common.namespace.platform" . ) -}}
   {{- printf "%s-%s" $namespace $name | trunc 63 | trimSuffix "-" -}}
 {{- end -}}
@@ -112,8 +113,6 @@
 
 
 
-
-
 {{- define "common.name.rtmgr" -}}
   {{- if .Values.rtmgr -}}
     {{- if .Values.rtmgr.nameOverride -}}
@@ -138,6 +137,30 @@
 
 
 
+{{- 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 -}}
+
+
+
+
+
+
 {{- define "common.name.a1mediator" -}}
   {{- if .Values.a1mediator -}}
     {{- if .Values.a1mediator.nameOverride -}}
@@ -158,6 +181,46 @@
 {{- 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 -}}
+
+
 
 {{- define "common.name.nexus" -}}
   {{- if .Values.nexus -}}
@@ -178,6 +241,24 @@
   {{- 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 -}}