Merge "Add chartmuseum as the helm repo"

diff --combined ric-common/Common-Template/helm/ric-common/templates/_configmapname.tpl
index 1210d91,4cff1a1..c9fcebf
--- 1/ric-common/Common-Template/helm/ric-common/templates/_configmapname.tpl
--- 2/ric-common/Common-Template/helm/ric-common/templates/_configmapname.tpl
+++ b/ric-common/Common-Template/helm/ric-common/templates/_configmapname.tpl
@@@ -46,11 -46,6 +46,11 @@@
    {{- printf "configmap-%s" $name | trunc 63 | trimSuffix "-" -}}
  {{- end -}}
  
 +{{- define "common.configmapname.submgr" -}}
 +  {{- $name := ( include "common.fullname.submgr" . ) -}}
 +  {{- printf "configmap-%s" $name | trunc 63 | trimSuffix "-" -}}
 +{{- end -}}
 +
  {{- define "common.configmapname.a1mediator" -}}
    {{- $name := ( include "common.fullname.a1mediator" . ) -}}
    {{- printf "configmap-%s" $name | trunc 63 | trimSuffix "-" -}}
@@@ -62,6 -57,11 +62,11 @@@
    {{- printf "configmap-%s" $name | trunc 63 | trimSuffix "-" -}}
  {{- end -}}
  
+ {{- define "common.configmapname.chartmuseum" -}}
+   {{- $name := ( include "common.fullname.chartmuseum" . ) -}}
+   {{- printf "configmap-%s" $name | trunc 63 | trimSuffix "-" -}}
+ {{- end -}}
+ 
  {{- define "common.configmapname.dashboard" -}}
    {{- $name := ( include "common.fullname.dashboard" . ) -}}
    {{- printf "configmap-%s" $name | trunc 63 | trimSuffix "-" -}}

diff --combined ric-common/Common-Template/helm/ric-common/templates/_containername.tpl
index e0dbc3b,f060dc2..b80a7ad
--- 1/ric-common/Common-Template/helm/ric-common/templates/_containername.tpl
--- 2/ric-common/Common-Template/helm/ric-common/templates/_containername.tpl
+++ b/ric-common/Common-Template/helm/ric-common/templates/_containername.tpl
@@@ -45,11 -45,6 +45,11 @@@
    {{- printf "container-%s" $name | trunc 63 | trimSuffix "-" -}}
  {{- end -}}
  
 +{{- define "common.containername.submgr" -}}
 +  {{- $name := ( include "common.fullname.submgr" . ) -}}
 +  {{- printf "container-%s" $name | trunc 63 | trimSuffix "-" -}}
 +{{- end -}}
 +
  {{- define "common.containername.a1mediator" -}}
    {{- $name := ( include "common.fullname.a1mediator" . ) -}}
    {{- printf "container-%s" $name | trunc 63 | trimSuffix "-" -}}
@@@ -60,6 -55,11 +60,11 @@@
    {{- printf "container-%s" $name | trunc 63 | trimSuffix "-" -}}
  {{- end -}}
  
+ {{- define "common.containername.chartmuseum" -}}
+   {{- $name := ( include "common.fullname.chartmuseum" . ) -}}
+   {{- printf "container-%s" $name | trunc 63 | trimSuffix "-" -}}
+ {{- end -}}
+ 
  {{- define "common.containername.dashboard" -}}
    {{- $name := ( include "common.fullname.dashboard" . ) -}}
    {{- printf "container-%s" $name | trunc 63 | trimSuffix "-" -}}

diff --combined ric-common/Common-Template/helm/ric-common/templates/_deploymentname.tpl
index 3b11c3e,f1104dc..c7a0ed2
--- 1/ric-common/Common-Template/helm/ric-common/templates/_deploymentname.tpl
--- 2/ric-common/Common-Template/helm/ric-common/templates/_deploymentname.tpl
+++ b/ric-common/Common-Template/helm/ric-common/templates/_deploymentname.tpl
@@@ -45,11 -45,6 +45,11 @@@
    {{- printf "deployment-%s" $name | trunc 63 | trimSuffix "-" -}}
  {{- end -}}
  
 +{{- define "common.deploymentname.submgr" -}}
 +  {{- $name := ( include "common.fullname.submgr" . ) -}}
 +  {{- printf "deployment-%s" $name | trunc 63 | trimSuffix "-" -}}
 +{{- end -}}
 +
  {{- define "common.deploymentname.a1mediator" -}}
    {{- $name := ( include "common.fullname.a1mediator" . ) -}}
    {{- printf "deployment-%s" $name | trunc 63 | trimSuffix "-" -}}
@@@ -60,6 -55,11 +60,11 @@@
    {{- printf "deployment-%s" $name | trunc 63 | trimSuffix "-" -}}
  {{- end -}}
  
+ {{- define "common.deploymentname.chartmuseum" -}}
+   {{- $name := ( include "common.fullname.chartmuseum" . ) -}}
+   {{- printf "deployment-%s" $name | trunc 63 | trimSuffix "-" -}}
+ {{- end -}}
+ 
  {{- define "common.deploymentname.dashboard" -}}
    {{- $name := ( include "common.fullname.dashboard" . ) -}}
    {{- printf "deployment-%s" $name | trunc 63 | trimSuffix "-" -}}

diff --combined ric-common/Common-Template/helm/ric-common/templates/_ingressname.tpl
index d10ebcf,5f090b6..ec5951f
--- 1/ric-common/Common-Template/helm/ric-common/templates/_ingressname.tpl
--- 2/ric-common/Common-Template/helm/ric-common/templates/_ingressname.tpl
+++ b/ric-common/Common-Template/helm/ric-common/templates/_ingressname.tpl
@@@ -37,11 -37,6 +37,11 @@@
    {{- printf "ingress-%s" $name | trunc 63 | trimSuffix "-" -}}
  {{- end -}}
  
 +{{- define "common.ingressname.submgr" -}}
 +  {{- $name := ( include "common.fullname.submgr" . ) -}}
 +  {{- printf "ingress-%s" $name | trunc 63 | trimSuffix "-" -}}
 +{{- end -}}
 +
  {{- define "common.ingressname.a1mediator" -}}
    {{- $name := ( include "common.fullname.a1mediator" . ) -}}
    {{- printf "ingress-%s" $name | trunc 63 | trimSuffix "-" -}}
@@@ -52,6 -47,11 +52,11 @@@
    {{- printf "ingress-%s" $name | trunc 63 | trimSuffix "-" -}}
  {{- end -}}
  
+ {{- define "common.ingressname.chartmuseum" -}}
+   {{- $name := ( include "common.fullname.chartmuseum" . ) -}}
+   {{- printf "ingress-%s" $name | trunc 63 | trimSuffix "-" -}}
+ {{- end -}}
+ 
  {{- define "common.ingressname.ves" -}}
    {{- $name := ( include "common.fullname.ves" . ) -}}
    {{- printf "ingress-%s" $name | trunc 63 | trimSuffix "-" -}}

diff --combined ric-common/Common-Template/helm/ric-common/templates/_servicename.tpl
index 81d2026,f8a21dd..8af2a97
--- 1/ric-common/Common-Template/helm/ric-common/templates/_servicename.tpl
--- 2/ric-common/Common-Template/helm/ric-common/templates/_servicename.tpl
+++ b/ric-common/Common-Template/helm/ric-common/templates/_servicename.tpl
@@@ -83,11 -83,6 +83,11 @@@
    {{- printf "service-%s-http" $name | trunc 63 | trimSuffix "-" -}}
  {{- end -}}
  
 +{{- define "common.servicename.submgr.http" -}}
 +  {{- $name := ( include "common.fullname.submgr" . ) -}}
 +  {{- printf "service-%s-http" $name | trunc 63 | trimSuffix "-" -}}
 +{{- end -}}
 +
  {{- define "common.servicename.a1mediator.http" -}}
    {{- $name := ( include "common.fullname.a1mediator" . ) -}}
    {{- printf "service-%s-http" $name | trunc 63 | trimSuffix "-" -}}
@@@ -98,6 -93,11 +98,11 @@@
    {{- printf "service-%s-http" $name | trunc 63 | trimSuffix "-" -}}
  {{- end -}}
  
+ {{- define "common.servicename.chartmuseum.http" -}}
+   {{- $name := ( include "common.fullname.chartmuseum" . ) -}}
+   {{- printf "service-%s-http" $name | trunc 63 | trimSuffix "-" -}}
+ {{- end -}}
+ 
  {{- define "common.servicename.dashboard.http" -}}
    {{- $name := ( include "common.fullname.dashboard" . ) -}}
    {{- printf "service-%s-http" $name | trunc 63 | trimSuffix "-" -}}