From 7f1e409379856025977fc8a6ea04ddb215f21a13 Mon Sep 17 00:00:00 2001 From: Zhe Huang Date: Tue, 28 May 2019 16:16:02 -0400 Subject: [PATCH] Add one-click deployment scripts and override file examples. Signed-off-by: Zhe Huang Change-Id: I35588deac8c0788eac1dcd99ea6d75e5d9cad03c --- README.md | 48 +++++---- RECIPE_EXAMPLE/RECIPE_EXAMPLE | 102 +++++++++++++++++++ bin/deploy-ric-aux | 45 +++++++++ bin/deploy-ric-platform | 46 +++++++++ bin/undeploy-ric-aux | 33 ++++++ bin/undeploy-ric-platform | 35 +++++++ etc/ric-aux.conf | 25 +++++ etc/ric-platform.conf | 27 +++++ infra/10-Nexus/docker/nexus-repository-helm | 1 - .../80-Auxiliary-Functions/bin/install | 0 .../80-Auxiliary-Functions/bin/uninstall | 0 .../80-Auxiliary-Functions/etc/dashboard.conf | 0 .../helm/dashboard/Chart.yaml | 0 .../helm/dashboard/requirements.yaml | 0 .../helm/dashboard/templates/_helpers.tpl | 0 .../helm/dashboard/templates/configmap.yaml | 0 .../helm/dashboard/templates/deployment.yaml | 4 +- .../helm/dashboard/templates/service.yaml | 4 +- .../helm/dashboard/values.yaml | 20 ++-- {aux => ric-aux}/README.md | 0 {infra => ric-infra}/00-Kubernetes/bin/install | 0 .../00-Kubernetes/bin/install-1node-k8s | 0 {infra => ric-infra}/00-Kubernetes/etc/k8s-1node | 0 {infra => ric-infra}/10-Nexus/bin/install | 0 {infra => ric-infra}/10-Nexus/bin/uninstall | 0 {infra => ric-infra}/10-Nexus/docker/Dockerfile | 0 {infra => ric-infra}/10-Nexus/etc/nexus.conf | 0 {infra => ric-infra}/10-Nexus/helm/.helmignore | 0 {infra => ric-infra}/10-Nexus/helm/Chart.yaml | 0 .../10-Nexus/helm/requirements.yaml | 0 .../10-Nexus/helm/templates/_helpers.tpl | 0 .../10-Nexus/helm/templates/deployment.yaml | 0 .../10-Nexus/helm/templates/ingress.yaml | 0 .../10-Nexus/helm/templates/save-secret-job.yaml | 0 .../10-Nexus/helm/templates/secret-docker.yaml | 0 .../10-Nexus/helm/templates/service.yaml | 0 {infra => ric-infra}/10-Nexus/helm/values.yaml | 0 .../20-Credential/bin/install | 8 ++ .../20-Credential/bin/uninstall | 0 .../20-Credential/etc/credential.conf | 0 .../20-Credential/helm/Chart.yaml | 0 ric-infra/20-Credential/helm/requirements.yaml | 20 ++++ .../20-Credential/helm/resources/tls.crt | 0 .../20-Credential/helm/templates/_helper.tpl | 6 +- .../helm/templates/config-helm-cert.yaml | 0 .../helm/templates/secrets-docker-reg.yaml | 0 .../helm/templates/secrets-helm-xapp.yaml | 0 .../20-Credential/helm/values.yaml | 2 - {infra => ric-infra}/README.md | 0 .../helm/appmgr/templates/appconfig.yaml | 4 +- .../helm/appmgr/templates/appenv.yaml | 2 +- .../helm/appmgr/templates/deployment.yaml | 29 ++---- .../helm/appmgr/templates/service.yaml | 10 +- .../50-RIC-Platform/helm/appmgr/values.yaml | 111 +++++++++------------ .../helm/dbaas/templates/deployment.yaml | 8 +- .../helm/dbaas/templates/service.yaml | 4 +- .../50-RIC-Platform/helm/dbaas/values.yaml | 17 ++-- .../helm/e2mgr/templates/deployment.yaml | 14 +-- .../helm/e2mgr/templates/service.yaml | 18 ++-- .../50-RIC-Platform/helm/e2mgr/values.yaml | 48 ++++----- .../helm/e2term/templates/deployment.yaml | 14 +-- .../helm/e2term/templates/service.yaml | 8 +- .../50-RIC-Platform/helm/e2term/values.yaml | 40 ++++---- .../helm/rtmgr/templates/rtmgr-dep.yaml | 8 +- .../helm/rtmgr/templates/rtmgr-svc.yaml | 8 +- .../50-RIC-Platform/helm/rtmgr/values.yaml | 26 ++--- .../90-xApps/helm/xapp-admin/Chart.yaml | 0 .../90-xApps/helm/xapp-admin/values.yaml | 0 .../90-xApps/helm/xapp-std/.helmignore | 0 .../90-xApps/helm/xapp-std/Chart.yaml | 0 .../90-xApps/helm/xapp-std/templates/_helpers.tpl | 0 .../helm/xapp-std/templates/appconfig.yaml | 0 .../90-xApps/helm/xapp-std/templates/appenv.yaml | 0 .../helm/xapp-std/templates/appsecret.yaml | 0 .../helm/xapp-std/templates/deployment.yaml | 0 .../90-xApps/helm/xapp-std/templates/secret.yaml | 0 .../90-xApps/helm/xapp-std/templates/service.yaml | 0 .../90-xApps/helm/xapp-std/values.yaml | 0 {xapps => ric-xapps}/README.md | 0 79 files changed, 558 insertions(+), 237 deletions(-) create mode 100644 RECIPE_EXAMPLE/RECIPE_EXAMPLE create mode 100755 bin/deploy-ric-aux create mode 100755 bin/deploy-ric-platform create mode 100755 bin/undeploy-ric-aux create mode 100755 bin/undeploy-ric-platform create mode 100644 etc/ric-aux.conf create mode 100644 etc/ric-platform.conf delete mode 160000 infra/10-Nexus/docker/nexus-repository-helm rename {aux => ric-aux}/80-Auxiliary-Functions/bin/install (100%) rename {aux => ric-aux}/80-Auxiliary-Functions/bin/uninstall (100%) rename {aux => ric-aux}/80-Auxiliary-Functions/etc/dashboard.conf (100%) rename {aux => ric-aux}/80-Auxiliary-Functions/helm/dashboard/Chart.yaml (100%) rename {aux => ric-aux}/80-Auxiliary-Functions/helm/dashboard/requirements.yaml (100%) rename {aux => ric-aux}/80-Auxiliary-Functions/helm/dashboard/templates/_helpers.tpl (100%) rename {aux => ric-aux}/80-Auxiliary-Functions/helm/dashboard/templates/configmap.yaml (100%) rename {aux => ric-aux}/80-Auxiliary-Functions/helm/dashboard/templates/deployment.yaml (96%) rename {aux => ric-aux}/80-Auxiliary-Functions/helm/dashboard/templates/service.yaml (95%) rename {aux => ric-aux}/80-Auxiliary-Functions/helm/dashboard/values.yaml (92%) rename {aux => ric-aux}/README.md (100%) rename {infra => ric-infra}/00-Kubernetes/bin/install (100%) rename {infra => ric-infra}/00-Kubernetes/bin/install-1node-k8s (100%) rename {infra => ric-infra}/00-Kubernetes/etc/k8s-1node (100%) rename {infra => ric-infra}/10-Nexus/bin/install (100%) rename {infra => ric-infra}/10-Nexus/bin/uninstall (100%) rename {infra => ric-infra}/10-Nexus/docker/Dockerfile (100%) rename {infra => ric-infra}/10-Nexus/etc/nexus.conf (100%) rename {infra => ric-infra}/10-Nexus/helm/.helmignore (100%) rename {infra => ric-infra}/10-Nexus/helm/Chart.yaml (100%) rename {infra => ric-infra}/10-Nexus/helm/requirements.yaml (100%) rename {infra => ric-infra}/10-Nexus/helm/templates/_helpers.tpl (100%) rename {infra => ric-infra}/10-Nexus/helm/templates/deployment.yaml (100%) rename {infra => ric-infra}/10-Nexus/helm/templates/ingress.yaml (100%) rename {infra => ric-infra}/10-Nexus/helm/templates/save-secret-job.yaml (100%) rename {infra => ric-infra}/10-Nexus/helm/templates/secret-docker.yaml (100%) rename {infra => ric-infra}/10-Nexus/helm/templates/service.yaml (100%) rename {infra => ric-infra}/10-Nexus/helm/values.yaml (100%) rename {ric-platform => ric-infra}/20-Credential/bin/install (86%) rename {ric-platform => ric-infra}/20-Credential/bin/uninstall (100%) rename {ric-platform => ric-infra}/20-Credential/etc/credential.conf (100%) rename {ric-platform => ric-infra}/20-Credential/helm/Chart.yaml (100%) create mode 100644 ric-infra/20-Credential/helm/requirements.yaml rename {ric-platform => ric-infra}/20-Credential/helm/resources/tls.crt (100%) rename {ric-platform => ric-infra}/20-Credential/helm/templates/_helper.tpl (95%) rename {ric-platform => ric-infra}/20-Credential/helm/templates/config-helm-cert.yaml (100%) rename {ric-platform => ric-infra}/20-Credential/helm/templates/secrets-docker-reg.yaml (100%) rename {ric-platform => ric-infra}/20-Credential/helm/templates/secrets-helm-xapp.yaml (100%) rename {ric-platform => ric-infra}/20-Credential/helm/values.yaml (94%) rename {infra => ric-infra}/README.md (100%) rename {xapps => ric-xapps}/90-xApps/helm/xapp-admin/Chart.yaml (100%) rename {xapps => ric-xapps}/90-xApps/helm/xapp-admin/values.yaml (100%) rename {xapps => ric-xapps}/90-xApps/helm/xapp-std/.helmignore (100%) rename {xapps => ric-xapps}/90-xApps/helm/xapp-std/Chart.yaml (100%) rename {xapps => ric-xapps}/90-xApps/helm/xapp-std/templates/_helpers.tpl (100%) rename {xapps => ric-xapps}/90-xApps/helm/xapp-std/templates/appconfig.yaml (100%) rename {xapps => ric-xapps}/90-xApps/helm/xapp-std/templates/appenv.yaml (100%) rename {xapps => ric-xapps}/90-xApps/helm/xapp-std/templates/appsecret.yaml (100%) rename {xapps => ric-xapps}/90-xApps/helm/xapp-std/templates/deployment.yaml (100%) rename {xapps => ric-xapps}/90-xApps/helm/xapp-std/templates/secret.yaml (100%) rename {xapps => ric-xapps}/90-xApps/helm/xapp-std/templates/service.yaml (100%) rename {xapps => ric-xapps}/90-xApps/helm/xapp-std/values.yaml (100%) rename {xapps => ric-xapps}/README.md (100%) diff --git a/README.md b/README.md index 3987ce68..742ceb74 100644 --- a/README.md +++ b/README.md @@ -2,33 +2,47 @@ This repo contains RAN Intelligent Controller (RIC) deployments related files. + +### Overview + +The RIC deployment scripts are designed to deploy RIC components using helm charts. A deployment recipe yaml file that +contains parameter key:value pairs can be provided as a parameter for any deployment script in this repository. The +deployment recipe is acting as the helm override value.yaml file. If no deployment recipe is provided, defaul parameters +are used. The default parameters are set up to deploy a RIC instance using Linux Foundation repositories in a +self-contained environment. + + ### Directory Structure . -├── aux Deployment scripts, charts and configuration files for RIC auxiliry functions -├── infra Deployment scripts, charts and configuration files for infrastructure support -├── LICENSES.txt License information -├── README.md This file -├── ric-platform Deployment scripts, charts and configuration files for RIC platform components -└── xapps xApp related scripts, charts and configuration files +├── bin +├── etc +├── LICENSES.txt License information +├── README.md This file +├── RECIPE_EXAMPLE Directory that contains deploy recipe examples +├── ric-aux Deployment scripts, charts and configuration files for RIC auxiliry functions +├── ric-infra Deployment scripts, charts and configuration files for infrastructure support +├── ric-platform Deployment scripts, charts and configuration files for RIC platform components +└── ric-xapps xApp related scripts, charts and configuration files ### Directory Naming Convention The root directories are orgainzed according to the deployment plans. Each directory contains subdirectories for different deployable components. The prefix of these subdirectories represents the deployment order. The smaller the prefix number the eariler the corresponding component will be deployed. Consider the following example, -. -├── aux -│   └── 80-Auxiliary-Functions -├── infra +├── ric-aux +│   ├── 80-Auxiliary-Functions +│   └── README.md +├── ric-infra │   ├── 00-Kubernetes -│   └── 10-Nexus -├── LICENSES.txt -├── README.md -├── ric-platform +│   ├── 10-Nexus │   ├── 20-Credential -│   └── 50-RIC-Platform -└── xapps - └── 90-xApps +│   └── README.md +├── ric-platform +│   ├── 50-RIC-Platform +│   └── README.md +└── ric-xapps + ├── 90-xApps + └── README.md when deploys the ric-platform, the credential is deployed before RIC-Platform. In each of the component directory, ./etc contains the configuration file, ./bin contains the binary and script files, diff --git a/RECIPE_EXAMPLE/RECIPE_EXAMPLE b/RECIPE_EXAMPLE/RECIPE_EXAMPLE new file mode 100644 index 00000000..e90af68f --- /dev/null +++ b/RECIPE_EXAMPLE/RECIPE_EXAMPLE @@ -0,0 +1,102 @@ +################################################################################ +# Copyright (c) 2019 AT&T Intellectual Property. # +# Copyright (c) 2019 Nokia. # +# # +# 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. # +############################################################################### + +#------------------------------------------------------------------------- +# Global common setting +#------------------------------------------------------------------------- +global: + # Docker registry from which RIC platform components pull the images + repository: nexus3.o-ran-sc.org:10004 + + # Name of the K8S docker credential that is onboarded by 20-credential + repositoryCred: docker-reg-cred + + # Docker image pull policy + imagePullPolicy: Always + + # Helm repo that will be used by xApp manager + helmRepository: nexus.ricinfra.local + + # Certificate of the helm repo + helmRepositoryCert: xapp-mgr-certs + + # Name of the K8S secret that contains the credential of the helm repo + helmRepositoryCred: xapp-mgr-creds + + # The name of the tiller that xApp helm client talks to + helmRepositoryTiller: tiller-deploy + + # The namespace of the xApp helm tiller + helmRepositoryTillerNamespace: kube-system + + # The port the xApp helm tiller is listening to + helmRepositoryTillerPort: 44134 + +#------------------------------------------------------------------------- +# Infrastructure +#------------------------------------------------------------------------- + + + + +#------------------------------------------------------------------------- +# Auxiliary Functions +#------------------------------------------------------------------------- +dashboard: + image: + name:: ric-dash-be + tag: 1.0.0-SNAPSHOT + +#------------------------------------------------------------------------- +# Platform Components +#------------------------------------------------------------------------- +# xApp Manager +appmgr: + image: + name: xapp-manager + tag: latest + +# DBAAS +dbaas: + backend: + image: + name: redis-standalone + tag: latest + +# E2 Manager +e2mgr: + image: + name: e2mgr + tag: 1.0.0 + env: + RMR_RTG_SVC: "ric-full-rtmgr" + + +# E2 Termination +e2term: + image: + name: e2 + tag: 1.0.0 + env: + print: "1" + RMR_RTG_SVC: "ric-full-rtmgr" + +# Routing Manager +rtmgr: + image: + name: rtmgr + tag: 0.0.2 diff --git a/bin/deploy-ric-aux b/bin/deploy-ric-aux new file mode 100755 index 00000000..5ccb386b --- /dev/null +++ b/bin/deploy-ric-aux @@ -0,0 +1,45 @@ +#!/bin/bash +################################################################################ +# Copyright (c) 2019 AT&T Intellectual Property. # +# Copyright (c) 2019 Nokia. # +# # +# 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 RIC auxiliary function components automatically + +OVERRIDEYAML=$1 + +if [ -z "$OVERRIDEYAML" ];then +echo "****************************************************************************************************************" +echo " WARNING " +echo "****************************************************************************************************************" +echo "Deploying RIC auxiliary functions without deployment recipe. Default configurations are used." +echo "****************************************************************************************************************" + + +fi + + +DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null && pwd )" + +source $DIR/../etc/ric-aux.conf + +export RICAUX_RELEASE_NAME=$ric_aux_helm_release_name + +export RICAUX_NAMESPACE=$ric_aux_namespace + + + +. ../ric-aux/80-Auxiliary-Functions/bin/install $OVERRIDEYAML + diff --git a/bin/deploy-ric-platform b/bin/deploy-ric-platform new file mode 100755 index 00000000..0997c269 --- /dev/null +++ b/bin/deploy-ric-platform @@ -0,0 +1,46 @@ +#!/bin/bash +################################################################################ +# Copyright (c) 2019 AT&T Intellectual Property. # +# Copyright (c) 2019 Nokia. # +# # +# 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 RIC platform components automatically + +OVERRIDEYAML=$1 + +if [ -z "$OVERRIDEYAML" ];then +echo "****************************************************************************************************************" +echo " WARNING " +echo "****************************************************************************************************************" +echo "Deploying RIC platform without deployment recipe. Default configurations are used." +echo "****************************************************************************************************************" + + +fi + + +DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null && pwd )" + +source $DIR/../etc/ric-platform.conf + + +export RICPLT_RELEASE_NAME=$ric_platform_helm_release_name + +export RICPLT_NAMESPACE=$ric_platform_namespace + + + +. ../ric-platform/50-RIC-Platform/bin/install $OVERRIDEYAML + diff --git a/bin/undeploy-ric-aux b/bin/undeploy-ric-aux new file mode 100755 index 00000000..df56d0e8 --- /dev/null +++ b/bin/undeploy-ric-aux @@ -0,0 +1,33 @@ +#!/bin/bash +################################################################################ +# Copyright (c) 2019 AT&T Intellectual Property. # +# Copyright (c) 2019 Nokia. # +# # +# 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 RIC auxiliary function components automatically + + +DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null && pwd )" + +source $DIR/../etc/ric-aux.conf + +export RICAUX_RELEASE_NAME=$ric_aux_helm_release_name + +export RICAUX_NAMESPACE=$ric_aux_namespace + + + +. ../ric-aux/80-Auxiliary-Functions/bin/uninstall + diff --git a/bin/undeploy-ric-platform b/bin/undeploy-ric-platform new file mode 100755 index 00000000..e9e5c9f2 --- /dev/null +++ b/bin/undeploy-ric-platform @@ -0,0 +1,35 @@ +#!/bin/bash +################################################################################ +# Copyright (c) 2019 AT&T Intellectual Property. # +# Copyright (c) 2019 Nokia. # +# # +# 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 RIC platform components automatically + + + +DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null && pwd )" + +source $DIR/../etc/ric-platform.conf + + +export RICPLT_RELEASE_NAME=$ric_platform_helm_release_name + +export RICPLT_NAMESPACE=$ric_platform_namespace + + + +. ../ric-platform/50-RIC-Platform/bin/uninstall + diff --git a/etc/ric-aux.conf b/etc/ric-aux.conf new file mode 100644 index 00000000..51235142 --- /dev/null +++ b/etc/ric-aux.conf @@ -0,0 +1,25 @@ +################################################################################ +# Copyright (c) 2019 AT&T Intellectual Property. # +# Copyright (c) 2019 Nokia. # +# # +# 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. # +################################################################################ + +# ------------------- RIC AUX --------------------------------------- + +# release name helm will use to deploy RIC aux componenets +ric_aux_helm_release_name=r0 + +# namespace that helm will use to deploy RIC +ric_aux_namespace=ricaux + diff --git a/etc/ric-platform.conf b/etc/ric-platform.conf new file mode 100644 index 00000000..10548923 --- /dev/null +++ b/etc/ric-platform.conf @@ -0,0 +1,27 @@ +################################################################################ +# Copyright (c) 2019 AT&T Intellectual Property. # +# Copyright (c) 2019 Nokia. # +# # +# 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. # +################################################################################ + +# ------------------- RIC PLATFORM --------------------------------------- + +# release name helm will use to deploy RIC platform componenets +ric_platform_helm_release_name=r0 + +# namespace that helm will use to deploy RIC +ric_platform_namespace=ricplt + + +# diff --git a/infra/10-Nexus/docker/nexus-repository-helm b/infra/10-Nexus/docker/nexus-repository-helm deleted file mode 160000 index 6de97765..00000000 --- a/infra/10-Nexus/docker/nexus-repository-helm +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 6de97765b747008e3016f202ccbe2dba18667b83 diff --git a/aux/80-Auxiliary-Functions/bin/install b/ric-aux/80-Auxiliary-Functions/bin/install similarity index 100% rename from aux/80-Auxiliary-Functions/bin/install rename to ric-aux/80-Auxiliary-Functions/bin/install diff --git a/aux/80-Auxiliary-Functions/bin/uninstall b/ric-aux/80-Auxiliary-Functions/bin/uninstall similarity index 100% rename from aux/80-Auxiliary-Functions/bin/uninstall rename to ric-aux/80-Auxiliary-Functions/bin/uninstall diff --git a/aux/80-Auxiliary-Functions/etc/dashboard.conf b/ric-aux/80-Auxiliary-Functions/etc/dashboard.conf similarity index 100% rename from aux/80-Auxiliary-Functions/etc/dashboard.conf rename to ric-aux/80-Auxiliary-Functions/etc/dashboard.conf diff --git a/aux/80-Auxiliary-Functions/helm/dashboard/Chart.yaml b/ric-aux/80-Auxiliary-Functions/helm/dashboard/Chart.yaml similarity index 100% rename from aux/80-Auxiliary-Functions/helm/dashboard/Chart.yaml rename to ric-aux/80-Auxiliary-Functions/helm/dashboard/Chart.yaml diff --git a/aux/80-Auxiliary-Functions/helm/dashboard/requirements.yaml b/ric-aux/80-Auxiliary-Functions/helm/dashboard/requirements.yaml similarity index 100% rename from aux/80-Auxiliary-Functions/helm/dashboard/requirements.yaml rename to ric-aux/80-Auxiliary-Functions/helm/dashboard/requirements.yaml diff --git a/aux/80-Auxiliary-Functions/helm/dashboard/templates/_helpers.tpl b/ric-aux/80-Auxiliary-Functions/helm/dashboard/templates/_helpers.tpl similarity index 100% rename from aux/80-Auxiliary-Functions/helm/dashboard/templates/_helpers.tpl rename to ric-aux/80-Auxiliary-Functions/helm/dashboard/templates/_helpers.tpl diff --git a/aux/80-Auxiliary-Functions/helm/dashboard/templates/configmap.yaml b/ric-aux/80-Auxiliary-Functions/helm/dashboard/templates/configmap.yaml similarity index 100% rename from aux/80-Auxiliary-Functions/helm/dashboard/templates/configmap.yaml rename to ric-aux/80-Auxiliary-Functions/helm/dashboard/templates/configmap.yaml diff --git a/aux/80-Auxiliary-Functions/helm/dashboard/templates/deployment.yaml b/ric-aux/80-Auxiliary-Functions/helm/dashboard/templates/deployment.yaml similarity index 96% rename from aux/80-Auxiliary-Functions/helm/dashboard/templates/deployment.yaml rename to ric-aux/80-Auxiliary-Functions/helm/dashboard/templates/deployment.yaml index efabecb9..f02ddec0 100644 --- a/aux/80-Auxiliary-Functions/helm/dashboard/templates/deployment.yaml +++ b/ric-aux/80-Auxiliary-Functions/helm/dashboard/templates/deployment.yaml @@ -26,7 +26,7 @@ metadata: release: {{ .Release.Name }} heritage: {{ .Release.Service }} spec: - replicas: {{ .Values.replicaCount }} + replicas: {{ .Values.dashboard.replicaCount }} selector: matchLabels: app: {{ include "common.namespace" . }}-{{ include "common.name" . }} @@ -42,7 +42,7 @@ spec: - name: {{ include "common.repositoryCred" . }} containers: - name: {{ include "common.namespace" . }}-{{ include "common.name" . }} - image: {{ include "common.repository" . }}/{{ .Values.image.name }}:{{ .Values.image.tag }} + image: {{ include "common.repository" . }}/{{ .Values.dashboard.image.name }}:{{ .Values.dashboard.image.tag }} imagePullPolicy: {{ include "common.pullPolicy" . }} ports: - name: http diff --git a/aux/80-Auxiliary-Functions/helm/dashboard/templates/service.yaml b/ric-aux/80-Auxiliary-Functions/helm/dashboard/templates/service.yaml similarity index 95% rename from aux/80-Auxiliary-Functions/helm/dashboard/templates/service.yaml rename to ric-aux/80-Auxiliary-Functions/helm/dashboard/templates/service.yaml index 8ed2a966..5a1b93c4 100644 --- a/aux/80-Auxiliary-Functions/helm/dashboard/templates/service.yaml +++ b/ric-aux/80-Auxiliary-Functions/helm/dashboard/templates/service.yaml @@ -26,9 +26,9 @@ metadata: release: {{ .Release.Name }} heritage: {{ .Release.Service }} spec: - type: {{ .Values.service.type }} + type: {{ .Values.dashboard.service.type }} ports: - - port: {{ .Values.service.port }} + - port: {{ .Values.dashboard.service.port }} targetPort: http protocol: TCP selector: diff --git a/aux/80-Auxiliary-Functions/helm/dashboard/values.yaml b/ric-aux/80-Auxiliary-Functions/helm/dashboard/values.yaml similarity index 92% rename from aux/80-Auxiliary-Functions/helm/dashboard/values.yaml rename to ric-aux/80-Auxiliary-Functions/helm/dashboard/values.yaml index 13bc5cfc..48da9304 100644 --- a/aux/80-Auxiliary-Functions/helm/dashboard/values.yaml +++ b/ric-aux/80-Auxiliary-Functions/helm/dashboard/values.yaml @@ -24,13 +24,13 @@ repository: "nexus3.o-ran-sc.org:10004" imagePullPolicy: IfNotPresent repositoryCred: docker-reg-cred - -image: - repository: ric-dash-be - tag: 1.0.0-SNAPSHOT - - -service: - type: NodePort - port: 80 - +dashboard: + image: + name: ric-dash-be + tag: 1.0.0-SNAPSHOT + + + service: + type: NodePort + port: 80 + diff --git a/aux/README.md b/ric-aux/README.md similarity index 100% rename from aux/README.md rename to ric-aux/README.md diff --git a/infra/00-Kubernetes/bin/install b/ric-infra/00-Kubernetes/bin/install similarity index 100% rename from infra/00-Kubernetes/bin/install rename to ric-infra/00-Kubernetes/bin/install diff --git a/infra/00-Kubernetes/bin/install-1node-k8s b/ric-infra/00-Kubernetes/bin/install-1node-k8s similarity index 100% rename from infra/00-Kubernetes/bin/install-1node-k8s rename to ric-infra/00-Kubernetes/bin/install-1node-k8s diff --git a/infra/00-Kubernetes/etc/k8s-1node b/ric-infra/00-Kubernetes/etc/k8s-1node similarity index 100% rename from infra/00-Kubernetes/etc/k8s-1node rename to ric-infra/00-Kubernetes/etc/k8s-1node diff --git a/infra/10-Nexus/bin/install b/ric-infra/10-Nexus/bin/install similarity index 100% rename from infra/10-Nexus/bin/install rename to ric-infra/10-Nexus/bin/install diff --git a/infra/10-Nexus/bin/uninstall b/ric-infra/10-Nexus/bin/uninstall similarity index 100% rename from infra/10-Nexus/bin/uninstall rename to ric-infra/10-Nexus/bin/uninstall diff --git a/infra/10-Nexus/docker/Dockerfile b/ric-infra/10-Nexus/docker/Dockerfile similarity index 100% rename from infra/10-Nexus/docker/Dockerfile rename to ric-infra/10-Nexus/docker/Dockerfile diff --git a/infra/10-Nexus/etc/nexus.conf b/ric-infra/10-Nexus/etc/nexus.conf similarity index 100% rename from infra/10-Nexus/etc/nexus.conf rename to ric-infra/10-Nexus/etc/nexus.conf diff --git a/infra/10-Nexus/helm/.helmignore b/ric-infra/10-Nexus/helm/.helmignore similarity index 100% rename from infra/10-Nexus/helm/.helmignore rename to ric-infra/10-Nexus/helm/.helmignore diff --git a/infra/10-Nexus/helm/Chart.yaml b/ric-infra/10-Nexus/helm/Chart.yaml similarity index 100% rename from infra/10-Nexus/helm/Chart.yaml rename to ric-infra/10-Nexus/helm/Chart.yaml diff --git a/infra/10-Nexus/helm/requirements.yaml b/ric-infra/10-Nexus/helm/requirements.yaml similarity index 100% rename from infra/10-Nexus/helm/requirements.yaml rename to ric-infra/10-Nexus/helm/requirements.yaml diff --git a/infra/10-Nexus/helm/templates/_helpers.tpl b/ric-infra/10-Nexus/helm/templates/_helpers.tpl similarity index 100% rename from infra/10-Nexus/helm/templates/_helpers.tpl rename to ric-infra/10-Nexus/helm/templates/_helpers.tpl diff --git a/infra/10-Nexus/helm/templates/deployment.yaml b/ric-infra/10-Nexus/helm/templates/deployment.yaml similarity index 100% rename from infra/10-Nexus/helm/templates/deployment.yaml rename to ric-infra/10-Nexus/helm/templates/deployment.yaml diff --git a/infra/10-Nexus/helm/templates/ingress.yaml b/ric-infra/10-Nexus/helm/templates/ingress.yaml similarity index 100% rename from infra/10-Nexus/helm/templates/ingress.yaml rename to ric-infra/10-Nexus/helm/templates/ingress.yaml diff --git a/infra/10-Nexus/helm/templates/save-secret-job.yaml b/ric-infra/10-Nexus/helm/templates/save-secret-job.yaml similarity index 100% rename from infra/10-Nexus/helm/templates/save-secret-job.yaml rename to ric-infra/10-Nexus/helm/templates/save-secret-job.yaml diff --git a/infra/10-Nexus/helm/templates/secret-docker.yaml b/ric-infra/10-Nexus/helm/templates/secret-docker.yaml similarity index 100% rename from infra/10-Nexus/helm/templates/secret-docker.yaml rename to ric-infra/10-Nexus/helm/templates/secret-docker.yaml diff --git a/infra/10-Nexus/helm/templates/service.yaml b/ric-infra/10-Nexus/helm/templates/service.yaml similarity index 100% rename from infra/10-Nexus/helm/templates/service.yaml rename to ric-infra/10-Nexus/helm/templates/service.yaml diff --git a/infra/10-Nexus/helm/values.yaml b/ric-infra/10-Nexus/helm/values.yaml similarity index 100% rename from infra/10-Nexus/helm/values.yaml rename to ric-infra/10-Nexus/helm/values.yaml diff --git a/ric-platform/20-Credential/bin/install b/ric-infra/20-Credential/bin/install similarity index 86% rename from ric-platform/20-Credential/bin/install rename to ric-infra/20-Credential/bin/install index c2c86e45..a2619900 100755 --- a/ric-platform/20-Credential/bin/install +++ b/ric-infra/20-Credential/bin/install @@ -36,6 +36,14 @@ else NAMESPACE=$RICPLT_NAMESPACE fi +COMMON_CHART_VERSION=$(cat $DIR/../../../ric-platform/50-RIC-Platform/helm/common/Chart.yaml | grep version | awk '{print $2}') +helm package -d /tmp $DIR/../../../ric-platform/50-RIC-Platform/helm/common + + +mkdir -p $DIR/../helm/charts/ +cp /tmp/common-$COMMON_CHART_VERSION.tgz $DIR/../helm/charts/ + + if [ -z $OVERRIDEYAML ]; then helm install --namespace "${NAMESPACE}" --name "${RELEASE_NAME}-credential" $DIR/../helm else diff --git a/ric-platform/20-Credential/bin/uninstall b/ric-infra/20-Credential/bin/uninstall similarity index 100% rename from ric-platform/20-Credential/bin/uninstall rename to ric-infra/20-Credential/bin/uninstall diff --git a/ric-platform/20-Credential/etc/credential.conf b/ric-infra/20-Credential/etc/credential.conf similarity index 100% rename from ric-platform/20-Credential/etc/credential.conf rename to ric-infra/20-Credential/etc/credential.conf diff --git a/ric-platform/20-Credential/helm/Chart.yaml b/ric-infra/20-Credential/helm/Chart.yaml similarity index 100% rename from ric-platform/20-Credential/helm/Chart.yaml rename to ric-infra/20-Credential/helm/Chart.yaml diff --git a/ric-infra/20-Credential/helm/requirements.yaml b/ric-infra/20-Credential/helm/requirements.yaml new file mode 100644 index 00000000..aa94575b --- /dev/null +++ b/ric-infra/20-Credential/helm/requirements.yaml @@ -0,0 +1,20 @@ +################################################################################ +# Copyright (c) 2019 AT&T Intellectual Property. # +# Copyright (c) 2019 Nokia. # +# # +# 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: common + version: ~1.1.0 diff --git a/ric-platform/20-Credential/helm/resources/tls.crt b/ric-infra/20-Credential/helm/resources/tls.crt similarity index 100% rename from ric-platform/20-Credential/helm/resources/tls.crt rename to ric-infra/20-Credential/helm/resources/tls.crt diff --git a/ric-platform/20-Credential/helm/templates/_helper.tpl b/ric-infra/20-Credential/helm/templates/_helper.tpl similarity index 95% rename from ric-platform/20-Credential/helm/templates/_helper.tpl rename to ric-infra/20-Credential/helm/templates/_helper.tpl index d009278a..67274f0d 100644 --- a/ric-platform/20-Credential/helm/templates/_helper.tpl +++ b/ric-infra/20-Credential/helm/templates/_helper.tpl @@ -48,9 +48,6 @@ Create chart name and version as used by the chart label. {{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" -}} {{- end -}} -{{- define "repository" -}} - {{- default "docker.ricinfra.local:80" .Values.repository -}} -{{- end -}} {{/* Resolve the image repository secret token. @@ -61,7 +58,7 @@ Create chart name and version as used by the chart label. mail: email (optional) */}} {{- define "repository.secret" -}} - {{- $repo := include "repository" . }} + {{- $repo := include "common.repository" . }} {{- $cred := .Values.repositoryCred }} {{- $user := default "docker" $cred.user }} {{- $password := default "docker" $cred.password }} @@ -71,6 +68,7 @@ Create chart name and version as used by the chart label. {{- end -}} + {{- define "helmrepo.secret.user" -}} {{- $user := default "helm" .Values.helmrepoCred.user -}} {{- printf "%s" $user |b64enc }} diff --git a/ric-platform/20-Credential/helm/templates/config-helm-cert.yaml b/ric-infra/20-Credential/helm/templates/config-helm-cert.yaml similarity index 100% rename from ric-platform/20-Credential/helm/templates/config-helm-cert.yaml rename to ric-infra/20-Credential/helm/templates/config-helm-cert.yaml diff --git a/ric-platform/20-Credential/helm/templates/secrets-docker-reg.yaml b/ric-infra/20-Credential/helm/templates/secrets-docker-reg.yaml similarity index 100% rename from ric-platform/20-Credential/helm/templates/secrets-docker-reg.yaml rename to ric-infra/20-Credential/helm/templates/secrets-docker-reg.yaml diff --git a/ric-platform/20-Credential/helm/templates/secrets-helm-xapp.yaml b/ric-infra/20-Credential/helm/templates/secrets-helm-xapp.yaml similarity index 100% rename from ric-platform/20-Credential/helm/templates/secrets-helm-xapp.yaml rename to ric-infra/20-Credential/helm/templates/secrets-helm-xapp.yaml diff --git a/ric-platform/20-Credential/helm/values.yaml b/ric-infra/20-Credential/helm/values.yaml similarity index 94% rename from ric-platform/20-Credential/helm/values.yaml rename to ric-infra/20-Credential/helm/values.yaml index 16b9b57b..8f37004a 100644 --- a/ric-platform/20-Credential/helm/values.yaml +++ b/ric-infra/20-Credential/helm/values.yaml @@ -19,13 +19,11 @@ # helm repo, etc. -repository: "nexus3.o-ran-sc.org:10004" repositoryCred: user: "docker" password: "docker" -helmrepo: "https://helm.ricinfra.local" helmrepoCred: user: "helm" password: "helm" diff --git a/infra/README.md b/ric-infra/README.md similarity index 100% rename from infra/README.md rename to ric-infra/README.md diff --git a/ric-platform/50-RIC-Platform/helm/appmgr/templates/appconfig.yaml b/ric-platform/50-RIC-Platform/helm/appmgr/templates/appconfig.yaml index 0985e505..0ed87d49 100644 --- a/ric-platform/50-RIC-Platform/helm/appmgr/templates/appconfig.yaml +++ b/ric-platform/50-RIC-Platform/helm/appmgr/templates/appconfig.yaml @@ -20,9 +20,9 @@ kind: ConfigMap metadata: name: {{ include "appmgr.fullname" . }}-appconfig data: - {{- $restport := default ":8080" (printf ":%.0f" .Values.containerPort) | quote -}} + {{- $restport := default ":8080" (printf ":%.0f" .Values.appmgr.containerPort) | quote -}} {{- $helmrepo := include "common.helmrepository" . | quote -}} - {{- $reponame := default "helm-repo" .Values.reponame | quote -}} + {{- $reponame := default "helm-repo" .Values.appmgr.reponame | quote -}} {{- $tiller := include "common.helmrepositorytiller" . | quote -}} {{- $tillernamespace := include "common.helmrepositorytillernamespace" . | quote -}} {{- $tillerport := include "common.helmrepositorytillerport" . | quote -}} diff --git a/ric-platform/50-RIC-Platform/helm/appmgr/templates/appenv.yaml b/ric-platform/50-RIC-Platform/helm/appmgr/templates/appenv.yaml index a414461b..465f08c5 100644 --- a/ric-platform/50-RIC-Platform/helm/appmgr/templates/appenv.yaml +++ b/ric-platform/50-RIC-Platform/helm/appmgr/templates/appenv.yaml @@ -20,6 +20,6 @@ kind: ConfigMap metadata: name: {{ include "appmgr.fullname" . }}-appenv data: - {{- with .Values.appenv }} + {{- with .Values.appmgr.appenv }} {{- toYaml . | nindent 2 }} {{- end }} diff --git a/ric-platform/50-RIC-Platform/helm/appmgr/templates/deployment.yaml b/ric-platform/50-RIC-Platform/helm/appmgr/templates/deployment.yaml index 52e53398..b425365a 100644 --- a/ric-platform/50-RIC-Platform/helm/appmgr/templates/deployment.yaml +++ b/ric-platform/50-RIC-Platform/helm/appmgr/templates/deployment.yaml @@ -26,7 +26,7 @@ metadata: release: {{ .Release.Name }} heritage: {{ .Release.Service }} spec: - replicas: {{ .Values.replicaCount }} + replicas: {{ .Values.appmgr.replicaCount }} selector: matchLabels: app: {{ include "common.namespace" . }}-{{ include "common.name" . }} @@ -41,22 +41,22 @@ spec: spec: hostname: {{ .Chart.Name }} imagePullSecrets: - - name: {{ .Values.image.repositoryCred }} + - name: {{ include "common.repositoryCred" . }} containers: - name: {{ include "common.namespace" . }}-{{ include "common.name" . }} - image: {{ include "common.repository" . }}/{{ .Values.image.name }}:{{ .Values.image.tag }} + image: {{ include "common.repository" . }}/{{ .Values.appmgr.image.name }}:{{ .Values.appmgr.image.tag }} imagePullPolicy: {{ include "common.pullPolicy" . }} ports: - name: http - containerPort: {{ .Values.containerPort }} + containerPort: {{ .Values.appmgr.containerPort }} protocol: TCP volumeMounts: - name: config-volume - mountPath: {{ .Values.appconfigpath }} + mountPath: {{ .Values.appmgr.appconfigpath }} - name: secret-volume - mountPath: {{ .Values.appsecretpath }} + mountPath: {{ .Values.appmgr.appsecretpath }} - name: cert-volume - mountPath: {{ .Values.appcertpath }} + mountPath: {{ .Values.appmgr.appcertpath }} envFrom: - configMapRef: name: {{ include "appmgr.fullname" . }}-appenv @@ -73,25 +73,10 @@ spec: # path: / # port: http restartPolicy: Always - resources: - {{- toYaml .Values.resources | nindent 12 }} securityContext: # ubuntu #runAsUser: 1000 #allowPrivilegeEscalation: false - {{- with .Values.nodeSelector }} - nodeSelector: - {{- toYaml . | nindent 8 }} - {{- end }} - {{- with .Values.affinity }} - affinity: - {{- toYaml . | nindent 8 }} - {{- end }} - {{- with .Values.tolerations }} - tolerations: - {{- toYaml . | nindent 8 }} - {{- end }} - volumes: - name: config-volume configMap: diff --git a/ric-platform/50-RIC-Platform/helm/appmgr/templates/service.yaml b/ric-platform/50-RIC-Platform/helm/appmgr/templates/service.yaml index 53046282..f7d73614 100644 --- a/ric-platform/50-RIC-Platform/helm/appmgr/templates/service.yaml +++ b/ric-platform/50-RIC-Platform/helm/appmgr/templates/service.yaml @@ -26,12 +26,12 @@ metadata: release: {{ .Release.Name }} heritage: {{ .Release.Service }} spec: - type: {{ .Values.service.type }} + type: {{ .Values.appmgr.service.type }} ports: - - port: {{ .Values.service.appmgr.port }} - protocol: {{ .Values.service.appmgr.protocol }} - name: "{{ .Values.service.appmgr.name }}" - {{ if (eq .Values.service.type "NodePort") }}nodePort: {{ .Values.service.appmgr.extport }} {{ end }} + - port: {{ .Values.appmgr.service.port }} + protocol: {{ .Values.appmgr.service.protocol }} + name: "{{ .Values.appmgr.service.name }}" + {{ if (eq .Values.appmgr.service.type "NodePort") }}nodePort: {{ .Values.appmgr.service.extport }} {{ end }} selector: app: {{ include "common.namespace" . }}-{{ include "common.name" . }} release: {{ .Release.Name }} diff --git a/ric-platform/50-RIC-Platform/helm/appmgr/values.yaml b/ric-platform/50-RIC-Platform/helm/appmgr/values.yaml index b3f0f57b..ffe29342 100644 --- a/ric-platform/50-RIC-Platform/helm/appmgr/values.yaml +++ b/ric-platform/50-RIC-Platform/helm/appmgr/values.yaml @@ -20,58 +20,6 @@ imagePullPolicy: IfNotPresent repositoryCred: docker-reg-cred -# Uncomment the following line to override the docker registry -#repositoryOverride: "" - - -# Uncomment the following line to override the docker registry credential -#repositoryCredOverride: "" - -# Uncomment the following line to override the image pull policy -#imagePullPolicyOverride: "" - - - -image: - # xAppmanager Docker image name and tag - name: xapp-manager - tag: latest - -# This section describes xAppManager -replicaCount: 1 - -containerPort: 8080 -reponame: "helm-repo" - -service: - type: NodePort - appmgr: - port: 8080 - name: appmgr-service - protocol: "TCP" - export: 30020 - - -# config -# Path referred in xapp-manager for retrieving configuration details -appconfigpath: /opt/ric/config - -# To be provided as env variables -appenv: - NAME: xappmgr - #ENV1: "envvalue1" - #ENV2: "envvalue2" - -# secret -# Path referred in xapp-manager for retrieving helm repo secrets -appsecretpath: /opt/ric/secret - - -# certificates -# Path referred in xapp-manager for retrieving helm repo client certificates -appcertpath: /opt/ric/certificates - - # Helm Repo for xApp # By default a local helm repo is used. The global setting will override # the default value. You can further override using @@ -86,7 +34,7 @@ helmRepositoryCred: xapp-mgr-creds # Default configmap name for Helm Repo cert. .Value.golbal.helmRepositoryCert will # override the default value. You can further override uing #helmRepositoryCertOverride:"" -helmRepositoryCert: xapp-mgr-cert +helmRepositoryCert: xapp-mgr-certs # Helm Tiller for xApp # The global setting will override this default value @@ -103,19 +51,56 @@ helmRepositoryTillerNamespace: "kube-system" # The global setting will override this default value # You can further override using helmRepositoryTillerPortOverride: "" helmRepositoryTillerPort: "44134" +# Uncomment the following line to override the docker registry +#repositoryOverride: "" + + +# Uncomment the following line to override the docker registry credential +#repositoryCredOverride: "" + +# Uncomment the following line to override the image pull policy +#imagePullPolicyOverride: "" + + +appmgr: + image: + # xAppmanager Docker image name and tag + name: xapp-manager + tag: latest + + # This section describes xAppManager + replicaCount: 1 + + containerPort: 8080 + reponame: "helm-repo" + + service: + type: NodePort + port: 8080 + name: appmgr-service + protocol: "TCP" + export: 30020 + + + # config + # Path referred in xapp-manager for retrieving configuration details + appconfigpath: /opt/ric/config + + # To be provided as env variables + appenv: + NAME: xappmgr + #ENV1: "envvalue1" + #ENV2: "envvalue2" + + # secret + # Path referred in xapp-manager for retrieving helm repo secrets + appsecretpath: /opt/ric/secret + # certificates + # Path referred in xapp-manager for retrieving helm repo client certificates + appcertpath: /opt/ric/certificates -resources: {} -# limits: -# cpu: 100m -# memory: 128Mi -# requests: -# cpu: 100m -# memory: 128Mi -nodeSelector: {} -tolerations: [] -affinity: {} diff --git a/ric-platform/50-RIC-Platform/helm/dbaas/templates/deployment.yaml b/ric-platform/50-RIC-Platform/helm/dbaas/templates/deployment.yaml index 1589b24b..8d2014fc 100644 --- a/ric-platform/50-RIC-Platform/helm/dbaas/templates/deployment.yaml +++ b/ric-platform/50-RIC-Platform/helm/dbaas/templates/deployment.yaml @@ -26,7 +26,7 @@ metadata: release: {{ .Release.Name }} heritage: {{ .Release.Service }} spec: - replicas: {{ .Values.backend.replicas }} + replicas: {{ .Values.dbaas.backend.replicas }} selector: matchLabels: app: {{ include "common.namespace" . }}-{{ include "common.name" . }} @@ -39,11 +39,11 @@ spec: spec: imagePullSecrets: - name: {{ include "common.repositoryCred" . }} - terminationGracePeriodSeconds: {{ .Values.backend.terminationGracePeriodSeconds }} + terminationGracePeriodSeconds: {{ .Values.dbaas.backend.terminationGracePeriodSeconds }} containers: - - image: {{ include "common.repository" . }}/{{ .Values.backend.image.name }}:{{ .Values.backend.image.tag }} + - image: {{ include "common.repository" . }}/{{ .Values.dbaas.backend.image.name }}:{{ .Values.dbaas.backend.image.tag }} imagePullPolicy: {{ include "common.pullPolicy" . }} ports: - - containerPort: {{ .Values.backend.targetPort }} + - containerPort: {{ .Values.dbaas.backend.targetPort }} name: {{ include "common.namespace" . }}-{{ include "common.name" . }} restartPolicy: Always diff --git a/ric-platform/50-RIC-Platform/helm/dbaas/templates/service.yaml b/ric-platform/50-RIC-Platform/helm/dbaas/templates/service.yaml index 6aa2bd9f..0708b0c9 100644 --- a/ric-platform/50-RIC-Platform/helm/dbaas/templates/service.yaml +++ b/ric-platform/50-RIC-Platform/helm/dbaas/templates/service.yaml @@ -30,5 +30,5 @@ spec: app: {{ include "common.namespace" . }}-{{ include "common.name" . }} release: {{ .Release.Name }} ports: - - port: {{ .Values.backend.port }} - targetPort: {{ .Values.backend.targetPort }} + - port: {{ .Values.dbaas.backend.port }} + targetPort: {{ .Values.dbaas.backend.targetPort }} diff --git a/ric-platform/50-RIC-Platform/helm/dbaas/values.yaml b/ric-platform/50-RIC-Platform/helm/dbaas/values.yaml index 59481670..edf51f43 100644 --- a/ric-platform/50-RIC-Platform/helm/dbaas/values.yaml +++ b/ric-platform/50-RIC-Platform/helm/dbaas/values.yaml @@ -34,11 +34,12 @@ repositoryCred: docker-reg-cred nameOverride: "redis-standalone" -backend: - terminationGracePeriodSeconds: 0 - replicas: 1 - port: 6379 - targetPort: 6379 - image: - name: redis-standalone - tag: latest +dbaas: + backend: + terminationGracePeriodSeconds: 0 + replicas: 1 + port: 6379 + targetPort: 6379 + image: + name: redis-standalone + tag: latest diff --git a/ric-platform/50-RIC-Platform/helm/e2mgr/templates/deployment.yaml b/ric-platform/50-RIC-Platform/helm/e2mgr/templates/deployment.yaml index b4561e83..f5726a3e 100644 --- a/ric-platform/50-RIC-Platform/helm/e2mgr/templates/deployment.yaml +++ b/ric-platform/50-RIC-Platform/helm/e2mgr/templates/deployment.yaml @@ -26,7 +26,7 @@ metadata: release: {{ .Release.Name }} heritage: {{ .Release.Service }} spec: - replicas: {{ .Values.replicaCount }} + replicas: {{ .Values.e2mgr.replicaCount }} selector: matchLabels: app: {{ include "common.namespace" . }}-{{ include "common.name" . }} @@ -42,7 +42,7 @@ spec: - name: {{ include "common.repositoryCred" . }} containers: - name: {{ include "common.namespace" . }}-{{ include "common.name" . }} - image: {{ include "common.repository" . }}/{{ .Values.image.name }}:{{ .Values.image.tag }} + image: {{ include "common.repository" . }}/{{ .Values.e2mgr.image.name }}:{{ .Values.e2mgr.image.tag }} imagePullPolicy: {{ include "common.pullPolicy" . }} volumeMounts: - mountPath: /opt/E2Manager/router.txt @@ -50,12 +50,12 @@ spec: subPath: router.txt env: - name: RMR_RTG_SVC - value: "{{ .Values.env.RMR_RTG_SVC }}" + value: "{{ .Values.e2mgr.env.RMR_RTG_SVC }}" ports: - - name: {{ .Values.service.http.name }} - containerPort: {{ .Values.service.http.port }} - - name: {{ .Values.service.nano.name }} - containerPort: {{ .Values.service.nano.port }} + - name: {{ .Values.e2mgr.service.http.name }} + containerPort: {{ .Values.e2mgr.service.http.port }} + - name: {{ .Values.e2mgr.service.nano.name }} + containerPort: {{ .Values.e2mgr.service.nano.port }} stdin: true tty: true securityContext: diff --git a/ric-platform/50-RIC-Platform/helm/e2mgr/templates/service.yaml b/ric-platform/50-RIC-Platform/helm/e2mgr/templates/service.yaml index 19d58968..d2a2a80c 100644 --- a/ric-platform/50-RIC-Platform/helm/e2mgr/templates/service.yaml +++ b/ric-platform/50-RIC-Platform/helm/e2mgr/templates/service.yaml @@ -26,18 +26,18 @@ metadata: release: {{ .Release.Name }} heritage: {{ .Release.Service }} spec: - type: {{ .Values.service.type }} + type: {{ .Values.e2mgr.service.type }} ports: - - port: {{ .Values.service.http.port }} + - port: {{ .Values.e2mgr.service.http.port }} protocol: TCP - targetPort: {{ .Values.service.http.port }} - name: "{{ .Values.service.http.name }}" - {{ if (eq .Values.service.type "NodePort") }}nodePort: {{ .Values.service.http.extport }} {{ end }} - - port: {{ .Values.service.nano.port }} + targetPort: {{ .Values.e2mgr.service.http.port }} + name: "{{ .Values.e2mgr.service.http.name }}" + {{ if (eq .Values.e2mgr.service.type "NodePort") }}nodePort: {{ .Values.e2mgr.service.http.extport }} {{ end }} + - port: {{ .Values.e2mgr.service.nano.port }} protocol: TCP - targetPort: {{ .Values.service.nano.port }} - name: "{{ .Values.service.nano.name }}" - {{ if (eq .Values.service.type "NodePort") }}nodePort: {{ .Values.service.nano.extport }} {{ end }} + targetPort: {{ .Values.e2mgr.service.nano.port }} + name: "{{ .Values.e2mgr.service.nano.name }}" + {{ if (eq .Values.e2mgr.service.type "NodePort") }}nodePort: {{ .Values.e2mgr.service.nano.extport }} {{ end }} selector: app: {{ include "common.namespace" . }}-{{ include "common.name" . }} release: {{ .Release.Name }} diff --git a/ric-platform/50-RIC-Platform/helm/e2mgr/values.yaml b/ric-platform/50-RIC-Platform/helm/e2mgr/values.yaml index a62acc92..5f11d215 100644 --- a/ric-platform/50-RIC-Platform/helm/e2mgr/values.yaml +++ b/ric-platform/50-RIC-Platform/helm/e2mgr/values.yaml @@ -36,27 +36,27 @@ repositoryCred: docker-reg-cred #imagePullPolicyOverride: "" - -image: - name: e2mgr - tag: 1.0.0 - - -replicaCount: 1 - -env: - RMR_RTG_SVC: "ric-full-rtmgr" - -service: - type: NodePort - http: - port: 3800 - target_port: 3800 - protocol: "TCP" - name: "http" - extport: 30004 - nano: - port: 3801 - target_port: 3801 - protocol: "TCP" - name: "nano" +e2mgr: + image: + name: e2mgr + tag: 1.0.0 + + + replicaCount: 1 + + env: + RMR_RTG_SVC: "ric-full-rtmgr" + + service: + type: NodePort + http: + port: 3800 + target_port: 3800 + protocol: "TCP" + name: "http" + extport: 30004 + nano: + port: 3801 + target_port: 3801 + protocol: "TCP" + name: "nano" diff --git a/ric-platform/50-RIC-Platform/helm/e2term/templates/deployment.yaml b/ric-platform/50-RIC-Platform/helm/e2term/templates/deployment.yaml index bf048b55..dc15bd8d 100644 --- a/ric-platform/50-RIC-Platform/helm/e2term/templates/deployment.yaml +++ b/ric-platform/50-RIC-Platform/helm/e2term/templates/deployment.yaml @@ -26,7 +26,7 @@ metadata: release: {{ .Release.Name }} heritage: {{ .Release.Service }} spec: - replicas: {{ .Values.replicaCount }} + replicas: {{ .Values.e2term.replicaCount }} selector: matchLabels: app: {{ include "common.namespace" . }}-{{ include "common.name" . }} @@ -42,7 +42,7 @@ spec: - name: {{ include "common.repositoryCred" . }} containers: - name: {{ .Chart.Name }} - image: {{ include "common.repository" . }}/{{ .Values.image.name }}:{{ .Values.image.tag }} + image: {{ include "common.repository" . }}/{{ .Values.e2term.image.name }}:{{ .Values.e2term.image.tag }} imagePullPolicy: {{ include "common.pullPolicy" . }} volumeMounts: - mountPath: /opt/e2/router.txt @@ -52,14 +52,14 @@ spec: - name: sctp value: "5577" - name: nano - value: "{{ .Values.service.nano.port }}" + value: "{{ .Values.e2term.service.nano.port }}" - name: print - value: "{{ .Values.env.print }}" + value: "{{ .Values.e2term.env.print }}" - name: RMR_RTG_SVC - value: "{{ .Values.env.RMR_RTG_SVC }}" + value: "{{ .Values.e2term.env.RMR_RTG_SVC }}" ports: - - name: {{ .Values.service.nano.name }} - containerPort: {{ .Values.service.nano.port }} + - name: {{ .Values.e2term.service.nano.name }} + containerPort: {{ .Values.e2term.service.nano.port }} stdin: true tty: true securityContext: diff --git a/ric-platform/50-RIC-Platform/helm/e2term/templates/service.yaml b/ric-platform/50-RIC-Platform/helm/e2term/templates/service.yaml index f9d82740..b46de3d0 100644 --- a/ric-platform/50-RIC-Platform/helm/e2term/templates/service.yaml +++ b/ric-platform/50-RIC-Platform/helm/e2term/templates/service.yaml @@ -26,12 +26,12 @@ metadata: release: {{ .Release.Name }} heritage: {{ .Release.Service }} spec: - type: {{ .Values.service.type }} + type: {{ .Values.e2term.service.type }} ports: - - port: {{ .Values.service.nano.port }} + - port: {{ .Values.e2term.service.nano.port }} protocol: TCP - targetPort: {{ .Values.service.nano.target_port }} - name: {{ .Values.service.nano.name }} + targetPort: {{ .Values.e2term.service.nano.target_port }} + name: {{ .Values.e2term.service.nano.name }} selector: app: {{ include "common.namespace" . }}-{{ include "common.name" . }} release: {{ .Release.Name }} diff --git a/ric-platform/50-RIC-Platform/helm/e2term/values.yaml b/ric-platform/50-RIC-Platform/helm/e2term/values.yaml index fdb232c3..e92ba786 100644 --- a/ric-platform/50-RIC-Platform/helm/e2term/values.yaml +++ b/ric-platform/50-RIC-Platform/helm/e2term/values.yaml @@ -33,23 +33,23 @@ repositoryCred: docker-reg-cred # Uncomment the following line to override the image pull policy #imagePullPolicyOverride: "" - -image: - name: e2 - tag: 1.0.0 - - -replicaCount: 1 - -env: - print: "1" - RMR_RTG_SVC: "ric-full-rtmgr" - -service: - type: ClusterIP - nano: - port: 38000 - target_port: 38000 - protocol: "TCP" - name: "nano-port" - +e2term: + image: + name: e2 + tag: 1.0.0 + + + replicaCount: 1 + + env: + print: "1" + RMR_RTG_SVC: "ric-full-rtmgr" + + service: + type: ClusterIP + nano: + port: 38000 + target_port: 38000 + protocol: "TCP" + name: "nano-port" + diff --git a/ric-platform/50-RIC-Platform/helm/rtmgr/templates/rtmgr-dep.yaml b/ric-platform/50-RIC-Platform/helm/rtmgr/templates/rtmgr-dep.yaml index a55b178c..7c1ad885 100644 --- a/ric-platform/50-RIC-Platform/helm/rtmgr/templates/rtmgr-dep.yaml +++ b/ric-platform/50-RIC-Platform/helm/rtmgr/templates/rtmgr-dep.yaml @@ -26,7 +26,7 @@ metadata: release: {{ .Release.Name }} heritage: {{ .Release.Service }} spec: - replicas: {{ .Values.replicaCount }} + replicas: {{ .Values.rtmgr.replicaCount }} selector: matchLabels: app: {{ include "common.namespace" . }}-{{ include "common.name" . }} @@ -42,7 +42,7 @@ spec: - name: {{ include "common.repositoryCred" . }} containers: - name: {{ include "common.namespace" . }}-{{ include "common.name" . }} - image: {{ include "common.repository" . }}/{{ .Values.image.name }}:{{ .Values.image.tag }} + image: {{ include "common.repository" . }}/{{ .Values.rtmgr.image.name }}:{{ .Values.rtmgr.image.tag }} imagePullPolicy: {{ include "common.pullPolicy" . }} command: ["/run_rtmgr.sh"] env: @@ -61,5 +61,5 @@ spec: - name: SDL value: "file" ports: - - name: {{ .Values.service.nano.name }} - containerPort: {{ .Values.service.nano.port }} + - name: {{ .Values.rtmgr.service.nano.name }} + containerPort: {{ .Values.rtmgr.service.nano.port }} diff --git a/ric-platform/50-RIC-Platform/helm/rtmgr/templates/rtmgr-svc.yaml b/ric-platform/50-RIC-Platform/helm/rtmgr/templates/rtmgr-svc.yaml index fb761112..b1080674 100644 --- a/ric-platform/50-RIC-Platform/helm/rtmgr/templates/rtmgr-svc.yaml +++ b/ric-platform/50-RIC-Platform/helm/rtmgr/templates/rtmgr-svc.yaml @@ -26,12 +26,12 @@ metadata: release: {{ .Release.Name }} heritage: {{ .Release.Service }} spec: - type: {{ .Values.service.type }} + type: {{ .Values.rtmgr.service.type }} ports: - - port: {{ .Values.service.nano.port }} + - port: {{ .Values.rtmgr.service.nano.port }} protocol: TCP - targetPort: {{ .Values.service.nano.target_port }} - name: {{ .Values.service.nano.name }} + targetPort: {{ .Values.rtmgr.service.nano.target_port }} + name: {{ .Values.rtmgr.service.nano.name }} selector: app: {{ include "common.namespace" . }}-{{ include "common.name" . }} release: {{ .Release.Name }} diff --git a/ric-platform/50-RIC-Platform/helm/rtmgr/values.yaml b/ric-platform/50-RIC-Platform/helm/rtmgr/values.yaml index 8300f8d1..299863c1 100644 --- a/ric-platform/50-RIC-Platform/helm/rtmgr/values.yaml +++ b/ric-platform/50-RIC-Platform/helm/rtmgr/values.yaml @@ -34,16 +34,16 @@ repositoryCred: docker-reg-cred # Uncomment the following line to override the image pull policy #imagePullPolicyOverride: "" - -image: - name: rtmgr - tag: 0.0.2 - -service: - type: ClusterIP - nano: - port: 5656 - target_port: 4560 - protocol: "TCP" - name: "nano-port" - +rtmgr: + image: + name: rtmgr + tag: 0.0.2 + + service: + type: ClusterIP + nano: + port: 5656 + target_port: 4560 + protocol: "TCP" + name: "nano-port" + diff --git a/xapps/90-xApps/helm/xapp-admin/Chart.yaml b/ric-xapps/90-xApps/helm/xapp-admin/Chart.yaml similarity index 100% rename from xapps/90-xApps/helm/xapp-admin/Chart.yaml rename to ric-xapps/90-xApps/helm/xapp-admin/Chart.yaml diff --git a/xapps/90-xApps/helm/xapp-admin/values.yaml b/ric-xapps/90-xApps/helm/xapp-admin/values.yaml similarity index 100% rename from xapps/90-xApps/helm/xapp-admin/values.yaml rename to ric-xapps/90-xApps/helm/xapp-admin/values.yaml diff --git a/xapps/90-xApps/helm/xapp-std/.helmignore b/ric-xapps/90-xApps/helm/xapp-std/.helmignore similarity index 100% rename from xapps/90-xApps/helm/xapp-std/.helmignore rename to ric-xapps/90-xApps/helm/xapp-std/.helmignore diff --git a/xapps/90-xApps/helm/xapp-std/Chart.yaml b/ric-xapps/90-xApps/helm/xapp-std/Chart.yaml similarity index 100% rename from xapps/90-xApps/helm/xapp-std/Chart.yaml rename to ric-xapps/90-xApps/helm/xapp-std/Chart.yaml diff --git a/xapps/90-xApps/helm/xapp-std/templates/_helpers.tpl b/ric-xapps/90-xApps/helm/xapp-std/templates/_helpers.tpl similarity index 100% rename from xapps/90-xApps/helm/xapp-std/templates/_helpers.tpl rename to ric-xapps/90-xApps/helm/xapp-std/templates/_helpers.tpl diff --git a/xapps/90-xApps/helm/xapp-std/templates/appconfig.yaml b/ric-xapps/90-xApps/helm/xapp-std/templates/appconfig.yaml similarity index 100% rename from xapps/90-xApps/helm/xapp-std/templates/appconfig.yaml rename to ric-xapps/90-xApps/helm/xapp-std/templates/appconfig.yaml diff --git a/xapps/90-xApps/helm/xapp-std/templates/appenv.yaml b/ric-xapps/90-xApps/helm/xapp-std/templates/appenv.yaml similarity index 100% rename from xapps/90-xApps/helm/xapp-std/templates/appenv.yaml rename to ric-xapps/90-xApps/helm/xapp-std/templates/appenv.yaml diff --git a/xapps/90-xApps/helm/xapp-std/templates/appsecret.yaml b/ric-xapps/90-xApps/helm/xapp-std/templates/appsecret.yaml similarity index 100% rename from xapps/90-xApps/helm/xapp-std/templates/appsecret.yaml rename to ric-xapps/90-xApps/helm/xapp-std/templates/appsecret.yaml diff --git a/xapps/90-xApps/helm/xapp-std/templates/deployment.yaml b/ric-xapps/90-xApps/helm/xapp-std/templates/deployment.yaml similarity index 100% rename from xapps/90-xApps/helm/xapp-std/templates/deployment.yaml rename to ric-xapps/90-xApps/helm/xapp-std/templates/deployment.yaml diff --git a/xapps/90-xApps/helm/xapp-std/templates/secret.yaml b/ric-xapps/90-xApps/helm/xapp-std/templates/secret.yaml similarity index 100% rename from xapps/90-xApps/helm/xapp-std/templates/secret.yaml rename to ric-xapps/90-xApps/helm/xapp-std/templates/secret.yaml diff --git a/xapps/90-xApps/helm/xapp-std/templates/service.yaml b/ric-xapps/90-xApps/helm/xapp-std/templates/service.yaml similarity index 100% rename from xapps/90-xApps/helm/xapp-std/templates/service.yaml rename to ric-xapps/90-xApps/helm/xapp-std/templates/service.yaml diff --git a/xapps/90-xApps/helm/xapp-std/values.yaml b/ric-xapps/90-xApps/helm/xapp-std/values.yaml similarity index 100% rename from xapps/90-xApps/helm/xapp-std/values.yaml rename to ric-xapps/90-xApps/helm/xapp-std/values.yaml diff --git a/xapps/README.md b/ric-xapps/README.md similarity index 100% rename from xapps/README.md rename to ric-xapps/README.md -- 2.16.6