From e4d2f4b90f4045519b1957b37416e163a3079da7 Mon Sep 17 00:00:00 2001 From: Lathish Date: Mon, 20 Apr 2020 17:21:51 +0100 Subject: [PATCH] Fixed override issue Issue-ID: NONRTRIC-202 Change-Id: I42ae02798c5761a89be13ba351d575ea9a5570bb Signed-off-by: Lathish --- nonrtric/RECIPE_EXAMPLE/example_recipe.yaml | 91 ++++++++++++----------- nonrtric/helm/a1controller/values.yaml | 3 +- nonrtric/helm/a1simulator/values.yaml | 2 +- nonrtric/helm/controlpanel/values.yaml | 3 +- nonrtric/helm/policymanagementservice/values.yaml | 4 +- 5 files changed, 51 insertions(+), 52 deletions(-) diff --git a/nonrtric/RECIPE_EXAMPLE/example_recipe.yaml b/nonrtric/RECIPE_EXAMPLE/example_recipe.yaml index bc9b1791..5a52499b 100644 --- a/nonrtric/RECIPE_EXAMPLE/example_recipe.yaml +++ b/nonrtric/RECIPE_EXAMPLE/example_recipe.yaml @@ -20,7 +20,6 @@ common: releasePrefix: r2-dev-nonrtric - # Change the namespaces using the following options namespace: nonrtric: nonrtric @@ -28,52 +27,56 @@ common: component: nonrtric a1controller: - imagePullPolicy: IfNotPresent - image: - registry: "nexus3.o-ran-sc.org:10002/o-ran-sc" - name: nonrtric-a1-controller - tag: 1.7.4 - replicaCount: 1 - service: - internalPort: 8181 - externalPort: 8282 + a1controller: + imagePullPolicy: IfNotPresent + image: + registry: 'nexus3.o-ran-sc.org:10002/o-ran-sc' + name: nonrtric-a1-controller + tag: 1.7.4 + replicaCount: 1 + service: + internalPort: 8181 + externalPort: 8282 a1simulator: - name: a1-sim - imagePullPolicy: IfNotPresent - image: - registry: "nexus3.o-ran-sc.org:10004/o-ran-sc" - name: a1-simulator - tag: 1.0.1 - service: - internalPort: 8085 - oscVersion: - name: a1-sim-osc - replicaCount: 2 - stdVersion: - name: a1-sim-std - replicaCount: 2 + a1simulator: + name: a1-sim + imagePullPolicy: IfNotPresent + image: + registry: 'nexus3.o-ran-sc.org:10004/o-ran-sc' + name: a1-simulator + tag: 1.0.1 + service: + internalPort: 8085 + oscVersion: + name: a1-sim-osc + replicaCount: 2 + stdVersion: + name: a1-sim-std + replicaCount: 2 +# image registry and tag to be changed after first release of controlpanel +# Need to check the external port Availability controlpanel: - imagePullPolicy: IfNotPresent - # image registry and tag to be changed after first release of controlpanel - image: - registry: "nexus3.o-ran-sc.org:10004/o-ran-sc" - name: nonrtric-controlpanel - tag: 1.0.0 - replicaCount: 1 - service: - internalPort: 8080 - externalPort: 30090 + controlpanel: + imagePullPolicy: IfNotPresent + image: + registry: 'nexus3.o-ran-sc.org:10004/o-ran-sc' + name: nonrtric-controlpanel + tag: 1.0.0 + replicaCount: 1 + service: + internalPort: 8080 + externalPort: 30090 +# Need to check the external port Availability policymanagementservice: - imagePullPolicy: IfNotPresent - image: - registry: "nexus3.o-ran-sc.org:10004/o-ran-sc" - name: nonrtric-policy-agent - tag: 1.0.0 - service: - internalPort: 8081 - #Need to check the external port Availability - externalPort: 30091 - + policymanagementservice: + imagePullPolicy: IfNotPresent + image: + registry: 'nexus3.o-ran-sc.org:10004/o-ran-sc' + name: nonrtric-policy-agent + tag: 1.0.0 + service: + internalPort: 8081 + externalPort: 30091 \ No newline at end of file diff --git a/nonrtric/helm/a1controller/values.yaml b/nonrtric/helm/a1controller/values.yaml index c4bd0c9f..6b0e5d37 100644 --- a/nonrtric/helm/a1controller/values.yaml +++ b/nonrtric/helm/a1controller/values.yaml @@ -17,11 +17,10 @@ # Default values for a1controller. # This is a YAML-formatted file. # Declare variables to be passed into your templates. - a1controller: imagePullPolicy: IfNotPresent image: - registry: "nexus3.o-ran-sc.org:10002/o-ran-sc" + registry: 'nexus3.o-ran-sc.org:10002/o-ran-sc' name: nonrtric-a1-controller tag: 1.7.4 replicaCount: 1 diff --git a/nonrtric/helm/a1simulator/values.yaml b/nonrtric/helm/a1simulator/values.yaml index 3544a231..97316395 100644 --- a/nonrtric/helm/a1simulator/values.yaml +++ b/nonrtric/helm/a1simulator/values.yaml @@ -22,7 +22,7 @@ a1simulator: name: a1-sim imagePullPolicy: IfNotPresent image: - registry: "nexus3.o-ran-sc.org:10004/o-ran-sc" + registry: 'nexus3.o-ran-sc.org:10004/o-ran-sc' name: a1-simulator tag: 1.0.1 service: diff --git a/nonrtric/helm/controlpanel/values.yaml b/nonrtric/helm/controlpanel/values.yaml index fb1f41a6..23fe2fda 100644 --- a/nonrtric/helm/controlpanel/values.yaml +++ b/nonrtric/helm/controlpanel/values.yaml @@ -20,9 +20,8 @@ controlpanel: imagePullPolicy: IfNotPresent - # image registry and tag to be changed after first release of controlpanel image: - registry: "nexus3.o-ran-sc.org:10004/o-ran-sc" + registry: 'nexus3.o-ran-sc.org:10004/o-ran-sc' name: nonrtric-controlpanel tag: 1.0.0 replicaCount: 1 diff --git a/nonrtric/helm/policymanagementservice/values.yaml b/nonrtric/helm/policymanagementservice/values.yaml index 21d2732c..bafe0954 100644 --- a/nonrtric/helm/policymanagementservice/values.yaml +++ b/nonrtric/helm/policymanagementservice/values.yaml @@ -21,13 +21,11 @@ policymanagementservice: imagePullPolicy: IfNotPresent image: - registry: "nexus3.o-ran-sc.org:10004/o-ran-sc" + registry: 'nexus3.o-ran-sc.org:10004/o-ran-sc' name: nonrtric-policy-agent tag: 1.0.0 service: - name: http internalPort: 8081 - #Need to check the external port Availability externalPort: 30091 -- 2.16.6