From ed4f2a560fe79fc096bfea07c372bb5842de15e1 Mon Sep 17 00:00:00 2001 From: "aravind.est" Date: Thu, 13 Mar 2025 16:55:43 +0000 Subject: [PATCH] Cleanup NONRTIC charts NONRTRIC charts and scripts cleaned up. Issue-ID: NONRTRIC-1058 Change-Id: I44cf4907485cafadc5ffe532de72dbb0746e7f6c Signed-off-by: aravind.est --- bin/deploy-nonrtric | 8 +- bin/undeploy-nonrtric | 8 +- nonrtric/RECIPE_EXAMPLE/example_recipe.yaml | 129 --------------------- nonrtric/helm/dmaapmediatorservice/.helmignore | 22 ---- nonrtric/helm/dmaapmediatorservice/Chart.yaml | 21 ---- .../helm/dmaapmediatorservice/requirements.yaml | 20 ---- .../resources/data/type_config.json | 9 -- .../dmaapmediatorservice/templates/configmap.yaml | 29 ----- .../dmaapmediatorservice/templates/service.yaml | 42 ------- .../templates/statefulset.yaml | 82 ------------- nonrtric/helm/dmaapmediatorservice/values.yaml | 40 ------- nonrtric/helm/helmmanager/.helmignore | 22 ---- nonrtric/helm/helmmanager/Chart.yaml | 21 ---- nonrtric/helm/helmmanager/requirements.yaml | 20 ---- nonrtric/helm/helmmanager/templates/service.yaml | 36 ------ .../helm/helmmanager/templates/serviceaccount.yaml | 43 ------- .../helm/helmmanager/templates/statefulset.yaml | 73 ------------ nonrtric/helm/helmmanager/values.yaml | 40 ------- nonrtric/helm/nonrtric/Chart.yaml | 32 +---- nonrtric/helm/orufhrecovery/Chart.yaml | 21 ---- nonrtric/helm/orufhrecovery/requirements.yaml | 20 ---- .../resources/config/o-ru-to-o-du-map.csv | 11 -- .../helm/orufhrecovery/templates/configmap.yaml | 29 ----- .../helm/orufhrecovery/templates/deployment.yaml | 78 ------------- nonrtric/helm/orufhrecovery/templates/service.yaml | 37 ------ nonrtric/helm/orufhrecovery/values.yaml | 41 ------- nonrtric/helm/ransliceassurance/Chart.yaml | 21 ---- nonrtric/helm/ransliceassurance/requirements.yaml | 20 ---- .../ransliceassurance/templates/deployment.yaml | 67 ----------- .../helm/ransliceassurance/templates/service.yaml | 37 ------ nonrtric/helm/ransliceassurance/values.yaml | 39 ------- .../helm/rappcatalogueenhancedservice/Chart.yaml | 21 ---- .../rappcatalogueenhancedservice/requirements.yaml | 20 ---- .../templates/deployment.yaml | 59 ---------- .../templates/service.yaml | 38 ------ .../helm/rappcatalogueenhancedservice/values.yaml | 38 ------ nonrtric/helm/rappcatalogueservice/Chart.yaml | 21 ---- .../helm/rappcatalogueservice/requirements.yaml | 20 ---- .../rappcatalogueservice/templates/deployment.yaml | 61 ---------- .../rappcatalogueservice/templates/service.yaml | 42 ------- nonrtric/helm/rappcatalogueservice/values.yaml | 40 ------- 41 files changed, 3 insertions(+), 1475 deletions(-) delete mode 100644 nonrtric/helm/dmaapmediatorservice/.helmignore delete mode 100644 nonrtric/helm/dmaapmediatorservice/Chart.yaml delete mode 100644 nonrtric/helm/dmaapmediatorservice/requirements.yaml delete mode 100644 nonrtric/helm/dmaapmediatorservice/resources/data/type_config.json delete mode 100644 nonrtric/helm/dmaapmediatorservice/templates/configmap.yaml delete mode 100644 nonrtric/helm/dmaapmediatorservice/templates/service.yaml delete mode 100644 nonrtric/helm/dmaapmediatorservice/templates/statefulset.yaml delete mode 100644 nonrtric/helm/dmaapmediatorservice/values.yaml delete mode 100644 nonrtric/helm/helmmanager/.helmignore delete mode 100644 nonrtric/helm/helmmanager/Chart.yaml delete mode 100644 nonrtric/helm/helmmanager/requirements.yaml delete mode 100644 nonrtric/helm/helmmanager/templates/service.yaml delete mode 100644 nonrtric/helm/helmmanager/templates/serviceaccount.yaml delete mode 100644 nonrtric/helm/helmmanager/templates/statefulset.yaml delete mode 100644 nonrtric/helm/helmmanager/values.yaml delete mode 100644 nonrtric/helm/orufhrecovery/Chart.yaml delete mode 100644 nonrtric/helm/orufhrecovery/requirements.yaml delete mode 100644 nonrtric/helm/orufhrecovery/resources/config/o-ru-to-o-du-map.csv delete mode 100644 nonrtric/helm/orufhrecovery/templates/configmap.yaml delete mode 100644 nonrtric/helm/orufhrecovery/templates/deployment.yaml delete mode 100644 nonrtric/helm/orufhrecovery/templates/service.yaml delete mode 100644 nonrtric/helm/orufhrecovery/values.yaml delete mode 100644 nonrtric/helm/ransliceassurance/Chart.yaml delete mode 100644 nonrtric/helm/ransliceassurance/requirements.yaml delete mode 100644 nonrtric/helm/ransliceassurance/templates/deployment.yaml delete mode 100644 nonrtric/helm/ransliceassurance/templates/service.yaml delete mode 100644 nonrtric/helm/ransliceassurance/values.yaml delete mode 100644 nonrtric/helm/rappcatalogueenhancedservice/Chart.yaml delete mode 100644 nonrtric/helm/rappcatalogueenhancedservice/requirements.yaml delete mode 100644 nonrtric/helm/rappcatalogueenhancedservice/templates/deployment.yaml delete mode 100644 nonrtric/helm/rappcatalogueenhancedservice/templates/service.yaml delete mode 100644 nonrtric/helm/rappcatalogueenhancedservice/values.yaml delete mode 100644 nonrtric/helm/rappcatalogueservice/Chart.yaml delete mode 100644 nonrtric/helm/rappcatalogueservice/requirements.yaml delete mode 100644 nonrtric/helm/rappcatalogueservice/templates/deployment.yaml delete mode 100644 nonrtric/helm/rappcatalogueservice/templates/service.yaml delete mode 100644 nonrtric/helm/rappcatalogueservice/values.yaml diff --git a/bin/deploy-nonrtric b/bin/deploy-nonrtric index 6ce07a51..5a11778d 100755 --- a/bin/deploy-nonrtric +++ b/bin/deploy-nonrtric @@ -1,7 +1,7 @@ #!/bin/bash ################################################################################ # Copyright (c) 2023 Nordix Foundation. # -# Copyright (C) 2023-2024 OpenInfra Foundation Europe. All rights reserved. # +# Copyright (C) 2023-2025 OpenInfra Foundation Europe. All rights reserved. # # # # Licensed under the Apache License, Version 2.0 (the "License"); # # you may not use this file except in compliance with the License. # @@ -99,16 +99,10 @@ a1simulator \ capifcore \ controlpanel \ dmaapadapterservice \ -dmaapmediatorservice \ dmeparticipant \ -helmmanager \ informationservice \ nonrtricgateway \ -orufhrecovery \ policymanagementservice \ -ransliceassurance \ -rappcatalogueenhancedservice \ -rappcatalogueservice \ rappmanager \ servicemanager \ " diff --git a/bin/undeploy-nonrtric b/bin/undeploy-nonrtric index adfe2875..4372ba7a 100755 --- a/bin/undeploy-nonrtric +++ b/bin/undeploy-nonrtric @@ -1,7 +1,7 @@ #!/bin/bash ################################################################################ # Copyright (c) 2023 Nordix Foundation. # -# Copyright (C) 2024 OpenInfra Foundation Europe. All rights reserved. # +# Copyright (C) 2024-2025 OpenInfra Foundation Europe. All rights reserved. # # # # Licensed under the Apache License, Version 2.0 (the "License"); # # you may not use this file except in compliance with the License. # @@ -26,16 +26,10 @@ a1simulator \ capifcore \ controlpanel \ dmaapadapterservice \ -dmaapmediatorservice \ dmeparticipant \ -helmmanager \ informationservice \ nonrtricgateway \ -orufhrecovery \ policymanagementservice \ -ransliceassurance \ -rappcatalogueenhancedservice \ -rappcatalogueservice \ rappmanager \ servicemanager \ " diff --git a/nonrtric/RECIPE_EXAMPLE/example_recipe.yaml b/nonrtric/RECIPE_EXAMPLE/example_recipe.yaml index 851722b9..ef4a6074 100644 --- a/nonrtric/RECIPE_EXAMPLE/example_recipe.yaml +++ b/nonrtric/RECIPE_EXAMPLE/example_recipe.yaml @@ -27,15 +27,9 @@ nonrtric: installA1simulator: true installControlpanel: true installInformationservice: true - installRappcatalogueservice: true - installRappcatalogueenhancedservice: true installNonrtricgateway: true installKong: true installDmaapadapterservice: true - installDmaapmediatorservice: true - installHelmmanager: true - installOrufhrecovery: true - installRansliceassurance: true installCapifcore: true installServicemanager: true # When enabling Ranpm switch to false installControlpanel, installInformationservice, installNonrtricgateway @@ -229,47 +223,6 @@ controlpanel: ingress: enabled: false -rappcatalogueservice: - rappcatalogueservice: - imagePullPolicy: Always - image: - registry: 'nexus3.o-ran-sc.org:10002/o-ran-sc' - name: nonrtric-plt-rappcatalogue - tag: 1.2.0 - service: - allowHttp: true - httpName: http - internalPort1: 9085 - targetPort1: 8680 - httpsName: https - internalPort2: 9086 - targetPort2: 8633 - liveness: - initialDelaySeconds: 20 - periodSeconds: 10 - readiness: - 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.2.0 - service: - allowHttp: true - httpName: http - internalPort1: 9696 - targetPort1: 9696 - liveness: - initialDelaySeconds: 20 - periodSeconds: 10 - readiness: - initialDelaySeconds: 20 - periodSeconds: 10 - nonrtricgateway: nonrtricgateway: imagePullPolicy: Always @@ -311,88 +264,6 @@ dmaapadapterservice: initialDelaySeconds: 20 periodSeconds: 10 -dmaapmediatorservice: - dmaapmediatorservice: - imagePullPolicy: IfNotPresent - image: - registry: "nexus3.o-ran-sc.org:10002/o-ran-sc" - name: "nonrtric-plt-dmaapmediatorproducer" - tag: 1.2.0 - service: - allowHttp: true - httpName: http - internalPort1: 8085 - targetPort1: 8085 - httpsName: https - internalPort2: 8185 - targetPort2: 8185 - liveness: - initialDelaySeconds: 20 - periodSeconds: 10 - readiness: - initialDelaySeconds: 20 - periodSeconds: 10 - -helmmanager: - helmmanager: - clusterRoleName: cluster-admin - imagePullPolicy: Always - image: - registry: "nexus3.o-ran-sc.org:10002/o-ran-sc" - name: "nonrtric-plt-helmmanager" - tag: 1.3.0 - service: - httpName: http - internalPort1: 8112 - targetPort1: 8083 - liveness: - initialDelaySeconds: 20 - periodSeconds: 10 - readiness: - initialDelaySeconds: 20 - periodSeconds: 10 - persistence: - # 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 - -ransliceassurance: - ransliceassurance: - imagePullPolicy: IfNotPresent - image: - registry: "nexus3.o-ran-sc.org:10002/o-ran-sc" - name: "nonrtric-rapp-ransliceassurance" - tag: 1.3.0 - env: - mr_host: "http://onap-dmaap" - mr_port: "3904" - sdnr_address: "http://sdnr:8181" - sdnr_user: "admin" - sdnr_password: "Kp8bJ4SXszM0WXlhak3eHlcse2gAw84vaoGGmJvUy2U" - log_level: "Info" - polltime: "10" - node_id: "o-du-1122" - -orufhrecovery: - orufhrecovery: - imagePullPolicy: IfNotPresent - image: - registry: "nexus3.o-ran-sc.org:10002/o-ran-sc" - name: "nonrtric-rapp-orufhrecovery-consumer" - tag: 1.1.0 - env: - consumer_host: "http://mrproducer" - consumer_port: "8095" - 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" - sdnr_password: "Kp8bJ4SXszM0WXlhak3eHlcse2gAw84vaoGGmJvUy2U" - oru_to_odu_map_file: "o-ru-to-o-du-map.csv" - log_level: "Info" - capifcore: capifcore: imagePullPolicy: IfNotPresent diff --git a/nonrtric/helm/dmaapmediatorservice/.helmignore b/nonrtric/helm/dmaapmediatorservice/.helmignore deleted file mode 100644 index 50af0317..00000000 --- a/nonrtric/helm/dmaapmediatorservice/.helmignore +++ /dev/null @@ -1,22 +0,0 @@ -# Patterns to ignore when building packages. -# This supports shell glob matching, relative path matching, and -# negation (prefixed with !). Only one pattern per line. -.DS_Store -# Common VCS dirs -.git/ -.gitignore -.bzr/ -.bzrignore -.hg/ -.hgignore -.svn/ -# Common backup files -*.swp -*.bak -*.tmp -*~ -# Various IDEs -.project -.idea/ -*.tmproj -.vscode/ diff --git a/nonrtric/helm/dmaapmediatorservice/Chart.yaml b/nonrtric/helm/dmaapmediatorservice/Chart.yaml deleted file mode 100644 index c78a5d0d..00000000 --- a/nonrtric/helm/dmaapmediatorservice/Chart.yaml +++ /dev/null @@ -1,21 +0,0 @@ -################################################################################ -# Copyright (c) 2021 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: "1.0.0" -description: A Helm chart for Dmaap Mediator Service -name: dmaapmediatorservice -version: 1.0.0 diff --git a/nonrtric/helm/dmaapmediatorservice/requirements.yaml b/nonrtric/helm/dmaapmediatorservice/requirements.yaml deleted file mode 100644 index 69b4db6d..00000000 --- a/nonrtric/helm/dmaapmediatorservice/requirements.yaml +++ /dev/null @@ -1,20 +0,0 @@ -################################################################################ -# Copyright (c) 2021 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/dmaapmediatorservice/resources/data/type_config.json b/nonrtric/helm/dmaapmediatorservice/resources/data/type_config.json deleted file mode 100644 index cf3855aa..00000000 --- a/nonrtric/helm/dmaapmediatorservice/resources/data/type_config.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "types": - [ - { - "id": "STD_Fault_Messages", - "dmaapTopicUrl": "/events/unauthenticated.dmaapmed.json/dmaapmediatorproducer/STD_Fault_Messages?timeout=15000&limit=100" - } - ] - } diff --git a/nonrtric/helm/dmaapmediatorservice/templates/configmap.yaml b/nonrtric/helm/dmaapmediatorservice/templates/configmap.yaml deleted file mode 100644 index 0315e379..00000000 --- a/nonrtric/helm/dmaapmediatorservice/templates/configmap.yaml +++ /dev/null @@ -1,29 +0,0 @@ -################################################################################ -# Copyright (c) 2021 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 -kind: ConfigMap -metadata: - name: {{ include "common.name.dmaapmediatorservice" . }}-configmap-data - namespace: {{ include "common.namespace.nonrtric" . }} - labels: - app: {{ include "common.namespace.nonrtric" . }}-{{ include "common.name.dmaapmediatorservice" . }} - chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }} - release: {{ .Release.Name }} - heritage: {{ .Release.Service }} -data: -{{ tpl (.Files.Glob "resources/data/*").AsConfig . | indent 2 }} \ No newline at end of file diff --git a/nonrtric/helm/dmaapmediatorservice/templates/service.yaml b/nonrtric/helm/dmaapmediatorservice/templates/service.yaml deleted file mode 100644 index d09fde42..00000000 --- a/nonrtric/helm/dmaapmediatorservice/templates/service.yaml +++ /dev/null @@ -1,42 +0,0 @@ -################################################################################ -# Copyright (c) 2021 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.dmaapmediatorservice" . }} - namespace: {{ include "common.namespace.nonrtric" . }} - labels: - app: {{ include "common.namespace.nonrtric" . }}-{{ include "common.name.dmaapmediatorservice" . }} - chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }} - release: {{ .Release.Name }} - heritage: {{ .Release.Service }} -spec: - ports: - {{if eq .Values.dmaapmediatorservice.service.allowHttp true -}} - - name: {{ index .Values.dmaapmediatorservice.service.httpName }} - port: {{ .Values.dmaapmediatorservice.service.internalPort1 }} - targetPort: {{ .Values.dmaapmediatorservice.service.targetPort1 }} - protocol: TCP - {{- end }} - - name: {{ index .Values.dmaapmediatorservice.service.httpsName }} - port: {{ .Values.dmaapmediatorservice.service.internalPort2 }} - targetPort: {{ .Values.dmaapmediatorservice.service.targetPort2 }} - protocol: TCP - selector: - app: {{ include "common.namespace.nonrtric" . }}-{{ include "common.name.dmaapmediatorservice" . }} - release: {{ .Release.Name }} - type: ClusterIP diff --git a/nonrtric/helm/dmaapmediatorservice/templates/statefulset.yaml b/nonrtric/helm/dmaapmediatorservice/templates/statefulset.yaml deleted file mode 100644 index 3694754e..00000000 --- a/nonrtric/helm/dmaapmediatorservice/templates/statefulset.yaml +++ /dev/null @@ -1,82 +0,0 @@ -################################################################################ -# Copyright (c) 2021 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: StatefulSet -apiVersion: apps/v1 -metadata: - name: {{ include "common.name.dmaapmediatorservice" . }} - namespace: {{ include "common.namespace.nonrtric" . }} - generation: 1 - labels: - app: {{ include "common.namespace.nonrtric" . }}-{{ include "common.name.dmaapmediatorservice" . }} - chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }} - release: {{ .Release.Name }} - heritage: {{ .Release.Service }} - annotations: - deployment.kubernetes.io/revision: '1' -spec: - serviceName: {{ include "common.name.dmaapmediatorservice" . }} - replicas: 1 - selector: - matchLabels: - app: {{ include "common.namespace.nonrtric" . }}-{{ include "common.name.dmaapmediatorservice" . }} - release: {{ .Release.Name }} - template: - metadata: - labels: - app: {{ include "common.namespace.nonrtric" . }}-{{ include "common.name.dmaapmediatorservice" . }} - release: {{ .Release.Name }} - spec: - hostname: {{ include "common.name.dmaapmediatorservice" . }} - containers: - - name: {{ include "common.container.dmaapmediatorservice" . }} - image: {{ .Values.dmaapmediatorservice.image.registry }}/{{ .Values.dmaapmediatorservice.image.name }}:{{ .Values.dmaapmediatorservice.image.tag }} - imagePullPolicy: {{ .Values.dmaapmediatorservice.imagePullPolicy }} - ports: - - containerPort: {{ .Values.dmaapmediatorservice.service.targetPort1 }} - protocol: TCP - - containerPort: {{ .Values.dmaapmediatorservice.service.targetPort2 }} - protocol: TCP - 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 - subPath: type_config.json - - env: - - name: INFO_PRODUCER_HOST - value: https://{{ include "common.name.dmaapmediatorservice" . }} - - name: INFO_PRODUCER_PORT - value: "{{ .Values.dmaapmediatorservice.service.internalPort2 }}" - - name: INFO_COORD_ADDR - value: https://informationservice:9083 - - name: DMAAP_MR_ADDR - value: https://message-router.onap:3905 - - name: LOG_LEVEL - value: Info - volumes: - - name: {{ include "common.name.dmaapmediatorservice" . }}-dmaapmediator-data - configMap: - name: {{ include "common.name.dmaapmediatorservice" . }}-configmap-data diff --git a/nonrtric/helm/dmaapmediatorservice/values.yaml b/nonrtric/helm/dmaapmediatorservice/values.yaml deleted file mode 100644 index bec03b9a..00000000 --- a/nonrtric/helm/dmaapmediatorservice/values.yaml +++ /dev/null @@ -1,40 +0,0 @@ -################################################################################ -# Copyright (c) 2021 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 Dmaap Adapter Service. -# This is a YAML-formatted file. -# Declare variables to be passed into your templates. - -dmaapmediatorservice: - imagePullPolicy: IfNotPresent - image: - registry: "nexus3.o-ran-sc.org:10002/o-ran-sc" - name: "nonrtric-plt-dmaapmediatorproducer" - tag: 1.2.0 - service: - allowHttp: true - httpName: http - internalPort1: 8085 - targetPort1: 8085 - httpsName: https - internalPort2: 8185 - targetPort2: 8185 - liveness: - initialDelaySeconds: 20 - periodSeconds: 10 - readiness: - initialDelaySeconds: 20 - periodSeconds: 10 diff --git a/nonrtric/helm/helmmanager/.helmignore b/nonrtric/helm/helmmanager/.helmignore deleted file mode 100644 index 50af0317..00000000 --- a/nonrtric/helm/helmmanager/.helmignore +++ /dev/null @@ -1,22 +0,0 @@ -# Patterns to ignore when building packages. -# This supports shell glob matching, relative path matching, and -# negation (prefixed with !). Only one pattern per line. -.DS_Store -# Common VCS dirs -.git/ -.gitignore -.bzr/ -.bzrignore -.hg/ -.hgignore -.svn/ -# Common backup files -*.swp -*.bak -*.tmp -*~ -# Various IDEs -.project -.idea/ -*.tmproj -.vscode/ diff --git a/nonrtric/helm/helmmanager/Chart.yaml b/nonrtric/helm/helmmanager/Chart.yaml deleted file mode 100644 index ab2d5a04..00000000 --- a/nonrtric/helm/helmmanager/Chart.yaml +++ /dev/null @@ -1,21 +0,0 @@ -################################################################################ -# Copyright (c) 2021 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: "1.0.0" -description: A Helm chart for Helm Manager -name: helmmanager -version: 1.0.0 diff --git a/nonrtric/helm/helmmanager/requirements.yaml b/nonrtric/helm/helmmanager/requirements.yaml deleted file mode 100644 index 69b4db6d..00000000 --- a/nonrtric/helm/helmmanager/requirements.yaml +++ /dev/null @@ -1,20 +0,0 @@ -################################################################################ -# Copyright (c) 2021 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/helmmanager/templates/service.yaml b/nonrtric/helm/helmmanager/templates/service.yaml deleted file mode 100644 index 4fab625a..00000000 --- a/nonrtric/helm/helmmanager/templates/service.yaml +++ /dev/null @@ -1,36 +0,0 @@ -################################################################################ -# Copyright (c) 2021 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.helmmanager" . }} - namespace: {{ include "common.namespace.nonrtric" . }} - labels: - app: {{ include "common.namespace.nonrtric" . }}-{{ include "common.name.helmmanager" . }} - chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }} - release: {{ .Release.Name }} - heritage: {{ .Release.Service }} -spec: - ports: - - name: {{ index .Values.helmmanager.service.httpName }} - port: {{ .Values.helmmanager.service.internalPort1 }} - targetPort: {{ .Values.helmmanager.service.targetPort1 }} - protocol: TCP - selector: - app: {{ include "common.namespace.nonrtric" . }}-{{ include "common.name.helmmanager" . }} - release: {{ .Release.Name }} - type: ClusterIP diff --git a/nonrtric/helm/helmmanager/templates/serviceaccount.yaml b/nonrtric/helm/helmmanager/templates/serviceaccount.yaml deleted file mode 100644 index 0e5ea202..00000000 --- a/nonrtric/helm/helmmanager/templates/serviceaccount.yaml +++ /dev/null @@ -1,43 +0,0 @@ -################################################################################ -# Copyright (c) 2021 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 -kind: ServiceAccount -metadata: - name: {{ include "common.namespace.nonrtric" . }}-helm-manager-sa - namespace: {{ include "common.namespace.nonrtric" . }} - labels: - app: {{ include "common.namespace.nonrtric" . }}-{{ include "common.name.helmmanager" . }} - chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }} - release: {{ .Release.Name }} - heritage: {{ .Release.Service }} - annotations: - ---- -apiVersion: rbac.authorization.k8s.io/v1 -kind: ClusterRoleBinding -metadata: - name: {{ include "common.namespace.nonrtric" . }}-helm-manager-sa-clusterrolebinding - namespace: {{ include "common.namespace.nonrtric" . }} -subjects: -- kind: ServiceAccount - name: {{ include "common.namespace.nonrtric" . }}-helm-manager-sa - namespace: {{ include "common.namespace.nonrtric" . }} -roleRef: - kind: ClusterRole - name: {{ .Values.helmmanager.clusterRoleName }} - apiGroup: rbac.authorization.k8s.io \ No newline at end of file diff --git a/nonrtric/helm/helmmanager/templates/statefulset.yaml b/nonrtric/helm/helmmanager/templates/statefulset.yaml deleted file mode 100644 index d980ecba..00000000 --- a/nonrtric/helm/helmmanager/templates/statefulset.yaml +++ /dev/null @@ -1,73 +0,0 @@ -################################################################################ -# Copyright (c) 2021 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: StatefulSet -apiVersion: apps/v1 -metadata: - name: {{ include "common.name.helmmanager" . }} - namespace: {{ include "common.namespace.nonrtric" . }} - generation: 1 - labels: - app: {{ include "common.namespace.nonrtric" . }}-{{ include "common.name.helmmanager" . }} - chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }} - release: {{ .Release.Name }} - heritage: {{ .Release.Service }} - annotations: - -spec: - serviceName: {{ include "common.name.helmmanager" . }} - replicas: 1 - selector: - matchLabels: - app: {{ include "common.namespace.nonrtric" . }}-{{ include "common.name.helmmanager" . }} - release: {{ .Release.Name }} - template: - metadata: - labels: - app: {{ include "common.namespace.nonrtric" . }}-{{ include "common.name.helmmanager" . }} - release: {{ .Release.Name }} - spec: - hostname: {{ include "common.name.helmmanager" . }} - containers: - - name: {{ include "common.container.helmmanager" . }} - image: {{ .Values.helmmanager.image.registry }}/{{ .Values.helmmanager.image.name }}:{{ .Values.helmmanager.image.tag }} - imagePullPolicy: {{ .Values.helmmanager.imagePullPolicy }} - 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: - 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" - volumeClaimTemplates: - - metadata: - name: {{ include "common.name.helmmanager" . }}-vardata - spec: - accessModes: - - ReadWriteOnce - storageClassName: "{{ .Values.helmmanager.persistence.storageClassName }}" - resources: - requests: - storage: "{{ .Values.helmmanager.persistence.size }}" diff --git a/nonrtric/helm/helmmanager/values.yaml b/nonrtric/helm/helmmanager/values.yaml deleted file mode 100644 index 485210d1..00000000 --- a/nonrtric/helm/helmmanager/values.yaml +++ /dev/null @@ -1,40 +0,0 @@ -################################################################################ -# Copyright (c) 2021 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 Helm Manager -# This is a YAML-formatted file. -# Declare variables to be passed into your templates. - -helmmanager: - clusterRoleName: cluster-admin - imagePullPolicy: IfNotPresent - image: - registry: "nexus3.o-ran-sc.org:10002/o-ran-sc" - name: "nonrtric-plt-helmmanager" - tag: 1.3.0 - service: - httpName: http - internalPort1: 8112 - targetPort1: 8083 - liveness: - initialDelaySeconds: 20 - periodSeconds: 10 - readiness: - initialDelaySeconds: 20 - periodSeconds: 10 - persistence: - size: 1Gi - storageClassName: standard \ No newline at end of file diff --git a/nonrtric/helm/nonrtric/Chart.yaml b/nonrtric/helm/nonrtric/Chart.yaml index aec8e39d..a7d865d0 100644 --- a/nonrtric/helm/nonrtric/Chart.yaml +++ b/nonrtric/helm/nonrtric/Chart.yaml @@ -1,6 +1,6 @@ ################################################################################ # Copyright (c) 2020 Nordix Foundation. # -# Copyright (C) 2023 OpenInfra Foundation Europe. All rights reserved. # +# Copyright (C) 2023-2025 OpenInfra Foundation Europe. All rights reserved. # # # # Licensed under the Apache License, Version 2.0 (the "License"); # # you may not use this file except in compliance with the License. # @@ -51,16 +51,6 @@ dependencies: repository: "@local" condition: true - - name: rappcatalogueservice - version: ~1.0.0 - repository: "@local" - condition: nonrtric.installRappcatalogueservice - - - name: rappcatalogueenhancedservice - version: ~1.0.0 - repository: "@local" - condition: nonrtric.installRappcatalogueenhancedservice - - name: nonrtricgateway version: ~1.0.0 repository: "@local" @@ -71,26 +61,6 @@ dependencies: repository: "@local" condition: nonrtric.installDmaapadapterservice - - name: dmaapmediatorservice - version: ~1.0.0 - repository: "@local" - condition: nonrtric.installDmaapmediatorservice - - - name: helmmanager - version: ~1.0.0 - repository: "@local" - condition: nonrtric.installHelmmanager - - - name: ransliceassurance - version: ~1.0.0 - repository: "@local" - condition: nonrtric.installRansliceassurance - - - name: orufhrecovery - version: ~1.0.0 - repository: "@local" - condition: nonrtric.installOrufhrecovery - - name: capifcore version: ~1.0.0 repository: "@local" diff --git a/nonrtric/helm/orufhrecovery/Chart.yaml b/nonrtric/helm/orufhrecovery/Chart.yaml deleted file mode 100644 index 789a7050..00000000 --- a/nonrtric/helm/orufhrecovery/Chart.yaml +++ /dev/null @@ -1,21 +0,0 @@ -################################################################################ -# Copyright (c) 2021 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 oru closed loop recovery -name: orufhrecovery -version: 1.0.0 diff --git a/nonrtric/helm/orufhrecovery/requirements.yaml b/nonrtric/helm/orufhrecovery/requirements.yaml deleted file mode 100644 index 69b4db6d..00000000 --- a/nonrtric/helm/orufhrecovery/requirements.yaml +++ /dev/null @@ -1,20 +0,0 @@ -################################################################################ -# Copyright (c) 2021 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/orufhrecovery/resources/config/o-ru-to-o-du-map.csv b/nonrtric/helm/orufhrecovery/resources/config/o-ru-to-o-du-map.csv deleted file mode 100644 index 951337af..00000000 --- a/nonrtric/helm/orufhrecovery/resources/config/o-ru-to-o-du-map.csv +++ /dev/null @@ -1,11 +0,0 @@ -ERICSSON-O-RU-11220,HCL-O-DU-1122 -ERICSSON-O-RU-11221,HCL-O-DU-1122 -ERICSSON-O-RU-11222,HCL-O-DU-1122 -ERICSSON-O-RU-11223,HCL-O-DU-1122 -ERICSSON-O-RU-11223,HCL-O-DU-1122 -ERICSSON-O-RU-11224,HCL-O-DU-1123 -ERICSSON-O-RU-11225,HCL-O-DU-1123 -ERICSSON-O-RU-11226,HCL-O-DU-1123 -ERICSSON-O-RU-11227,HCL-O-DU-1124 -ERICSSON-O-RU-11228,HCL-O-DU-1125 -ERICSSON-O-RU-11229,HCL-O-DU-1125 \ No newline at end of file diff --git a/nonrtric/helm/orufhrecovery/templates/configmap.yaml b/nonrtric/helm/orufhrecovery/templates/configmap.yaml deleted file mode 100644 index 3882374a..00000000 --- a/nonrtric/helm/orufhrecovery/templates/configmap.yaml +++ /dev/null @@ -1,29 +0,0 @@ -################################################################################ -# Copyright (c) 2021 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 -kind: ConfigMap -metadata: - name: {{ include "common.name.orufhrecovery" . }}-configmap-config - namespace: {{ include "common.namespace.nonrtric" . }} - labels: - app: {{ include "common.namespace.nonrtric" . }}-{{ include "common.name.orufhrecovery" . }} - chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }} - release: {{ .Release.Name }} - heritage: {{ .Release.Service }} -data: -{{ tpl (.Files.Glob "resources/config/*").AsConfig . | indent 2 }} \ No newline at end of file diff --git a/nonrtric/helm/orufhrecovery/templates/deployment.yaml b/nonrtric/helm/orufhrecovery/templates/deployment.yaml deleted file mode 100644 index 0d975555..00000000 --- a/nonrtric/helm/orufhrecovery/templates/deployment.yaml +++ /dev/null @@ -1,78 +0,0 @@ -################################################################################ -# Copyright (c) 2021 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.orufhrecovery" . }} - namespace: {{ include "common.namespace.nonrtric" . }} - generation: 1 - labels: - app: {{ include "common.namespace.nonrtric" . }}-{{ include "common.name.orufhrecovery" . }} - 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.orufhrecovery" . }} - release: {{ .Release.Name }} - template: - metadata: - labels: - app: {{ include "common.namespace.nonrtric" . }}-{{ include "common.name.orufhrecovery" . }} - release: {{ .Release.Name }} - spec: - hostname: {{ include "common.name.orufhrecovery" . }} - containers: - - name: {{ include "common.container.orufhrecovery" . }} - image: {{ .Values.orufhrecovery.image.registry }}/{{ .Values.orufhrecovery.image.name }}:{{ .Values.orufhrecovery.image.tag }} - imagePullPolicy: {{ .Values.orufhrecovery.imagePullPolicy }} - ports: - - containerPort: 80 - protocol: TCP - env: - - name: CONSUMER_HOST - value: "{{ .Values.orufhrecovery.env.consumer_host }}" - - name: CONSUMER_PORT - value: "{{ .Values.orufhrecovery.env.consumer_port }}" - - name: CONSUMER_CERT_PATH - value: "{{ .Values.orufhrecovery.env.consumer_cert_path }}" - - name: CONSUMER_KEY_PATH - value: "{{ .Values.orufhrecovery.env.consumer_key_path }}" - - name: INFO_COORD_ADDR - value: "{{ .Values.orufhrecovery.env.info_coord_addr }}" - - name: SDNR_ADDR - value: "{{ .Values.orufhrecovery.env.sdnr_address }}" - - name: SDNR_USER - value: "{{ .Values.orufhrecovery.env.sdnr_user }}" - - name: SDNR_PASSWORD - value: "{{ .Values.orufhrecovery.env.sdnr_password }}" - - name: ORU_TO_ODU_MAP_FILE - value: "{{ .Values.orufhrecovery.env.oru_to_odu_map_file }}" - - name: LOG_LEVEL - value: "{{ .Values.orufhrecovery.env.log_level }}" - volumeMounts: - - name: {{ include "common.name.orufhrecovery" . }}-oru-config - mountPath: "/app/o-ru-to-o-du-map.csv" - subPath: "o-ru-to-o-du-map.csv" - volumes: - - name: {{ include "common.name.orufhrecovery" . }}-oru-config - configMap: - name: {{ include "common.name.orufhrecovery" . }}-configmap-config diff --git a/nonrtric/helm/orufhrecovery/templates/service.yaml b/nonrtric/helm/orufhrecovery/templates/service.yaml deleted file mode 100644 index 3cf88e18..00000000 --- a/nonrtric/helm/orufhrecovery/templates/service.yaml +++ /dev/null @@ -1,37 +0,0 @@ -################################################################################ -# Copyright (c) 2021 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.orufhrecovery" . }} - namespace: {{ include "common.namespace.nonrtric" . }} - labels: - app: {{ include "common.namespace.nonrtric" . }}-{{ include "common.name.orufhrecovery" . }} - chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }} - release: {{ .Release.Name }} - heritage: {{ .Release.Service }} -spec: - ports: - {{if eq .Values.orufhrecovery.service.allowHttp true -}} - - name: {{ index .Values.orufhrecovery.service.httpName }} - port: {{ .Values.orufhrecovery.service.port }} - protocol: TCP - {{- end }} - selector: - app: {{ include "common.namespace.nonrtric" . }}-{{ include "common.name.orufhrecovery" . }} - release: {{ .Release.Name }} - type: ClusterIP diff --git a/nonrtric/helm/orufhrecovery/values.yaml b/nonrtric/helm/orufhrecovery/values.yaml deleted file mode 100644 index 4e73cc9b..00000000 --- a/nonrtric/helm/orufhrecovery/values.yaml +++ /dev/null @@ -1,41 +0,0 @@ -################################################################################ -# Copyright (c) 2021 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 oru closed loop recovery. -# This is a YAML-formatted file. -# Declare variables to be passed into your templates. - -orufhrecovery: - imagePullPolicy: IfNotPresent - image: - registry: 'nexus3.o-ran-sc.org:10002/o-ran-sc' - name: nonrtric-rapp-orufhrecovery-consumer - tag: 1.1.0 - service: - httpName: web - allowHttp: true - port: 80 - env: - consumer_host: "http://mrproducer" - consumer_port: "8095" - 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" - sdnr_password: "Kp8bJ4SXszM0WXlhak3eHlcse2gAw84vaoGGmJvUy2U" - oru_to_odu_map_file: "o-ru-to-o-du-map.csv" - log_level: "Info" diff --git a/nonrtric/helm/ransliceassurance/Chart.yaml b/nonrtric/helm/ransliceassurance/Chart.yaml deleted file mode 100644 index 2043c140..00000000 --- a/nonrtric/helm/ransliceassurance/Chart.yaml +++ /dev/null @@ -1,21 +0,0 @@ -################################################################################ -# Copyright (c) 2021 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 odu slice assurance -name: ransliceassurance -version: 1.0.0 diff --git a/nonrtric/helm/ransliceassurance/requirements.yaml b/nonrtric/helm/ransliceassurance/requirements.yaml deleted file mode 100644 index 69b4db6d..00000000 --- a/nonrtric/helm/ransliceassurance/requirements.yaml +++ /dev/null @@ -1,20 +0,0 @@ -################################################################################ -# Copyright (c) 2021 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/ransliceassurance/templates/deployment.yaml b/nonrtric/helm/ransliceassurance/templates/deployment.yaml deleted file mode 100644 index fd9e3466..00000000 --- a/nonrtric/helm/ransliceassurance/templates/deployment.yaml +++ /dev/null @@ -1,67 +0,0 @@ -################################################################################ -# Copyright (c) 2021 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.ransliceassurance" . }} - namespace: {{ include "common.namespace.nonrtric" . }} - generation: 1 - labels: - app: {{ include "common.namespace.nonrtric" . }}-{{ include "common.name.ransliceassurance" . }} - 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.ransliceassurance" . }} - release: {{ .Release.Name }} - template: - metadata: - labels: - app: {{ include "common.namespace.nonrtric" . }}-{{ include "common.name.ransliceassurance" . }} - release: {{ .Release.Name }} - spec: - hostname: {{ include "common.name.ransliceassurance" . }} - containers: - - name: {{ include "common.container.ransliceassurance" . }} - image: {{ .Values.ransliceassurance.image.registry }}/{{ .Values.ransliceassurance.image.name }}:{{ .Values.ransliceassurance.image.tag }} - imagePullPolicy: {{ .Values.ransliceassurance.imagePullPolicy }} - ports: - - containerPort: 80 - protocol: TCP - env: - - name: MR_HOST - value: "{{ .Values.ransliceassurance.env.mr_host }}" - - name: MR_PORT - value: "{{ .Values.ransliceassurance.env.mr_port }}" - - name: SDNR_ADDRESS - value: "{{ .Values.ransliceassurance.env.sdnr_address }}" - - name: SDNR_USER - value: "{{ .Values.ransliceassurance.env.sdnr_user }}" - - name: SDNR_PASSWORD - value: "{{ .Values.ransliceassurance.env.sdnr_password }}" - - name: LOG_LEVEL - 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/templates/service.yaml b/nonrtric/helm/ransliceassurance/templates/service.yaml deleted file mode 100644 index a0a5b841..00000000 --- a/nonrtric/helm/ransliceassurance/templates/service.yaml +++ /dev/null @@ -1,37 +0,0 @@ -################################################################################ -# Copyright (c) 2021 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.ransliceassurance" . }} - namespace: {{ include "common.namespace.nonrtric" . }} - labels: - app: {{ include "common.namespace.nonrtric" . }}-{{ include "common.name.ransliceassurance" . }} - chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }} - release: {{ .Release.Name }} - heritage: {{ .Release.Service }} -spec: - ports: - {{if eq .Values.ransliceassurance.service.allowHttp true -}} - - name: {{ index .Values.ransliceassurance.service.httpName }} - port: {{ .Values.ransliceassurance.service.port }} - protocol: TCP - {{- end }} - selector: - app: {{ include "common.namespace.nonrtric" . }}-{{ include "common.name.ransliceassurance" . }} - release: {{ .Release.Name }} - type: ClusterIP diff --git a/nonrtric/helm/ransliceassurance/values.yaml b/nonrtric/helm/ransliceassurance/values.yaml deleted file mode 100644 index 4e483d83..00000000 --- a/nonrtric/helm/ransliceassurance/values.yaml +++ /dev/null @@ -1,39 +0,0 @@ -################################################################################ -# Copyright (c) 2021 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 odu slice assurance. -# This is a YAML-formatted file. -# Declare variables to be passed into your templates. - -ransliceassurance: - imagePullPolicy: IfNotPresent - image: - registry: 'nexus3.o-ran-sc.org:10002/o-ran-sc' - name: nonrtric-rapp-ransliceassurance - tag: 1.3.0 - service: - httpName: web - allowHttp: true - port: 80 - env: - mr_host: "http://onap-dmaap" - mr_port: "3904" - sdnr_address: "http://sdnr:8181" - sdnr_user: "admin" - 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 deleted file mode 100644 index 2695c8cf..00000000 --- a/nonrtric/helm/rappcatalogueenhancedservice/Chart.yaml +++ /dev/null @@ -1,21 +0,0 @@ -################################################################################ -# 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 deleted file mode 100644 index 25a3e897..00000000 --- a/nonrtric/helm/rappcatalogueenhancedservice/requirements.yaml +++ /dev/null @@ -1,20 +0,0 @@ -################################################################################ -# 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 deleted file mode 100644 index d55fcdcc..00000000 --- a/nonrtric/helm/rappcatalogueenhancedservice/templates/deployment.yaml +++ /dev/null @@ -1,59 +0,0 @@ -################################################################################ -# 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 deleted file mode 100644 index d1ba4820..00000000 --- a/nonrtric/helm/rappcatalogueenhancedservice/templates/service.yaml +++ /dev/null @@ -1,38 +0,0 @@ -################################################################################ -# 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 deleted file mode 100644 index bddf6790..00000000 --- a/nonrtric/helm/rappcatalogueenhancedservice/values.yaml +++ /dev/null @@ -1,38 +0,0 @@ -# ============LICENSE_START================================================ -# Copyright (C) 2022-2023 Nordix Foundation. All rights reserved. -# Copyright (C) 2023-2024 OpenInfra Foundation Europe. All rights reserved. -# ========================================================================= -# 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. -# ============LICENSE_END================================================== - -# 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.2.0 - service: - allowHttp: true - httpName: http - internalPort: 9696 - targetPort: 9696 - liveness: - initialDelaySeconds: 20 - periodSeconds: 10 - readiness: - initialDelaySeconds: 20 - periodSeconds: 10 diff --git a/nonrtric/helm/rappcatalogueservice/Chart.yaml b/nonrtric/helm/rappcatalogueservice/Chart.yaml deleted file mode 100644 index 4482422d..00000000 --- a/nonrtric/helm/rappcatalogueservice/Chart.yaml +++ /dev/null @@ -1,21 +0,0 @@ -################################################################################ -# 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. # -################################################################################ - -apiVersion: v1 -appVersion: "2.0.0" -description: A Helm chart for rAPP Catalogue Service -name: rappcatalogueservice -version: 1.0.0 diff --git a/nonrtric/helm/rappcatalogueservice/requirements.yaml b/nonrtric/helm/rappcatalogueservice/requirements.yaml deleted file mode 100644 index f3b3ecd4..00000000 --- a/nonrtric/helm/rappcatalogueservice/requirements.yaml +++ /dev/null @@ -1,20 +0,0 @@ -################################################################################ -# 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. # -################################################################################ - -dependencies: - - name: nonrtric-common - version: ^2.0.0 - repository: "@local" diff --git a/nonrtric/helm/rappcatalogueservice/templates/deployment.yaml b/nonrtric/helm/rappcatalogueservice/templates/deployment.yaml deleted file mode 100644 index 95304c5d..00000000 --- a/nonrtric/helm/rappcatalogueservice/templates/deployment.yaml +++ /dev/null @@ -1,61 +0,0 @@ -################################################################################ -# 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. # -################################################################################ - -kind: Deployment -apiVersion: apps/v1 -metadata: - name: {{ include "common.name.rappcatalogueservice" . }} - namespace: {{ include "common.namespace.nonrtric" . }} - generation: 1 - labels: - app: {{ include "common.namespace.nonrtric" . }}-{{ include "common.name.rappcatalogueservice" . }} - 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.rappcatalogueservice" . }} - release: {{ .Release.Name }} - template: - metadata: - labels: - app: {{ include "common.namespace.nonrtric" . }}-{{ include "common.name.rappcatalogueservice" . }} - release: {{ .Release.Name }} - spec: - hostname: {{ include "common.name.rappcatalogueservice" . }} - containers: - - name: {{ include "common.container.rappcatalogueservice" . }} - image: {{ .Values.rappcatalogueservice.image.registry }}/{{ .Values.rappcatalogueservice.image.name }}:{{ .Values.rappcatalogueservice.image.tag }} - imagePullPolicy: {{ .Values.rappcatalogueservice.imagePullPolicy }} - ports: - - containerPort: {{ .Values.rappcatalogueservice.service.targetPort1 }} - protocol: TCP - - containerPort: {{ .Values.rappcatalogueservice.service.targetPort2 }} - protocol: TCP - readinessProbe: - tcpSocket: - port: {{ .Values.rappcatalogueservice.service.targetPort1 }} - initialDelaySeconds: {{ .Values.rappcatalogueservice.liveness.initialDelaySeconds }} - periodSeconds: {{ .Values.rappcatalogueservice.liveness.periodSeconds }} - livenessProbe: - tcpSocket: - port: {{ .Values.rappcatalogueservice.service.targetPort1 }} - initialDelaySeconds: {{ .Values.rappcatalogueservice.liveness.initialDelaySeconds }} - periodSeconds: {{ .Values.rappcatalogueservice.liveness.periodSeconds }} diff --git a/nonrtric/helm/rappcatalogueservice/templates/service.yaml b/nonrtric/helm/rappcatalogueservice/templates/service.yaml deleted file mode 100644 index 2c056eb5..00000000 --- a/nonrtric/helm/rappcatalogueservice/templates/service.yaml +++ /dev/null @@ -1,42 +0,0 @@ -################################################################################ -# 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. # -################################################################################ - -kind: Service -apiVersion: v1 -metadata: - name: {{ include "common.name.rappcatalogueservice" . }} - namespace: {{ include "common.namespace.nonrtric" . }} - labels: - app: {{ include "common.namespace.nonrtric" . }}-{{ include "common.name.rappcatalogueservice" . }} - chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }} - release: {{ .Release.Name }} - heritage: {{ .Release.Service }} -spec: - ports: - {{if eq .Values.rappcatalogueservice.service.allowHttp true -}} - - name: {{ index .Values.rappcatalogueservice.service.httpName }} - port: {{ .Values.rappcatalogueservice.service.internalPort1 }} - targetPort: {{ .Values.rappcatalogueservice.service.targetPort1 }} - protocol: TCP - {{- end }} - - name: {{ index .Values.rappcatalogueservice.service.httpsName }} - port: {{ .Values.rappcatalogueservice.service.internalPort2 }} - targetPort: {{ .Values.rappcatalogueservice.service.targetPort2 }} - protocol: TCP - selector: - app: {{ include "common.namespace.nonrtric" . }}-{{ include "common.name.rappcatalogueservice" . }} - release: {{ .Release.Name }} - type: ClusterIP diff --git a/nonrtric/helm/rappcatalogueservice/values.yaml b/nonrtric/helm/rappcatalogueservice/values.yaml deleted file mode 100644 index f2d03aca..00000000 --- a/nonrtric/helm/rappcatalogueservice/values.yaml +++ /dev/null @@ -1,40 +0,0 @@ -################################################################################ -# 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. # -################################################################################ - -# Default values for rAPP Catalogue Service. -# This is a YAML-formatted file. -# Declare variables to be passed into your templates. - -rappcatalogueservice: - imagePullPolicy: IfNotPresent - image: - registry: 'nexus3.o-ran-sc.org:10002/o-ran-sc' - name: nonrtric-plt-rappcatalogue - tag: 1.2.0 - service: - allowHttp: true - httpName: http - internalPort1: 9080 - targetPort1: 8680 - httpsName: https - internalPort2: 9081 - targetPort2: 8633 - liveness: - initialDelaySeconds: 20 - periodSeconds: 10 - readiness: - initialDelaySeconds: 20 - periodSeconds: 10 -- 2.16.6