Merge "Add simulator helm charts"
authorJohn Keeney <john.keeney@est.tech>
Fri, 3 Mar 2023 16:26:43 +0000 (16:26 +0000)
committerGerrit Code Review <gerrit@o-ran-sc.org>
Fri, 3 Mar 2023 16:26:43 +0000 (16:26 +0000)
30 files changed:
bin/deploy-nonrtric
bin/undeploy-nonrtric
nonrtric/RECIPE_EXAMPLE/example_recipe.yaml
nonrtric/helm/a1simulator/values.yaml
nonrtric/helm/capifcore/Chart.yaml [new file with mode: 0644]
nonrtric/helm/capifcore/requirements.yaml [new file with mode: 0644]
nonrtric/helm/capifcore/templates/deployment.yaml [new file with mode: 0644]
nonrtric/helm/capifcore/templates/service.yaml [new file with mode: 0644]
nonrtric/helm/capifcore/values.yaml [new file with mode: 0644]
nonrtric/helm/controlpanel/values.yaml
nonrtric/helm/dmaapadapterservice/resources/config/application.yaml
nonrtric/helm/dmaapadapterservice/values.yaml
nonrtric/helm/informationservice/values.yaml
nonrtric/helm/nonrtric/Chart.yaml
nonrtric/helm/nonrtric/values.yaml
nonrtric/helm/policymanagementservice/values.yaml
nonrtric/helm/ransliceassurance/templates/deployment.yaml
nonrtric/helm/ransliceassurance/values.yaml
nonrtric/helm/rappcatalogueenhancedservice/Chart.yaml [new file with mode: 0644]
nonrtric/helm/rappcatalogueenhancedservice/requirements.yaml [new file with mode: 0644]
nonrtric/helm/rappcatalogueenhancedservice/templates/deployment.yaml [new file with mode: 0644]
nonrtric/helm/rappcatalogueenhancedservice/templates/service.yaml [new file with mode: 0644]
nonrtric/helm/rappcatalogueenhancedservice/values.yaml [new file with mode: 0644]
ric-common/Common-Template/helm/nonrtric-common/templates/_rappcatalogueenhancedservice.tpl [new file with mode: 0644]
ric-common/Common-Template/helm/nonrtric-common/templates/capifcore.tpl [new file with mode: 0644]
smo-install/oran_oom/odu-app-ics-version/values.yaml
smo-install/oran_oom/odu-app/values.yaml
smo-install/tests_oom/du-simulator/values.yaml
smo-install/tests_oom/ru-simulator/values.yaml
smo-install/tests_oom/topology-server/values.yaml

index 291dfee..baaa1aa 100755 (executable)
@@ -106,7 +106,7 @@ rm $HELM_LOCAL_REPO/*
 helm repo remove local
 $ROOT_DIR/prepare-common-templates
 
-COMPONENTS="controlpanel a1controller a1simulator policymanagementservice informationservice rappcatalogueservice nonrtricgateway dmaapadapterservice dmaapmediatorservice helmmanager orufhrecovery ransliceassurance"
+COMPONENTS="controlpanel a1controller a1simulator policymanagementservice informationservice rappcatalogueservice rappcatalogueenhancedservice nonrtricgateway dmaapadapterservice dmaapmediatorservice helmmanager orufhrecovery ransliceassurance capifcore"
 for component in $COMPONENTS; do
     echo "Packaging NONRTRIC component [$component]"
     helm dep up $ROOT_DIR/../nonrtric/helm/$component
index be6dff7..162bf6e 100755 (executable)
@@ -17,8 +17,7 @@
 
 # This script to undeploy the NONRTRIC
 
-
-COMPONENTS="controlpanel a1controller a1simulator policymanagementservice informationservice rappcatalogueservice nonrtricgateway dmaapadapterservice dmaapmediatorservice helmmanager orufhrecovery ransliceassurance"
+COMPONENTS="controlpanel a1controller a1simulator policymanagementservice informationservice rappcatalogueservice rappcatalogueenhancedservice nonrtricgateway dmaapadapterservice dmaapmediatorservice helmmanager orufhrecovery ransliceassurance capifcore"
 RECIPE_NAMESPACE=$(kubectl get cm --all-namespaces | grep nonrtric-recipe | awk '{print $1}')
 kubectl get configmap  -n $RECIPE_NAMESPACE nonrtric-recipe  -o jsonpath='{.data.recipe}' > /tmp/recipe.yaml
 
index 6e3b84e..a69e75e 100644 (file)
@@ -27,6 +27,7 @@ nonrtric:
   installControlpanel: true
   installInformationservice: true
   installRappcatalogueservice: true
+  installRappcatalogueenhancedservice: true
   installNonrtricgateway: true
   installKong: false
   installDmaapadapterservice: true
@@ -60,7 +61,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 +91,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 +145,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 +176,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
@@ -218,6 +219,25 @@ rappcatalogueservice:
       initialDelaySeconds: 20
       periodSeconds: 10
 
+rappcatalogueenhancedservice:
+  rappcatalogueenhancedservice:
+    imagePullPolicy: Always
+    image:
+      registry: 'nexus3.o-ran-sc.org:10002/o-ran-sc'
+      name: nonrtric-plt-rappcatalogue-enhanced
+      tag: 1.0.1
+    service:
+      allowHttp: true
+      httpName: http
+      internalPort1: 9696
+      targetPort1: 9696
+    liveness:
+      initialDelaySeconds: 20
+      periodSeconds: 10
+    readiness:
+      initialDelaySeconds: 20
+      periodSeconds: 10
+
 nonrtricgateway:
   nonrtricgateway:
     imagePullPolicy: Always
@@ -243,7 +263,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
@@ -311,7 +331,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"
@@ -320,6 +340,7 @@ ransliceassurance:
       sdnr_password: "Kp8bJ4SXszM0WXlhak3eHlcse2gAw84vaoGGmJvUy2U"
       log_level: "Info"
       polltime: "10"
+      node_id: "o-du-1122"
 
 orufhrecovery:
   orufhrecovery:
@@ -340,3 +361,14 @@ orufhrecovery:
       oru_to_odu_map_file: "o-ru-to-o-du-map.csv"
       log_level: "Info"
 
+
+capifcore:
+  capifcore:
+    imagePullPolicy: IfNotPresent
+    image:
+      registry: "nexus3.o-ran-sc.org:10002/o-ran-sc"
+      name: nonrtric-plt-capifcore
+      tag: 1.0.0
+    env:
+      chart_museum_url: "http://chartmuseum:8080"
+      repo_name: "capifcore"
\ No newline at end of file
index 8d7fb32..9a7d462 100644 (file)
@@ -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/capifcore/Chart.yaml b/nonrtric/helm/capifcore/Chart.yaml
new file mode 100644 (file)
index 0000000..903a20c
--- /dev/null
@@ -0,0 +1,21 @@
+################################################################################
+#   Copyright (c) 2022 Nordix Foundation.                                      #
+#                                                                              #
+#   Licensed under the Apache License, Version 2.0 (the "License");            #
+#   you may not use this file except in compliance with the License.           #
+#   You may obtain a copy of the License at                                    #
+#                                                                              #
+#       http://www.apache.org/licenses/LICENSE-2.0                             #
+#                                                                              #
+#   Unless required by applicable law or agreed to in writing, software        #
+#   distributed under the License is distributed on an "AS IS" BASIS,          #
+#   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.   #
+#   See the License for the specific language governing permissions and        #
+#   limitations under the License.                                             #
+################################################################################
+
+apiVersion: v1
+appVersion: "2.0.0"
+description: A Helm chart for CAPIF core
+name: capifcore
+version: 1.0.0
diff --git a/nonrtric/helm/capifcore/requirements.yaml b/nonrtric/helm/capifcore/requirements.yaml
new file mode 100644 (file)
index 0000000..25a3e89
--- /dev/null
@@ -0,0 +1,20 @@
+################################################################################
+#   Copyright (c) 2022 Nordix Foundation.                                      #
+#                                                                              #
+#   Licensed under the Apache License, Version 2.0 (the "License");            #
+#   you may not use this file except in compliance with the License.           #
+#   You may obtain a copy of the License at                                    #
+#                                                                              #
+#       http://www.apache.org/licenses/LICENSE-2.0                             #
+#                                                                              #
+#   Unless required by applicable law or agreed to in writing, software        #
+#   distributed under the License is distributed on an "AS IS" BASIS,          #
+#   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.   #
+#   See the License for the specific language governing permissions and        #
+#   limitations under the License.                                             #
+################################################################################
+
+dependencies:
+  - name: nonrtric-common
+    version: ^2.0.0
+    repository: "@local"
diff --git a/nonrtric/helm/capifcore/templates/deployment.yaml b/nonrtric/helm/capifcore/templates/deployment.yaml
new file mode 100644 (file)
index 0000000..ea499a3
--- /dev/null
@@ -0,0 +1,57 @@
+################################################################################
+#   Copyright (c) 2022 Nordix Foundation.                                      #
+#                                                                              #
+#   Licensed under the Apache License, Version 2.0 (the "License");            #
+#   you may not use this file except in compliance with the License.           #
+#   You may obtain a copy of the License at                                    #
+#                                                                              #
+#       http://www.apache.org/licenses/LICENSE-2.0                             #
+#                                                                              #
+#   Unless required by applicable law or agreed to in writing, software        #
+#   distributed under the License is distributed on an "AS IS" BASIS,          #
+#   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.   #
+#   See the License for the specific language governing permissions and        #
+#   limitations under the License.                                             #
+################################################################################
+
+kind: Deployment
+apiVersion: apps/v1
+metadata:
+  name: {{ include "common.name.capifcore" . }}
+  namespace: {{ include "common.namespace.nonrtric" . }}
+  generation: 1
+  labels:
+    app: {{ include "common.namespace.nonrtric" . }}-{{ include "common.name.capifcore" . }}
+    chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
+    release: {{ .Release.Name }}
+    heritage: {{ .Release.Service }}
+  annotations:
+    deployment.kubernetes.io/revision: '1'
+spec:
+  replicas: 1
+  selector:
+    matchLabels:
+      app: {{ include "common.namespace.nonrtric" . }}-{{ include "common.name.capifcore" . }}
+      release: {{ .Release.Name }}
+  template:
+    metadata:
+      labels:
+        app: {{ include "common.namespace.nonrtric" . }}-{{ include "common.name.capifcore" . }}
+        release: {{ .Release.Name }}
+    spec:
+      hostname: {{ include "common.name.capifcore" . }}
+      containers:
+      - name: {{ include "common.container.capifcore" . }}
+        image: {{ .Values.capifcore.image.registry }}/{{ .Values.capifcore.image.name }}:{{ .Values.capifcore.image.tag }}
+        imagePullPolicy: {{ .Values.capifcore.imagePullPolicy }}
+        args:
+            [
+              "-chartMuseumUrl",
+              "{{ .Values.capifcore.env.chart_museum_url }}",
+              "-repoName",
+              "{{ .Values.capifcore.env.repo_name }}"
+            ]
+        ports:
+        - containerPort: 8090
+          protocol: TCP
+
diff --git a/nonrtric/helm/capifcore/templates/service.yaml b/nonrtric/helm/capifcore/templates/service.yaml
new file mode 100644 (file)
index 0000000..568264c
--- /dev/null
@@ -0,0 +1,38 @@
+################################################################################
+#   Copyright (c) 2022 Nordix Foundation.                                      #
+#                                                                              #
+#   Licensed under the Apache License, Version 2.0 (the "License");            #
+#   you may not use this file except in compliance with the License.           #
+#   You may obtain a copy of the License at                                    #
+#                                                                              #
+#       http://www.apache.org/licenses/LICENSE-2.0                             #
+#                                                                              #
+#   Unless required by applicable law or agreed to in writing, software        #
+#   distributed under the License is distributed on an "AS IS" BASIS,          #
+#   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.   #
+#   See the License for the specific language governing permissions and        #
+#   limitations under the License.                                             #
+################################################################################
+
+kind: Service
+apiVersion: v1
+metadata:
+  name: {{ include "common.name.capifcore" . }}
+  namespace: {{ include "common.namespace.nonrtric" . }}
+  labels:
+    app: {{ include "common.namespace.nonrtric" . }}-{{ include "common.name.capifcore" . }}
+    chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
+    release: {{ .Release.Name }}
+    heritage: {{ .Release.Service }}
+spec:
+  ports:
+    {{if eq .Values.capifcore.service.allowHttp true -}}
+    - name: {{ index .Values.capifcore.service.httpName }}
+      port: {{ .Values.capifcore.service.port }}
+      targetPort: {{ .Values.capifcore.service.targetPort }}
+      protocol: TCP
+    {{- end }}
+  selector:
+    app: {{ include "common.namespace.nonrtric" . }}-{{ include "common.name.capifcore" . }}
+    release: {{ .Release.Name }}
+  type: ClusterIP
diff --git a/nonrtric/helm/capifcore/values.yaml b/nonrtric/helm/capifcore/values.yaml
new file mode 100644 (file)
index 0000000..70798f2
--- /dev/null
@@ -0,0 +1,34 @@
+################################################################################
+#   Copyright (c) 2022 Nordix Foundation.                                      #
+#                                                                              #
+#   Licensed under the Apache License, Version 2.0 (the "License");            #
+#   you may not use this file except in compliance with the License.           #
+#   You may obtain a copy of the License at                                    #
+#                                                                              #
+#       http://www.apache.org/licenses/LICENSE-2.0                             #
+#                                                                              #
+#   Unless required by applicable law or agreed to in writing, software        #
+#   distributed under the License is distributed on an "AS IS" BASIS,          #
+#   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.   #
+#   See the License for the specific language governing permissions and        #
+#   limitations under the License.                                             #
+################################################################################
+
+# Default values for CAPIF core.
+# This is a YAML-formatted file.
+# Declare variables to be passed into your templates.
+
+capifcore:
+  imagePullPolicy: IfNotPresent
+  image:
+    registry: 'nexus3.o-ran-sc.org:10002/o-ran-sc'
+    name: nonrtric-plt-capifcore
+    tag: 1.0.0
+  service:
+    httpName: http
+    allowHttp: true
+    port: 8090
+    targetPort: 8090
+  env:
+    chart_museum_url: "http://chartmuseum:8080"
+    repo_name: "capifcore"
index 063b830..5297ea2 100644 (file)
@@ -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
index cc357c4..eaf3ec3 100644 (file)
@@ -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
+
index 8db1069..96996a5 100644 (file)
@@ -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
index 4ef157f..c1a036b 100644 (file)
@@ -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
index bb2a24a..2cb1aaf 100644 (file)
@@ -55,6 +55,11 @@ dependencies:
     repository: "@local"
     condition: nonrtric.installRappcatalogueservice
 
+  - name: rappcatalogueenhancedservice
+    version: ~1.0.0
+    repository: "@local"
+    condition: nonrtric.installRappcatalogueenhancedservice
+
   - name: nonrtricgateway
     version: ~1.0.0
     repository: "@local"
@@ -84,3 +89,8 @@ dependencies:
     version: ~1.0.0
     repository: "@local"
     condition: nonrtric.installOrufhrecovery
+
+  - name: capifcore
+    version: ~1.0.0
+    repository: "@local"
+    condition: nonrtric.installCapifcore
index e936b13..c820699 100644 (file)
@@ -21,12 +21,14 @@ nonrtric:
   installControlpanel: true
   installInformationservice: true
   installRappcatalogueservice: true
+  installRappcatalogueEnhancedservice: true
   installNonrtricgateway: true
   installDmaapadapterservice: true
   installDmaapmediatorservice: true
   installHelmmanager: true
   installOrufhrecovery: true
   installRansliceassurance: true
+  installCapifcore: true
 
   volume1:
     size: 1Gi
index 4fa26f0..11c4571 100644 (file)
@@ -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
index a762e61..fd9e346 100644 (file)
@@ -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 }}"
 
index 0dcb2ef..e569e36 100644 (file)
@@ -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"
diff --git a/nonrtric/helm/rappcatalogueenhancedservice/Chart.yaml b/nonrtric/helm/rappcatalogueenhancedservice/Chart.yaml
new file mode 100644 (file)
index 0000000..2695c8c
--- /dev/null
@@ -0,0 +1,21 @@
+################################################################################
+#   Copyright (c) 2022 Nordix Foundation.                                      #
+#                                                                              #
+#   Licensed under the Apache License, Version 2.0 (the "License");            #
+#   you may not use this file except in compliance with the License.           #
+#   You may obtain a copy of the License at                                    #
+#                                                                              #
+#       http://www.apache.org/licenses/LICENSE-2.0                             #
+#                                                                              #
+#   Unless required by applicable law or agreed to in writing, software        #
+#   distributed under the License is distributed on an "AS IS" BASIS,          #
+#   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.   #
+#   See the License for the specific language governing permissions and        #
+#   limitations under the License.                                             #
+################################################################################
+
+apiVersion: v1
+appVersion: "2.0.0"
+description: A Helm chart for rAPP Catalogue Enhanced Service
+name: rappcatalogueenhancedservice
+version: 1.0.0
diff --git a/nonrtric/helm/rappcatalogueenhancedservice/requirements.yaml b/nonrtric/helm/rappcatalogueenhancedservice/requirements.yaml
new file mode 100644 (file)
index 0000000..25a3e89
--- /dev/null
@@ -0,0 +1,20 @@
+################################################################################
+#   Copyright (c) 2022 Nordix Foundation.                                      #
+#                                                                              #
+#   Licensed under the Apache License, Version 2.0 (the "License");            #
+#   you may not use this file except in compliance with the License.           #
+#   You may obtain a copy of the License at                                    #
+#                                                                              #
+#       http://www.apache.org/licenses/LICENSE-2.0                             #
+#                                                                              #
+#   Unless required by applicable law or agreed to in writing, software        #
+#   distributed under the License is distributed on an "AS IS" BASIS,          #
+#   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.   #
+#   See the License for the specific language governing permissions and        #
+#   limitations under the License.                                             #
+################################################################################
+
+dependencies:
+  - name: nonrtric-common
+    version: ^2.0.0
+    repository: "@local"
diff --git a/nonrtric/helm/rappcatalogueenhancedservice/templates/deployment.yaml b/nonrtric/helm/rappcatalogueenhancedservice/templates/deployment.yaml
new file mode 100644 (file)
index 0000000..d55fcdc
--- /dev/null
@@ -0,0 +1,59 @@
+################################################################################
+#   Copyright (c) 2022 Nordix Foundation.                                      #
+#                                                                              #
+#   Licensed under the Apache License, Version 2.0 (the "License");            #
+#   you may not use this file except in compliance with the License.           #
+#   You may obtain a copy of the License at                                    #
+#                                                                              #
+#       http://www.apache.org/licenses/LICENSE-2.0                             #
+#                                                                              #
+#   Unless required by applicable law or agreed to in writing, software        #
+#   distributed under the License is distributed on an "AS IS" BASIS,          #
+#   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.   #
+#   See the License for the specific language governing permissions and        #
+#   limitations under the License.                                             #
+################################################################################
+
+kind: Deployment
+apiVersion: apps/v1
+metadata:
+  name: {{ include "common.name.rappcatalogueenhancedservice" . }}
+  namespace: {{ include "common.namespace.nonrtric" . }}
+  generation: 1
+  labels:
+    app: {{ include "common.namespace.nonrtric" . }}-{{ include "common.name.rappcatalogueenhancedservice" . }}
+    chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
+    release: {{ .Release.Name }}
+    heritage: {{ .Release.Service }}
+  annotations:
+    deployment.kubernetes.io/revision: '1'
+spec:
+  replicas: 1
+  selector:
+    matchLabels:
+      app: {{ include "common.namespace.nonrtric" . }}-{{ include "common.name.rappcatalogueenhancedservice" . }}
+      release: {{ .Release.Name }}
+  template:
+    metadata:
+      labels:
+        app: {{ include "common.namespace.nonrtric" . }}-{{ include "common.name.rappcatalogueenhancedservice" . }}
+        release: {{ .Release.Name }}
+    spec:
+      hostname: {{ include "common.name.rappcatalogueenhancedservice" . }}
+      containers:
+      - name: {{ include "common.container.rappcatalogueenhancedservice" . }}
+        image: {{ .Values.rappcatalogueenhancedservice.image.registry }}/{{ .Values.rappcatalogueenhancedservice.image.name }}:{{ .Values.rappcatalogueenhancedservice.image.tag }}
+        imagePullPolicy: {{ .Values.rappcatalogueenhancedservice.imagePullPolicy }}
+        ports:
+        - containerPort: {{ .Values.rappcatalogueenhancedservice.service.targetPort }}
+          protocol: TCP
+        readinessProbe:
+          tcpSocket:
+            port: {{ .Values.rappcatalogueenhancedservice.service.targetPort }}
+          initialDelaySeconds: {{ .Values.rappcatalogueenhancedservice.liveness.initialDelaySeconds }}
+          periodSeconds: {{ .Values.rappcatalogueenhancedservice.liveness.periodSeconds }}
+        livenessProbe:
+          tcpSocket:
+            port: {{ .Values.rappcatalogueenhancedservice.service.targetPort }}
+          initialDelaySeconds: {{ .Values.rappcatalogueenhancedservice.liveness.initialDelaySeconds }}
+          periodSeconds: {{ .Values.rappcatalogueenhancedservice.liveness.periodSeconds }}
diff --git a/nonrtric/helm/rappcatalogueenhancedservice/templates/service.yaml b/nonrtric/helm/rappcatalogueenhancedservice/templates/service.yaml
new file mode 100644 (file)
index 0000000..d1ba482
--- /dev/null
@@ -0,0 +1,38 @@
+################################################################################
+#   Copyright (c) 2022 Nordix Foundation.                                      #
+#                                                                              #
+#   Licensed under the Apache License, Version 2.0 (the "License");            #
+#   you may not use this file except in compliance with the License.           #
+#   You may obtain a copy of the License at                                    #
+#                                                                              #
+#       http://www.apache.org/licenses/LICENSE-2.0                             #
+#                                                                              #
+#   Unless required by applicable law or agreed to in writing, software        #
+#   distributed under the License is distributed on an "AS IS" BASIS,          #
+#   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.   #
+#   See the License for the specific language governing permissions and        #
+#   limitations under the License.                                             #
+################################################################################
+
+kind: Service
+apiVersion: v1
+metadata:
+  name: {{ include "common.name.rappcatalogueenhancedservice" . }}
+  namespace: {{ include "common.namespace.nonrtric" . }}
+  labels:
+    app: {{ include "common.namespace.nonrtric" . }}-{{ include "common.name.rappcatalogueenhancedservice" . }}
+    chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
+    release: {{ .Release.Name }}
+    heritage: {{ .Release.Service }}
+spec:
+  ports:
+    {{if eq .Values.rappcatalogueenhancedservice.service.allowHttp true -}}
+    - name: {{ index .Values.rappcatalogueenhancedservice.service.httpName }}
+      port: {{ .Values.rappcatalogueenhancedservice.service.internalPort }}
+      targetPort: {{ .Values.rappcatalogueenhancedservice.service.targetPort }}
+      protocol: TCP
+    {{- end }}
+  selector:
+    app: {{ include "common.namespace.nonrtric" . }}-{{ include "common.name.rappcatalogueenhancedservice" . }}
+    release: {{ .Release.Name }}
+  type: ClusterIP
diff --git a/nonrtric/helm/rappcatalogueenhancedservice/values.yaml b/nonrtric/helm/rappcatalogueenhancedservice/values.yaml
new file mode 100644 (file)
index 0000000..b8d3ce9
--- /dev/null
@@ -0,0 +1,37 @@
+################################################################################
+#   Copyright (c) 2022 Nordix Foundation.                                      #
+#                                                                              #
+#   Licensed under the Apache License, Version 2.0 (the "License");            #
+#   you may not use this file except in compliance with the License.           #
+#   You may obtain a copy of the License at                                    #
+#                                                                              #
+#       http://www.apache.org/licenses/LICENSE-2.0                             #
+#                                                                              #
+#   Unless required by applicable law or agreed to in writing, software        #
+#   distributed under the License is distributed on an "AS IS" BASIS,          #
+#   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.   #
+#   See the License for the specific language governing permissions and        #
+#   limitations under the License.                                             #
+################################################################################
+
+# Default values for rAPP Catalogue Enhanced Service.
+# This is a YAML-formatted file.
+# Declare variables to be passed into your templates.
+
+rappcatalogueenhancedservice:
+  imagePullPolicy: IfNotPresent
+  image:
+    registry: 'nexus3.o-ran-sc.org:10002/o-ran-sc'
+    name: nonrtric-plt-rappcatalogue-enhanced
+    tag: 1.0.1
+  service:
+    allowHttp: true
+    httpName: http
+    internalPort: 9696
+    targetPort: 9696
+  liveness:
+    initialDelaySeconds: 20
+    periodSeconds: 10
+  readiness:
+    initialDelaySeconds: 20
+    periodSeconds: 10
diff --git a/ric-common/Common-Template/helm/nonrtric-common/templates/_rappcatalogueenhancedservice.tpl b/ric-common/Common-Template/helm/nonrtric-common/templates/_rappcatalogueenhancedservice.tpl
new file mode 100644 (file)
index 0000000..eb48013
--- /dev/null
@@ -0,0 +1,24 @@
+################################################################################
+#   Copyright (c) 2020 Nordix Foundation.                                      #
+#                                                                              #
+#   Licensed under the Apache License, Version 2.0 (the "License");            #
+#   you may not use this file except in compliance with the License.           #
+#   You may obtain a copy of the License at                                    #
+#                                                                              #
+#       http://www.apache.org/licenses/LICENSE-2.0                             #
+#                                                                              #
+#   Unless required by applicable law or agreed to in writing, software        #
+#   distributed under the License is distributed on an "AS IS" BASIS,          #
+#   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.   #
+#   See the License for the specific language governing permissions and        #
+#   limitations under the License.                                             #
+################################################################################
+
+{{- define "common.name.rappcatalogueenhancedservice" -}}
+  {{- printf "rappcatalogueenhancedservice" -}}
+{{- end -}}
+
+{{- define "common.container.rappcatalogueenhancedservice" -}}
+  {{- $name := ( include "common.name.rappcatalogueenhancedservice" . ) -}}
+  {{- printf "container-%s" $name | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
diff --git a/ric-common/Common-Template/helm/nonrtric-common/templates/capifcore.tpl b/ric-common/Common-Template/helm/nonrtric-common/templates/capifcore.tpl
new file mode 100644 (file)
index 0000000..7fa8532
--- /dev/null
@@ -0,0 +1,24 @@
+################################################################################
+#   Copyright (c) 2022 Nordix Foundation.                                      #
+#                                                                              #
+#   Licensed under the Apache License, Version 2.0 (the "License");            #
+#   you may not use this file except in compliance with the License.           #
+#   You may obtain a copy of the License at                                    #
+#                                                                              #
+#       http://www.apache.org/licenses/LICENSE-2.0                             #
+#                                                                              #
+#   Unless required by applicable law or agreed to in writing, software        #
+#   distributed under the License is distributed on an "AS IS" BASIS,          #
+#   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.   #
+#   See the License for the specific language governing permissions and        #
+#   limitations under the License.                                             #
+################################################################################
+
+{{- define "common.name.capifcore" -}}
+  {{- printf "capifcore" -}}
+{{- end -}}
+
+{{- define "common.container.capifcore" -}}
+  {{- $name := ( include "common.name.capifcore" . ) -}}
+  {{- printf "container-%s" $name | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
index af2e873..350a70f 100755 (executable)
@@ -20,7 +20,7 @@
 replicaCount: 1
 
 image:
-  repository: nexus3.o-ran-sc.org:10004/o-ran-sc/nonrtric-rapp-ransliceassurance-icsversion
+  repository: nexus3.o-ran-sc.org:10002/o-ran-sc/nonrtric-rapp-ransliceassurance-icsversion
   pullPolicy: Always
   # Overrides the image tag whose default is the chart appVersion.
   tag: "1.1.0"
index 4752c13..d070a8c 100755 (executable)
@@ -20,7 +20,7 @@
 replicaCount: 1
 
 image:
-  repository: nexus3.o-ran-sc.org:10004/o-ran-sc/nonrtric-rapp-ransliceassurance
+  repository: nexus3.o-ran-sc.org:10002/o-ran-sc/nonrtric-rapp-ransliceassurance
   pullPolicy: Always
   # Overrides the image tag whose default is the chart appVersion.
   tag: "1.2.0"
index e59f821..b302b6d 100644 (file)
@@ -14,7 +14,7 @@
 
 # Static Defaults
 image:
-  repository: 'nexus3.o-ran-sc.org:10004/o-ran-sc'
+  repository: 'nexus3.o-ran-sc.org:10002/o-ran-sc'
   name: nts-ng-o-ran-du 
   tag: 1.5.0
   pullPolicy: IfNotPresent
index 3010fb3..f67cbae 100644 (file)
@@ -14,7 +14,7 @@
 
 # Static Defaults
 image:
-  repository: 'nexus3.o-ran-sc.org:10004/o-ran-sc'
+  repository: 'nexus3.o-ran-sc.org:10002/o-ran-sc'
   name: nts-ng-o-ran-ru-fh 
   tag: 1.5.0
   pullPolicy: IfNotPresent
index b57e1cc..54b191c 100644 (file)
@@ -15,7 +15,7 @@
 # Static Defaults
 replicaCount: 1
 image:
-  repository: 'nexus3.o-ran-sc.org:10004/o-ran-sc'
+  repository: 'nexus3.o-ran-sc.org:10002/o-ran-sc'
   name: smo-nts-ng-topology-server
   tag: 1.5.0
   pullPolicy: IfNotPresent