From: Martin Skorupski Date: Sat, 11 Feb 2023 10:23:33 +0000 (+0000) Subject: Merge "Fix/add use cases under SMO package" X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=commitdiff_plain;h=47e5e9345c69000ebbd1a7827aafbd84e8f6a3cd;hp=bc6231f7d4d44ab5f269683c42eb90c2ce4ec9a6;p=it%2Fdep.git Merge "Fix/add use cases under SMO package" --- diff --git a/bin/deploy-nonrtric b/bin/deploy-nonrtric index 291dfee4..baaa1aaa 100755 --- a/bin/deploy-nonrtric +++ b/bin/deploy-nonrtric @@ -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 diff --git a/bin/undeploy-nonrtric b/bin/undeploy-nonrtric index be6dff7e..162bf6e6 100755 --- a/bin/undeploy-nonrtric +++ b/bin/undeploy-nonrtric @@ -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 diff --git a/nonrtric/RECIPE_EXAMPLE/example_recipe.yaml b/nonrtric/RECIPE_EXAMPLE/example_recipe.yaml index 6e3b84e4..a69e75ed 100644 --- a/nonrtric/RECIPE_EXAMPLE/example_recipe.yaml +++ b/nonrtric/RECIPE_EXAMPLE/example_recipe.yaml @@ -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 diff --git a/nonrtric/helm/a1simulator/values.yaml b/nonrtric/helm/a1simulator/values.yaml index 8d7fb32c..9a7d462e 100644 --- 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/capifcore/Chart.yaml b/nonrtric/helm/capifcore/Chart.yaml new file mode 100644 index 00000000..903a20c2 --- /dev/null +++ b/nonrtric/helm/capifcore/Chart.yaml @@ -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 index 00000000..25a3e897 --- /dev/null +++ b/nonrtric/helm/capifcore/requirements.yaml @@ -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 index 00000000..ea499a37 --- /dev/null +++ b/nonrtric/helm/capifcore/templates/deployment.yaml @@ -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 index 00000000..568264c6 --- /dev/null +++ b/nonrtric/helm/capifcore/templates/service.yaml @@ -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 index 00000000..70798f28 --- /dev/null +++ b/nonrtric/helm/capifcore/values.yaml @@ -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" diff --git a/nonrtric/helm/controlpanel/values.yaml b/nonrtric/helm/controlpanel/values.yaml index 063b830b..5297ea25 100644 --- 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 cc357c48..eaf3ec36 100644 --- 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 8db10694..96996a5f 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-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 4ef157fd..c1a036b1 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-plt-informationcoordinatorservice" - tag: 1.3.0 + tag: 1.4.0 service: allowHttp: true httpName: http diff --git a/nonrtric/helm/nonrtric/Chart.yaml b/nonrtric/helm/nonrtric/Chart.yaml index bb2a24a2..2cb1aaf7 100644 --- a/nonrtric/helm/nonrtric/Chart.yaml +++ b/nonrtric/helm/nonrtric/Chart.yaml @@ -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 diff --git a/nonrtric/helm/nonrtric/values.yaml b/nonrtric/helm/nonrtric/values.yaml index e936b135..c8206996 100644 --- a/nonrtric/helm/nonrtric/values.yaml +++ b/nonrtric/helm/nonrtric/values.yaml @@ -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 diff --git a/nonrtric/helm/policymanagementservice/values.yaml b/nonrtric/helm/policymanagementservice/values.yaml index 4fa26f0d..11c4571b 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-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 a762e611..fd9e3466 100644 --- 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 0dcb2eff..e569e368 100644 --- 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" diff --git a/nonrtric/helm/rappcatalogueenhancedservice/Chart.yaml b/nonrtric/helm/rappcatalogueenhancedservice/Chart.yaml new file mode 100644 index 00000000..2695c8cf --- /dev/null +++ b/nonrtric/helm/rappcatalogueenhancedservice/Chart.yaml @@ -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 index 00000000..25a3e897 --- /dev/null +++ b/nonrtric/helm/rappcatalogueenhancedservice/requirements.yaml @@ -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 index 00000000..d55fcdcc --- /dev/null +++ b/nonrtric/helm/rappcatalogueenhancedservice/templates/deployment.yaml @@ -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 index 00000000..d1ba4820 --- /dev/null +++ b/nonrtric/helm/rappcatalogueenhancedservice/templates/service.yaml @@ -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 index 00000000..b8d3ce96 --- /dev/null +++ b/nonrtric/helm/rappcatalogueenhancedservice/values.yaml @@ -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 index 00000000..eb480131 --- /dev/null +++ b/ric-common/Common-Template/helm/nonrtric-common/templates/_rappcatalogueenhancedservice.tpl @@ -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 index 00000000..7fa85321 --- /dev/null +++ b/ric-common/Common-Template/helm/nonrtric-common/templates/capifcore.tpl @@ -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 -}}