From 0a926be3581d536682491bd2a1099da28b56018a Mon Sep 17 00:00:00 2001 From: "aravind.est" Date: Thu, 4 Apr 2024 12:51:46 +0100 Subject: [PATCH] Add rAppmanager and Capifcore charts in ORAN_OOM rAppmanager and Capifcore charts added in ORAN_OOM. Issue-ID: NONRTRIC-997 Change-Id: I93e0d4836605c08ada594e367931abf8d7721d54 Signed-off-by: aravind.est --- smo-install/helm-override/cnf/oran-override.yaml | 3 + .../helm-override/default/oran-override.yaml | 3 + .../pythonsdk-tests/oran-override.yaml | 3 + smo-install/oran_oom/capifcore/Chart.yaml | 26 +++++++ .../oran_oom/capifcore/templates/deployment.yaml | 32 +++++++++ .../oran_oom/capifcore/templates/service.yaml | 18 +++++ smo-install/oran_oom/capifcore/values.yaml | 44 ++++++++++++ smo-install/oran_oom/nonrtric/Chart.yaml | 10 +++ smo-install/oran_oom/nonrtric/values.yaml | 2 +- smo-install/oran_oom/rappmanager/.helmignore | 22 ++++++ smo-install/oran_oom/rappmanager/Chart.yaml | 27 +++++++ .../oran_oom/rappmanager/templates/configmap.yaml | 18 +++++ .../oran_oom/rappmanager/templates/ingress.yaml | 36 ++++++++++ .../oran_oom/rappmanager/templates/secret.yaml | 25 +++++++ .../oran_oom/rappmanager/templates/service.yaml | 18 +++++ .../rappmanager/templates/statefulset.yaml | 49 +++++++++++++ smo-install/oran_oom/rappmanager/values.yaml | 84 ++++++++++++++++++++++ 17 files changed, 419 insertions(+), 1 deletion(-) create mode 100644 smo-install/oran_oom/capifcore/Chart.yaml create mode 100644 smo-install/oran_oom/capifcore/templates/deployment.yaml create mode 100644 smo-install/oran_oom/capifcore/templates/service.yaml create mode 100644 smo-install/oran_oom/capifcore/values.yaml create mode 100644 smo-install/oran_oom/rappmanager/.helmignore create mode 100644 smo-install/oran_oom/rappmanager/Chart.yaml create mode 100644 smo-install/oran_oom/rappmanager/templates/configmap.yaml create mode 100644 smo-install/oran_oom/rappmanager/templates/ingress.yaml create mode 100644 smo-install/oran_oom/rappmanager/templates/secret.yaml create mode 100644 smo-install/oran_oom/rappmanager/templates/service.yaml create mode 100644 smo-install/oran_oom/rappmanager/templates/statefulset.yaml create mode 100644 smo-install/oran_oom/rappmanager/values.yaml diff --git a/smo-install/helm-override/cnf/oran-override.yaml b/smo-install/helm-override/cnf/oran-override.yaml index 8ae50c07..52403d25 100644 --- a/smo-install/helm-override/cnf/oran-override.yaml +++ b/smo-install/helm-override/cnf/oran-override.yaml @@ -1,5 +1,6 @@ # Copyright © 2017 Amdocs, Bell Canada # Mofification Copyright © 2021 AT&T +# Copyright (C) 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. @@ -40,6 +41,8 @@ nonrtric: installDmaapadapterservice: true installDmaapmediatorservice: true installHelmmanager: true + installrAppmanager: true + installCapifcore: true # override default mount path root directory # referenced by persistent volumes and log files persistence: diff --git a/smo-install/helm-override/default/oran-override.yaml b/smo-install/helm-override/default/oran-override.yaml index 8ae50c07..574ef5d6 100644 --- a/smo-install/helm-override/default/oran-override.yaml +++ b/smo-install/helm-override/default/oran-override.yaml @@ -1,5 +1,6 @@ # Copyright © 2017 Amdocs, Bell Canada # Mofification Copyright © 2021 AT&T +# Modifcation Copyright (C) 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. @@ -40,6 +41,8 @@ nonrtric: installDmaapadapterservice: true installDmaapmediatorservice: true installHelmmanager: true + installrAppmanager: true + installCapifcore: true # override default mount path root directory # referenced by persistent volumes and log files persistence: diff --git a/smo-install/helm-override/pythonsdk-tests/oran-override.yaml b/smo-install/helm-override/pythonsdk-tests/oran-override.yaml index f8e608b0..9b0c2de5 100644 --- a/smo-install/helm-override/pythonsdk-tests/oran-override.yaml +++ b/smo-install/helm-override/pythonsdk-tests/oran-override.yaml @@ -1,5 +1,6 @@ # Copyright © 2017 Amdocs, Bell Canada # Mofification Copyright © 2021 AT&T +# Modification Copyright (C) 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. @@ -40,6 +41,8 @@ nonrtric: installDmaapadapterservice: true installDmaapmediatorservice: true installHelmmanager: true + installrAppmanager: true + installCapifcore: true # override default mount path root directory # referenced by persistent volumes and log files persistence: diff --git a/smo-install/oran_oom/capifcore/Chart.yaml b/smo-install/oran_oom/capifcore/Chart.yaml new file mode 100644 index 00000000..ab52c086 --- /dev/null +++ b/smo-install/oran_oom/capifcore/Chart.yaml @@ -0,0 +1,26 @@ +################################################################################ +# 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. # +################################################################################ + +apiVersion: v2 +appVersion: "2.0.0" +description: A Helm chart for CAPIF core +name: capifcore +version: 1.0.0 + +dependencies: + - name: nonrtric-common + version: ^2.0.0 + repository: "@local" \ No newline at end of file diff --git a/smo-install/oran_oom/capifcore/templates/deployment.yaml b/smo-install/oran_oom/capifcore/templates/deployment.yaml new file mode 100644 index 00000000..916f497f --- /dev/null +++ b/smo-install/oran_oom/capifcore/templates/deployment.yaml @@ -0,0 +1,32 @@ +################################################################################ +# Copyright (C) 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. # +################################################################################ + +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/capifcore/templates/service.yaml b/smo-install/oran_oom/capifcore/templates/service.yaml new file mode 100644 index 00000000..5437660b --- /dev/null +++ b/smo-install/oran_oom/capifcore/templates/service.yaml @@ -0,0 +1,18 @@ +################################################################################ +# Copyright (C) 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. # +################################################################################ + + +{{ include "common.service" . }} diff --git a/smo-install/oran_oom/capifcore/values.yaml b/smo-install/oran_oom/capifcore/values.yaml new file mode 100644 index 00000000..8d9cf80a --- /dev/null +++ b/smo-install/oran_oom/capifcore/values.yaml @@ -0,0 +1,44 @@ +# ============LICENSE_START=============================================== +# 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 CAPIF core. +# 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-capifcore + tag: 1.2.0 +service: + type: ClusterIP + ports: + - name: http + internalPort: "8090" + targetPort: "8090" +liveness: + initialDelaySeconds: 20 + periodSeconds: 10 +readiness: + initialDelaySeconds: 20 + periodSeconds: 10 +persistence: + size: 2Gi + storageClassName: standard +ingress: + enabled: false + + diff --git a/smo-install/oran_oom/nonrtric/Chart.yaml b/smo-install/oran_oom/nonrtric/Chart.yaml index f8790512..e7dd005f 100644 --- a/smo-install/oran_oom/nonrtric/Chart.yaml +++ b/smo-install/oran_oom/nonrtric/Chart.yaml @@ -87,3 +87,13 @@ dependencies: version: ~1.0.0 repository: "@local" condition: nonrtric.installDmaapadapterservice + + - name: rappmanager + version: ~1.0.0 + repository: "@local" + condition: nonrtric.installrAppmanager + + - name: capifcore + version: ~1.0.0 + repository: "@local" + condition: nonrtric.installCapifcore diff --git a/smo-install/oran_oom/nonrtric/values.yaml b/smo-install/oran_oom/nonrtric/values.yaml index 441ef31d..f3444418 100644 --- a/smo-install/oran_oom/nonrtric/values.yaml +++ b/smo-install/oran_oom/nonrtric/values.yaml @@ -43,7 +43,7 @@ nonrtric: installDmaapmediatorservice: true installHelmmanager: true installrAppmanager: true - installDmeParticipant: true + installCapifcore: true volume1: size: 1Gi diff --git a/smo-install/oran_oom/rappmanager/.helmignore b/smo-install/oran_oom/rappmanager/.helmignore new file mode 100644 index 00000000..50af0317 --- /dev/null +++ b/smo-install/oran_oom/rappmanager/.helmignore @@ -0,0 +1,22 @@ +# 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/rappmanager/Chart.yaml b/smo-install/oran_oom/rappmanager/Chart.yaml new file mode 100644 index 00000000..4d971a2d --- /dev/null +++ b/smo-install/oran_oom/rappmanager/Chart.yaml @@ -0,0 +1,27 @@ +# ============LICENSE_START=============================================== +# Copyright (C) 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================================================= +# + +apiVersion: v2 +appVersion: "2.0.0" +description: A Helm chart for rAppmanager +name: rappmanager +version: 1.0.0 + +dependencies: + - name: nonrtric-common + version: ^2.0.0 + repository: "@local" \ No newline at end of file diff --git a/smo-install/oran_oom/rappmanager/templates/configmap.yaml b/smo-install/oran_oom/rappmanager/templates/configmap.yaml new file mode 100644 index 00000000..3b61b846 --- /dev/null +++ b/smo-install/oran_oom/rappmanager/templates/configmap.yaml @@ -0,0 +1,18 @@ +# ============LICENSE_START=============================================== +# Copyright (C) 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================================================= +# + +{{ include "common.applicationConfigmap" . }} diff --git a/smo-install/oran_oom/rappmanager/templates/ingress.yaml b/smo-install/oran_oom/rappmanager/templates/ingress.yaml new file mode 100644 index 00000000..38cc1914 --- /dev/null +++ b/smo-install/oran_oom/rappmanager/templates/ingress.yaml @@ -0,0 +1,36 @@ +{{/* +# ============LICENSE_START=============================================== +# Copyright (C) 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================================================= +# +*/}} + +{{- if (include "common.ingressEnabled" .) -}} +apiVersion: networking.k8s.io/v1 +kind: Ingress +metadata: {{- include "common.resourceMetadata" . | nindent 2 }} +spec: + ingressClassName: {{ include "common.ingressClassName" . }} + rules: + - http: + paths: + - backend: + service: + name: {{ include "common.name" . }} + port: + number: {{ (first .Values.service.ports).internalPort }} + path: "/rapps" + pathType: Prefix +{{- end -}} \ No newline at end of file diff --git a/smo-install/oran_oom/rappmanager/templates/secret.yaml b/smo-install/oran_oom/rappmanager/templates/secret.yaml new file mode 100644 index 00000000..fd2a1a38 --- /dev/null +++ b/smo-install/oran_oom/rappmanager/templates/secret.yaml @@ -0,0 +1,25 @@ +# ============LICENSE_START=============================================== +# Copyright (C) 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================================================= +# + +apiVersion: v1 +kind: Secret +metadata: + name: {{ include "common.name" . }}-acm-secret +type: Opaque +data: + username: {{ .Values.rappmanager.acm.username }} + password: {{ .Values.rappmanager.acm.password }} diff --git a/smo-install/oran_oom/rappmanager/templates/service.yaml b/smo-install/oran_oom/rappmanager/templates/service.yaml new file mode 100644 index 00000000..581f6691 --- /dev/null +++ b/smo-install/oran_oom/rappmanager/templates/service.yaml @@ -0,0 +1,18 @@ +# ============LICENSE_START=============================================== +# Copyright (C) 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================================================= +# + +{{ include "common.service" . }} diff --git a/smo-install/oran_oom/rappmanager/templates/statefulset.yaml b/smo-install/oran_oom/rappmanager/templates/statefulset.yaml new file mode 100644 index 00000000..cc082022 --- /dev/null +++ b/smo-install/oran_oom/rappmanager/templates/statefulset.yaml @@ -0,0 +1,49 @@ +# ============LICENSE_START=============================================== +# Copyright (C) 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================================================= +# + +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 }} + env: + - name: RAPPMANAGER_ACM_USERNAME + valueFrom: + secretKeyRef: + name: {{ include "common.name" . }}-acm-secret + key: username + - name: RAPPMANAGER_ACM_PASSWORD + valueFrom: + secretKeyRef: + name: {{ include "common.name" . }}-acm-secret + key: password + volumeMounts: + - name: {{ include "common.applicationConfigMountName" . }} + mountPath: /opt/app/rappmanager/config + volumes: {{- include "common.applicationConfigVolume" . | nindent 8 }} \ No newline at end of file diff --git a/smo-install/oran_oom/rappmanager/values.yaml b/smo-install/oran_oom/rappmanager/values.yaml new file mode 100644 index 00000000..95e38f8e --- /dev/null +++ b/smo-install/oran_oom/rappmanager/values.yaml @@ -0,0 +1,84 @@ +# ============LICENSE_START=============================================== +# 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 Manager. +# This is a YAML-formatted file. +# Declare variables to be passed into your templates. +# This needs to be set up with ACM installation in order for the functionalities to operate. + +imagePullPolicy: IfNotPresent +image: + registry: "nexus3.o-ran-sc.org:10002/o-ran-sc" + name: nonrtric-plt-rappmanager + tag: 0.0.1 +service: + type: ClusterIP + ports: + - name: http + internalPort: "8080" + targetPort: "8080" +liveness: + initialDelaySeconds: 20 + periodSeconds: 10 +readiness: + initialDelaySeconds: 20 + periodSeconds: 10 +persistence: + size: 2Gi + storageClassName: standard +ingress: + enabled: false + +rappmanager: + acm: + username: cnVudGltZVVzZXI= + password: emIhWHp0RzM0 + +application: + rappmanager: + csarlocation: /opt/app/rappmanager/csar + acm: + baseurl: http://policy-clamp-runtime-acm.onap:6969/onap/policy/clamp/acm/v2/ + maxRetries: 10 + retryInterval: 2 #seconds + sme: + baseurl: http://capifcore.nonrtric:8090 + providerBasePath: /api-provider-management/v1/ + invokerBasePath: /api-invoker-management/v1/ + publishApiBasePath: /published-apis/v1/ + maxRetries: 3 + retryInterval: 2 #seconds + dme: + baseurl: http://informationservice.nonrtric:9082 + + spring: + jackson: + default-property-inclusion: non_null + + logging: + level: + root: INFO + com.oransc: INFO + org.apache.http: INFO + httpclient.wire: INFO + org.springframework.web.client.RestTemplate: INFO + + management: + endpoints: + web: + exposure: + include: "*" \ No newline at end of file -- 2.16.6