Merge "Adding helm chart & documentation for redis-cluster related study ticket"

diff --git a/RECIPE_EXAMPLE/example_recipe.yaml b/RECIPE_EXAMPLE/example_recipe.yaml
index 24f2ff4..37fd77b 100644 (file)
--- a/RECIPE_EXAMPLE/example_recipe.yaml
+++ b/RECIPE_EXAMPLE/example_recipe.yaml
@@ -96,7 +96,7 @@ e2mgr:
   image:
     registry: "nexus3.o-ran-sc.org:10002/o-ran-sc"
     name: ric-plt-e2mgr
-    tag: 5.2.15
+    tag: 5.4.13
   privilegedmode: false
   globalRicId:
     ricId: "AACCE"

diff --git a/helm/alarmadapter/templates/deployment.yaml b/helm/alarmadapter/templates/deployment.yaml
index 47e8e66..9b82ff3 100644 (file)
--- a/helm/alarmadapter/templates/deployment.yaml
+++ b/helm/alarmadapter/templates/deployment.yaml
@@ -53,6 +53,9 @@ spec:
           #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

diff --git a/helm/e2mgr/templates/deployment.yaml b/helm/e2mgr/templates/deployment.yaml
index a4fafa5..f5c9a1f 100644 (file)
--- a/helm/e2mgr/templates/deployment.yaml
+++ b/helm/e2mgr/templates/deployment.yaml
@@ -45,14 +45,6 @@ spec:
       hostname: {{ include "common.name.e2mgr" . }} 
       imagePullSecrets:
         - name: {{ include "common.dockerregistry.credential" $imagectx }}
-      initContainers:
-        - name: redis-init
-          image: "redis"
-          command:
-          - "/bin/sh"
-          args:
-          - '-c'
-          - "redis-cli -h {{ include "common.servicename.dbaas.tcp" . }} -p {{ include "common.serviceport.dbaas.redis" . }} SETNX \"{e2Manager},GENERAL\" \"{\\\"enableRic\\\":true}\""
       containers:
         - name: {{ include "common.containername.e2mgr" . }}
           image: {{ include "common.dockerregistry.url" $imagectx }}/{{ .Values.e2mgr.image.name }}:{{ .Values.e2mgr.image.tag }}