alarmadapter helm renamed to alarmmanager
modified requirements.yaml to update the ric-common version tag
renamed alarmadapter.tpl to alarmmanager.tpl
added reference to dbaas
helm version changed to 2.17.0
cherry update
Change-Id: I21197189f5f334d3c2bacaf857779240bca7e206
Signed-off-by: vipin <vipin.mavila@nokia.com>
diff --git a/RECIPE_EXAMPLE/example_recipe.yaml b/RECIPE_EXAMPLE/example_recipe.yaml
index 37fd77b..49d78ef 100644
--- a/RECIPE_EXAMPLE/example_recipe.yaml
+++ b/RECIPE_EXAMPLE/example_recipe.yaml
@@ -179,8 +179,8 @@
tag: v0.8.2
allow_redeploy: "True"
-alarmadapter:
+alarmmanager:
image:
registry: "nexus3.o-ran-sc.org:10002/o-ran-sc"
- name: ric-plt-alarmadapter
- tag: 0.4.5
+ name: ric-plt-alarmmanager
+ tag: 0.5.9
diff --git a/bin/install b/bin/install
index 2607acc..6f4fbd4 100755
--- a/bin/install
+++ b/bin/install
@@ -119,7 +119,7 @@
LOCAL_REPOSITORY=$(echo "$COMMON_BLOCK" | awk '/^ *localregistry:/{print $2}')
# replace the dbaasha with dbaas1 if deploying non HA DBaaS
-COMPONENTS=${LIST_OF_COMPONENTS:-"infrastructure dbaas xapp-onboarder appmgr rtmgr e2mgr e2term a1mediator submgr vespamgr jaegeradapter o1mediator alarmadapter"}
+COMPONENTS=${LIST_OF_COMPONENTS:-"infrastructure dbaas xapp-onboarder appmgr rtmgr e2mgr e2term a1mediator submgr vespamgr jaegeradapter o1mediator alarmmanager"}
echo "Deploying RIC infra components [$COMPONENTS]"
diff --git a/bin/uninstall b/bin/uninstall
index fa8fc0a..2fb080e 100755
--- a/bin/uninstall
+++ b/bin/uninstall
@@ -16,7 +16,7 @@
# limitations under the License. #
################################################################################
-COMPONENTS="xapp-onboarder appmgr rtmgr e2mgr e2term a1mediator submgr vespamgr jaegeradapter dbaas infrastructure o1mediator alarmadapter"
+COMPONENTS="xapp-onboarder appmgr rtmgr e2mgr e2term a1mediator submgr vespamgr jaegeradapter dbaas infrastructure o1mediator alarmmanager"
RECIPE_NAMESPACE=$(kubectl get cm --all-namespaces | grep ricplt-recipe | awk '{print $1}')
kubectl get configmap -n $RECIPE_NAMESPACE ricplt-recipe -o jsonpath='{.data.recipe}' > /tmp/recipe.yaml
diff --git a/bin/verify-ric-charts b/bin/verify-ric-charts
index e9630c4..696e447 100755
--- a/bin/verify-ric-charts
+++ b/bin/verify-ric-charts
@@ -28,7 +28,7 @@
if [[ "${1:-nope}" != "nope" ]]; then
HELMVERSION=$1
else
- HELMVERSION=2.12.3
+ HELMVERSION=2.17.0
fi
if [[ "${2:-nope}" != "nope" ]]; then
OVERRIDEYAML=$2
diff --git a/helm/alarmadapter/templates/service-http.yaml b/helm/alarmadapter/templates/service-http.yaml
deleted file mode 100644
index b589851..0000000
--- a/helm/alarmadapter/templates/service-http.yaml
+++ /dev/null
@@ -1,40 +0,0 @@
-#
-#==================================================================================
-# Copyright (c) 2019 AT&T Intellectual Property.
-# Copyright (c) 2019 Nokia
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#==================================================================================
-#
-#
-#
-kind: Service
-apiVersion: v1
-metadata:
- name: {{ include "common.servicename.alarmadapter.http" . }}
- namespace: {{ include "common.namespace.platform" . }}
- labels:
- app: {{ include "common.namespace.platform" . }}-{{ include "common.name.alarmadapter" . }}
- chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
- release: {{ .Release.Name }}
- heritage: {{ .Release.Service }}
-spec:
- selector:
- app: {{ include "common.namespace.platform" . }}-{{ include "common.name.alarmadapter" . }}
- release: {{ .Release.Name }}
- type: ClusterIP
- ports:
- - name: http
- port: {{ include "common.serviceport.alarmadapter.http" . }}
- protocol: TCP
- targetPort: http
diff --git a/helm/alarmadapter/.helmignore b/helm/alarmmanager/.helmignore
similarity index 100%
rename from helm/alarmadapter/.helmignore
rename to helm/alarmmanager/.helmignore
diff --git a/helm/alarmadapter/Chart.yaml b/helm/alarmmanager/Chart.yaml
similarity index 94%
rename from helm/alarmadapter/Chart.yaml
rename to helm/alarmmanager/Chart.yaml
index af55ed9..c279307 100644
--- a/helm/alarmadapter/Chart.yaml
+++ b/helm/alarmmanager/Chart.yaml
@@ -17,6 +17,6 @@
apiVersion: v1
appVersion: "1.0"
-description: Helm chart for RIC Alarm Adapter
-name: alarmadapter
-version: 3.0.0
+description: Helm chart for RIC Alarm Manager
+name: alarmmanager
+version: 5.0.0
diff --git a/helm/alarmadapter/requirements.yaml b/helm/alarmmanager/requirements.yaml
similarity index 98%
rename from helm/alarmadapter/requirements.yaml
rename to helm/alarmmanager/requirements.yaml
index 855acfe..8030a8b 100644
--- a/helm/alarmadapter/requirements.yaml
+++ b/helm/alarmmanager/requirements.yaml
@@ -17,5 +17,5 @@
dependencies:
- name: ric-common
- version: ^3.3.0
+ version: ~3.3.2
repository: "@local"
diff --git a/helm/alarmadapter/templates/appconfig.yaml b/helm/alarmmanager/templates/appconfig.yaml
similarity index 86%
rename from helm/alarmadapter/templates/appconfig.yaml
rename to helm/alarmmanager/templates/appconfig.yaml
index 0ff0c6a..5f9af24 100644
--- a/helm/alarmadapter/templates/appconfig.yaml
+++ b/helm/alarmmanager/templates/appconfig.yaml
@@ -24,13 +24,13 @@
kind: ConfigMap
metadata:
{{- if eq $namespace $platformNameSpace }}
- name: {{ include "common.configmapname.alarmadapter" $ }}-appconfig
+ name: {{ include "common.configmapname.alarmmanager" $ }}-appconfig
{{- else }}
name: alarm-appconfig
{{- end }}
namespace: {{ $namespace }}
data:
- ALARM_MGR_SERVICE_NAME: {{ include "common.servicename.alarmadapter.rmr" $ }}.{{ $platformNameSpace }}
- ALARM_MGR_SERVICE_PORT: {{ include "common.serviceport.alarmadapter.rmr.data" $ | quote }}
+ ALARM_MGR_SERVICE_NAME: {{ include "common.servicename.alarmmanager.rmr" $ }}.{{ $platformNameSpace }}
+ ALARM_MGR_SERVICE_PORT: {{ include "common.serviceport.alarmmanager.rmr.data" $ | quote }}
{{- end }}
diff --git a/helm/alarmadapter/templates/config.yaml b/helm/alarmmanager/templates/configmap.yaml
similarity index 60%
rename from helm/alarmadapter/templates/config.yaml
rename to helm/alarmmanager/templates/configmap.yaml
index 532a5b9..b01e24b 100644
--- a/helm/alarmadapter/templates/config.yaml
+++ b/helm/alarmmanager/templates/configmap.yaml
@@ -1,5 +1,5 @@
#==================================================================================
-# Copyright (c) 2019,2020 AT&T 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.
@@ -13,14 +13,15 @@
# See the License for the specific language governing permissions and
# limitations under the License.
#==================================================================================
+
apiVersion: v1
kind: ConfigMap
metadata:
- name: {{ include "common.configmapname.alarmadapter" . }}-appconfig
+ name: {{ include "common.configmapname.alarmmanager" . }}-alarmmanagercfg
namespace: {{ include "common.namespace.platform" . }}
data:
- config-file.json: |-
- {
+ alarmmanagercfg: |-
+ {
"local": {
"host": ":8080"
},
@@ -35,24 +36,15 @@
"maxSize": 1024,
"numWorkers": 1
},
- "promAlertManager": {
- "address": {{ .Values.alarmadapter.alertManagerAddress | quote }},
- "baseUrl": "/api/v2",
- "schemes": "http",
- "alertInterval": 30000
- },
- "alarmDefinitions": [
- {
- "specificProblem": 1234,
- "Text": "Connection to DBAAS server lost"
+ "controls": {
+ "promAlertManager": {
+ "address": "cpro-alertmanager:80",
+ "baseUrl": "api/v2",
+ "schemes": "http",
+ "alertInterval": 30000
},
- {
- "specificProblem": 1235,
- "Text": "Distribution of internal routing table failed due to timeout"
- },
- {
- "specificProblem": 1236,
- "Text": "E2 connection to gNB lost"
- }
- ]
+ "maxActiveAlarms": 5000,
+ "maxAlarmHistory": 20000,
+ "alarmInfoPvFile": "/mnt/pv-ricplt-alarmmanager/alarminfo.json"
+ }
}
diff --git a/helm/alarmadapter/templates/deployment.yaml b/helm/alarmmanager/templates/deployment.yaml
similarity index 62%
rename from helm/alarmadapter/templates/deployment.yaml
rename to helm/alarmmanager/templates/deployment.yaml
index 8d02070..08b041e 100644
--- a/helm/alarmadapter/templates/deployment.yaml
+++ b/helm/alarmmanager/templates/deployment.yaml
@@ -14,65 +14,77 @@
# See the License for the specific language governing permissions and #
# limitations under the License. #
################################################################################
-{{- $imagectx := dict "ctx" . "defaultregistry" .Values.alarmadapter.image.registry }}
-{{- $pullpolicyctx := dict "ctx" . "defaultpullpolicy" .Values.alarmadapter.imagePullPolicy }}
+{{- $topCtx := . }}
+{{- $imagectx := dict "ctx" . "defaultregistry" .Values.alarmmanager.image.registry }}
+{{- $pullpolicyctx := dict "ctx" . "defaultpullpolicy" .Values.alarmmanager.imagePullPolicy }}
+{{- $imagetag := .Values.alarmmanager.image.tag }}
+---
apiVersion: apps/v1
kind: Deployment
metadata:
- name: {{ include "common.deploymentname.alarmadapter" . }}
+ name: {{ include "common.deploymentname.alarmmanager" . }}
namespace: {{ include "common.namespace.platform" . }}
labels:
- app: {{ include "common.namespace.platform" . }}-{{ include "common.name.alarmadapter" . }}
+ app: {{ include "common.namespace.platform" . }}-{{ include "common.name.alarmmanager" . }}
chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
release: {{ .Release.Name }}
heritage: {{ .Release.Service }}
spec:
- replicas: {{ .Values.alarmadapter.replicaCount }}
+ replicas: {{ .Values.alarmmanager.replicaCount }}
selector:
matchLabels:
- app: {{ include "common.namespace.platform" . }}-{{ include "common.name.alarmadapter" . }}
+ app: {{ include "common.namespace.platform" . }}-{{ include "common.name.alarmmanager" . }}
release: {{ .Release.Name }}
template:
metadata:
- {{- if .Values.alarmadapter.annotations }}
+ {{- if .Values.alarmmanager.annotations }}
annotations:
- {{- .Values.alarmadapter.annotations | nindent 8 -}}
+ {{- .Values.alarmmanager.annotations | nindent 8 -}}
{{ end }}
labels:
- app: {{ include "common.namespace.platform" . }}-{{ include "common.name.alarmadapter" . }}
+ app: {{ include "common.namespace.platform" . }}-{{ include "common.name.alarmmanager" . }}
release: {{ .Release.Name }}
spec:
- hostname: {{ include "common.name.alarmadapter" . }}
+ hostname: {{ include "common.name.alarmmanager" . }}
imagePullSecrets:
- name: {{ include "common.dockerregistry.credential" $imagectx }}
+ serviceAccountName: {{ include "common.serviceaccountname.alarmmanager" . }}
containers:
- - name: {{ include "common.containername.alarmadapter" . }}
- image: {{ include "common.dockerregistry.url" $imagectx }}/{{ .Values.alarmadapter.image.name }}:{{ .Values.alarmadapter.image.tag }}
+ - name: {{ include "common.containername.alarmmanager" . }}
+ image: {{ include "common.dockerregistry.url" $imagectx }}/{{ .Values.alarmmanager.image.name }}:{{ $imagetag }}
imagePullPolicy: {{ include "common.dockerregistry.pullpolicy" $pullpolicyctx }}
- #command: ["/bin/sh"]
- #args: ["-c", "while true; do echo hello; sleep 10;done"]
- command: ["/bin/sh"]
- args: ["-c", "/alarm-adapter -f /alarmadaptercfg/config-file.json"]
env:
- name: PLT_NAMESPACE
value: {{ include "common.namespace.platform" . }}
envFrom:
- configMapRef:
- name: {{ include "common.configmapname.alarmadapter" . }}-env
+ name: {{ include "common.configmapname.dbaas" . }}-appconfig
- configMapRef:
- name: {{ include "common.configmapname.dbaas" . }}-appconfig
- volumeMounts:
- - mountPath: /alarmadaptercfg
- name: appconfig-file
- subPath: config-file.json
+ name: {{ include "common.configmapname.alarmmanager" . }}-env
ports:
- - name: "http"
- containerPort: {{ include "common.serviceport.alarmadapter.http" . }}
- - name: "rmrroute"
- containerPort: {{ include "common.serviceport.alarmadapter.rmr.route" . }}
- - name: "rmrdata"
- containerPort: {{ include "common.serviceport.alarmadapter.rmr.data" . }}
+ - name: rmrroute
+ containerPort: {{ include "common.serviceport.alarmmanager.rmr.route" . }}
+ protocol: TCP
+ - name: rmrdata
+ containerPort: {{ include "common.serviceport.alarmmanager.rmr.data" . }}
+ protocol: TCP
+ - name: http
+ containerPort: {{ include "common.serviceport.alarmmanager.http" . }}
+ protocol: TCP
+ volumeMounts:
+ - name: config-volume
+ mountPath: /cfg
+ - name: am-persistent-storage
+ mountPath: /mnt/pv-ricplt-alarmmanager
volumes:
- - name: appconfig-file
+ - name: config-volume
configMap:
- name: {{ include "common.configmapname.alarmadapter" . }}-appconfig
+ name: {{ include "common.configmapname.alarmmanager" . }}-alarmmanagercfg
+ #name: alarmmanagercfg
+ items:
+ - key: alarmmanagercfg
+ path: config-file.json
+ mode: 0644
+ - name: am-persistent-storage
+ persistentVolumeClaim:
+ claimName: {{ include "common.pvcname.alarmmanager" $topCtx }}
diff --git a/helm/alarmadapter/templates/env.yaml b/helm/alarmmanager/templates/env.yaml
similarity index 82%
rename from helm/alarmadapter/templates/env.yaml
rename to helm/alarmmanager/templates/env.yaml
index ac1569e..e7649cd 100644
--- a/helm/alarmadapter/templates/env.yaml
+++ b/helm/alarmmanager/templates/env.yaml
@@ -1,3 +1,4 @@
+################################################################################
# Copyright (c) 2019 AT&T Intellectual Property. #
# Copyright (c) 2019 Nokia. #
# #
@@ -16,8 +17,9 @@
apiVersion: v1
kind: ConfigMap
metadata:
- name: {{ include "common.configmapname.alarmadapter" . }}-env
+ name: {{ include "common.configmapname.alarmmanager" . }}-env
+ namespace: {{ include "common.namespace.platform" . }}
data:
RMR_RTG_SVC: {{ include "common.servicename.rtmgr.rmr" . }}:{{ include "common.serviceport.rtmgr.rmr.route" . }}
- RMR_SEED_RT: "/uta_rtg.rt"
- RMR_SRC_ID: {{ include "common.servicename.alarmadapter.rmr" . }}.{{ include "common.namespace.platform" . }}
+ RMR_SEED_RT: "/cfg/uta_rtg.rt"
+ RMR_SRC_ID: {{ include "common.servicename.alarmmanager.rmr" . }}.{{ include "common.namespace.platform" . }}
diff --git a/helm/alarmadapter/Chart.yaml b/helm/alarmmanager/templates/pv.yaml
similarity index 68%
copy from helm/alarmadapter/Chart.yaml
copy to helm/alarmmanager/templates/pv.yaml
index af55ed9..bb780f1 100644
--- a/helm/alarmadapter/Chart.yaml
+++ b/helm/alarmmanager/templates/pv.yaml
@@ -1,6 +1,5 @@
################################################################################
# Copyright (c) 2019 AT&T Intellectual Property. #
-# Copyright (c) 2019 Nokia. #
# #
# Licensed under the Apache License, Version 2.0 (the "License"); #
# you may not use this file except in compliance with the License. #
@@ -13,10 +12,23 @@
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. #
# See the License for the specific language governing permissions and #
# limitations under the License. #
-################################################################################
-
+################################################################################1
+{{- $topCtx := . }}
+{{if eq .Values.alarmmanager.storageClassName "local-storage" }}
+---
apiVersion: v1
-appVersion: "1.0"
-description: Helm chart for RIC Alarm Adapter
-name: alarmadapter
-version: 3.0.0
+kind: PersistentVolume
+metadata:
+ name: {{ include "common.pvname.alarmmanager" $topCtx }}
+ namespace: {{ include "common.namespace.platform" $topCtx }}
+ labels:
+ type: local
+spec:
+ storageClassName: {{ .Values.alarmmanager.storageClassName }}
+ capacity:
+ storage: {{ .Values.alarmmanager.dataVolSize }}
+ accessModes:
+ - ReadWriteOnce
+ hostPath:
+ path: /mnt/{{ include "common.pvname.alarmmanager" $topCtx }}
+{{ end }}
diff --git a/helm/alarmadapter/Chart.yaml b/helm/alarmmanager/templates/pvc.yaml
similarity index 76%
copy from helm/alarmadapter/Chart.yaml
copy to helm/alarmmanager/templates/pvc.yaml
index af55ed9..0efe288 100644
--- a/helm/alarmadapter/Chart.yaml
+++ b/helm/alarmmanager/templates/pvc.yaml
@@ -1,6 +1,5 @@
################################################################################
# Copyright (c) 2019 AT&T Intellectual Property. #
-# Copyright (c) 2019 Nokia. #
# #
# Licensed under the Apache License, Version 2.0 (the "License"); #
# you may not use this file except in compliance with the License. #
@@ -14,9 +13,17 @@
# See the License for the specific language governing permissions and #
# limitations under the License. #
################################################################################
-
+{{- $topCtx := . }}
+---
+kind: PersistentVolumeClaim
apiVersion: v1
-appVersion: "1.0"
-description: Helm chart for RIC Alarm Adapter
-name: alarmadapter
-version: 3.0.0
+metadata:
+ name: {{ include "common.pvcname.alarmmanager" $topCtx }}
+ namespace: {{ include "common.namespace.platform" $topCtx }}
+spec:
+ accessModes:
+ - ReadWriteOnce
+ resources:
+ requests:
+ storage: {{ .Values.alarmmanager.dataVolSize }}
+ storageClassName: {{ .Values.alarmmanager.storageClassName }}
diff --git a/helm/alarmadapter/Chart.yaml b/helm/alarmmanager/templates/service-http.yaml
similarity index 63%
copy from helm/alarmadapter/Chart.yaml
copy to helm/alarmmanager/templates/service-http.yaml
index af55ed9..e5abac6 100644
--- a/helm/alarmadapter/Chart.yaml
+++ b/helm/alarmmanager/templates/service-http.yaml
@@ -16,7 +16,23 @@
################################################################################
apiVersion: v1
-appVersion: "1.0"
-description: Helm chart for RIC Alarm Adapter
-name: alarmadapter
-version: 3.0.0
+kind: Service
+metadata:
+ name: {{ include "common.servicename.alarmmanager.http" . }}
+ namespace: {{ include "common.namespace.platform" . }}
+ labels:
+ app: {{ include "common.namespace.platform" . }}-{{ include "common.name.alarmmanager" . }}
+ chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
+ release: {{ .Release.Name }}
+ heritage: {{ .Release.Service }}
+spec:
+ type: ClusterIP
+ ports:
+ - port: {{ include "common.serviceport.alarmmanager.http" . }}
+ protocol: "TCP"
+ name: http
+ targetPort: {{ include "common.serviceport.alarmmanager.http" . }}
+ selector:
+ app: {{ include "common.namespace.platform" . }}-{{ include "common.name.alarmmanager" . }}
+ release: {{ .Release.Name }}
+
diff --git a/helm/alarmadapter/templates/service-rmr.yaml b/helm/alarmmanager/templates/service-rmr.yaml
similarity index 66%
rename from helm/alarmadapter/templates/service-rmr.yaml
rename to helm/alarmmanager/templates/service-rmr.yaml
index 3cb6796..7fb3fd0 100644
--- a/helm/alarmadapter/templates/service-rmr.yaml
+++ b/helm/alarmmanager/templates/service-rmr.yaml
@@ -15,28 +15,35 @@
# See the License for the specific language governing permissions and
# limitations under the License.
#==================================================================================
+#
+#
+# Abstract: Subscription Manager service manifest
+# Date: 28 May 2019
+#
kind: Service
apiVersion: v1
metadata:
- name: {{ include "common.servicename.alarmadapter.rmr" . }}
+ name: {{ include "common.servicename.alarmmanager.rmr" . }}
namespace: {{ include "common.namespace.platform" . }}
labels:
- app: {{ include "common.namespace.platform" . }}-{{ include "common.name.alarmadapter" . }}
+ app: {{ include "common.namespace.platform" . }}-{{ include "common.name.alarmmanager" . }}
chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
release: {{ .Release.Name }}
heritage: {{ .Release.Service }}
spec:
selector:
- app: {{ include "common.namespace.platform" . }}-{{ include "common.name.alarmadapter" . }}
+ app: {{ include "common.namespace.platform" . }}-{{ include "common.name.alarmmanager" . }}
release: {{ .Release.Name }}
type: ClusterIP
ports:
- - name: rmrdata
- port: {{ include "common.serviceport.alarmadapter.rmr.data" . }}
- protocol: TCP
- targetPort: rmrdata
- - name: rmrroute
- port: {{ include "common.serviceport.alarmadapter.rmr.route" . }}
- protocol: TCP
- targetPort: rmrroute
-
+ - name: rmrdata
+ port: {{ include "common.serviceport.alarmmanager.rmr.data" . }}
+ protocol: TCP
+ targetPort: rmrdata
+ - name: rmrroute
+ port: {{ include "common.serviceport.alarmmanager.rmr.route" . }}
+ protocol: TCP
+ targetPort: rmrroute
+ selector:
+ app: {{ include "common.namespace.platform" . }}-{{ include "common.name.alarmmanager" . }}
+ release: {{ .Release.Name }}
diff --git a/helm/alarmmanager/templates/serviceaccount.yaml b/helm/alarmmanager/templates/serviceaccount.yaml
new file mode 100644
index 0000000..58dbf85
--- /dev/null
+++ b/helm/alarmmanager/templates/serviceaccount.yaml
@@ -0,0 +1,46 @@
+################################################################################
+# Copyright (c) 2019-2020 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. #
+# You may obtain a copy of the License at #
+# #
+# http://www.apache.org/licenses/LICENSE-2.0 #
+# #
+# Unless required by applicable law or agreed to in writing, software #
+# distributed under the License is distributed on an "AS IS" BASIS, #
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. #
+# See the License for the specific language governing permissions and #
+# limitations under the License. #
+################################################################################
+---
+apiVersion: v1
+kind: ServiceAccount
+metadata:
+ name: {{ include "common.serviceaccountname.alarmmanager" . }}
+ namespace: {{ include "common.namespace.platform" . }}
+---
+apiVersion: rbac.authorization.k8s.io/v1
+kind: Role
+metadata:
+ name: {{ include "common.serviceaccountname.alarmmanager" . }}-{{ include "common.namespace.xapp" . }}-podreader
+ namespace: {{ include "common.namespace.xapp" . }}
+rules:
+- apiGroups: [""]
+ resources: ["pods"]
+ verbs: ["get", "list", "watch"]
+---
+apiVersion: rbac.authorization.k8s.io/v1
+kind: RoleBinding
+metadata:
+ name: {{ include "common.serviceaccountname.alarmmanager" . }}-{{ include "common.namespace.xapp" . }}-podreader
+ namespace: {{ include "common.namespace.xapp" . }}
+roleRef:
+ apiGroup: rbac.authorization.k8s.io
+ kind: Role
+ name: {{ include "common.serviceaccountname.alarmmanager" . }}-{{ include "common.namespace.xapp" . }}-podreader
+subjects:
+ - kind: ServiceAccount
+ name: {{ include "common.serviceaccountname.alarmmanager" . }}
+ namespace: {{ include "common.namespace.platform" . }}
+
diff --git a/helm/alarmadapter/values.yaml b/helm/alarmmanager/values.yaml
similarity index 66%
rename from helm/alarmadapter/values.yaml
rename to helm/alarmmanager/values.yaml
index b8ddbff..a3559eb 100644
--- a/helm/alarmadapter/values.yaml
+++ b/helm/alarmmanager/values.yaml
@@ -1,6 +1,6 @@
################################################################################
-# Copyright (c) 2019 AT&T Intellectual Property. #
-# Copyright (c) 2019 Nokia. #
+# Copyright (c) 2019-2020 AT&T Intellectual Property. #
+# Copyright (c) 2019-2020 Nokia. #
# #
# Licensed under the Apache License, Version 2.0 (the "License"); #
# you may not use this file except in compliance with the License. #
@@ -14,11 +14,17 @@
# See the License for the specific language governing permissions and #
# limitations under the License. #
################################################################################
-alarmadapter:
+alarmmanager:
+ replicaCount: 1
imagePullPolicy: IfNotPresent
image:
- name: ric-plt-alarm-go
- tag: 0.4.3
- registry: "nexus3.o-ran-sc.org:10002/o-ran-sc"
+ name: ric-plt-alarmmanager
+ tag: 0.5.9
+ registry: "nexus3.o-ran-sc.org:10002/o-ran-sc" #"ranco-dev-tools.eastus.cloudapp.azure.com:10001"
+ dataVolSize: 100Mi
+ storageClassName: local-storage
- alertManagerAddress: "r4-infrastructure-prometheus-alertmanager:80"
+ # Service ports are now defined in
+ # ric-common/Common-Template/helm/ric-common/templates/_ports.tpl file.
+ # If need to change a service port, make the code change necessary, then
+ # update the _ports.tpl file with the new port number.
diff --git a/helm/dbaas/charts/ric-common/Chart.yaml b/helm/dbaas/charts/ric-common/Chart.yaml
new file mode 100755
index 0000000..e735f86
--- /dev/null
+++ b/helm/dbaas/charts/ric-common/Chart.yaml
@@ -0,0 +1,4 @@
+apiVersion: v1
+description: Common templates for inclusion in other charts
+name: ric-common
+version: 3.3.2
diff --git a/helm/dbaas/charts/ric-common/templates/_a1mediator.tpl b/helm/dbaas/charts/ric-common/templates/_a1mediator.tpl
new file mode 100755
index 0000000..ec4740f
--- /dev/null
+++ b/helm/dbaas/charts/ric-common/templates/_a1mediator.tpl
@@ -0,0 +1,66 @@
+################################################################################
+# 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. #
+# You may obtain a copy of the License at #
+# #
+# http://www.apache.org/licenses/LICENSE-2.0 #
+# #
+# Unless required by applicable law or agreed to in writing, software #
+# distributed under the License is distributed on an "AS IS" BASIS, #
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. #
+# See the License for the specific language governing permissions and #
+# limitations under the License. #
+################################################################################
+
+{{- define "common.name.a1mediator" -}}
+ {{- printf "a1mediator" -}}
+{{- end -}}
+
+{{- define "common.fullname.a1mediator" -}}
+ {{- $name := ( include "common.name.a1mediator" . ) -}}
+ {{- $namespace := ( include "common.namespace.platform" . ) -}}
+ {{- printf "%s-%s" $namespace $name | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+
+{{- define "common.configmapname.a1mediator" -}}
+ {{- $name := ( include "common.fullname.a1mediator" . ) -}}
+ {{- printf "configmap-%s" $name | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+
+{{- define "common.deploymentname.a1mediator" -}}
+ {{- $name := ( include "common.fullname.a1mediator" . ) -}}
+ {{- printf "deployment-%s" $name | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+
+{{- define "common.containername.a1mediator" -}}
+ {{- $name := ( include "common.fullname.a1mediator" . ) -}}
+ {{- printf "container-%s" $name | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+
+{{- define "common.serviceaccountname.a1mediator" -}}
+ {{- $name := ( include "common.fullname.a1mediator" . ) -}}
+ {{- printf "svcacct-%s" $name | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+
+{{- define "common.ingressname.a1mediator" -}}
+ {{- $name := ( include "common.fullname.a1mediator" . ) -}}
+ {{- printf "ingress-%s" $name | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+
+{{- define "common.kongpath.ric.a1mediator" -}}/a1mediator{{- end -}}
+
+{{- define "common.servicename.a1mediator.rmr" -}}
+ {{- $name := ( include "common.fullname.a1mediator" . ) -}}
+ {{- printf "service-%s-rmr" $name | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+
+{{- define "common.servicename.a1mediator.http" -}}
+ {{- $name := ( include "common.fullname.a1mediator" . ) -}}
+ {{- printf "service-%s-http" $name | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+
+{{- define "common.serviceport.a1mediator.rmr.data" -}}4562{{- end -}}
+{{- define "common.serviceport.a1mediator.rmr.route" -}}4561{{- end -}}
+{{- define "common.serviceport.a1mediator.http" -}}10000{{- end -}}
diff --git a/helm/dbaas/charts/ric-common/templates/_alarmadapter.tpl b/helm/dbaas/charts/ric-common/templates/_alarmadapter.tpl
new file mode 100755
index 0000000..2755492
--- /dev/null
+++ b/helm/dbaas/charts/ric-common/templates/_alarmadapter.tpl
@@ -0,0 +1,64 @@
+################################################################################
+# 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. #
+# You may obtain a copy of the License at #
+# #
+# http://www.apache.org/licenses/LICENSE-2.0 #
+# #
+# Unless required by applicable law or agreed to in writing, software #
+# distributed under the License is distributed on an "AS IS" BASIS, #
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. #
+# See the License for the specific language governing permissions and #
+# limitations under the License. #
+################################################################################
+
+{{- define "common.name.alarmadapter" -}}
+ {{- printf "alarmadapter" -}}
+{{- end -}}
+
+{{- define "common.fullname.alarmadapter" -}}
+ {{- $name := ( include "common.name.alarmadapter" . ) -}}
+ {{- $namespace := ( include "common.namespace.platform" . ) -}}
+ {{- printf "%s-%s" $namespace $name | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+
+{{- define "common.configmapname.alarmadapter" -}}
+ {{- $name := ( include "common.fullname.alarmadapter" . ) -}}
+ {{- printf "configmap-%s" $name | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+
+{{- define "common.deploymentname.alarmadapter" -}}
+ {{- $name := ( include "common.fullname.alarmadapter" . ) -}}
+ {{- printf "deployment-%s" $name | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+
+{{- define "common.containername.alarmadapter" -}}
+ {{- $name := ( include "common.fullname.alarmadapter" . ) -}}
+ {{- printf "container-%s" $name | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+
+{{- define "common.serviceaccountname.alarmadapter" -}}
+ {{- $name := ( include "common.fullname.alarmadapter" . ) -}}
+ {{- printf "svcacct-%s" $name | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+
+{{- define "common.ingressname.alarmadapter" -}}
+ {{- $name := ( include "common.fullname.alarmadapter" . ) -}}
+ {{- printf "ingress-%s" $name | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+
+{{- define "common.servicename.alarmadapter.rmr" -}}
+ {{- $name := ( include "common.fullname.alarmadapter" . ) -}}
+ {{- printf "service-%s-rmr" $name | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+
+{{- define "common.servicename.alarmadapter.http" -}}
+ {{- $name := ( include "common.fullname.alarmadapter" . ) -}}
+ {{- printf "service-%s-http" $name | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+
+{{- define "common.serviceport.alarmadapter.rmr.data" -}}4560{{- end -}}
+{{- define "common.serviceport.alarmadapter.rmr.route" -}}4561{{- end -}}
+{{- define "common.serviceport.alarmadapter.http" -}}8080{{- end -}}
diff --git a/helm/dbaas/charts/ric-common/templates/_appmgr.tpl b/helm/dbaas/charts/ric-common/templates/_appmgr.tpl
new file mode 100755
index 0000000..954ba3d
--- /dev/null
+++ b/helm/dbaas/charts/ric-common/templates/_appmgr.tpl
@@ -0,0 +1,74 @@
+################################################################################
+# 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. #
+# You may obtain a copy of the License at #
+# #
+# http://www.apache.org/licenses/LICENSE-2.0 #
+# #
+# Unless required by applicable law or agreed to in writing, software #
+# distributed under the License is distributed on an "AS IS" BASIS, #
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. #
+# See the License for the specific language governing permissions and #
+# limitations under the License. #
+################################################################################
+
+{{- define "common.name.appmgr" -}}
+ {{- printf "appmgr" -}}
+{{- end -}}
+
+
+{{- define "common.fullname.appmgr" -}}
+ {{- $name := ( include "common.name.appmgr" . ) -}}
+ {{- $namespace := ( include "common.namespace.platform" . ) -}}
+ {{- printf "%s-%s" $namespace $name | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+
+{{- define "common.configmapname.appmgr" -}}
+ {{- $name := ( include "common.fullname.appmgr" . ) -}}
+ {{- printf "configmap-%s" $name | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+
+{{- define "common.deploymentname.appmgr" -}}
+ {{- $name := ( include "common.fullname.appmgr" . ) -}}
+ {{- printf "deployment-%s" $name | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+
+{{- define "common.containername.appmgr" -}}
+ {{- $name := ( include "common.fullname.appmgr" . ) -}}
+ {{- printf "container-%s" $name | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+
+
+{{- define "common.serviceaccountname.appmgr" -}}
+ {{- $name := ( include "common.fullname.appmgr" . ) -}}
+ {{- printf "svcacct-%s" $name | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+
+{{- define "common.ingressname.appmgr" -}}
+ {{- $name := ( include "common.fullname.appmgr" . ) -}}
+ {{- printf "ingress-%s" $name | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+
+{{- define "common.kongpath.ric.appmgr" -}}/appmgr{{- end -}}
+
+{{- define "common.servicename.appmgr.rmr" -}}
+ {{- $name := ( include "common.fullname.appmgr" . ) -}}
+ {{- printf "service-%s-rmr" $name | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+
+{{- define "common.servicename.appmgr.http" -}}
+ {{- $name := ( include "common.fullname.appmgr" . ) -}}
+ {{- printf "service-%s-http" $name | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+
+{{- define "common.secretname.appmgr" -}}
+ {{- $name := ( include "common.fullname.appmgr" . ) -}}
+ {{- printf "secret-%s" $name | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+
+{{- define "common.serviceport.appmgr.rmr.data" -}}4560{{- end -}}
+{{- define "common.serviceport.appmgr.rmr.route" -}}4561{{- end -}}
+{{- define "common.serviceport.appmgr.http" -}}8080{{- end -}}
+
diff --git a/helm/alarmadapter/requirements.yaml b/helm/dbaas/charts/ric-common/templates/_chart.tpl
old mode 100644
new mode 100755
similarity index 87%
copy from helm/alarmadapter/requirements.yaml
copy to helm/dbaas/charts/ric-common/templates/_chart.tpl
index 855acfe..54875fd
--- a/helm/alarmadapter/requirements.yaml
+++ b/helm/dbaas/charts/ric-common/templates/_chart.tpl
@@ -1,6 +1,5 @@
################################################################################
# Copyright (c) 2019 AT&T Intellectual Property. #
-# Copyright (c) 2019 Nokia. #
# #
# Licensed under the Apache License, Version 2.0 (the "License"); #
# you may not use this file except in compliance with the License. #
@@ -15,7 +14,7 @@
# limitations under the License. #
################################################################################
-dependencies:
- - name: ric-common
- version: ^3.3.0
- repository: "@local"
+
+{{- define "common.chart" -}}
+{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
diff --git a/helm/alarmadapter/Chart.yaml b/helm/dbaas/charts/ric-common/templates/_context_locator.tpl
old mode 100644
new mode 100755
similarity index 70%
copy from helm/alarmadapter/Chart.yaml
copy to helm/dbaas/charts/ric-common/templates/_context_locator.tpl
index af55ed9..5155dec
--- a/helm/alarmadapter/Chart.yaml
+++ b/helm/dbaas/charts/ric-common/templates/_context_locator.tpl
@@ -1,6 +1,5 @@
################################################################################
# Copyright (c) 2019 AT&T Intellectual Property. #
-# Copyright (c) 2019 Nokia. #
# #
# Licensed under the Apache License, Version 2.0 (the "License"); #
# you may not use this file except in compliance with the License. #
@@ -15,8 +14,24 @@
# limitations under the License. #
################################################################################
-apiVersion: v1
-appVersion: "1.0"
-description: Helm chart for RIC Alarm Adapter
-name: alarmadapter
-version: 3.0.0
+
+
+
+
+{{- define "locate" -}}
+ {{- $ctx := .ctx }}
+ {{- $keylist := .keylist }}
+ {{- $currentkey := first $keylist -}}
+ {{- $restkeys := rest $keylist -}}
+ {{- if empty $restkeys -}}
+ {{- $result := index $ctx $currentkey -}}
+ {{- if not (empty $result) -}}
+ {{- $result -}}
+ {{- end -}}
+ {{- else -}}
+ {{- with index $ctx $currentkey }}
+ {{- $newctx := dict "ctx" . "keylist" $restkeys -}}
+ {{- include "locate" $newctx -}}
+ {{- end -}}
+ {{- end -}}
+{{- end -}}
diff --git a/helm/dbaas/charts/ric-common/templates/_dashboard.tpl b/helm/dbaas/charts/ric-common/templates/_dashboard.tpl
new file mode 100755
index 0000000..7193400
--- /dev/null
+++ b/helm/dbaas/charts/ric-common/templates/_dashboard.tpl
@@ -0,0 +1,59 @@
+################################################################################
+# 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. #
+# You may obtain a copy of the License at #
+# #
+# http://www.apache.org/licenses/LICENSE-2.0 #
+# #
+# Unless required by applicable law or agreed to in writing, software #
+# distributed under the License is distributed on an "AS IS" BASIS, #
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. #
+# See the License for the specific language governing permissions and #
+# limitations under the License. #
+################################################################################
+
+{{- define "common.name.dashboard" -}}
+ {{- printf "dashboard" -}}
+{{- 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.configmapname.dashboard" -}}
+ {{- $name := ( include "common.fullname.dashboard" . ) -}}
+ {{- printf "configmap-%s" $name | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+
+{{- define "common.deploymentname.dashboard" -}}
+ {{- $name := ( include "common.fullname.dashboard" . ) -}}
+ {{- printf "deployment-%s" $name | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+
+{{- define "common.containername.dashboard" -}}
+ {{- $name := ( include "common.fullname.dashboard" . ) -}}
+ {{- printf "container-%s" $name | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+
+{{- define "common.serviceaccountname.dashboard" -}}
+ {{- $name := ( include "common.fullname.dashboard" . ) -}}
+ {{- printf "svcacct-%s" $name | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+
+{{- define "common.ingressname.dashboard" -}}
+ {{- $name := ( include "common.fullname.dashboard" . ) -}}
+ {{- printf "ingress-%s" $name | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+
+{{- define "common.servicename.dashboard.http" -}}
+ {{- $name := ( include "common.fullname.dashboard" . ) -}}
+ {{- printf "service-%s-http" $name | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+
+{{- define "common.serviceport.dashboard.http" -}}30080{{- end -}}
+{{- define "common.serviceport.dashboard.container" -}}8080{{- end -}}
diff --git a/helm/dbaas/charts/ric-common/templates/_dbaas.tpl b/helm/dbaas/charts/ric-common/templates/_dbaas.tpl
new file mode 100755
index 0000000..9f3daca
--- /dev/null
+++ b/helm/dbaas/charts/ric-common/templates/_dbaas.tpl
@@ -0,0 +1,58 @@
+################################################################################
+# Copyright (c) 2020 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. #
+# You may obtain a copy of the License at #
+# #
+# http://www.apache.org/licenses/LICENSE-2.0 #
+# #
+# Unless required by applicable law or agreed to in writing, software #
+# distributed under the License is distributed on an "AS IS" BASIS, #
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. #
+# See the License for the specific language governing permissions and #
+# limitations under the License. #
+################################################################################
+
+{{- define "common.name.dbaas" -}}
+ {{- printf "dbaas" -}}
+{{- end -}}
+
+{{- define "common.fullname.dbaas" -}}
+ {{- $name := ( include "common.name.dbaas" . ) -}}
+ {{- $namespace := ( include "common.namespace.platform" . ) -}}
+ {{- printf "%s-%s" $namespace $name | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+
+{{- define "common.configmapname.dbaas" -}}
+ {{- $name := ( include "common.fullname.dbaas" . ) -}}
+ {{- printf "configmap-%s" $name | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+
+{{- define "common.deploymentname.dbaas" -}}
+ {{- $name := ( include "common.fullname.dbaas" . ) -}}
+ {{- printf "deployment-%s" $name | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+
+{{- define "common.statefulsetname.dbaas" -}}
+ {{- $name := ( include "common.fullname.dbaas" . ) -}}
+ {{- printf "statefulset-%s" $name | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+
+{{- define "common.containername.dbaas" -}}
+ {{- $name := ( include "common.fullname.dbaas" . ) -}}
+ {{- printf "container-%s" $name | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+
+{{- define "common.serviceaccountname.dbaas" -}}
+ {{- $name := ( include "common.fullname.dbaas" . ) -}}
+ {{- printf "svcacct-%s" $name | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+
+{{- define "common.servicename.dbaas.tcp" -}}
+ {{- $name := ( include "common.fullname.dbaas" . ) -}}
+ {{- printf "service-%s-tcp" $name | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+
+{{- define "common.serviceport.dbaas.redis" -}}6379{{- end -}}
+{{- define "common.serviceport.dbaas.sentinel" -}}26379{{- end -}}
diff --git a/helm/dbaas/charts/ric-common/templates/_docker.tpl b/helm/dbaas/charts/ric-common/templates/_docker.tpl
new file mode 100755
index 0000000..62ef171
--- /dev/null
+++ b/helm/dbaas/charts/ric-common/templates/_docker.tpl
@@ -0,0 +1,63 @@
+################################################################################
+# 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. #
+# You may obtain a copy of the License at #
+# #
+# http://www.apache.org/licenses/LICENSE-2.0 #
+# #
+# Unless required by applicable law or agreed to in writing, software #
+# distributed under the License is distributed on an "AS IS" BASIS, #
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. #
+# See the License for the specific language governing permissions and #
+# limitations under the License. #
+################################################################################
+
+{{- define "common.dockerregistry.url" -}}
+ {{- $defaultregistry := .defaultregistry }}
+ {{- $keylist := list $.ctx.Chart.Name "registry" -}}
+ {{- $ctx := dict "ctx" $.ctx.Values "keylist" $keylist -}}
+ {{- $overrideregistry := include "locate" $ctx -}}
+ {{- $keylist := list "common" "localregistry" -}}
+ {{- $ctx := dict "ctx" $.ctx.Values "keylist" $keylist -}}
+ {{- $localregistry := include "locate" $ctx -}}
+ {{- if not (empty $overrideregistry) -}}
+ {{- $overrideregistry -}}
+ {{- else -}}
+ {{- if not (empty $localregistry) -}}
+ {{- $localregistry -}}
+ {{- else -}}
+ {{- $defaultregistry -}}
+ {{- end -}}
+ {{- end -}}
+{{- end -}}
+
+
+{{- define "common.dockerregistry.credential" -}}
+ {{- $reponame := include "common.dockerregistry.url" . -}}
+ {{- $postfix := $reponame | replace "." "-" | replace ":" "-" | replace "/" "-" | trunc 63 | trimSuffix "-" -}}
+ {{- printf "secret-%s" $postfix -}}
+{{- end -}}
+
+
+{{- define "common.dockerregistry.pullpolicy" -}}
+ {{- $defaulpullpolicy := .defaultpullpolicy }}
+ {{- $keylist := list $.ctx.Chart.Name "pullpolicy" -}}
+ {{- $ctx := dict "ctx" $.ctx.Values "keylist" $keylist -}}
+ {{- $overridepullpolicy := include "locate" $ctx -}}
+ {{- $keylist := list "common" "pullpolicy" -}}
+ {{- $ctx := dict "ctx" $.ctx.Values "keylist" $keylist -}}
+ {{- $globalpullpolicy := include "locate" $ctx -}}
+ {{- if not (empty $overridepullpolicy) -}}
+ {{- $overridepullpolicy -}}
+ {{- else -}}
+ {{- if not (empty $globalpullpolicy) -}}
+ {{- $globalpullpolicy -}}
+ {{- else -}}
+ {{- $defaulpullpolicy -}}
+ {{- end -}}
+ {{- end -}}
+{{- end -}}
+
+
diff --git a/helm/dbaas/charts/ric-common/templates/_e2mgr.tpl b/helm/dbaas/charts/ric-common/templates/_e2mgr.tpl
new file mode 100755
index 0000000..5275d28
--- /dev/null
+++ b/helm/dbaas/charts/ric-common/templates/_e2mgr.tpl
@@ -0,0 +1,66 @@
+################################################################################
+# 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. #
+# You may obtain a copy of the License at #
+# #
+# http://www.apache.org/licenses/LICENSE-2.0 #
+# #
+# Unless required by applicable law or agreed to in writing, software #
+# distributed under the License is distributed on an "AS IS" BASIS, #
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. #
+# See the License for the specific language governing permissions and #
+# limitations under the License. #
+################################################################################
+
+{{- define "common.name.e2mgr" -}}
+ {{- printf "e2mgr" -}}
+{{- end -}}
+
+{{- define "common.fullname.e2mgr" -}}
+ {{- $name := ( include "common.name.e2mgr" . ) -}}
+ {{- $namespace := ( include "common.namespace.platform" . ) -}}
+ {{- printf "%s-%s" $namespace $name | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+
+{{- define "common.configmapname.e2mgr" -}}
+ {{- $name := ( include "common.fullname.e2mgr" . ) -}}
+ {{- printf "configmap-%s" $name | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+
+{{- define "common.deploymentname.e2mgr" -}}
+ {{- $name := ( include "common.fullname.e2mgr" . ) -}}
+ {{- printf "deployment-%s" $name | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+
+{{- define "common.containername.e2mgr" -}}
+ {{- $name := ( include "common.fullname.e2mgr" . ) -}}
+ {{- printf "container-%s" $name | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+
+{{- define "common.serviceaccountname.e2mgr" -}}
+ {{- $name := ( include "common.fullname.e2mgr" . ) -}}
+ {{- printf "svcacct-%s" $name | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+
+{{- define "common.ingressname.e2mgr" -}}
+ {{- $name := ( include "common.fullname.e2mgr" . ) -}}
+ {{- printf "ingress-%s" $name | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+
+{{- define "common.kongpath.ric.e2mgr" -}}/e2mgr{{- end -}}
+
+{{- define "common.servicename.e2mgr.rmr" -}}
+ {{- $name := ( include "common.fullname.e2mgr" . ) -}}
+ {{- printf "service-%s-rmr" $name | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+
+{{- define "common.servicename.e2mgr.http" -}}
+ {{- $name := ( include "common.fullname.e2mgr" . ) -}}
+ {{- printf "service-%s-http" $name | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+
+{{- define "common.serviceport.e2mgr.rmr.data" -}}3801{{- end -}}
+{{- define "common.serviceport.e2mgr.rmr.route" -}}4561{{- end -}}
+{{- define "common.serviceport.e2mgr.http" -}}3800{{- end -}}
diff --git a/helm/dbaas/charts/ric-common/templates/_e2term.tpl b/helm/dbaas/charts/ric-common/templates/_e2term.tpl
new file mode 100755
index 0000000..5a43161
--- /dev/null
+++ b/helm/dbaas/charts/ric-common/templates/_e2term.tpl
@@ -0,0 +1,89 @@
+################################################################################
+# 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. #
+# You may obtain a copy of the License at #
+# #
+# http://www.apache.org/licenses/LICENSE-2.0 #
+# #
+# Unless required by applicable law or agreed to in writing, software #
+# distributed under the License is distributed on an "AS IS" BASIS, #
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. #
+# See the License for the specific language governing permissions and #
+# limitations under the License. #
+################################################################################
+
+{{- define "common.name.e2term" -}}
+ {{- printf "e2term" -}}
+{{- end -}}
+
+{{- define "common.fullname.e2term" -}}
+ {{- $name := ( include "common.name.e2term" . ) -}}
+ {{- $namespace := ( include "common.namespace.platform" . ) -}}
+ {{- printf "%s-%s" $namespace $name | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+
+
+{{- define "common.deploymentname.e2term" -}}
+ {{- $name := ( include "common.fullname.e2term" . ) -}}
+ {{- printf "deployment-%s" $name | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+
+{{- define "common.configmapname.e2term" -}}
+ {{- $name := ( include "common.fullname.e2term" . ) -}}
+ {{- printf "configmap-%s" $name | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+
+{{- define "common.containername.e2term" -}}
+ {{- $name := ( include "common.fullname.e2term" . ) -}}
+ {{- printf "container-%s" $name | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+
+{{- define "common.pvname.e2term" -}}
+ {{- $name := ( include "common.fullname.e2term" . ) -}}
+ {{- printf "pv-%s" $name | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+
+{{- define "common.pvcname.e2term" -}}
+ {{- $name := ( include "common.fullname.e2term" . ) -}}
+ {{- printf "pvc-%s" $name | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+
+{{- define "common.servicename.e2term.rmr" -}}
+ {{- $name := ( include "common.fullname.e2term" . ) -}}
+ {{- printf "service-%s-rmr" $name | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+{{- define "common.servicename.e2term.sctp" -}}
+ {{- $name := ( include "common.fullname.e2term" . ) -}}
+ {{- printf "service-%s-sctp" $name | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+
+{{- define "common.servicename.e2term.http" -}}
+ {{- $name := ( include "common.fullname.e2term" . ) -}}
+ {{- printf "service-%s-http" $name | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+
+{{- define "common.servicename.e2term.prometheus" -}}
+ {{- $name := ( include "common.fullname.e2term" . ) -}}
+ {{- printf "service-%s-prometheus" $name | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+
+
+{{- define "common.serviceport.e2term.rmr.data" -}}38000{{- end -}}
+{{- define "common.serviceport.e2term.rmr.route" -}}4561{{- end -}}
+{{- define "common.serviceport.e2term.http" -}}8080{{- end -}}
+{{- define "common.serviceport.e2term.sctp" -}}36422{{- end -}}
+{{- define "common.serviceport.e2term.prometheus" -}}8088{{- end -}}
+
+
+{{- define "common.serviceaccountname.e2term" -}}
+ {{- $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 -}}
diff --git a/helm/dbaas/charts/ric-common/templates/_esreader.tpl b/helm/dbaas/charts/ric-common/templates/_esreader.tpl
new file mode 100755
index 0000000..d895ddc
--- /dev/null
+++ b/helm/dbaas/charts/ric-common/templates/_esreader.tpl
@@ -0,0 +1,60 @@
+################################################################################
+# 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. #
+# You may obtain a copy of the License at #
+# #
+# http://www.apache.org/licenses/LICENSE-2.0 #
+# #
+# Unless required by applicable law or agreed to in writing, software #
+# distributed under the License is distributed on an "AS IS" BASIS, #
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. #
+# See the License for the specific language governing permissions and #
+# limitations under the License. #
+################################################################################
+
+
+{{- define "common.name.esreader" -}}
+ {{- printf "esreader" -}}
+{{- end -}}
+
+
+{{- define "common.fullname.esreader" -}}
+ {{- $name := ( include "common.name.esreader" . ) -}}
+ {{- $namespace := ( include "common.namespace.infra" . ) -}}
+ {{- printf "%s-%s" $namespace $name | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+
+
+
+{{- define "common.deploymentname.esreader" -}}
+ {{- $name := ( include "common.fullname.esreader" . ) -}}
+ {{- printf "deployment-%s" $name | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+
+
+{{- define "common.configmapname.esreader" -}}
+ {{- $name := ( include "common.fullname.esreader" . ) -}}
+ {{- printf "configmap-%s" $name | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+
+
+{{- define "common.containername.esreader" -}}
+ {{- $name := ( include "common.fullname.esreader" . ) -}}
+ {{- printf "container-%s" $name | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+
+
+{{- define "common.serviceport.esreader.http" -}}8080{{- end -}}
+
+{{- define "common.pvname.esreader" -}}
+ {{- $name := ( include "common.fullname.esreader" . ) -}}
+ {{- printf "pv-%s" $name | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+
+{{- define "common.pvcname.esreader" -}}
+ {{- $name := ( include "common.fullname.esreader" . ) -}}
+ {{- printf "pvc-%s" $name | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+
diff --git a/helm/dbaas/charts/ric-common/templates/_ingress_controller.tpl b/helm/dbaas/charts/ric-common/templates/_ingress_controller.tpl
new file mode 100755
index 0000000..e136404
--- /dev/null
+++ b/helm/dbaas/charts/ric-common/templates/_ingress_controller.tpl
@@ -0,0 +1,71 @@
+################################################################################
+# 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. #
+# You may obtain a copy of the License at #
+# #
+# http://www.apache.org/licenses/LICENSE-2.0 #
+# #
+# Unless required by applicable law or agreed to in writing, software #
+# distributed under the License is distributed on an "AS IS" BASIS, #
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. #
+# See the License for the specific language governing permissions and #
+# limitations under the License. #
+################################################################################
+
+{{- define "common.ingresscontroller.url.platform" -}}
+ {{- $keylist := list "common" "ingresscontroller" "url" "platform" -}}
+ {{- $ctx := dict "ctx" $.Values "keylist" $keylist -}}
+ {{- $url := include "locate" $ctx -}}
+ {{- if not (empty $url) -}}
+ {{- $url -}}
+ {{- else -}}
+ {{- printf "ric-entry" -}}
+ {{- end -}}
+{{- end -}}
+
+{{- define "common.ingresscontroller.url.aux" -}}
+ {{- $keylist := list "common" "ingresscontroller" "url" "aux" -}}
+ {{- $ctx := dict "ctx" $.Values "keylist" $keylist -}}
+ {{- $url := include "locate" $ctx -}}
+ {{- if not (empty $url) -}}
+ {{- $url -}}
+ {{- else -}}
+ {{- printf "aux-entry" -}}
+ {{- end -}}
+{{- end -}}
+
+
+{{- define "common.ingresscontroller.url.dashboard" -}}
+ {{- $keylist := list "common" "ingresscontroller" "url" "dashboard" -}}
+ {{- $ctx := dict "ctx" $.Values "keylist" $keylist -}}
+ {{- $url := include "locate" $ctx -}}
+ {{- if not (empty $url) -}}
+ {{- $url -}}
+ {{- else -}}
+ {{- printf "dashboard-entry" -}}
+ {{- end -}}
+{{- end -}}
+
+{{- define "common.ingresscontroller.port.http" -}}
+ {{- $keylist := list "common" "ingresscontroller" "port" "http" -}}
+ {{- $ctx := dict "ctx" $.Values "keylist" $keylist -}}
+ {{- $port := include "locate" $ctx -}}
+ {{- if not (empty $port) -}}
+ {{- $port -}}
+ {{- else -}}
+ {{- printf "32080" -}}
+ {{- end -}}
+{{- end -}}
+
+{{- define "common.ingresscontroller.port.https" -}}
+ {{- $keylist := list "common" "ingresscontroller" "port" "https" -}}
+ {{- $ctx := dict "ctx" $.Values "keylist" $keylist -}}
+ {{- $port := include "locate" $ctx -}}
+ {{- if not (empty $port) -}}
+ {{- $port -}}
+ {{- else -}}
+ {{- printf "32443" -}}
+ {{- end -}}
+{{- end -}}
diff --git a/helm/dbaas/charts/ric-common/templates/_jaegeradapter.tpl b/helm/dbaas/charts/ric-common/templates/_jaegeradapter.tpl
new file mode 100755
index 0000000..0743710
--- /dev/null
+++ b/helm/dbaas/charts/ric-common/templates/_jaegeradapter.tpl
@@ -0,0 +1,72 @@
+################################################################################
+# 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. #
+# You may obtain a copy of the License at #
+# #
+# http://www.apache.org/licenses/LICENSE-2.0 #
+# #
+# Unless required by applicable law or agreed to in writing, software #
+# distributed under the License is distributed on an "AS IS" BASIS, #
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. #
+# See the License for the specific language governing permissions and #
+# limitations under the License. #
+################################################################################
+
+{{- define "common.name.jaegeradapter" -}}
+ {{- printf "jaegeradapter" -}}
+{{- 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.configmapname.jaegeradapter" -}}
+ {{- $name := ( include "common.fullname.jaegeradapter" . ) -}}
+ {{- printf "configmap-%s" $name | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+
+{{- define "common.deploymentname.jaegeradapter" -}}
+ {{- $name := ( include "common.fullname.jaegeradapter" . ) -}}
+ {{- printf "deployment-%s" $name | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+
+{{- define "common.containername.jaegeradapter" -}}
+ {{- $name := ( include "common.fullname.jaegeradapter" . ) -}}
+ {{- printf "container-%s" $name | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+
+
+{{- define "common.servicename.jaegeradapter.query" -}}
+ {{- $name := ( include "common.fullname.jaegeradapter" . ) -}}
+ {{- printf "service-%s-query" $name | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+{{- define "common.servicename.jaegeradapter.collector" -}}
+ {{- $name := ( include "common.fullname.jaegeradapter" . ) -}}
+ {{- printf "service-%s-collector" $name | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+{{- define "common.servicename.jaegeradapter.agent" -}}
+ {{- $name := ( include "common.fullname.jaegeradapter" . ) -}}
+ {{- printf "service-%s-agent" $name | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+
+{{- define "common.serviceport.jaegeradapter.zipkincompact" -}}5775{{- end -}}
+{{- define "common.serviceport.jaegeradapter.jaegercompact" -}}6831{{- end -}}
+{{- define "common.serviceport.jaegeradapter.jaegerbinary" -}}6832{{- end -}}
+{{- define "common.serviceport.jaegeradapter.httpquery" -}}16686{{- end -}}
+{{- define "common.serviceport.jaegeradapter.httpconfig" -}}5778{{- end -}}
+{{- define "common.serviceport.jaegeradapter.zipkinhttp" -}}9411{{- end -}}
+{{- define "common.serviceport.jaegeradapter.jaegerhttp" -}}14268{{- end -}}
+{{- define "common.serviceport.jaegeradapter.jaegerhttpt" -}}14267{{- end -}}
+
+{{- define "common.portname.jaegeradapter.zipkincompact" -}}"zipkincompact"{{- end -}}
+{{- define "common.portname.jaegeradapter.jaegercompact" -}}"jaegercompact"{{- end -}}
+{{- define "common.portname.jaegeradapter.jaegerbinary" -}}"jaegerbinary"{{- end -}}
+{{- define "common.portname.jaegeradapter.zipkinhttp" -}}"zipkinhttp"{{- end -}}
+{{- define "common.portname.jaegeradapter.jaegerhttp" -}}"jaegerhttp"{{- end -}}
+{{- define "common.portname.jaegeradapter.jaegerhttpt" -}}"jaegerhttpt"{{- end -}}
+{{- define "common.portname.jaegeradapter.httpquery" -}}"httpquery"{{- end -}}
+{{- define "common.portname.jaegeradapter.httpconfig" -}}"httpconfig"{{- end -}}
diff --git a/helm/dbaas/charts/ric-common/templates/_logstash.tpl b/helm/dbaas/charts/ric-common/templates/_logstash.tpl
new file mode 100755
index 0000000..7e50e03
--- /dev/null
+++ b/helm/dbaas/charts/ric-common/templates/_logstash.tpl
@@ -0,0 +1,49 @@
+################################################################################
+# 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. #
+# You may obtain a copy of the License at #
+# #
+# http://www.apache.org/licenses/LICENSE-2.0 #
+# #
+# Unless required by applicable law or agreed to in writing, software #
+# distributed under the License is distributed on an "AS IS" BASIS, #
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. #
+# See the License for the specific language governing permissions and #
+# limitations under the License. #
+################################################################################
+
+{{- define "common.name.logstash" -}}
+ {{- printf "logstash" -}}
+{{- end -}}
+
+
+{{- define "common.fullname.logstash" -}}
+ {{- $name := ( include "common.name.logstash" . ) -}}
+ {{- $namespace := ( include "common.namespace.aux" . ) -}}
+ {{- printf "%s-%s" $namespace $name | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+
+
+
+{{- define "common.deploymentname.logstash" -}}
+ {{- $name := ( include "common.fullname.logstash" . ) -}}
+ {{- printf "deployment-%s" $name | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+
+
+{{- define "common.configmapname.logstash" -}}
+ {{- $name := ( include "common.fullname.logstash" . ) -}}
+ {{- printf "configmap-%s" $name | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+
+
+{{- define "common.containername.logstash" -}}
+ {{- $name := ( include "common.fullname.logstash" . ) -}}
+ {{- printf "container-%s" $name | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+
+
+{{- define "common.serviceport.logstash.http" -}}8080{{- end -}}
+{{- define "common.servicename.logstash.http" -}}logstash{{- end -}}
diff --git a/helm/dbaas/charts/ric-common/templates/_messagerouter.tpl b/helm/dbaas/charts/ric-common/templates/_messagerouter.tpl
new file mode 100755
index 0000000..ac73f6c
--- /dev/null
+++ b/helm/dbaas/charts/ric-common/templates/_messagerouter.tpl
@@ -0,0 +1,58 @@
+################################################################################
+# 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. #
+# You may obtain a copy of the License at #
+# #
+# http://www.apache.org/licenses/LICENSE-2.0 #
+# #
+# Unless required by applicable law or agreed to in writing, software #
+# distributed under the License is distributed on an "AS IS" BASIS, #
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. #
+# See the License for the specific language governing permissions and #
+# limitations under the License. #
+################################################################################
+
+{{- define "common.name.messagerouter" -}}
+ {{- printf "messagerouter" -}}
+{{- 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.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.containername.messagerouter" -}}
+ {{- $name := ( include "common.fullname.messagerouter" . ) -}}
+ {{- printf "container-%s" $name | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+
+{{- define "common.serviceaccountname.messagerouter" -}}
+ {{- $name := ( include "common.fullname.messagerouter" . ) -}}
+ {{- 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 -}}
+
diff --git a/helm/dbaas/charts/ric-common/templates/_mrsub.tpl b/helm/dbaas/charts/ric-common/templates/_mrsub.tpl
new file mode 100755
index 0000000..15583d5
--- /dev/null
+++ b/helm/dbaas/charts/ric-common/templates/_mrsub.tpl
@@ -0,0 +1,48 @@
+################################################################################
+# 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. #
+# You may obtain a copy of the License at #
+# #
+# http://www.apache.org/licenses/LICENSE-2.0 #
+# #
+# Unless required by applicable law or agreed to in writing, software #
+# distributed under the License is distributed on an "AS IS" BASIS, #
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. #
+# See the License for the specific language governing permissions and #
+# limitations under the License. #
+################################################################################
+
+
+{{- define "common.name.mrsub" -}}
+ {{- printf "mrsub" -}}
+{{- end -}}
+
+{{- define "common.fullname.mrsub" -}}
+ {{- $name := ( include "common.name.mrsub" . ) -}}
+ {{- $namespace := ( include "common.namespace.aux" . ) -}}
+ {{- printf "%s-%s" $namespace $name | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+
+
+
+{{- define "common.deploymentname.mrsub" -}}
+ {{- $name := ( include "common.fullname.mrsub" . ) -}}
+ {{- printf "deployment-%s" $name | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+
+
+{{- define "common.configmapname.mrsub" -}}
+ {{- $name := ( include "common.fullname.mrsub" . ) -}}
+ {{- printf "configmap-%s" $name | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+
+
+{{- define "common.containername.mrsub" -}}
+ {{- $name := ( include "common.fullname.mrsub" . ) -}}
+ {{- printf "container-%s" $name | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+
+
+{{- define "common.serviceport.mrsub.http" -}}8080{{- end -}}
diff --git a/helm/dbaas/charts/ric-common/templates/_namespace.tpl b/helm/dbaas/charts/ric-common/templates/_namespace.tpl
new file mode 100755
index 0000000..d2df3ee
--- /dev/null
+++ b/helm/dbaas/charts/ric-common/templates/_namespace.tpl
@@ -0,0 +1,60 @@
+################################################################################
+# 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. #
+# You may obtain a copy of the License at #
+# #
+# http://www.apache.org/licenses/LICENSE-2.0 #
+# #
+# Unless required by applicable law or agreed to in writing, software #
+# distributed under the License is distributed on an "AS IS" BASIS, #
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. #
+# See the License for the specific language governing permissions and #
+# limitations under the License. #
+################################################################################
+
+{{- define "common.namespace.platform" -}}
+ {{- $keylist := list "common" "namespace" "platform" -}}
+ {{- $ctx := dict "ctx" $.Values "keylist" $keylist -}}
+ {{- $namespace := include "locate" $ctx -}}
+ {{- if not (empty $namespace) -}}
+ {{- $namespace -}}
+ {{- else -}}
+ {{- printf "ricplt" -}}
+ {{- end -}}
+{{- end -}}
+
+{{- define "common.namespace.infra" -}}
+ {{- $keylist := list "common" "namespace" "infra" -}}
+ {{- $ctx := dict "ctx" $.Values "keylist" $keylist -}}
+ {{- $namespace := include "locate" $ctx -}}
+ {{- if not (empty $namespace) -}}
+ {{- $namespace -}}
+ {{- else -}}
+ {{- printf "ricinfra" -}}
+ {{- end -}}
+{{- end -}}
+
+{{- define "common.namespace.xapp" -}}
+ {{- $keylist := list "common" "namespace" "xapp" -}}
+ {{- $ctx := dict "ctx" $.Values "keylist" $keylist -}}
+ {{- $namespace := include "locate" $ctx -}}
+ {{- if not (empty $namespace) -}}
+ {{- $namespace -}}
+ {{- else -}}
+ {{- printf "ricxapp" -}}
+ {{- end -}}
+{{- end -}}
+
+
+{{- define "common.namespace.aux" -}}
+ {{- $keylist := list "common" "namespace" "aux" -}}
+ {{- $ctx := dict "ctx" $.Values "keylist" $keylist -}}
+ {{- $namespace := include "locate" $ctx -}}
+ {{- if not (empty $namespace) -}}
+ {{- $namespace -}}
+ {{- else -}}
+ {{- printf "ricaux" -}}
+ {{- end -}}
+{{- end -}}
diff --git a/helm/dbaas/charts/ric-common/templates/_o1mediator.tpl b/helm/dbaas/charts/ric-common/templates/_o1mediator.tpl
new file mode 100755
index 0000000..1abcbe6
--- /dev/null
+++ b/helm/dbaas/charts/ric-common/templates/_o1mediator.tpl
@@ -0,0 +1,69 @@
+################################################################################
+# 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. #
+# You may obtain a copy of the License at #
+# #
+# http://www.apache.org/licenses/LICENSE-2.0 #
+# #
+# Unless required by applicable law or agreed to in writing, software #
+# distributed under the License is distributed on an "AS IS" BASIS, #
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. #
+# See the License for the specific language governing permissions and #
+# limitations under the License. #
+################################################################################
+
+{{- define "common.name.o1mediator" -}}
+ {{- printf "o1mediator" -}}
+{{- end -}}
+
+{{- define "common.fullname.o1mediator" -}}
+ {{- $name := ( include "common.name.o1mediator" . ) -}}
+ {{- $namespace := ( include "common.namespace.platform" . ) -}}
+ {{- printf "%s-%s" $namespace $name | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+
+{{- define "common.configmapname.o1mediator" -}}
+ {{- $name := ( include "common.fullname.o1mediator" . ) -}}
+ {{- printf "configmap-%s" $name | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+
+{{- define "common.deploymentname.o1mediator" -}}
+ {{- $name := ( include "common.fullname.o1mediator" . ) -}}
+ {{- printf "deployment-%s" $name | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+
+{{- define "common.containername.o1mediator" -}}
+ {{- $name := ( include "common.fullname.o1mediator" . ) -}}
+ {{- printf "container-%s" $name | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+
+{{- define "common.serviceaccountname.o1mediator" -}}
+ {{- $name := ( include "common.fullname.o1mediator" . ) -}}
+ {{- printf "svcacct-%s" $name | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+
+{{- define "common.ingressname.o1mediator" -}}
+ {{- $name := ( include "common.fullname.o1mediator" . ) -}}
+ {{- printf "ingress-%s" $name | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+{{- define "common.kongpath.ric.o1mediator" -}}/o1mediator{{- end -}}
+
+{{- define "common.servicename.o1mediator.http" -}}
+ {{- $name := ( include "common.fullname.o1mediator" . ) -}}
+ {{- printf "service-%s-http" $name | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+
+{{- define "common.servicename.o1mediator.tcp.netconf" -}}
+ {{- $name := ( include "common.fullname.o1mediator" . ) -}}
+ {{- printf "service-%s-tcp-netconf" $name | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+
+
+{{- define "common.serviceport.o1mediator.http.supervise" -}}9001{{- end -}}
+{{- define "common.serviceport.o1mediator.http.mediation" -}}8080{{- end -}}
+{{- define "common.serviceport.o1mediator.http.event" -}}3000{{- end -}}
+{{- define "common.serviceport.o1mediator.tcp.netconf" -}}830{{- end -}}
+
+{{- define "common.nodeport.o1mediator.tcp.netconf" -}}30830{{- end -}}
diff --git a/helm/dbaas/charts/ric-common/templates/_rsm.tpl b/helm/dbaas/charts/ric-common/templates/_rsm.tpl
new file mode 100755
index 0000000..4fe5d46
--- /dev/null
+++ b/helm/dbaas/charts/ric-common/templates/_rsm.tpl
@@ -0,0 +1,66 @@
+################################################################################
+# 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. #
+# You may obtain a copy of the License at #
+# #
+# http://www.apache.org/licenses/LICENSE-2.0 #
+# #
+# Unless required by applicable law or agreed to in writing, software #
+# distributed under the License is distributed on an "AS IS" BASIS, #
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. #
+# See the License for the specific language governing permissions and #
+# limitations under the License. #
+################################################################################
+
+{{- define "common.name.rsm" -}}
+ {{- printf "rsm" -}}
+{{- end -}}
+
+{{- define "common.fullname.rsm" -}}
+ {{- $name := ( include "common.name.rsm" . ) -}}
+ {{- $namespace := ( include "common.namespace.platform" . ) -}}
+ {{- printf "%s-%s" $namespace $name | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+
+{{- define "common.configmapname.rsm" -}}
+ {{- $name := ( include "common.fullname.rsm" . ) -}}
+ {{- printf "configmap-%s" $name | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+
+{{- define "common.deploymentname.rsm" -}}
+ {{- $name := ( include "common.fullname.rsm" . ) -}}
+ {{- printf "deployment-%s" $name | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+
+{{- define "common.containername.rsm" -}}
+ {{- $name := ( include "common.fullname.rsm" . ) -}}
+ {{- printf "container-%s" $name | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+
+{{- define "common.serviceaccountname.rsm" -}}
+ {{- $name := ( include "common.fullname.rsm" . ) -}}
+ {{- printf "svcacct-%s" $name | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+
+{{- define "common.ingressname.rsm" -}}
+ {{- $name := ( include "common.fullname.rsm" . ) -}}
+ {{- printf "ingress-%s" $name | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+
+{{- define "common.kongpath.ric.rsm" -}}/rsm{{- end -}}
+
+{{- define "common.servicename.rsm.rmr" -}}
+ {{- $name := ( include "common.fullname.rsm" . ) -}}
+ {{- printf "service-%s-rmr" $name | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+
+{{- define "common.servicename.rsm.http" -}}
+ {{- $name := ( include "common.fullname.rsm" . ) -}}
+ {{- printf "service-%s-http" $name | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+
+{{- define "common.serviceport.rsm.rmr.data" -}}4801{{- end -}}
+{{- define "common.serviceport.rsm.rmr.route" -}}4561{{- end -}}
+{{- define "common.serviceport.rsm.http" -}}4800{{- end -}}
diff --git a/helm/dbaas/charts/ric-common/templates/_rtmgr.tpl b/helm/dbaas/charts/ric-common/templates/_rtmgr.tpl
new file mode 100755
index 0000000..f3dd2ab
--- /dev/null
+++ b/helm/dbaas/charts/ric-common/templates/_rtmgr.tpl
@@ -0,0 +1,64 @@
+################################################################################
+# 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. #
+# You may obtain a copy of the License at #
+# #
+# http://www.apache.org/licenses/LICENSE-2.0 #
+# #
+# Unless required by applicable law or agreed to in writing, software #
+# distributed under the License is distributed on an "AS IS" BASIS, #
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. #
+# See the License for the specific language governing permissions and #
+# limitations under the License. #
+################################################################################
+
+{{- define "common.name.rtmgr" -}}
+ {{- printf "rtmgr" -}}
+{{- end -}}
+
+{{- define "common.fullname.rtmgr" -}}
+ {{- $name := ( include "common.name.rtmgr" . ) -}}
+ {{- $namespace := ( include "common.namespace.platform" . ) -}}
+ {{- printf "%s-%s" $namespace $name | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+
+{{- define "common.configmapname.rtmgr" -}}
+ {{- $name := ( include "common.fullname.rtmgr" . ) -}}
+ {{- printf "configmap-%s" $name | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+
+{{- define "common.deploymentname.rtmgr" -}}
+ {{- $name := ( include "common.fullname.rtmgr" . ) -}}
+ {{- printf "deployment-%s" $name | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+
+{{- define "common.containername.rtmgr" -}}
+ {{- $name := ( include "common.fullname.rtmgr" . ) -}}
+ {{- printf "container-%s" $name | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+
+{{- define "common.serviceaccountname.rtmgr" -}}
+ {{- $name := ( include "common.fullname.rtmgr" . ) -}}
+ {{- printf "svcacct-%s" $name | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+
+{{- define "common.ingressname.rtmgr" -}}
+ {{- $name := ( include "common.fullname.rtmgr" . ) -}}
+ {{- printf "ingress-%s" $name | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+
+{{- define "common.servicename.rtmgr.rmr" -}}
+ {{- $name := ( include "common.fullname.rtmgr" . ) -}}
+ {{- printf "service-%s-rmr" $name | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+
+{{- define "common.servicename.rtmgr.http" -}}
+ {{- $name := ( include "common.fullname.rtmgr" . ) -}}
+ {{- printf "service-%s-http" $name | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+
+{{- define "common.serviceport.rtmgr.rmr.data" -}}4560{{- end -}}
+{{- define "common.serviceport.rtmgr.rmr.route" -}}4561{{- end -}}
+{{- define "common.serviceport.rtmgr.http" -}}3800{{- end -}}
diff --git a/helm/dbaas/charts/ric-common/templates/_submgr.tpl b/helm/dbaas/charts/ric-common/templates/_submgr.tpl
new file mode 100755
index 0000000..b4b06c1
--- /dev/null
+++ b/helm/dbaas/charts/ric-common/templates/_submgr.tpl
@@ -0,0 +1,55 @@
+################################################################################
+# 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. #
+# You may obtain a copy of the License at #
+# #
+# http://www.apache.org/licenses/LICENSE-2.0 #
+# #
+# Unless required by applicable law or agreed to in writing, software #
+# distributed under the License is distributed on an "AS IS" BASIS, #
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. #
+# See the License for the specific language governing permissions and #
+# limitations under the License. #
+################################################################################
+
+{{- define "common.name.submgr" -}}
+ {{- printf "submgr" -}}
+{{- 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.configmapname.submgr" -}}
+ {{- $name := ( include "common.fullname.submgr" . ) -}}
+ {{- printf "configmap-%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.containername.submgr" -}}
+ {{- $name := ( include "common.fullname.submgr" . ) -}}
+ {{- printf "container-%s" $name | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+
+{{- define "common.servicename.submgr.rmr" -}}
+ {{- $name := ( include "common.fullname.submgr" . ) -}}
+ {{- printf "service-%s-rmr" $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.serviceport.submgr.rmr.data" -}}4560{{- end -}}
+{{- define "common.serviceport.submgr.rmr.route" -}}4561{{- end -}}
+{{- define "common.serviceport.submgr.http" -}}3800{{- end -}}
diff --git a/helm/dbaas/charts/ric-common/templates/_tiller.tpl b/helm/dbaas/charts/ric-common/templates/_tiller.tpl
new file mode 100755
index 0000000..d423c39
--- /dev/null
+++ b/helm/dbaas/charts/ric-common/templates/_tiller.tpl
@@ -0,0 +1,149 @@
+################################################################################
+# Copyright (c) 2019 AT&T Intellectual Property. #
+# Copyright (c) 2019 Nokia. #
+# #
+# Licensed under the Apache License, Version 2.0 (the "License"); #
+# you may not use this file except in compliance with the License. #
+# You may obtain a copy of the License at #
+# #
+# http://www.apache.org/licenses/LICENSE-2.0 #
+# #
+# Unless required by applicable law or agreed to in writing, software #
+# distributed under the License is distributed on an "AS IS" BASIS, #
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. #
+# See the License for the specific language governing permissions and #
+# limitations under the License. #
+################################################################################
+
+{{- define "recursiveprinter" -}}
+ {{- $ctx := .ctx }}
+ {{- $printkeys := .printkeys }}
+ {{- $currentkey := first $printkeys -}}
+ {{- $restkeys := rest $printkeys -}}
+ {{- if empty $restkeys -}}
+ {{- $result := index $ctx $currentkey -}}
+ {{- if not (empty $result) -}}
+ {{- $result -}}
+ {{- end -}}
+ {{- else -}}
+ {{- with index $ctx $currentkey }}
+ {{- $newctx := dict "ctx" . "printkeys" $restkeys -}}
+ {{- include "recursiveprinter" $newctx -}}
+ {{- end -}}
+ {{- end -}}
+{{- end -}}
+
+{{- define "printer" -}}
+ {{- $topctx := .ctx }}
+ {{- if hasKey $topctx.Values "common" }}
+ {{- if hasKey $topctx.Values.common "tillers" }}
+ {{- $ctx := index $topctx.Values.common.tillers .key -}}
+ {{- if not (empty $ctx) -}}
+ {{- $newctx := dict "ctx" $ctx "printkeys" .printkey -}}
+ {{- include "recursiveprinter" $newctx -}}
+ {{- end -}}
+ {{- end -}}
+ {{- end -}}
+{{- end -}}
+
+
+
+
+{{- define "common.tillerName" -}}
+ {{- $printkey := list "name" -}}
+ {{- $newctx := dict "ctx" .ctx "key" .key "printkey" $printkey }}
+ {{- default "tiller-deploy" (include "printer" $newctx) -}}
+{{- end -}}
+
+
+{{- define "common.tillerNameSpace" -}}
+ {{- $printkey := list "nameSpace" -}}
+ {{- $newctx := dict "ctx" .ctx "key" .key "printkey" $printkey }}
+ {{- default "kube-system" (include "printer" $newctx) -}}
+{{- end -}}
+
+{{- define "common.tillerDeployNameSpace" -}}
+ {{- $printkey := list "deployNameSpace" -}}
+ {{- $newctx := dict "ctx" .ctx "key" .key "printkey" $printkey }}
+ {{- default "kube-system" (include "printer" $newctx) -}}
+{{- end -}}
+
+
+
+{{- define "common.tillerPort" -}}
+ {{- $printkey := list "port" -}}
+ {{- $newctx := dict "ctx" .ctx "key" .key "printkey" $printkey }}
+ {{- default 44134 (include "printer" $newctx) -}}
+{{- end -}}
+
+
+
+
+{{- define "common.tillerTLSVerify" -}}
+ {{- $printkey := list "tls" "verify" -}}
+ {{- $newctx := dict "ctx" .ctx "key" .key "printkey" $printkey }}
+ {{- default false (include "printer" $newctx) -}}
+{{- end -}}
+
+
+{{- define "common.tillerTLSAuthenticate" -}}
+ {{- $printkey := list "tls" "authenticate" -}}
+ {{- $newctx := dict "ctx" .ctx "key" .key "printkey" $printkey }}
+ {{- default false (include "printer" $newctx) -}}
+{{- end -}}
+
+
+{{- define "common.tillerHelmClientTLSSecret" -}}
+ {{- $tlsverify := include "common.tillerTLSVerify" . }}
+ {{- $tlsauthenticate := include "common.tillerTLSAuthenticate" . }}
+ {{- if or (eq $tlsverify "true") (eq $tlsauthenticate "true") }}
+ {{- $printkey := list "secret" "helmSecretName" -}}
+ {{- $newctx := dict "ctx" .ctx "key" .key "printkey" $printkey }}
+ {{- default "" (include "printer" $newctx) -}}
+ {{- else -}}
+ {{- printf "" -}}
+ {{- end }}
+{{- end -}}
+
+
+{{- define "common.serviceaccountname.tiller" -}}
+ {{- $name := ( include "common.tillerName" . ) -}}
+ {{- printf "svcacct-tiller-%s" $name | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+
+
+
+{{- define "common.deploymentname.tiller" -}}
+ {{- $name := ( include "common.tillerName" . ) -}}
+ {{- printf "deployment-tiller-%s" $name | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+
+
+{{- define "common.servicename.tiller" -}}
+ {{- $topctx := .ctx }}
+ {{- if hasKey $topctx.Values "common" }}
+ {{- if hasKey $topctx.Values.common "tillers" }}
+ {{- $ctx := index $topctx.Values.common.tillers .key -}}
+ {{- if not (empty $ctx) -}}
+ {{- if hasKey $ctx "name" -}}
+ {{- $name := include "common.tillerName" . -}}
+ {{- printf "service-tiller-%s" $name | trunc 63 | trimSuffix "-" -}}
+ {{- else -}}
+ {{ "tiller-deploy" }}
+ {{- end -}}
+ {{- else -}}
+ {{ "tiller-deploy" }}
+ {{- end -}}
+ {{- else -}}
+ {{ "tiller-deploy" }}
+ {{- end -}}
+ {{- else -}}
+ {{ "tiller-deploy" }}
+ {{- end -}}
+{{- end -}}
+
+{{- define "common.tillerEndpoint" -}}
+ {{- $servicename := ( include "common.servicename.tiller" . ) -}}
+ {{- $deploynamespace := ( include "common.tillerDeployNameSpace" . ) -}}
+ {{- printf "%s.%s" $servicename $deploynamespace -}}
+{{- end -}}
diff --git a/helm/dbaas/charts/ric-common/templates/_ves.tpl b/helm/dbaas/charts/ric-common/templates/_ves.tpl
new file mode 100755
index 0000000..e768551
--- /dev/null
+++ b/helm/dbaas/charts/ric-common/templates/_ves.tpl
@@ -0,0 +1,66 @@
+################################################################################
+# 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. #
+# You may obtain a copy of the License at #
+# #
+# http://www.apache.org/licenses/LICENSE-2.0 #
+# #
+# Unless required by applicable law or agreed to in writing, software #
+# distributed under the License is distributed on an "AS IS" BASIS, #
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. #
+# See the License for the specific language governing permissions and #
+# limitations under the License. #
+################################################################################
+
+{{- define "common.name.ves" -}}
+ {{- printf "ves" -}}
+{{- 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.configmapname.ves" -}}
+ {{- $name := ( include "common.fullname.ves" . ) -}}
+ {{- printf "configmap-%s" $name | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+
+{{- define "common.deploymentname.ves" -}}
+ {{- $name := ( include "common.fullname.ves" . ) -}}
+ {{- printf "deployment-%s" $name | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+
+{{- define "common.containername.ves" -}}
+ {{- $name := ( include "common.fullname.ves" . ) -}}
+ {{- printf "container-%s" $name | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+
+{{- define "common.serviceaccountname.ves" -}}
+ {{- $name := ( include "common.fullname.ves" . ) -}}
+ {{- printf "svcacct-%s" $name | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+
+{{- define "common.ingressname.ves" -}}
+ {{- $name := ( include "common.fullname.ves" . ) -}}
+ {{- printf "ingress-%s" $name | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+
+{{- define "common.kongpath.aux.vescollector" -}}/vescollector{{- end -}}
+
+{{- define "common.servicename.ves.http" -}}
+ {{- $name := ( include "common.fullname.ves" . ) -}}
+ {{- printf "service-%s-http" $name | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+
+{{- define "common.servicename.ves.tcp" -}}
+ {{- $name := ( include "common.fullname.ves" . ) -}}
+ {{- printf "service-%s-tcp" $name | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+
+{{- define "common.serviceport.ves.http" -}}8080{{- end -}}
+{{- define "common.serviceport.ves.https" -}}8443{{- end -}}
diff --git a/helm/dbaas/charts/ric-common/templates/_vespamgr.tpl b/helm/dbaas/charts/ric-common/templates/_vespamgr.tpl
new file mode 100755
index 0000000..a1c443d
--- /dev/null
+++ b/helm/dbaas/charts/ric-common/templates/_vespamgr.tpl
@@ -0,0 +1,53 @@
+################################################################################
+# 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. #
+# You may obtain a copy of the License at #
+# #
+# http://www.apache.org/licenses/LICENSE-2.0 #
+# #
+# Unless required by applicable law or agreed to in writing, software #
+# distributed under the License is distributed on an "AS IS" BASIS, #
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. #
+# See the License for the specific language governing permissions and #
+# limitations under the License. #
+################################################################################
+
+{{- define "common.name.vespamgr" -}}
+ {{- printf "vespamgr" -}}
+{{- 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.configmapname.vespamgr" -}}
+ {{- $name := ( include "common.fullname.vespamgr" . ) -}}
+ {{- printf "configmap-%s" $name | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+
+{{- define "common.deploymentname.vespamgr" -}}
+ {{- $name := ( include "common.fullname.vespamgr" . ) -}}
+ {{- printf "deployment-%s" $name | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+
+{{- define "common.containername.vespamgr" -}}
+ {{- $name := ( include "common.fullname.vespamgr" . ) -}}
+ {{- printf "container-%s" $name | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+
+{{- define "common.servicename.vespamgr.http" -}}
+ {{- $name := ( include "common.fullname.vespamgr" . ) -}}
+ {{- printf "service-%s-http" $name | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+
+{{- define "common.servicename.vespamgr.alert" -}}
+ {{- $name := ( include "common.fullname.vespamgr" . ) -}}
+ {{- printf "service-%s-alert" $name | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+
+{{- define "common.serviceport.vespamgr.http" -}}8080{{- end -}}
+{{- define "common.serviceport.vespamgr.alert" -}}9095{{- end -}}
diff --git a/helm/dbaas/charts/ric-common/templates/_xapp_onboarder.tpl b/helm/dbaas/charts/ric-common/templates/_xapp_onboarder.tpl
new file mode 100755
index 0000000..357f3ea
--- /dev/null
+++ b/helm/dbaas/charts/ric-common/templates/_xapp_onboarder.tpl
@@ -0,0 +1,65 @@
+################################################################################
+# 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. #
+# You may obtain a copy of the License at #
+# #
+# http://www.apache.org/licenses/LICENSE-2.0 #
+# #
+# Unless required by applicable law or agreed to in writing, software #
+# distributed under the License is distributed on an "AS IS" BASIS, #
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. #
+# See the License for the specific language governing permissions and #
+# limitations under the License. #
+################################################################################
+
+{{- define "common.name.xapp-onboarder" -}}
+ {{- printf "xapp-onboarder" -}}
+{{- end -}}
+
+{{- define "common.fullname.xapp-onboarder" -}}
+ {{- $name := ( include "common.name.xapp-onboarder" . ) -}}
+ {{- $namespace := ( include "common.namespace.platform" . ) -}}
+ {{- printf "%s-%s" $namespace $name | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+
+{{- define "common.configmapname.xapp-onboarder" -}}
+ {{- $name := ( include "common.fullname.xapp-onboarder" . ) -}}
+ {{- printf "configmap-%s" $name | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+
+{{- define "common.deploymentname.xapp-onboarder" -}}
+ {{- $name := ( include "common.fullname.xapp-onboarder" . ) -}}
+ {{- printf "deployment-%s" $name | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+
+{{- define "common.containername.xapp-onboarder" -}}
+ {{- $name := ( include "common.fullname.xapp-onboarder" . ) -}}
+ {{- printf "container-%s" $name | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+{{- define "common.containername.xapp-onboarder.chartmuseum" -}}
+ {{- $name := ( include "common.fullname.xapp-onboarder" . ) -}}
+ {{- printf "container-%s-chartmuseum" $name | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+
+{{- define "common.serviceaccountname.xapp-onboarder" -}}
+ {{- $name := ( include "common.fullname.xapp-onboarder" . ) -}}
+ {{- printf "svcacct-%s" $name | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+
+{{- define "common.ingressname.xapp-onboarder" -}}
+ {{- $name := ( include "common.fullname.xapp-onboarder" . ) -}}
+ {{- printf "ingress-%s" $name | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+
+{{- define "common.servicename.xapp-onboarder.server" -}}
+ {{- $name := ( include "common.fullname.xapp-onboarder" . ) -}}
+ {{- printf "service-%s-http" $name | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+
+{{- define "common.serviceport.xapp-onboarder.server" -}}8888{{- end -}}
+{{- define "common.serviceport.xapp-onboarder.chartmuseum" -}}8080{{- end -}}
+
+{{- define "common.kongpath.ric.xapp-onboarder" -}}/onboard{{- end -}}
+{{- define "common.kongpath.ric.chartmuseum" -}}/helmrepo{{- end -}}
diff --git a/helm/alarmadapter/Chart.yaml b/helm/dbaas/charts/ric-common/values.yaml
old mode 100644
new mode 100755
similarity index 85%
copy from helm/alarmadapter/Chart.yaml
copy to helm/dbaas/charts/ric-common/values.yaml
index af55ed9..8543211
--- a/helm/alarmadapter/Chart.yaml
+++ b/helm/dbaas/charts/ric-common/values.yaml
@@ -15,8 +15,7 @@
# limitations under the License. #
################################################################################
-apiVersion: v1
-appVersion: "1.0"
-description: Helm chart for RIC Alarm Adapter
-name: alarmadapter
-version: 3.0.0
+#################################################################
+# Global configuration default values that can be inherited by
+# all subcharts.
+#################################################################
diff --git a/helm/dbaas/templates/configmap.yaml b/helm/dbaas/templates/configmap.yaml
index a9a0764..27b36a7 100644
--- a/helm/dbaas/templates/configmap.yaml
+++ b/helm/dbaas/templates/configmap.yaml
@@ -19,6 +19,7 @@
kind: ConfigMap
metadata:
name: {{ template "common.configmapname.dbaas" . }}-config
+ namespace: {{ include "common.namespace.platform" . }}
labels:
heritage: {{ .Release.Service }}
release: {{ .Release.Name }}