From baeef2ceabae0a558e86726e93da6fd4d0dbf306 Mon Sep 17 00:00:00 2001 From: ecaiyanlinux Date: Mon, 14 Feb 2022 22:36:54 +0100 Subject: [PATCH] Update image tags for nonrtric Minor corrections on env variables for o-ru application Signed-off-by: ecaiyanlinux Issue-ID: NONRTRIC-720 Change-Id: I6e217a6a9f65c7572e2413a41a5f588eadf2617f --- nonrtric/RECIPE_EXAMPLE/example_recipe.yaml | 22 +++++++++++----------- nonrtric/helm/dmaapadapterservice/values.yaml | 2 +- nonrtric/helm/dmaapmediatorservice/values.yaml | 2 +- nonrtric/helm/helmmanager/values.yaml | 2 +- nonrtric/helm/informationservice/values.yaml | 2 +- nonrtric/helm/odusliceassurance/values.yaml | 2 +- .../templates/deployment.yaml | 2 +- nonrtric/helm/oruclosedlooprecovery/values.yaml | 8 ++++---- nonrtric/helm/policymanagementservice/values.yaml | 2 +- nonrtric/helm/rappcatalogueservice/values.yaml | 2 +- 10 files changed, 23 insertions(+), 23 deletions(-) diff --git a/nonrtric/RECIPE_EXAMPLE/example_recipe.yaml b/nonrtric/RECIPE_EXAMPLE/example_recipe.yaml index 510ecb22..ea90b1d9 100644 --- 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-information-coordinator-service' - tag: 1.2.0 + tag: 1.2.1 service: allowHttp: true httpName: http @@ -90,7 +90,7 @@ policymanagementservice: image: registry: 'nexus3.o-ran-sc.org:10002/o-ran-sc' name: nonrtric-a1-policy-management-service - tag: 2.3.0 + tag: 2.3.1 service: allowHttp: true httpName: http @@ -202,7 +202,7 @@ rappcatalogueservice: image: registry: 'nexus3.o-ran-sc.org:10002/o-ran-sc' name: nonrtric-r-app-catalogue - tag: 1.0.1 + tag: 1.0.2 service: allowHttp: true httpName: http @@ -243,7 +243,7 @@ dmaapadapterservice: image: registry: 'nexus3.o-ran-sc.org:10002/o-ran-sc' name: 'nonrtric-dmaap-adaptor' - tag: 1.0.0 + tag: 1.0.1 service: allowHttp: true httpName: http @@ -265,7 +265,7 @@ dmaapmediatorservice: image: registry: "nexus3.o-ran-sc.org:10002/o-ran-sc" name: "nonrtric-dmaap-mediator-producer" - tag: 1.0.0 + tag: 1.0.1 service: allowHttp: true httpName: http @@ -288,7 +288,7 @@ helmmanager: image: registry: "nexus3.o-ran-sc.org:10002/o-ran-sc" name: "nonrtric-helm-manager" - tag: 1.1.0 + tag: 1.1.1 service: httpName: http internalPort1: 8112 @@ -311,7 +311,7 @@ odusliceassurance: image: registry: "nexus3.o-ran-sc.org:10002/o-ran-sc" name: "nonrtric-o-du-slice-assurance" - tag: 1.0.0 + tag: 1.0.2 env: mr_host: "http://onap-dmaap" mr_port: "3904" @@ -326,13 +326,13 @@ oruclosedlooprecovery: imagePullPolicy: IfNotPresent image: registry: "nexus3.o-ran-sc.org:10002/o-ran-sc" - name: "nonrtric-o-ru-closed-loop-recovery" - tag: 1.0.0 + name: "nonrtric-o-ru-closed-loop-consumer" + tag: 1.0.1 env: consumer_host: "http://mrproducer" consumer_port: "8095" - consumer_cert_path: "security/producer.crt" - consumer_key_path: "security/producer.key" + consumer_cert_path: "security/consumer.crt" + consumer_key_path: "security/consumer.key" info_coord_addr: "http://ics:8083" sdnr_address: "http://sdnr:8282" sdnr_user: "admin" diff --git a/nonrtric/helm/dmaapadapterservice/values.yaml b/nonrtric/helm/dmaapadapterservice/values.yaml index 3260e267..24263c48 100644 --- 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-dmaap-adaptor" - tag: 1.0.0 + tag: 1.0.1 service: allowHttp: true httpName: http diff --git a/nonrtric/helm/dmaapmediatorservice/values.yaml b/nonrtric/helm/dmaapmediatorservice/values.yaml index 3ae2eacb..fd67ae6d 100644 --- a/nonrtric/helm/dmaapmediatorservice/values.yaml +++ b/nonrtric/helm/dmaapmediatorservice/values.yaml @@ -23,7 +23,7 @@ dmaapmediatorservice: image: registry: "nexus3.o-ran-sc.org:10002/o-ran-sc" name: "nonrtric-dmaap-mediator-producer" - tag: 1.0.0 + tag: 1.0.1 service: allowHttp: true httpName: http diff --git a/nonrtric/helm/helmmanager/values.yaml b/nonrtric/helm/helmmanager/values.yaml index 07516986..94a6777e 100644 --- a/nonrtric/helm/helmmanager/values.yaml +++ b/nonrtric/helm/helmmanager/values.yaml @@ -24,7 +24,7 @@ helmmanager: image: registry: "nexus3.o-ran-sc.org:10002/o-ran-sc" name: "nonrtric-helm-manager" - tag: 1.1.0 + tag: 1.1.1 service: httpName: http internalPort1: 8112 diff --git a/nonrtric/helm/informationservice/values.yaml b/nonrtric/helm/informationservice/values.yaml index a5d571ac..f5d83aa6 100644 --- 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-information-coordinator-service" - tag: 1.2.0 + tag: 1.2.1 service: allowHttp: true httpName: http diff --git a/nonrtric/helm/odusliceassurance/values.yaml b/nonrtric/helm/odusliceassurance/values.yaml index 8479912a..f67ffac6 100644 --- a/nonrtric/helm/odusliceassurance/values.yaml +++ b/nonrtric/helm/odusliceassurance/values.yaml @@ -23,7 +23,7 @@ odusliceassurance: image: registry: 'nexus3.o-ran-sc.org:10002/o-ran-sc' name: nonrtric-o-du-slice-assurance - tag: 1.0.0 + tag: 1.0.2 service: httpName: web allowHttp: true diff --git a/nonrtric/helm/oruclosedlooprecovery/templates/deployment.yaml b/nonrtric/helm/oruclosedlooprecovery/templates/deployment.yaml index 0f2d08c4..fbc8bffb 100644 --- a/nonrtric/helm/oruclosedlooprecovery/templates/deployment.yaml +++ b/nonrtric/helm/oruclosedlooprecovery/templates/deployment.yaml @@ -58,7 +58,7 @@ spec: value: "{{ .Values.oruclosedlooprecovery.env.consumer_key_path }}" - name: INFO_COORD_ADDR value: "{{ .Values.oruclosedlooprecovery.env.info_coord_addr }}" - - name: SDNR_ADDRESS + - name: SDNR_ADDR value: "{{ .Values.oruclosedlooprecovery.env.sdnr_address }}" - name: SDNR_USER value: "{{ .Values.oruclosedlooprecovery.env.sdnr_user }}" diff --git a/nonrtric/helm/oruclosedlooprecovery/values.yaml b/nonrtric/helm/oruclosedlooprecovery/values.yaml index e3830c8f..4ca94c55 100644 --- a/nonrtric/helm/oruclosedlooprecovery/values.yaml +++ b/nonrtric/helm/oruclosedlooprecovery/values.yaml @@ -22,8 +22,8 @@ oruclosedlooprecovery: imagePullPolicy: IfNotPresent image: registry: 'nexus3.o-ran-sc.org:10002/o-ran-sc' - name: nonrtric-o-ru-closed-loop-recovery - tag: 1.0.0 + name: nonrtric-o-ru-closed-loop-consumer + tag: 1.0.1 service: httpName: web allowHttp: true @@ -31,8 +31,8 @@ oruclosedlooprecovery: env: consumer_host: "http://mrproducer" consumer_port: "8095" - consumer_cert_path: "security/producer.crt" - consumer_key_path: "security/producer.key" + consumer_cert_path: "security/consumer.crt" + consumer_key_path: "security/consumer.key" info_coord_addr: "http://ics:8083" sdnr_address: "http://sdnr:8282" sdnr_user: "admin" diff --git a/nonrtric/helm/policymanagementservice/values.yaml b/nonrtric/helm/policymanagementservice/values.yaml index 8782d050..9085ad1f 100644 --- 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-a1-policy-management-service - tag: 2.3.0 + tag: 2.3.1 service: allowHttp: true httpName: http diff --git a/nonrtric/helm/rappcatalogueservice/values.yaml b/nonrtric/helm/rappcatalogueservice/values.yaml index 3165c46a..f01b2c29 100644 --- a/nonrtric/helm/rappcatalogueservice/values.yaml +++ b/nonrtric/helm/rappcatalogueservice/values.yaml @@ -23,7 +23,7 @@ rappcatalogueservice: image: registry: 'nexus3.o-ran-sc.org:10002/o-ran-sc' name: nonrtric-r-app-catalogue - tag: 1.0.1 + tag: 1.0.2 service: allowHttp: true httpName: http -- 2.16.6