Add one-click deployment scripts and override file examples. 01/201/7
authorZhe Huang <zhehuang@research.att.com>
Tue, 28 May 2019 20:16:02 +0000 (16:16 -0400)
committerZhe Huang <zhehuang@research.att.com>
Thu, 30 May 2019 15:46:53 +0000 (11:46 -0400)
Signed-off-by: Zhe Huang <zhehuang@research.att.com>
Change-Id: I35588deac8c0788eac1dcd99ea6d75e5d9cad03c

79 files changed:
README.md
RECIPE_EXAMPLE/RECIPE_EXAMPLE [new file with mode: 0644]
bin/deploy-ric-aux [new file with mode: 0755]
bin/deploy-ric-platform [new file with mode: 0755]
bin/undeploy-ric-aux [new file with mode: 0755]
bin/undeploy-ric-platform [new file with mode: 0755]
etc/ric-aux.conf [new file with mode: 0644]
etc/ric-platform.conf [new file with mode: 0644]
infra/10-Nexus/docker/nexus-repository-helm [deleted submodule]
ric-aux/80-Auxiliary-Functions/bin/install [moved from aux/80-Auxiliary-Functions/bin/install with 100% similarity]
ric-aux/80-Auxiliary-Functions/bin/uninstall [moved from aux/80-Auxiliary-Functions/bin/uninstall with 100% similarity]
ric-aux/80-Auxiliary-Functions/etc/dashboard.conf [moved from aux/80-Auxiliary-Functions/etc/dashboard.conf with 100% similarity]
ric-aux/80-Auxiliary-Functions/helm/dashboard/Chart.yaml [moved from aux/80-Auxiliary-Functions/helm/dashboard/Chart.yaml with 100% similarity]
ric-aux/80-Auxiliary-Functions/helm/dashboard/requirements.yaml [moved from aux/80-Auxiliary-Functions/helm/dashboard/requirements.yaml with 100% similarity]
ric-aux/80-Auxiliary-Functions/helm/dashboard/templates/_helpers.tpl [moved from aux/80-Auxiliary-Functions/helm/dashboard/templates/_helpers.tpl with 100% similarity]
ric-aux/80-Auxiliary-Functions/helm/dashboard/templates/configmap.yaml [moved from aux/80-Auxiliary-Functions/helm/dashboard/templates/configmap.yaml with 100% similarity]
ric-aux/80-Auxiliary-Functions/helm/dashboard/templates/deployment.yaml [moved from aux/80-Auxiliary-Functions/helm/dashboard/templates/deployment.yaml with 96% similarity]
ric-aux/80-Auxiliary-Functions/helm/dashboard/templates/service.yaml [moved from aux/80-Auxiliary-Functions/helm/dashboard/templates/service.yaml with 95% similarity]
ric-aux/80-Auxiliary-Functions/helm/dashboard/values.yaml [moved from aux/80-Auxiliary-Functions/helm/dashboard/values.yaml with 92% similarity]
ric-aux/README.md [moved from aux/README.md with 100% similarity]
ric-infra/00-Kubernetes/bin/install [moved from infra/00-Kubernetes/bin/install with 100% similarity]
ric-infra/00-Kubernetes/bin/install-1node-k8s [moved from infra/00-Kubernetes/bin/install-1node-k8s with 100% similarity]
ric-infra/00-Kubernetes/etc/k8s-1node [moved from infra/00-Kubernetes/etc/k8s-1node with 100% similarity]
ric-infra/10-Nexus/bin/install [moved from infra/10-Nexus/bin/install with 100% similarity]
ric-infra/10-Nexus/bin/uninstall [moved from infra/10-Nexus/bin/uninstall with 100% similarity]
ric-infra/10-Nexus/docker/Dockerfile [moved from infra/10-Nexus/docker/Dockerfile with 100% similarity]
ric-infra/10-Nexus/etc/nexus.conf [moved from infra/10-Nexus/etc/nexus.conf with 100% similarity]
ric-infra/10-Nexus/helm/.helmignore [moved from infra/10-Nexus/helm/.helmignore with 100% similarity]
ric-infra/10-Nexus/helm/Chart.yaml [moved from infra/10-Nexus/helm/Chart.yaml with 100% similarity]
ric-infra/10-Nexus/helm/requirements.yaml [moved from infra/10-Nexus/helm/requirements.yaml with 100% similarity]
ric-infra/10-Nexus/helm/templates/_helpers.tpl [moved from infra/10-Nexus/helm/templates/_helpers.tpl with 100% similarity]
ric-infra/10-Nexus/helm/templates/deployment.yaml [moved from infra/10-Nexus/helm/templates/deployment.yaml with 100% similarity]
ric-infra/10-Nexus/helm/templates/ingress.yaml [moved from infra/10-Nexus/helm/templates/ingress.yaml with 100% similarity]
ric-infra/10-Nexus/helm/templates/save-secret-job.yaml [moved from infra/10-Nexus/helm/templates/save-secret-job.yaml with 100% similarity]
ric-infra/10-Nexus/helm/templates/secret-docker.yaml [moved from infra/10-Nexus/helm/templates/secret-docker.yaml with 100% similarity]
ric-infra/10-Nexus/helm/templates/service.yaml [moved from infra/10-Nexus/helm/templates/service.yaml with 100% similarity]
ric-infra/10-Nexus/helm/values.yaml [moved from infra/10-Nexus/helm/values.yaml with 100% similarity]
ric-infra/20-Credential/bin/install [moved from ric-platform/20-Credential/bin/install with 86% similarity]
ric-infra/20-Credential/bin/uninstall [moved from ric-platform/20-Credential/bin/uninstall with 100% similarity]
ric-infra/20-Credential/etc/credential.conf [moved from ric-platform/20-Credential/etc/credential.conf with 100% similarity]
ric-infra/20-Credential/helm/Chart.yaml [moved from ric-platform/20-Credential/helm/Chart.yaml with 100% similarity]
ric-infra/20-Credential/helm/requirements.yaml [new file with mode: 0644]
ric-infra/20-Credential/helm/resources/tls.crt [moved from ric-platform/20-Credential/helm/resources/tls.crt with 100% similarity]
ric-infra/20-Credential/helm/templates/_helper.tpl [moved from ric-platform/20-Credential/helm/templates/_helper.tpl with 95% similarity]
ric-infra/20-Credential/helm/templates/config-helm-cert.yaml [moved from ric-platform/20-Credential/helm/templates/config-helm-cert.yaml with 100% similarity]
ric-infra/20-Credential/helm/templates/secrets-docker-reg.yaml [moved from ric-platform/20-Credential/helm/templates/secrets-docker-reg.yaml with 100% similarity]
ric-infra/20-Credential/helm/templates/secrets-helm-xapp.yaml [moved from ric-platform/20-Credential/helm/templates/secrets-helm-xapp.yaml with 100% similarity]
ric-infra/20-Credential/helm/values.yaml [moved from ric-platform/20-Credential/helm/values.yaml with 94% similarity]
ric-infra/README.md [moved from infra/README.md with 100% similarity]
ric-platform/50-RIC-Platform/helm/appmgr/templates/appconfig.yaml
ric-platform/50-RIC-Platform/helm/appmgr/templates/appenv.yaml
ric-platform/50-RIC-Platform/helm/appmgr/templates/deployment.yaml
ric-platform/50-RIC-Platform/helm/appmgr/templates/service.yaml
ric-platform/50-RIC-Platform/helm/appmgr/values.yaml
ric-platform/50-RIC-Platform/helm/dbaas/templates/deployment.yaml
ric-platform/50-RIC-Platform/helm/dbaas/templates/service.yaml
ric-platform/50-RIC-Platform/helm/dbaas/values.yaml
ric-platform/50-RIC-Platform/helm/e2mgr/templates/deployment.yaml
ric-platform/50-RIC-Platform/helm/e2mgr/templates/service.yaml
ric-platform/50-RIC-Platform/helm/e2mgr/values.yaml
ric-platform/50-RIC-Platform/helm/e2term/templates/deployment.yaml
ric-platform/50-RIC-Platform/helm/e2term/templates/service.yaml
ric-platform/50-RIC-Platform/helm/e2term/values.yaml
ric-platform/50-RIC-Platform/helm/rtmgr/templates/rtmgr-dep.yaml
ric-platform/50-RIC-Platform/helm/rtmgr/templates/rtmgr-svc.yaml
ric-platform/50-RIC-Platform/helm/rtmgr/values.yaml
ric-xapps/90-xApps/helm/xapp-admin/Chart.yaml [moved from xapps/90-xApps/helm/xapp-admin/Chart.yaml with 100% similarity]
ric-xapps/90-xApps/helm/xapp-admin/values.yaml [moved from xapps/90-xApps/helm/xapp-admin/values.yaml with 100% similarity]
ric-xapps/90-xApps/helm/xapp-std/.helmignore [moved from xapps/90-xApps/helm/xapp-std/.helmignore with 100% similarity]
ric-xapps/90-xApps/helm/xapp-std/Chart.yaml [moved from xapps/90-xApps/helm/xapp-std/Chart.yaml with 100% similarity]
ric-xapps/90-xApps/helm/xapp-std/templates/_helpers.tpl [moved from xapps/90-xApps/helm/xapp-std/templates/_helpers.tpl with 100% similarity]
ric-xapps/90-xApps/helm/xapp-std/templates/appconfig.yaml [moved from xapps/90-xApps/helm/xapp-std/templates/appconfig.yaml with 100% similarity]
ric-xapps/90-xApps/helm/xapp-std/templates/appenv.yaml [moved from xapps/90-xApps/helm/xapp-std/templates/appenv.yaml with 100% similarity]
ric-xapps/90-xApps/helm/xapp-std/templates/appsecret.yaml [moved from xapps/90-xApps/helm/xapp-std/templates/appsecret.yaml with 100% similarity]
ric-xapps/90-xApps/helm/xapp-std/templates/deployment.yaml [moved from xapps/90-xApps/helm/xapp-std/templates/deployment.yaml with 100% similarity]
ric-xapps/90-xApps/helm/xapp-std/templates/secret.yaml [moved from xapps/90-xApps/helm/xapp-std/templates/secret.yaml with 100% similarity]
ric-xapps/90-xApps/helm/xapp-std/templates/service.yaml [moved from xapps/90-xApps/helm/xapp-std/templates/service.yaml with 100% similarity]
ric-xapps/90-xApps/helm/xapp-std/values.yaml [moved from xapps/90-xApps/helm/xapp-std/values.yaml with 100% similarity]
ric-xapps/README.md [moved from xapps/README.md with 100% similarity]

index 3987ce6..742ceb7 100644 (file)
--- 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,
-.
-â\94\9câ\94\80â\94\80 aux
-│   â””── 80-Auxiliary-Functions
-├── infra
+├── ric-aux
+â\94\82   Ã¢\94\9câ\94\80â\94\80 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 (file)
index 0000000..e90af68
--- /dev/null
@@ -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 (executable)
index 0000000..5ccb386
--- /dev/null
@@ -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 (executable)
index 0000000..0997c26
--- /dev/null
@@ -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 (executable)
index 0000000..df56d0e
--- /dev/null
@@ -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 (executable)
index 0000000..e9e5c9f
--- /dev/null
@@ -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 (file)
index 0000000..5123514
--- /dev/null
@@ -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 (file)
index 0000000..1054892
--- /dev/null
@@ -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 (submodule)
index 6de9776..0000000
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 6de97765b747008e3016f202ccbe2dba18667b83
@@ -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
@@ -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:
@@ -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
+  
similarity index 100%
rename from aux/README.md
rename to ric-aux/README.md
similarity index 86%
rename from ric-platform/20-Credential/bin/install
rename to ric-infra/20-Credential/bin/install
index c2c86e4..a261990 100755 (executable)
@@ -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-infra/20-Credential/helm/requirements.yaml b/ric-infra/20-Credential/helm/requirements.yaml
new file mode 100644 (file)
index 0000000..aa94575
--- /dev/null
@@ -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
@@ -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 }}
similarity index 94%
rename from ric-platform/20-Credential/helm/values.yaml
rename to ric-infra/20-Credential/helm/values.yaml
index 16b9b57..8f37004 100644 (file)
 # 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"
similarity index 100%
rename from infra/README.md
rename to ric-infra/README.md
index 0985e50..0ed87d4 100644 (file)
@@ -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 -}}
index a414461..465f08c 100644 (file)
@@ -20,6 +20,6 @@ kind: ConfigMap
 metadata:
   name: {{ include "appmgr.fullname" . }}-appenv
 data:
-  {{- with .Values.appenv }}
+  {{- with .Values.appmgr.appenv }}
     {{- toYaml . | nindent 2 }}
   {{- end }}
index 52e5339..b425365 100644 (file)
@@ -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:
index 5304628..f7d7361 100644 (file)
@@ -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 }}
index b3f0f57..ffe2934 100644 (file)
@@ -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: {}
index 1589b24..8d2014f 100644 (file)
@@ -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
index 6aa2bd9..0708b0c 100644 (file)
@@ -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 }}
index 5948167..edf51f4 100644 (file)
@@ -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
index b4561e8..f5726a3 100644 (file)
@@ -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:
index 19d5896..d2a2a80 100644 (file)
@@ -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 }}
index a62acc9..5f11d21 100644 (file)
@@ -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"
index bf048b5..dc15bd8 100644 (file)
@@ -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:
index f9d8274..b46de3d 100644 (file)
@@ -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 }}
index fdb232c..e92ba78 100644 (file)
@@ -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"
+  
index a55b178..7c1ad88 100644 (file)
@@ -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 }}
index fb76111..b108067 100644 (file)
@@ -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 }}
index 8300f8d..299863c 100644 (file)
@@ -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"
+  
similarity index 100%
rename from xapps/README.md
rename to ric-xapps/README.md