Merge "Add DBAAS_NODE_COUNT configuration parameter"

diff --git a/RECIPE_EXAMPLE/example_recipe_oran_e_release.yaml b/RECIPE_EXAMPLE/example_recipe_oran_e_release.yaml
new file mode 100644 (file)
index 0000000..1eb799f
--- /dev/null
+++ b/RECIPE_EXAMPLE/example_recipe_oran_e_release.yaml
@@ -0,0 +1,193 @@
+################################################################################
+#   Copyright (c) 2019 AT&T Intellectual Property.                             #
+#   Copyright (c) 2021 HCL Technologies Limited.                               #
+#                                                                              #
+#   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.                                             #
+###############################################################################
+
+#-------------------------------------------------------------------------
+# Global common setting
+#-------------------------------------------------------------------------
+
+common:
+  releasePrefix: r4
+# If a local docker registry is used, please specify it using the following option 
+#  localregistry: nexus3.o-ran-sc.org:10004
+
+# Change the overall image pull policy using the following option
+#  pullpolicy: IfNotPresent
+
+# Change the namespaces using the following options
+#  namespace:
+#    aux: ricaux
+#    platform: ricplt
+#    xapp: ricxapp
+#    infra: ricinfra
+
+# ricip should be the ingress controller listening IP for the platform cluster
+# auxip should be the ingress controller listening IP for the AUX cluster
+extsvcplt:
+  ricip: "10.0.0.1"
+  auxip: "10.0.0.1"
+
+
+# Specify the docker registry credential using the following
+# The release and staging LF repos' credentials have already been included.
+# Please do not create duplicated entries
+#docker-credential:
+#  enabled: true
+#  credential:
+#    SOME_KEY_NAME:
+#      registry: ""
+#      credential:
+#        user: ""
+#        password: ""
+#        email: ""
+
+prometheus:
+  enabled: true
+
+a1mediator:
+  image:
+    registry: "nexus3.o-ran-sc.org:10002/o-ran-sc"
+    name: ric-plt-a1
+    tag: 2.5.1
+  rmr_timeout_config:
+    a1_rcv_retry_times: 20
+    ins_del_no_resp_ttl: 5
+    ins_del_resp_ttl: 10
+
+appmgr:
+  image:
+   init:
+     registry: "nexus3.o-ran-sc.org:10002/o-ran-sc"
+     name: it-dep-init
+     tag: 0.0.1
+   appmgr:
+     registry: "nexus3.o-ran-sc.org:10002/o-ran-sc"
+     name: ric-plt-appmgr
+     tag: 0.5.4
+   chartmuseum:
+     registry: "docker.io"
+     name: chartmuseum/chartmuseum
+     tag: v0.8.2
+
+
+dbaas:
+  image:
+    registry: "nexus3.o-ran-sc.org:10002/o-ran-sc"
+    name: ric-plt-dbaas
+    tag: 0.5.3
+  enableHighAvailability: false
+  # Enable pod anti affinity only if you have more than 3 k8s nodes
+  enablePodAntiAffinity: false
+
+
+e2mgr:
+  image:
+    registry: "nexus3.o-ran-sc.org:10002/o-ran-sc"
+    name: ric-plt-e2mgr
+    tag: 5.4.18
+  privilegedmode: false
+  globalRicId:
+    ricId: "AACCE"
+    mcc: "310"
+    mnc: "411"
+  rnibWriter:
+    stateChangeMessageChannel: RAN_CONNECTION_STATUS_CHANGE
+    ranManipulationMessageChannel: RAN_MANIPULATION
+
+e2term:
+  alpha:
+    image:
+      registry: "nexus3.o-ran-sc.org:10002/o-ran-sc"
+      name: ric-plt-e2
+      tag: 5.5.0
+    privilegedmode: false
+    hostnetworkmode: false
+    env:
+      print: "1"
+      messagecollectorfile: "/data/outgoing/"
+    dataVolSize: 100Mi
+    storageClassName: local-storage
+    pizpub:
+      enabled: false
+
+
+jaegeradapter:
+  image:
+    registry: "docker.io"
+    name: jaegertracing/all-in-one
+    tag: 1.12
+
+
+#rsm:
+#  image:
+#    init:
+#      name: redis
+#      tag: latest
+#      registry: "docker.io"
+#    main:
+#      name: ric-plt-resource-status-manager
+#      tag: 3.0.1
+#      registry: "nexus3.o-ran-sc.org:10002/o-ran-sc"
+#  privilegedmode: false
+
+rtmgr:
+  image:
+    registry: "nexus3.o-ran-sc.org:10002/o-ran-sc"
+    name: ric-plt-rtmgr
+    tag: 0.8.2
+
+submgr:
+  image:
+    registry: "nexus3.o-ran-sc.org:10002/o-ran-sc"
+    name: ric-plt-submgr
+    tag: 0.8.2
+
+vespamgr:
+  image:
+    registry: "nexus3.o-ran-sc.org:10002/o-ran-sc"
+    name: ric-plt-vespamgr
+    tag: 0.7.5
+  prometheusurl: "http://r4-infrastructure-prometheus-server.ricplt"
+
+o1mediator:
+  image:
+    registry: "nexus3.o-ran-sc.org:10002/o-ran-sc"
+    name: ric-plt-o1
+    tag: 0.5.3
+
+xapponboarder:
+  image:
+   xapponboarder:
+     registry: "nexus3.o-ran-sc.org:10002/o-ran-sc"
+     name: xapp-onboarder
+     tag: 1.0.7
+   chartmuseum:
+     registry: "docker.io"
+     name: chartmuseum/chartmuseum
+     tag: v0.8.2
+  allow_redeploy: "True"
+
+alarmmanager:
+  image:
+    registry: "nexus3.o-ran-sc.org:10002/o-ran-sc"
+    name: ric-plt-alarmmanager
+    tag: 0.5.11
+
+influxdb:
+  image:
+    registry: "influxdb"
+    name: influxdb
+    tag: "1.8.0-alpine"

diff --git a/helm/e2term/templates/deployment.yaml b/helm/e2term/templates/deployment.yaml
index 1a09e62..661f1ca 100644 (file)
--- a/helm/e2term/templates/deployment.yaml
+++ b/helm/e2term/templates/deployment.yaml
@@ -16,6 +16,7 @@
 ################################################################################
 {{- $topCtx :=  . }}
 {{- $health := .Values.health }}
+{{- $common_env := .Values.common_env_variables }}
 {{- range keys .Values.e2term }}
 {{- $key := . }}
 {{- with index $topCtx.Values.e2term . }}
@@ -126,6 +127,23 @@ spec:
           envFrom:
             - configMapRef:
                 name: {{ include "common.configmapname.e2term" $topCtx }}-env-{{ $key }}
+          env:
+            - name: SYSTEM_NAME
+              value: "SEP"
+            - name: CONFIG_MAP_NAME
+              value: "{{ $common_env.ConfigMapName }}"
+            - name: HOST_NAME
+              valueFrom:
+               fieldRef:
+                fieldPath: spec.nodeName
+            - name: SERVICE_NAME
+              value: "{{ $common_env.ServiceName }}"
+            - name: CONTAINER_NAME
+              value: "{{ include "common.containername.e2term" $topCtx }}"
+            - name: POD_NAME
+              valueFrom:
+               fieldRef:
+                fieldPath: metadata.name
           ports:
             - name: "rmrroute-{{ $key }}"
               containerPort: {{ include "common.serviceport.e2term.rmr.route" $topCtx }}

diff --git a/helm/e2term/values.yaml b/helm/e2term/values.yaml
index 8c793c4..a144270 100644 (file)
--- a/helm/e2term/values.yaml
+++ b/helm/e2term/values.yaml
@@ -59,13 +59,19 @@ e2term:
 
 health:
     liveness:
-      command: "/opt/e2/rmr_probe -h 0.0.0.0"
+      command: "ip=`hostname -i`;export RMR_SRC_ID=$ip;/opt/e2/rmr_probe -h $ip"
       initialDelaySeconds: 10
       periodSeconds: 10
       enabled: true
 
     readiness:
-      command: "/opt/e2/rmr_probe -h 0.0.0.0"
+      command: "ip=`hostname -i`;export RMR_SRC_ID=$ip;/opt/e2/rmr_probe -h $ip"
       initialDelaySeconds: 120
       periodSeconds: 60
       enabled: true
+
+loglevel: ERR
+
+common_env_variables:
+  ConfigMapName: "/etc/config/log-level"
+  ServiceName: "RIC_E2_TERM"

diff --git a/helm/infrastructure/subcharts/kong/values.yaml b/helm/infrastructure/subcharts/kong/values.yaml
index 3d64d8c..37cff3f 100644 (file)
--- a/helm/infrastructure/subcharts/kong/values.yaml
+++ b/helm/infrastructure/subcharts/kong/values.yaml
@@ -181,7 +181,7 @@ dblessConfig:
 ingressController:
   enabled: true
   image:
-    repository: kong-docker-kubernetes-ingress-controller.bintray.io/kong-ingress-controller
+    repository: kong/kubernetes-ingress-controller
     tag: 0.7.0
 
   # Specify Kong Ingress Controller configuration via environment variables

diff --git a/helm/submgr/templates/configmap.yaml b/helm/submgr/templates/configmap.yaml
index a92391c..2f0bc4e 100644 (file)
--- a/helm/submgr/templates/configmap.yaml
+++ b/helm/submgr/templates/configmap.yaml
@@ -33,13 +33,23 @@ data:
       "hostAddr": {{ include "common.servicename.rtmgr.http" . | quote }}
       "port"    : {{ include "common.serviceport.rtmgr.http" . }}
       "baseUrl" : "/ric/v1"
+    "db":
+      "sessionNamespace": "XMSession"
+      "host": ":6379"
+      "prot": "tcp"
+      "maxIdle": 80
+      "maxActive": 12000
     "controls":
       "e2tSubReqTimeout_ms": 2000
       "e2tSubDelReqTime_ms": 2000
       "e2tRecvMsgTimeout_ms": 2000
       "e2tMaxSubReqTryCount": 2
       "e2tMaxSubDelReqTryCount": 2
+      "checkE2State": "true"
       "readSubsFromDb": "true"
+      "dbTryCount": 200
+      "dbRetryForever": "true"
+      "waitRouteCleanup_ms": 5000
   submgrutartg: |
       newrt|start
       newrt|end