Merge R3 into master

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

diff --git a/ric-common/Common-Template/helm/ric-common/templates/_message-router.tpl b/ric-common/Common-Template/helm/ric-common/templates/_messagerouter.tpl
similarity index 75%
rename from ric-common/Common-Template/helm/ric-common/templates/_message-router.tpl
rename to ric-common/Common-Template/helm/ric-common/templates/_messagerouter.tpl
index 6fad8ea..ac73f6c 100644 (file)
--- a/ric-common/Common-Template/helm/ric-common/templates/_message-router.tpl
+++ b/ric-common/Common-Template/helm/ric-common/templates/_messagerouter.tpl
@@ -1,5 +1,5 @@
 ################################################################################
-#   Copyright (c) 2019 ATT Intellectual Property.                             #
+#   Copyright (c) 2019 AT&T Intellectual Property.                             #
 #                                                                              #
 #   Licensed under the Apache License, Version 2.0 (the "License");            #
 #   you may not use this file except in compliance with the License.           #
@@ -14,17 +14,8 @@
 #   limitations under the License.                                             #
 ################################################################################
 
-# template for component name
 {{- define "common.name.messagerouter" -}}
-  {{- if .Values.messagerouter -}}
-    {{- if .Values.messagerouter.nameOverride -}}
-      {{- printf "%s" .Values.messagerouter.nameOverride -}}
-    {{- else -}}
-      {{- printf "messagerouter" -}}
-    {{- end -}}
-  {{- else -}}
-    {{- printf "messagerouter" -}}
-  {{- end -}}
+  {{- printf "messagerouter" -}}
 {{- end -}}
 
 {{- define "common.fullname.messagerouter" -}}
@@ -33,26 +24,35 @@
   {{- printf "%s-%s" $namespace $name | trunc 63 | trimSuffix "-" -}}
 {{- end -}}
 
-
+{{- define "common.configmapname.messagerouter" -}}
+  {{- $name := ( include "common.fullname.messagerouter" . ) -}}
+  {{- printf "configmap-%s" $name | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
 
 {{- define "common.deploymentname.messagerouter" -}}
   {{- $name := ( include "common.fullname.messagerouter" . ) -}}
   {{- printf "deployment-%s" $name | trunc 63 | trimSuffix "-" -}}
 {{- end -}}
 
-
-{{- define "common.configmapname.messagerouter" -}}
+{{- define "common.containername.messagerouter" -}}
   {{- $name := ( include "common.fullname.messagerouter" . ) -}}
-  {{- printf "configmap-%s" $name | trunc 63 | trimSuffix "-" -}}
+  {{- printf "container-%s" $name | trunc 63 | trimSuffix "-" -}}
 {{- end -}}
 
-
-
-{{- define "common.containername.messagerouter" -}}
+{{- define "common.serviceaccountname.messagerouter" -}}
   {{- $name := ( include "common.fullname.messagerouter" . ) -}}
-  {{- printf "container-%s" $name | trunc 63 | trimSuffix "-" -}}
+  {{- printf "svcacct-%s" $name | trunc 63 | trimSuffix "-" -}}
 {{- end -}}
 
+{{- define "common.servicename.messagerouter.tcp" -}}
+  {{- $name := ( include "common.fullname.messagerouter" . ) -}}
+  {{- printf "service-%s-tcp" $name | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
 
 {{- define "common.serviceport.messagerouter.http" -}}3904{{- end -}}
+{{- define "common.serviceport.messagerouter.https" -}}3905{{- end -}}
+{{- define "common.serviceport.messagerouter.kafka" -}}9092{{- end -}}
+{{- define "common.serviceport.messagerouter.zookeeper" -}}2181{{- end -}}
+
 {{- define "common.servicename.messagerouter.http" -}}ricaux-messagerouter{{- end -}}
+