Merge R3 into master

[it/dep.git] / ric-common / Common-Template / helm / ric-common / templates / _e2term.tpl

diff --git a/ric-common/Common-Template/helm/ric-common/templates/_e2term.tpl b/ric-common/Common-Template/helm/ric-common/templates/_e2term.tpl
index 6ed3195..f83862e 100644 (file)
--- a/ric-common/Common-Template/helm/ric-common/templates/_e2term.tpl
+++ b/ric-common/Common-Template/helm/ric-common/templates/_e2term.tpl
@@ -14,17 +14,8 @@
 #   limitations under the License.                                             #
 ################################################################################
 
-# template for component name
 {{- define "common.name.e2term" -}}
-  {{- if .Values.e2term -}}
-    {{- if .Values.e2term.nameOverride -}}
-      {{- printf "%s" .Values.e2term.nameOverride -}}
-    {{- else -}}
-      {{- printf "e2term" -}}
-    {{- end -}}
-  {{- else -}}
-    {{- printf "e2term" -}}
-  {{- end -}}
+  {{- printf "e2term" -}}
 {{- end -}}
 
 {{- define "common.fullname.e2term" -}}
@@ -81,3 +72,9 @@
   {{- $name := ( include "common.fullname.e2term" . ) -}}
   {{- printf "svcacct-%s" $name | trunc 63 | trimSuffix "-" -}}
 {{- end -}}
+
+
+{{- define "common.ingressname.e2term" -}}
+  {{- $name := ( include "common.fullname.e2term" . ) -}}
+  {{- printf "ingress-%s" $name | trunc 63 | trimSuffix "-" -}}
+{{- end -}}