From: aravind.est Date: Tue, 18 Mar 2025 17:22:14 +0000 (+0000) Subject: Clenaup NONRTRIC charts in oran_oom X-Git-Tag: l-release~38 X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=commitdiff_plain;h=5f4f598476b357cad58d25af1c7174f87407c088;p=it%2Fdep.git Clenaup NONRTRIC charts in oran_oom NONRTRIC charts and scrips cleaned up in oran_oom folder. Issue-ID: NONRTRIC-1058 Change-Id: I0c461f16131fc28dc18e8c3a1f5e11c128f79da4 Signed-off-by: aravind.est --- diff --git a/smo-install/helm-override/cnf/oran-override.yaml b/smo-install/helm-override/cnf/oran-override.yaml index b159e965..91159b61 100644 --- a/smo-install/helm-override/cnf/oran-override.yaml +++ b/smo-install/helm-override/cnf/oran-override.yaml @@ -1,6 +1,6 @@ # Copyright © 2017 Amdocs, Bell Canada # Mofification Copyright © 2021 AT&T -# 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. @@ -31,16 +31,10 @@ nonrtric: installA1simulator: true installControlpanel: true installInformationservice: true - installRappcatalogueservice: true installNonrtricgateway: true installKong: true - installORUApp: true - installODUSMOApp: true - installODUICSApp: true installTopology: true installDmaapadapterservice: true - installDmaapmediatorservice: true - installHelmmanager: true installrAppmanager: true installCapifcore: true installServicemanager: true @@ -90,27 +84,10 @@ kong: admin: enabled: true -helmmanager: - persistence: - # Either refer to a volume created under the nonrtric by storageClassName. Then the claimed si> - # The alternative use a dynamic volume provisioner in the cluster. Storage class can then be f> - storageClassName: helmmanager-storage - controlpanel: ingress: enabled: false -oru-app: - simulators: - - simRu: o-ru-11221 - simDu: o-du-1122 - - simRu: o-ru-11222 - simDu: o-du-1122 - - simRu: o-ru-11223 - simDu: o-du-1122 - - simRu: o-ru-11211 - simDu: o-du-1121 - a1simulator: a1Sims: - name: a1-sim-osc-0 diff --git a/smo-install/helm-override/default/oran-override.yaml b/smo-install/helm-override/default/oran-override.yaml index fd611afc..41bd2490 100644 --- a/smo-install/helm-override/default/oran-override.yaml +++ b/smo-install/helm-override/default/oran-override.yaml @@ -1,6 +1,6 @@ # Copyright © 2017 Amdocs, Bell Canada # Mofification Copyright © 2021 AT&T -# Modifcation Copyright (C) 2024 OpenInfra Foundation Europe. All rights reserved. +# Modifcation 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. @@ -31,16 +31,10 @@ nonrtric: installA1simulator: true installControlpanel: true installInformationservice: true - installRappcatalogueservice: true installNonrtricgateway: true installKong: true - installORUApp: true - installODUSMOApp: true - installODUICSApp: true installTopology: true installDmaapadapterservice: true - installDmaapmediatorservice: true - installHelmmanager: true installrAppmanager: true installCapifcore: true installServicemanager: true @@ -90,27 +84,10 @@ kong: admin: enabled: true -helmmanager: - persistence: - # Either refer to a volume created under the nonrtric by storageClassName. Then the claimed si> - # The alternative use a dynamic volume provisioner in the cluster. Storage class can then be f> - storageClassName: helmmanager-storage - controlpanel: ingress: enabled: false -oru-app: - simulators: - - simRu: o-ru-11221 - simDu: o-du-1122 - - simRu: o-ru-11222 - simDu: o-du-1122 - - simRu: o-ru-11223 - simDu: o-du-1122 - - simRu: o-ru-11211 - simDu: o-du-1121 - a1simulator: a1Sims: - name: a1-sim-osc-0 diff --git a/smo-install/helm-override/pythonsdk-tests/oran-override.yaml b/smo-install/helm-override/pythonsdk-tests/oran-override.yaml index 50634ccf..43235d52 100644 --- a/smo-install/helm-override/pythonsdk-tests/oran-override.yaml +++ b/smo-install/helm-override/pythonsdk-tests/oran-override.yaml @@ -1,6 +1,6 @@ # Copyright © 2017 Amdocs, Bell Canada # Mofification Copyright © 2021 AT&T -# Modification Copyright (C) 2024 OpenInfra Foundation Europe. All rights reserved. +# Modification 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. @@ -31,16 +31,10 @@ nonrtric: installA1simulator: true installControlpanel: true installInformationservice: true - installRappcatalogueservice: true installNonrtricgateway: true installKong: true - installORUApp: false - installODUSMOApp: false - installODUICSApp: false installTopology: true installDmaapadapterservice: true - installDmaapmediatorservice: true - installHelmmanager: true installrAppmanager: true installCapifcore: true installServicemanager: true @@ -90,27 +84,10 @@ kong: admin: enabled: true -helmmanager: - persistence: - # Either refer to a volume created under the nonrtric by storageClassName. Then the claimed si> - # The alternative use a dynamic volume provisioner in the cluster. Storage class can then be f> - storageClassName: helmmanager-storage - controlpanel: ingress: enabled: false -oru-app: - simulators: - - simRu: o-ru-11221 - simDu: o-du-1122 - - simRu: o-ru-11222 - simDu: o-du-1122 - - simRu: o-ru-11223 - simDu: o-du-1122 - - simRu: o-ru-11211 - simDu: o-du-1121 - a1simulator: a1Sims: - name: a1-sim-osc-0 diff --git a/smo-install/helm-override/standalone-nonrtric/oran-override.yaml b/smo-install/helm-override/standalone-nonrtric/oran-override.yaml index eb5a7a20..54d2c2d4 100644 --- a/smo-install/helm-override/standalone-nonrtric/oran-override.yaml +++ b/smo-install/helm-override/standalone-nonrtric/oran-override.yaml @@ -1,6 +1,6 @@ # ============LICENSE_START=============================================== # Copyright (C) 2022-2023 Nordix Foundation. All rights reserved. -# 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. @@ -32,16 +32,10 @@ nonrtric: installA1simulator: true installControlpanel: true installInformationservice: true - installRappcatalogueservice: true installNonrtricgateway: true installKong: false - installORUApp: false - installODUSMOApp: false - installODUICSApp: false installTopology: false installDmaapadapterservice: true - installDmaapmediatorservice: true - installHelmmanager: true installrAppmanager: true installDmeParticipant: true # override default mount path root directory @@ -92,13 +86,6 @@ kong: admin: enabled: true -helmmanager: - helmmanager: - persistence: - # Either refer to a volume created under the nonrtric by storageClassName. Then the claimed si> - # The alternative use a dynamic volume provisioner in the cluster. Storage class can then be f> - storageClassName: helmmanager-storage - controlpanel: controlpanel: ingress: diff --git a/smo-install/oran_oom/dmaapmediatorservice/.helmignore b/smo-install/oran_oom/dmaapmediatorservice/.helmignore deleted file mode 100644 index 50af0317..00000000 --- a/smo-install/oran_oom/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/smo-install/oran_oom/dmaapmediatorservice/Chart.yaml b/smo-install/oran_oom/dmaapmediatorservice/Chart.yaml deleted file mode 100644 index 3abc57f9..00000000 --- a/smo-install/oran_oom/dmaapmediatorservice/Chart.yaml +++ /dev/null @@ -1,26 +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: v2 -appVersion: "1.0.0" -description: A Helm chart for Dmaap Mediator Service -name: dmaapmediatorservice -version: 1.0.0 - -dependencies: - - name: nonrtric-common - version: ^2.0.0 - repository: "@local" diff --git a/smo-install/oran_oom/dmaapmediatorservice/resources/dmaap-topic-init.sh b/smo-install/oran_oom/dmaapmediatorservice/resources/dmaap-topic-init.sh deleted file mode 100644 index be8c6c8f..00000000 --- a/smo-install/oran_oom/dmaapmediatorservice/resources/dmaap-topic-init.sh +++ /dev/null @@ -1,27 +0,0 @@ -#!/bin/sh -################################################################################ -# Copyright (c) 2024 NYCU WINLab. # -# # -# 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. # -################################################################################ - -topics='{{ .Values.dmaapTopicInit.topics | toRawJson }}' - -echo $topics | jq -c '.[]' | while read -r obj; do - curl -X POST -H "Content-Type: application/json" -d "$obj" {{ .Values.dmaapTopicInit.dmaapMrAddr }}/topics/create - response=$? - if [ $response -ne 0 ]; then - echo "Failed to create topic $obj" - exit 1 - fi -done diff --git a/smo-install/oran_oom/dmaapmediatorservice/templates/_helpers.tpl b/smo-install/oran_oom/dmaapmediatorservice/templates/_helpers.tpl deleted file mode 100644 index 4f3b0b1e..00000000 --- a/smo-install/oran_oom/dmaapmediatorservice/templates/_helpers.tpl +++ /dev/null @@ -1,47 +0,0 @@ -{{/* -################################################################################ -# Copyright (c) 2024 NYCU WINLab. # -# # -# 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 "dmaapTopic.initContainer" -}} -- name: dmaap-topic-init - image: alpine:3.19.1 - command: - - sh - - -c - - apk add --no-cache curl jq; sh /app/dmaap-topic-init.sh; - volumeMounts: - - name: dmaap-topic-init - mountPath: /app -{{- end -}} - -{{- define "dmaapTopic.initConfigMap" -}} -apiVersion: v1 -kind: ConfigMap -metadata: - name: {{ include "common.name" . }}-dmaap-topic-init - namespace: {{ include "common.namespace" . }} - labels: {{- include "common.labels" . | nindent 4 }} -data: - dmaap-topic-init.sh: | - {{- tpl (.Files.Get "resources/dmaap-topic-init.sh") . | nindent 4 }} -{{- end }} - -{{- define "dmaapTopic.initVolume" -}} -- name: dmaap-topic-init - configMap: - name: {{ include "common.name" . }}-dmaap-topic-init -{{- end }} diff --git a/smo-install/oran_oom/dmaapmediatorservice/templates/configmap.yaml b/smo-install/oran_oom/dmaapmediatorservice/templates/configmap.yaml deleted file mode 100644 index 2dce181f..00000000 --- a/smo-install/oran_oom/dmaapmediatorservice/templates/configmap.yaml +++ /dev/null @@ -1,28 +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: {{ include "common.resourceMetadata" (dict "suffix" "type-configmap" "dot" . ) | nindent 2 }} -data: - type_config.json: | - {{- (dict "types" .Values.types) | toRawJson | nindent 4 }} ---- -{{ if .Values.dmaapTopicInit.enabled -}} -{{ include "dmaapTopic.initConfigMap" . }} ---- -{{- end -}} diff --git a/smo-install/oran_oom/dmaapmediatorservice/templates/service.yaml b/smo-install/oran_oom/dmaapmediatorservice/templates/service.yaml deleted file mode 100644 index 48461ebd..00000000 --- a/smo-install/oran_oom/dmaapmediatorservice/templates/service.yaml +++ /dev/null @@ -1,17 +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. # -################################################################################ - -{{ include "common.service" . }} diff --git a/smo-install/oran_oom/dmaapmediatorservice/templates/statefulset.yaml b/smo-install/oran_oom/dmaapmediatorservice/templates/statefulset.yaml deleted file mode 100644 index e3211e24..00000000 --- a/smo-install/oran_oom/dmaapmediatorservice/templates/statefulset.yaml +++ /dev/null @@ -1,59 +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: {{- include "common.resourceMetadata" . | nindent 2 }} -spec: - serviceName: {{ include "common.name" . }} - replicas: 1 - selector: {{- include "common.selectors" . | nindent 4 }} - template: - metadata: {{- include "common.templateMetadata" . | nindent 6 }} - spec: - hostname: {{ include "common.name" . }} - {{- if .Values.dmaapTopicInit.enabled }} - initContainers: {{- include "dmaapTopic.initContainer" . | nindent 6 }} - {{- end }} - containers: - - name: {{ include "common.containername" . }} - image: {{ .Values.image.registry }}/{{ .Values.image.name }}:{{ .Values.image.tag }} - imagePullPolicy: {{ .Values.imagePullPolicy }} - ports: {{- include "common.containerPorts" . | nindent 8 }} - {{- /* Only the info producer port is active */ -}} - {{- include "common.tcpsocketProbes" (dict "port" ((first .Values.service.ports).internalPort_tls) "dot" .) | nindent 8 }} - volumeMounts: - - name: {{ include "common.name" . }}-dmaapmediator-data - mountPath: /configs/type_config.json - subPath: type_config.json - env: - - name: INFO_PRODUCER_HOST - value: "{{ default (print "https://" ( include "common.name" . )) .Values.infoProducerHost }}" - - name: INFO_PRODUCER_PORT - value: "{{ default (first .Values.service.ports).internalPort_tls .Values.infoProducerPort }}" - - name: INFO_COORD_ADDR - value: "{{ .Values.infoCoordinatorAddr }}" - - name: DMAAP_MR_ADDR - value: "{{ .Values.dmaapMrAddr }}" - - name: LOG_LEVEL - value: "{{ .Values.logLevel }}" - volumes: - - name: {{ include "common.name" . }}-dmaapmediator-data - configMap: - name: {{ include "common.name" . }}-type-configmap - {{- if .Values.dmaapTopicInit.enabled -}} - {{- include "dmaapTopic.initVolume" . | nindent 8 }} - {{- end }} diff --git a/smo-install/oran_oom/dmaapmediatorservice/values.yaml b/smo-install/oran_oom/dmaapmediatorservice/values.yaml deleted file mode 100644 index 7acf5e66..00000000 --- a/smo-install/oran_oom/dmaapmediatorservice/values.yaml +++ /dev/null @@ -1,63 +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. - -imagePullPolicy: IfNotPresent -image: - registry: "nexus3.o-ran-sc.org:10002/o-ran-sc" - name: "nonrtric-plt-dmaapmediatorproducer" - tag: 1.2.0 -service: - type: ClusterIP - ports: - - name: http - internalPort: 8085 - targetPort: 8085 - name_tls: https - internalPort_tls: 8185 - targetPort_tls: 8185 -liveness: - initialDelaySeconds: 20 - periodSeconds: 10 -readiness: - initialDelaySeconds: 20 - periodSeconds: 10 - -logLevel: INFO -dmaapMrAddr: http://message-router.onap:3904 -infoCoordinatorAddr: https://informationservice:9083 - -types: - - id: STD_Fault_Messages - dmaapTopicUrl: "/events/unauthenticated.dmaapmed.json/dmaapmediatorproducer/STD_Fault_Messages?timeout=15000&limit=100" - - id: VES_Fault_Messages - dmaapTopicUrl: "/events/unauthenticated.SEC_FAULT_OUTPUT/dmaapmediatorproducer/VES_Fault_Messages?timeout=15000&limit=100" - -dmaapTopicInit: - enabled: true - dmaapMrAddr: http://message-router.onap:3904 - topics: - - topicName: unauthenticated.dmaapmed.json - topicDescription: STD_Fault_Messages - partitionCount: 1 - replicationCount: 1 - - topicName: unauthenticated.SEC_FAULT_OUTPUT - topicDescription: VES_Fault_Messages - partitionCount: 1 - replicationCount: 1 diff --git a/smo-install/oran_oom/helmmanager/.helmignore b/smo-install/oran_oom/helmmanager/.helmignore deleted file mode 100644 index 50af0317..00000000 --- a/smo-install/oran_oom/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/smo-install/oran_oom/helmmanager/Chart.yaml b/smo-install/oran_oom/helmmanager/Chart.yaml deleted file mode 100644 index 26aa796c..00000000 --- a/smo-install/oran_oom/helmmanager/Chart.yaml +++ /dev/null @@ -1,25 +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: v2 -appVersion: "1.0.0" -description: A Helm chart for Helm Manager -name: helmmanager -version: 1.0.0 - -dependencies: - - name: nonrtric-common - version: ^2.0.0 - repository: "@local" diff --git a/smo-install/oran_oom/helmmanager/templates/service.yaml b/smo-install/oran_oom/helmmanager/templates/service.yaml deleted file mode 100644 index 48461ebd..00000000 --- a/smo-install/oran_oom/helmmanager/templates/service.yaml +++ /dev/null @@ -1,17 +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. # -################################################################################ - -{{ include "common.service" . }} diff --git a/smo-install/oran_oom/helmmanager/templates/serviceaccount.yaml b/smo-install/oran_oom/helmmanager/templates/serviceaccount.yaml deleted file mode 100644 index a2f4242c..00000000 --- a/smo-install/oran_oom/helmmanager/templates/serviceaccount.yaml +++ /dev/null @@ -1,38 +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" . }}-helm-manager-sa - namespace: {{ include "common.namespace" . }} - labels: {{- include "common.labels" . | nindent 4 }} ---- -apiVersion: rbac.authorization.k8s.io/v1 -kind: ClusterRoleBinding -metadata: - name: {{ include "common.namespace" . }}-helm-manager-sa-clusterrolebinding - namespace: {{ include "common.namespace" . }} - labels: {{- include "common.labels" . | nindent 4 }} -subjects: -- kind: ServiceAccount - name: {{ include "common.namespace" . }}-helm-manager-sa - namespace: {{ include "common.namespace" . }} -roleRef: - kind: ClusterRole - name: {{ .Values.clusterRoleName }} - apiGroup: rbac.authorization.k8s.io diff --git a/smo-install/oran_oom/helmmanager/templates/statefulset.yaml b/smo-install/oran_oom/helmmanager/templates/statefulset.yaml deleted file mode 100644 index 25e361c3..00000000 --- a/smo-install/oran_oom/helmmanager/templates/statefulset.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: StatefulSet -apiVersion: apps/v1 -metadata: {{- include "common.resourceMetadata" . | nindent 2 }} -spec: - serviceName: {{ include "common.name" . }} - replicas: 1 - selector: {{- include "common.selectors" . | nindent 4 }} - template: - metadata: {{- include "common.templateMetadata" . | nindent 6 }} - spec: - hostname: {{ include "common.name" . }} - containers: - - name: {{ include "common.containername" . }} - image: {{ .Values.image.registry }}/{{ .Values.image.name }}:{{ .Values.image.tag }} - imagePullPolicy: {{ .Values.imagePullPolicy }} - ports: {{- include "common.containerPorts" . | nindent 8 }} - {{- include "common.tcpsocketProbes" . | nindent 8 }} - volumeMounts: - - name: {{ include "common.vardataMountName" . }} - mountPath: "/var/helm-manager-service" - volumeClaimTemplates: {{- include "common.vardataVolumeClaimTemplate" . | nindent 4 }} diff --git a/smo-install/oran_oom/helmmanager/values.yaml b/smo-install/oran_oom/helmmanager/values.yaml deleted file mode 100644 index d21d38c7..00000000 --- a/smo-install/oran_oom/helmmanager/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 Helm Manager -# This is a YAML-formatted file. -# Declare variables to be passed into your templates. - -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: - type: ClusterIP - ports: - - name: http - internalPort: "8112" - targetPort: "8083" -liveness: - initialDelaySeconds: 20 - periodSeconds: 10 -readiness: - initialDelaySeconds: 20 - periodSeconds: 10 -persistence: - size: 1Gi - storageClassName: standard diff --git a/smo-install/oran_oom/nonrtric/Chart.yaml b/smo-install/oran_oom/nonrtric/Chart.yaml index 5462a683..c6d6a5ea 100644 --- a/smo-install/oran_oom/nonrtric/Chart.yaml +++ b/smo-install/oran_oom/nonrtric/Chart.yaml @@ -1,5 +1,5 @@ # ============LICENSE_START======================================================== -# Modification Copyright (C) 2024 OpenInfra Foundation Europe. All rights reserved. +# Modification 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. @@ -54,46 +54,16 @@ dependencies: version: ^2.0.0 repository: "@local" - - name: rappcatalogueservice - version: ~1.0.0 - repository: "@local" - condition: nonrtric.installRappcatalogueservice - - name: nonrtricgateway version: ~1.0.0 repository: "@local" condition: nonrtric.installNonrtricgateway - - name: oru-app - version: ~1.0.0 - repository: "@local" - condition: nonrtric.installORUApp - - - name: odu-app - version: ~1.0.0 - repository: "@local" - condition: nonrtric.installODUSMOApp - - - name: odu-app-ics-version - version: ~1.0.0 - repository: "@local" - condition: nonrtric.installODUICSApp - - name: topology version: ~1.0.0 repository: "@local" condition: nonrtric.installTopology - - name: dmaapmediatorservice - version: ~1.0.0 - repository: "@local" - condition: nonrtric.installDmaapmediatorservice - - - name: helmmanager - version: ~1.0.0 - repository: "@local" - condition: nonrtric.installHelmmanager - - name: kong version: ~1.0.0 repository: "@local" diff --git a/smo-install/oran_oom/nonrtric/values.yaml b/smo-install/oran_oom/nonrtric/values.yaml index 7b862a7e..d132ca5f 100644 --- a/smo-install/oran_oom/nonrtric/values.yaml +++ b/smo-install/oran_oom/nonrtric/values.yaml @@ -1,6 +1,6 @@ # ============LICENSE_START=============================================== # Copyright (C) 2020-2023 Nordix Foundation. All rights reserved. -# 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. @@ -32,16 +32,10 @@ nonrtric: installA1simulator: true installControlpanel: true installInformationservice: true - installRappcatalogueservice: true installNonrtricgateway: true - installORUApp: true - installODUSMOApp: true - installODUICSApp: true installTopology: true installKong: true installDmaapadapterservice: true - installDmaapmediatorservice: true - installHelmmanager: true installrAppmanager: true installCapifcore: true installServicemanager: true diff --git a/smo-install/oran_oom/odu-app-ics-version/.helmignore b/smo-install/oran_oom/odu-app-ics-version/.helmignore deleted file mode 100755 index 0e8a0eb3..00000000 --- a/smo-install/oran_oom/odu-app-ics-version/.helmignore +++ /dev/null @@ -1,23 +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 -*.orig -*~ -# Various IDEs -.project -.idea/ -*.tmproj -.vscode/ diff --git a/smo-install/oran_oom/odu-app-ics-version/Chart.yaml b/smo-install/oran_oom/odu-app-ics-version/Chart.yaml deleted file mode 100755 index 24949acb..00000000 --- a/smo-install/oran_oom/odu-app-ics-version/Chart.yaml +++ /dev/null @@ -1,10 +0,0 @@ -apiVersion: v2 -appVersion: "1.0.0" -description: A Helm chart to deploy odu-app-ics-version version -name: odu-app-ics-version -version: 1.0.0 - -dependencies: - - name: nonrtric-common - version: ^2.0.0 - repository: "@local" diff --git a/smo-install/oran_oom/odu-app-ics-version/templates/deployment.yaml b/smo-install/oran_oom/odu-app-ics-version/templates/deployment.yaml deleted file mode 100755 index c5b55204..00000000 --- a/smo-install/oran_oom/odu-app-ics-version/templates/deployment.yaml +++ /dev/null @@ -1,69 +0,0 @@ -# Copyright (C) 2021 Nordix Foundation. 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================================================= - -apiVersion: apps/v1 -kind: Deployment -metadata: {{- include "common.resourceMetadata" . | nindent 2 }} -spec: - replicas: {{ .Values.replicaCount }} - selector: {{- include "common.selectors" . | nindent 4 }} - template: - metadata: {{- include "common.templateMetadata" . | nindent 6 }} - spec: - {{- with .Values.imagePullSecrets }} - imagePullSecrets: - {{- toYaml . | nindent 8 }} - {{- end }} - securityContext: - {{- toYaml .Values.podSecurityContext | nindent 8 }} - containers: - - name: {{ include "common.containername" . }} - securityContext: - {{- toYaml .Values.securityContext | nindent 12 }} - image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}" - imagePullPolicy: {{ .Values.image.pullPolicy }} - env: - - name: CONSUMER_HOST - value: "{{ .Values.consumer.host }}" - - name: CONSUMER_PORT - value: "{{ .Values.consumer.port }}" - - name: SDNR_ADDR - value: "{{ .Values.sdnr.address }}" - - name: SDNR_USER - value: "{{ .Values.sdnr.user }}" - - name: SDNR_PASSWORD - value: "{{ .Values.sdnr.password }}" - - name: INFO_COORD_ADDR - value: "{{ .Values.informationcoordinator.address }}" - - name: NODE_ID - value: "{{ .Values.simulator.node }}" - ports: - - name: http - containerPort: 8095 - protocol: TCP - resources: - {{- toYaml .Values.resources | nindent 12 }} - {{- with .Values.nodeSelector }} - nodeSelector: - {{- toYaml . | nindent 8 }} - {{- end }} - {{- with .Values.affinity }} - affinity: - {{- toYaml . | nindent 8 }} - {{- end }} - {{- with .Values.tolerations }} - tolerations: - {{- toYaml . | nindent 8 }} - {{- end }} diff --git a/smo-install/oran_oom/odu-app-ics-version/templates/service.yaml b/smo-install/oran_oom/odu-app-ics-version/templates/service.yaml deleted file mode 100755 index 0f0441c2..00000000 --- a/smo-install/oran_oom/odu-app-ics-version/templates/service.yaml +++ /dev/null @@ -1,16 +0,0 @@ -# Copyright (C) 2021 Nordix Foundation. 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================================================= - -{{ include "common.service" . }} diff --git a/smo-install/oran_oom/odu-app-ics-version/values.yaml b/smo-install/oran_oom/odu-app-ics-version/values.yaml deleted file mode 100755 index 27e861dc..00000000 --- a/smo-install/oran_oom/odu-app-ics-version/values.yaml +++ /dev/null @@ -1,82 +0,0 @@ -# Copyright (C) 2022 Nordix Foundation. 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 odu-app-ics-version. -# This is a YAML-formatted file. -# Declare variables to be passed into your templates. - -replicaCount: 1 - -image: - repository: nexus3.o-ran-sc.org:10002/o-ran-sc/nonrtric-rapp-ransliceassurance-icsversion - pullPolicy: Always - # Overrides the image tag whose default is the chart appVersion. - tag: "1.2.0" - -consumer: - host: http://odu-app-ics-version.nonrtric - port: 8095 - -sdnr: - address: http://10.1.49.120:8181 - user: admin - password: Kp8bJ4SXszM0WXlhak3eHlcse2gAw84vaoGGmJvUy2U - -informationcoordinator: - address: http://informationservice.nonrtric:9082 - -simulator: - node: o-du-1122 - -imagePullSecrets: [] -nameOverride: "" -fullnameOverride: "" - -podAnnotations: {} - -podSecurityContext: {} - # fsGroup: 2000 - -securityContext: {} - # capabilities: - # drop: - # - ALL - # readOnlyRootFilesystem: true - # runAsNonRoot: true - # runAsUser: 1000 - -service: - type: ClusterIP - ports: - - name: http - targetPort: 8095 - -resources: {} - # We usually recommend not to specify default resources and to leave this as a conscious - # choice for the user. This also increases chances charts run on environments with little - # resources, such as Minikube. If you do want to specify resources, uncomment the following - # lines, adjust them as necessary, and remove the curly braces after 'resources:'. - # limits: - # cpu: 100m - # memory: 128Mi - # requests: - # cpu: 100m - # memory: 128Mi - -nodeSelector: {} - -tolerations: [] - -affinity: {} diff --git a/smo-install/oran_oom/odu-app/.helmignore b/smo-install/oran_oom/odu-app/.helmignore deleted file mode 100755 index 0e8a0eb3..00000000 --- a/smo-install/oran_oom/odu-app/.helmignore +++ /dev/null @@ -1,23 +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 -*.orig -*~ -# Various IDEs -.project -.idea/ -*.tmproj -.vscode/ diff --git a/smo-install/oran_oom/odu-app/Chart.yaml b/smo-install/oran_oom/odu-app/Chart.yaml deleted file mode 100755 index fa4e5ecf..00000000 --- a/smo-install/oran_oom/odu-app/Chart.yaml +++ /dev/null @@ -1,10 +0,0 @@ -apiVersion: v2 -appVersion: "1.0.0" -description: A Helm chart to deploy odu-app smo version -name: odu-app -version: 1.0.0 - -dependencies: - - name: nonrtric-common - version: ^2.0.0 - repository: "@local" diff --git a/smo-install/oran_oom/odu-app/templates/deployment.yaml b/smo-install/oran_oom/odu-app/templates/deployment.yaml deleted file mode 100755 index 8a2f0984..00000000 --- a/smo-install/oran_oom/odu-app/templates/deployment.yaml +++ /dev/null @@ -1,64 +0,0 @@ -# Copyright (C) 2021 Nordix Foundation. 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================================================= - -apiVersion: apps/v1 -kind: Deployment -metadata: {{- include "common.resourceMetadata" . | nindent 2 }} -spec: - replicas: {{ .Values.replicaCount }} - selector: {{- include "common.selectors" . | nindent 4 }} - template: - metadata: {{- include "common.templateMetadata" . | nindent 6 }} - spec: - {{- with .Values.imagePullSecrets }} - imagePullSecrets: - {{- toYaml . | nindent 8 }} - {{- end }} - securityContext: - {{- toYaml .Values.podSecurityContext | nindent 8 }} - containers: - - name: {{ include "common.containername" . }} - securityContext: - {{- toYaml .Values.securityContext | nindent 12 }} - image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}" - imagePullPolicy: {{ .Values.image.pullPolicy }} - env: - - name: MR_HOST - value: "{{ .Values.messagerouter.host }}" - - name: MR_PORT - value: "{{ .Values.messagerouter.port }}" - - name: SDNR_ADDR - value: "{{ .Values.sdnr.address }}" - - name: SDNR_USER - value: "{{ .Values.sdnr.user }}" - - name: SDNR_PASSWORD - value: "{{ .Values.sdnr.password }}" - - name: NODE_ID - value: "{{ .Values.simulator.node }}" - ports: {{- include "common.containerPorts" . | nindent 10 }} - resources: - {{- toYaml .Values.resources | nindent 12 }} - {{- with .Values.nodeSelector }} - nodeSelector: - {{- toYaml . | nindent 8 }} - {{- end }} - {{- with .Values.affinity }} - affinity: - {{- toYaml . | nindent 8 }} - {{- end }} - {{- with .Values.tolerations }} - tolerations: - {{- toYaml . | nindent 8 }} - {{- end }} diff --git a/smo-install/oran_oom/odu-app/templates/service.yaml b/smo-install/oran_oom/odu-app/templates/service.yaml deleted file mode 100755 index 0f0441c2..00000000 --- a/smo-install/oran_oom/odu-app/templates/service.yaml +++ /dev/null @@ -1,16 +0,0 @@ -# Copyright (C) 2021 Nordix Foundation. 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================================================= - -{{ include "common.service" . }} diff --git a/smo-install/oran_oom/odu-app/values.yaml b/smo-install/oran_oom/odu-app/values.yaml deleted file mode 100755 index 96fbe076..00000000 --- a/smo-install/oran_oom/odu-app/values.yaml +++ /dev/null @@ -1,79 +0,0 @@ -# Copyright (C) 2022 Nordix Foundation. 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 odu-app. -# This is a YAML-formatted file. -# Declare variables to be passed into your templates. - -replicaCount: 1 - -image: - repository: nexus3.o-ran-sc.org:10002/o-ran-sc/nonrtric-rapp-ransliceassurance - pullPolicy: Always - # Overrides the image tag whose default is the chart appVersion. - tag: "1.3.0" - -messagerouter: - host: http://message-router.onap - port: 3904 - -sdnr: - address: http://10.1.49.120:8181 - user: admin - password: Kp8bJ4SXszM0WXlhak3eHlcse2gAw84vaoGGmJvUy2U - -simulator: - node: o-du-1122 - -imagePullSecrets: [] -nameOverride: "" -fullnameOverride: "" - -podAnnotations: {} - -podSecurityContext: {} - # fsGroup: 2000 - -securityContext: {} - # capabilities: - # drop: - # - ALL - # readOnlyRootFilesystem: true - # runAsNonRoot: true - # runAsUser: 1000 - -service: - type: ClusterIP - ports: - - name: http - targetPort: 80 - -resources: {} - # We usually recommend not to specify default resources and to leave this as a conscious - # choice for the user. This also increases chances charts run on environments with little - # resources, such as Minikube. If you do want to specify resources, uncomment the following - # lines, adjust them as necessary, and remove the curly braces after 'resources:'. - # limits: - # cpu: 100m - # memory: 128Mi - # requests: - # cpu: 100m - # memory: 128Mi - -nodeSelector: {} - -tolerations: [] - -affinity: {} diff --git a/smo-install/oran_oom/oru-app/Chart.yaml b/smo-install/oran_oom/oru-app/Chart.yaml deleted file mode 100644 index aee48e47..00000000 --- a/smo-install/oran_oom/oru-app/Chart.yaml +++ /dev/null @@ -1,10 +0,0 @@ -apiVersion: v2 -appVersion: "1.0.0" -description: A Helm chart to deploy oru-app -name: oru-app -version: 1.0.0 - -dependencies: - - name: nonrtric-common - version: ^2.0.0 - repository: "@local" diff --git a/smo-install/oran_oom/oru-app/resources/config/o-ru-to-o-du-map.txt b/smo-install/oran_oom/oru-app/resources/config/o-ru-to-o-du-map.txt deleted file mode 100644 index b1fde240..00000000 --- a/smo-install/oran_oom/oru-app/resources/config/o-ru-to-o-du-map.txt +++ /dev/null @@ -1,8 +0,0 @@ -{ -{{ $simsSize := (len .Values.simulators) }} -{{ range $i, $sim := .Values.simulators }} - "{{$sim.simRu}}": "{{$sim.simDu}}" - {{ if lt (add1 $i) $simsSize }},{{ end }} -{{ end }} -} - diff --git a/smo-install/oran_oom/oru-app/templates/configmap.yaml b/smo-install/oran_oom/oru-app/templates/configmap.yaml deleted file mode 100644 index b417a21f..00000000 --- a/smo-install/oran_oom/oru-app/templates/configmap.yaml +++ /dev/null @@ -1,5 +0,0 @@ -apiVersion: v1 -kind: ConfigMap -metadata: {{ include "common.resourceMetadata" . | nindent 2 }} -data: -{{ tpl (.Files.Glob "resources/config/*.{json,xml,txt}").AsConfig . | indent 2 }} diff --git a/smo-install/oran_oom/oru-app/templates/configmapenv.yaml b/smo-install/oran_oom/oru-app/templates/configmapenv.yaml deleted file mode 100644 index 72a9ffae..00000000 --- a/smo-install/oran_oom/oru-app/templates/configmapenv.yaml +++ /dev/null @@ -1,9 +0,0 @@ -apiVersion: v1 -kind: ConfigMap -metadata: {{ include "common.resourceMetadata" (dict "suffix" "configmapenv" "dot" . ) | nindent 2 }} -data: - MR-HOST: {{ .Values.conf.mrHost | quote }} - MR-PORT: {{ .Values.conf.mrPort | quote }} - SDNR-HOST: {{ .Values.conf.sdnrHost | quote }} - SDNR-PORT: {{ .Values.conf.sdnrPort | quote }} - VERBOSE: {{ .Values.conf.verbose | quote }} diff --git a/smo-install/oran_oom/oru-app/templates/deployment.yaml b/smo-install/oran_oom/oru-app/templates/deployment.yaml deleted file mode 100644 index e13084e6..00000000 --- a/smo-install/oran_oom/oru-app/templates/deployment.yaml +++ /dev/null @@ -1,34 +0,0 @@ -apiVersion: apps/v1 -kind: Deployment -metadata: {{- include "common.resourceMetadata" . | nindent 2 }} -spec: - replicas: {{ .Values.replicaCount }} - selector: {{- include "common.selectors" . | nindent 4 }} - template: - metadata: {{- include "common.templateMetadata" . | nindent 6 }} - spec: - containers: - - name: {{ include "common.containername" . }} - image: "{{ .Values.image.repository }}/{{ .Values.image.name}}:{{ .Values.image.tag }}" - imagePullPolicy: {{ .Values.image.pullPolicy }} - tty: true - stdin: true - envFrom: - - configMapRef: - name: {{ include "common.name" . }}-configmapenv - volumeMounts: - - name: oru-app-config-volume - subPath: o-ru-to-o-du-map.txt - mountPath: /usr/src/app/o-ru-to-o-du-map.txt - securityContext: - capabilities: - add: - - SYS_ADMIN - - SYS_PTRACE - volumes: - - name: oru-app-config-volume - configMap: - name: {{ include "common.name" . }} - items: - - key: o-ru-to-o-du-map.txt - path: o-ru-to-o-du-map.txt diff --git a/smo-install/oran_oom/oru-app/templates/service.yaml b/smo-install/oran_oom/oru-app/templates/service.yaml deleted file mode 100644 index f024c648..00000000 --- a/smo-install/oran_oom/oru-app/templates/service.yaml +++ /dev/null @@ -1 +0,0 @@ -{{ include "common.service" . }} diff --git a/smo-install/oran_oom/oru-app/values.yaml b/smo-install/oran_oom/oru-app/values.yaml deleted file mode 100644 index 45c5b994..00000000 --- a/smo-install/oran_oom/oru-app/values.yaml +++ /dev/null @@ -1,31 +0,0 @@ -# Static Defaults -replicaCount: 1 -image: - repository: 'nexus3.o-ran-sc.org:10002/o-ran-sc' - name: nonrtric-rapp-orufhrecovery - tag: 1.1.0 - pullPolicy: IfNotPresent - -service: - type: NodePort - ports: - - name: http - targetPort: 830 - nodePort: 30835 - -simulators: - - simRu: o-ru-11221 - simDu: o-du-1122 - -conf: - mrHost: http://message-router.onap - mrPort: 3904 - sdnrHost: http://sdnc.onap - sdnrPort: 8282 - verbose: on - -#Pods Service Account -serviceAccount: - nameOverride: oru-app - roles: - - read diff --git a/smo-install/oran_oom/rappcatalogueservice/Chart.yaml b/smo-install/oran_oom/rappcatalogueservice/Chart.yaml deleted file mode 100644 index a6eeabb6..00000000 --- a/smo-install/oran_oom/rappcatalogueservice/Chart.yaml +++ /dev/null @@ -1,26 +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: v2 -appVersion: "2.0.0" -description: A Helm chart for rAPP Catalogue Service -name: rappcatalogueservice -version: 1.0.0 - -dependencies: - - name: nonrtric-common - version: ^2.0.0 - repository: "@local" diff --git a/smo-install/oran_oom/rappcatalogueservice/templates/deployment.yaml b/smo-install/oran_oom/rappcatalogueservice/templates/deployment.yaml deleted file mode 100644 index 810c7d3d..00000000 --- a/smo-install/oran_oom/rappcatalogueservice/templates/deployment.yaml +++ /dev/null @@ -1,32 +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: {{- include "common.resourceMetadata" . | nindent 2 }} -spec: - replicas: 1 - selector: {{- include "common.selectors" . | nindent 4 }} - template: - metadata: {{- include "common.templateMetadata" . | nindent 6 }} - spec: - hostname: {{ include "common.name" . }} - containers: - - name: {{ include "common.containername" . }} - image: {{ .Values.image.registry }}/{{ .Values.image.name }}:{{ .Values.image.tag }} - imagePullPolicy: {{ .Values.imagePullPolicy }} - ports: {{- include "common.containerPorts" . | nindent 8 }} - {{- include "common.tcpsocketProbes" . | nindent 8 }} diff --git a/smo-install/oran_oom/rappcatalogueservice/templates/service.yaml b/smo-install/oran_oom/rappcatalogueservice/templates/service.yaml deleted file mode 100644 index be38ac46..00000000 --- a/smo-install/oran_oom/rappcatalogueservice/templates/service.yaml +++ /dev/null @@ -1,17 +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. # -################################################################################ - -{{ include "common.service" . }} diff --git a/smo-install/oran_oom/rappcatalogueservice/values.yaml b/smo-install/oran_oom/rappcatalogueservice/values.yaml deleted file mode 100644 index ecf1ea79..00000000 --- a/smo-install/oran_oom/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. - -imagePullPolicy: IfNotPresent -image: - registry: 'nexus3.o-ran-sc.org:10002/o-ran-sc' - name: nonrtric-plt-rappcatalogue - tag: 1.2.0 -service: - type: ClusterIP - ports: - - name: http - internalPort: "9085" - targetPort: "8680" - name_tls: https - internalPort_tls: "9086" - targetPort_tls: "8633" -liveness: - initialDelaySeconds: 20 - periodSeconds: 10 -readiness: - initialDelaySeconds: 20 - periodSeconds: 10