Remove Standalone NONRTRIC charts 00/14800/1
authoraravind.est <aravindhan.a@est.tech>
Thu, 7 Aug 2025 13:51:40 +0000 (14:51 +0100)
committeraravind.est <aravindhan.a@est.tech>
Thu, 7 Aug 2025 13:51:40 +0000 (14:51 +0100)
Standalone NONRTRIC installation flavour introduced as part of smo-install
Remove all other version of NONRTRIC charts

Issue-ID: NONRTRIC-1082
Change-Id: I240bf2a0dc9b402fdcac03690f6ea64f18e13c16
Signed-off-by: aravind.est <aravindhan.a@est.tech>
119 files changed:
RECIPE_EXAMPLE/NONRTRIC [deleted symlink]
bin/build-nonrtric-base [deleted file]
bin/deploy-nonrtric [deleted file]
bin/undeploy-nonrtric [deleted file]
bin/verify-nonrtric-charts [deleted file]
ci/Dockerfile-nonrtric-install [deleted file]
nonrtric/.gitignore [deleted file]
nonrtric/RECIPE_EXAMPLE/example_recipe.yaml [deleted file]
nonrtric/data/README.md [deleted file]
nonrtric/data/prepare_data.sh [deleted file]
nonrtric/data/run_in_k8s/populate_information_data.sh [deleted file]
nonrtric/data/run_in_k8s/populate_policy_data.sh [deleted file]
nonrtric/data/run_in_k8s/testdata/ICS/EiJob.json [deleted file]
nonrtric/data/run_in_k8s/testdata/ICS/EiProducer.json [deleted file]
nonrtric/data/run_in_k8s/testdata/ICS/EiType.json [deleted file]
nonrtric/data/run_in_k8s/testdata/OSC/policy.json [deleted file]
nonrtric/data/run_in_k8s/testdata/OSC/policy_type.json [deleted file]
nonrtric/data/run_in_k8s/testdata/STD/v1/policy.json [deleted file]
nonrtric/data/run_in_k8s/testdata/STD/v2/policy.json [deleted file]
nonrtric/data/run_in_k8s/testdata/STD/v2/policy_type.json [deleted file]
nonrtric/data/run_in_k8s/testdata/service.json [deleted file]
nonrtric/helm/a1controller/.helmignore [deleted file]
nonrtric/helm/a1controller/Chart.yaml [deleted file]
nonrtric/helm/a1controller/requirements.yaml [deleted file]
nonrtric/helm/a1controller/templates/deployment.yaml [deleted file]
nonrtric/helm/a1controller/templates/service.yaml [deleted file]
nonrtric/helm/a1controller/values.yaml [deleted file]
nonrtric/helm/a1simulator/.helmignore [deleted file]
nonrtric/helm/a1simulator/Chart.yaml [deleted file]
nonrtric/helm/a1simulator/requirements.yaml [deleted file]
nonrtric/helm/a1simulator/templates/service.yaml [deleted file]
nonrtric/helm/a1simulator/templates/statefulset.yaml [deleted file]
nonrtric/helm/a1simulator/values.yaml [deleted file]
nonrtric/helm/capifcore/Chart.yaml [deleted file]
nonrtric/helm/capifcore/requirements.yaml [deleted file]
nonrtric/helm/capifcore/templates/deployment.yaml [deleted file]
nonrtric/helm/capifcore/templates/service.yaml [deleted file]
nonrtric/helm/capifcore/values.yaml [deleted file]
nonrtric/helm/controlpanel/.helmignore [deleted file]
nonrtric/helm/controlpanel/Chart.yaml [deleted file]
nonrtric/helm/controlpanel/requirements.yaml [deleted file]
nonrtric/helm/controlpanel/resources-ing/nginx.conf [deleted file]
nonrtric/helm/controlpanel/resources-ngw/nginx.conf [deleted file]
nonrtric/helm/controlpanel/templates/configmap.yaml [deleted file]
nonrtric/helm/controlpanel/templates/deployment.yaml [deleted file]
nonrtric/helm/controlpanel/templates/service.yaml [deleted file]
nonrtric/helm/controlpanel/values.yaml [deleted file]
nonrtric/helm/dmaapadapterservice/.helmignore [deleted file]
nonrtric/helm/dmaapadapterservice/Chart.yaml [deleted file]
nonrtric/helm/dmaapadapterservice/requirements.yaml [deleted file]
nonrtric/helm/dmaapadapterservice/resources/config/application.yaml [deleted file]
nonrtric/helm/dmaapadapterservice/resources/data/application_configuration.json [deleted file]
nonrtric/helm/dmaapadapterservice/templates/configmap.yaml [deleted file]
nonrtric/helm/dmaapadapterservice/templates/service.yaml [deleted file]
nonrtric/helm/dmaapadapterservice/templates/statefulset.yaml [deleted file]
nonrtric/helm/dmaapadapterservice/values.yaml [deleted file]
nonrtric/helm/dmeparticipant/.helmignore [deleted file]
nonrtric/helm/dmeparticipant/Chart.yaml [deleted file]
nonrtric/helm/dmeparticipant/requirements.yaml [deleted file]
nonrtric/helm/dmeparticipant/resources/config/application.yaml [deleted file]
nonrtric/helm/dmeparticipant/templates/configmap.yaml [deleted file]
nonrtric/helm/dmeparticipant/templates/deployment.yaml [deleted file]
nonrtric/helm/dmeparticipant/templates/secret.yaml [deleted file]
nonrtric/helm/dmeparticipant/templates/service.yaml [deleted file]
nonrtric/helm/dmeparticipant/values.yaml [deleted file]
nonrtric/helm/informationservice/.helmignore [deleted file]
nonrtric/helm/informationservice/Chart.yaml [deleted file]
nonrtric/helm/informationservice/requirements.yaml [deleted file]
nonrtric/helm/informationservice/resources/config/application.yaml [deleted file]
nonrtric/helm/informationservice/templates/configmap.yaml [deleted file]
nonrtric/helm/informationservice/templates/ingress.yaml [deleted file]
nonrtric/helm/informationservice/templates/service.yaml [deleted file]
nonrtric/helm/informationservice/templates/statefulset.yaml [deleted file]
nonrtric/helm/informationservice/values.yaml [deleted file]
nonrtric/helm/kongstorage/Chart.yaml [deleted file]
nonrtric/helm/kongstorage/kongvalues.yaml [deleted file]
nonrtric/helm/kongstorage/templates/kongpv.yaml [deleted file]
nonrtric/helm/kongstorage/templates/kongpvc.yaml [deleted file]
nonrtric/helm/kongstorage/values.yaml [deleted file]
nonrtric/helm/nonrtric/Chart.yaml [deleted file]
nonrtric/helm/nonrtric/templates/pv1.yaml [deleted file]
nonrtric/helm/nonrtric/templates/pv2.yaml [deleted file]
nonrtric/helm/nonrtric/templates/pv3.yaml [deleted file]
nonrtric/helm/nonrtric/values.yaml [deleted file]
nonrtric/helm/nonrtricgateway/.helmignore [deleted file]
nonrtric/helm/nonrtricgateway/Chart.yaml [deleted file]
nonrtric/helm/nonrtricgateway/requirements.yaml [deleted file]
nonrtric/helm/nonrtricgateway/resources/config/application.yaml [deleted file]
nonrtric/helm/nonrtricgateway/templates/configmap.yaml [deleted file]
nonrtric/helm/nonrtricgateway/templates/deployment.yaml [deleted file]
nonrtric/helm/nonrtricgateway/templates/service.yaml [deleted file]
nonrtric/helm/nonrtricgateway/values.yaml [deleted file]
nonrtric/helm/policymanagementservice/.helmignore [deleted file]
nonrtric/helm/policymanagementservice/Chart.yaml [deleted file]
nonrtric/helm/policymanagementservice/requirements.yaml [deleted file]
nonrtric/helm/policymanagementservice/resources/config/application.yaml [deleted file]
nonrtric/helm/policymanagementservice/resources/data/application_configuration.json [deleted file]
nonrtric/helm/policymanagementservice/templates/configmap.yaml [deleted file]
nonrtric/helm/policymanagementservice/templates/ingress.yaml [deleted file]
nonrtric/helm/policymanagementservice/templates/pg-secret.yaml [deleted file]
nonrtric/helm/policymanagementservice/templates/service.yaml [deleted file]
nonrtric/helm/policymanagementservice/templates/statefulset.yaml [deleted file]
nonrtric/helm/policymanagementservice/values.yaml [deleted file]
nonrtric/helm/rappmanager/.helmignore [deleted file]
nonrtric/helm/rappmanager/Chart.yaml [deleted file]
nonrtric/helm/rappmanager/requirements.yaml [deleted file]
nonrtric/helm/rappmanager/resources/config/application.yaml [deleted file]
nonrtric/helm/rappmanager/templates/configmap.yaml [deleted file]
nonrtric/helm/rappmanager/templates/ingress.yaml [deleted file]
nonrtric/helm/rappmanager/templates/secret.yaml [deleted file]
nonrtric/helm/rappmanager/templates/service.yaml [deleted file]
nonrtric/helm/rappmanager/templates/statefulset.yaml [deleted file]
nonrtric/helm/rappmanager/values.yaml [deleted file]
nonrtric/helm/servicemanager/Chart.yaml [deleted file]
nonrtric/helm/servicemanager/requirements.yaml [deleted file]
nonrtric/helm/servicemanager/templates/configmap.yaml [deleted file]
nonrtric/helm/servicemanager/templates/deployment.yaml [deleted file]
nonrtric/helm/servicemanager/templates/service.yaml [deleted file]
nonrtric/helm/servicemanager/values.yaml [deleted file]

diff --git a/RECIPE_EXAMPLE/NONRTRIC b/RECIPE_EXAMPLE/NONRTRIC
deleted file mode 120000 (symlink)
index fcd504e..0000000
+++ /dev/null
@@ -1 +0,0 @@
-../nonrtric/RECIPE_EXAMPLE/
\ No newline at end of file
diff --git a/bin/build-nonrtric-base b/bin/build-nonrtric-base
deleted file mode 100755 (executable)
index 00dd64e..0000000
+++ /dev/null
@@ -1,73 +0,0 @@
-#!/bin/bash
-################################################################################
-#   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.                                             #
-################################################################################
-
-ROOT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null && pwd )"
-
-#Check for helm3
-IS_HELM3=$(helm version -c --short|grep -e "^v3")
-
-CM_VERSION="v0.16.2"
-CM_PORT="8879"
-CM_BASE_URL="http://127.0.0.1:$CM_PORT"
-CM_CHART_GET_URL="$CM_BASE_URL/charts"
-CM_CHART_POST_URL="$CM_BASE_URL/charts/api/charts"
-
-if ! command -v chartmuseum &> /dev/null
-then
-  pushd /tmp
-  echo "Installing ChartMuseum binary..."
-  wget https://get.helm.sh/chartmuseum-$CM_VERSION-linux-amd64.tar.gz
-  tar xvfz chartmuseum-$CM_VERSION-linux-amd64.tar.gz
-  sudo mv /tmp/linux-amd64/chartmuseum /usr/local/bin/chartmuseum
-  popd
-else
-  echo "ChartMuseum is already installed."
-fi
-
-# Package common templates and serve it using Helm local repo
-HELM_LOCAL_REPO="./chartstorage"
-rm $HELM_LOCAL_REPO/*
-
-#Start Chart Museum server if there isn't one
-CHART_MUSEUM_PID=$(lsof -i :"$CM_PORT" | grep "chartmus" | grep -v "grep" | awk '{print $2}')
-if [ -z "$CHART_MUSEUM_PID" ]; then
-  echo "Starting ChartMuseum on port $CM_PORT..."
-  nohup chartmuseum --port=$CM_PORT --storage="local" --context-path=/charts --storage-local-rootdir=$HELM_LOCAL_REPO >/dev/null 2>&1 &
-  echo $! > $ROOT_DIR/CM_PID.txt
-else
-  echo "ChartMuseum is already running..."
-fi
-
-# Check if ChartMuseum  is ready to serve request
-command="curl --silent --output /dev/null  $CM_BASE_URL"
-for i in $(seq 1 5)
-do $command && s=0 && break || s=$? && echo "Failed to establish a connection with the ChartMuseum server. Retrying after 5s" && sleep 5;
-done
-
-if [ $s -gt 0 ]
-then
-        echo "Cmd to test ChartMuseum failed with ($s): $command"
-        exit $s
-fi
-
-helm repo remove local
-helm repo add local $CM_CHART_GET_URL
-
-echo -e "\nPackaging NONRTRIC common [nonrtric-common]"
-NONRTRIC_COMMON_CHART_VERSION=$(cat $ROOT_DIR/../ric-common/Common-Template/helm/nonrtric-common/Chart.yaml | grep version | awk '{print $2}')
-helm package -d /tmp $ROOT_DIR/../ric-common/Common-Template/helm/nonrtric-common
-curl --data-binary @/tmp/nonrtric-common-$NONRTRIC_COMMON_CHART_VERSION.tgz $CM_CHART_POST_URL
diff --git a/bin/deploy-nonrtric b/bin/deploy-nonrtric
deleted file mode 100755 (executable)
index db22a9f..0000000
+++ /dev/null
@@ -1,189 +0,0 @@
-#!/bin/bash
-################################################################################
-#   Copyright (c) 2023 Nordix Foundation.                                      #
-#   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.           #
-#   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.                                             #
-################################################################################
-
-# This script deploys NonRtRic components automatically
-
-
-
-if [ "$#" -eq 1 ]; then
-    OVERRIDEYAML=$1
-else
-
-    while [ -n "$1" ]; do # while loop starts
-
-        case "$1" in
-
-        -f) OVERRIDEYAML=$2
-            shift
-            ;;
-        *) echo "Option $1 not recognized" ;; # In case you typed a different option other than a,b,c
-
-        esac
-
-        shift
-
-    done
-fi
-
-
-if [ -z "$OVERRIDEYAML" ];then
-    echo "****************************************************************************************************************"
-    echo "                                                     ERROR                                                      "
-    echo "****************************************************************************************************************"
-    echo "RIC deployment without deployment recipe is currently disabled. Please specify an recipe with the -f option."
-    echo "****************************************************************************************************************"
-    exit 1
-fi
-
-if ! command -v yq > /dev/null 2>&1; then
-    echo "yq is not installed. Installing yq..."
-    ARCH=$(case $(uname -m) in x86_64) echo "amd64";; aarch64) echo "arm64";; *) uname -m;; esac)
-    VERSION="v4.45.4"
-    wget https://github.com/mikefarah/yq/releases/download/${VERSION}/yq_linux_${ARCH} -O /usr/local/bin/yq
-    chmod +x /usr/local/bin/yq
-fi
-
-INSTALL_KONG=$(cat $OVERRIDEYAML | yq e '.nonrtric.installKong' -)
-if [ $? -ne 0 ] || [ -z "$INSTALL_KONG"  ]; then
-    echo "Error: failed to parse installKong from YAML with yq. Aborting install."
-    exit 1
-fi
-
-INSTALL_CAPIF=$(cat $OVERRIDEYAML | yq e '.nonrtric.installCapifcore' -)
-if [ $? -ne 0 ] || [ -z "$INSTALL_CAPIF"  ]; then
-    echo "Error: failed to parse installCapifcore from YAML with yq. Aborting install."
-    exit 1
-fi
-
-INSTALL_SERVICEMANAGER=$(cat $OVERRIDEYAML | yq e '.nonrtric.installServicemanager' -)
-if [ $? -ne 0 ] || [ -z "$INSTALL_SERVICEMANAGER"  ]; then
-    echo "Error: failed to parse installServicemanager from YAML with yq. Aborting install."
-    exit 1
-fi
-
-if [ "$INSTALL_SERVICEMANAGER" == "true" ]; then
-    if [ "$INSTALL_KONG" == "false" ]; then
-        echo "Error: INSTALL_KONG must be true if INSTALL_SERVICEMANAGER is true. Aborting install."
-        exit 1
-    fi
-    if [ "$INSTALL_CAPIF" == "false" ]; then
-        echo "Error: INSTALL_CAPIF must be true if INSTALL_SERVICEMANAGER is true. Aborting install."
-        exit 1
-    fi
-fi
-
-ROOT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null && pwd )"
-
-echo "** $ROOT_DIR"
-rm $ROOT_DIR/../nonrtric/helm/*/charts/*.tgz
-
-source $ROOT_DIR/build-nonrtric-base
-
-charts_already_exists=()
-
-COMPONENTS="
-a1controller \
-a1simulator \
-capifcore \
-controlpanel \
-dmaapadapterservice \
-dmeparticipant \
-informationservice \
-nonrtricgateway \
-policymanagementservice \
-rappmanager \
-servicemanager \
-"
-
-for component in $COMPONENTS; do
-    echo "Packaging NONRTRIC component [$component]"
-    helm dep up $ROOT_DIR/../nonrtric/helm/$component
-    VERSION=$(cat $ROOT_DIR/../nonrtric/helm/$component/Chart.yaml | grep version | awk '{print $2}')
-    helm package -d /tmp $ROOT_DIR/../nonrtric/helm/$component
-    resp_code=$(curl -s -o /dev/null -w "%{http_code}" --data-binary @/tmp/$component-$VERSION.tgz $CM_CHART_POST_URL)
-    echo "Chart upload status of $component is $resp_code"
-    if [ "$resp_code" -eq 409 ]; then
-      charts_already_exists+=("$component")
-    fi
-done
-
-if [ ${#charts_already_exists[@]} -gt 0 ]; then
-  echo "----------------------------------- WARNING!!! -------------------------------------------"
-  echo "The following charts already exists in ChartMuseum '${charts_already_exists[@]}'."
-  echo "The current build of the charts hasn't been updated because the charts already exist."
-  echo "It is recommended to delete the charts from ChartMuseum before the build."
-  echo "------------------------------------------------------------------------------------------"
-fi
-
-helm dep up $ROOT_DIR/../nonrtric/helm/nonrtric
-
-helm repo index ${HELM_LOCAL_REPO}
-
-# Make sure that helm local repo is added
-helm repo add local $CM_CHART_GET_URL --force-update
-
-echo "Finished Packaging NONRTRIC components [$COMPONENTS]"
-
-
-COMMON_BLOCK=$(cat $OVERRIDEYAML | awk '/^common:/{getline; while ($0 ~ /^ +.*|^ *$/) {print $0; if (getline == 0) {break}}}')
-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}')
-
-if ! kubectl get ns ${NONRTRIC_NAMESPACE:-nonrtric}> /dev/null 2>&1; then
-    kubectl create ns ${NONRTRIC_NAMESPACE:-nonrtric}
-fi
-
-if ! kubectl get ns onap > /dev/null 2>&1; then
-    kubectl create ns onap
-fi
-
-HELM_NAME_OPT=""
-if [ -z $IS_HELM3 ];then
-   HELM_NAME_OPT="--name"
-fi
-
-echo "Install Kong- $INSTALL_KONG"
-
-if [ "$INSTALL_KONG" = true ];then
-  DEFAULT_SC=$(kubectl get sc -o jsonpath='{.items[?(@.metadata.annotations.storageclass\.kubernetes\.io/is-default-class=="true")].metadata.name}')
-  if [ -z "$DEFAULT_SC" ];then
-    echo "----------------------------------- WARNING!!! -------------------------------------------------------"
-    echo "Default storage class is not set."
-    echo "Kong PV and PVC creation may fail if it unable to create/use a storage class."
-    echo "Storage class for the kong installation can be specified in nonrtric/helm/kongstorage/kongvalues.yaml"
-    echo "------------------------------------------------------------------------------------------------------"
-  else
-    echo "Default storage class is set to $DEFAULT_SC"
-  fi
-
-  echo "Install kongstorage through helm"
-  helm install kongstorage -n "${NONRTRIC_NAMESPACE:-nonrtric}" ${HELM_NAME_OPT}  "$ROOT_DIR/../nonrtric/helm/kongstorage"
-
-  echo "Installing Kong"
-  helm repo add kong https://charts.konghq.com --force-update
-  helm repo update
-  helm install oran-nonrtric kong/kong -n ${NONRTRIC_NAMESPACE:-nonrtric} -f "$ROOT_DIR/../nonrtric/helm/kongstorage/kongvalues.yaml"
-fi
-
-kubectl create configmap -n ${NONRTRIC_NAMESPACE:-nonrtric} nonrtric-recipe --from-file=recipe=$OVERRIDEYAML
-
-echo "Deploying NONRTRIC"
-
-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"
\ No newline at end of file
diff --git a/bin/undeploy-nonrtric b/bin/undeploy-nonrtric
deleted file mode 100755 (executable)
index 46fad2e..0000000
+++ /dev/null
@@ -1,88 +0,0 @@
-#!/bin/bash
-################################################################################
-#   Copyright (c) 2023 Nordix Foundation.                                      #
-#   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.           #
-#   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.                                             #
-################################################################################
-
-# This script to undeploy the NONRTRIC
-ROOT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null && pwd )"
-echo "** $ROOT_DIR"
-
-COMPONENTS="
-a1controller \
-a1simulator \
-capifcore \
-controlpanel \
-dmaapadapterservice \
-dmeparticipant \
-informationservice \
-nonrtricgateway \
-policymanagementservice \
-rappmanager \
-servicemanager \
-"
-
-RECIPE_NAMESPACE=$(kubectl get cm --all-namespaces | grep nonrtric-recipe | awk '{print $1}')
-kubectl get configmap  -n $RECIPE_NAMESPACE nonrtric-recipe  -o jsonpath='{.data.recipe}' > /tmp/recipe.yaml
-
-if [ ! -s /tmp/recipe.yaml ]; then
-    echo "NONRTRIC recipe is not found. Are you sure it's deployed successfully?"
-    exit 0
-fi
-
-COMMON_BLOCK=$(cat /tmp/recipe.yaml | awk '/^common:/{getline; while ($0 ~ /^ +.*|^ *$/) {print $0; if (getline == 0) {break}}}')
-NAMESPACE_BLOCK=$(cat /tmp/recipe.yaml | 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_KONG=$(cat /tmp/recipe.yaml | awk '/^  installKong:/{print $2}')
-
-if [ "$INSTALL_KONG" = true ];then
-  echo "Uninstalling kongstorage"
-  helm delete kongstorage -n "${NONRTRIC_NAMESPACE:-nonrtric}"
-  echo "Uninstalling Kong"
-  helm delete oran-nonrtric -n ${NONRTRIC_NAMESPACE:-nonrtric}
-fi
-
-ROOT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null && pwd )"
-
-echo "Undeploying NONRTRIC components [$COMPONENTS]"
-
-IS_HELM3=$(helm version -c --short|grep -e "^v3")
-HELM_FLAG=''
-if [ $IS_HELM3 ]
-then
-  HELM_FLAG=' -n '${NONRTRIC_NAMESPACE:-nonrtric}
-else
-  HELM_FLAG='--purge'
-fi
-
-helm delete ${HELM_FLAG} ${RELEASE_PREFIX}
-
-kubectl delete cm -n ${NONRTRIC_NAMESPACE:-nonrtric} nonrtric-recipe
-
-kubectl delete ns ${NONRTRIC_NAMESPACE:-nonrtric}
-
-kubectl delete ns onap
-
-# Cleanup ChartMuseum
-CM_PID_FILE="$ROOT_DIR/CM_PID.txt"
-if [ -f $CM_PID_FILE ]; then
-  echo "Cleaning up ChartMuseum..."
-  PID=$(cat "$CM_PID_FILE")
-  echo "Killing ChartMuseum with PID $PID"
-  kill $PID
-  rm $CM_PID_FILE
-  echo "ChartMuseum cleanup completed"
-fi
diff --git a/bin/verify-nonrtric-charts b/bin/verify-nonrtric-charts
deleted file mode 100755 (executable)
index c454792..0000000
+++ /dev/null
@@ -1,65 +0,0 @@
-#!/bin/bash
-################################################################################
-#   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.                                             #
-################################################################################
-
-OVERRIDEYAML=$1
-
-ROOT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null && pwd )"
-
-source $ROOT_DIR/build-nonrtric-base
-
-echo "Create array of helm charts"
-CHART_ARRAY=()
-while IFS= read -r -d $'\0'; do
-    echo -e "File - $REPLY \n"
-    CHART_ARRAY+=("$REPLY")
-done < <(find $ROOT_DIR/../nonrtric -maxdepth 5 -name Chart.yaml -printf '%h\0')
-
-echo "***************************************"
-echo "Remove nonrtric parent chart from linting as its a conceptual visualization of Nonrtric components. This chart doesn't contain any templates & it's primarily
-used for grouping of all Nonrtric components in deployment"
-
-for dir in "${CHART_ARRAY[@]}"
-do
-    if [[ $dir == *"/helm/nonrtric"* ]]; then
-        echo "Skip Nonrtric Parent chart"
-    else
-    echo "Update chart dependency for directory $dir"
-    helm dep up $dir
-    # Lint clearly marks errors; e.g., [ERROR]
-    if [ -z $OVERRIDEYAML ]; then
-        helm lint $dir > /tmp/output 2>&1
-    else
-        helm lint -f $OVERRIDEYAML $dir> /tmp/output 2>&1
-    fi
-    echo "***************************************************************************************************************"
-    cat /tmp/output
-
-    egrep -q '^Error: [0-9]* chart\(s\) linted, [0-9]* chart\(s\) failed' /tmp/output && exit 1
-    echo "***************************************************************************************************************"
-
-    if [ -z $OVERRIDEYAML ]; then
-        helm template $dir > /tmp/output 2>&1
-    else
-       helm template -f $OVERRIDEYAML $dir > /tmp/output 2>&1
-    fi
-    echo "***************************************************************************************************************"
-    cat /tmp/output
-   sleep 1
-    egrep -n '%!.\(.*=.*\)' /tmp/output && echo "Error: Type mismatch." && exit 1
-    echo "***************************************************************************************************************"
-    fi
-done
diff --git a/ci/Dockerfile-nonrtric-install b/ci/Dockerfile-nonrtric-install
deleted file mode 100644 (file)
index ae6a9fd..0000000
+++ /dev/null
@@ -1,27 +0,0 @@
-################################################################################
-#   Copyright (c) 2019 AT&T Intellectual Property.                             #
-#   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.                                             #
-################################################################################
-
-FROM ubuntu:24.04
-RUN apt-get update && apt-get -y install curl ca-certificates wget curl lsof sudo
-ARG HELMVERSION=v3.15.4
-# often times out during LF jenkins build
-RUN wget https://get.helm.sh/helm-${HELMVERSION}-linux-amd64.tar.gz && tar -xvf ../helm-${HELMVERSION}-linux-amd64.tar.gz && mv linux-amd64/helm /usr/local/bin/helm
-ARG TGT=/tmp/it-dep
-COPY . $TGT
-# Remove the smo-install as this one will be verified in another verify job
-RUN rm -rf $TGT/smo-install
-RUN $TGT/bin/verify-nonrtric-charts
diff --git a/nonrtric/.gitignore b/nonrtric/.gitignore
deleted file mode 100644 (file)
index 5b7129c..0000000
+++ /dev/null
@@ -1,9 +0,0 @@
-# ignore all logs
-*.log
-*.tar
-*.tgz
-*.swp
-*.lock
-.tox
-docs/_build/
-.DS_STORE
diff --git a/nonrtric/RECIPE_EXAMPLE/example_recipe.yaml b/nonrtric/RECIPE_EXAMPLE/example_recipe.yaml
deleted file mode 100644 (file)
index 65f24ae..0000000
+++ /dev/null
@@ -1,328 +0,0 @@
-#  ============LICENSE_START===============================================
-#  Copyright (C) 2023 Nordix Foundation. 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.
-#  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=================================================
-
-#-------------------------------------------------------------------------
-# Global common setting
-#-------------------------------------------------------------------------
-
-
-# Here you can enable inclusion or exclusion of each component. A not enabled component will not be installed.
-nonrtric:
-  installPms: true
-  installA1controller: true
-  installA1simulator: true
-  installControlpanel: true
-  installInformationservice: true
-  installNonrtricgateway: true
-  installKong: true
-  installDmaapadapterservice: true
-  installCapifcore: true
-  installServicemanager: true
-  # 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
-  installDmeParticipant: false
-
-  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
-    hostPath: /var/nonrtric/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
-    hostPath: /var/nonrtric/ics-storage
-  volume3:
-    size: 1Gi
-    storageClassName: helmmanager-storage
-common:
-  releasePrefix: r3-dev-nonrtric
-# Do not change the namespace
-  namespace:
-    nonrtric: nonrtric
-  ingressClassName: kong
-
-informationservice:
-  informationservice:
-    imagePullPolicy: Always
-    image:
-      registry: 'nexus3.o-ran-sc.org:10002/o-ran-sc'
-      name: 'nonrtric-plt-informationcoordinatorservice'
-      tag: 1.6.0
-    service:
-      allowHttp: true
-      httpName: http
-      internalPort1: 9082
-      targetPort1: 8083
-      httpsName: https
-      internalPort2: 9083
-      targetPort2: 8434
-    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: 2Gi
-      storageClassName: ics-storage
-    ingress:
-      enabled: true
-
-# Need to check the external port Availability
-policymanagementservice:
-  policymanagementservice:
-    imagePullPolicy: Always
-    image:
-      registry: 'nexus3.o-ran-sc.org:10002/o-ran-sc'
-      name: nonrtric-plt-a1policymanagementservice
-      tag: 2.9.0
-    service:
-      allowHttp: true
-      httpName: http
-      internalPort1: 8081
-      targetPort1: 8081
-      httpsName: https
-      internalPort2: 8433
-      targetPort2: 8433
-    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: 2Gi
-      storageClassName: pms-storage
-    ingress:
-      enabled: true
-    #Volumepermissions needs to align with the container build arguments
-    volumepermissions:
-      groupid: 120957
-      userid: 120957
-    database:
-      # By default database is disabled
-      # Enabling this will start postgres and use that as storage
-      enabled: false
-      password: bXlwd2Q=
-  # These are the postgresql installation parameters
-  postgresql:
-    fullnameOverride: policymanagementservice-db
-    auth:
-      username: a1pms
-      existingSecret: policymanagementservice-pg-secret
-      database: a1pms
-    primary:
-      persistence:
-        # Persistence disabled by default.
-        # Restarting postgres container will clear the data.
-        # Persistence can be enabled by providing volume details in the below section (size, volumeName, storageClass).
-        enabled: false
-
-# A1 Controller may take few more minutes to start. Increase the initialDelaySeconds in liveness to avoid container restart.
-a1controller:
-  a1controller:
-    imagePullPolicy: Always
-    image:
-      registry: 'nexus3.onap.org:10002/onap'
-      name: sdnc-image
-      tag: 2.1.6
-    replicaCount: 1
-    service:
-      allowHttp: true
-      httpName: http
-      internalPort1: 8282
-      targetPort1: 8181
-      httpsName: https
-      internalPort2: 8383
-      targetPort2: 8443
-    liveness:
-      initialDelaySeconds: 300
-      periodSeconds: 10
-    readiness:
-      initialDelaySeconds: 60
-      periodSeconds: 10
-
-a1simulator:
-  a1simulator:
-    name: a1-sim
-    imagePullPolicy: Always
-    image:
-      registry: 'nexus3.o-ran-sc.org:10002/o-ran-sc'
-      name: a1-simulator
-      tag: 2.8.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
-    oscVersion:
-      name: a1-sim-osc
-      replicaCount: 2
-    stdVersion:
-      name: a1-sim-std
-      replicaCount: 2
-    stdVersion2:
-      name: a1-sim-std2
-      replicaCount: 2
-
-controlpanel:
-  controlpanel:
-    imagePullPolicy: Always
-    image:
-      registry: 'nexus3.o-ran-sc.org:10002/o-ran-sc'
-      name: nonrtric-controlpanel
-      tag: 2.5.0
-    replicaCount: 1
-    service:
-      allowHttp: true
-      httpName: http
-      internalPort1: 8080
-      targetPort1: 8080
-      externalPort1: 30091
-      httpsName: https
-      internalPort2: 8081
-      targetPort2: 8082
-      externalPort2: 30092
-    liveness:
-      initialDelaySeconds: 20
-      periodSeconds: 10
-    readiness:
-      initialDelaySeconds: 20
-      periodSeconds: 10
-    ingress:
-      enabled: false
-
-nonrtricgateway:
-  nonrtricgateway:
-    imagePullPolicy: Always
-    image:
-      registry: 'nexus3.o-ran-sc.org:10002/o-ran-sc'
-      name: nonrtric-gateway
-      tag: 1.2.0
-    service:
-      httpName: http
-      internalPort1: 9090
-      targetPort1: 9090
-      externalPort1: 30093
-    liveness:
-      initialDelaySeconds: 20
-      periodSeconds: 10
-    readiness:
-      initialDelaySeconds: 20
-      periodSeconds: 10
-
-dmaapadapterservice:
-  dmaapadapterservice:
-    imagePullPolicy: Always
-    image:
-      registry: 'nexus3.o-ran-sc.org:10002/o-ran-sc'
-      name: 'nonrtric-plt-dmaapadapter'
-      tag: 1.4.0
-    service:
-      allowHttp: true
-      httpName: http
-      internalPort1: 9087
-      targetPort1: 8084
-      httpsName: https
-      internalPort2: 9088
-      targetPort2: 8435
-    liveness:
-      initialDelaySeconds: 20
-      periodSeconds: 10
-    readiness:
-      initialDelaySeconds: 20
-      periodSeconds: 10
-
-capifcore:
-  capifcore:
-    imagePullPolicy: IfNotPresent
-    image:
-      registry: "nexus3.o-ran-sc.org:10004/o-ran-sc"
-      name: nonrtric-plt-capifcore
-      tag: 1.4.0
-    env:
-      chart_museum_url: "http://chartmuseum:8080"
-      repo_name: "capifcore"
-
-servicemanager:
-  servicemanager:
-    imagePullPolicy: IfNotPresent
-    image:
-      registry: "nexus3.o-ran-sc.org:10002/o-ran-sc"
-      name: nonrtric-plt-servicemanager
-      tag: 0.2.0
-
-rappmanager:
-  rappmanager:
-    imagePullPolicy: IfNotPresent
-    image:
-      registry: "nexus3.o-ran-sc.org:10002/o-ran-sc"
-      name: nonrtric-plt-rappmanager
-      tag: 0.2.0
-    service:
-      httpName: http
-      internalPort1: 8080
-      targetPort1: 8080
-    liveness:
-      initialDelaySeconds: 20
-      periodSeconds: 10
-    readiness:
-      initialDelaySeconds: 20
-      periodSeconds: 10
-    ingress:
-      enabled: true
-    acm:
-      username: cnVudGltZVVzZXI=
-      password: emIhWHp0RzM0
-
-dmeparticipant:
-  dmeparticipant:
-    imagePullPolicy: IfNotPresent
-    image:
-      registry: "nexus3.o-ran-sc.org:10002/o-ran-sc"
-      name: nonrtric-plt-participant-impl-dme
-      tag: 0.2.0
-    service:
-      httpName: http
-      internalPort1: 8080
-      targetPort1: 8080
-    liveness:
-      initialDelaySeconds: 20
-      periodSeconds: 10
-    readiness:
-      initialDelaySeconds: 20
-      periodSeconds: 10
-    ingress:
-      enabled: false
-    security:
-      username: cGFydGljaXBhbnRVc2VyCg==
-      password: emIhWHp0RzM0
diff --git a/nonrtric/data/README.md b/nonrtric/data/README.md
deleted file mode 100644 (file)
index 3815ef2..0000000
+++ /dev/null
@@ -1,24 +0,0 @@
-# O-RAN-SC Non-RealTime RIC data
-
-In this folder, there are some scripts to populate data into nonrtric k8s deployment
-
-# How to run the scripts
-
-bash prepare_data.sh
-
-## License
-
-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.
-
-For more information about license please see the [LICENSE](LICENSE.txt) file for details.
diff --git a/nonrtric/data/prepare_data.sh b/nonrtric/data/prepare_data.sh
deleted file mode 100755 (executable)
index 0181f6d..0000000
+++ /dev/null
@@ -1,34 +0,0 @@
-#!/bin/bash
-
-#  ============LICENSE_START===============================================
-#  Copyright (C) 2020 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=================================================
-#
-
-# This script is populating some data into nonrtric for demo/test purpose.
-# First this script copies data/ folder into one of the rics, in below case a1-sim-osc-0.
-# Then from the ric, run populate_policy_data.sh and populate_information_data.sh.
-# populate_policy_data.sh creates policy-types, service, and policies.
-# populate_information_data.sh creates EiProducer, EiType, and EiJob.
-#
-# Why we run the scripts in the ric, not from the host?
-# Because a1-simulators(ric) are deployed in statefulset,
-# they are not exposed to outside the k8s cluster.
-# And we must create policy type into the ric first.
-# Similarly, the informationservice is not exposed outside the k8s cluster,
-# hence the commands for populating information data need to be run from within the cluster.
-
-kubectl -n nonrtric cp run_in_k8s a1-sim-osc-0:/usr/src/app/
-kubectl -n nonrtric exec -it a1-sim-osc-0 -- bash -c 'cd run_in_k8s/ && ./populate_policy_data.sh && ./populate_information_data.sh'
\ No newline at end of file
diff --git a/nonrtric/data/run_in_k8s/populate_information_data.sh b/nonrtric/data/run_in_k8s/populate_information_data.sh
deleted file mode 100755 (executable)
index 71bd916..0000000
+++ /dev/null
@@ -1,82 +0,0 @@
-#!/bin/bash
-
-#  ============LICENSE_START===============================================
-#  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=================================================
-#
-
-# This script will generate some dummy information data in the running system.
-# It will create:
-# one EiProducer in ICS
-# one EiType in ICS
-# one EiJob in ICS
-
-ics_host="informationservice"
-ics_port="9082"
-httpx=http
-
-echo "ICS status:"
-curl -skw " %{http_code}" $httpx://$ics_host:$ics_port/status
-echo -e "\n"
-
-# Create EiType
-echo "Create EiType:"
-curl -X PUT -skw %{http_code} $httpx://$ics_host:$ics_port/data-producer/v1/info-types/type1 -H accept:application/json -H Content-Type:application/json --data-binary @testdata/ICS/EiType.json
-echo -e "\n"
-
-# Get EiTypes
-echo "Get EiTypes:"
-curl -X GET -skw %{http_code} $httpx://$ics_host:$ics_port/data-producer/v1/info-types -H Content-Type:application/json
-echo -e "\n"
-
-# Get Individual EiType
-echo "Get Individual EiType:"
-curl -X GET -skw %{http_code} $httpx://$ics_host:$ics_port/data-producer/v1/info-types/type1 -H Content-Type:application/json
-echo -e "\n"
-
-# Create EiProducer
-echo "Create EiProducer:"
-curl -X PUT -skw %{http_code} $httpx://$ics_host:$ics_port/data-producer/v1/info-producers/1 -H Content-Type:application/json --data-binary @testdata/ICS/EiProducer.json
-echo -e "\n"
-
-# Get EiProducers
-echo "Get EiProducers:"
-curl -X GET -skw %{http_code} $httpx://$ics_host:$ics_port/data-producer/v1/info-producers -H Content-Type:application/json
-echo -e "\n"
-
-# Get Individual EiProducer
-echo "Get Individual EiProducer:"
-curl -X GET -skw %{http_code} $httpx://$ics_host:$ics_port/data-producer/v1/info-producers/1 -H Content-Type:application/json
-echo -e "\n"
-
-# Get Individual EiProducer Status
-echo "Get Individual EiProducer:"
-curl -X GET -skw %{http_code} $httpx://$ics_host:$ics_port/data-producer/v1/info-producers/1/status -H Content-Type:application/json
-echo -e "\n"
-
-# Create EiJob
-echo "Create EiJob Of A Certain Type type1:"
-curl -X PUT -skw %{http_code} $httpx://$ics_host:$ics_port/data-consumer/v1/info-jobs/job1 -H Content-Type:application/json --data-binary @testdata/ICS/EiJob.json
-echo -e "\n"
-
-# Get EiJobs
-echo "Get EiJobs:"
-curl -X GET -skw %{http_code} $httpx://$ics_host:$ics_port/data-consumer/v1/info-jobs -H Content-Type:application/json
-echo -e "\n"
-
-# Get Individual EiJob:
-echo "Get Individual EiJob:"
-curl -X GET -skw %{http_code} $httpx://$ics_host:$ics_port/data-consumer/v1/info-jobs/job1 -H Content-Type:application/json
-echo -e "\n"
\ No newline at end of file
diff --git a/nonrtric/data/run_in_k8s/populate_policy_data.sh b/nonrtric/data/run_in_k8s/populate_policy_data.sh
deleted file mode 100755 (executable)
index 4f15e89..0000000
+++ /dev/null
@@ -1,140 +0,0 @@
-#!/bin/bash
-
-#  ============LICENSE_START===============================================
-#  Copyright (C) 2020 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=================================================
-#
-
-# The scripts in data/ will generate some dummy data in the running system.
-# It will create:
-# one service in policy agent
-# one policy-type and one policy in a1-sim-OSC_0
-# one policy in a1-sim-STD_0 (with no policy-type)
-# one policy-type and one policy in a1-sim-STD2_0
-
-policy_agent_host="policymanagementservice"
-policy_agent_port="8081"
-a1_sim_osc_0_host="a1-sim-osc-0.a1-sim"
-a1_sim_osc_0_port="8085"
-a1_sim_osc_1_host="a1-sim-osc-1.a1-sim"
-a1_sim_osc_1_port="8085"
-a1_sim_std_0_host="a1-sim-std-0.a1-sim"
-a1_sim_std_0_port="8085"
-a1_sim_std_1_host="a1-sim-std-1.a1-sim"
-a1_sim_std_1_port="8085"
-a1_sim_std2_0_host="a1-sim-std2-0.a1-sim"
-a1_sim_std2_0_port="8085"
-a1_sim_std2_1_host="a1-sim-std2-1.a1-sim"
-a1_sim_std2_1_port="8085"
-httpx=http
-
-echo "policy agent status:"
-curl -skw " %{http_code}" $httpx://$policy_agent_host:$policy_agent_port/status
-echo -e "\n"
-
-echo "ric1 version:"
-curl -skw " %{http_code}" $httpx://$a1_sim_osc_0_host:$a1_sim_osc_0_port/counter/interface
-echo -e "\n"
-
-echo "ric2 version:"
-curl -skw " %{http_code}" $httpx://$a1_sim_osc_1_host:$a1_sim_osc_1_port/counter/interface
-echo -e "\n"
-
-echo "ric3 version:"
-curl -skw " %{http_code}" $httpx://$a1_sim_std_0_host:$a1_sim_std_0_port/counter/interface
-echo -e "\n"
-
-echo "ric4 version:"
-curl -skw " %{http_code}" $httpx://$a1_sim_std_1_host:$a1_sim_std_1_port/counter/interface
-echo -e "\n"
-
-echo "ric5 version:"
-curl -skw " %{http_code}" $httpx://$a1_sim_std2_0_host:$a1_sim_std_0_port/counter/interface
-echo -e "\n"
-
-echo "ric6 version:"
-curl -skw " %{http_code}" $httpx://$a1_sim_std2_1_host:$a1_sim_std_1_port/counter/interface
-echo -e "\n"
-
-echo "create policy type 1 to ric1:"
-curl -X PUT -skw " %{http_code}" $httpx://$a1_sim_osc_0_host:$a1_sim_osc_0_port/policytype?id=1 -H Content-Type:application/json --data-binary @testdata/OSC/policy_type.json
-echo -e "\n"
-
-echo "create policy type 1 to ric2:"
-curl -X PUT -skw " %{http_code}" $httpx://$a1_sim_osc_1_host:$a1_sim_osc_1_port/policytype?id=1 -H Content-Type:application/json --data-binary @testdata/OSC/policy_type.json
-echo -e "\n"
-
-echo "create policy type 2 to STD2 ric5:"
-curl -X PUT -skw " %{http_code}" $httpx://$a1_sim_std2_0_host:$a1_sim_std2_0_port/policytype?id=2 -H Content-Type:application/json --data-binary @testdata/STD/v2/policy_type.json
-echo -e "\n"
-
-echo "create policy type 2 to STD2 ric6:"
-curl -X PUT -skw " %{http_code}" $httpx://$a1_sim_std2_1_host:$a1_sim_std2_1_port/policytype?id=2 -H Content-Type:application/json --data-binary @testdata/STD/v2/policy_type.json
-echo -e "\n"
-
-for i in {1..12}; do
-       echo "policy types from policy agent:"
-    curlString="curl -skw %{http_code} $httpx://$policy_agent_host:$policy_agent_port/a1-policy/v2/policy-types"
-    res=$($curlString)
-    echo "$res"
-    expect="{\"policytype_ids\":[\"\",\"1\",\"2\"]}200"
-    if [ "$res" == "$expect" ]; then
-        echo -e "\n"
-        break;
-    else
-        sleep $i
-    fi
-done
-
-echo "create service1 to policy agent:"
-curl -k -X PUT -sw " %{http_code}" -H accept:application/json -H Content-Type:application/json "$httpx://$policy_agent_host:$policy_agent_port/a1-policy/v2/services" --data-binary @testdata/service.json
-echo -e "\n"
-
-echo "create policy aa8feaa88d944d919ef0e83f2172a5000 to ric1 with type1 and service1 via policy agent:"
-curl -k -X PUT -sw " %{http_code}" -H accept:application/json -H Content-Type:application/json "$httpx://$policy_agent_host:$policy_agent_port/a1-policy/v2/policies" --data-binary @testdata/OSC/policy.json
-echo -e "\n"
-
-echo "create policy aa8feaa88d944d919ef0e83f2172a5100 to ric3 with service1 via policy agent, no type:"
-curl -k -X PUT -sw " %{http_code}" -H accept:application/json -H Content-Type:application/json "$httpx://$policy_agent_host:$policy_agent_port/policy?id=aa8feaa88d944d919ef0e83f2172a5100&ric=ric3&service=service1" --data-binary @testdata/STD/v1/policy.json
-echo -e "\n"
-
-echo "create policy aa8feaa88d944d919ef0e83f2172a5200 to ric5 with type2 and service1 via policy agent:"
-curl -k -X PUT -sw " %{http_code}" -H accept:application/json -H Content-Type:application/json "$httpx://$policy_agent_host:$policy_agent_port/a1-policy/v2/policies" --data-binary @testdata/STD/v2/policy.json
-echo -e "\n"
-
-echo "policy numbers from ric1:"
-curl -skw " %{http_code}" $httpx://$a1_sim_osc_0_host:$a1_sim_osc_0_port/counter/num_instances
-echo -e "\n"
-
-echo "policy numbers from ric3:"
-curl -skw " %{http_code}" $httpx://$a1_sim_std_0_host:$a1_sim_std_0_port/counter/num_instances
-echo -e "\n"
-
-echo "policy numbers from ric5:"
-curl -skw " %{http_code}" $httpx://$a1_sim_std2_0_host:$a1_sim_std2_0_port/counter/num_instances
-echo -e "\n"
-
-echo "policy id aa8feaa88d944d919ef0e83f2172a5000 from policy agent:"
-curl -k -X GET -sw " %{http_code}" $httpx://$policy_agent_host:$policy_agent_port/a1-policy/v2/policies/aa8feaa88d944d919ef0e83f2172a5000
-echo -e "\n"
-
-echo "policy id aa8feaa88d944d919ef0e83f2172a5100 from policy agent:"
-curl -k -X GET -sw " %{http_code}" $httpx://$policy_agent_host:$policy_agent_port/a1-policy/v2/policies/aa8feaa88d944d919ef0e83f2172a5100
-echo -e "\n"
-
-echo "policy id aa8feaa88d944d919ef0e83f2172a5200 from policy agent:"
-curl -k -X GET -sw " %{http_code}" $httpx://$policy_agent_host:$policy_agent_port/a1-policy/v2/policies/aa8feaa88d944d919ef0e83f2172a5200
-echo -e "\n"
-
diff --git a/nonrtric/data/run_in_k8s/testdata/ICS/EiJob.json b/nonrtric/data/run_in_k8s/testdata/ICS/EiJob.json
deleted file mode 100644 (file)
index 3939ee1..0000000
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-    "info_type_id": "type1",
-    "job_result_uri": "https://ricsim_g3_1:8185/datadelivery",
-    "job_owner": "ricsim_g3_1",
-    "status_notification_uri": "http://producer:80/",
-    "job_definition": {
-        "jobparam1": "value1_job1",
-        "jobparam2": "value2_job1",
-        "jobparam3": "value3_job1"
-    }
-}
\ No newline at end of file
diff --git a/nonrtric/data/run_in_k8s/testdata/ICS/EiProducer.json b/nonrtric/data/run_in_k8s/testdata/ICS/EiProducer.json
deleted file mode 100644 (file)
index 4b7c6c9..0000000
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-    "supported_info_types":["type1"],
-    "info_job_callback_url": "https://producer-stub:8093/callbacks/job/prod-a",
-    "info_producer_supervision_callback_url": "https://producer-stub:8093/callbacks/supervision/prod-a"
-}
\ No newline at end of file
diff --git a/nonrtric/data/run_in_k8s/testdata/ICS/EiType.json b/nonrtric/data/run_in_k8s/testdata/ICS/EiType.json
deleted file mode 100644 (file)
index 8618555..0000000
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-   "info_job_data_schema":{
-      "$schema":"http://json-schema.org/draft-07/schema#",
-      "title":"STD_Type1_1.0.0",
-      "description":"EI-Type 1",
-      "type":"object"
-   }
-}
\ No newline at end of file
diff --git a/nonrtric/data/run_in_k8s/testdata/OSC/policy.json b/nonrtric/data/run_in_k8s/testdata/OSC/policy.json
deleted file mode 100644 (file)
index cae1d32..0000000
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "ric_id": "ric1",
-  "policy_id": "aa8feaa88d944d919ef0e83f2172a5000",
-  "service_id": "service1",
-  "policy_data": {
-    "scope": {
-      "ueId": "ue5000",
-      "qosId": "qos5000"
-    },
-    "qosObjectives": {
-      "priorityLevel": 5000
-    }
-  },
-  "policytype_id": "1"
-}
\ No newline at end of file
diff --git a/nonrtric/data/run_in_k8s/testdata/OSC/policy_type.json b/nonrtric/data/run_in_k8s/testdata/OSC/policy_type.json
deleted file mode 100644 (file)
index aeea773..0000000
+++ /dev/null
@@ -1,45 +0,0 @@
-{
-  "name": "pt1",
-  "description": "pt1 policy type",
-  "policy_type_id": 1,
-  "create_schema": {
-    "$schema": "http://json-schema.org/draft-07/schema#",
-    "title": "OSC_Type1_1.0.0",
-    "description": "Type 1 policy type",
-    "type": "object",
-    "properties": {
-      "scope": {
-        "type": "object",
-        "properties": {
-          "ueId": {
-            "type": "string"
-          },
-          "qosId": {
-            "type": "string"
-          }
-        },
-        "additionalProperties": false,
-        "required": [
-          "ueId",
-          "qosId"
-        ]
-      },
-      "qosObjectives": {
-        "type": "object",
-        "properties": {
-          "priorityLevel": {
-            "type": "number"
-          }
-        },
-        "additionalProperties": false,
-        "required": [
-          "priorityLevel"
-        ]
-      }
-    },
-    "additionalProperties": false,
-    "required": [
-      "scope", "qosObjectives"
-    ]
-  }
-}
diff --git a/nonrtric/data/run_in_k8s/testdata/STD/v1/policy.json b/nonrtric/data/run_in_k8s/testdata/STD/v1/policy.json
deleted file mode 100644 (file)
index 745eab6..0000000
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "scope": {
-    "ueId": "ue5100",
-    "qosId": "qos5100"
-  },
-  "qosObjectives": {
-    "priorityLevel": 5100
-  }
-}
diff --git a/nonrtric/data/run_in_k8s/testdata/STD/v2/policy.json b/nonrtric/data/run_in_k8s/testdata/STD/v2/policy.json
deleted file mode 100644 (file)
index 814469b..0000000
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-    "ric_id": "ric5",
-    "policy_id": "aa8feaa88d944d919ef0e83f2172a5200",
-    "service_id": "service1",
-    "policytype_id": "2",
-    "status_notification_uri": "http://callback-receiver:8090/callbacks/test",
-    "policy_data": {
-        "scope": {
-            "ueId": "ue5200",
-            "qosId": "qos5200"
-        },
-        "qosObjectives": {
-            "priorityLevel": 5200
-        }
-    }
-}
diff --git a/nonrtric/data/run_in_k8s/testdata/STD/v2/policy_type.json b/nonrtric/data/run_in_k8s/testdata/STD/v2/policy_type.json
deleted file mode 100644 (file)
index 931498c..0000000
+++ /dev/null
@@ -1,56 +0,0 @@
-{
-    "policySchema": {
-      "$schema": "http://json-schema.org/draft-07/schema#",
-      "title": "STD_QOS_0_2_0",
-      "description": "STD QOS policy type",
-      "type": "object",
-      "properties": {
-        "scope": {
-          "type": "object",
-          "properties": {
-            "ueId": {
-              "type": "string"
-            },
-            "qosId": {
-              "type": "string"
-            }
-          },
-          "additionalProperties": false,
-          "required": [
-            "ueId",
-            "qosId"
-          ]
-        },
-        "qosObjectives": {
-          "type": "object",
-          "properties": {
-            "priorityLevel": {
-              "type": "number"
-            }
-          },
-          "additionalProperties": false,
-          "required": [
-            "priorityLevel"
-          ]
-        }
-      }
-    },
-    "statusSchema": {
-      "$schema": "http://json-schema.org/draft-07/schema#",
-      "title": "STD_QOS_0.2.0",
-      "description": "STD QOS policy type status",
-      "type": "object",
-      "properties": {
-        "enforceStatus": {
-          "type": "string"
-        },
-        "enforceReason": {
-          "type": "string"
-        },
-        "additionalProperties": false,
-        "required": [
-          "enforceStatus"
-        ]
-      }
-    }
-  }
\ No newline at end of file
diff --git a/nonrtric/data/run_in_k8s/testdata/service.json b/nonrtric/data/run_in_k8s/testdata/service.json
deleted file mode 100644 (file)
index 66f43ac..0000000
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-    "callback_url": "http://callback-receiver:8090/callbacks/service1",
-    "keep_alive_interval_seconds": "3600",
-    "service_id": "service1"
-}
\ No newline at end of file
diff --git a/nonrtric/helm/a1controller/.helmignore b/nonrtric/helm/a1controller/.helmignore
deleted file mode 100644 (file)
index 50af031..0000000
+++ /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/a1controller/Chart.yaml b/nonrtric/helm/a1controller/Chart.yaml
deleted file mode 100644 (file)
index 99ced47..0000000
+++ /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 nonrtric a1controller
-name: a1controller
-version: 2.0.0
diff --git a/nonrtric/helm/a1controller/requirements.yaml b/nonrtric/helm/a1controller/requirements.yaml
deleted file mode 100644 (file)
index f3b3ecd..0000000
+++ /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/a1controller/templates/deployment.yaml b/nonrtric/helm/a1controller/templates/deployment.yaml
deleted file mode 100644 (file)
index e21ce87..0000000
+++ /dev/null
@@ -1,120 +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.a1controller" . }}
-  namespace: {{ include "common.namespace.nonrtric" . }}
-  generation: 1
-  labels:
-    app: {{ include "common.namespace.nonrtric" . }}-{{ include "common.name.a1controller" . }}
-    chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
-    release: {{ .Release.Name }}
-    heritage: {{ .Release.Service }}
-  annotations:
-    deployment.kubernetes.io/revision: '1'
-spec:
-  replicas: {{ .Values.a1controller.replicaCount }}
-  selector:
-    matchLabels:
-      app: {{ include "common.namespace.nonrtric" . }}-{{ include "common.name.a1controller" . }}
-      release: {{ .Release.Name }}
-  template:
-    metadata:
-      labels:
-        app: {{ include "common.namespace.nonrtric" . }}-{{ include "common.name.a1controller" . }}
-        release: {{ .Release.Name }}
-    spec:
-      hostname: {{ include "common.name.a1controller" . }}
-      containers:
-        - name: {{ include "common.containername.a1controller" . }}
-          image: {{ .Values.a1controller.image.registry }}/{{ .Values.a1controller.image.name }}:{{ .Values.a1controller.image.tag }}
-          imagePullPolicy: {{ .Values.a1controller.imagePullPolicy }}
-          command:
-            - /opt/onap/sdnc/bin/startODL.sh
-          ports:
-            - containerPort: {{ .Values.a1controller.service.targetPort1 }}
-              protocol: TCP
-            - containerPort: {{ .Values.a1controller.service.targetPort2 }}
-              protocol: TCP
-          env:
-            - name: MYSQL_ROOT_PASSWORD
-              value: 'itsASecret'
-            - name: MYSQL_USER
-              value: 'sdnctl'
-            - name: MYSQL_PASSWORD
-              value: 'gamma'
-            - name: MYSQL_DATABASE
-              value: 'sdnctl'
-            - name: SDNC_CONFIG_DIR
-              value: '/opt/onap/sdnc/data/properties'
-            - name: SDNC_BIN
-              value: '/opt/onap/sdnc/bin'
-            - name: ODL_CERT_DIR
-              value: '/tmp'
-            - name: ODL_ADMIN_USERNAME
-              value: admin
-            - name: ODL_ADMIN_PASSWORD
-              value: 'Kp8bJ4SXszM0WXlhak3eHlcse2gAw84vaoGGmJvUy2U'
-            - name: ODL_USERNAME
-              value: admin
-            - name: ODL_PASSWORD
-              value: 'Kp8bJ4SXszM0WXlhak3eHlcse2gAw84vaoGGmJvUy2U'
-            - name: SDNC_DB_INIT
-              value: 'true'
-            - name: A1_TRUSTSTORE_PASSWORD
-              value: 'a1adapter'
-            - name: AAI_TRUSTSTORE_PASSWORD
-              value: 'changeit'
-          readinessProbe:
-            tcpSocket:
-              port: {{ .Values.a1controller.service.targetPort1 }}
-            initialDelaySeconds: {{ .Values.a1controller.readiness.initialDelaySeconds }}
-            periodSeconds: {{ .Values.a1controller.readiness.periodSeconds }}
-          livenessProbe:
-            tcpSocket:
-              port: {{ .Values.a1controller.service.targetPort1 }}
-            initialDelaySeconds: {{ .Values.a1controller.liveness.initialDelaySeconds }}
-            periodSeconds: {{ .Values.a1controller.liveness.periodSeconds }}
----
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: db
-  namespace: {{ include "common.namespace.nonrtric" . }}
-  labels:
-    app: db
-spec:
-  selector:
-    matchLabels:
-      app: db
-  template:
-    metadata:
-      labels:
-        app: db
-    spec:
-      containers:
-        - name: sdnc-db-container
-          image: nexus3.o-ran-sc.org:10001/mariadb:10.5
-          imagePullPolicy: IfNotPresent
-          env:
-            - name: MYSQL_ROOT_HOST
-              value: '%'
-            - name: MYSQL_ROOT_PASSWORD
-              value: 'itsASecret'
-          ports:
-            - containerPort: 3306
\ No newline at end of file
diff --git a/nonrtric/helm/a1controller/templates/service.yaml b/nonrtric/helm/a1controller/templates/service.yaml
deleted file mode 100644 (file)
index 5259bb8..0000000
+++ /dev/null
@@ -1,66 +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.a1controller" . }}
-  namespace: {{ include "common.namespace.nonrtric" . }}
-  labels:
-    app: {{ include "common.namespace.nonrtric" . }}-{{ include "common.name.a1controller" . }}
-    chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
-    release: {{ .Release.Name }}
-    heritage: {{ .Release.Service }}
-spec:
-  type: ClusterIP
-  ports:
-    {{if eq .Values.a1controller.service.allowHttp true -}}
-    - name: {{ index .Values.a1controller.service.httpName }}
-      port: {{ .Values.a1controller.service.internalPort1 }}
-      targetPort: {{ .Values.a1controller.service.targetPort1 }}
-      protocol: TCP
-    {{- end }}
-    - name: {{ index .Values.a1controller.service.httpsName }}
-      port: {{ .Values.a1controller.service.internalPort2 }}
-      targetPort: {{ .Values.a1controller.service.targetPort2 }}
-      protocol: TCP
-  selector:
-    app: {{ include "common.namespace.nonrtric" . }}-{{ include "common.name.a1controller" . }}
-    release: {{ .Release.Name }}
----
-apiVersion: v1
-kind: Service
-metadata:
-  name: dbhost
-  namespace: {{ include "common.namespace.nonrtric" . }}
-spec:
-  ports:
-    - port: 3306
-      targetPort: 3306
-  selector:
-    app: db
----
-apiVersion: v1
-kind: Service
-metadata:
-  name: sdnctldb01
-  namespace: {{ include "common.namespace.nonrtric" . }}
-spec:
-  ports:
-    - port: 3306
-      targetPort: 3306
-  selector:
-    app: db
diff --git a/nonrtric/helm/a1controller/values.yaml b/nonrtric/helm/a1controller/values.yaml
deleted file mode 100644 (file)
index 6f0410d..0000000
+++ /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 a1controller.
-# This is a YAML-formatted file.
-# Declare variables to be passed into your templates.
-a1controller:
-  imagePullPolicy: IfNotPresent
-  image:
-    registry: 'nexus3.onap.org:10002/onap'
-    name: sdnc-image
-    tag: 2.1.6
-  replicaCount: 1
-  service:
-    allowHttp: true
-    httpName: http
-    internalPort1: 8282
-    targetPort1: 8181
-    httpsName: https
-    internalPort2: 8383
-    targetPort2: 8443
-  liveness:
-    initialDelaySeconds: 60
-    periodSeconds: 10
-  readiness:
-    initialDelaySeconds: 60
-    periodSeconds: 10
diff --git a/nonrtric/helm/a1simulator/.helmignore b/nonrtric/helm/a1simulator/.helmignore
deleted file mode 100644 (file)
index 50af031..0000000
+++ /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/a1simulator/Chart.yaml b/nonrtric/helm/a1simulator/Chart.yaml
deleted file mode 100644 (file)
index 60d0cbf..0000000
+++ /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 A1 simulator
-name: a1simulator
-version: 2.0.0
diff --git a/nonrtric/helm/a1simulator/requirements.yaml b/nonrtric/helm/a1simulator/requirements.yaml
deleted file mode 100644 (file)
index f3b3ecd..0000000
+++ /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/a1simulator/templates/service.yaml b/nonrtric/helm/a1simulator/templates/service.yaml
deleted file mode 100644 (file)
index d22654c..0000000
+++ /dev/null
@@ -1,41 +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: {{ .Values.a1simulator.name }}
-  namespace: {{ include "common.namespace.nonrtric" . }}
-  labels:
-    app: {{ include "common.namespace.nonrtric" . }}-{{ include "common.name.a1simulator" . }}
-    chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
-    release: {{ .Release.Name }}
-    heritage: {{ .Release.Service }}
-spec:
-  ports:
-    - name: {{ index .Values.a1simulator.service.httpName }}
-      port: {{ .Values.a1simulator.service.internalPort1 }}
-      targetPort: {{ .Values.a1simulator.service.targetPort1 }}
-      protocol: TCP
-    - name: {{ index .Values.a1simulator.service.httpsName }}
-      port: {{ .Values.a1simulator.service.internalPort2 }}
-      targetPort: {{ .Values.a1simulator.service.targetPort2 }}
-      protocol: TCP
-  selector:
-    app: {{ include "common.namespace.nonrtric" . }}-{{ include "common.name.a1simulator" . }}
-    release: {{ .Release.Name }}
-  type: ClusterIP
-  clusterIP: None
\ No newline at end of file
diff --git a/nonrtric/helm/a1simulator/templates/statefulset.yaml b/nonrtric/helm/a1simulator/templates/statefulset.yaml
deleted file mode 100644 (file)
index 939f3a3..0000000
+++ /dev/null
@@ -1,172 +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: StatefulSet
-apiVersion: apps/v1
-metadata:
-  name: {{ .Values.a1simulator.oscVersion.name }}
-  namespace: {{ include "common.namespace.nonrtric" . }}
-  generation: 1
-  labels:
-    app: {{ include "common.namespace.nonrtric" . }}-{{ include "common.name.a1simulator" . }}
-    chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
-    release: {{ .Release.Name }}
-    heritage: {{ .Release.Service }}
-  annotations:
-    deployment.kubernetes.io/revision: '1'
-spec:
-  replicas: {{ .Values.a1simulator.oscVersion.replicaCount }}
-  selector:
-    matchLabels:
-      app: {{ include "common.namespace.nonrtric" . }}-{{ include "common.name.a1simulator" . }}
-      release: {{ .Release.Name }}
-  serviceName: {{ .Values.a1simulator.name }}
-  template:
-    metadata:
-      labels:
-        app: {{ include "common.namespace.nonrtric" . }}-{{ include "common.name.a1simulator" . }}
-        release: {{ .Release.Name }}
-    spec:
-      hostname: {{ include "common.name.a1simulator" . }}
-      containers:
-      - name: {{ include "common.containername.a1simulator" . }}
-        image: {{ .Values.a1simulator.image.registry }}/{{ .Values.a1simulator.image.name }}:{{ .Values.a1simulator.image.tag }}
-        imagePullPolicy: {{ .Values.a1simulator.imagePullPolicy }}
-        ports:
-        - containerPort: {{ .Values.a1simulator.service.targetPort1 }}
-          protocol: TCP
-        - containerPort: {{ .Values.a1simulator.service.targetPort2 }}
-          protocol: TCP
-        readinessProbe:
-          tcpSocket:
-            port: {{ .Values.a1simulator.service.targetPort1 }}
-          initialDelaySeconds: {{ .Values.a1simulator.readiness.initialDelaySeconds }}
-          periodSeconds: {{ .Values.a1simulator.readiness.periodSeconds }}
-        livenessProbe:
-          tcpSocket:
-            port: {{ .Values.a1simulator.service.targetPort1 }}
-          initialDelaySeconds: {{ .Values.a1simulator.liveness.initialDelaySeconds }}
-          periodSeconds: {{ .Values.a1simulator.liveness.periodSeconds }}
-        env:
-        - name: A1_VERSION
-          value: OSC_2.1.0
-        - name: ALLOW_HTTP
-          value: {{ .Values.a1simulator.service.allowHttp | quote}}
-
----
-kind: StatefulSet
-apiVersion: apps/v1
-metadata:
-  name: {{ .Values.a1simulator.stdVersion.name }}
-  namespace: {{ include "common.namespace.nonrtric" . }}
-  generation: 1
-  labels:
-    app: {{ include "common.namespace.nonrtric" . }}-{{ include "common.name.a1simulator" . }}
-    chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
-    release: {{ .Release.Name }}
-    heritage: {{ .Release.Service }}
-  annotations:
-    deployment.kubernetes.io/revision: '1'
-spec:
-  replicas: {{ .Values.a1simulator.stdVersion.replicaCount }}
-  selector:
-    matchLabels:
-      app: {{ include "common.namespace.nonrtric" . }}-{{ include "common.name.a1simulator" . }}
-      release: {{ .Release.Name }}
-  serviceName: {{ .Values.a1simulator.name }}
-  template:
-    metadata:
-      labels:
-        app: {{ include "common.namespace.nonrtric" . }}-{{ include "common.name.a1simulator" . }}
-        release: {{ .Release.Name }}
-    spec:
-      hostname: {{ include "common.name.a1simulator" . }}
-      containers:
-      - name: {{ include "common.containername.a1simulator" . }}
-        image: {{ .Values.a1simulator.image.registry }}/{{ .Values.a1simulator.image.name }}:{{ .Values.a1simulator.image.tag }}
-        imagePullPolicy: {{ .Values.a1simulator.imagePullPolicy }}
-        ports:
-        - containerPort: {{ .Values.a1simulator.service.targetPort1 }}
-          protocol: TCP
-        - containerPort: {{ .Values.a1simulator.service.targetPort2 }}
-          protocol: TCP
-        readinessProbe:
-          tcpSocket:
-            port: {{ .Values.a1simulator.service.targetPort1 }}
-          initialDelaySeconds: {{ .Values.a1simulator.readiness.initialDelaySeconds }}
-          periodSeconds: {{ .Values.a1simulator.readiness.periodSeconds }}
-        livenessProbe:
-          tcpSocket:
-            port: {{ .Values.a1simulator.service.targetPort1 }}
-          initialDelaySeconds: {{ .Values.a1simulator.liveness.initialDelaySeconds }}
-          periodSeconds: {{ .Values.a1simulator.liveness.periodSeconds }}
-        env:
-        - name: A1_VERSION
-          value: STD_1.1.3
-        - name: ALLOW_HTTP
-          value: {{ .Values.a1simulator.service.allowHttp | quote}}
----
-kind: StatefulSet
-apiVersion: apps/v1
-metadata:
-  name: {{ .Values.a1simulator.stdVersion2.name }}
-  namespace: {{ include "common.namespace.nonrtric" . }}
-  generation: 1
-  labels:
-    app: {{ include "common.namespace.nonrtric" . }}-{{ include "common.name.a1simulator" . }}
-    chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
-    release: {{ .Release.Name }}
-    heritage: {{ .Release.Service }}
-  annotations:
-    deployment.kubernetes.io/revision: '1'
-spec:
-  replicas: {{ .Values.a1simulator.stdVersion2.replicaCount }}
-  selector:
-    matchLabels:
-      app: {{ include "common.namespace.nonrtric" . }}-{{ include "common.name.a1simulator" . }}
-      release: {{ .Release.Name }}
-  serviceName: {{ .Values.a1simulator.name }}
-  template:
-    metadata:
-      labels:
-        app: {{ include "common.namespace.nonrtric" . }}-{{ include "common.name.a1simulator" . }}
-        release: {{ .Release.Name }}
-    spec:
-      hostname: {{ include "common.name.a1simulator" . }}
-      containers:
-      - name: {{ include "common.containername.a1simulator" . }}
-        image: {{ .Values.a1simulator.image.registry }}/{{ .Values.a1simulator.image.name }}:{{ .Values.a1simulator.image.tag }}
-        imagePullPolicy: {{ .Values.a1simulator.imagePullPolicy }}
-        ports:
-        - containerPort: {{ .Values.a1simulator.service.targetPort1 }}
-          protocol: TCP
-        - containerPort: {{ .Values.a1simulator.service.targetPort2 }}
-          protocol: TCP
-        readinessProbe:
-          tcpSocket:
-            port: {{ .Values.a1simulator.service.targetPort1 }}
-          initialDelaySeconds: {{ .Values.a1simulator.readiness.initialDelaySeconds }}
-          periodSeconds: {{ .Values.a1simulator.readiness.periodSeconds }}
-        livenessProbe:
-          tcpSocket:
-            port: {{ .Values.a1simulator.service.targetPort1 }}
-          initialDelaySeconds: {{ .Values.a1simulator.liveness.initialDelaySeconds }}
-          periodSeconds: {{ .Values.a1simulator.liveness.periodSeconds }}
-        env:
-        - name: A1_VERSION
-          value: STD_2.0.0
-        - name: ALLOW_HTTP
-          value: {{ .Values.a1simulator.service.allowHttp | quote}}
diff --git a/nonrtric/helm/a1simulator/values.yaml b/nonrtric/helm/a1simulator/values.yaml
deleted file mode 100644 (file)
index 22e0096..0000000
+++ /dev/null
@@ -1,52 +0,0 @@
-#  ============LICENSE_START================================================
-#  Copyright (C) 2020-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 a1-simulator.
-# This is a YAML-formatted file.
-# Declare variables to be passed into your templates.
-
-a1simulator:
-  name: a1-sim
-  imagePullPolicy: IfNotPresent
-  image:
-    registry: 'nexus3.o-ran-sc.org:10002/o-ran-sc'
-    name: a1-simulator
-    tag: 2.7.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
-  oscVersion:
-    name: a1-sim-osc
-    replicaCount: 2
-  stdVersion:
-    name: a1-sim-std
-    replicaCount: 2
-  stdVersion2:
-    name: a1-sim-std2
-    replicaCount: 2
-
diff --git a/nonrtric/helm/capifcore/Chart.yaml b/nonrtric/helm/capifcore/Chart.yaml
deleted file mode 100644 (file)
index 903a20c..0000000
+++ /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 CAPIF core
-name: capifcore
-version: 1.0.0
diff --git a/nonrtric/helm/capifcore/requirements.yaml b/nonrtric/helm/capifcore/requirements.yaml
deleted file mode 100644 (file)
index 25a3e89..0000000
+++ /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/capifcore/templates/deployment.yaml b/nonrtric/helm/capifcore/templates/deployment.yaml
deleted file mode 100644 (file)
index ea499a3..0000000
+++ /dev/null
@@ -1,57 +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.capifcore" . }}
-  namespace: {{ include "common.namespace.nonrtric" . }}
-  generation: 1
-  labels:
-    app: {{ include "common.namespace.nonrtric" . }}-{{ include "common.name.capifcore" . }}
-    chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
-    release: {{ .Release.Name }}
-    heritage: {{ .Release.Service }}
-  annotations:
-    deployment.kubernetes.io/revision: '1'
-spec:
-  replicas: 1
-  selector:
-    matchLabels:
-      app: {{ include "common.namespace.nonrtric" . }}-{{ include "common.name.capifcore" . }}
-      release: {{ .Release.Name }}
-  template:
-    metadata:
-      labels:
-        app: {{ include "common.namespace.nonrtric" . }}-{{ include "common.name.capifcore" . }}
-        release: {{ .Release.Name }}
-    spec:
-      hostname: {{ include "common.name.capifcore" . }}
-      containers:
-      - name: {{ include "common.container.capifcore" . }}
-        image: {{ .Values.capifcore.image.registry }}/{{ .Values.capifcore.image.name }}:{{ .Values.capifcore.image.tag }}
-        imagePullPolicy: {{ .Values.capifcore.imagePullPolicy }}
-        args:
-            [
-              "-chartMuseumUrl",
-              "{{ .Values.capifcore.env.chart_museum_url }}",
-              "-repoName",
-              "{{ .Values.capifcore.env.repo_name }}"
-            ]
-        ports:
-        - containerPort: 8090
-          protocol: TCP
-
diff --git a/nonrtric/helm/capifcore/templates/service.yaml b/nonrtric/helm/capifcore/templates/service.yaml
deleted file mode 100644 (file)
index 568264c..0000000
+++ /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.capifcore" . }}
-  namespace: {{ include "common.namespace.nonrtric" . }}
-  labels:
-    app: {{ include "common.namespace.nonrtric" . }}-{{ include "common.name.capifcore" . }}
-    chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
-    release: {{ .Release.Name }}
-    heritage: {{ .Release.Service }}
-spec:
-  ports:
-    {{if eq .Values.capifcore.service.allowHttp true -}}
-    - name: {{ index .Values.capifcore.service.httpName }}
-      port: {{ .Values.capifcore.service.port }}
-      targetPort: {{ .Values.capifcore.service.targetPort }}
-      protocol: TCP
-    {{- end }}
-  selector:
-    app: {{ include "common.namespace.nonrtric" . }}-{{ include "common.name.capifcore" . }}
-    release: {{ .Release.Name }}
-  type: ClusterIP
diff --git a/nonrtric/helm/capifcore/values.yaml b/nonrtric/helm/capifcore/values.yaml
deleted file mode 100644 (file)
index 2dd263a..0000000
+++ /dev/null
@@ -1,35 +0,0 @@
-#  ============LICENSE_START===============================================
-#  Copyright (C) 2022-2023 Nordix Foundation. All rights reserved.
-#  Copyright (C) 2023 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.
-
-capifcore:
-  imagePullPolicy: IfNotPresent
-  image:
-    registry: 'nexus3.o-ran-sc.org:10004/o-ran-sc'
-    name: nonrtric-plt-capifcore
-    tag: 1.4.0
-  service:
-    httpName: http
-    allowHttp: true
-    port: 8090
-    targetPort: 8090
-  env:
-    chart_museum_url: "http://chartmuseum:8080"
-    repo_name: "capifcore"
diff --git a/nonrtric/helm/controlpanel/.helmignore b/nonrtric/helm/controlpanel/.helmignore
deleted file mode 100644 (file)
index 50af031..0000000
+++ /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/controlpanel/Chart.yaml b/nonrtric/helm/controlpanel/Chart.yaml
deleted file mode 100644 (file)
index 585ada4..0000000
+++ /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 nonrtric controlpanel
-name: controlpanel
-version: 2.0.0
diff --git a/nonrtric/helm/controlpanel/requirements.yaml b/nonrtric/helm/controlpanel/requirements.yaml
deleted file mode 100644 (file)
index f3b3ecd..0000000
+++ /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/controlpanel/resources-ing/nginx.conf b/nonrtric/helm/controlpanel/resources-ing/nginx.conf
deleted file mode 100644 (file)
index 4e53c54..0000000
+++ /dev/null
@@ -1,28 +0,0 @@
-events{}
-
-http {
-    include /etc/nginx/mime.types;
-
-    upstream backend {
-        server oran-nonrtric-kong-proxy.nonrtric:80;
-    }
-
-    server {
-        listen 8080;
-        server_name localhost;
-        root /usr/share/nginx/html;
-        index index.html;
-        location /a1-policy/ {
-            proxy_pass  http://backend;
-        }
-         location /data-producer/ {
-            proxy_pass  http://backend;
-        }
-        location /data-consumer/ {
-            proxy_pass  http://backend;
-        }
-        location / {
-            try_files $uri $uri/ /index.html;
-        }
-    }
-}
diff --git a/nonrtric/helm/controlpanel/resources-ngw/nginx.conf b/nonrtric/helm/controlpanel/resources-ngw/nginx.conf
deleted file mode 100644 (file)
index 46f87d0..0000000
+++ /dev/null
@@ -1,28 +0,0 @@
-events{}
-
-http {
-    include /etc/nginx/mime.types;
-
-    upstream backend {
-        server  nonrtricgateway:9090;
-    }
-
-    server {
-        listen 8080;
-        server_name localhost;
-        root /usr/share/nginx/html;
-        index index.html;
-        location /a1-policy/ {
-            proxy_pass  http://backend;
-        }
-         location /data-producer/ {
-            proxy_pass  http://backend;
-        }
-        location /data-consumer/ {
-            proxy_pass  http://backend;
-        }
-        location / {
-            try_files $uri $uri/ /index.html;
-        }
-    }
-}
\ No newline at end of file
diff --git a/nonrtric/helm/controlpanel/templates/configmap.yaml b/nonrtric/helm/controlpanel/templates/configmap.yaml
deleted file mode 100644 (file)
index c99b92f..0000000
+++ /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.                                             #
-################################################################################
-
-apiVersion: v1
-kind: ConfigMap
-metadata:
-  name: {{ include "common.name.controlpanel" . }}-configmap
-  namespace: {{ include "common.namespace.nonrtric" . }}
-  labels:
-    app: {{ include "common.namespace.nonrtric" . }}-{{ include "common.name.controlpanel" . }}
-    chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
-    release: {{ .Release.Name }}
-    heritage: {{ .Release.Service }}
-data:
-{{if eq .Values.controlpanel.ingress.enabled false }}
-{{ tpl (.Files.Glob "resources-ngw/*").AsConfig . | indent 2 }}
-{{ else }}
-{{ tpl (.Files.Glob "resources-ing/*").AsConfig . | indent 2 }}
-{{ end }}
\ No newline at end of file
diff --git a/nonrtric/helm/controlpanel/templates/deployment.yaml b/nonrtric/helm/controlpanel/templates/deployment.yaml
deleted file mode 100644 (file)
index eb8fcce..0000000
+++ /dev/null
@@ -1,70 +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.controlpanel" . }}
-  namespace: {{ include "common.namespace.nonrtric" . }}
-  generation: 1
-  labels:
-    app: {{ include "common.namespace.nonrtric" . }}-{{ include "common.name.controlpanel" . }}
-    chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
-    release: {{ .Release.Name }}
-    heritage: {{ .Release.Service }}
-  annotations:
-    deployment.kubernetes.io/revision: '1'
-spec:
-  replicas: {{ .Values.controlpanel.replicaCount }}
-  selector:
-    matchLabels:
-      app: {{ include "common.namespace.nonrtric" . }}-{{ include "common.name.controlpanel" . }}
-      release: {{ .Release.Name }}
-  template:
-    metadata:
-      labels:
-        app: {{ include "common.namespace.nonrtric" . }}-{{ include "common.name.controlpanel" . }}
-        release: {{ .Release.Name }}
-    spec:
-      hostname: {{ include "common.name.controlpanel" . }}
-      containers:
-        - name: {{ include "common.containername.controlpanel" . }}
-          image: {{ .Values.controlpanel.image.registry }}/{{ .Values.controlpanel.image.name }}:{{ .Values.controlpanel.image.tag }}
-          imagePullPolicy: {{ .Values.controlpanel.imagePullPolicy }}
-          ports:
-          - containerPort: {{ .Values.controlpanel.service.targetPort1 }}
-            protocol: TCP
-          - containerPort: {{ .Values.controlpanel.service.targetPort2 }}
-            protocol: TCP
-          volumeMounts:
-            - name: configmap
-              mountPath: /etc/nginx/nginx.conf
-              subPath: nginx.conf
-              readOnly: true
-          readinessProbe:
-            tcpSocket:
-              port: {{ .Values.controlpanel.service.targetPort1 }}
-            initialDelaySeconds: {{ .Values.controlpanel.liveness.initialDelaySeconds }}
-            periodSeconds: {{ .Values.controlpanel.liveness.periodSeconds }}
-          livenessProbe:
-            tcpSocket:
-              port: {{ .Values.controlpanel.service.targetPort1 }}
-            initialDelaySeconds: {{ .Values.controlpanel.liveness.initialDelaySeconds }}
-            periodSeconds: {{ .Values.controlpanel.liveness.periodSeconds }}
-      volumes:
-        - name: configmap
-          configMap:
-            name: {{ include "common.name.controlpanel" . }}-configmap
\ No newline at end of file
diff --git a/nonrtric/helm/controlpanel/templates/service.yaml b/nonrtric/helm/controlpanel/templates/service.yaml
deleted file mode 100644 (file)
index 1a61ed7..0000000
+++ /dev/null
@@ -1,44 +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.controlpanel" . }}
-  namespace: {{ include "common.namespace.nonrtric" . }}
-  labels:
-    app: {{ include "common.namespace.nonrtric" . }}-{{ include "common.name.controlpanel" . }}
-    chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
-    release: {{ .Release.Name }}
-    heritage: {{ .Release.Service }}
-spec:
-  type: NodePort
-  ports:
-    {{if eq .Values.controlpanel.service.allowHttp true -}}
-    - name: {{ index .Values.controlpanel.service.httpName }}
-      port: {{ .Values.controlpanel.service.internalPort1 }}
-      targetPort: {{ .Values.controlpanel.service.targetPort1 }}
-      nodePort: {{ .Values.controlpanel.service.externalPort1 }}
-      protocol: TCP
-    {{- end }}
-    - name: {{ index .Values.controlpanel.service.httpsName }}
-      port: {{ .Values.controlpanel.service.internalPort2 }}
-      targetPort: {{ .Values.controlpanel.service.targetPort2 }}
-      nodePort: {{ .Values.controlpanel.service.externalPort2 }}
-      protocol: TCP
-  selector:
-    app: {{ include "common.namespace.nonrtric" . }}-{{ include "common.name.controlpanel" . }}
-    release: {{ .Release.Name }}
\ No newline at end of file
diff --git a/nonrtric/helm/controlpanel/values.yaml b/nonrtric/helm/controlpanel/values.yaml
deleted file mode 100644 (file)
index e3e41dc..0000000
+++ /dev/null
@@ -1,45 +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 controlpanel.
-# This is a YAML-formatted file.
-# Declare variables to be passed into your templates.
-
-controlpanel:
-  imagePullPolicy: IfNotPresent
-  image:
-    registry: 'nexus3.o-ran-sc.org:10002/o-ran-sc'
-    name: nonrtric-controlpanel
-    tag: 2.5.0
-  replicaCount: 1
-  service:
-    allowHttp: true
-    httpName: http
-    internalPort1: 8080
-    targetPort1: 8080
-    externalPort1: 30091
-    httpsName: https
-    internalPort2: 8082
-    targetPort2: 8082
-    externalPort2: 30092
-  liveness:
-    initialDelaySeconds: 20
-    periodSeconds: 10
-  readiness:
-    initialDelaySeconds: 20
-    periodSeconds: 10
-  ingress:
-    enabled: true
\ No newline at end of file
diff --git a/nonrtric/helm/dmaapadapterservice/.helmignore b/nonrtric/helm/dmaapadapterservice/.helmignore
deleted file mode 100644 (file)
index 50af031..0000000
+++ /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/dmaapadapterservice/Chart.yaml b/nonrtric/helm/dmaapadapterservice/Chart.yaml
deleted file mode 100644 (file)
index 623ae8b..0000000
+++ /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 Adapter Service
-name: dmaapadapterservice
-version: 1.0.0
diff --git a/nonrtric/helm/dmaapadapterservice/requirements.yaml b/nonrtric/helm/dmaapadapterservice/requirements.yaml
deleted file mode 100644 (file)
index 69b4db6..0000000
+++ /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/dmaapadapterservice/resources/config/application.yaml b/nonrtric/helm/dmaapadapterservice/resources/config/application.yaml
deleted file mode 100644 (file)
index eaf3ec3..0000000
+++ /dev/null
@@ -1,85 +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.                                             #
-################################################################################
-
-spring:
-  profiles:
-    active: prod
-  main:
-    allow-bean-definition-overriding: true
-  aop:
-    auto: false
-management:
-  endpoints:
-    web:
-      exposure:
-        # Enabling of springboot actuator features. See springboot documentation.
-        include: "loggers,logfile,health,info,metrics,threaddump,heapdump"
-springdoc:
-  show-actuator: true
-logging:
-  # Configuration of logging
-  level:
-    ROOT: ERROR
-    org.springframework: ERROR
-    org.springframework.data: ERROR
-    org.springframework.web.reactive.function.client.ExchangeFunctions: ERROR
-    org.oran.dmaapadapter: DEBUG
-  file:
-    name: /var/log/dmaap-adapter-service/application.log
-server:
-   # Configuration of the HTTP/REST server. The parameters are defined and handeled by the springboot framework.
-   # See springboot documentation.
-   port : 8435
-   http-port: 8084
-   ssl:
-      key-store-type: JKS
-      key-store-password: policy_agent
-      key-store: /opt/app/dmaap-adapter-service/etc/cert/keystore.jks
-      key-password: policy_agent
-      key-alias: policy_agent
-app:
-  webclient:
-    # Configuration of the trust store used for the HTTP client (outgoing requests)
-    # The file location and the password for the truststore is only relevant if trust-store-used == true
-    # Note that the same keystore as for the server is used.
-    trust-store-used: false
-    trust-store-password: policy_agent
-    trust-store: /opt/app/dmaap-adapter-service/etc/cert/truststore.jks
-    # Configuration of usage of HTTP Proxy for the southbound accesses.
-    # The HTTP proxy (if configured) will only be used for accessing NearRT RIC:s
-    http.proxy-host:
-    http.proxy-port: 0
-  ics-base-url: https://informationservice.nonrtric:9083
-  # Location of the component configuration file. The file will only be used if the Consul database is not used;
-  # configuration from the Consul will override the file.
-  configuration-filepath: /opt/app/dmaap-adapter-service/data/application_configuration.json
-  dmaap-base-url: http://message-router.onap:3904
-  # The url used to adress this component. This is used as a callback url sent to other components.
-  dmaap-adapter-base-url: https://dmaapadapterservice.nonrtric:9088
-  # KAFKA boostrap server. This is only needed if there are Information Types that uses a kafkaInputTopic
-  kafka:
-    bootstrap-servers: message-router-kafka.onap:9092
-  # If the file name is empty, no authorization token is used
-  auth-token-file:
-  pm-files-path: /tmp
-  zip-output: false
-  s3:
-    endpointOverride: http://localhost:9000
-    accessKeyId: minio
-    secretAccessKey: miniostorage
-    locksBucket: ropfilelocks
-    bucket: ropfiles
-
diff --git a/nonrtric/helm/dmaapadapterservice/resources/data/application_configuration.json b/nonrtric/helm/dmaapadapterservice/resources/data/application_configuration.json
deleted file mode 100644 (file)
index 137e353..0000000
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-   "types": [
-      {
-         "id": "ExampleInformationType",
-         "dmaapTopicUrl": "/events/unauthenticated.dmaapadp.json/dmaapadapterproducer/msgs?timeout=15000&limit=100",
-         "useHttpProxy": false
-      },
-      {
-       "id": "ExampleInformationTypeKafka",
-       "kafkaInputTopic": "unauthenticated.dmaapadp_kafka.text",
-       "useHttpProxy": false
-    }
-   ]
- }
diff --git a/nonrtric/helm/dmaapadapterservice/templates/configmap.yaml b/nonrtric/helm/dmaapadapterservice/templates/configmap.yaml
deleted file mode 100644 (file)
index 9697062..0000000
+++ /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.                                             #
-################################################################################
-
-
-apiVersion: v1
-kind: ConfigMap
-metadata:
-  name: {{ include "common.name.dmaapadapterservice" . }}-configmap-config
-  namespace: {{ include "common.namespace.nonrtric" . }}
-  labels:
-    app: {{ include "common.namespace.nonrtric" . }}-{{ include "common.name.dmaapadapterservice" . }}
-    chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
-    release: {{ .Release.Name }}
-    heritage: {{ .Release.Service }}
-data:
-{{ tpl (.Files.Glob "resources/config/*").AsConfig . | indent 2 }}
----
-apiVersion: v1
-kind: ConfigMap
-metadata:
-  name: {{ include "common.name.dmaapadapterservice" . }}-configmap-data
-  namespace: {{ include "common.namespace.nonrtric" . }}
-  labels:
-    app: {{ include "common.namespace.nonrtric" . }}-{{ include "common.name.dmaapadapterservice" . }}
-    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/dmaapadapterservice/templates/service.yaml b/nonrtric/helm/dmaapadapterservice/templates/service.yaml
deleted file mode 100644 (file)
index b2f0ad6..0000000
+++ /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.dmaapadapterservice" . }}
-  namespace: {{ include "common.namespace.nonrtric" . }}
-  labels:
-    app: {{ include "common.namespace.nonrtric" . }}-{{ include "common.name.dmaapadapterservice" . }}
-    chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
-    release: {{ .Release.Name }}
-    heritage: {{ .Release.Service }}
-spec:
-  ports:
-    {{if eq .Values.dmaapadapterservice.service.allowHttp true -}}
-    - name: {{ index .Values.dmaapadapterservice.service.httpName }}
-      port: {{ .Values.dmaapadapterservice.service.internalPort1 }}
-      targetPort: {{ .Values.dmaapadapterservice.service.targetPort1 }}
-      protocol: TCP
-    {{- end }}
-    - name: {{ index .Values.dmaapadapterservice.service.httpsName }}
-      port: {{ .Values.dmaapadapterservice.service.internalPort2 }}
-      targetPort: {{ .Values.dmaapadapterservice.service.targetPort2 }}
-      protocol: TCP
-  selector:
-    app: {{ include "common.namespace.nonrtric" . }}-{{ include "common.name.dmaapadapterservice" . }}
-    release: {{ .Release.Name }}
-  type: ClusterIP
diff --git a/nonrtric/helm/dmaapadapterservice/templates/statefulset.yaml b/nonrtric/helm/dmaapadapterservice/templates/statefulset.yaml
deleted file mode 100644 (file)
index bc28297..0000000
+++ /dev/null
@@ -1,74 +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.dmaapadapterservice" . }}
-  namespace: {{ include "common.namespace.nonrtric" . }}
-  generation: 1
-  labels:
-    app: {{ include "common.namespace.nonrtric" . }}-{{ include "common.name.dmaapadapterservice" . }}
-    chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
-    release: {{ .Release.Name }}
-    heritage: {{ .Release.Service }}
-  annotations:
-    deployment.kubernetes.io/revision: '1'
-spec:
-  serviceName: {{ include "common.name.dmaapadapterservice" . }}
-  replicas: 1
-  selector:
-    matchLabels:
-      app: {{ include "common.namespace.nonrtric" . }}-{{ include "common.name.dmaapadapterservice" . }}
-      release: {{ .Release.Name }}
-  template:
-    metadata:
-      labels:
-        app: {{ include "common.namespace.nonrtric" . }}-{{ include "common.name.dmaapadapterservice" . }}
-        release: {{ .Release.Name }}
-    spec:
-      hostname: {{ include "common.name.dmaapadapterservice" . }}
-      containers:
-      - name: {{ include "common.container.dmaapadapterservice" . }}
-        image: {{ .Values.dmaapadapterservice.image.registry }}/{{ .Values.dmaapadapterservice.image.name }}:{{ .Values.dmaapadapterservice.image.tag }}
-        imagePullPolicy: {{ .Values.dmaapadapterservice.imagePullPolicy }}
-        ports:
-        - containerPort: {{ .Values.dmaapadapterservice.service.targetPort1 }}
-          protocol: TCP
-        - containerPort: {{ .Values.dmaapadapterservice.service.targetPort2 }}
-          protocol: TCP
-        readinessProbe:
-          tcpSocket:
-            port: {{ .Values.dmaapadapterservice.service.targetPort1 }}
-          initialDelaySeconds: {{ .Values.dmaapadapterservice.liveness.initialDelaySeconds }}
-          periodSeconds: {{ .Values.dmaapadapterservice.liveness.periodSeconds }}
-        livenessProbe:
-          tcpSocket:
-            port: {{ .Values.dmaapadapterservice.service.targetPort1 }}
-          initialDelaySeconds: {{ .Values.dmaapadapterservice.liveness.initialDelaySeconds }}
-          periodSeconds: {{ .Values.dmaapadapterservice.liveness.periodSeconds }}
-        volumeMounts:
-        - name: {{ include "common.name.dmaapadapterservice" . }}-dmaapadapter-config
-          mountPath: /opt/app/dmaap-adapter-service/config
-        - name: {{ include "common.name.dmaapadapterservice" . }}-dmaapadapter-data
-          mountPath: /opt/app/dmaap-adapter-service/data
-      volumes:
-        - name: {{ include "common.name.dmaapadapterservice" . }}-dmaapadapter-config
-          configMap:
-            name: {{ include "common.name.dmaapadapterservice" . }}-configmap-config
-        - name: {{ include "common.name.dmaapadapterservice" . }}-dmaapadapter-data
-          configMap:
-            name: {{ include "common.name.dmaapadapterservice" . }}-configmap-data
diff --git a/nonrtric/helm/dmaapadapterservice/values.yaml b/nonrtric/helm/dmaapadapterservice/values.yaml
deleted file mode 100644 (file)
index 0a53d14..0000000
+++ /dev/null
@@ -1,41 +0,0 @@
-################################################################################
-#  Copyright (c) 2021 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.                                             #
-################################################################################
-
-# Default values for Dmaap Adapter Service.
-# This is a YAML-formatted file.
-# Declare variables to be passed into your templates.
-
-dmaapadapterservice:
-  imagePullPolicy: IfNotPresent
-  image:
-    registry: "nexus3.o-ran-sc.org:10002/o-ran-sc"
-    name: "nonrtric-plt-dmaapadapter"
-    tag: 1.4.0
-  service:
-    allowHttp: true
-    httpName: http
-    internalPort1: 9087
-    targetPort1: 8084
-    httpsName: https
-    internalPort2: 9088
-    targetPort2: 8435
-  liveness:
-    initialDelaySeconds: 20
-    periodSeconds: 10
-  readiness:
-    initialDelaySeconds: 20
-    periodSeconds: 10
diff --git a/nonrtric/helm/dmeparticipant/.helmignore b/nonrtric/helm/dmeparticipant/.helmignore
deleted file mode 100644 (file)
index 50af031..0000000
+++ /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/dmeparticipant/Chart.yaml b/nonrtric/helm/dmeparticipant/Chart.yaml
deleted file mode 100644 (file)
index d55b76b..0000000
+++ /dev/null
@@ -1,22 +0,0 @@
-#  ============LICENSE_START===============================================
-#  Copyright (C) 2023 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
-appVersion: "2.0.0"
-description: A Helm chart for DME Participant
-name: dmeparticipant
-version: 1.0.0
diff --git a/nonrtric/helm/dmeparticipant/requirements.yaml b/nonrtric/helm/dmeparticipant/requirements.yaml
deleted file mode 100644 (file)
index d0fba08..0000000
+++ /dev/null
@@ -1,21 +0,0 @@
-#  ============LICENSE_START===============================================
-#  Copyright (C) 2023 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=================================================
-#
-
-dependencies:
-  - name: nonrtric-common
-    version: ^2.0.0
-    repository: "@local"
diff --git a/nonrtric/helm/dmeparticipant/resources/config/application.yaml b/nonrtric/helm/dmeparticipant/resources/config/application.yaml
deleted file mode 100644 (file)
index 10e7e0b..0000000
+++ /dev/null
@@ -1,45 +0,0 @@
-spring:
-  autoconfigure:
-    exclude:
-      - org.springframework.boot.autoconfigure.orm.jpa.HibernateJpaAutoConfiguration
-      - org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration
-      - org.springframework.boot.autoconfigure.jdbc.DataSourceTransactionManagerAutoConfiguration
-      - org.springframework.boot.autoconfigure.data.web.SpringDataWebAutoConfiguration
-security:
-  enable-csrf: false
-
-dme:
-  baseUrl: http://informationservice:9082
-
-participant:
-  intermediaryParameters:
-    reportingTimeIntervalMs: 120000
-    description: Participant Description
-    participantId: 101c62b3-8918-41b9-a747-d21eb79c6c08
-    clampAutomationCompositionTopics:
-      topicSources:
-        - topic: policy-acruntime-participant
-          servers:
-           - ${topicServer:kafka.default.svc.cluster.local:9092}
-          topicCommInfrastructure: kafka
-          fetchTimeout: 15000
-      topicSinks:
-        - topic: policy-acruntime-participant
-          servers:
-           - ${topicServer:kafka.default.svc.cluster.local:9092}
-          topicCommInfrastructure: kafka
-    participantSupportedElementTypes:
-      -
-        typeName: org.onap.policy.clamp.acm.DMEAutomationCompositionElement
-        typeVersion: 1.0.1
-
-management:
-  endpoints:
-    web:
-      base-path: /
-      exposure:
-        include: health, metrics, prometheus
-server:
-  port: 8080
-  servlet:
-    context-path: /nonrtric/dmeparticipant
diff --git a/nonrtric/helm/dmeparticipant/templates/configmap.yaml b/nonrtric/helm/dmeparticipant/templates/configmap.yaml
deleted file mode 100644 (file)
index 7a2b4dd..0000000
+++ /dev/null
@@ -1,29 +0,0 @@
-#  ============LICENSE_START===============================================
-#  Copyright (C) 2023 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: ConfigMap
-metadata:
-  name: {{ include "common.name.dmeparticipant" . }}-configmap-config
-  namespace: {{ include "common.namespace.nonrtric" . }}
-  labels:
-    app: {{ include "common.namespace.nonrtric" . }}-{{ include "common.name.dmeparticipant" . }}
-    chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
-    release: {{ .Release.Name }}
-    heritage: {{ .Release.Service }}
-data:
-{{ tpl (.Files.Glob "resources/config/*").AsConfig . | indent 2 }}
diff --git a/nonrtric/helm/dmeparticipant/templates/deployment.yaml b/nonrtric/helm/dmeparticipant/templates/deployment.yaml
deleted file mode 100644 (file)
index 790f411..0000000
+++ /dev/null
@@ -1,78 +0,0 @@
-#  ============LICENSE_START===============================================
-#  Copyright (C) 2023 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: Deployment
-apiVersion: apps/v1
-metadata:
-  name: {{ include "common.name.dmeparticipant" . }}
-  namespace: {{ include "common.namespace.nonrtric" . }}
-  generation: 1
-  labels:
-    app: {{ include "common.namespace.nonrtric" . }}-{{ include "common.name.dmeparticipant" . }}
-    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.dmeparticipant" . }}
-      release: {{ .Release.Name }}
-  template:
-    metadata:
-      labels:
-        app: {{ include "common.namespace.nonrtric" . }}-{{ include "common.name.dmeparticipant" . }}
-        release: {{ .Release.Name }}
-    spec:
-      hostname: {{ include "common.name.dmeparticipant" . }}
-      containers:
-      - name: {{ include "common.container.dmeparticipant" . }}
-        image: {{ .Values.dmeparticipant.image.registry }}/{{ .Values.dmeparticipant.image.name }}:{{ .Values.dmeparticipant.image.tag }}
-        imagePullPolicy: {{ .Values.dmeparticipant.imagePullPolicy }}
-        ports:
-        - containerPort: {{ .Values.dmeparticipant.service.targetPort1 }}
-          protocol: TCP
-        readinessProbe:
-          tcpSocket:
-            port: {{ .Values.dmeparticipant.service.targetPort1 }}
-          initialDelaySeconds: {{ .Values.dmeparticipant.liveness.initialDelaySeconds }}
-          periodSeconds: {{ .Values.dmeparticipant.liveness.periodSeconds }}
-        livenessProbe:
-          tcpSocket:
-            port: {{ .Values.dmeparticipant.service.targetPort1 }}
-          initialDelaySeconds: {{ .Values.dmeparticipant.liveness.initialDelaySeconds }}
-          periodSeconds: {{ .Values.dmeparticipant.liveness.periodSeconds }}
-        env:
-        - name: SPRING_SECURITY_USER_NAME
-          valueFrom:
-            secretKeyRef:
-              name: {{ include "common.name.dmeparticipant" . }}-security-secret
-              key: username
-        - name: SPRING_SECURITY_USER_PASSWORD
-          valueFrom:
-            secretKeyRef:
-              name: {{ include "common.name.dmeparticipant" . }}-security-secret
-              key: password
-        volumeMounts:
-        - name: {{ include "common.name.dmeparticipant" . }}-dmeparticipant-config
-          mountPath: /opt/app/participant/dme/config/
-      volumes:
-        - name: {{ include "common.name.dmeparticipant" . }}-dmeparticipant-config
-          configMap:
-            name: {{ include "common.name.dmeparticipant" . }}-configmap-config
diff --git a/nonrtric/helm/dmeparticipant/templates/secret.yaml b/nonrtric/helm/dmeparticipant/templates/secret.yaml
deleted file mode 100755 (executable)
index d134413..0000000
+++ /dev/null
@@ -1,25 +0,0 @@
-#  ============LICENSE_START===============================================\r
-#  Copyright (C) 2023 OpenInfra Foundation Europe. All rights reserved.\r
-#  ========================================================================\r
-#  Licensed under the Apache License, Version 2.0 (the "License");\r
-#  you may not use this file except in compliance with the License.\r
-#  You may obtain a copy of the License at\r
-#\r
-#       http://www.apache.org/licenses/LICENSE-2.0\r
-#\r
-#  Unless required by applicable law or agreed to in writing, software\r
-#  distributed under the License is distributed on an "AS IS" BASIS,\r
-#  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\r
-#  See the License for the specific language governing permissions and\r
-#  limitations under the License.\r
-#  ============LICENSE_END=================================================\r
-#\r
-\r
-apiVersion: v1\r
-kind: Secret\r
-metadata:\r
-  name: {{ include "common.name.dmeparticipant" . }}-security-secret\r
-type: Opaque\r
-data:\r
-    username: {{ .Values.dmeparticipant.security.username }}\r
-    password: {{ .Values.dmeparticipant.security.password }}\r
diff --git a/nonrtric/helm/dmeparticipant/templates/service.yaml b/nonrtric/helm/dmeparticipant/templates/service.yaml
deleted file mode 100644 (file)
index 9c9f030..0000000
+++ /dev/null
@@ -1,37 +0,0 @@
-#  ============LICENSE_START===============================================
-#  Copyright (C) 2023 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: Service
-apiVersion: v1
-metadata:
-  name: {{ include "common.name.dmeparticipant" . }}
-  namespace: {{ include "common.namespace.nonrtric" . }}
-  labels:
-    app: {{ include "common.namespace.nonrtric" . }}-{{ include "common.name.dmeparticipant" . }}
-    chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
-    release: {{ .Release.Name }}
-    heritage: {{ .Release.Service }}
-spec:
-  ports:
-    - name: {{ index .Values.dmeparticipant.service.httpName }}
-      port: {{ .Values.dmeparticipant.service.internalPort1 }}
-      targetPort: {{ .Values.dmeparticipant.service.targetPort1 }}
-      protocol: TCP
-  selector:
-    app: {{ include "common.namespace.nonrtric" . }}-{{ include "common.name.dmeparticipant" . }}
-    release: {{ .Release.Name }}
-  type: ClusterIP
diff --git a/nonrtric/helm/dmeparticipant/values.yaml b/nonrtric/helm/dmeparticipant/values.yaml
deleted file mode 100644 (file)
index e451871..0000000
+++ /dev/null
@@ -1,42 +0,0 @@
-#  ============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 DME Participant.
-# This is a YAML-formatted file.
-# Declare variables to be passed into your templates.
-
-dmeparticipant:
-  imagePullPolicy: IfNotPresent
-  image:
-    registry: "nexus3.o-ran-sc.org:10002/o-ran-sc"
-    name: nonrtric-plt-participant-impl-dme
-    tag: 0.1.0
-  service:
-    httpName: http
-    internalPort1: 8080
-    targetPort1: 8080
-  liveness:
-    initialDelaySeconds: 20
-    periodSeconds: 10
-  readiness:
-    initialDelaySeconds: 20
-    periodSeconds: 10
-  ingress:
-    enabled: false
-  security:
-    username: cGFydGljaXBhbnRVc2VyCg==
-    password: emIhWHp0RzM0
diff --git a/nonrtric/helm/informationservice/.helmignore b/nonrtric/helm/informationservice/.helmignore
deleted file mode 100644 (file)
index 50af031..0000000
+++ /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/informationservice/Chart.yaml b/nonrtric/helm/informationservice/Chart.yaml
deleted file mode 100644 (file)
index 610411b..0000000
+++ /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: "1.0.0"
-description: A Helm chart for Information Coordinator Service
-name: informationservice
-version: 1.0.0
diff --git a/nonrtric/helm/informationservice/requirements.yaml b/nonrtric/helm/informationservice/requirements.yaml
deleted file mode 100644 (file)
index f3b3ecd..0000000
+++ /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/informationservice/resources/config/application.yaml b/nonrtric/helm/informationservice/resources/config/application.yaml
deleted file mode 100644 (file)
index 5d949a9..0000000
+++ /dev/null
@@ -1,58 +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.                                             #
-################################################################################
-
-spring:
-  profiles:
-    active: prod
-  main:
-    allow-bean-definition-overriding: true
-  aop:
-    auto: false
-management:
-  endpoints:
-    web:
-      exposure:
-        include: "loggers,logfile,health,info,metrics,threaddump,heapdump"
-
-logging:
-  level:
-    ROOT: ERROR
-    org.springframework: ERROR
-    org.springframework.data: ERROR
-    org.springframework.web.reactive.function.client.ExchangeFunctions: ERROR
-    org.oransc.information: INFO
-  file:
-    name: /var/log/information-coordinator-service/application.log
-server:
-   port : 8434
-   http-port: 8083
-   ssl:
-      key-store-type: JKS
-      key-store-password: policy_agent
-      key-store: /opt/app/information-coordinator-service/etc/cert/keystore.jks
-      key-password: policy_agent
-      key-alias: policy_agent
-app:
-  filepath: /opt/app/information-coordinator-service/data/application_configuration.json
-  webclient:
-    trust-store-used: false
-    trust-store-password: policy_agent
-    trust-store: /opt/app/information-coordinator-service/etc/cert/truststore.jks
-    # Configuration of usage of HTTP Proxy for the southbound accesses.
-    # The HTTP proxy (if configured) will only be used for accessing NearRT RIC:s
-    http.proxy-host:
-    http.proxy-port: 0
-  vardata-directory: /var/information-coordinator-service
\ No newline at end of file
diff --git a/nonrtric/helm/informationservice/templates/configmap.yaml b/nonrtric/helm/informationservice/templates/configmap.yaml
deleted file mode 100644 (file)
index d8b198d..0000000
+++ /dev/null
@@ -1,29 +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
-kind: ConfigMap
-metadata:
-  name: {{ include "common.name.informationservice" . }}-configmap
-  namespace: {{ include "common.namespace.nonrtric" . }}
-  labels:
-    app: {{ include "common.namespace.nonrtric" . }}-{{ include "common.name.informationservice" . }}
-    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/informationservice/templates/ingress.yaml b/nonrtric/helm/informationservice/templates/ingress.yaml
deleted file mode 100644 (file)
index 9387bdc..0000000
+++ /dev/null
@@ -1,45 +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.                                             #
-################################################################################
-*/}}
-
-{{- if .Values.informationservice.ingress.enabled -}}
-apiVersion: networking.k8s.io/v1
-kind: Ingress
-metadata:
-  name: {{ include "common.name.informationservice" . }}
-  namespace: {{ include "common.namespace.nonrtric" . }}
-
-spec:
-  ingressClassName: {{ include "common.ingressClassName" . }}
-  rules:
-    - http:
-        paths:
-          - path: "/data-producer"
-            backend:
-              service:
-                name: {{ include "common.name.informationservice" . }}
-                port:
-                  number: {{ .Values.informationservice.service.internalPort1 }}
-            pathType: Prefix
-          - path: "/data-consumer"
-            backend:
-              service:
-                name: {{ include "common.name.informationservice" . }}
-                port:
-                  number: {{ .Values.informationservice.service.internalPort1 }}
-            pathType: Prefix
-{{- end -}}
\ No newline at end of file
diff --git a/nonrtric/helm/informationservice/templates/service.yaml b/nonrtric/helm/informationservice/templates/service.yaml
deleted file mode 100644 (file)
index ba5783c..0000000
+++ /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.informationservice" . }}
-  namespace: {{ include "common.namespace.nonrtric" . }}
-  labels:
-    app: {{ include "common.namespace.nonrtric" . }}-{{ include "common.name.informationservice" . }}
-    chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
-    release: {{ .Release.Name }}
-    heritage: {{ .Release.Service }}
-spec:
-  ports:
-    {{if eq .Values.informationservice.service.allowHttp true -}}
-    - name: {{ index .Values.informationservice.service.httpName }}
-      port: {{ .Values.informationservice.service.internalPort1 }}
-      targetPort: {{ .Values.informationservice.service.targetPort1 }}
-      protocol: TCP
-    {{- end }}
-    - name: {{ index .Values.informationservice.service.httpsName }}
-      port: {{ .Values.informationservice.service.internalPort2 }}
-      targetPort: {{ .Values.informationservice.service.targetPort2 }}
-      protocol: TCP
-  selector:
-    app: {{ include "common.namespace.nonrtric" . }}-{{ include "common.name.informationservice" . }}
-    release: {{ .Release.Name }}
-  type: ClusterIP
diff --git a/nonrtric/helm/informationservice/templates/statefulset.yaml b/nonrtric/helm/informationservice/templates/statefulset.yaml
deleted file mode 100644 (file)
index a597324..0000000
+++ /dev/null
@@ -1,82 +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: StatefulSet
-apiVersion: apps/v1
-metadata:
-  name: {{ include "common.name.informationservice" . }}
-  namespace: {{ include "common.namespace.nonrtric" . }}
-  generation: 1
-  labels:
-    app: {{ include "common.namespace.nonrtric" . }}-{{ include "common.name.informationservice" . }}
-    chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
-    release: {{ .Release.Name }}
-    heritage: {{ .Release.Service }}
-  annotations:
-    deployment.kubernetes.io/revision: '1'
-spec:
-  serviceName: {{ include "common.name.informationservice" . }}
-  replicas: 1
-  selector:
-    matchLabels:
-      app: {{ include "common.namespace.nonrtric" . }}-{{ include "common.name.informationservice" . }}
-      release: {{ .Release.Name }}
-  template:
-    metadata:
-      labels:
-        app: {{ include "common.namespace.nonrtric" . }}-{{ include "common.name.informationservice" . }}
-        release: {{ .Release.Name }}
-    spec:
-      hostname: {{ include "common.name.informationservice" . }}
-      containers:
-      - name: {{ include "common.container.informationservice" . }}
-        image: {{ .Values.informationservice.image.registry }}/{{ .Values.informationservice.image.name }}:{{ .Values.informationservice.image.tag }}
-        imagePullPolicy: {{ .Values.informationservice.imagePullPolicy }}
-        ports:
-        - containerPort: {{ .Values.informationservice.service.targetPort1 }}
-          protocol: TCP
-        - containerPort: {{ .Values.informationservice.service.targetPort2 }}
-          protocol: TCP
-        readinessProbe:
-          tcpSocket:
-            port: {{ .Values.informationservice.service.targetPort1 }}
-          initialDelaySeconds: {{ .Values.informationservice.liveness.initialDelaySeconds }}
-          periodSeconds: {{ .Values.informationservice.liveness.periodSeconds }}
-        livenessProbe:
-          httpGet:
-            path: /status
-            port: {{ .Values.informationservice.service.targetPort1 }}
-          initialDelaySeconds: {{ .Values.informationservice.liveness.initialDelaySeconds }}
-          periodSeconds: {{ .Values.informationservice.liveness.periodSeconds }}
-        volumeMounts:
-        - name: {{ include "common.name.informationservice" . }}-information-config
-          mountPath: /opt/app/information-coordinator-service/config
-        - name: {{ include "common.name.informationservice" . }}-vardata
-          mountPath: /var/information-coordinator-service
-      volumes:
-        - name: {{ include "common.name.informationservice" . }}-information-config
-          configMap:
-            name: {{ include "common.name.informationservice" . }}-configmap
-
-  volumeClaimTemplates:
-    - metadata:
-        name: {{ include "common.name.informationservice" . }}-vardata
-      spec:
-        accessModes: [ ReadWriteOnce ]
-        storageClassName: "{{ .Values.informationservice.persistence.storageClassName }}"
-        resources:
-          requests:
-            storage: "{{ .Values.informationservice.persistence.size }}"
diff --git a/nonrtric/helm/informationservice/values.yaml b/nonrtric/helm/informationservice/values.yaml
deleted file mode 100644 (file)
index 7d7aadf..0000000
+++ /dev/null
@@ -1,46 +0,0 @@
-#  ============LICENSE_START===============================================
-#  Copyright (C) 2020-2023 Nordix Foundation. All rights reserved.
-#  Copyright (C) 2023 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 Information Coordinate Service.
-# This is a YAML-formatted file.
-# Declare variables to be passed into your templates.
-
-informationservice:
-  imagePullPolicy: IfNotPresent
-  image:
-    registry: "nexus3.o-ran-sc.org:10002/o-ran-sc"
-    name: "nonrtric-plt-informationcoordinatorservice"
-    tag: 1.6.0
-  service:
-    allowHttp: true
-    httpName: http
-    internalPort1: 9082
-    targetPort1: 8083
-    httpsName: https
-    internalPort2: 9083
-    targetPort2: 8434
-  liveness:
-    initialDelaySeconds: 20
-    periodSeconds: 10
-  readiness:
-    initialDelaySeconds: 20
-    periodSeconds: 10
-  persistence:
-    size: 2Gi
-    storageClassName: standard
-  ingress:
-    enabled: false
diff --git a/nonrtric/helm/kongstorage/Chart.yaml b/nonrtric/helm/kongstorage/Chart.yaml
deleted file mode 100644 (file)
index bb07ce6..0000000
+++ /dev/null
@@ -1,21 +0,0 @@
-################################################################################
-#   Copyright (c) 2024 OpenInfra Foundation Europe.                            #
-#                                                                              #
-#   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 kongstorage
-name: kongstorage
-version: 1.0.0
diff --git a/nonrtric/helm/kongstorage/kongvalues.yaml b/nonrtric/helm/kongstorage/kongvalues.yaml
deleted file mode 100644 (file)
index 0d85b8e..0000000
+++ /dev/null
@@ -1,139 +0,0 @@
-
-#  ============LICENSE_START===============================================
-#  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.
-#  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 Kong's Helm Chart.
-#
-# Sections:
-# - Deployment parameters
-# - Kong parameters
-# - Ingress Controller parameters
-# - Postgres sub-chart parameters
-# - Miscellaneous parameters
-# For a detailed example of values.yaml, please see https://github.com/Kong/charts/blob/main/charts/kong/values.yaml
-# -----------------------------------------------------------------------------
-# Deployment parameters
-# -----------------------------------------------------------------------------
-deployment:
-  kong:
-    enabled: true
-  serviceAccount:
-    create: true
-    automountServiceAccountToken: false
-# -----------------------------------------------------------------------------
-# Kong parameters
-# -----------------------------------------------------------------------------
-env:
-  database: "postgres"
-# Specify Kong's Docker image and repository details here
-image:
-  repository: kong
-  tag: "3.4"
-  pullPolicy: IfNotPresent
-# Specify Kong admin API service and listener configuration
-admin:
-  enabled: true
-  type: NodePort
-  http:
-    # Enable plaintext HTTP listen for the admin API
-    enabled: true
-    servicePort: 8001
-    containerPort: 8001
-    nodePort: 32081
-    parameters: []
-  tls:
-    # Enable HTTPS listen for the admin API
-    enabled: false
-    servicePort: 8444
-    containerPort: 8444
-    nodePort: 32444
-    parameters:
-    - http2
-  ingress:
-    enabled: false
-# Specify Kong proxy service configuration
-proxy:
-  # Enable creating a Kubernetes service for the proxy
-  enabled: true
-  type: LoadBalancer
-  loadBalancerClass:
-  nameOverride: ""
-  annotations: {}
-  labels:
-    enable-metrics: "true"
-  http:
-    # Enable plaintext HTTP listen for the proxy
-    enabled: true
-    servicePort: 80
-    containerPort: 8000
-    # Set a nodePort which is available if service type is NodePort
-    nodePort: 32080
-    parameters: []
-  tls:
-    # Enable HTTPS listen for the proxy
-    enabled: false
-    servicePort: 443
-    containerPort: 8443
-    parameters:
-    - http2
-# -----------------------------------------------------------------------------
-# Ingress Controller parameters
-# -----------------------------------------------------------------------------
-ingressController:
-  enabled: true
-  installCRDs: false
-  image:
-    repository: kong/kubernetes-ingress-controller
-    tag: "3.0"
-  env:
-    kong_admin_tls_skip_verify: true
-# -----------------------------------------------------------------------------
-# Postgres sub-chart parameters
-# -----------------------------------------------------------------------------
-postgresql:
-  enabled: true
-  auth:
-    username: kong
-    database: kong
-    password: kong
-    postgresPassword: kong
-  image:
-    # use postgres < 14 until is https://github.com/Kong/kong/issues/8533 resolved
-    tag: 13.11.0-debian-11-r20
-  service:
-    ports:
-      postgresql: "5432"
-  volumePermissions:
-    enabled: true
-    image:
-      repository: bitnami/os-shell
-    # This provides permission for the initcontainer to set the correct permissions
-    containerSecurityContext:
-      runAsNonRoot: false
-  primary:
-    persistence:
-      existingClaim: kongpvc
-      # If the default storage class is not set,
-      # This value should be set to create the PV
-      # storageClass: standard
-
-# -----------------------------------------------------------------------------
-# Miscellaneous parameters
-# -----------------------------------------------------------------------------
-waitImage:
-  enabled: true
-  pullPolicy: IfNotPresent
-replicaCount: 1
diff --git a/nonrtric/helm/kongstorage/templates/kongpv.yaml b/nonrtric/helm/kongstorage/templates/kongpv.yaml
deleted file mode 100644 (file)
index d96fcb1..0000000
+++ /dev/null
@@ -1,32 +0,0 @@
-#  ============LICENSE_START===============================================
-#  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.
-#  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 .Values.kongpv.enabled }}
-apiVersion: v1
-kind: PersistentVolume
-metadata:
-  name: kongpv
-  labels:
-    type: local
-spec:
-  capacity:
-    storage: "{{ .Values.kongpv.persistence.size }}"
-  accessModes:
-    - "{{ .Values.kongpv.persistence.accessMode }}"
-  hostPath:
-    path: "{{ .Values.kongpv.persistence.path }}"
-  persistentVolumeReclaimPolicy: "{{ .Values.kongpv.persistence.volumeReclaimPolicy }}"
-{{- end }}
\ No newline at end of file
diff --git a/nonrtric/helm/kongstorage/templates/kongpvc.yaml b/nonrtric/helm/kongstorage/templates/kongpvc.yaml
deleted file mode 100644 (file)
index 1a8762d..0000000
+++ /dev/null
@@ -1,29 +0,0 @@
-#  ============LICENSE_START===============================================
-#  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.
-#  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: PersistentVolumeClaim
-metadata:
-  name: kongpvc
-spec:
-  accessModes:
-    - "{{ .Values.kongpvc.persistence.accessMode }}"
-  resources:
-    requests:
-      storage: "{{ .Values.kongpvc.persistence.size }}"
-{{- if .Values.kongpv.enabled }}
-  volumeName: kongpv
-{{- end }}
diff --git a/nonrtric/helm/kongstorage/values.yaml b/nonrtric/helm/kongstorage/values.yaml
deleted file mode 100644 (file)
index f05dfa4..0000000
+++ /dev/null
@@ -1,34 +0,0 @@
-#  ============LICENSE_START===============================================
-#  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.
-#  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 Kong PV and PVC
-
-kongpv:
-  # This enables/disables the PV creation for kong
-  # PV creation is necessary when there is no default storage class
-  # This should be set to false when there is a default storage class, Which lets the PVC provisions the PV dynamically.
-  enabled: true
-  persistence:
-    volumeReclaimPolicy: Delete
-    accessMode: ReadWriteOnce
-    size: 2Gi
-    path: "/tmp/kongpv"
-
-kongpvc:
-  persistence:
-    volumeReclaimPolicy: Delete
-    accessMode: ReadWriteOnce
-    size: 2Gi
diff --git a/nonrtric/helm/nonrtric/Chart.yaml b/nonrtric/helm/nonrtric/Chart.yaml
deleted file mode 100644 (file)
index a7d865d..0000000
+++ /dev/null
@@ -1,82 +0,0 @@
-################################################################################
-#   Copyright (c) 2020 Nordix Foundation.                                      #
-#   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.           #
-#   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
-description: NonRealTime RAN Intelligent Controller
-name: nonrtric
-version: 2.0.0
-
-dependencies:
-  - name: a1controller
-    version: ~2.0.0
-    repository: "@local"
-    condition: nonrtric.installA1controller
-
-  - name: a1simulator
-    version: ~2.0.0
-    repository: "@local"
-    condition: nonrtric.installA1simulator
-
-  - name: controlpanel
-    version: ~2.0.0
-    repository: "@local"
-    condition: nonrtric.installControlpanel
-
-  - name: policymanagementservice
-    version: ~2.0.0
-    repository: "@local"
-    condition: nonrtric.installPms
-
-  - name: informationservice
-    version: ~1.0.0
-    repository: "@local"
-    condition: nonrtric.installInformationservice
-
-  - name: nonrtric-common
-    version: ^2.0.0
-    repository: "@local"
-    condition: true
-
-  - name: nonrtricgateway
-    version: ~1.0.0
-    repository: "@local"
-    condition: nonrtric.installNonrtricgateway
-
-  - name: dmaapadapterservice
-    version: ~1.0.0
-    repository: "@local"
-    condition: nonrtric.installDmaapadapterservice
-
-  - name: capifcore
-    version: ~1.0.0
-    repository: "@local"
-    condition: nonrtric.installCapifcore
-
-  - name: servicemanager
-    version: ~1.0.0
-    repository: "@local"
-    condition: nonrtric.installServicemanager
-
-  - name: rappmanager
-    version: ~1.0.0
-    repository: "@local"
-    condition: nonrtric.installrAppmanager
-
-  - name: dmeparticipant
-    version: ~1.0.0
-    repository: "@local"
-    condition: nonrtric.installDmeParticipant
diff --git a/nonrtric/helm/nonrtric/templates/pv1.yaml b/nonrtric/helm/nonrtric/templates/pv1.yaml
deleted file mode 100644 (file)
index 27426e4..0000000
+++ /dev/null
@@ -1,35 +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.                                             #
-################################################################################
-
-{{- if .Values.nonrtric.volume1.size }}
-
-kind: PersistentVolume
-apiVersion: v1
-metadata:
-  name: nonrtric-pv1
-  namespace: {{ include "common.namespace.nonrtric" . }}
-spec:
-  capacity:
-    storage: {{ .Values.nonrtric.volume1.size}}
-  accessModes:
-    - ReadWriteOnce
-    - ReadWriteMany
-  persistentVolumeReclaimPolicy: Retain
-  hostPath:
-    path:  {{ .Values.nonrtric.volume1.hostPath }}
-  storageClassName: {{ .Values.nonrtric.volume1.storageClassName }}
-
-{{- end }}
diff --git a/nonrtric/helm/nonrtric/templates/pv2.yaml b/nonrtric/helm/nonrtric/templates/pv2.yaml
deleted file mode 100644 (file)
index 0058780..0000000
+++ /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.                                             #
-################################################################################
-
-{{- if .Values.nonrtric.volume2.size }}
-
-kind: PersistentVolume
-apiVersion: v1
-metadata:
-  name: nonrtric-pv2
-  namespace: {{ include "common.namespace.nonrtric" . }}
-spec:
-  capacity:
-    storage: {{ .Values.nonrtric.volume2.size }}
-  accessModes:
-    - ReadWriteOnce
-    - ReadWriteMany
-  persistentVolumeReclaimPolicy: Retain
-  hostPath:
-    path:  {{ .Values.nonrtric.volume2.hostPath }}
-  storageClassName: {{ .Values.nonrtric.volume2.storageClassName }}
-
-{{- end }}
-
diff --git a/nonrtric/helm/nonrtric/templates/pv3.yaml b/nonrtric/helm/nonrtric/templates/pv3.yaml
deleted file mode 100644 (file)
index c0382f0..0000000
+++ /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.                                             #
-################################################################################
-
-{{- if .Values.nonrtric.volume3.size }}
-
-kind: PersistentVolume
-apiVersion: v1
-metadata:
-  name: nonrtric-pv3
-  namespace: {{ include "common.namespace.nonrtric" . }}
-spec:
-  capacity:
-    storage: {{ .Values.nonrtric.volume3.size }}
-  accessModes:
-    - ReadWriteOnce
-    - ReadWriteMany
-  persistentVolumeReclaimPolicy: Retain
-  hostPath:
-    path: /dockerdata-nfs/nonrtric/volume3
-  storageClassName: {{ .Values.nonrtric.volume3.storageClassName }}
-
-{{- end }}
-
diff --git a/nonrtric/helm/nonrtric/values.yaml b/nonrtric/helm/nonrtric/values.yaml
deleted file mode 100644 (file)
index c8edf87..0000000
+++ /dev/null
@@ -1,48 +0,0 @@
-#  ============LICENSE_START===============================================
-#  Copyright (C) 2020-2023 Nordix Foundation. All rights reserved.
-#  Copyright (C) 2023 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=================================================
-
-nonrtric:
-  installPms: true
-  installA1controller: true
-  installA1simulator: true
-  installControlpanel: true
-  installInformationservice: true
-  installRappcatalogueservice: true
-  installRappcatalogueEnhancedservice: true
-  installNonrtricgateway: true
-  installDmaapadapterservice: true
-  installDmaapmediatorservice: true
-  installHelmmanager: true
-  installOrufhrecovery: true
-  installRansliceassurance: true
-  installCapifcore: true
-  installServicemanager: true
-  installRanpm: true
-  installrAppmanager: true
-  installDmeParticipant: true
-
-  volume1:
-    size: 1Gi
-    storageClassName: volume1
-    hostPath: /dockerdata-nfs/nonrtric/volume1
-  volume2:
-    size: 1Gi
-    storageClassName: volume2
-    hostPath: /dockerdata-nfs/nonrtric/volume2
-  volume3:
-    size: 1Gi
-    storageClassName: volume3
\ No newline at end of file
diff --git a/nonrtric/helm/nonrtricgateway/.helmignore b/nonrtric/helm/nonrtricgateway/.helmignore
deleted file mode 100644 (file)
index 50af031..0000000
+++ /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/nonrtricgateway/Chart.yaml b/nonrtric/helm/nonrtricgateway/Chart.yaml
deleted file mode 100644 (file)
index c989221..0000000
+++ /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: "0.0.1"
-description: A Helm chart for Nonrtric Gateway
-name: nonrtricgateway
-version: 1.0.0
diff --git a/nonrtric/helm/nonrtricgateway/requirements.yaml b/nonrtric/helm/nonrtricgateway/requirements.yaml
deleted file mode 100644 (file)
index 69b4db6..0000000
+++ /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/nonrtricgateway/resources/config/application.yaml b/nonrtric/helm/nonrtricgateway/resources/config/application.yaml
deleted file mode 100644 (file)
index 602252b..0000000
+++ /dev/null
@@ -1,52 +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.                                             #
-################################################################################
-
-server:
-  port: 9090
-spring:
-  cloud:
-    gateway:
-      httpclient:
-        ssl:
-          useInsecureTrustManager: true
-        wiretap: true
-      httpserver:
-        wiretap: true
-      routes:
-      - id: A1-Policy
-        uri: https://policymanagementservice:8433
-        predicates:
-        - Path=/a1-policy/**
-      - id: A1-EI
-        uri: https://informationservice:9083
-        predicates:
-        - Path=/data-producer/**,/data-consumer/**
-management:
-  endpoint:
-    gateway:
-      enabled: true
-  endpoints:
-    web:
-      exposure:
-        include: "gateway,loggers,logfile,health,info,metrics,threaddump,heapdump"
-logging:
-  level:
-    ROOT: ERROR
-    org.springframework: ERROR
-    org.springframework.cloud.gateway: INFO
-    reactor.netty: INFO
-  file:
-    name: /var/log/nonrtric-gateway/application.log
\ No newline at end of file
diff --git a/nonrtric/helm/nonrtricgateway/templates/configmap.yaml b/nonrtric/helm/nonrtricgateway/templates/configmap.yaml
deleted file mode 100644 (file)
index d391d1e..0000000
+++ /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.nonrtricgateway" . }}-configmap
-  namespace: {{ include "common.namespace.nonrtric" . }}
-  labels:
-    app: {{ include "common.namespace.nonrtric" . }}-{{ include "common.name.nonrtricgateway" . }}
-    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/nonrtricgateway/templates/deployment.yaml b/nonrtric/helm/nonrtricgateway/templates/deployment.yaml
deleted file mode 100644 (file)
index bd742a9..0000000
+++ /dev/null
@@ -1,66 +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.nonrtricgateway" . }}
-  namespace: {{ include "common.namespace.nonrtric" . }}
-  generation: 1
-  labels:
-    app: {{ include "common.namespace.nonrtric" . }}-{{ include "common.name.nonrtricgateway" . }}
-    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.nonrtricgateway" . }}
-      release: {{ .Release.Name }}
-  template:
-    metadata:
-      labels:
-        app: {{ include "common.namespace.nonrtric" . }}-{{ include "common.name.nonrtricgateway" . }}
-        release: {{ .Release.Name }}
-    spec:
-      hostname: {{ include "common.name.nonrtricgateway" . }}
-      containers:
-      - name: {{ include "common.container.nonrtricgateway" . }}
-        image: {{ .Values.nonrtricgateway.image.registry }}/{{ .Values.nonrtricgateway.image.name }}:{{ .Values.nonrtricgateway.image.tag }}
-        imagePullPolicy: {{ .Values.nonrtricgateway.imagePullPolicy }}
-        ports:
-        - containerPort: {{ .Values.nonrtricgateway.service.targetPort1 }}
-          protocol: TCP
-        readinessProbe:
-          tcpSocket:
-            port: {{ .Values.nonrtricgateway.service.targetPort1 }}
-          initialDelaySeconds: {{ .Values.nonrtricgateway.liveness.initialDelaySeconds }}
-          periodSeconds: {{ .Values.nonrtricgateway.liveness.periodSeconds }}
-        livenessProbe:
-          tcpSocket:
-            port: {{ .Values.nonrtricgateway.service.targetPort1 }}
-          initialDelaySeconds: {{ .Values.nonrtricgateway.liveness.initialDelaySeconds }}
-          periodSeconds: {{ .Values.nonrtricgateway.liveness.periodSeconds }}
-        volumeMounts:
-        - name: {{ include "common.name.nonrtricgateway" . }}-config
-          mountPath: /opt/app/nonrtric-gateway/config
-      volumes:
-        - name: {{ include "common.name.nonrtricgateway" . }}-config
-          configMap:
-            name: {{ include "common.name.nonrtricgateway" . }}-configmap
\ No newline at end of file
diff --git a/nonrtric/helm/nonrtricgateway/templates/service.yaml b/nonrtric/helm/nonrtricgateway/templates/service.yaml
deleted file mode 100644 (file)
index 085c0e6..0000000
+++ /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.nonrtricgateway" . }}
-  namespace: {{ include "common.namespace.nonrtric" . }}
-  labels:
-    app: {{ include "common.namespace.nonrtric" . }}-{{ include "common.name.nonrtricgateway" . }}
-    chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
-    release: {{ .Release.Name }}
-    heritage: {{ .Release.Service }}
-spec:
-  ports:
-    - name: {{ index .Values.nonrtricgateway.service.httpName }}
-      port: {{ .Values.nonrtricgateway.service.internalPort1 }}
-      targetPort: {{ .Values.nonrtricgateway.service.targetPort1 }}
-      nodePort: {{ .Values.nonrtricgateway.service.externalPort1 }}
-      protocol: TCP
-  selector:
-    app: {{ include "common.namespace.nonrtric" . }}-{{ include "common.name.nonrtricgateway" . }}
-    release: {{ .Release.Name }}
-  type: NodePort
diff --git a/nonrtric/helm/nonrtricgateway/values.yaml b/nonrtric/helm/nonrtricgateway/values.yaml
deleted file mode 100644 (file)
index 61b781a..0000000
+++ /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.                                             #
-################################################################################
-
-# Default values for Gateway application.
-# This is a YAML-formatted file.
-# Declare variables to be passed into your templates.
-
-nonrtricgateway:
-  imagePullPolicy: IfNotPresent
-  image:
-    registry: 'nexus3.o-ran-sc.org:10002/o-ran-sc'
-    name: nonrtric-gateway
-    tag: 1.2.0
-  service:
-    httpName: http
-    internalPort1: 9090
-    targetPort1: 9090
-    externalPort1: 30093
-  liveness:
-    initialDelaySeconds: 20
-    periodSeconds: 10
-  readiness:
-    initialDelaySeconds: 20
-    periodSeconds: 10
\ No newline at end of file
diff --git a/nonrtric/helm/policymanagementservice/.helmignore b/nonrtric/helm/policymanagementservice/.helmignore
deleted file mode 100644 (file)
index 50af031..0000000
+++ /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/policymanagementservice/Chart.yaml b/nonrtric/helm/policymanagementservice/Chart.yaml
deleted file mode 100644 (file)
index 256af34..0000000
+++ /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 Policy Management Service
-name: policymanagementservice
-version: 2.0.0
diff --git a/nonrtric/helm/policymanagementservice/requirements.yaml b/nonrtric/helm/policymanagementservice/requirements.yaml
deleted file mode 100644 (file)
index 75e7020..0000000
+++ /dev/null
@@ -1,25 +0,0 @@
-################################################################################
-#   Copyright (c) 2020-2023 Nordix Foundation.                                 #
-#   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.                                             #
-################################################################################
-
-dependencies:
-  - name: nonrtric-common
-    version: ^2.0.0
-    repository: "@local"
-  - name: postgresql
-    version: 15.5.27
-    repository: "https://charts.bitnami.com/bitnami"
-    condition: policymanagementservice.database.enabled
diff --git a/nonrtric/helm/policymanagementservice/resources/config/application.yaml b/nonrtric/helm/policymanagementservice/resources/config/application.yaml
deleted file mode 100644 (file)
index 69f4096..0000000
+++ /dev/null
@@ -1,144 +0,0 @@
-################################################################################
-#   Copyright (c) 2020-2023 Nordix Foundation. All rights reserved.            #
-#   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.                                             #
-################################################################################
-
-app:
-  # A file containing an authorization token, which shall be inserted in each HTTP header (authorization).
-  # If the file name is empty, no authorization token is sent.
-  auth-token-file:
-  # A URL to authorization provider such as OPA. Each time an A1 Policy is accessed, a call to this
-  # authorization provider is done for access control. If this is empty, no fine grained access control is done.
-  authorization-provider:
-  # the config-file-schema-path referres to a location in the jar file. If this property is empty or missing,
-  # no schema validation will be executed.
-  config-file-schema-path: /application_configuration_schema.json
-  # Postgres database usage is enabled using the below parameter.
-  # If this is enabled, the application will use postgres database for storage.
-  # This overrides the s3(s3.bucket) or file store(vardata-directory) configuration if enabled.
-  database-enabled: {{ .Values.policymanagementservice.database.enabled }}
-  # Location of the component configuration file.
-  filepath: /var/policy-management-service/application_configuration.json
-  # S3 object store usage is enabled by defining the bucket to use. This will override the vardata-directory parameter.
-  s3:
-    endpointOverride: http://localhost:9000
-    accessKeyId: minio
-    secretAccessKey: miniostorage
-    bucket:
-  webclient:
-    # Configuration of usage of HTTP Proxy for the southbound accesses.
-    # The HTTP proxy (if configured) will only be used for accessing NearRT RIC:s
-    # proxy-type can be either HTTP, SOCKS4 or SOCKS5
-    http.proxy-host:
-    http.proxy-port: 0
-    http.proxy-type: HTTP
-    # Configuration of the trust store used for the HTTP client (outgoing requests)
-    # The file location and the password for the truststore is only relevant if trust-store-used == true
-    # Note that the same keystore as for the server is used.
-    trust-store-used: false
-    trust-store-password: policy_agent
-    trust-store: /opt/app/policy-agent/etc/cert/truststore.jks
-  # path where the service can store data. This parameter is not relevant if S3 Object store is configured.
-  vardata-directory: /var/policy-management-service
-lifecycle:
-  timeout-per-shutdown-phase: "20s"
-logging:
-  # Configuration of logging
-  file:
-    name: /var/log/policy-agent/application.log
-  level:
-    ROOT: INFO
-    org.onap.ccsdk.oran.a1policymanagementservice: INFO
-    org.springframework: ERROR
-    org.springframework.data: ERROR
-    org.springframework.web.reactive.function.client.ExchangeFunctions: ERROR
-    org.springframework.web.servlet.DispatcherServlet: ERROR
-    # org.postgresql: DEBUG
-    # org.onap.ccsdk.oran.a1policymanagementservice.datastore: DEBUG
-  pattern:
-    console: "%d{yyyy-MM-dd HH:mm:ss.SSS} [%-5level] [%thread] %logger{20} - %msg%n"
-    file: "%d{yyyy-MM-dd HH:mm:ss.SSS} [%-5level] [%thread] %logger{20} - %msg%n"
-management:
-  endpoint:
-    shutdown:
-      enabled: true
-  endpoints:
-    web:
-      exposure:
-        # Enabling of springboot actuator features. See springboot documentation.
-        include: "loggers,logfile,health,info,metrics,threaddump,heapdump,shutdown"
-  tracing:
-    propagation:
-      produce: ${ONAP_PROPAGATOR_PRODUCE:[W3C]}
-    sampling:
-      probability: 1.0
-otel:
-  exporter:
-    otlp:
-      traces:
-        endpoint: ${ONAP_OTEL_EXPORTER_ENDPOINT:http://jaeger:4317}
-        protocol: ${ONAP_OTEL_EXPORTER_PROTOCOL:grpc}
-  logs:
-    exporter: none
-  metrics:
-    exporter: none
-  sdk:
-    disabled: ${ONAP_SDK_DISABLED:true}
-    south: ${ONAP_TRACING_SOUTHBOUND:true}
-  tracing:
-    sampler:
-      jaeger_remote:
-        endpoint: ${ONAP_OTEL_SAMPLER_JAEGER_REMOTE_ENDPOINT:http://jaeger:14250}
-server:
-  # Configuration of the HTTP/REST server. The parameters are defined and handeled by the springboot framework.
-  # See springboot documentation.
-  port : 8433
-  http-port: 8081
-  shutdown: "graceful"
-  ssl:
-    key-store-type: JKS
-    key-store-password: policy_agent
-    key-store: /opt/app/policy-agent/etc/cert/keystore.jks
-    key-password: policy_agent
-    key-alias: policy_agent
-    # trust-store-password:
-    # trust-store:
-spring:
-  aop:
-    auto: false
-  application:
-    name: a1-pms
-  flyway:
-    # Configuration of the postgres database to be used for database migration.
-    # This is where the flyway maintains the information about the sql files loaded.
-    # These values can be passed via configmap/secret/env variable based on the installation.
-    # By default, Flyway uses location classpath:db/migration to load the sql files.
-    # This can be overridden using "flyway.locations" to have a different location.
-    # Password will be injected via secret/env configuration
-    baseline-on-migrate: true
-    url: "jdbc:postgresql://policymanagementservice-db:5432/a1pms"
-    user: a1pms
-  main:
-    allow-bean-definition-overriding: true
-  profiles:
-    active: prod
-  r2dbc:
-    # Configuration of the postgres database to be used by the application.
-    # These values can be passed via configmap/secret/env variable based on the installation.
-    # Password will be injected via secret/env configuration
-    url: "r2dbc:postgresql://policymanagementservice-db:5432/a1pms"
-    username: a1pms
-springdoc:
-  show-actuator: true
\ No newline at end of file
diff --git a/nonrtric/helm/policymanagementservice/resources/data/application_configuration.json b/nonrtric/helm/policymanagementservice/resources/data/application_configuration.json
deleted file mode 100644 (file)
index 0abd1d5..0000000
+++ /dev/null
@@ -1,68 +0,0 @@
-{
-  "config": {
-    "controller": [
-      {
-        "name": "controller1",
-        "baseUrl": "https://a1controller:8383",
-        "userName": "admin",
-        "password": "Kp8bJ4SXszM0WXlhak3eHlcse2gAw84vaoGGmJvUy2U"
-      }
-    ],
-    "ric": [
-      {
-        "name": "ric1",
-        "baseUrl": "https://a1-sim-osc-0.a1-sim:8185",
-        "controller": "controller1",
-        "managedElementIds": [
-          "kista_1",
-          "kista_2"
-        ]
-      },
-      {
-        "name": "ric2",
-        "baseUrl": "https://a1-sim-osc-1.a1-sim:8185",
-        "controller": "controller1",
-        "managedElementIds": [
-          "kista_1",
-          "kista_2"
-        ]
-      },
-      {
-        "name": "ric3",
-        "baseUrl": "https://a1-sim-std-0.a1-sim:8185",
-        "controller": "controller1",
-        "managedElementIds": [
-          "kista_1",
-          "kista_2"
-        ]
-      },
-      {
-        "name": "ric4",
-        "baseUrl": "https://a1-sim-std-1.a1-sim:8185",
-        "controller": "controller1",
-        "managedElementIds": [
-          "kista_1",
-          "kista_2"
-        ]
-      },
-      {
-        "name": "ric5",
-        "baseUrl": "https://a1-sim-std2-0.a1-sim:8185",
-        "controller": "controller1",
-        "managedElementIds": [
-          "kista_1",
-          "kista_2"
-        ]
-      },
-      {
-        "name": "ric6",
-        "baseUrl": "https://a1-sim-std2-1.a1-sim:8185",
-        "controller": "controller1",
-        "managedElementIds": [
-          "kista_1",
-          "kista_2"
-        ]
-      }
-    ]
-  }
-}
\ No newline at end of file
diff --git a/nonrtric/helm/policymanagementservice/templates/configmap.yaml b/nonrtric/helm/policymanagementservice/templates/configmap.yaml
deleted file mode 100644 (file)
index a7bb6b5..0000000
+++ /dev/null
@@ -1,43 +0,0 @@
-################################################################################
-#   Copyright (c) 2020-2023 Nordix Foundation.                                 #
-#   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: v1
-kind: ConfigMap
-metadata:
-  name: {{ include "common.name.policymanagementservice" . }}-configmap-application-yaml
-  namespace: {{ include "common.namespace.nonrtric" . }}
-  labels:
-    app: {{ include "common.namespace.nonrtric" . }}-{{ include "common.name.policymanagementservice" . }}
-    chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
-    release: {{ .Release.Name }}
-    heritage: {{ .Release.Service }}
-data:
-{{ tpl (.Files.Glob "resources/config/*").AsConfig . | indent 2 }}
----
-apiVersion: v1
-kind: ConfigMap
-metadata:
-  name: {{ include "common.name.policymanagementservice" . }}-configmap-application-json-configuration
-  namespace: {{ include "common.namespace.nonrtric" . }}
-  labels:
-    app: {{ include "common.namespace.nonrtric" . }}-{{ include "common.name.policymanagementservice" . }}
-    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/policymanagementservice/templates/ingress.yaml b/nonrtric/helm/policymanagementservice/templates/ingress.yaml
deleted file mode 100644 (file)
index d981da5..0000000
+++ /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.                                             #
-################################################################################
-*/}}
-
-{{- if .Values.policymanagementservice.ingress.enabled -}}
-apiVersion: networking.k8s.io/v1
-kind: Ingress
-metadata:
-  name: {{ include "common.name.policymanagementservice" . }}
-  namespace: {{ include "common.namespace.nonrtric" . }}
-
-spec:
-  ingressClassName: {{ include "common.ingressClassName" . }}
-  rules:
-    - http:
-        paths:
-          - backend:
-              service:
-                name: {{ include "common.name.policymanagementservice" . }}
-                port:
-                  number: {{ .Values.policymanagementservice.service.internalPort1 }}
-            path: "/a1-policy"
-            pathType: Prefix
-{{- end -}}
\ No newline at end of file
diff --git a/nonrtric/helm/policymanagementservice/templates/pg-secret.yaml b/nonrtric/helm/policymanagementservice/templates/pg-secret.yaml
deleted file mode 100644 (file)
index 36b09bb..0000000
+++ /dev/null
@@ -1,26 +0,0 @@
-#  ============LICENSE_START===============================================\r
-#  Copyright (C) 2024 OpenInfra Foundation Europe. All rights reserved.\r
-#  ========================================================================\r
-#  Licensed under the Apache License, Version 2.0 (the "License");\r
-#  you may not use this file except in compliance with the License.\r
-#  You may obtain a copy of the License at\r
-#\r
-#       http://www.apache.org/licenses/LICENSE-2.0\r
-#\r
-#  Unless required by applicable law or agreed to in writing, software\r
-#  distributed under the License is distributed on an "AS IS" BASIS,\r
-#  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\r
-#  See the License for the specific language governing permissions and\r
-#  limitations under the License.\r
-#  ============LICENSE_END=================================================\r
-#\r
-\r
-apiVersion: v1\r
-kind: Secret\r
-metadata:\r
-  name: {{ include "common.name.policymanagementservice" . }}-pg-secret\r
-type: Opaque\r
-data:\r
-    password: &a1pmsdbpwd {{ .Values.policymanagementservice.database.password }}\r
-    postgres-password: *a1pmsdbpwd\r
-    replication-password: *a1pmsdbpwd\r
diff --git a/nonrtric/helm/policymanagementservice/templates/service.yaml b/nonrtric/helm/policymanagementservice/templates/service.yaml
deleted file mode 100644 (file)
index 6d820e2..0000000
+++ /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.policymanagementservice" . }}
-  namespace: {{ include "common.namespace.nonrtric" . }}
-  labels:
-    app: {{ include "common.namespace.nonrtric" . }}-{{ include "common.name.policymanagementservice" . }}
-    chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
-    release: {{ .Release.Name }}
-    heritage: {{ .Release.Service }}
-spec:
-  ports:
-    {{if eq .Values.policymanagementservice.service.allowHttp true -}}
-    - name: {{ index .Values.policymanagementservice.service.httpName }}
-      port: {{ .Values.policymanagementservice.service.internalPort1 }}
-      targetPort: {{ .Values.policymanagementservice.service.targetPort1 }}
-      protocol: TCP
-    {{- end }}
-    - name: {{ index .Values.policymanagementservice.service.httpsName }}
-      port: {{ .Values.policymanagementservice.service.internalPort2 }}
-      targetPort: {{ .Values.policymanagementservice.service.targetPort2 }}
-      protocol: TCP
-  selector:
-    app: {{ include "common.namespace.nonrtric" . }}-{{ include "common.name.policymanagementservice" . }}
-    release: {{ .Release.Name }}
-  type: ClusterIP
diff --git a/nonrtric/helm/policymanagementservice/templates/statefulset.yaml b/nonrtric/helm/policymanagementservice/templates/statefulset.yaml
deleted file mode 100644 (file)
index 918916c..0000000
+++ /dev/null
@@ -1,131 +0,0 @@
-################################################################################
-#   Copyright (c) 2020-2023 Nordix Foundation.                                 #
-#   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.                                             #
-################################################################################
-
-kind: StatefulSet
-apiVersion: apps/v1
-metadata:
-  name: {{ include "common.name.policymanagementservice" . }}
-  namespace: {{ include "common.namespace.nonrtric" . }}
-  generation: 1
-  labels:
-    app: {{ include "common.namespace.nonrtric" . }}-{{ include "common.name.policymanagementservice" . }}
-    chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
-    release: {{ .Release.Name }}
-    heritage: {{ .Release.Service }}
-  annotations:
-    deployment.kubernetes.io/revision: '1'
-spec:
-  serviceName: {{ include "common.name.policymanagementservice" . }}
-  replicas: 1
-  selector:
-    matchLabels:
-      app: {{ include "common.namespace.nonrtric" . }}-{{ include "common.name.policymanagementservice" . }}
-      release: {{ .Release.Name }}
-  template:
-    metadata:
-      labels:
-        app: {{ include "common.namespace.nonrtric" . }}-{{ include "common.name.policymanagementservice" . }}
-        release: {{ .Release.Name }}
-    spec:
-      hostname: {{ include "common.name.policymanagementservice" . }}
-      initContainers:
-      {{ if .Values.policymanagementservice.database.enabled }}
-      - name: check-db-ready
-        image: busybox:1.28
-        command: ['sh', '-c']
-        args:
-          - |
-            until nc -z -v -w20 {{ .Values.postgresql.fullnameOverride }} 5432
-            do
-              echo "waiting for postgres to be running";
-              sleep 2;
-            done;
-            echo "Postgres is up and running";
-      {{ end }}
-      - name: copy
-        image: busybox:1.28
-        command:
-        - /bin/sh
-        - -c
-        - FILE=/var/policy-management-service/application_configuration.json;
-          if [ ! -f $FILE ]; then
-            cp  /etc/app/policy-management-service/application_configuration_json_initial/application_configuration.json $FILE;
-          fi;
-          chmod 666 $FILE;
-          chown {{ .Values.policymanagementservice.volumepermissions.groupid }}:{{ .Values.policymanagementservice.volumepermissions.userid }} -R /var/policy-management-service/;
-        volumeMounts:
-        - name: {{ include "common.name.policymanagementservice" . }}-vardata
-          mountPath: "/var/policy-management-service"
-        - name: {{ include "common.name.policymanagementservice" . }}-application-configuration-json-initial
-          mountPath: /etc/app/policy-management-service/application_configuration_json_initial
-      containers:
-      - name: {{ include "common.container.policymanagementservice" . }}
-        image: {{ .Values.policymanagementservice.image.registry }}/{{ .Values.policymanagementservice.image.name }}:{{ .Values.policymanagementservice.image.tag }}
-        imagePullPolicy: {{ .Values.policymanagementservice.imagePullPolicy }}
-        ports:
-        - containerPort: {{ .Values.policymanagementservice.service.targetPort1 }}
-          protocol: TCP
-        - containerPort: {{ .Values.policymanagementservice.service.targetPort2 }}
-          protocol: TCP
-        {{ if .Values.policymanagementservice.database.enabled }}
-        env:
-          - name: SPRING_FLYWAY_PASSWORD
-            valueFrom:
-              secretKeyRef:
-                name: {{ include "common.name.policymanagementservice" . }}-pg-secret
-                key: password
-          - name: SPRING_R2DBC_PASSWORD
-            valueFrom:
-              secretKeyRef:
-                name: {{ include "common.name.policymanagementservice" . }}-pg-secret
-                key: password
-        {{ end }}
-        readinessProbe:
-          tcpSocket:
-            port: {{ .Values.policymanagementservice.service.targetPort1 }}
-          initialDelaySeconds: {{ .Values.policymanagementservice.liveness.initialDelaySeconds }}
-          periodSeconds: {{ .Values.policymanagementservice.liveness.periodSeconds }}
-        livenessProbe:
-          httpGet:
-            path: /status
-            port: {{ .Values.policymanagementservice.service.targetPort1 }}
-          initialDelaySeconds: {{ .Values.policymanagementservice.liveness.initialDelaySeconds }}
-          periodSeconds: {{ .Values.policymanagementservice.liveness.periodSeconds }}
-        volumeMounts:
-        - name: {{ include "common.name.policymanagementservice" . }}-vardata
-          mountPath: "/var/policy-management-service"
-        - name: {{ include "common.name.policymanagementservice" . }}-application-yaml
-          mountPath: /opt/app/policy-agent/config
-        - name: {{ include "common.name.policymanagementservice" . }}-application-configuration-json-initial
-          mountPath: /etc/app/policy-management-service/application_configuration_json_initial
-      volumes:
-        - name: {{ include "common.name.policymanagementservice" . }}-application-yaml
-          configMap:
-            name: {{ include "common.name.policymanagementservice" . }}-configmap-application-yaml
-        - name: {{ include "common.name.policymanagementservice" . }}-application-configuration-json-initial
-          configMap:
-            name: {{ include "common.name.policymanagementservice" . }}-configmap-application-json-configuration
-  volumeClaimTemplates:
-    - metadata:
-        name: {{ include "common.name.policymanagementservice" . }}-vardata
-      spec:
-        accessModes:
-          - ReadWriteOnce
-        storageClassName: "{{ .Values.policymanagementservice.persistence.storageClassName }}"
-        resources:
-          requests:
-            storage: "{{ .Values.policymanagementservice.persistence.size }}"
diff --git a/nonrtric/helm/policymanagementservice/values.yaml b/nonrtric/helm/policymanagementservice/values.yaml
deleted file mode 100644 (file)
index b82eff6..0000000
+++ /dev/null
@@ -1,68 +0,0 @@
-#  ============LICENSE_START================================================
-#  Copyright (C) 2020-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 Policy Management Service.
-# This is a YAML-formatted file.
-# Declare variables to be passed into your templates.
-
-policymanagementservice:
-  imagePullPolicy: IfNotPresent
-  image:
-    registry: "nexus3.o-ran-sc.org:10002/o-ran-sc"
-    name: nonrtric-plt-a1policymanagementservice
-    tag: 2.8.0
-  service:
-    allowHttp: true
-    httpName: http
-    internalPort1: 8081
-    targetPort1: 8081
-    httpsName: https
-    internalPort2: 8433
-    targetPort2: 8433
-  liveness:
-    initialDelaySeconds: 20
-    periodSeconds: 10
-  readiness:
-    initialDelaySeconds: 20
-    periodSeconds: 10
-  persistence:
-    size: 2Gi
-    storageClassName: standard
-  ingress:
-    enabled: false
-  #Volumepermissions needs to align with the container build arguments
-  volumepermissions:
-    groupid: 120957
-    userid: 120957
-  database:
-    # By default database is disabled
-    # Enabling this will start postgres and use that as storage
-    enabled: false
-    password: bXlwd2Q=
-# These are the postgresql installation parameters
-postgresql:
-  fullnameOverride: policymanagementservice-db
-  auth:
-    username: a1pms
-    existingSecret: policymanagementservice-pg-secret
-    database: a1pms
-  primary:
-    # Persistence disabled by default.
-    # Restarting postgres container will clear the data.
-    # Persistence can be enabled by providing volume details in the below section (size, volumeName, storageClass).
-    persistence:
-      enabled: false
diff --git a/nonrtric/helm/rappmanager/.helmignore b/nonrtric/helm/rappmanager/.helmignore
deleted file mode 100644 (file)
index 50af031..0000000
+++ /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/rappmanager/Chart.yaml b/nonrtric/helm/rappmanager/Chart.yaml
deleted file mode 100644 (file)
index 45c78f4..0000000
+++ /dev/null
@@ -1,22 +0,0 @@
-#  ============LICENSE_START===============================================
-#  Copyright (C) 2023 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
-appVersion: "2.0.0"
-description: A Helm chart for rAppmanager
-name: rappmanager
-version: 1.0.0
diff --git a/nonrtric/helm/rappmanager/requirements.yaml b/nonrtric/helm/rappmanager/requirements.yaml
deleted file mode 100644 (file)
index d0fba08..0000000
+++ /dev/null
@@ -1,21 +0,0 @@
-#  ============LICENSE_START===============================================
-#  Copyright (C) 2023 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=================================================
-#
-
-dependencies:
-  - name: nonrtric-common
-    version: ^2.0.0
-    repository: "@local"
diff --git a/nonrtric/helm/rappmanager/resources/config/application.yaml b/nonrtric/helm/rappmanager/resources/config/application.yaml
deleted file mode 100644 (file)
index e61f10f..0000000
+++ /dev/null
@@ -1,53 +0,0 @@
-################################################################################
-#   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.                                             #
-################################################################################
-
-rappmanager:
-  csarlocation: /opt/app/rappmanager/csar
-  acm:
-    baseurl: http://policy-clamp-runtime-acm.default:6969/onap/policy/clamp/acm/v2/
-    maxRetries: 10
-    retryInterval: 2 #seconds
-  sme:
-    baseurl: http://servicemanager:8095
-    providerBasePath: /api-provider-management/v1/
-    invokerBasePath: /api-invoker-management/v1/
-    publishApiBasePath: /published-apis/v1/
-    maxRetries: 3
-    retryInterval: 2 #seconds
-  dme:
-    baseurl: http://informationservice:9082
-
-  rapps:
-    env:
-      smeDiscoveryEndpoint: http://servicemanager:8095/service-apis/v1/allServiceAPIs
-
-spring:
-  jackson:
-    default-property-inclusion: non_null
-
-logging:
-  level:
-    root: INFO
-    com.oransc: DEBUG
-    org.apache.http: DEBUG
-    httpclient.wire: DEBUG
-    org.springframework.web.client.RestTemplate: TRACE
-
-management:
-  endpoints:
-    web:
-      exposure:
-        include: "*"
\ No newline at end of file
diff --git a/nonrtric/helm/rappmanager/templates/configmap.yaml b/nonrtric/helm/rappmanager/templates/configmap.yaml
deleted file mode 100644 (file)
index 8130fbb..0000000
+++ /dev/null
@@ -1,29 +0,0 @@
-#  ============LICENSE_START===============================================
-#  Copyright (C) 2023 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: ConfigMap
-metadata:
-  name: {{ include "common.name.rappmanager" . }}-configmap-config
-  namespace: {{ include "common.namespace.nonrtric" . }}
-  labels:
-    app: {{ include "common.namespace.nonrtric" . }}-{{ include "common.name.rappmanager" . }}
-    chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
-    release: {{ .Release.Name }}
-    heritage: {{ .Release.Service }}
-data:
-{{ tpl (.Files.Glob "resources/config/*").AsConfig . | indent 2 }}
diff --git a/nonrtric/helm/rappmanager/templates/ingress.yaml b/nonrtric/helm/rappmanager/templates/ingress.yaml
deleted file mode 100644 (file)
index 3ab75f6..0000000
+++ /dev/null
@@ -1,39 +0,0 @@
-{{/*
-#  ============LICENSE_START===============================================
-#  Copyright (C) 2023 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 .Values.rappmanager.ingress.enabled -}}
-apiVersion: networking.k8s.io/v1
-kind: Ingress
-metadata:
-  name: {{ include "common.name.rappmanager" . }}
-  namespace: {{ include "common.namespace.nonrtric" . }}
-
-spec:
-  ingressClassName: {{ include "common.ingressClassName" . }}
-  rules:
-    - http:
-        paths:
-          - backend:
-              service:
-                name: {{ include "common.name.rappmanager" . }}
-                port:
-                  number: {{ .Values.rappmanager.service.internalPort1 }}
-            path: "/rapps"
-            pathType: Prefix
-{{- end -}}
\ No newline at end of file
diff --git a/nonrtric/helm/rappmanager/templates/secret.yaml b/nonrtric/helm/rappmanager/templates/secret.yaml
deleted file mode 100755 (executable)
index a8cbfc1..0000000
+++ /dev/null
@@ -1,25 +0,0 @@
-#  ============LICENSE_START===============================================\r
-#  Copyright (C) 2023 OpenInfra Foundation Europe. All rights reserved.\r
-#  ========================================================================\r
-#  Licensed under the Apache License, Version 2.0 (the "License");\r
-#  you may not use this file except in compliance with the License.\r
-#  You may obtain a copy of the License at\r
-#\r
-#       http://www.apache.org/licenses/LICENSE-2.0\r
-#\r
-#  Unless required by applicable law or agreed to in writing, software\r
-#  distributed under the License is distributed on an "AS IS" BASIS,\r
-#  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\r
-#  See the License for the specific language governing permissions and\r
-#  limitations under the License.\r
-#  ============LICENSE_END=================================================\r
-#\r
-\r
-apiVersion: v1\r
-kind: Secret\r
-metadata:\r
-  name: {{ include "common.name.rappmanager" . }}-acm-secret\r
-type: Opaque\r
-data:\r
-    username: {{ .Values.rappmanager.acm.username }}\r
-    password: {{ .Values.rappmanager.acm.password }}\r
diff --git a/nonrtric/helm/rappmanager/templates/service.yaml b/nonrtric/helm/rappmanager/templates/service.yaml
deleted file mode 100644 (file)
index e1062ff..0000000
+++ /dev/null
@@ -1,37 +0,0 @@
-#  ============LICENSE_START===============================================
-#  Copyright (C) 2023 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: Service
-apiVersion: v1
-metadata:
-  name: {{ include "common.name.rappmanager" . }}
-  namespace: {{ include "common.namespace.nonrtric" . }}
-  labels:
-    app: {{ include "common.namespace.nonrtric" . }}-{{ include "common.name.rappmanager" . }}
-    chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
-    release: {{ .Release.Name }}
-    heritage: {{ .Release.Service }}
-spec:
-  ports:
-    - name: {{ index .Values.rappmanager.service.httpName }}
-      port: {{ .Values.rappmanager.service.internalPort1 }}
-      targetPort: {{ .Values.rappmanager.service.targetPort1 }}
-      protocol: TCP
-  selector:
-    app: {{ include "common.namespace.nonrtric" . }}-{{ include "common.name.rappmanager" . }}
-    release: {{ .Release.Name }}
-  type: ClusterIP
diff --git a/nonrtric/helm/rappmanager/templates/statefulset.yaml b/nonrtric/helm/rappmanager/templates/statefulset.yaml
deleted file mode 100644 (file)
index dccb285..0000000
+++ /dev/null
@@ -1,79 +0,0 @@
-#  ============LICENSE_START===============================================
-#  Copyright (C) 2023 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:
-  name: {{ include "common.name.rappmanager" . }}
-  namespace: {{ include "common.namespace.nonrtric" . }}
-  generation: 1
-  labels:
-    app: {{ include "common.namespace.nonrtric" . }}-{{ include "common.name.rappmanager" . }}
-    chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
-    release: {{ .Release.Name }}
-    heritage: {{ .Release.Service }}
-  annotations:
-    deployment.kubernetes.io/revision: '1'
-spec:
-  serviceName: {{ include "common.name.rappmanager" . }}
-  replicas: 1
-  selector:
-    matchLabels:
-      app: {{ include "common.namespace.nonrtric" . }}-{{ include "common.name.rappmanager" . }}
-      release: {{ .Release.Name }}
-  template:
-    metadata:
-      labels:
-        app: {{ include "common.namespace.nonrtric" . }}-{{ include "common.name.rappmanager" . }}
-        release: {{ .Release.Name }}
-    spec:
-      hostname: {{ include "common.name.rappmanager" . }}
-      containers:
-      - name: {{ include "common.container.rappmanager" . }}
-        image: {{ .Values.rappmanager.image.registry }}/{{ .Values.rappmanager.image.name }}:{{ .Values.rappmanager.image.tag }}
-        imagePullPolicy: {{ .Values.rappmanager.imagePullPolicy }}
-        ports:
-        - containerPort: {{ .Values.rappmanager.service.targetPort1 }}
-          protocol: TCP
-        readinessProbe:
-          tcpSocket:
-            port: {{ .Values.rappmanager.service.targetPort1 }}
-          initialDelaySeconds: {{ .Values.rappmanager.liveness.initialDelaySeconds }}
-          periodSeconds: {{ .Values.rappmanager.liveness.periodSeconds }}
-        livenessProbe:
-          tcpSocket:
-            port: {{ .Values.rappmanager.service.targetPort1 }}
-          initialDelaySeconds: {{ .Values.rappmanager.liveness.initialDelaySeconds }}
-          periodSeconds: {{ .Values.rappmanager.liveness.periodSeconds }}
-        env:
-        - name: RAPPMANAGER_ACM_USERNAME
-          valueFrom:
-            secretKeyRef:
-              name: {{ include "common.name.rappmanager" . }}-acm-secret
-              key: username
-        - name: RAPPMANAGER_ACM_PASSWORD
-          valueFrom:
-            secretKeyRef:
-              name: {{ include "common.name.rappmanager" . }}-acm-secret
-              key: password
-        volumeMounts:
-        - name: {{ include "common.name.rappmanager" . }}-rappmanager-config
-          mountPath: /opt/app/rappmanager/config
-      volumes:
-        - name: {{ include "common.name.rappmanager" . }}-rappmanager-config
-          configMap:
-            name: {{ include "common.name.rappmanager" . }}-configmap-config
diff --git a/nonrtric/helm/rappmanager/values.yaml b/nonrtric/helm/rappmanager/values.yaml
deleted file mode 100644 (file)
index 75c54cc..0000000
+++ /dev/null
@@ -1,46 +0,0 @@
-#  ============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.
-
-rappmanager:
-  imagePullPolicy: IfNotPresent
-  image:
-    registry: "nexus3.o-ran-sc.org:10002/o-ran-sc"
-    name: nonrtric-plt-rappmanager
-    tag: 0.1.0
-  service:
-    httpName: http
-    internalPort1: 8080
-    targetPort1: 8080
-  liveness:
-    initialDelaySeconds: 20
-    periodSeconds: 10
-  readiness:
-    initialDelaySeconds: 20
-    periodSeconds: 10
-  persistence:
-    size: 2Gi
-    storageClassName: standard
-  ingress:
-    enabled: false
-  acm:
-    username: cnVudGltZVVzZXI=
-    password: emIhWHp0RzM0
diff --git a/nonrtric/helm/servicemanager/Chart.yaml b/nonrtric/helm/servicemanager/Chart.yaml
deleted file mode 100644 (file)
index ba0886a..0000000
+++ /dev/null
@@ -1,21 +0,0 @@
-################################################################################
-#   Copyright (c) 2024 OpenInfra Foundation Europe.                            #
-#                                                                              #
-#   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 ServiceManager
-name: servicemanager
-version: 1.0.0
diff --git a/nonrtric/helm/servicemanager/requirements.yaml b/nonrtric/helm/servicemanager/requirements.yaml
deleted file mode 100644 (file)
index f9c3ecc..0000000
+++ /dev/null
@@ -1,19 +0,0 @@
-################################################################################
-#   Copyright (c) 2024 OpenInfra Foundation Europe.                            #
-#                                                                              #
-#   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/servicemanager/templates/configmap.yaml b/nonrtric/helm/servicemanager/templates/configmap.yaml
deleted file mode 100644 (file)
index 280e58f..0000000
+++ /dev/null
@@ -1,32 +0,0 @@
-################################################################################
-#   Copyright (c) 2024 OpenInfra Foundation Europe.                            #
-#                                                                              #
-#   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.servicemanager" . }}-configmap
-  namespace: {{ include "common.namespace.nonrtric" . }}
-  labels:
-    app: {{ include "common.namespace.nonrtric" . }}-{{ include "common.name.servicemanager" . }}
-    chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
-    release: {{ .Release.Name }}
-    heritage: {{ .Release.Service }}
-data:
-{{- range $key, $value := .Values.data }}
-  {{ $key }}: |
-{{ $value | indent 4 }}
-{{- end }}
diff --git a/nonrtric/helm/servicemanager/templates/deployment.yaml b/nonrtric/helm/servicemanager/templates/deployment.yaml
deleted file mode 100644 (file)
index cdf1af3..0000000
+++ /dev/null
@@ -1,60 +0,0 @@
-################################################################################
-#   Copyright (c) 2024 OpenInfra Foundation Europe.                            #
-#                                                                              #
-#   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.servicemanager" . }}
-  namespace: {{ include "common.namespace.nonrtric" . }}
-  generation: 1
-  labels:
-    app: {{ include "common.namespace.nonrtric" . }}-{{ include "common.name.servicemanager" . }}
-    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.servicemanager" . }}
-      release: {{ .Release.Name }}
-  template:
-    metadata:
-      labels:
-        app: {{ include "common.namespace.nonrtric" . }}-{{ include "common.name.servicemanager" . }}
-        release: {{ .Release.Name }}
-    spec:
-      hostname: {{ include "common.name.servicemanager" . }}
-      containers:
-      - name: {{ include "common.container.servicemanager" . }}
-        image: {{ .Values.servicemanager.image.registry }}/{{ .Values.servicemanager.image.name }}:{{ .Values.servicemanager.image.tag }}
-        imagePullPolicy: {{ .Values.servicemanager.imagePullPolicy }}
-        resources:
-          limits:
-            memory: 256Mi
-            cpu: "250m"
-          requests:
-            memory: 128Mi
-            cpu: "80m"
-        volumeMounts:
-        - name: servicemanager-config-volume
-          mountPath: /app/servicemanager/.env
-          subPath: .env
-      volumes:
-      - name: servicemanager-config-volume
-        configMap:
-          name:  servicemanager-configmap
diff --git a/nonrtric/helm/servicemanager/templates/service.yaml b/nonrtric/helm/servicemanager/templates/service.yaml
deleted file mode 100644 (file)
index 159b4ab..0000000
+++ /dev/null
@@ -1,40 +0,0 @@
-################################################################################
-#   Copyright (c) 2024 OpenInfra Foundation Europe.                            #
-#                                                                              #
-#   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.servicemanager" . }}
-  namespace: {{ include "common.namespace.nonrtric" . }}
-  labels:
-    app: {{ include "common.namespace.nonrtric" . }}-{{ include "common.name.servicemanager" . }}
-    chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
-    release: {{ .Release.Name }}
-    heritage: {{ .Release.Service }}
-spec:
-  ports:
-    {{if eq .Values.servicemanager.service.allowHttp true -}}
-    - name: {{ index .Values.servicemanager.service.httpName }}
-      port: {{ .Values.servicemanager.service.port }}
-      targetPort: {{ .Values.servicemanager.service.targetPort }}
-      {{if eq .Values.servicemanager.service.type "NodePort" -}}
-      nodePort: {{ .Values.servicemanager.service.nodePort }}
-      {{- end }}
-      protocol: TCP
-    {{- end }}
-  selector:
-    app: {{ include "common.namespace.nonrtric" . }}-{{ include "common.name.servicemanager" . }}
-    release: {{ .Release.Name }}
-  type: {{ .Values.servicemanager.service.type }}
diff --git a/nonrtric/helm/servicemanager/values.yaml b/nonrtric/helm/servicemanager/values.yaml
deleted file mode 100644 (file)
index 1463130..0000000
+++ /dev/null
@@ -1,52 +0,0 @@
-#  ============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=================================================
-
-# Default values for Servicemanager
-
-servicemanager:
-  imagePullPolicy: IfNotPresent
-  image:
-    registry: 'nexus3.o-ran-sc.org:10004/o-ran-sc'
-    name: nonrtric-plt-servicemanager
-    tag: 0.1.3
-  apiVersion: v1
-  kind: ConfigMap
-  metadataName: servicemanager-configmap
-  service:
-    httpName: http
-    allowHttp: true
-    port: 8095
-    targetPort: 8095
-    nodePort: 31575
-    type: NodePort
-    SERVICE_MANAGER_ENV: ""
-
-data:
-  .env: |
-    # The Kong Data plane provides the endpoint that Service Manager gives to the rApp so that the rApp can invoke the CAPIF published API.
-    # In a Kubernetes environment, we need to use the Kong NodePort IP and nodePort if the rApp needs access from outside the Kong cluster.
-    # From inside the Kong cluster, we can use the Kubernetes cluster DNS entry, oran-nonrtric-kong-proxy.nonrtric.svc.cluster.local.
-    KONG_DOMAIN: "kong"
-    KONG_PROTOCOL: "http"
-    KONG_CONTROL_PLANE_IPV4: "oran-nonrtric-kong-admin.nonrtric.svc.cluster.local"
-    KONG_CONTROL_PLANE_PORT: "8001"
-    KONG_DATA_PLANE_IPV4: "oran-nonrtric-kong-proxy.nonrtric.svc.cluster.local"
-    KONG_DATA_PLANE_PORT: "80"
-    CAPIF_PROTOCOL: "http"
-    CAPIF_IPV4: "capifcore.nonrtric.svc.cluster.local"
-    CAPIF_PORT: "8090"
-    LOG_LEVEL: "Info"
-    SERVICE_MANAGER_PORT: "8095"