Merge "Add Rapp Enhanced Catalogue helm charts"

diff --git a/nonrtric/RECIPE_EXAMPLE/example_recipe.yaml b/nonrtric/RECIPE_EXAMPLE/example_recipe.yaml
index 29dac37..e566e91 100644 (file)
--- a/nonrtric/RECIPE_EXAMPLE/example_recipe.yaml
+++ b/nonrtric/RECIPE_EXAMPLE/example_recipe.yaml
@@ -60,7 +60,7 @@ informationservice:
     image:
       registry: 'nexus3.o-ran-sc.org:10002/o-ran-sc'
       name: 'nonrtric-plt-informationcoordinatorservice'
-      tag: 1.3.0
+      tag: 1.4.0
     service:
       allowHttp: true
       httpName: http
@@ -90,7 +90,7 @@ policymanagementservice:
     image:
       registry: 'nexus3.o-ran-sc.org:10002/o-ran-sc'
       name: nonrtric-plt-a1policymanagementservice
-      tag: 2.4.0
+      tag: 2.5.0
     service:
       allowHttp: true
       httpName: http
@@ -144,7 +144,7 @@ a1simulator:
     image:
       registry: 'nexus3.o-ran-sc.org:10002/o-ran-sc'
       name: a1-simulator
-      tag: 2.3.0
+      tag: 2.4.0
     service:
       allowHttp: true
       httpName: http
@@ -175,7 +175,7 @@ controlpanel:
     image:
       registry: 'nexus3.o-ran-sc.org:10002/o-ran-sc'
       name: nonrtric-controlpanel
-      tag: 2.3.0
+      tag: 2.4.0
     replicaCount: 1
     service:
       allowHttp: true
@@ -262,7 +262,7 @@ dmaapadapterservice:
     image:
       registry: 'nexus3.o-ran-sc.org:10002/o-ran-sc'
       name: 'nonrtric-plt-dmaapadapter'
-      tag: 1.1.0
+      tag: 1.2.0
     service:
       allowHttp: true
       httpName: http
@@ -330,7 +330,7 @@ ransliceassurance:
     image:
       registry: "nexus3.o-ran-sc.org:10002/o-ran-sc"
       name: "nonrtric-rapp-ransliceassurance"
-      tag: 1.1.0
+      tag: 1.2.0
     env:
       mr_host: "http://onap-dmaap"
       mr_port: "3904"
@@ -339,6 +339,7 @@ ransliceassurance:
       sdnr_password: "Kp8bJ4SXszM0WXlhak3eHlcse2gAw84vaoGGmJvUy2U"
       log_level: "Info"
       polltime: "10"
+      node_id: "o-du-1122"
 
 orufhrecovery:
   orufhrecovery:

diff --git a/nonrtric/helm/a1simulator/values.yaml b/nonrtric/helm/a1simulator/values.yaml
index 8d7fb32..9a7d462 100644 (file)
--- a/nonrtric/helm/a1simulator/values.yaml
+++ b/nonrtric/helm/a1simulator/values.yaml
@@ -24,7 +24,7 @@ a1simulator:
   image:
     registry: 'nexus3.o-ran-sc.org:10002/o-ran-sc'
     name: a1-simulator
-    tag: 2.3.0
+    tag: 2.4.0
   service:
     allowHttp: true
     httpName: http

diff --git a/nonrtric/helm/controlpanel/values.yaml b/nonrtric/helm/controlpanel/values.yaml
index 063b830..5297ea2 100644 (file)
--- a/nonrtric/helm/controlpanel/values.yaml
+++ b/nonrtric/helm/controlpanel/values.yaml
@@ -23,7 +23,7 @@ controlpanel:
   image:
     registry: 'nexus3.o-ran-sc.org:10002/o-ran-sc'
     name: nonrtric-controlpanel
-    tag: 2.3.0
+    tag: 2.4.0
   replicaCount: 1
   service:
     allowHttp: true

diff --git a/nonrtric/helm/dmaapadapterservice/resources/config/application.yaml b/nonrtric/helm/dmaapadapterservice/resources/config/application.yaml
index cc357c4..eaf3ec3 100644 (file)
--- a/nonrtric/helm/dmaapadapterservice/resources/config/application.yaml
+++ b/nonrtric/helm/dmaapadapterservice/resources/config/application.yaml
@@ -74,3 +74,12 @@ app:
     bootstrap-servers: message-router-kafka.onap:9092
   # If the file name is empty, no authorization token is used
   auth-token-file:
+  pm-files-path: /tmp
+  zip-output: false
+  s3:
+    endpointOverride: http://localhost:9000
+    accessKeyId: minio
+    secretAccessKey: miniostorage
+    locksBucket: ropfilelocks
+    bucket: ropfiles
+

diff --git a/nonrtric/helm/dmaapadapterservice/values.yaml b/nonrtric/helm/dmaapadapterservice/values.yaml
index 8db1069..96996a5 100644 (file)
--- a/nonrtric/helm/dmaapadapterservice/values.yaml
+++ b/nonrtric/helm/dmaapadapterservice/values.yaml
@@ -23,7 +23,7 @@ dmaapadapterservice:
   image:
     registry: "nexus3.o-ran-sc.org:10002/o-ran-sc"
     name: "nonrtric-plt-dmaapadapter"
-    tag: 1.1.0
+    tag: 1.2.0
   service:
     allowHttp: true
     httpName: http

diff --git a/nonrtric/helm/informationservice/values.yaml b/nonrtric/helm/informationservice/values.yaml
index 4ef157f..c1a036b 100644 (file)
--- a/nonrtric/helm/informationservice/values.yaml
+++ b/nonrtric/helm/informationservice/values.yaml
@@ -23,7 +23,7 @@ informationservice:
   image:
     registry: "nexus3.o-ran-sc.org:10002/o-ran-sc"
     name: "nonrtric-plt-informationcoordinatorservice"
-    tag: 1.3.0
+    tag: 1.4.0
   service:
     allowHttp: true
     httpName: http

diff --git a/nonrtric/helm/policymanagementservice/values.yaml b/nonrtric/helm/policymanagementservice/values.yaml
index 4fa26f0..11c4571 100644 (file)
--- a/nonrtric/helm/policymanagementservice/values.yaml
+++ b/nonrtric/helm/policymanagementservice/values.yaml
@@ -23,7 +23,7 @@ policymanagementservice:
   image:
     registry: "nexus3.o-ran-sc.org:10002/o-ran-sc"
     name: nonrtric-plt-a1policymanagementservice
-    tag: 2.4.0
+    tag: 2.5.0
   service:
     allowHttp: true
     httpName: http

diff --git a/nonrtric/helm/ransliceassurance/templates/deployment.yaml b/nonrtric/helm/ransliceassurance/templates/deployment.yaml
index a762e61..fd9e346 100644 (file)
--- a/nonrtric/helm/ransliceassurance/templates/deployment.yaml
+++ b/nonrtric/helm/ransliceassurance/templates/deployment.yaml
@@ -62,4 +62,6 @@ spec:
             value: "{{ .Values.ransliceassurance.env.log_level }}"
           - name: POLLTIME
             value: "{{ .Values.ransliceassurance.env.polltime }}"
+          - name: NODE_ID
+            value: "{{ .Values.ransliceassurance.env.node_id }}"
 

diff --git a/nonrtric/helm/ransliceassurance/values.yaml b/nonrtric/helm/ransliceassurance/values.yaml
index 0dcb2ef..e569e36 100644 (file)
--- a/nonrtric/helm/ransliceassurance/values.yaml
+++ b/nonrtric/helm/ransliceassurance/values.yaml
@@ -23,7 +23,7 @@ ransliceassurance:
   image:
     registry: 'nexus3.o-ran-sc.org:10002/o-ran-sc'
     name: nonrtric-rapp-ransliceassurance
-    tag: 1.1.0
+    tag: 1.2.0
   service:
     httpName: web
     allowHttp: true
@@ -36,3 +36,4 @@ ransliceassurance:
     sdnr_password: "Kp8bJ4SXszM0WXlhak3eHlcse2gAw84vaoGGmJvUy2U"
     log_level: "Info"
     polltime: "10"
+    node_id: "o-du-1122"