From 6748c12764e4cf3a8bc0d4028adc4192a1eaaa49 Mon Sep 17 00:00:00 2001 From: "aravind.est" Date: Tue, 5 Aug 2025 18:06:17 +0100 Subject: [PATCH] Remove RANPM submodule RANPM components installation provided by the new flavour in the SMO installation. This commit removes the RANPM submodule from the it/dep repository. Issue-ID: NONRTRIC-1082 Change-Id: I120251bbd45ca2a65cb4ee7f29c96442e7fc57eb Signed-off-by: aravind.est --- .gitmodules | 3 --- README.md | 39 +---------------------------- bin/deploy-nonrtric | 10 -------- bin/undeploy-nonrtric | 9 ------- nonrtric/RECIPE_EXAMPLE/example_recipe.yaml | 2 -- ranpm | 1 - 6 files changed, 1 insertion(+), 63 deletions(-) delete mode 160000 ranpm diff --git a/.gitmodules b/.gitmodules index 73d1475a..383f4d05 100644 --- a/.gitmodules +++ b/.gitmodules @@ -7,6 +7,3 @@ [submodule "smo-install/multicloud-k8s"] path = smo-install/multicloud-k8s url = https://github.com/onap/multicloud-k8s.git -[submodule "ranpm"] - path = ranpm - url = https://gerrit.nordix.org/oransc/nonrtric/plt/ranpm diff --git a/README.md b/README.md index b79262ad..d419cb22 100644 --- a/README.md +++ b/README.md @@ -2,6 +2,7 @@ Copyright (c) 2019 AT&T Intellectual Property. Modifications Copyright (C) 2023 Nordix. +Modifications Copyright (C) 2025 OpenInfra Foundation Europe. All rights reserved. Licensed under the Creative Commons License, Attribution 4.0 Intl. (the"Documentation License"); you may not use this documentation @@ -87,41 +88,3 @@ Run the following to undeploy: ```sh $ . ./undeploy-ric-aux ``` - -### NOTE: To Deploy RANPM -RANPM helm charts are integrated as a submodule in this repository. To deploy RANPM function set installRanpm: true in the RECIPE_EXAMPLE file as below: - -nonrtric: - installPms: true - installA1controller: true - installA1simulator: true - installControlpanel: true - installInformationservice: true - installRappcatalogueservice: true - installRappcatalogueEnhancedservice: true -  installNonrtricgateway: true - installKong: true - installDmaapadapterservice: true - installDmaapmediatorservice: true - installHelmmanager: true - installOruclosedlooprecovery: true - installOdusliceassurance: true - installCapifcore: true - installServicemanager: true - installRanpm: true - -   volume1: - # Set the size to 0 if you do not need the volume (if you are using Dynamic Volume Provisioning) - size: 2Gi - storageClassName: pms-storage - volume2: - # Set the size to 0 if you do not need the volume (if you are using Dynamic Volume Provisioning) - size: 2Gi - storageClassName: ics-storage - volume3: - size: 1Gi - storageClassName: helmmanager-storage - -... -... -... \ No newline at end of file diff --git a/bin/deploy-nonrtric b/bin/deploy-nonrtric index 5bc9002a..504403dd 100755 --- a/bin/deploy-nonrtric +++ b/bin/deploy-nonrtric @@ -144,7 +144,6 @@ COMMON_BLOCK=$(cat $OVERRIDEYAML | awk '/^common:/{getline; while ($0 ~ /^ +.*|^ NAMESPACE_BLOCK=$(cat $OVERRIDEYAML | awk '/^ namespace:/{getline; while ($0 ~ /^ .*|^ *$/) {print $0; if (getline == 0) {break}}}') NONRTRIC_NAMESPACE=$(echo "$NAMESPACE_BLOCK" | awk '/^ *nonrtric:/{print $2}') RELEASE_PREFIX=$(echo "$COMMON_BLOCK" | awk '/^ *releasePrefix:/{print $2}') -INSTALL_RANPM=$(cat $OVERRIDEYAML | awk '/^ installRanpm:/{print $2}') if ! kubectl get ns ${NONRTRIC_NAMESPACE:-nonrtric}> /dev/null 2>&1; then kubectl create ns ${NONRTRIC_NAMESPACE:-nonrtric} @@ -186,15 +185,6 @@ kubectl create configmap -n ${NONRTRIC_NAMESPACE:-nonrtric} nonrtric-recipe --fr echo "Deploying NONRTRIC" -echo "Install Ranpm- $INSTALL_RANPM" - -if [ "$INSTALL_RANPM" = true ];then - echo "Running install-ranpm.sh" - chmod +x ${ROOT_DIR}/../ranpm/install/install-ranpm.sh - ${ROOT_DIR}/../ranpm/install/install-ranpm.sh - echo "install-ranpm.sh completed" -fi - echo "helm install -f $OVERRIDEYAML --namespace ${NONRTRIC_NAMESPACE:-nonrtric} ${HELM_NAME_OPT} ${RELEASE_PREFIX} $ROOT_DIR/../nonrtric/helm/nonrtric" helm install -f $OVERRIDEYAML -n "${NONRTRIC_NAMESPACE:-nonrtric}" ${HELM_NAME_OPT} "${RELEASE_PREFIX}" "$ROOT_DIR/../nonrtric/helm/nonrtric" diff --git a/bin/undeploy-nonrtric b/bin/undeploy-nonrtric index 4372ba7a..1753a25e 100755 --- a/bin/undeploy-nonrtric +++ b/bin/undeploy-nonrtric @@ -47,7 +47,6 @@ NAMESPACE_BLOCK=$(cat /tmp/recipe.yaml | awk '/^ namespace:/{getline; while ($0 NONRTRIC_NAMESPACE=$(echo "$NAMESPACE_BLOCK" | awk '/^ *nonrtric:/{print $2}') RELEASE_PREFIX=$(echo "$COMMON_BLOCK" | awk '/^ *releasePrefix:/{print $2}') INSTALL_KONG=$(cat /tmp/recipe.yaml | awk '/^ installKong:/{print $2}') -INSTALL_RANPM=$(cat /tmp/recipe.yaml | awk '/^ installRanpm:/{print $2}') if [ "$INSTALL_KONG" = true ];then echo "Warning - deleting Kong routes and services for ServiceManager" @@ -65,14 +64,6 @@ fi ROOT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null && pwd )" -if [ "$INSTALL_RANPM" = true ];then - echo "Running uninstall-ranpm.sh" - chmod +x ${ROOT_DIR}/../ranpm/install/uninstall-ranpm.sh - ${ROOT_DIR}/../ranpm/install/uninstall-ranpm.sh - kubectl delete ns ran - echo "uninstall-ranpm.sh completed" -fi - echo "Undeploying NONRTRIC components [$COMPONENTS]" IS_HELM3=$(helm version -c --short|grep -e "^v3") diff --git a/nonrtric/RECIPE_EXAMPLE/example_recipe.yaml b/nonrtric/RECIPE_EXAMPLE/example_recipe.yaml index ef4a6074..65f24ae6 100644 --- a/nonrtric/RECIPE_EXAMPLE/example_recipe.yaml +++ b/nonrtric/RECIPE_EXAMPLE/example_recipe.yaml @@ -32,8 +32,6 @@ nonrtric: installDmaapadapterservice: true installCapifcore: true installServicemanager: true - # When enabling Ranpm switch to false installControlpanel, installInformationservice, installNonrtricgateway - installRanpm: false # rApp Manager functionality relies on ACM for its operation installrAppmanager: true # DME Participant should only be activated when ACM installation is available for this participant to utilize diff --git a/ranpm b/ranpm deleted file mode 160000 index 6748b9e8..00000000 --- a/ranpm +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 6748b9e87a3a09a430080cfd508275e6f18f4342 -- 2.16.6