Support for dbaas(HA/SA) in deployment

Change-Id: I43cec8190d2bff3096654e3fddac5faee3014b8f
Signed-off-by: wahidw <abdulwahid.w@nokia.com>

diff --git a/helm/a1mediator/templates/deployment.yaml b/helm/a1mediator/templates/deployment.yaml
index 6ad2b93..589eecd 100644 (file)
--- a/helm/a1mediator/templates/deployment.yaml
+++ b/helm/a1mediator/templates/deployment.yaml
@@ -56,6 +56,8 @@ spec:
           envFrom:
             - configMapRef:
                 name: {{ include "common.configmapname.a1mediator" . }}-env
+            - configMapRef:
+                name: {{ include "common.configmapname.dbaas" . }}-appconfig
           image: {{ include "common.dockerregistry.url" $imagectx }}/{{ .Values.a1mediator.image.name }}:{{ .Values.a1mediator.image.tag }}
           imagePullPolicy: {{ include "common.dockerregistry.pullpolicy" $pullpolicyctx }}
           ports:

diff --git a/helm/a1mediator/templates/env.yaml b/helm/a1mediator/templates/env.yaml
index e60850a..eaae74a 100644 (file)
--- a/helm/a1mediator/templates/env.yaml
+++ b/helm/a1mediator/templates/env.yaml
@@ -19,10 +19,6 @@ kind: ConfigMap
 metadata:
   name: {{ include "common.configmapname.a1mediator" . }}-env
 data:
-  DBAAS_SERVICE_HOST: {{ include "common.servicename.dbaas.tcp" . | quote }}
-  DBAAS_SERVICE_PORT: {{ include "common.serviceport.dbaas.tcp" . | quote }}
-  DBAAS_PORT_6379_TCP_ADDR: {{ include "common.servicename.dbaas.tcp" . | quote }}
-  DBAAS_PORT_6379_TCP_PORT: {{ include "common.serviceport.dbaas.tcp" . | quote }}
   RMR_RTG_SVC: {{ include "common.serviceport.a1mediator.rmr.route" . | quote }}
   PYTHONUNBUFFERED: "1"
   A1_RMR_RETRY_TIMES: "{{ .Values.a1mediator.rmr_timeout_config.a1_rcv_retry_times }}"

diff --git a/helm/appmgr/templates/deployment.yaml b/helm/appmgr/templates/deployment.yaml
index 26ad883..f1c38e3 100644 (file)
--- a/helm/appmgr/templates/deployment.yaml
+++ b/helm/appmgr/templates/deployment.yaml
@@ -117,6 +117,8 @@ spec:
           envFrom:
             - configMapRef:
                 name: {{ include "common.configmapname.appmgr" . }}-env
+            - configMapRef:
+                name: {{ include "common.configmapname.dbaas" . }}-appconfig
           livenessProbe:
             #exec:
             #  command:

diff --git a/helm/appmgr/templates/env-appmgr.yaml b/helm/appmgr/templates/env-appmgr.yaml
index e87d3e1..5ab9580 100644 (file)
--- a/helm/appmgr/templates/env-appmgr.yaml
+++ b/helm/appmgr/templates/env-appmgr.yaml
@@ -23,10 +23,6 @@ metadata:
   name: {{ include "common.configmapname.appmgr" . }}-env
 data:
   NAME: "xappmgr"
-  DBAAS_SERVICE_HOST: {{ include "common.servicename.dbaas.tcp" . | quote }}
-  DBAAS_SERVICE_PORT: {{ include "common.serviceport.dbaas.tcp" . | quote }}
-  DBAAS_PORT_6379_TCP_ADDR: {{ include "common.servicename.dbaas.tcp" . | quote }}
-  DBAAS_PORT_6379_TCP_PORT: {{ include "common.serviceport.dbaas.tcp" . | quote }} 
   RMR_RTG_SVC: {{ include "common.serviceport.appmgr.rmr.route" . | quote }}
 {{- $certPath := .Values.appmgr.appcertpath | default "/opt/ric/certificates" }}
 {{- $secretPath := .Values.appmgr.appsecretpath | default "/opt/ric/secret" }}

diff --git a/helm/dbaasha/templates/appconfig.yaml b/helm/dbaasha/templates/appconfig.yaml
deleted file mode 100644 (file)
index fe956dd..0000000
--- a/helm/dbaasha/templates/appconfig.yaml
+++ /dev/null
@@ -1,31 +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.                                             #
-################################################################################
-
-apiVersion: v1
-kind: ConfigMap
-metadata:
-  name: {{ template "common.configmapname.dbaasha" . }}-appconfig
-  labels:
-    heritage: {{ .Release.Service }}
-    release: {{ .Release.Name }}
-    chart: {{ .Chart.Name }}-{{ .Chart.Version }}
-    app: {{ include "common.namespace.platform" . }}-{{ include "common.name.dbaasha" . }}
-data:
-  DBAAS_SERVICE_HOST: {{ include "common.servicename.dbaasha.tcp" . }}.{{ .Release.Namespace }}.svc.cluster.local
-  DBAAS_SERVICE_PORT: {{ include "common.serviceport.dbaasha.redis" . | quote }}
-  DBAAS_SERVICE_SENTINEL_PORT: {{ include "common.serviceport.dbaasha.sentinel" . | quote }}
-  DBAAS_MASTER_NAME: {{ .Values.dbaasha.redis.masterGroupName }}

diff --git a/helm/e2mgr/templates/deployment.yaml b/helm/e2mgr/templates/deployment.yaml
index 04028a4..f5cbafe 100644 (file)
--- a/helm/e2mgr/templates/deployment.yaml
+++ b/helm/e2mgr/templates/deployment.yaml
@@ -59,6 +59,8 @@ spec:
           envFrom:
             - configMapRef:
                 name: {{ include "common.configmapname.e2mgr" . }}-env
+            - configMapRef:
+                name: {{ include "common.configmapname.dbaas" . }}-appconfig
           ports:
             - name: "http"
               containerPort: {{ include "common.serviceport.e2mgr.http" . }}

diff --git a/helm/e2mgr/templates/env.yaml b/helm/e2mgr/templates/env.yaml
index c17aa26..213b571 100644 (file)
--- a/helm/e2mgr/templates/env.yaml
+++ b/helm/e2mgr/templates/env.yaml
@@ -19,10 +19,6 @@ kind: ConfigMap
 metadata:
   name: {{ include "common.configmapname.e2mgr" . }}-env
 data:
-   DBAAS_SERVICE_HOST: {{ include "common.servicename.dbaas.tcp" . | quote }}
-   DBAAS_SERVICE_PORT: {{ include "common.serviceport.dbaas.tcp" . | quote }}
-   DBAAS_PORT_6379_TCP_ADDR: {{ include "common.servicename.dbaas.tcp" . | quote }}
-   DBAAS_PORT_6379_TCP_PORT: {{ include "common.serviceport.dbaas.tcp" . | quote }} 
    RMR_RTG_SVC: {{ include "common.serviceport.e2mgr.rmr.route" . | quote }}
    RMR_SRC_ID: {{ include "common.servicename.e2mgr.rmr" . }}.{{ include "common.namespace.platform" . }}
    #nano: {{ include "common.serviceport.e2mgr.rmr.data" . | quote }}

diff --git a/helm/e2term/templates/env.yaml b/helm/e2term/templates/env.yaml
index 89bd26a..3d11225 100644 (file)
--- a/helm/e2term/templates/env.yaml
+++ b/helm/e2term/templates/env.yaml
@@ -24,10 +24,6 @@ kind: ConfigMap
 metadata:
   name: {{ include "common.configmapname.e2term" $topCtx }}-env-{{ $key }}
 data:
-  DBAAS_SERVICE_HOST: {{ include "common.servicename.dbaas.tcp" $topCtx | quote }}
-  DBAAS_SERVICE_PORT: {{ include "common.serviceport.dbaas.tcp" $topCtx | quote }}
-  DBAAS_PORT_6379_TCP_ADDR: {{ include "common.servicename.dbaas.tcp" $topCtx | quote }}
-  DBAAS_PORT_6379_TCP_PORT: {{ include "common.serviceport.dbaas.tcp" $topCtx | quote }}
   RMR_SRC_ID: {{ include "common.servicename.e2term.rmr" $topCtx }}-{{ $key }}.{{ include "common.namespace.platform" $topCtx }}
   RMR_RTG_SVC: {{ include "common.serviceport.e2term.rmr.route" $topCtx | quote }}
   RMR_SEED_RT: "router.txt"

diff --git a/helm/o1mediator/templates/deployment.yaml b/helm/o1mediator/templates/deployment.yaml
index 5aa02c6..ddd2685 100644 (file)
--- a/helm/o1mediator/templates/deployment.yaml
+++ b/helm/o1mediator/templates/deployment.yaml
@@ -54,7 +54,7 @@ spec:
           imagePullPolicy: {{ include "common.dockerregistry.pullpolicy" $pullpolicyctx }}
           envFrom:
             - configMapRef:
-                name: {{ include "common.configmapname.o1mediator" . }}-env
+                name: {{ include "common.configmapname.dbaas" . }}-appconfig
           ports:
             - name: http-supervise
               containerPort: {{ include "common.serviceport.o1mediator.http.supervise" . }}

diff --git a/helm/o1mediator/templates/env.yaml b/helm/o1mediator/templates/env.yaml
deleted file mode 100644 (file)
index 5ae05b2..0000000
--- a/helm/o1mediator/templates/env.yaml
+++ /dev/null
@@ -1,23 +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.                                             #
-################################################################################
-apiVersion: v1
-kind: ConfigMap
-metadata:
-  name: {{ include "common.configmapname.o1mediator" . }}-env
-data:
-  DBAAS_SERVICE_HOST: {{ include "common.servicename.dbaas.tcp" . | quote }}
-  DBAAS_SERVICE_PORT: {{ include "common.serviceport.dbaas.tcp" . | quote }}

diff --git a/helm/rsm/templates/deployment.yaml b/helm/rsm/templates/deployment.yaml
index 8a01306..7818413 100644 (file)
--- a/helm/rsm/templates/deployment.yaml
+++ b/helm/rsm/templates/deployment.yaml
@@ -64,6 +64,8 @@ spec:
           envFrom:
             - configMapRef:
                 name: {{ include "common.configmapname.rsm" . }}-env
+            - configMapRef:
+                name: {{ include "common.configmapname.dbaas" . }}-appconfig
           ports:
             - name: "http"
               containerPort: {{ include "common.serviceport.rsm.http" . }}

diff --git a/helm/rsm/templates/env.yaml b/helm/rsm/templates/env.yaml
index 9fad361..d42a4e8 100644 (file)
--- a/helm/rsm/templates/env.yaml
+++ b/helm/rsm/templates/env.yaml
@@ -18,10 +18,6 @@ kind: ConfigMap
 metadata:
   name: {{ include "common.configmapname.rsm" . }}-env
 data:
-   DBAAS_SERVICE_HOST: {{ include "common.servicename.dbaas.tcp" . | quote }}
-   DBAAS_SERVICE_PORT: {{ include "common.serviceport.dbaas.tcp" . | quote }}
-   DBAAS_PORT_6379_TCP_ADDR: {{ include "common.servicename.dbaas.tcp" . | quote }}
-   DBAAS_PORT_6379_TCP_PORT: {{ include "common.serviceport.dbaas.tcp" . | quote }} 
    RMR_RTG_SVC: {{ include "common.serviceport.rsm.rmr.route" . | quote }}
    
    

diff --git a/helm/rtmgr/templates/deployment.yaml b/helm/rtmgr/templates/deployment.yaml
index 56a271b..4dbb5d3 100644 (file)
--- a/helm/rtmgr/templates/deployment.yaml
+++ b/helm/rtmgr/templates/deployment.yaml
@@ -55,6 +55,8 @@ spec:
           envFrom:
             - configMapRef:
                 name: {{ include "common.configmapname.rtmgr" . }}-env
+            - configMapRef:
+                name: {{ include "common.configmapname.dbaas" . }}-appconfig
           volumeMounts:
             - mountPath: /cfg
               name: rtmgrcfg

diff --git a/helm/rtmgr/templates/env.yaml b/helm/rtmgr/templates/env.yaml
index 3a51c5b..795f766 100644 (file)
--- a/helm/rtmgr/templates/env.yaml
+++ b/helm/rtmgr/templates/env.yaml
@@ -19,10 +19,6 @@ kind: ConfigMap
 metadata:
   name: {{ include "common.configmapname.rtmgr" . }}-env
 data:
-   DBAAS_SERVICE_HOST: {{ include "common.servicename.dbaas.tcp" . | quote }}
-   DBAAS_SERVICE_PORT: {{ include "common.serviceport.dbaas.tcp" . | quote }}
-   DBAAS_PORT_6379_TCP_ADDR: {{ include "common.servicename.dbaas.tcp" . | quote }}
-   DBAAS_PORT_6379_TCP_PORT: {{ include "common.serviceport.dbaas.tcp" . | quote }} 
    RMR_SEED_RT: "/uta_rtg_ric.rt"
    RMR_RTG_SVC: {{ include "common.serviceport.rtmgr.rmr.route" . | quote }}
    CFGFILE: "/cfg/rtmgr-config.yaml"

diff --git a/helm/submgr/templates/deployment.yaml b/helm/submgr/templates/deployment.yaml
index 6f502ba..c566073 100644 (file)
--- a/helm/submgr/templates/deployment.yaml
+++ b/helm/submgr/templates/deployment.yaml
@@ -54,6 +54,8 @@ spec:
           envFrom:
             - configMapRef:
                 name: {{ include "common.configmapname.submgr" . }}-env
+            - configMapRef:
+                name: {{ include "common.configmapname.dbaas" . }}-appconfig
           ports:
             - name: http
               containerPort: {{ include "common.serviceport.submgr.http" . }}

diff --git a/helm/submgr/templates/env.yaml b/helm/submgr/templates/env.yaml
index 9e65676..6dbd565 100644 (file)
--- a/helm/submgr/templates/env.yaml
+++ b/helm/submgr/templates/env.yaml
@@ -19,10 +19,6 @@ kind: ConfigMap
 metadata:
   name: {{ include "common.configmapname.submgr" . }}-env
 data:
-  DBAAS_SERVICE_HOST: {{ include "common.servicename.dbaas.tcp" . | quote }}
-  DBAAS_SERVICE_PORT: {{ include "common.serviceport.dbaas.tcp" . | quote }}
-  DBAAS_PORT_6379_TCP_ADDR: {{ include "common.servicename.dbaas.tcp" . | quote }}
-  DBAAS_PORT_6379_TCP_PORT: {{ include "common.serviceport.dbaas.tcp" . | quote }} 
   RMR_RTG_SVC: {{ include "common.serviceport.submgr.rmr.route" . | quote }}
   RMR_SRC_ID: {{ include "common.servicename.submgr.rmr" . }}.{{ include "common.namespace.platform" . }}
   CFGFILE: "/cfg/submgr-config.yaml"

diff --git a/helm/xapp-onboarder/templates/deployment.yaml b/helm/xapp-onboarder/templates/deployment.yaml
index c7d1390..d43c730 100644 (file)
--- a/helm/xapp-onboarder/templates/deployment.yaml
+++ b/helm/xapp-onboarder/templates/deployment.yaml
@@ -72,6 +72,8 @@ spec:
           envFrom:
             - configMapRef:
                 name: {{ include "common.configmapname.xapp-onboarder" . }}-env
+            - configMapRef:
+                name: {{ include "common.configmapname.dbaas" . }}-appconfig
           livenessProbe:
             #exec:
             #  command:

diff --git a/helm/xapp-onboarder/templates/env-xapp-onboarder.yaml b/helm/xapp-onboarder/templates/env-xapp-onboarder.yaml
index 93ba4c3..748104d 100644 (file)
--- a/helm/xapp-onboarder/templates/env-xapp-onboarder.yaml
+++ b/helm/xapp-onboarder/templates/env-xapp-onboarder.yaml
@@ -21,12 +21,6 @@ metadata:
 data:
   FLASK_PORT: {{ include "common.serviceport.xapp-onboarder.server" . | quote }}  
   FLASK_DEBUG: "False"
-  DBAAS_SERVICE_HOST: {{ include "common.servicename.dbaas.tcp" . | quote }}
-  DBAAS_SERVICE_PORT: {{ include "common.serviceport.dbaas.tcp" . | quote }}
-  DBAAS_PORT_6379_TCP_ADDR: {{ include "common.servicename.dbaas.tcp" . | quote }}
-  DBAAS_PORT_6379_TCP_PORT: {{ include "common.serviceport.dbaas.tcp" . | quote }}
-  DBAAS_MASTER_NAME: {{ include "common.servicename.dbaasha.tcp" . | quote }}
-  DBAAS_SERVICE_SENTINEL_PORT: {{ include "common.serviceport.dbaasha.sentinel" . | quote }}
   CHART_WORKSPACE_PATH: {{.Values.xapponboarder.chart_workspace_path | quote}}
   CHART_REPO_URL: "http://0.0.0.0:8080"
   HELM_VERSION: {{.Values.xapponboarder.helm_version | quote }}