Change images to release registry and release versions

Issue-ID: NONRTRIC-622

Signed-off-by: BjornMagnussonXA <bjorn.magnusson@est.tech>
Change-Id: Ib4d097e8825a7d4a6cbc10a227f531541da84933

diff --git a/nonrtric/RECIPE_EXAMPLE/example_recipe.yaml b/nonrtric/RECIPE_EXAMPLE/example_recipe.yaml
index 73de17e..1a0edb1 100644 (file)
--- a/nonrtric/RECIPE_EXAMPLE/example_recipe.yaml
+++ b/nonrtric/RECIPE_EXAMPLE/example_recipe.yaml
@@ -19,7 +19,7 @@
 #-------------------------------------------------------------------------
 
 
 #-------------------------------------------------------------------------
 
 

-# Here you can enable inclusion or exclusion of each component. A not installed component will not be installed.
+# Here you can enable inclusion or exclusion of each component. A not enabled component will not be installed.

 nonrtric:
   installPms: true
   installA1controller: true
 nonrtric:
   installPms: true
   installA1controller: true


@@ -55,7 +55,7 @@ informationservice:
   informationservice:
     imagePullPolicy: Always
     image:
   informationservice:
     imagePullPolicy: Always
     image:

-      registry: 'nexus3.o-ran-sc.org:10004/o-ran-sc'
+      registry: 'nexus3.o-ran-sc.org:10002/o-ran-sc'

       name: 'nonrtric-information-coordinator-service'
       tag: 1.2.0
     service:
       name: 'nonrtric-information-coordinator-service'
       tag: 1.2.0
     service:


@@ -85,8 +85,8 @@ policymanagementservice:
   policymanagementservice:
     imagePullPolicy: Always
     image:
   policymanagementservice:
     imagePullPolicy: Always
     image:

-      registry: 'nexus3.o-ran-sc.org:10004/o-ran-sc'
-      name: nonrtric-policy-agent
+      registry: 'nexus3.o-ran-sc.org:10002/o-ran-sc'
+      name: nonrtric-a1-policy-management-service

       tag: 2.3.0
     service:
       allowHttp: true
       tag: 2.3.0
     service:
       allowHttp: true


@@ -139,7 +139,7 @@ a1simulator:
     name: a1-sim
     imagePullPolicy: Always
     image:
     name: a1-sim
     imagePullPolicy: Always
     image:

-      registry: 'nexus3.o-ran-sc.org:10004/o-ran-sc'
+      registry: 'nexus3.o-ran-sc.org:10002/o-ran-sc'

       name: a1-simulator
       tag: 2.2.0
     service:
       name: a1-simulator
       tag: 2.2.0
     service:


@@ -170,7 +170,7 @@ controlpanel:
   controlpanel:
     imagePullPolicy: Always
     image:
   controlpanel:
     imagePullPolicy: Always
     image:

-      registry: 'nexus3.o-ran-sc.org:10004/o-ran-sc'
+      registry: 'nexus3.o-ran-sc.org:10002/o-ran-sc'

       name: nonrtric-controlpanel
       tag: 2.3.0
     replicaCount: 1
       name: nonrtric-controlpanel
       tag: 2.3.0
     replicaCount: 1


@@ -197,9 +197,9 @@ rappcatalogueservice:
   rappcatalogueservice:
     imagePullPolicy: Always
     image:
   rappcatalogueservice:
     imagePullPolicy: Always
     image:

-      registry: 'nexus3.o-ran-sc.org:10004/o-ran-sc'
+      registry: 'nexus3.o-ran-sc.org:10002/o-ran-sc'

       name: nonrtric-r-app-catalogue
       name: nonrtric-r-app-catalogue

-      tag: 1.1.0
+      tag: 1.0.1

     service:
       allowHttp: true
       httpName: http
     service:
       allowHttp: true
       httpName: http


@@ -219,9 +219,9 @@ nonrtricgateway:
   nonrtricgateway:
     imagePullPolicy: Always
     image:
   nonrtricgateway:
     imagePullPolicy: Always
     image:

-      registry: 'nexus3.o-ran-sc.org:10004/o-ran-sc'
+      registry: 'nexus3.o-ran-sc.org:10002/o-ran-sc'

       name: nonrtric-gateway
       name: nonrtric-gateway

-      tag: 1.1.0
+      tag: 1.0.0

     service:
       httpName: http
       internalPort1: 9090
     service:
       httpName: http
       internalPort1: 9090


@@ -238,7 +238,7 @@ dmaapadapterservice:
   dmaapadapterservice:
     imagePullPolicy: Always
     image:
   dmaapadapterservice:
     imagePullPolicy: Always
     image:

-      registry: 'nexus3.o-ran-sc.org:10004/o-ran-sc'
+      registry: 'nexus3.o-ran-sc.org:10002/o-ran-sc'

       name: 'nonrtric-dmaap-adaptor'
       tag: 1.0.0
     service:
       name: 'nonrtric-dmaap-adaptor'
       tag: 1.0.0
     service:


@@ -260,7 +260,7 @@ dmaapmediatorservice:
   dmaapmediatorservice:
     imagePullPolicy: IfNotPresent
     image:
   dmaapmediatorservice:
     imagePullPolicy: IfNotPresent
     image:

-      registry: "nexus3.o-ran-sc.org:10004/o-ran-sc"
+      registry: "nexus3.o-ran-sc.org:10002/o-ran-sc"

       name: "nonrtric-dmaap-mediator-producer"
       tag: 1.0.0
     service:
       name: "nonrtric-dmaap-mediator-producer"
       tag: 1.0.0
     service:


@@ -283,7 +283,7 @@ helmmanager:
     clusterRoleName: cluster-admin
     imagePullPolicy: Always
     image:
     clusterRoleName: cluster-admin
     imagePullPolicy: Always
     image:

-      registry: "nexus3.o-ran-sc.org:10004/o-ran-sc"
+      registry: "nexus3.o-ran-sc.org:10002/o-ran-sc"

       name: "nonrtric-helm-manager"
       tag: 1.1.0
     service:
       name: "nonrtric-helm-manager"
       tag: 1.1.0
     service:


@@ -300,4 +300,4 @@ helmmanager:
       # Either refer to a volume created under the nonrtric by storageClassName. Then the claimed size should be the same.
       # The alternative use a dynamic volume provisioner in the cluster. Storage class can then be for instance 'standard' or 'gluster-fs' (depeneds on which classes that are available)
       size: 1Gi
       # Either refer to a volume created under the nonrtric by storageClassName. Then the claimed size should be the same.
       # The alternative use a dynamic volume provisioner in the cluster. Storage class can then be for instance 'standard' or 'gluster-fs' (depeneds on which classes that are available)
       size: 1Gi

-      storageClassName: helmmanager-storage
\ No newline at end of file
+      storageClassName: helmmanager-storage

diff --git a/nonrtric/helm/a1simulator/values.yaml b/nonrtric/helm/a1simulator/values.yaml
index 3f587c6..d104e1a 100644 (file)
--- a/nonrtric/helm/a1simulator/values.yaml
+++ b/nonrtric/helm/a1simulator/values.yaml
@@ -22,7 +22,7 @@ a1simulator:
   name: a1-sim
   imagePullPolicy: IfNotPresent
   image:
   name: a1-sim
   imagePullPolicy: IfNotPresent
   image:

-    registry: 'nexus3.o-ran-sc.org:10004/o-ran-sc'
+    registry: 'nexus3.o-ran-sc.org:10002/o-ran-sc'

     name: a1-simulator
     tag: 2.2.0
   service:
     name: a1-simulator
     tag: 2.2.0
   service:

diff --git a/nonrtric/helm/controlpanel/values.yaml b/nonrtric/helm/controlpanel/values.yaml
index 91f233f..063b830 100644 (file)
--- a/nonrtric/helm/controlpanel/values.yaml
+++ b/nonrtric/helm/controlpanel/values.yaml
@@ -21,7 +21,7 @@
 controlpanel:
   imagePullPolicy: IfNotPresent
   image:
 controlpanel:
   imagePullPolicy: IfNotPresent
   image:

-    registry: 'nexus3.o-ran-sc.org:10004/o-ran-sc'
+    registry: 'nexus3.o-ran-sc.org:10002/o-ran-sc'

     name: nonrtric-controlpanel
     tag: 2.3.0
   replicaCount: 1
     name: nonrtric-controlpanel
     tag: 2.3.0
   replicaCount: 1

diff --git a/nonrtric/helm/dmaapadapterservice/values.yaml b/nonrtric/helm/dmaapadapterservice/values.yaml
index 123b2b7..3260e26 100644 (file)
--- a/nonrtric/helm/dmaapadapterservice/values.yaml
+++ b/nonrtric/helm/dmaapadapterservice/values.yaml
@@ -21,7 +21,7 @@
 dmaapadapterservice:
   imagePullPolicy: IfNotPresent
   image:
 dmaapadapterservice:
   imagePullPolicy: IfNotPresent
   image:

-    registry: "nexus3.o-ran-sc.org:10004/o-ran-sc"
+    registry: "nexus3.o-ran-sc.org:10002/o-ran-sc"

     name: "nonrtric-dmaap-adaptor"
     tag: 1.0.0
   service:
     name: "nonrtric-dmaap-adaptor"
     tag: 1.0.0
   service:

diff --git a/nonrtric/helm/dmaapmediatorservice/templates/statefulset.yaml b/nonrtric/helm/dmaapmediatorservice/templates/statefulset.yaml
index ae3971d..3694754 100644 (file)
--- a/nonrtric/helm/dmaapmediatorservice/templates/statefulset.yaml
+++ b/nonrtric/helm/dmaapmediatorservice/templates/statefulset.yaml
@@ -50,17 +50,16 @@ spec:
           protocol: TCP
         - containerPort: {{ .Values.dmaapmediatorservice.service.targetPort2 }}
           protocol: TCP
           protocol: TCP
         - containerPort: {{ .Values.dmaapmediatorservice.service.targetPort2 }}
           protocol: TCP

-        # Temporarily disabled probes due to no http available in the container
-        # readinessProbe:
-        #   tcpSocket:
-        #     port: {{ .Values.dmaapmediatorservice.service.targetPort1 }}
-        #   initialDelaySeconds: {{ .Values.dmaapmediatorservice.liveness.initialDelaySeconds }}
-        #   periodSeconds: {{ .Values.dmaapmediatorservice.liveness.periodSeconds }}
-        # livenessProbe:
-        #   tcpSocket:
-        #     port: {{ .Values.dmaapmediatorservice.service.targetPort1 }}
-        #   initialDelaySeconds: {{ .Values.dmaapmediatorservice.liveness.initialDelaySeconds }}
-        #   periodSeconds: {{ .Values.dmaapmediatorservice.liveness.periodSeconds }}
+        readinessProbe:
+          tcpSocket:
+            port: {{ .Values.dmaapmediatorservice.service.targetPort2 }}
+          initialDelaySeconds: {{ .Values.dmaapmediatorservice.liveness.initialDelaySeconds }}
+          periodSeconds: {{ .Values.dmaapmediatorservice.liveness.periodSeconds }}
+        livenessProbe:
+          tcpSocket:
+            port: {{ .Values.dmaapmediatorservice.service.targetPort2 }}
+          initialDelaySeconds: {{ .Values.dmaapmediatorservice.liveness.initialDelaySeconds }}
+          periodSeconds: {{ .Values.dmaapmediatorservice.liveness.periodSeconds }}

         volumeMounts:
         - name: {{ include "common.name.dmaapmediatorservice" . }}-dmaapmediator-data
           mountPath: /configs/type_config.json
         volumeMounts:
         - name: {{ include "common.name.dmaapmediatorservice" . }}-dmaapmediator-data
           mountPath: /configs/type_config.json

diff --git a/nonrtric/helm/dmaapmediatorservice/values.yaml b/nonrtric/helm/dmaapmediatorservice/values.yaml
index 4a32b42..3ae2eac 100644 (file)
--- a/nonrtric/helm/dmaapmediatorservice/values.yaml
+++ b/nonrtric/helm/dmaapmediatorservice/values.yaml
@@ -21,7 +21,7 @@
 dmaapmediatorservice:
   imagePullPolicy: IfNotPresent
   image:
 dmaapmediatorservice:
   imagePullPolicy: IfNotPresent
   image:

-    registry: "nexus3.o-ran-sc.org:10004/o-ran-sc"
+    registry: "nexus3.o-ran-sc.org:10002/o-ran-sc"

     name: "nonrtric-dmaap-mediator-producer"
     tag: 1.0.0
   service:
     name: "nonrtric-dmaap-mediator-producer"
     tag: 1.0.0
   service:

diff --git a/nonrtric/helm/helmmanager/templates/statefulset.yaml b/nonrtric/helm/helmmanager/templates/statefulset.yaml
index 668ac5f..d980ecb 100644 (file)
--- a/nonrtric/helm/helmmanager/templates/statefulset.yaml
+++ b/nonrtric/helm/helmmanager/templates/statefulset.yaml
@@ -48,17 +48,16 @@ spec:
         ports:
         - containerPort: {{ .Values.helmmanager.service.targetPort1 }}
           protocol: TCP
         ports:
         - containerPort: {{ .Values.helmmanager.service.targetPort1 }}
           protocol: TCP

-        # readinessProbe:
-        #   tcpSocket:
-        #     port: {{ .Values.helmmanager.service.targetPort1 }}
-        #   initialDelaySeconds: {{ .Values.helmmanager.liveness.initialDelaySeconds }}
-        #   periodSeconds: {{ .Values.helmmanager.liveness.periodSeconds }}
-        # livenessProbe:
-        #   httpGet:
-        #     path: /helm/charts
-        #     port: {{ .Values.helmmanager.service.targetPort1 }}
-        #   initialDelaySeconds: {{ .Values.helmmanager.liveness.initialDelaySeconds }}
-        #   periodSeconds: {{ .Values.helmmanager.liveness.periodSeconds }}
+        readinessProbe:
+          tcpSocket:
+            port: {{ .Values.helmmanager.service.targetPort1 }}
+          initialDelaySeconds: {{ .Values.helmmanager.liveness.initialDelaySeconds }}
+          periodSeconds: {{ .Values.helmmanager.liveness.periodSeconds }}
+        livenessProbe:
+          tcpSocket:
+            port: {{ .Values.helmmanager.service.targetPort1 }}
+          initialDelaySeconds: {{ .Values.helmmanager.liveness.initialDelaySeconds }}
+          periodSeconds: {{ .Values.helmmanager.liveness.periodSeconds }}

         volumeMounts:
         - name: {{ include "common.name.helmmanager" . }}-vardata
           mountPath: "/var/helm-manager-service"
         volumeMounts:
         - name: {{ include "common.name.helmmanager" . }}-vardata
           mountPath: "/var/helm-manager-service"

diff --git a/nonrtric/helm/helmmanager/values.yaml b/nonrtric/helm/helmmanager/values.yaml
index 40ef634..0751698 100644 (file)
--- a/nonrtric/helm/helmmanager/values.yaml
+++ b/nonrtric/helm/helmmanager/values.yaml
@@ -22,7 +22,7 @@ helmmanager:
   clusterRoleName: cluster-admin
   imagePullPolicy: IfNotPresent
   image:
   clusterRoleName: cluster-admin
   imagePullPolicy: IfNotPresent
   image:

-    registry: "nexus3.o-ran-sc.org:10004/o-ran-sc"
+    registry: "nexus3.o-ran-sc.org:10002/o-ran-sc"

     name: "nonrtric-helm-manager"
     tag: 1.1.0
   service:
     name: "nonrtric-helm-manager"
     tag: 1.1.0
   service:

diff --git a/nonrtric/helm/informationservice/values.yaml b/nonrtric/helm/informationservice/values.yaml
index e998656..a5d571a 100644 (file)
--- a/nonrtric/helm/informationservice/values.yaml
+++ b/nonrtric/helm/informationservice/values.yaml
@@ -21,7 +21,7 @@
 informationservice:
   imagePullPolicy: IfNotPresent
   image:
 informationservice:
   imagePullPolicy: IfNotPresent
   image:

-    registry: "nexus3.o-ran-sc.org:10004/o-ran-sc"
+    registry: "nexus3.o-ran-sc.org:10002/o-ran-sc"

     name: "nonrtric-information-coordinator-service"
     tag: 1.2.0
   service:
     name: "nonrtric-information-coordinator-service"
     tag: 1.2.0
   service:

diff --git a/nonrtric/helm/nonrtricgateway/values.yaml b/nonrtric/helm/nonrtricgateway/values.yaml
index 6333376..acfc3dc 100644 (file)
--- a/nonrtric/helm/nonrtricgateway/values.yaml
+++ b/nonrtric/helm/nonrtricgateway/values.yaml
@@ -21,9 +21,9 @@
 nonrtricgateway:
   imagePullPolicy: IfNotPresent
   image:
 nonrtricgateway:
   imagePullPolicy: IfNotPresent
   image:

-    registry: 'nexus3.o-ran-sc.org:10004/o-ran-sc'
+    registry: 'nexus3.o-ran-sc.org:10002/o-ran-sc'

     name: nonrtric-gateway
     name: nonrtric-gateway

-    tag: 1.1.0
+    tag: 1.0.0

   service:
     httpName: http
     internalPort1: 9090
   service:
     httpName: http
     internalPort1: 9090

diff --git a/nonrtric/helm/policymanagementservice/values.yaml b/nonrtric/helm/policymanagementservice/values.yaml
index b0e21c8..8782d05 100644 (file)
--- a/nonrtric/helm/policymanagementservice/values.yaml
+++ b/nonrtric/helm/policymanagementservice/values.yaml
@@ -21,8 +21,8 @@
 policymanagementservice:
   imagePullPolicy: IfNotPresent
   image:
 policymanagementservice:
   imagePullPolicy: IfNotPresent
   image:

-    registry: "nexus3.o-ran-sc.org:10004/o-ran-sc"
-    name: nonrtric-policy-agent
+    registry: "nexus3.o-ran-sc.org:10002/o-ran-sc"
+    name: nonrtric-a1-policy-management-service

     tag: 2.3.0
   service:
     allowHttp: true
     tag: 2.3.0
   service:
     allowHttp: true

diff --git a/nonrtric/helm/rappcatalogueservice/values.yaml b/nonrtric/helm/rappcatalogueservice/values.yaml
index 507ed55..3165c46 100644 (file)
--- a/nonrtric/helm/rappcatalogueservice/values.yaml
+++ b/nonrtric/helm/rappcatalogueservice/values.yaml
@@ -21,9 +21,9 @@
 rappcatalogueservice:
   imagePullPolicy: IfNotPresent
   image:
 rappcatalogueservice:
   imagePullPolicy: IfNotPresent
   image:

-    registry: 'nexus3.o-ran-sc.org:10004/o-ran-sc'
+    registry: 'nexus3.o-ran-sc.org:10002/o-ran-sc'

     name: nonrtric-r-app-catalogue
     name: nonrtric-r-app-catalogue

-    tag: 1.1.0
+    tag: 1.0.1

   service:
     allowHttp: true
     httpName: http
   service:
     allowHttp: true
     httpName: http