Separating RICPLT from it/dep repo. 76/2276/1
authorZhe Huang <zhehuang@research.att.com>
Wed, 15 Jan 2020 22:15:45 +0000 (17:15 -0500)
committerZhe Huang <zhehuang@research.att.com>
Mon, 20 Jan 2020 20:29:31 +0000 (15:29 -0500)
Signed-off-by: Zhe Huang <zhehuang@research.att.com>
Change-Id: I577a36470209e7dce6663818dc4d61285cc3e5b1

653 files changed:
.gitmodules [new file with mode: 0644]
.gitreview
README.md
RECIPE_EXAMPLE/AUX [new symlink]
RECIPE_EXAMPLE/PLATFORM [new symlink]
RECIPE_EXAMPLE/RIC_AUX_RECIPE_EXAMPLE [deleted file]
RECIPE_EXAMPLE/RIC_INFRA_AUX_RECIPE_EXAMPLE [deleted file]
RECIPE_EXAMPLE/RIC_INFRA_RECIPE_EXAMPLE [deleted file]
RECIPE_EXAMPLE/RIC_PLATFORM_RECIPE_EXAMPLE [deleted file]
bin/deploy-ric-aux
bin/deploy-ric-infra [deleted file]
bin/deploy-ric-platform
bin/gen-image-list
bin/undeploy-ric-aux
bin/undeploy-ric-infra [deleted file]
bin/undeploy-ric-platform
bin/verify-ric-charts
etc/ric.conf [deleted file]
ric-aux/85-Ext-Services/bin/install [deleted file]
ric-aux/85-Ext-Services/bin/uninstall [deleted file]
ric-aux/85-Ext-Services/helm/extsvcaux/values.yaml [deleted file]
ric-aux/RECIPE_EXAMPLE/amber_example_recipe.yaml [new file with mode: 0644]
ric-aux/bin/install [moved from ric-aux/80-Auxiliary-Functions/bin/install with 55% similarity]
ric-aux/bin/uninstall [moved from ric-aux/80-Auxiliary-Functions/bin/uninstall with 56% similarity]
ric-aux/helm/.helmignore [moved from ric-aux/80-Auxiliary-Functions/helm/.helmignore with 100% similarity]
ric-aux/helm/aaf/.helmignore [moved from ric-aux/80-Auxiliary-Functions/helm/aaf/.helmignore with 100% similarity]
ric-aux/helm/aaf/Chart.yaml [moved from ric-aux/80-Auxiliary-Functions/helm/aaf/Chart.yaml with 100% similarity]
ric-aux/helm/aaf/charts/aaf-cass/.helmignore [moved from ric-aux/80-Auxiliary-Functions/helm/aaf/charts/aaf-cass/.helmignore with 100% similarity]
ric-aux/helm/aaf/charts/aaf-cass/Chart.yaml [moved from ric-aux/80-Auxiliary-Functions/helm/aaf/charts/aaf-cass/Chart.yaml with 100% similarity]
ric-aux/helm/aaf/charts/aaf-cass/templates/NOTES.txt [moved from ric-aux/80-Auxiliary-Functions/helm/aaf/charts/aaf-cass/templates/NOTES.txt with 100% similarity]
ric-aux/helm/aaf/charts/aaf-cass/templates/deployment.yaml [moved from ric-aux/80-Auxiliary-Functions/helm/aaf/charts/aaf-cass/templates/deployment.yaml with 100% similarity]
ric-aux/helm/aaf/charts/aaf-cass/templates/pv.yaml [moved from ric-aux/80-Auxiliary-Functions/helm/aaf/charts/aaf-cass/templates/pv.yaml with 100% similarity]
ric-aux/helm/aaf/charts/aaf-cass/templates/pvc.yaml [moved from ric-aux/80-Auxiliary-Functions/helm/aaf/charts/aaf-cass/templates/pvc.yaml with 100% similarity]
ric-aux/helm/aaf/charts/aaf-cass/templates/service.yaml [moved from ric-aux/80-Auxiliary-Functions/helm/aaf/charts/aaf-cass/templates/service.yaml with 100% similarity]
ric-aux/helm/aaf/charts/aaf-cass/values.yaml [moved from ric-aux/80-Auxiliary-Functions/helm/aaf/charts/aaf-cass/values.yaml with 100% similarity]
ric-aux/helm/aaf/charts/aaf-cm/.helmignore [moved from ric-aux/80-Auxiliary-Functions/helm/aaf/charts/aaf-cm/.helmignore with 100% similarity]
ric-aux/helm/aaf/charts/aaf-cm/Chart.yaml [moved from ric-aux/80-Auxiliary-Functions/helm/aaf/charts/aaf-cm/Chart.yaml with 100% similarity]
ric-aux/helm/aaf/charts/aaf-cm/templates/NOTES.txt [moved from ric-aux/80-Auxiliary-Functions/helm/aaf/charts/aaf-cm/templates/NOTES.txt with 100% similarity]
ric-aux/helm/aaf/charts/aaf-cm/templates/deployment.yaml [moved from ric-aux/80-Auxiliary-Functions/helm/aaf/charts/aaf-cm/templates/deployment.yaml with 100% similarity]
ric-aux/helm/aaf/charts/aaf-cm/templates/service.yaml [moved from ric-aux/80-Auxiliary-Functions/helm/aaf/charts/aaf-cm/templates/service.yaml with 100% similarity]
ric-aux/helm/aaf/charts/aaf-cm/values.yaml [moved from ric-aux/80-Auxiliary-Functions/helm/aaf/charts/aaf-cm/values.yaml with 100% similarity]
ric-aux/helm/aaf/charts/aaf-fs/.helmignore [moved from ric-aux/80-Auxiliary-Functions/helm/aaf/charts/aaf-fs/.helmignore with 100% similarity]
ric-aux/helm/aaf/charts/aaf-fs/Chart.yaml [moved from ric-aux/80-Auxiliary-Functions/helm/aaf/charts/aaf-fs/Chart.yaml with 100% similarity]
ric-aux/helm/aaf/charts/aaf-fs/templates/NOTES.txt [moved from ric-aux/80-Auxiliary-Functions/helm/aaf/charts/aaf-fs/templates/NOTES.txt with 100% similarity]
ric-aux/helm/aaf/charts/aaf-fs/templates/deployment.yaml [moved from ric-aux/80-Auxiliary-Functions/helm/aaf/charts/aaf-fs/templates/deployment.yaml with 100% similarity]
ric-aux/helm/aaf/charts/aaf-fs/templates/service.yaml [moved from ric-aux/80-Auxiliary-Functions/helm/aaf/charts/aaf-fs/templates/service.yaml with 100% similarity]
ric-aux/helm/aaf/charts/aaf-fs/values.yaml [moved from ric-aux/80-Auxiliary-Functions/helm/aaf/charts/aaf-fs/values.yaml with 100% similarity]
ric-aux/helm/aaf/charts/aaf-gui/.helmignore [moved from ric-aux/80-Auxiliary-Functions/helm/aaf/charts/aaf-gui/.helmignore with 100% similarity]
ric-aux/helm/aaf/charts/aaf-gui/Chart.yaml [moved from ric-aux/80-Auxiliary-Functions/helm/aaf/charts/aaf-gui/Chart.yaml with 100% similarity]
ric-aux/helm/aaf/charts/aaf-gui/templates/NOTES.txt [moved from ric-aux/80-Auxiliary-Functions/helm/aaf/charts/aaf-gui/templates/NOTES.txt with 100% similarity]
ric-aux/helm/aaf/charts/aaf-gui/templates/deployment.yaml [moved from ric-aux/80-Auxiliary-Functions/helm/aaf/charts/aaf-gui/templates/deployment.yaml with 100% similarity]
ric-aux/helm/aaf/charts/aaf-gui/templates/service.yaml [moved from ric-aux/80-Auxiliary-Functions/helm/aaf/charts/aaf-gui/templates/service.yaml with 100% similarity]
ric-aux/helm/aaf/charts/aaf-gui/values.yaml [moved from ric-aux/80-Auxiliary-Functions/helm/aaf/charts/aaf-gui/values.yaml with 100% similarity]
ric-aux/helm/aaf/charts/aaf-hello/.helmignore [moved from ric-aux/80-Auxiliary-Functions/helm/aaf/charts/aaf-hello/.helmignore with 100% similarity]
ric-aux/helm/aaf/charts/aaf-hello/Chart.yaml [moved from ric-aux/80-Auxiliary-Functions/helm/aaf/charts/aaf-hello/Chart.yaml with 100% similarity]
ric-aux/helm/aaf/charts/aaf-hello/templates/NOTES.txt [moved from ric-aux/80-Auxiliary-Functions/helm/aaf/charts/aaf-hello/templates/NOTES.txt with 100% similarity]
ric-aux/helm/aaf/charts/aaf-hello/templates/aaf-hello-pv.yaml [moved from ric-aux/80-Auxiliary-Functions/helm/aaf/charts/aaf-hello/templates/aaf-hello-pv.yaml with 100% similarity]
ric-aux/helm/aaf/charts/aaf-hello/templates/aaf-hello-pvc.yaml [moved from ric-aux/80-Auxiliary-Functions/helm/aaf/charts/aaf-hello/templates/aaf-hello-pvc.yaml with 100% similarity]
ric-aux/helm/aaf/charts/aaf-hello/templates/deployment.yaml [moved from ric-aux/80-Auxiliary-Functions/helm/aaf/charts/aaf-hello/templates/deployment.yaml with 100% similarity]
ric-aux/helm/aaf/charts/aaf-hello/templates/service.yaml [moved from ric-aux/80-Auxiliary-Functions/helm/aaf/charts/aaf-hello/templates/service.yaml with 100% similarity]
ric-aux/helm/aaf/charts/aaf-hello/values.yaml [moved from ric-aux/80-Auxiliary-Functions/helm/aaf/charts/aaf-hello/values.yaml with 100% similarity]
ric-aux/helm/aaf/charts/aaf-locate/.helmignore [moved from ric-aux/80-Auxiliary-Functions/helm/aaf/charts/aaf-locate/.helmignore with 100% similarity]
ric-aux/helm/aaf/charts/aaf-locate/Chart.yaml [moved from ric-aux/80-Auxiliary-Functions/helm/aaf/charts/aaf-locate/Chart.yaml with 100% similarity]
ric-aux/helm/aaf/charts/aaf-locate/templates/NOTES.txt [moved from ric-aux/80-Auxiliary-Functions/helm/aaf/charts/aaf-locate/templates/NOTES.txt with 100% similarity]
ric-aux/helm/aaf/charts/aaf-locate/templates/deployment.yaml [moved from ric-aux/80-Auxiliary-Functions/helm/aaf/charts/aaf-locate/templates/deployment.yaml with 100% similarity]
ric-aux/helm/aaf/charts/aaf-locate/templates/service.yaml [moved from ric-aux/80-Auxiliary-Functions/helm/aaf/charts/aaf-locate/templates/service.yaml with 100% similarity]
ric-aux/helm/aaf/charts/aaf-locate/values.yaml [moved from ric-aux/80-Auxiliary-Functions/helm/aaf/charts/aaf-locate/values.yaml with 100% similarity]
ric-aux/helm/aaf/charts/aaf-oauth/.helmignore [moved from ric-aux/80-Auxiliary-Functions/helm/aaf/charts/aaf-oauth/.helmignore with 100% similarity]
ric-aux/helm/aaf/charts/aaf-oauth/Chart.yaml [moved from ric-aux/80-Auxiliary-Functions/helm/aaf/charts/aaf-oauth/Chart.yaml with 100% similarity]
ric-aux/helm/aaf/charts/aaf-oauth/templates/NOTES.txt [moved from ric-aux/80-Auxiliary-Functions/helm/aaf/charts/aaf-oauth/templates/NOTES.txt with 100% similarity]
ric-aux/helm/aaf/charts/aaf-oauth/templates/deployment.yaml [moved from ric-aux/80-Auxiliary-Functions/helm/aaf/charts/aaf-oauth/templates/deployment.yaml with 100% similarity]
ric-aux/helm/aaf/charts/aaf-oauth/templates/service.yaml [moved from ric-aux/80-Auxiliary-Functions/helm/aaf/charts/aaf-oauth/templates/service.yaml with 100% similarity]
ric-aux/helm/aaf/charts/aaf-oauth/values.yaml [moved from ric-aux/80-Auxiliary-Functions/helm/aaf/charts/aaf-oauth/values.yaml with 100% similarity]
ric-aux/helm/aaf/charts/aaf-service/.helmignore [moved from ric-aux/80-Auxiliary-Functions/helm/aaf/charts/aaf-service/.helmignore with 100% similarity]
ric-aux/helm/aaf/charts/aaf-service/Chart.yaml [moved from ric-aux/80-Auxiliary-Functions/helm/aaf/charts/aaf-service/Chart.yaml with 100% similarity]
ric-aux/helm/aaf/charts/aaf-service/templates/deployment.yaml [moved from ric-aux/80-Auxiliary-Functions/helm/aaf/charts/aaf-service/templates/deployment.yaml with 100% similarity]
ric-aux/helm/aaf/charts/aaf-service/templates/service.yaml [moved from ric-aux/80-Auxiliary-Functions/helm/aaf/charts/aaf-service/templates/service.yaml with 100% similarity]
ric-aux/helm/aaf/charts/aaf-service/values.yaml [moved from ric-aux/80-Auxiliary-Functions/helm/aaf/charts/aaf-service/values.yaml with 100% similarity]
ric-aux/helm/aaf/charts/aaf-sms/Chart.yaml [moved from ric-aux/80-Auxiliary-Functions/helm/aaf/charts/aaf-sms/Chart.yaml with 100% similarity]
ric-aux/helm/aaf/charts/aaf-sms/charts/aaf-sms-quorumclient/Chart.yaml [moved from ric-aux/80-Auxiliary-Functions/helm/aaf/charts/aaf-sms/charts/aaf-sms-quorumclient/Chart.yaml with 100% similarity]
ric-aux/helm/aaf/charts/aaf-sms/charts/aaf-sms-quorumclient/resources/config/config.json [moved from ric-aux/80-Auxiliary-Functions/helm/aaf/charts/aaf-sms/charts/aaf-sms-quorumclient/resources/config/config.json with 100% similarity]
ric-aux/helm/aaf/charts/aaf-sms/charts/aaf-sms-quorumclient/templates/configmap.yaml [moved from ric-aux/80-Auxiliary-Functions/helm/aaf/charts/aaf-sms/charts/aaf-sms-quorumclient/templates/configmap.yaml with 100% similarity]
ric-aux/helm/aaf/charts/aaf-sms/charts/aaf-sms-quorumclient/templates/pv.yaml [moved from ric-aux/80-Auxiliary-Functions/helm/aaf/charts/aaf-sms/charts/aaf-sms-quorumclient/templates/pv.yaml with 100% similarity]
ric-aux/helm/aaf/charts/aaf-sms/charts/aaf-sms-quorumclient/templates/pvc.yaml [moved from ric-aux/80-Auxiliary-Functions/helm/aaf/charts/aaf-sms/charts/aaf-sms-quorumclient/templates/pvc.yaml with 100% similarity]
ric-aux/helm/aaf/charts/aaf-sms/charts/aaf-sms-quorumclient/templates/statefulset.yaml [moved from ric-aux/80-Auxiliary-Functions/helm/aaf/charts/aaf-sms/charts/aaf-sms-quorumclient/templates/statefulset.yaml with 100% similarity]
ric-aux/helm/aaf/charts/aaf-sms/charts/aaf-sms-quorumclient/values.yaml [moved from ric-aux/80-Auxiliary-Functions/helm/aaf/charts/aaf-sms/charts/aaf-sms-quorumclient/values.yaml with 100% similarity]
ric-aux/helm/aaf/charts/aaf-sms/charts/aaf-sms-vault/Chart.yaml [moved from ric-aux/80-Auxiliary-Functions/helm/aaf/charts/aaf-sms/charts/aaf-sms-vault/Chart.yaml with 100% similarity]
ric-aux/helm/aaf/charts/aaf-sms/charts/aaf-sms-vault/templates/configmap.yaml [moved from ric-aux/80-Auxiliary-Functions/helm/aaf/charts/aaf-sms/charts/aaf-sms-vault/templates/configmap.yaml with 100% similarity]
ric-aux/helm/aaf/charts/aaf-sms/charts/aaf-sms-vault/templates/pv.yaml [moved from ric-aux/80-Auxiliary-Functions/helm/aaf/charts/aaf-sms/charts/aaf-sms-vault/templates/pv.yaml with 100% similarity]
ric-aux/helm/aaf/charts/aaf-sms/charts/aaf-sms-vault/templates/pvc.yaml [moved from ric-aux/80-Auxiliary-Functions/helm/aaf/charts/aaf-sms/charts/aaf-sms-vault/templates/pvc.yaml with 100% similarity]
ric-aux/helm/aaf/charts/aaf-sms/charts/aaf-sms-vault/templates/service.yaml [moved from ric-aux/80-Auxiliary-Functions/helm/aaf/charts/aaf-sms/charts/aaf-sms-vault/templates/service.yaml with 100% similarity]
ric-aux/helm/aaf/charts/aaf-sms/charts/aaf-sms-vault/templates/statefulset.yaml [moved from ric-aux/80-Auxiliary-Functions/helm/aaf/charts/aaf-sms/charts/aaf-sms-vault/templates/statefulset.yaml with 100% similarity]
ric-aux/helm/aaf/charts/aaf-sms/charts/aaf-sms-vault/values.yaml [moved from ric-aux/80-Auxiliary-Functions/helm/aaf/charts/aaf-sms/charts/aaf-sms-vault/values.yaml with 100% similarity]
ric-aux/helm/aaf/charts/aaf-sms/resources/config/has.json [moved from ric-aux/80-Auxiliary-Functions/helm/aaf/charts/aaf-sms/resources/config/has.json with 100% similarity]
ric-aux/helm/aaf/charts/aaf-sms/resources/config/osdf.json [moved from ric-aux/80-Auxiliary-Functions/helm/aaf/charts/aaf-sms/resources/config/osdf.json with 100% similarity]
ric-aux/helm/aaf/charts/aaf-sms/templates/configmap.yaml [moved from ric-aux/80-Auxiliary-Functions/helm/aaf/charts/aaf-sms/templates/configmap.yaml with 100% similarity]
ric-aux/helm/aaf/charts/aaf-sms/templates/deployment.yaml [moved from ric-aux/80-Auxiliary-Functions/helm/aaf/charts/aaf-sms/templates/deployment.yaml with 100% similarity]
ric-aux/helm/aaf/charts/aaf-sms/templates/job.yaml [moved from ric-aux/80-Auxiliary-Functions/helm/aaf/charts/aaf-sms/templates/job.yaml with 100% similarity]
ric-aux/helm/aaf/charts/aaf-sms/templates/pv.yaml [moved from ric-aux/80-Auxiliary-Functions/helm/aaf/charts/aaf-sms/templates/pv.yaml with 100% similarity]
ric-aux/helm/aaf/charts/aaf-sms/templates/pvc.yaml [moved from ric-aux/80-Auxiliary-Functions/helm/aaf/charts/aaf-sms/templates/pvc.yaml with 100% similarity]
ric-aux/helm/aaf/charts/aaf-sms/templates/service.yaml [moved from ric-aux/80-Auxiliary-Functions/helm/aaf/charts/aaf-sms/templates/service.yaml with 100% similarity]
ric-aux/helm/aaf/charts/aaf-sms/values.yaml [moved from ric-aux/80-Auxiliary-Functions/helm/aaf/charts/aaf-sms/values.yaml with 100% similarity]
ric-aux/helm/aaf/charts/aaf-sshsm/Chart.yaml [moved from ric-aux/80-Auxiliary-Functions/helm/aaf/charts/aaf-sshsm/Chart.yaml with 100% similarity]
ric-aux/helm/aaf/charts/aaf-sshsm/README.md [moved from ric-aux/80-Auxiliary-Functions/helm/aaf/charts/aaf-sshsm/README.md with 100% similarity]
ric-aux/helm/aaf/charts/aaf-sshsm/charts/aaf-sshsm-abrmd/Chart.yaml [moved from ric-aux/80-Auxiliary-Functions/helm/aaf/charts/aaf-sshsm/charts/aaf-sshsm-abrmd/Chart.yaml with 100% similarity]
ric-aux/helm/aaf/charts/aaf-sshsm/charts/aaf-sshsm-abrmd/templates/configmap.yaml [moved from ric-aux/80-Auxiliary-Functions/helm/aaf/charts/aaf-sshsm/charts/aaf-sshsm-abrmd/templates/configmap.yaml with 100% similarity]
ric-aux/helm/aaf/charts/aaf-sshsm/charts/aaf-sshsm-abrmd/templates/job.yaml [moved from ric-aux/80-Auxiliary-Functions/helm/aaf/charts/aaf-sshsm/charts/aaf-sshsm-abrmd/templates/job.yaml with 100% similarity]
ric-aux/helm/aaf/charts/aaf-sshsm/charts/aaf-sshsm-abrmd/templates/statefulset.yaml [moved from ric-aux/80-Auxiliary-Functions/helm/aaf/charts/aaf-sshsm/charts/aaf-sshsm-abrmd/templates/statefulset.yaml with 100% similarity]
ric-aux/helm/aaf/charts/aaf-sshsm/charts/aaf-sshsm-abrmd/values.yaml [moved from ric-aux/80-Auxiliary-Functions/helm/aaf/charts/aaf-sshsm/charts/aaf-sshsm-abrmd/values.yaml with 100% similarity]
ric-aux/helm/aaf/charts/aaf-sshsm/charts/aaf-sshsm-distcenter/Chart.yaml [moved from ric-aux/80-Auxiliary-Functions/helm/aaf/charts/aaf-sshsm/charts/aaf-sshsm-distcenter/Chart.yaml with 100% similarity]
ric-aux/helm/aaf/charts/aaf-sshsm/charts/aaf-sshsm-distcenter/templates/configmap.yaml [moved from ric-aux/80-Auxiliary-Functions/helm/aaf/charts/aaf-sshsm/charts/aaf-sshsm-distcenter/templates/configmap.yaml with 100% similarity]
ric-aux/helm/aaf/charts/aaf-sshsm/charts/aaf-sshsm-distcenter/templates/job.yaml [moved from ric-aux/80-Auxiliary-Functions/helm/aaf/charts/aaf-sshsm/charts/aaf-sshsm-distcenter/templates/job.yaml with 100% similarity]
ric-aux/helm/aaf/charts/aaf-sshsm/charts/aaf-sshsm-distcenter/templates/pv.yaml [moved from ric-aux/80-Auxiliary-Functions/helm/aaf/charts/aaf-sshsm/charts/aaf-sshsm-distcenter/templates/pv.yaml with 100% similarity]
ric-aux/helm/aaf/charts/aaf-sshsm/charts/aaf-sshsm-distcenter/templates/pvc.yaml [moved from ric-aux/80-Auxiliary-Functions/helm/aaf/charts/aaf-sshsm/charts/aaf-sshsm-distcenter/templates/pvc.yaml with 100% similarity]
ric-aux/helm/aaf/charts/aaf-sshsm/charts/aaf-sshsm-distcenter/values.yaml [moved from ric-aux/80-Auxiliary-Functions/helm/aaf/charts/aaf-sshsm/charts/aaf-sshsm-distcenter/values.yaml with 100% similarity]
ric-aux/helm/aaf/charts/aaf-sshsm/charts/aaf-sshsm-testca/Chart.yaml [moved from ric-aux/80-Auxiliary-Functions/helm/aaf/charts/aaf-sshsm/charts/aaf-sshsm-testca/Chart.yaml with 100% similarity]
ric-aux/helm/aaf/charts/aaf-sshsm/charts/aaf-sshsm-testca/templates/job.yaml [moved from ric-aux/80-Auxiliary-Functions/helm/aaf/charts/aaf-sshsm/charts/aaf-sshsm-testca/templates/job.yaml with 100% similarity]
ric-aux/helm/aaf/charts/aaf-sshsm/charts/aaf-sshsm-testca/values.yaml [moved from ric-aux/80-Auxiliary-Functions/helm/aaf/charts/aaf-sshsm/charts/aaf-sshsm-testca/values.yaml with 100% similarity]
ric-aux/helm/aaf/charts/aaf-sshsm/requirements.yaml [moved from ric-aux/80-Auxiliary-Functions/helm/aaf/charts/aaf-sshsm/requirements.yaml with 100% similarity]
ric-aux/helm/aaf/charts/aaf-sshsm/resources/config/prk_passwd [moved from ric-aux/80-Auxiliary-Functions/helm/aaf/charts/aaf-sshsm/resources/config/prk_passwd with 100% similarity]
ric-aux/helm/aaf/charts/aaf-sshsm/resources/config/srk_handle [moved from ric-aux/80-Auxiliary-Functions/helm/aaf/charts/aaf-sshsm/resources/config/srk_handle with 100% similarity]
ric-aux/helm/aaf/charts/aaf-sshsm/templates/pv.yaml [moved from ric-aux/80-Auxiliary-Functions/helm/aaf/charts/aaf-sshsm/templates/pv.yaml with 100% similarity]
ric-aux/helm/aaf/charts/aaf-sshsm/templates/pvc.yaml [moved from ric-aux/80-Auxiliary-Functions/helm/aaf/charts/aaf-sshsm/templates/pvc.yaml with 100% similarity]
ric-aux/helm/aaf/charts/aaf-sshsm/templates/secret.yaml [moved from ric-aux/80-Auxiliary-Functions/helm/aaf/charts/aaf-sshsm/templates/secret.yaml with 100% similarity]
ric-aux/helm/aaf/charts/aaf-sshsm/values.yaml [moved from ric-aux/80-Auxiliary-Functions/helm/aaf/charts/aaf-sshsm/values.yaml with 100% similarity]
ric-aux/helm/aaf/requirements.yaml [moved from ric-aux/80-Auxiliary-Functions/helm/aaf/requirements.yaml with 90% similarity]
ric-aux/helm/aaf/templates/aaf-config-pv.yaml [moved from ric-aux/80-Auxiliary-Functions/helm/aaf/templates/aaf-config-pv.yaml with 100% similarity]
ric-aux/helm/aaf/templates/aaf-config-pvc.yaml [moved from ric-aux/80-Auxiliary-Functions/helm/aaf/templates/aaf-config-pvc.yaml with 100% similarity]
ric-aux/helm/aaf/templates/aaf-status-pv.yaml [moved from ric-aux/80-Auxiliary-Functions/helm/aaf/templates/aaf-status-pv.yaml with 100% similarity]
ric-aux/helm/aaf/templates/aaf-status-pvc.yaml [moved from ric-aux/80-Auxiliary-Functions/helm/aaf/templates/aaf-status-pvc.yaml with 100% similarity]
ric-aux/helm/aaf/values.yaml [moved from ric-aux/80-Auxiliary-Functions/helm/aaf/values.yaml with 100% similarity]
ric-aux/helm/dashboard/Chart.yaml [moved from ric-aux/80-Auxiliary-Functions/helm/dashboard/Chart.yaml with 100% similarity]
ric-aux/helm/dashboard/requirements.yaml [moved from ric-common/Helm-Credential/helm/helm-credential/requirements.yaml with 96% similarity]
ric-aux/helm/dashboard/templates/_gen-cert.tpl [moved from ric-aux/80-Auxiliary-Functions/helm/dashboard/templates/_gen-cert.tpl with 88% similarity]
ric-aux/helm/dashboard/templates/_genurl.tpl [moved from ric-aux/80-Auxiliary-Functions/helm/dashboard/templates/_genurl.tpl with 88% similarity]
ric-aux/helm/dashboard/templates/appconfig.yaml [moved from ric-aux/80-Auxiliary-Functions/helm/dashboard/templates/appconfig.yaml with 100% similarity]
ric-aux/helm/dashboard/templates/deployment.yaml [moved from ric-aux/80-Auxiliary-Functions/helm/dashboard/templates/deployment.yaml with 88% similarity]
ric-aux/helm/dashboard/templates/ingress.yaml [moved from ric-aux/80-Auxiliary-Functions/helm/dashboard/templates/ingress.yaml with 92% similarity]
ric-aux/helm/dashboard/templates/persistentVolume.yaml [moved from ric-aux/80-Auxiliary-Functions/helm/dashboard/templates/persistentVolume.yaml with 100% similarity]
ric-aux/helm/dashboard/templates/persistentVolumeClaim.yaml [moved from ric-aux/80-Auxiliary-Functions/helm/dashboard/templates/persistentVolumeClaim.yaml with 100% similarity]
ric-aux/helm/dashboard/templates/secret.yaml [moved from ric-aux/80-Auxiliary-Functions/helm/dashboard/templates/secret.yaml with 100% similarity]
ric-aux/helm/dashboard/templates/service.yaml [moved from ric-aux/80-Auxiliary-Functions/helm/dashboard/templates/service.yaml with 100% similarity]
ric-aux/helm/dashboard/values.yaml [moved from ric-aux/80-Auxiliary-Functions/helm/dashboard/values.yaml with 96% similarity]
ric-aux/helm/infrastructure/Chart.yaml [moved from ric-platform/50-RIC-Platform/helm/appmgr/Chart.yaml with 92% similarity]
ric-aux/helm/infrastructure/requirements.yaml [new file with mode: 0644]
ric-aux/helm/infrastructure/subcharts/certificate-manager/Chart.yaml [new file with mode: 0644]
ric-aux/helm/infrastructure/subcharts/certificate-manager/requirements.yaml [moved from ric-aux/80-Auxiliary-Functions/helm/dashboard/requirements.yaml with 96% similarity]
ric-aux/helm/infrastructure/subcharts/certificate-manager/templates/secret.yaml [new file with mode: 0644]
ric-aux/helm/infrastructure/subcharts/certificate-manager/values.yaml [new file with mode: 0644]
ric-aux/helm/infrastructure/subcharts/docker-credential/Chart.yaml [moved from ric-common/Docker-Credential/helm/docker-credential/Chart.yaml with 98% similarity]
ric-aux/helm/infrastructure/subcharts/docker-credential/requirements.yaml [moved from ric-aux/85-Ext-Services/helm/extsvcaux/requirements.yaml with 96% similarity]
ric-aux/helm/infrastructure/subcharts/docker-credential/templates/secrets-docker-reg.yaml [moved from ric-common/Docker-Credential/helm/docker-credential/templates/secrets-docker-reg.yaml with 60% similarity]
ric-aux/helm/infrastructure/subcharts/docker-credential/values.yaml [new file with mode: 0644]
ric-aux/helm/infrastructure/subcharts/extsvcaux/Chart.yaml [moved from ric-aux/85-Ext-Services/helm/extsvcaux/Chart.yaml with 100% similarity]
ric-aux/helm/infrastructure/subcharts/extsvcaux/requirements.yaml [moved from ric-common/Docker-Credential/helm/docker-credential/requirements.yaml with 96% similarity]
ric-aux/helm/infrastructure/subcharts/extsvcaux/templates/services-plt.yaml [moved from ric-aux/85-Ext-Services/helm/extsvcaux/templates/services-ric.yaml with 71% similarity]
ric-aux/helm/infrastructure/subcharts/extsvcaux/values.yaml [moved from ric-platform/55-Ext-Services/helm/extsvcplt/values.yaml with 90% similarity]
ric-aux/helm/infrastructure/subcharts/kong/.helmignore [moved from ric-infra/30-Kong/helm/kong/charts/kong/.helmignore with 100% similarity]
ric-aux/helm/infrastructure/subcharts/kong/Chart.yaml [moved from ric-infra/30-Kong/helm/kong/charts/kong/Chart.yaml with 100% similarity]
ric-aux/helm/infrastructure/subcharts/kong/README.md [moved from ric-infra/30-Kong/helm/kong/charts/kong/README.md with 100% similarity]
ric-aux/helm/infrastructure/subcharts/kong/charts/cassandra/.helmignore [moved from ric-infra/30-Kong/helm/kong/charts/kong/charts/cassandra/.helmignore with 100% similarity]
ric-aux/helm/infrastructure/subcharts/kong/charts/cassandra/Chart.yaml [moved from ric-infra/30-Kong/helm/kong/charts/kong/charts/cassandra/Chart.yaml with 100% similarity]
ric-aux/helm/infrastructure/subcharts/kong/charts/cassandra/README.md [moved from ric-infra/30-Kong/helm/kong/charts/kong/charts/cassandra/README.md with 100% similarity]
ric-aux/helm/infrastructure/subcharts/kong/charts/cassandra/sample/create-storage-gce.yaml [moved from ric-infra/30-Kong/helm/kong/charts/kong/charts/cassandra/sample/create-storage-gce.yaml with 100% similarity]
ric-aux/helm/infrastructure/subcharts/kong/charts/cassandra/templates/NOTES.txt [moved from ric-infra/30-Kong/helm/kong/charts/kong/charts/cassandra/templates/NOTES.txt with 100% similarity]
ric-aux/helm/infrastructure/subcharts/kong/charts/cassandra/templates/_helpers.tpl [moved from ric-infra/30-Kong/helm/kong/charts/kong/charts/cassandra/templates/_helpers.tpl with 100% similarity]
ric-aux/helm/infrastructure/subcharts/kong/charts/cassandra/templates/backup/cronjob.yaml [moved from ric-infra/30-Kong/helm/kong/charts/kong/charts/cassandra/templates/backup/cronjob.yaml with 100% similarity]
ric-aux/helm/infrastructure/subcharts/kong/charts/cassandra/templates/backup/rbac.yaml [moved from ric-infra/30-Kong/helm/kong/charts/kong/charts/cassandra/templates/backup/rbac.yaml with 100% similarity]
ric-aux/helm/infrastructure/subcharts/kong/charts/cassandra/templates/configmap.yaml [moved from ric-infra/30-Kong/helm/kong/charts/kong/charts/cassandra/templates/configmap.yaml with 100% similarity]
ric-aux/helm/infrastructure/subcharts/kong/charts/cassandra/templates/pdb.yaml [moved from ric-infra/30-Kong/helm/kong/charts/kong/charts/cassandra/templates/pdb.yaml with 100% similarity]
ric-aux/helm/infrastructure/subcharts/kong/charts/cassandra/templates/service.yaml [moved from ric-infra/30-Kong/helm/kong/charts/kong/charts/cassandra/templates/service.yaml with 100% similarity]
ric-aux/helm/infrastructure/subcharts/kong/charts/cassandra/templates/statefulset.yaml [moved from ric-infra/30-Kong/helm/kong/charts/kong/charts/cassandra/templates/statefulset.yaml with 100% similarity]
ric-aux/helm/infrastructure/subcharts/kong/charts/cassandra/values.yaml [moved from ric-infra/30-Kong/helm/kong/charts/kong/charts/cassandra/values.yaml with 100% similarity]
ric-aux/helm/infrastructure/subcharts/kong/charts/postgresql/.helmignore [moved from ric-infra/30-Kong/helm/kong/charts/kong/charts/postgresql/.helmignore with 100% similarity]
ric-aux/helm/infrastructure/subcharts/kong/charts/postgresql/Chart.yaml [moved from ric-infra/30-Kong/helm/kong/charts/kong/charts/postgresql/Chart.yaml with 100% similarity]
ric-aux/helm/infrastructure/subcharts/kong/charts/postgresql/README.md [moved from ric-infra/30-Kong/helm/kong/charts/kong/charts/postgresql/README.md with 100% similarity]
ric-aux/helm/infrastructure/subcharts/kong/charts/postgresql/files/README.md [moved from ric-infra/30-Kong/helm/kong/charts/kong/charts/postgresql/files/README.md with 100% similarity]
ric-aux/helm/infrastructure/subcharts/kong/charts/postgresql/files/conf.d/README.md [moved from ric-infra/30-Kong/helm/kong/charts/kong/charts/postgresql/files/conf.d/README.md with 100% similarity]
ric-aux/helm/infrastructure/subcharts/kong/charts/postgresql/files/docker-entrypoint-initdb.d/README.md [moved from ric-infra/30-Kong/helm/kong/charts/kong/charts/postgresql/files/docker-entrypoint-initdb.d/README.md with 100% similarity]
ric-aux/helm/infrastructure/subcharts/kong/charts/postgresql/templates/NOTES.txt [moved from ric-infra/30-Kong/helm/kong/charts/kong/charts/postgresql/templates/NOTES.txt with 100% similarity]
ric-aux/helm/infrastructure/subcharts/kong/charts/postgresql/templates/_helpers.tpl [moved from ric-infra/30-Kong/helm/kong/charts/kong/charts/postgresql/templates/_helpers.tpl with 100% similarity]
ric-aux/helm/infrastructure/subcharts/kong/charts/postgresql/templates/configmap.yaml [moved from ric-infra/30-Kong/helm/kong/charts/kong/charts/postgresql/templates/configmap.yaml with 100% similarity]
ric-aux/helm/infrastructure/subcharts/kong/charts/postgresql/templates/extended-config-configmap.yaml [moved from ric-infra/30-Kong/helm/kong/charts/kong/charts/postgresql/templates/extended-config-configmap.yaml with 100% similarity]
ric-aux/helm/infrastructure/subcharts/kong/charts/postgresql/templates/initialization-configmap.yaml [moved from ric-infra/30-Kong/helm/kong/charts/kong/charts/postgresql/templates/initialization-configmap.yaml with 100% similarity]
ric-aux/helm/infrastructure/subcharts/kong/charts/postgresql/templates/metrics-svc.yaml [moved from ric-infra/30-Kong/helm/kong/charts/kong/charts/postgresql/templates/metrics-svc.yaml with 100% similarity]
ric-aux/helm/infrastructure/subcharts/kong/charts/postgresql/templates/networkpolicy.yaml [moved from ric-infra/30-Kong/helm/kong/charts/kong/charts/postgresql/templates/networkpolicy.yaml with 100% similarity]
ric-aux/helm/infrastructure/subcharts/kong/charts/postgresql/templates/secrets.yaml [moved from ric-infra/30-Kong/helm/kong/charts/kong/charts/postgresql/templates/secrets.yaml with 100% similarity]
ric-aux/helm/infrastructure/subcharts/kong/charts/postgresql/templates/statefulset-slaves.yaml [moved from ric-infra/30-Kong/helm/kong/charts/kong/charts/postgresql/templates/statefulset-slaves.yaml with 100% similarity]
ric-aux/helm/infrastructure/subcharts/kong/charts/postgresql/templates/statefulset.yaml [moved from ric-infra/30-Kong/helm/kong/charts/kong/charts/postgresql/templates/statefulset.yaml with 100% similarity]
ric-aux/helm/infrastructure/subcharts/kong/charts/postgresql/templates/svc-headless.yaml [moved from ric-infra/30-Kong/helm/kong/charts/kong/charts/postgresql/templates/svc-headless.yaml with 100% similarity]
ric-aux/helm/infrastructure/subcharts/kong/charts/postgresql/templates/svc-read.yaml [moved from ric-infra/30-Kong/helm/kong/charts/kong/charts/postgresql/templates/svc-read.yaml with 100% similarity]
ric-aux/helm/infrastructure/subcharts/kong/charts/postgresql/templates/svc.yaml [moved from ric-infra/30-Kong/helm/kong/charts/kong/charts/postgresql/templates/svc.yaml with 100% similarity]
ric-aux/helm/infrastructure/subcharts/kong/charts/postgresql/values-production.yaml [moved from ric-infra/30-Kong/helm/kong/charts/kong/charts/postgresql/values-production.yaml with 100% similarity]
ric-aux/helm/infrastructure/subcharts/kong/charts/postgresql/values.yaml [moved from ric-infra/30-Kong/helm/kong/charts/kong/charts/postgresql/values.yaml with 100% similarity]
ric-aux/helm/infrastructure/subcharts/kong/ci/cassandra.yaml [moved from ric-infra/30-Kong/helm/kong/charts/kong/ci/cassandra.yaml with 100% similarity]
ric-aux/helm/infrastructure/subcharts/kong/ci/dbless-no-kic-internal-declarative-config-values.yaml [moved from ric-infra/30-Kong/helm/kong/charts/kong/ci/dbless-no-kic-internal-declarative-config-values.yaml with 100% similarity]
ric-aux/helm/infrastructure/subcharts/kong/ci/dbless-no-kic-values.yaml [moved from ric-infra/30-Kong/helm/kong/charts/kong/ci/dbless-no-kic-values.yaml with 100% similarity]
ric-aux/helm/infrastructure/subcharts/kong/ci/dbless-values.yaml [moved from ric-infra/30-Kong/helm/kong/charts/kong/ci/dbless-values.yaml with 100% similarity]
ric-aux/helm/infrastructure/subcharts/kong/ci/default-values.yaml [moved from ric-infra/30-Kong/helm/kong/charts/kong/ci/default-values.yaml with 100% similarity]
ric-aux/helm/infrastructure/subcharts/kong/ci/ingressController-values.yaml [moved from ric-infra/30-Kong/helm/kong/charts/kong/ci/ingressController-values.yaml with 100% similarity]
ric-aux/helm/infrastructure/subcharts/kong/ci/loadbalancer-values.yaml [moved from ric-infra/30-Kong/helm/kong/charts/kong/ci/loadbalancer-values.yaml with 100% similarity]
ric-aux/helm/infrastructure/subcharts/kong/requirements.yaml [moved from ric-infra/30-Kong/helm/kong/charts/kong/requirements.yaml with 100% similarity]
ric-aux/helm/infrastructure/subcharts/kong/templates/NOTES.txt [moved from ric-infra/30-Kong/helm/kong/charts/kong/templates/NOTES.txt with 100% similarity]
ric-aux/helm/infrastructure/subcharts/kong/templates/_helpers.tpl [moved from ric-infra/30-Kong/helm/kong/charts/kong/templates/_helpers.tpl with 100% similarity]
ric-aux/helm/infrastructure/subcharts/kong/templates/config-custom-server-blocks.yaml [moved from ric-infra/30-Kong/helm/kong/charts/kong/templates/config-custom-server-blocks.yaml with 100% similarity]
ric-aux/helm/infrastructure/subcharts/kong/templates/config-dbless.yaml [moved from ric-infra/30-Kong/helm/kong/charts/kong/templates/config-dbless.yaml with 100% similarity]
ric-aux/helm/infrastructure/subcharts/kong/templates/controller-cluster-role.yaml [moved from ric-infra/30-Kong/helm/kong/charts/kong/templates/controller-cluster-role.yaml with 100% similarity]
ric-aux/helm/infrastructure/subcharts/kong/templates/controller-deployment.yaml [moved from ric-infra/30-Kong/helm/kong/charts/kong/templates/controller-deployment.yaml with 100% similarity]
ric-aux/helm/infrastructure/subcharts/kong/templates/controller-pdb.yaml [moved from ric-infra/30-Kong/helm/kong/charts/kong/templates/controller-pdb.yaml with 100% similarity]
ric-aux/helm/infrastructure/subcharts/kong/templates/controller-rbac-cluster-role-binding.yaml [moved from ric-infra/30-Kong/helm/kong/charts/kong/templates/controller-rbac-cluster-role-binding.yaml with 100% similarity]
ric-aux/helm/infrastructure/subcharts/kong/templates/controller-rbac-role-binding.yaml [moved from ric-infra/30-Kong/helm/kong/charts/kong/templates/controller-rbac-role-binding.yaml with 100% similarity]
ric-aux/helm/infrastructure/subcharts/kong/templates/controller-rbac-role.yaml [moved from ric-infra/30-Kong/helm/kong/charts/kong/templates/controller-rbac-role.yaml with 100% similarity]
ric-aux/helm/infrastructure/subcharts/kong/templates/controller-service-account.yaml [moved from ric-infra/30-Kong/helm/kong/charts/kong/templates/controller-service-account.yaml with 100% similarity]
ric-aux/helm/infrastructure/subcharts/kong/templates/crd-kongconsumer.yaml [moved from ric-infra/30-Kong/helm/kong/charts/kong/templates/crd-kongconsumer.yaml with 100% similarity]
ric-aux/helm/infrastructure/subcharts/kong/templates/crd-kongcredential.yaml [moved from ric-infra/30-Kong/helm/kong/charts/kong/templates/crd-kongcredential.yaml with 100% similarity]
ric-aux/helm/infrastructure/subcharts/kong/templates/crd-kongingress.yaml [moved from ric-infra/30-Kong/helm/kong/charts/kong/templates/crd-kongingress.yaml with 100% similarity]
ric-aux/helm/infrastructure/subcharts/kong/templates/crd-kongplugins.yaml [moved from ric-infra/30-Kong/helm/kong/charts/kong/templates/crd-kongplugins.yaml with 100% similarity]
ric-aux/helm/infrastructure/subcharts/kong/templates/deployment.yaml [moved from ric-infra/30-Kong/helm/kong/charts/kong/templates/deployment.yaml with 100% similarity]
ric-aux/helm/infrastructure/subcharts/kong/templates/ingress-admin.yaml [moved from ric-infra/30-Kong/helm/kong/charts/kong/templates/ingress-admin.yaml with 100% similarity]
ric-aux/helm/infrastructure/subcharts/kong/templates/ingress-manager.yaml [moved from ric-infra/30-Kong/helm/kong/charts/kong/templates/ingress-manager.yaml with 100% similarity]
ric-aux/helm/infrastructure/subcharts/kong/templates/ingress-portal-api.yaml [moved from ric-infra/30-Kong/helm/kong/charts/kong/templates/ingress-portal-api.yaml with 100% similarity]
ric-aux/helm/infrastructure/subcharts/kong/templates/ingress-portal.yaml [moved from ric-infra/30-Kong/helm/kong/charts/kong/templates/ingress-portal.yaml with 100% similarity]
ric-aux/helm/infrastructure/subcharts/kong/templates/ingress-proxy.yaml [moved from ric-infra/30-Kong/helm/kong/charts/kong/templates/ingress-proxy.yaml with 100% similarity]
ric-aux/helm/infrastructure/subcharts/kong/templates/migrations-post-upgrade.yaml [moved from ric-infra/30-Kong/helm/kong/charts/kong/templates/migrations-post-upgrade.yaml with 100% similarity]
ric-aux/helm/infrastructure/subcharts/kong/templates/migrations-pre-upgrade.yaml [moved from ric-infra/30-Kong/helm/kong/charts/kong/templates/migrations-pre-upgrade.yaml with 100% similarity]
ric-aux/helm/infrastructure/subcharts/kong/templates/migrations.yaml [moved from ric-infra/30-Kong/helm/kong/charts/kong/templates/migrations.yaml with 100% similarity]
ric-aux/helm/infrastructure/subcharts/kong/templates/pdb.yaml [moved from ric-infra/30-Kong/helm/kong/charts/kong/templates/pdb.yaml with 100% similarity]
ric-aux/helm/infrastructure/subcharts/kong/templates/service-kong-admin.yaml [moved from ric-infra/30-Kong/helm/kong/charts/kong/templates/service-kong-admin.yaml with 100% similarity]
ric-aux/helm/infrastructure/subcharts/kong/templates/service-kong-manager.yaml [moved from ric-infra/30-Kong/helm/kong/charts/kong/templates/service-kong-manager.yaml with 100% similarity]
ric-aux/helm/infrastructure/subcharts/kong/templates/service-kong-portal-api.yaml [moved from ric-infra/30-Kong/helm/kong/charts/kong/templates/service-kong-portal-api.yaml with 100% similarity]
ric-aux/helm/infrastructure/subcharts/kong/templates/service-kong-portal.yaml [moved from ric-infra/30-Kong/helm/kong/charts/kong/templates/service-kong-portal.yaml with 100% similarity]
ric-aux/helm/infrastructure/subcharts/kong/templates/service-kong-proxy.yaml [moved from ric-infra/30-Kong/helm/kong/charts/kong/templates/service-kong-proxy.yaml with 100% similarity]
ric-aux/helm/infrastructure/subcharts/kong/templates/servicemonitor.yaml [moved from ric-infra/30-Kong/helm/kong/charts/kong/templates/servicemonitor.yaml with 100% similarity]
ric-aux/helm/infrastructure/subcharts/kong/values.yaml [moved from ric-infra/30-Kong/helm/kong/charts/kong/values.yaml with 99% similarity]
ric-aux/helm/infrastructure/values.yaml [moved from ric-infra/30-Kong/helm/kong/values.yaml with 79% similarity]
ric-aux/helm/mc-stack/.helmignore [moved from ric-aux/80-Auxiliary-Functions/helm/mc-stack/.helmignore with 100% similarity]
ric-aux/helm/mc-stack/Chart.yaml [moved from ric-aux/80-Auxiliary-Functions/helm/mc-stack/Chart.yaml with 100% similarity]
ric-aux/helm/mc-stack/charts/elasticsearch/.helmignore [moved from ric-aux/80-Auxiliary-Functions/helm/mc-stack/charts/elasticsearch/.helmignore with 100% similarity]
ric-aux/helm/mc-stack/charts/elasticsearch/Chart.yaml [moved from ric-aux/80-Auxiliary-Functions/helm/mc-stack/charts/elasticsearch/Chart.yaml with 100% similarity]
ric-aux/helm/mc-stack/charts/elasticsearch/Makefile [moved from ric-aux/80-Auxiliary-Functions/helm/mc-stack/charts/elasticsearch/Makefile with 100% similarity]
ric-aux/helm/mc-stack/charts/elasticsearch/README.md [moved from ric-aux/80-Auxiliary-Functions/helm/mc-stack/charts/elasticsearch/README.md with 100% similarity]
ric-aux/helm/mc-stack/charts/elasticsearch/examples/6.x/Makefile [moved from ric-aux/80-Auxiliary-Functions/helm/mc-stack/charts/elasticsearch/examples/6.x/Makefile with 100% similarity]
ric-aux/helm/mc-stack/charts/elasticsearch/examples/6.x/test/goss.yaml [moved from ric-aux/80-Auxiliary-Functions/helm/mc-stack/charts/elasticsearch/examples/6.x/test/goss.yaml with 100% similarity]
ric-aux/helm/mc-stack/charts/elasticsearch/examples/6.x/values.yaml [moved from ric-aux/80-Auxiliary-Functions/helm/mc-stack/charts/elasticsearch/examples/6.x/values.yaml with 100% similarity]
ric-aux/helm/mc-stack/charts/elasticsearch/examples/default/Makefile [moved from ric-aux/80-Auxiliary-Functions/helm/mc-stack/charts/elasticsearch/examples/default/Makefile with 100% similarity]
ric-aux/helm/mc-stack/charts/elasticsearch/examples/default/rolling_upgrade.sh [moved from ric-aux/80-Auxiliary-Functions/helm/mc-stack/charts/elasticsearch/examples/default/rolling_upgrade.sh with 100% similarity]
ric-aux/helm/mc-stack/charts/elasticsearch/examples/default/test/goss.yaml [moved from ric-aux/80-Auxiliary-Functions/helm/mc-stack/charts/elasticsearch/examples/default/test/goss.yaml with 100% similarity]
ric-aux/helm/mc-stack/charts/elasticsearch/examples/docker-for-mac/Makefile [moved from ric-aux/80-Auxiliary-Functions/helm/mc-stack/charts/elasticsearch/examples/docker-for-mac/Makefile with 100% similarity]
ric-aux/helm/mc-stack/charts/elasticsearch/examples/docker-for-mac/values.yaml [moved from ric-aux/80-Auxiliary-Functions/helm/mc-stack/charts/elasticsearch/examples/docker-for-mac/values.yaml with 100% similarity]
ric-aux/helm/mc-stack/charts/elasticsearch/examples/migration/Makefile [moved from ric-aux/80-Auxiliary-Functions/helm/mc-stack/charts/elasticsearch/examples/migration/Makefile with 100% similarity]
ric-aux/helm/mc-stack/charts/elasticsearch/examples/migration/README.md [moved from ric-aux/80-Auxiliary-Functions/helm/mc-stack/charts/elasticsearch/examples/migration/README.md with 100% similarity]
ric-aux/helm/mc-stack/charts/elasticsearch/examples/migration/client.yml [moved from ric-aux/80-Auxiliary-Functions/helm/mc-stack/charts/elasticsearch/examples/migration/client.yml with 100% similarity]
ric-aux/helm/mc-stack/charts/elasticsearch/examples/migration/data.yml [moved from ric-aux/80-Auxiliary-Functions/helm/mc-stack/charts/elasticsearch/examples/migration/data.yml with 100% similarity]
ric-aux/helm/mc-stack/charts/elasticsearch/examples/migration/master.yml [moved from ric-aux/80-Auxiliary-Functions/helm/mc-stack/charts/elasticsearch/examples/migration/master.yml with 100% similarity]
ric-aux/helm/mc-stack/charts/elasticsearch/examples/minikube/Makefile [moved from ric-aux/80-Auxiliary-Functions/helm/mc-stack/charts/elasticsearch/examples/minikube/Makefile with 100% similarity]
ric-aux/helm/mc-stack/charts/elasticsearch/examples/minikube/values.yaml [moved from ric-aux/80-Auxiliary-Functions/helm/mc-stack/charts/elasticsearch/examples/minikube/values.yaml with 100% similarity]
ric-aux/helm/mc-stack/charts/elasticsearch/examples/multi/Makefile [moved from ric-aux/80-Auxiliary-Functions/helm/mc-stack/charts/elasticsearch/examples/multi/Makefile with 100% similarity]
ric-aux/helm/mc-stack/charts/elasticsearch/examples/multi/data.yml [moved from ric-aux/80-Auxiliary-Functions/helm/mc-stack/charts/elasticsearch/examples/multi/data.yml with 100% similarity]
ric-aux/helm/mc-stack/charts/elasticsearch/examples/multi/master.yml [moved from ric-aux/80-Auxiliary-Functions/helm/mc-stack/charts/elasticsearch/examples/multi/master.yml with 100% similarity]
ric-aux/helm/mc-stack/charts/elasticsearch/examples/multi/test/goss.yaml [moved from ric-aux/80-Auxiliary-Functions/helm/mc-stack/charts/elasticsearch/examples/multi/test/goss.yaml with 100% similarity]
ric-aux/helm/mc-stack/charts/elasticsearch/examples/oss/Makefile [moved from ric-aux/80-Auxiliary-Functions/helm/mc-stack/charts/elasticsearch/examples/oss/Makefile with 100% similarity]
ric-aux/helm/mc-stack/charts/elasticsearch/examples/oss/test/goss.yaml [moved from ric-aux/80-Auxiliary-Functions/helm/mc-stack/charts/elasticsearch/examples/oss/test/goss.yaml with 100% similarity]
ric-aux/helm/mc-stack/charts/elasticsearch/examples/oss/values.yaml [moved from ric-aux/80-Auxiliary-Functions/helm/mc-stack/charts/elasticsearch/examples/oss/values.yaml with 100% similarity]
ric-aux/helm/mc-stack/charts/elasticsearch/examples/security/Makefile [moved from ric-aux/80-Auxiliary-Functions/helm/mc-stack/charts/elasticsearch/examples/security/Makefile with 100% similarity]
ric-aux/helm/mc-stack/charts/elasticsearch/examples/security/security.yml [moved from ric-aux/80-Auxiliary-Functions/helm/mc-stack/charts/elasticsearch/examples/security/security.yml with 100% similarity]
ric-aux/helm/mc-stack/charts/elasticsearch/examples/security/test/goss.yaml [moved from ric-aux/80-Auxiliary-Functions/helm/mc-stack/charts/elasticsearch/examples/security/test/goss.yaml with 100% similarity]
ric-aux/helm/mc-stack/charts/elasticsearch/examples/upgrade/Makefile [moved from ric-aux/80-Auxiliary-Functions/helm/mc-stack/charts/elasticsearch/examples/upgrade/Makefile with 100% similarity]
ric-aux/helm/mc-stack/charts/elasticsearch/examples/upgrade/test/goss.yaml [moved from ric-aux/80-Auxiliary-Functions/helm/mc-stack/charts/elasticsearch/examples/upgrade/test/goss.yaml with 100% similarity]
ric-aux/helm/mc-stack/charts/elasticsearch/templates/_helpers.tpl [moved from ric-aux/80-Auxiliary-Functions/helm/mc-stack/charts/elasticsearch/templates/_helpers.tpl with 100% similarity]
ric-aux/helm/mc-stack/charts/elasticsearch/templates/configmap.yaml [moved from ric-aux/80-Auxiliary-Functions/helm/mc-stack/charts/elasticsearch/templates/configmap.yaml with 100% similarity]
ric-aux/helm/mc-stack/charts/elasticsearch/templates/ingress.yaml [moved from ric-aux/80-Auxiliary-Functions/helm/mc-stack/charts/elasticsearch/templates/ingress.yaml with 100% similarity]
ric-aux/helm/mc-stack/charts/elasticsearch/templates/poddisruptionbudget.yaml [moved from ric-aux/80-Auxiliary-Functions/helm/mc-stack/charts/elasticsearch/templates/poddisruptionbudget.yaml with 100% similarity]
ric-aux/helm/mc-stack/charts/elasticsearch/templates/service.yaml [moved from ric-aux/80-Auxiliary-Functions/helm/mc-stack/charts/elasticsearch/templates/service.yaml with 100% similarity]
ric-aux/helm/mc-stack/charts/elasticsearch/templates/statefulset.yaml [moved from ric-aux/80-Auxiliary-Functions/helm/mc-stack/charts/elasticsearch/templates/statefulset.yaml with 100% similarity]
ric-aux/helm/mc-stack/charts/elasticsearch/templates/test/test-elasticsearch-health.yaml [moved from ric-aux/80-Auxiliary-Functions/helm/mc-stack/charts/elasticsearch/templates/test/test-elasticsearch-health.yaml with 100% similarity]
ric-aux/helm/mc-stack/charts/elasticsearch/values.yaml [moved from ric-aux/80-Auxiliary-Functions/helm/mc-stack/charts/elasticsearch/values.yaml with 100% similarity]
ric-aux/helm/mc-stack/charts/kibana/.helmignore [moved from ric-aux/80-Auxiliary-Functions/helm/mc-stack/charts/kibana/.helmignore with 100% similarity]
ric-aux/helm/mc-stack/charts/kibana/Chart.yaml [moved from ric-aux/80-Auxiliary-Functions/helm/mc-stack/charts/kibana/Chart.yaml with 100% similarity]
ric-aux/helm/mc-stack/charts/kibana/Makefile [moved from ric-aux/80-Auxiliary-Functions/helm/mc-stack/charts/kibana/Makefile with 100% similarity]
ric-aux/helm/mc-stack/charts/kibana/README.md [moved from ric-aux/80-Auxiliary-Functions/helm/mc-stack/charts/kibana/README.md with 100% similarity]
ric-aux/helm/mc-stack/charts/kibana/examples/6.x/Makefile [moved from ric-aux/80-Auxiliary-Functions/helm/mc-stack/charts/kibana/examples/6.x/Makefile with 100% similarity]
ric-aux/helm/mc-stack/charts/kibana/examples/6.x/test/goss.yaml [moved from ric-aux/80-Auxiliary-Functions/helm/mc-stack/charts/kibana/examples/6.x/test/goss.yaml with 100% similarity]
ric-aux/helm/mc-stack/charts/kibana/examples/6.x/values.yml [moved from ric-aux/80-Auxiliary-Functions/helm/mc-stack/charts/kibana/examples/6.x/values.yml with 100% similarity]
ric-aux/helm/mc-stack/charts/kibana/examples/default/Makefile [moved from ric-aux/80-Auxiliary-Functions/helm/mc-stack/charts/kibana/examples/default/Makefile with 100% similarity]
ric-aux/helm/mc-stack/charts/kibana/examples/default/test/goss.yaml [moved from ric-aux/80-Auxiliary-Functions/helm/mc-stack/charts/kibana/examples/default/test/goss.yaml with 100% similarity]
ric-aux/helm/mc-stack/charts/kibana/examples/oss/Makefile [moved from ric-aux/80-Auxiliary-Functions/helm/mc-stack/charts/kibana/examples/oss/Makefile with 100% similarity]
ric-aux/helm/mc-stack/charts/kibana/examples/oss/test/goss.yaml [moved from ric-aux/80-Auxiliary-Functions/helm/mc-stack/charts/kibana/examples/oss/test/goss.yaml with 100% similarity]
ric-aux/helm/mc-stack/charts/kibana/examples/oss/values.yml [moved from ric-aux/80-Auxiliary-Functions/helm/mc-stack/charts/kibana/examples/oss/values.yml with 100% similarity]
ric-aux/helm/mc-stack/charts/kibana/examples/security/Makefile [moved from ric-aux/80-Auxiliary-Functions/helm/mc-stack/charts/kibana/examples/security/Makefile with 100% similarity]
ric-aux/helm/mc-stack/charts/kibana/examples/security/security.yml [moved from ric-aux/80-Auxiliary-Functions/helm/mc-stack/charts/kibana/examples/security/security.yml with 100% similarity]
ric-aux/helm/mc-stack/charts/kibana/examples/security/test/goss.yaml [moved from ric-aux/80-Auxiliary-Functions/helm/mc-stack/charts/kibana/examples/security/test/goss.yaml with 100% similarity]
ric-aux/helm/mc-stack/charts/kibana/templates/_helpers.tpl [moved from ric-aux/80-Auxiliary-Functions/helm/mc-stack/charts/kibana/templates/_helpers.tpl with 100% similarity]
ric-aux/helm/mc-stack/charts/kibana/templates/configmap.yaml [moved from ric-aux/80-Auxiliary-Functions/helm/mc-stack/charts/kibana/templates/configmap.yaml with 100% similarity]
ric-aux/helm/mc-stack/charts/kibana/templates/deployment.yaml [moved from ric-aux/80-Auxiliary-Functions/helm/mc-stack/charts/kibana/templates/deployment.yaml with 100% similarity]
ric-aux/helm/mc-stack/charts/kibana/templates/ingress.yaml [moved from ric-aux/80-Auxiliary-Functions/helm/mc-stack/charts/kibana/templates/ingress.yaml with 100% similarity]
ric-aux/helm/mc-stack/charts/kibana/templates/service.yaml [moved from ric-aux/80-Auxiliary-Functions/helm/mc-stack/charts/kibana/templates/service.yaml with 100% similarity]
ric-aux/helm/mc-stack/charts/kibana/values.yaml [moved from ric-aux/80-Auxiliary-Functions/helm/mc-stack/charts/kibana/values.yaml with 100% similarity]
ric-aux/helm/mc-stack/charts/logstash/.helmignore [moved from ric-aux/80-Auxiliary-Functions/helm/mc-stack/charts/logstash/.helmignore with 100% similarity]
ric-aux/helm/mc-stack/charts/logstash/Chart.yaml [moved from ric-aux/80-Auxiliary-Functions/helm/mc-stack/charts/logstash/Chart.yaml with 100% similarity]
ric-aux/helm/mc-stack/charts/logstash/OWNERS [moved from ric-aux/80-Auxiliary-Functions/helm/mc-stack/charts/logstash/OWNERS with 100% similarity]
ric-aux/helm/mc-stack/charts/logstash/README.md [moved from ric-aux/80-Auxiliary-Functions/helm/mc-stack/charts/logstash/README.md with 100% similarity]
ric-aux/helm/mc-stack/charts/logstash/templates/NOTES.txt [moved from ric-aux/80-Auxiliary-Functions/helm/mc-stack/charts/logstash/templates/NOTES.txt with 100% similarity]
ric-aux/helm/mc-stack/charts/logstash/templates/_helpers.tpl [moved from ric-aux/80-Auxiliary-Functions/helm/mc-stack/charts/logstash/templates/_helpers.tpl with 100% similarity]
ric-aux/helm/mc-stack/charts/logstash/templates/files-config.yaml [moved from ric-aux/80-Auxiliary-Functions/helm/mc-stack/charts/logstash/templates/files-config.yaml with 100% similarity]
ric-aux/helm/mc-stack/charts/logstash/templates/ingress.yaml [moved from ric-aux/80-Auxiliary-Functions/helm/mc-stack/charts/logstash/templates/ingress.yaml with 100% similarity]
ric-aux/helm/mc-stack/charts/logstash/templates/patterns-config.yaml [moved from ric-aux/80-Auxiliary-Functions/helm/mc-stack/charts/logstash/templates/patterns-config.yaml with 100% similarity]
ric-aux/helm/mc-stack/charts/logstash/templates/pipeline-config.yaml [moved from ric-aux/80-Auxiliary-Functions/helm/mc-stack/charts/logstash/templates/pipeline-config.yaml with 100% similarity]
ric-aux/helm/mc-stack/charts/logstash/templates/poddisruptionbudget.yaml [moved from ric-aux/80-Auxiliary-Functions/helm/mc-stack/charts/logstash/templates/poddisruptionbudget.yaml with 100% similarity]
ric-aux/helm/mc-stack/charts/logstash/templates/service.yaml [moved from ric-aux/80-Auxiliary-Functions/helm/mc-stack/charts/logstash/templates/service.yaml with 100% similarity]
ric-aux/helm/mc-stack/charts/logstash/templates/statefulset.yaml [moved from ric-aux/80-Auxiliary-Functions/helm/mc-stack/charts/logstash/templates/statefulset.yaml with 100% similarity]
ric-aux/helm/mc-stack/charts/logstash/values.yaml [moved from ric-aux/80-Auxiliary-Functions/helm/mc-stack/charts/logstash/values.yaml with 100% similarity]
ric-aux/helm/mc-stack/requirements.yaml [moved from ric-aux/80-Auxiliary-Functions/helm/mc-stack/requirements.yaml with 100% similarity]
ric-aux/helm/mc-stack/values.yaml [moved from ric-aux/80-Auxiliary-Functions/helm/mc-stack/values.yaml with 100% similarity]
ric-aux/helm/message-router/.helmignore [moved from ric-aux/80-Auxiliary-Functions/helm/message-router/.helmignore with 100% similarity]
ric-aux/helm/message-router/Chart.yaml [moved from ric-aux/80-Auxiliary-Functions/helm/message-router/Chart.yaml with 100% similarity]
ric-aux/helm/message-router/charts/message-router-kafka/.helmignore [moved from ric-aux/80-Auxiliary-Functions/helm/message-router/charts/message-router-kafka/.helmignore with 100% similarity]
ric-aux/helm/message-router/charts/message-router-kafka/Chart.yaml [moved from ric-aux/80-Auxiliary-Functions/helm/message-router/charts/message-router-kafka/Chart.yaml with 100% similarity]
ric-aux/helm/message-router/charts/message-router-kafka/templates/poddisruptionbudget.yaml [moved from ric-aux/80-Auxiliary-Functions/helm/message-router/charts/message-router-kafka/templates/poddisruptionbudget.yaml with 100% similarity]
ric-aux/helm/message-router/charts/message-router-kafka/templates/pv.yaml [moved from ric-aux/80-Auxiliary-Functions/helm/message-router/charts/message-router-kafka/templates/pv.yaml with 100% similarity]
ric-aux/helm/message-router/charts/message-router-kafka/templates/service-hs.yaml [moved from ric-aux/80-Auxiliary-Functions/helm/message-router/charts/message-router-kafka/templates/service-hs.yaml with 100% similarity]
ric-aux/helm/message-router/charts/message-router-kafka/templates/service.yaml [moved from ric-aux/80-Auxiliary-Functions/helm/message-router/charts/message-router-kafka/templates/service.yaml with 100% similarity]
ric-aux/helm/message-router/charts/message-router-kafka/templates/statefulset.yaml [moved from ric-aux/80-Auxiliary-Functions/helm/message-router/charts/message-router-kafka/templates/statefulset.yaml with 100% similarity]
ric-aux/helm/message-router/charts/message-router-kafka/values.yaml [moved from ric-aux/80-Auxiliary-Functions/helm/message-router/charts/message-router-kafka/values.yaml with 100% similarity]
ric-aux/helm/message-router/charts/message-router-zookeeper/.helmignore [moved from ric-aux/80-Auxiliary-Functions/helm/message-router/charts/message-router-zookeeper/.helmignore with 100% similarity]
ric-aux/helm/message-router/charts/message-router-zookeeper/Chart.yaml [moved from ric-aux/80-Auxiliary-Functions/helm/message-router/charts/message-router-zookeeper/Chart.yaml with 100% similarity]
ric-aux/helm/message-router/charts/message-router-zookeeper/templates/_zkquorum.tpl [moved from ric-aux/80-Auxiliary-Functions/helm/message-router/charts/message-router-zookeeper/templates/_zkquorum.tpl with 100% similarity]
ric-aux/helm/message-router/charts/message-router-zookeeper/templates/poddisruptionbudget.yaml [moved from ric-aux/80-Auxiliary-Functions/helm/message-router/charts/message-router-zookeeper/templates/poddisruptionbudget.yaml with 100% similarity]
ric-aux/helm/message-router/charts/message-router-zookeeper/templates/pv.yaml [moved from ric-aux/80-Auxiliary-Functions/helm/message-router/charts/message-router-zookeeper/templates/pv.yaml with 100% similarity]
ric-aux/helm/message-router/charts/message-router-zookeeper/templates/service.yaml [moved from ric-aux/80-Auxiliary-Functions/helm/message-router/charts/message-router-zookeeper/templates/service.yaml with 100% similarity]
ric-aux/helm/message-router/charts/message-router-zookeeper/templates/statefulset.yaml [moved from ric-aux/80-Auxiliary-Functions/helm/message-router/charts/message-router-zookeeper/templates/statefulset.yaml with 100% similarity]
ric-aux/helm/message-router/charts/message-router-zookeeper/values.yaml [moved from ric-aux/80-Auxiliary-Functions/helm/message-router/charts/message-router-zookeeper/values.yaml with 100% similarity]
ric-aux/helm/message-router/requirements.yaml [new file with mode: 0755]
ric-aux/helm/message-router/resources/config/dmaap/MsgRtrApi.properties [moved from ric-aux/80-Auxiliary-Functions/helm/message-router/resources/config/dmaap/MsgRtrApi.properties with 100% similarity]
ric-aux/helm/message-router/resources/config/dmaap/cadi.properties [moved from ric-aux/80-Auxiliary-Functions/helm/message-router/resources/config/dmaap/cadi.properties with 100% similarity]
ric-aux/helm/message-router/resources/config/dmaap/mykey [moved from ric-aux/80-Auxiliary-Functions/helm/message-router/resources/config/dmaap/mykey with 100% similarity]
ric-aux/helm/message-router/resources/mr_clusters/san-francisco.json [moved from ric-aux/80-Auxiliary-Functions/helm/message-router/resources/mr_clusters/san-francisco.json with 100% similarity]
ric-aux/helm/message-router/resources/topics/PM_MAPPER.json [moved from ric-aux/80-Auxiliary-Functions/helm/message-router/resources/topics/PM_MAPPER.json with 100% similarity]
ric-aux/helm/message-router/resources/topics/PNF_READY.json [moved from ric-aux/80-Auxiliary-Functions/helm/message-router/resources/topics/PNF_READY.json with 100% similarity]
ric-aux/helm/message-router/resources/topics/PNF_REGISTRATION.json [moved from ric-aux/80-Auxiliary-Functions/helm/message-router/resources/topics/PNF_REGISTRATION.json with 100% similarity]
ric-aux/helm/message-router/resources/topics/README [moved from ric-aux/80-Auxiliary-Functions/helm/message-router/resources/topics/README with 100% similarity]
ric-aux/helm/message-router/resources/topics/mirrormakeragent.json [moved from ric-aux/80-Auxiliary-Functions/helm/message-router/resources/topics/mirrormakeragent.json with 100% similarity]
ric-aux/helm/message-router/templates/configmap.yaml [moved from ric-aux/80-Auxiliary-Functions/helm/message-router/templates/configmap.yaml with 100% similarity]
ric-aux/helm/message-router/templates/secrets.yaml [moved from ric-aux/80-Auxiliary-Functions/helm/message-router/templates/secrets.yaml with 100% similarity]
ric-aux/helm/message-router/templates/service.yaml [moved from ric-aux/80-Auxiliary-Functions/helm/message-router/templates/service.yaml with 100% similarity]
ric-aux/helm/message-router/templates/statefulset.yaml [moved from ric-aux/80-Auxiliary-Functions/helm/message-router/templates/statefulset.yaml with 100% similarity]
ric-aux/helm/message-router/values.yaml [moved from ric-aux/80-Auxiliary-Functions/helm/message-router/values.yaml with 100% similarity]
ric-aux/helm/mrsub/Chart.yaml [moved from ric-aux/80-Auxiliary-Functions/helm/mrsub/Chart.yaml with 100% similarity]
ric-aux/helm/mrsub/resources/mrsub.sh [moved from ric-aux/80-Auxiliary-Functions/helm/mrsub/resources/mrsub.sh with 100% similarity]
ric-aux/helm/mrsub/templates/_helpers.tpl [moved from ric-aux/80-Auxiliary-Functions/helm/mrsub/templates/_helpers.tpl with 100% similarity]
ric-aux/helm/mrsub/templates/configmap-bin.yaml [moved from ric-aux/80-Auxiliary-Functions/helm/mrsub/templates/configmap-bin.yaml with 100% similarity]
ric-aux/helm/mrsub/templates/configmap-env.yaml [moved from ric-aux/80-Auxiliary-Functions/helm/mrsub/templates/configmap-env.yaml with 100% similarity]
ric-aux/helm/mrsub/templates/deployment.yaml [moved from ric-aux/80-Auxiliary-Functions/helm/mrsub/templates/deployment.yaml with 100% similarity]
ric-aux/helm/mrsub/values.yaml [moved from ric-aux/80-Auxiliary-Functions/helm/mrsub/values.yaml with 100% similarity]
ric-aux/helm/portal/.helmignore [moved from ric-aux/80-Auxiliary-Functions/helm/portal/.helmignore with 100% similarity]
ric-aux/helm/portal/Chart.yaml [moved from ric-aux/80-Auxiliary-Functions/helm/portal/Chart.yaml with 100% similarity]
ric-aux/helm/portal/charts/portal-app/.helmignore [moved from ric-aux/80-Auxiliary-Functions/helm/portal/charts/portal-app/.helmignore with 100% similarity]
ric-aux/helm/portal/charts/portal-app/Chart.yaml [moved from ric-aux/80-Auxiliary-Functions/helm/portal/charts/portal-app/Chart.yaml with 100% similarity]
ric-aux/helm/portal/charts/portal-app/resources/certs/keystoreONAPPortal.p12 [moved from ric-aux/80-Auxiliary-Functions/helm/portal/charts/portal-app/resources/certs/keystoreONAPPortal.p12 with 100% similarity]
ric-aux/helm/portal/charts/portal-app/resources/certs/truststoreONAPall.jks [moved from ric-aux/80-Auxiliary-Functions/helm/portal/charts/portal-app/resources/certs/truststoreONAPall.jks with 100% similarity]
ric-aux/helm/portal/charts/portal-app/resources/config/deliveries/properties/ONAPPORTAL/fusion.properties [moved from ric-aux/80-Auxiliary-Functions/helm/portal/charts/portal-app/resources/config/deliveries/properties/ONAPPORTAL/fusion.properties with 100% similarity]
ric-aux/helm/portal/charts/portal-app/resources/config/deliveries/properties/ONAPPORTAL/logback.xml [moved from ric-aux/80-Auxiliary-Functions/helm/portal/charts/portal-app/resources/config/deliveries/properties/ONAPPORTAL/logback.xml with 100% similarity]
ric-aux/helm/portal/charts/portal-app/resources/config/deliveries/properties/ONAPPORTAL/music.properties [moved from ric-aux/80-Auxiliary-Functions/helm/portal/charts/portal-app/resources/config/deliveries/properties/ONAPPORTAL/music.properties with 100% similarity]
ric-aux/helm/portal/charts/portal-app/resources/config/deliveries/properties/ONAPPORTAL/openid-connect.properties [moved from ric-aux/80-Auxiliary-Functions/helm/portal/charts/portal-app/resources/config/deliveries/properties/ONAPPORTAL/openid-connect.properties with 100% similarity]
ric-aux/helm/portal/charts/portal-app/resources/config/deliveries/properties/ONAPPORTAL/portal.properties [moved from ric-aux/80-Auxiliary-Functions/helm/portal/charts/portal-app/resources/config/deliveries/properties/ONAPPORTAL/portal.properties with 100% similarity]
ric-aux/helm/portal/charts/portal-app/resources/config/deliveries/properties/ONAPPORTAL/system.properties [moved from ric-aux/80-Auxiliary-Functions/helm/portal/charts/portal-app/resources/config/deliveries/properties/ONAPPORTAL/system.properties with 100% similarity]
ric-aux/helm/portal/charts/portal-app/resources/server/server.xml [moved from ric-aux/80-Auxiliary-Functions/helm/portal/charts/portal-app/resources/server/server.xml with 100% similarity]
ric-aux/helm/portal/charts/portal-app/templates/NOTES.txt [moved from ric-aux/80-Auxiliary-Functions/helm/portal/charts/portal-app/templates/NOTES.txt with 100% similarity]
ric-aux/helm/portal/charts/portal-app/templates/configmap.yaml [moved from ric-aux/80-Auxiliary-Functions/helm/portal/charts/portal-app/templates/configmap.yaml with 100% similarity]
ric-aux/helm/portal/charts/portal-app/templates/deployment.yaml [moved from ric-aux/80-Auxiliary-Functions/helm/portal/charts/portal-app/templates/deployment.yaml with 100% similarity]
ric-aux/helm/portal/charts/portal-app/templates/secret.yaml [moved from ric-aux/80-Auxiliary-Functions/helm/portal/charts/portal-app/templates/secret.yaml with 100% similarity]
ric-aux/helm/portal/charts/portal-app/templates/service.yaml [moved from ric-aux/80-Auxiliary-Functions/helm/portal/charts/portal-app/templates/service.yaml with 100% similarity]
ric-aux/helm/portal/charts/portal-app/values.yaml [moved from ric-aux/80-Auxiliary-Functions/helm/portal/charts/portal-app/values.yaml with 100% similarity]
ric-aux/helm/portal/charts/portal-cassandra/.helmignore [moved from ric-aux/80-Auxiliary-Functions/helm/portal/charts/portal-cassandra/.helmignore with 100% similarity]
ric-aux/helm/portal/charts/portal-cassandra/Chart.yaml [moved from ric-aux/80-Auxiliary-Functions/helm/portal/charts/portal-cassandra/Chart.yaml with 100% similarity]
ric-aux/helm/portal/charts/portal-cassandra/resources/config/cassandra/docker-entrypoint-initdb.d/portal.cql [moved from ric-aux/80-Auxiliary-Functions/helm/portal/charts/portal-cassandra/resources/config/cassandra/docker-entrypoint-initdb.d/portal.cql with 100% similarity]
ric-aux/helm/portal/charts/portal-cassandra/resources/config/cassandra/docker-entrypoint-initdb.d/portal_single.cql [moved from ric-aux/80-Auxiliary-Functions/helm/portal/charts/portal-cassandra/resources/config/cassandra/docker-entrypoint-initdb.d/portal_single.cql with 100% similarity]
ric-aux/helm/portal/charts/portal-cassandra/resources/config/cassandra/docker-entrypoint-initdb.d/portalsdk.cql [moved from ric-aux/80-Auxiliary-Functions/helm/portal/charts/portal-cassandra/resources/config/cassandra/docker-entrypoint-initdb.d/portalsdk.cql with 100% similarity]
ric-aux/helm/portal/charts/portal-cassandra/templates/NOTES.txt [moved from ric-aux/80-Auxiliary-Functions/helm/portal/charts/portal-cassandra/templates/NOTES.txt with 100% similarity]
ric-aux/helm/portal/charts/portal-cassandra/templates/configmap.yaml [moved from ric-aux/80-Auxiliary-Functions/helm/portal/charts/portal-cassandra/templates/configmap.yaml with 100% similarity]
ric-aux/helm/portal/charts/portal-cassandra/templates/deployment.yaml [moved from ric-aux/80-Auxiliary-Functions/helm/portal/charts/portal-cassandra/templates/deployment.yaml with 100% similarity]
ric-aux/helm/portal/charts/portal-cassandra/templates/pv.yaml [moved from ric-aux/80-Auxiliary-Functions/helm/portal/charts/portal-cassandra/templates/pv.yaml with 100% similarity]
ric-aux/helm/portal/charts/portal-cassandra/templates/pvc.yaml [moved from ric-aux/80-Auxiliary-Functions/helm/portal/charts/portal-cassandra/templates/pvc.yaml with 100% similarity]
ric-aux/helm/portal/charts/portal-cassandra/templates/service.yaml [moved from ric-aux/80-Auxiliary-Functions/helm/portal/charts/portal-cassandra/templates/service.yaml with 100% similarity]
ric-aux/helm/portal/charts/portal-cassandra/values.yaml [moved from ric-aux/80-Auxiliary-Functions/helm/portal/charts/portal-cassandra/values.yaml with 100% similarity]
ric-aux/helm/portal/charts/portal-mariadb/.helmignore [moved from ric-aux/80-Auxiliary-Functions/helm/portal/charts/portal-mariadb/.helmignore with 100% similarity]
ric-aux/helm/portal/charts/portal-mariadb/Chart.yaml [moved from ric-aux/80-Auxiliary-Functions/helm/portal/charts/portal-mariadb/Chart.yaml with 100% similarity]
ric-aux/helm/portal/charts/portal-mariadb/resources/config/mariadb/docker-entrypoint.sh [moved from ric-aux/80-Auxiliary-Functions/helm/portal/charts/portal-mariadb/resources/config/mariadb/docker-entrypoint.sh with 100% similarity]
ric-aux/helm/portal/charts/portal-mariadb/resources/config/mariadb/oom_updates.sql [moved from ric-aux/80-Auxiliary-Functions/helm/portal/charts/portal-mariadb/resources/config/mariadb/oom_updates.sql with 100% similarity]
ric-aux/helm/portal/charts/portal-mariadb/templates/NOTES.txt [moved from ric-aux/80-Auxiliary-Functions/helm/portal/charts/portal-mariadb/templates/NOTES.txt with 100% similarity]
ric-aux/helm/portal/charts/portal-mariadb/templates/configmap.yaml [moved from ric-aux/80-Auxiliary-Functions/helm/portal/charts/portal-mariadb/templates/configmap.yaml with 100% similarity]
ric-aux/helm/portal/charts/portal-mariadb/templates/deployment.yaml [moved from ric-aux/80-Auxiliary-Functions/helm/portal/charts/portal-mariadb/templates/deployment.yaml with 100% similarity]
ric-aux/helm/portal/charts/portal-mariadb/templates/job.yaml [moved from ric-aux/80-Auxiliary-Functions/helm/portal/charts/portal-mariadb/templates/job.yaml with 100% similarity]
ric-aux/helm/portal/charts/portal-mariadb/templates/pv.yaml [moved from ric-aux/80-Auxiliary-Functions/helm/portal/charts/portal-mariadb/templates/pv.yaml with 100% similarity]
ric-aux/helm/portal/charts/portal-mariadb/templates/pvc.yaml [moved from ric-aux/80-Auxiliary-Functions/helm/portal/charts/portal-mariadb/templates/pvc.yaml with 100% similarity]
ric-aux/helm/portal/charts/portal-mariadb/templates/secrets.yaml [moved from ric-aux/80-Auxiliary-Functions/helm/portal/charts/portal-mariadb/templates/secrets.yaml with 100% similarity]
ric-aux/helm/portal/charts/portal-mariadb/templates/service.yaml [moved from ric-aux/80-Auxiliary-Functions/helm/portal/charts/portal-mariadb/templates/service.yaml with 100% similarity]
ric-aux/helm/portal/charts/portal-mariadb/values.yaml [moved from ric-aux/80-Auxiliary-Functions/helm/portal/charts/portal-mariadb/values.yaml with 100% similarity]
ric-aux/helm/portal/charts/portal-zookeeper/.helmignore [moved from ric-aux/80-Auxiliary-Functions/helm/portal/charts/portal-zookeeper/.helmignore with 100% similarity]
ric-aux/helm/portal/charts/portal-zookeeper/Chart.yaml [moved from ric-aux/80-Auxiliary-Functions/helm/portal/charts/portal-zookeeper/Chart.yaml with 100% similarity]
ric-aux/helm/portal/charts/portal-zookeeper/templates/NOTES.txt [moved from ric-aux/80-Auxiliary-Functions/helm/portal/charts/portal-zookeeper/templates/NOTES.txt with 100% similarity]
ric-aux/helm/portal/charts/portal-zookeeper/templates/deployment.yaml [moved from ric-aux/80-Auxiliary-Functions/helm/portal/charts/portal-zookeeper/templates/deployment.yaml with 100% similarity]
ric-aux/helm/portal/charts/portal-zookeeper/templates/service.yaml [moved from ric-aux/80-Auxiliary-Functions/helm/portal/charts/portal-zookeeper/templates/service.yaml with 100% similarity]
ric-aux/helm/portal/charts/portal-zookeeper/values.yaml [moved from ric-aux/80-Auxiliary-Functions/helm/portal/charts/portal-zookeeper/values.yaml with 100% similarity]
ric-aux/helm/portal/requirements.yaml [moved from ric-aux/80-Auxiliary-Functions/helm/portal/requirements.yaml with 90% similarity]
ric-aux/helm/portal/resources/config/log/filebeat/filebeat.yml [moved from ric-aux/80-Auxiliary-Functions/helm/portal/resources/config/log/filebeat/filebeat.yml with 100% similarity]
ric-aux/helm/portal/templates/configmap.yaml [moved from ric-aux/80-Auxiliary-Functions/helm/portal/templates/configmap.yaml with 100% similarity]
ric-aux/helm/portal/values.yaml [moved from ric-aux/80-Auxiliary-Functions/helm/portal/values.yaml with 100% similarity]
ric-aux/helm/ves/.helmignore [moved from ric-aux/80-Auxiliary-Functions/helm/ves/.helmignore with 100% similarity]
ric-aux/helm/ves/Chart.yaml [moved from ric-aux/80-Auxiliary-Functions/helm/ves/Chart.yaml with 100% similarity]
ric-aux/helm/ves/requirements.yaml [new file with mode: 0644]
ric-aux/helm/ves/resources/collector.properties [moved from ric-aux/80-Auxiliary-Functions/helm/ves/resources/collector.properties with 100% similarity]
ric-aux/helm/ves/templates/configmap.yaml [moved from ric-aux/80-Auxiliary-Functions/helm/ves/templates/configmap.yaml with 100% similarity]
ric-aux/helm/ves/templates/ingress-ves.yaml [moved from ric-aux/80-Auxiliary-Functions/helm/ves/templates/ingress-ves.yaml with 100% similarity]
ric-aux/helm/ves/templates/ves-deployment.yaml [moved from ric-aux/80-Auxiliary-Functions/helm/ves/templates/ves-deployment.yaml with 98% similarity]
ric-aux/helm/ves/templates/ves-service.yaml [moved from ric-aux/80-Auxiliary-Functions/helm/ves/templates/ves-service.yaml with 100% similarity]
ric-aux/helm/ves/values.yaml [moved from ric-aux/80-Auxiliary-Functions/helm/ves/values.yaml with 97% similarity]
ric-common/Common-Template/helm/aux-common/Chart.yaml [moved from ric-infra/30-Kong/helm/kong/Chart.yaml with 93% similarity]
ric-common/Common-Template/helm/aux-common/templates/_createPassword.tpl [new file with mode: 0644]
ric-common/Common-Template/helm/aux-common/templates/_ingress.tpl [new file with mode: 0644]
ric-common/Common-Template/helm/aux-common/templates/_mariadb.tpl [new file with mode: 0644]
ric-common/Common-Template/helm/aux-common/templates/_name.tpl [new file with mode: 0644]
ric-common/Common-Template/helm/aux-common/templates/_namespace.tpl [new file with mode: 0644]
ric-common/Common-Template/helm/aux-common/templates/_repository.tpl [new file with mode: 0644]
ric-common/Common-Template/helm/aux-common/templates/_resources.tpl [moved from ric-common/Common-Template/helm/ric-common/templates/_resources.tpl with 51% similarity]
ric-common/Common-Template/helm/aux-common/templates/_secret.yaml [new file with mode: 0644]
ric-common/Common-Template/helm/aux-common/templates/_service.tpl [new file with mode: 0644]
ric-common/Common-Template/helm/aux-common/templates/_storageClass.tpl [new file with mode: 0644]
ric-common/Common-Template/helm/aux-common/values.yaml [moved from ric-platform/50-RIC-Platform/helm/e2term/resources/pizpub.crontab with 85% similarity]
ric-common/Common-Template/helm/ric-common/Chart.yaml
ric-common/Common-Template/helm/ric-common/templates/_a1mediator.tpl [new file with mode: 0644]
ric-common/Common-Template/helm/ric-common/templates/_appmgr.tpl [new file with mode: 0644]
ric-common/Common-Template/helm/ric-common/templates/_chart.tpl
ric-common/Common-Template/helm/ric-common/templates/_configmapname.tpl [deleted file]
ric-common/Common-Template/helm/ric-common/templates/_containername.tpl [deleted file]
ric-common/Common-Template/helm/ric-common/templates/_context_locator.tpl [moved from ric-common/Helm-Credential/helm/helm-credential/templates/_helper.tpl with 71% similarity]
ric-common/Common-Template/helm/ric-common/templates/_dashboard.tpl [new file with mode: 0644]
ric-common/Common-Template/helm/ric-common/templates/_dbaas.tpl [new file with mode: 0644]
ric-common/Common-Template/helm/ric-common/templates/_deploymentname.tpl [deleted file]
ric-common/Common-Template/helm/ric-common/templates/_docker.tpl [new file with mode: 0644]
ric-common/Common-Template/helm/ric-common/templates/_docker_credential_name.tpl [deleted file]
ric-common/Common-Template/helm/ric-common/templates/_dockerregistry.tpl [deleted file]
ric-common/Common-Template/helm/ric-common/templates/_e2mgr.tpl [new file with mode: 0644]
ric-common/Common-Template/helm/ric-common/templates/_e2term.tpl
ric-common/Common-Template/helm/ric-common/templates/_esreader.tpl
ric-common/Common-Template/helm/ric-common/templates/_helm_credential_name.tpl [deleted file]
ric-common/Common-Template/helm/ric-common/templates/_helmrepo.tpl [deleted file]
ric-common/Common-Template/helm/ric-common/templates/_ingress_controller.tpl [new file with mode: 0644]
ric-common/Common-Template/helm/ric-common/templates/_ingresscontroller.tpl [deleted file]
ric-common/Common-Template/helm/ric-common/templates/_ingressname.tpl [deleted file]
ric-common/Common-Template/helm/ric-common/templates/_jaegeradapter.tpl [new file with mode: 0644]
ric-common/Common-Template/helm/ric-common/templates/_kongpath.tpl [deleted file]
ric-common/Common-Template/helm/ric-common/templates/_logstash.tpl
ric-common/Common-Template/helm/ric-common/templates/_messagerouter.tpl [moved from ric-common/Common-Template/helm/ric-common/templates/_message-router.tpl with 75% similarity]
ric-common/Common-Template/helm/ric-common/templates/_mrsub.tpl
ric-common/Common-Template/helm/ric-common/templates/_name.tpl [deleted file]
ric-common/Common-Template/helm/ric-common/templates/_namespace.tpl
ric-common/Common-Template/helm/ric-common/templates/_ports.tpl [deleted file]
ric-common/Common-Template/helm/ric-common/templates/_rsm.tpl [new file with mode: 0644]
ric-common/Common-Template/helm/ric-common/templates/_rtmgr.tpl [new file with mode: 0644]
ric-common/Common-Template/helm/ric-common/templates/_serviceaccountname.tpl [deleted file]
ric-common/Common-Template/helm/ric-common/templates/_servicename.tpl [deleted file]
ric-common/Common-Template/helm/ric-common/templates/_submgr.tpl [new file with mode: 0644]
ric-common/Common-Template/helm/ric-common/templates/_tiller.tpl [moved from ric-common/Common-Template/helm/ric-common/templates/_helmtiller.tpl with 94% similarity]
ric-common/Common-Template/helm/ric-common/templates/_ves.tpl [new file with mode: 0644]
ric-common/Common-Template/helm/ric-common/templates/_vespamgr.tpl [moved from ric-platform/50-RIC-Platform/helm/dbaas1/templates/_helper.tpl with 54% similarity]
ric-common/Docker-Credential/bin/install [deleted file]
ric-common/Docker-Credential/bin/uninstall [deleted file]
ric-common/Docker-Credential/etc/credential.conf [deleted file]
ric-common/Docker-Credential/helm/docker-credential/templates/_helper.tpl [deleted file]
ric-common/Docker-Credential/helm/docker-credential/values.yaml [deleted file]
ric-common/Helm-Credential/bin/install [deleted file]
ric-common/Helm-Credential/bin/uninstall [deleted file]
ric-common/Helm-Credential/etc/credential.conf [deleted file]
ric-common/Helm-Credential/helm/helm-credential/Chart.yaml [deleted file]
ric-common/Helm-Credential/helm/helm-credential/templates/config-helm-cert.yaml [deleted file]
ric-common/Helm-Credential/helm/helm-credential/templates/secrets-helm-xapp.yaml [deleted file]
ric-common/Helm-Credential/helm/helm-credential/values.yaml [deleted file]
ric-dep [new submodule]
ric-infra/15-Chartmuseum/bin/install [deleted file]
ric-infra/15-Chartmuseum/bin/uninstall [deleted file]
ric-infra/15-Chartmuseum/helm/chartmuseum/Chart.yaml [deleted file]
ric-infra/15-Chartmuseum/helm/chartmuseum/requirements.yaml [deleted file]
ric-infra/15-Chartmuseum/helm/chartmuseum/templates/_gen-cert.tpl [deleted file]
ric-infra/15-Chartmuseum/helm/chartmuseum/templates/deployment.yaml [deleted file]
ric-infra/15-Chartmuseum/helm/chartmuseum/templates/env.yaml [deleted file]
ric-infra/15-Chartmuseum/helm/chartmuseum/templates/ingress.yaml [deleted file]
ric-infra/15-Chartmuseum/helm/chartmuseum/templates/job-save-certs.yaml [deleted file]
ric-infra/15-Chartmuseum/helm/chartmuseum/templates/persistentVolume.yaml [deleted file]
ric-infra/15-Chartmuseum/helm/chartmuseum/templates/persistentVolumeClaim.yaml [deleted file]
ric-infra/15-Chartmuseum/helm/chartmuseum/templates/secret.yaml [deleted file]
ric-infra/15-Chartmuseum/helm/chartmuseum/templates/service.yaml [deleted file]
ric-infra/15-Chartmuseum/helm/chartmuseum/values.yaml [deleted file]
ric-infra/20-Monitoring/bin/install [deleted file]
ric-infra/20-Monitoring/bin/uninstall [deleted file]
ric-infra/20-Monitoring/helm/elfkp/.helm/repository/local/index.yaml [deleted file]
ric-infra/20-Monitoring/helm/elfkp/Chart.yaml [deleted file]
ric-infra/20-Monitoring/helm/elfkp/requirements.yaml [deleted file]
ric-infra/20-Monitoring/helm/elfkp/values.yaml [deleted file]
ric-infra/30-Kong/bin/install [deleted file]
ric-infra/30-Kong/bin/uninstall [deleted file]
ric-infra/30-Kong/helm/.helmignore [deleted file]
ric-infra/30-Kong/helm/kong/.helmignore [deleted file]
ric-infra/30-Kong/helm/kong/requirements.yaml [deleted file]
ric-infra/40-Credential/bin/install [deleted file]
ric-infra/40-Credential/bin/uninstall [deleted file]
ric-infra/40-Credential/helm/credential/Chart.yaml [deleted file]
ric-infra/40-Credential/helm/credential/requirements.yaml [deleted file]
ric-infra/40-Credential/helm/credential/templates/_helper.tpl [deleted file]
ric-infra/40-Credential/helm/credential/templates/config-helm-cert.yaml [deleted file]
ric-infra/40-Credential/helm/credential/templates/secrets-docker-reg.yaml [deleted file]
ric-infra/40-Credential/helm/credential/templates/secrets-helm-xapp.yaml [deleted file]
ric-infra/40-Credential/helm/credential/values.yaml [deleted file]
ric-infra/45-Tiller/bin/install [deleted file]
ric-infra/45-Tiller/bin/uninstall [deleted file]
ric-infra/45-Tiller/docker/Dockerfile [deleted file]
ric-infra/45-Tiller/docker/bin/cert-gen.sh [deleted file]
ric-infra/45-Tiller/docker/bin/svcacct-to-kubeconfig.sh [deleted file]
ric-infra/45-Tiller/docker/bin/tls-secrets.sh [deleted file]
ric-infra/45-Tiller/docker/container-tag.yaml [deleted file]
ric-infra/45-Tiller/helm/xapp-tiller/Chart.yaml [deleted file]
ric-infra/45-Tiller/helm/xapp-tiller/requirements.yaml [deleted file]
ric-infra/45-Tiller/helm/xapp-tiller/templates/deployment-tiller.yaml [deleted file]
ric-infra/45-Tiller/helm/xapp-tiller/templates/job-tiller-secrets.yaml [deleted file]
ric-infra/45-Tiller/helm/xapp-tiller/values.yaml [deleted file]
ric-infra/README.md [deleted file]
ric-platform/50-RIC-Platform/bin/install [deleted file]
ric-platform/50-RIC-Platform/bin/uninstall [deleted file]
ric-platform/50-RIC-Platform/helm/a1mediator/.gitignore [deleted file]
ric-platform/50-RIC-Platform/helm/a1mediator/.helmignore [deleted file]
ric-platform/50-RIC-Platform/helm/a1mediator/Chart.yaml [deleted file]
ric-platform/50-RIC-Platform/helm/a1mediator/requirements.yaml [deleted file]
ric-platform/50-RIC-Platform/helm/a1mediator/templates/config.yaml [deleted file]
ric-platform/50-RIC-Platform/helm/a1mediator/templates/deployment.yaml [deleted file]
ric-platform/50-RIC-Platform/helm/a1mediator/templates/env.yaml [deleted file]
ric-platform/50-RIC-Platform/helm/a1mediator/templates/ingress-a1mediator.yaml [deleted file]
ric-platform/50-RIC-Platform/helm/a1mediator/templates/service-http.yaml [deleted file]
ric-platform/50-RIC-Platform/helm/a1mediator/templates/service-rmr.yaml [deleted file]
ric-platform/50-RIC-Platform/helm/a1mediator/values.yaml [deleted file]
ric-platform/50-RIC-Platform/helm/appmgr/.helmignore [deleted file]
ric-platform/50-RIC-Platform/helm/appmgr/requirements.yaml [deleted file]
ric-platform/50-RIC-Platform/helm/appmgr/resources/appmgr.yaml [deleted file]
ric-platform/50-RIC-Platform/helm/appmgr/templates/appconfig.yaml [deleted file]
ric-platform/50-RIC-Platform/helm/appmgr/templates/bin/_appmgr-tiller-secret-copier.sh.tpl [deleted file]
ric-platform/50-RIC-Platform/helm/appmgr/templates/bin/_svcacct-to-kubeconfig.sh.tpl [deleted file]
ric-platform/50-RIC-Platform/helm/appmgr/templates/configmap-bin.yaml [deleted file]
ric-platform/50-RIC-Platform/helm/appmgr/templates/deployment.yaml [deleted file]
ric-platform/50-RIC-Platform/helm/appmgr/templates/env.yaml [deleted file]
ric-platform/50-RIC-Platform/helm/appmgr/templates/ingress-appmgr.yaml [deleted file]
ric-platform/50-RIC-Platform/helm/appmgr/templates/service-http.yaml [deleted file]
ric-platform/50-RIC-Platform/helm/appmgr/templates/service-rmr.yaml [deleted file]
ric-platform/50-RIC-Platform/helm/appmgr/templates/serviceaccount.yaml [deleted file]
ric-platform/50-RIC-Platform/helm/appmgr/values.yaml [deleted file]
ric-platform/50-RIC-Platform/helm/dbaas1/Chart.yaml [deleted file]
ric-platform/50-RIC-Platform/helm/dbaas1/requirements.yaml [deleted file]
ric-platform/50-RIC-Platform/helm/dbaas1/templates/deployment.yaml [deleted file]
ric-platform/50-RIC-Platform/helm/dbaas1/templates/service.yaml [deleted file]
ric-platform/50-RIC-Platform/helm/dbaas1/values.yaml [deleted file]
ric-platform/50-RIC-Platform/helm/e2mgr/Chart.yaml [deleted file]
ric-platform/50-RIC-Platform/helm/e2mgr/requirements.yaml [deleted file]
ric-platform/50-RIC-Platform/helm/e2mgr/templates/configmap.yaml [deleted file]
ric-platform/50-RIC-Platform/helm/e2mgr/templates/deployment.yaml [deleted file]
ric-platform/50-RIC-Platform/helm/e2mgr/templates/env.yaml [deleted file]
ric-platform/50-RIC-Platform/helm/e2mgr/templates/ingress-e2mgr.yaml [deleted file]
ric-platform/50-RIC-Platform/helm/e2mgr/templates/service-http.yaml [deleted file]
ric-platform/50-RIC-Platform/helm/e2mgr/templates/service-rmr.yaml [deleted file]
ric-platform/50-RIC-Platform/helm/e2mgr/values.yaml [deleted file]
ric-platform/50-RIC-Platform/helm/e2term/.helmignore [deleted file]
ric-platform/50-RIC-Platform/helm/e2term/Chart.yaml [deleted file]
ric-platform/50-RIC-Platform/helm/e2term/requirements.yaml [deleted file]
ric-platform/50-RIC-Platform/helm/e2term/resources/cleaner.sh [deleted file]
ric-platform/50-RIC-Platform/helm/e2term/resources/configfile.properties [deleted file]
ric-platform/50-RIC-Platform/helm/e2term/templates/configmap-pizpub.yaml [deleted file]
ric-platform/50-RIC-Platform/helm/e2term/templates/configmap.yaml [deleted file]
ric-platform/50-RIC-Platform/helm/e2term/templates/deployment.yaml [deleted file]
ric-platform/50-RIC-Platform/helm/e2term/templates/e2term-pv.yaml [deleted file]
ric-platform/50-RIC-Platform/helm/e2term/templates/e2term-pvc.yaml [deleted file]
ric-platform/50-RIC-Platform/helm/e2term/templates/env.yaml [deleted file]
ric-platform/50-RIC-Platform/helm/e2term/templates/service-rmr.yaml [deleted file]
ric-platform/50-RIC-Platform/helm/e2term/values.yaml [deleted file]
ric-platform/50-RIC-Platform/helm/jaegeradapter/.helmignore [deleted file]
ric-platform/50-RIC-Platform/helm/jaegeradapter/Chart.yaml [deleted file]
ric-platform/50-RIC-Platform/helm/jaegeradapter/requirements.yaml [deleted file]
ric-platform/50-RIC-Platform/helm/jaegeradapter/templates/agent-service.yaml [deleted file]
ric-platform/50-RIC-Platform/helm/jaegeradapter/templates/collector-service.yaml [deleted file]
ric-platform/50-RIC-Platform/helm/jaegeradapter/templates/deployment.yaml [deleted file]
ric-platform/50-RIC-Platform/helm/jaegeradapter/templates/env.yaml [deleted file]
ric-platform/50-RIC-Platform/helm/jaegeradapter/templates/query-service.yaml [deleted file]
ric-platform/50-RIC-Platform/helm/jaegeradapter/values.yaml [deleted file]
ric-platform/50-RIC-Platform/helm/rsm/Chart.yaml [deleted file]
ric-platform/50-RIC-Platform/helm/rsm/requirements.yaml [deleted file]
ric-platform/50-RIC-Platform/helm/rsm/templates/configmap.yaml [deleted file]
ric-platform/50-RIC-Platform/helm/rsm/templates/deployment.yaml [deleted file]
ric-platform/50-RIC-Platform/helm/rsm/templates/env.yaml [deleted file]
ric-platform/50-RIC-Platform/helm/rsm/templates/ingress-rsm.yaml [deleted file]
ric-platform/50-RIC-Platform/helm/rsm/templates/service-http.yaml [deleted file]
ric-platform/50-RIC-Platform/helm/rsm/templates/service-rmr.yaml [deleted file]
ric-platform/50-RIC-Platform/helm/rsm/values.yaml [deleted file]
ric-platform/50-RIC-Platform/helm/rtmgr/.helmignore [deleted file]
ric-platform/50-RIC-Platform/helm/rtmgr/Chart.yaml [deleted file]
ric-platform/50-RIC-Platform/helm/rtmgr/requirements.yaml [deleted file]
ric-platform/50-RIC-Platform/helm/rtmgr/templates/config.yaml [deleted file]
ric-platform/50-RIC-Platform/helm/rtmgr/templates/deployment.yaml [deleted file]
ric-platform/50-RIC-Platform/helm/rtmgr/templates/env.yaml [deleted file]
ric-platform/50-RIC-Platform/helm/rtmgr/templates/service-http.yaml [deleted file]
ric-platform/50-RIC-Platform/helm/rtmgr/templates/service-rmr.yaml [deleted file]
ric-platform/50-RIC-Platform/helm/rtmgr/values.yaml [deleted file]
ric-platform/50-RIC-Platform/helm/submgr/Chart.yaml [deleted file]
ric-platform/50-RIC-Platform/helm/submgr/requirements.yaml [deleted file]
ric-platform/50-RIC-Platform/helm/submgr/templates/configmap.yaml [deleted file]
ric-platform/50-RIC-Platform/helm/submgr/templates/deployment.yaml [deleted file]
ric-platform/50-RIC-Platform/helm/submgr/templates/env.yaml [deleted file]
ric-platform/50-RIC-Platform/helm/submgr/templates/service-http.yaml [deleted file]
ric-platform/50-RIC-Platform/helm/submgr/templates/service-rmr.yaml [deleted file]
ric-platform/50-RIC-Platform/helm/submgr/values.yaml [deleted file]
ric-platform/50-RIC-Platform/helm/vespamgr/.helmignore [deleted file]
ric-platform/50-RIC-Platform/helm/vespamgr/Chart.yaml [deleted file]
ric-platform/50-RIC-Platform/helm/vespamgr/README [deleted file]
ric-platform/50-RIC-Platform/helm/vespamgr/requirements.yaml [deleted file]
ric-platform/50-RIC-Platform/helm/vespamgr/templates/deployment.yaml [deleted file]
ric-platform/50-RIC-Platform/helm/vespamgr/templates/secret.yaml [deleted file]
ric-platform/50-RIC-Platform/helm/vespamgr/templates/service.yaml [deleted file]
ric-platform/50-RIC-Platform/helm/vespamgr/templates/vespa-config.yaml [deleted file]
ric-platform/50-RIC-Platform/helm/vespamgr/values.yaml [deleted file]
ric-platform/55-Ext-Services/bin/install [deleted file]
ric-platform/55-Ext-Services/bin/uninstall [deleted file]
ric-platform/55-Ext-Services/etc/ext.conf [deleted file]
ric-platform/55-Ext-Services/helm/extsvcplt/Chart.yaml [deleted file]
ric-platform/55-Ext-Services/helm/extsvcplt/requirements.yaml [deleted file]
ric-platform/55-Ext-Services/helm/extsvcplt/templates/services-aux.yaml [deleted file]
ric-platform/README.md [deleted file]
tools/k8s/README.md [moved from ric-infra/00-Kubernetes/README.md with 100% similarity]
tools/k8s/bin/deploy-stack.sh [moved from ric-infra/00-Kubernetes/bin/deploy-stack.sh with 100% similarity]
tools/k8s/bin/gen-cloud-init.sh [moved from ric-infra/00-Kubernetes/bin/gen-cloud-init.sh with 100% similarity]
tools/k8s/bin/gen-ric-heat-yaml.sh [moved from ric-infra/00-Kubernetes/bin/gen-ric-heat-yaml.sh with 100% similarity]
tools/k8s/bin/install [moved from ric-infra/00-Kubernetes/bin/install with 100% similarity]
tools/k8s/bin/undeploy-stack.sh [moved from ric-infra/00-Kubernetes/bin/undeploy-stack.sh with 100% similarity]
tools/k8s/bin/uninstall [moved from ric-infra/00-Kubernetes/bin/uninstall with 100% similarity]
tools/k8s/etc/env.rc [moved from ric-infra/00-Kubernetes/etc/env.rc with 100% similarity]
tools/k8s/etc/infra.rc [moved from ric-infra/00-Kubernetes/etc/infra.rc with 100% similarity]
tools/k8s/etc/openstack.rc [moved from ric-infra/00-Kubernetes/etc/openstack.rc with 100% similarity]
tools/k8s/heat/env/aux.env [moved from ric-infra/00-Kubernetes/heat/env/aux.env with 100% similarity]
tools/k8s/heat/env/ric.env [moved from ric-infra/00-Kubernetes/heat/env/ric.env with 100% similarity]
tools/k8s/heat/parts/part-1-v6.yaml [moved from ric-infra/00-Kubernetes/heat/parts/part-1-v6.yaml with 100% similarity]
tools/k8s/heat/parts/part-1.yaml [moved from ric-infra/00-Kubernetes/heat/parts/part-1.yaml with 100% similarity]
tools/k8s/heat/parts/part-2-v6.yaml [moved from ric-infra/00-Kubernetes/heat/parts/part-2-v6.yaml with 100% similarity]
tools/k8s/heat/parts/part-2.yaml [moved from ric-infra/00-Kubernetes/heat/parts/part-2.yaml with 100% similarity]
tools/k8s/heat/parts/part-3-v6.yaml [moved from ric-infra/00-Kubernetes/heat/parts/part-3-v6.yaml with 100% similarity]
tools/k8s/heat/parts/part-3.yaml [moved from ric-infra/00-Kubernetes/heat/parts/part-3.yaml with 100% similarity]
tools/k8s/heat/scripts/k8s_vm_aux_install.sh [moved from ric-infra/00-Kubernetes/heat/scripts/k8s_vm_aux_install.sh with 100% similarity]
tools/k8s/heat/scripts/k8s_vm_custom_repos.sh [moved from ric-infra/00-Kubernetes/heat/scripts/k8s_vm_custom_repos.sh with 100% similarity]
tools/k8s/heat/scripts/k8s_vm_init.sh [moved from ric-infra/00-Kubernetes/heat/scripts/k8s_vm_init.sh with 100% similarity]
tools/k8s/heat/scripts/k8s_vm_init_serv.sh [moved from ric-infra/00-Kubernetes/heat/scripts/k8s_vm_init_serv.sh with 100% similarity]
tools/k8s/heat/scripts/k8s_vm_install.sh [moved from ric-infra/00-Kubernetes/heat/scripts/k8s_vm_install.sh with 100% similarity]

diff --git a/.gitmodules b/.gitmodules
new file mode 100644 (file)
index 0000000..4d686bd
--- /dev/null
@@ -0,0 +1,3 @@
+[submodule "ric-dep"]
+       path = ric-dep
+       url = https://gerrit.o-ran-sc.org/r/ric-plt/ric-dep
index 8b783c0..14635d8 100644 (file)
@@ -2,4 +2,4 @@
 host=gerrit.o-ran-sc.org
 port=29418
 project=it/dep
-defaultbranch=master
+defaultbranch=r3
index 4f1102f..531ce31 100644 (file)
--- a/README.md
+++ b/README.md
@@ -32,92 +32,43 @@ This repo contains RAN Intelligent Controller (RIC) deployments related files.
 
 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 values.yaml file. If no deployment recipe is provided, default parameters
-are used. The default parameters are set up to deploy a RIC instance using Linux Foundation repositories in a
-self-contained environment. 
+deployment recipe is acting as the helm override values.yaml file. The default parameters are set up to deploy a 
+RIC instance using Linux Foundation repositories in a self-contained environment. 
 
 
 ### Directory Structure
 .
 ├── bin
 ├── ci
-├── etc
+├── docs
 ├── 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 auxilary functions
 ├── ric-common           Deployment scripts, charts and configuration files for RIC common template
-├── 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 organized according to the deployment plans. Each directory contains subdirectories for
-different deployable components. The prefixes of these subdirectories represent the deployment order. The smaller the
-prefix number the eariler the corresponding component will be deployed.  Consider the following example,
-├── ric-aux
-│   ├── 80-Auxiliary-Functions
-│   ├── 85-Ext-Services
-│   └── README.md
-├── ric-infra
-│   ├── 00-Kubernetes
-│   ├── 10-Nexus
-│   ├── 20-Monitoring
-│   ├── 30-Kong
-│   ├── 40-Credential
-│   ├── 45-Tiller
-│   └── README.md
-├── ric-platform
-│   ├── 50-RIC-Platform
-│   ├── 55-Ext-Services
-│   └── README.md
-├── ric-aux
-│   ├── 80-Auxiliary-Functions
-│   ├── 85-Ext-Services
-│   └── README.md
-└── ric-xapps
-    ├── 90-xApps
-    └── README.md
-
-when deploying the ric-platform, the credential is deployed before RIC-Platform.
-
-In each of the component directories, ./bin contains the binary and script files and ./helm contains the helm charts,
-
-Some components contain an ./etc directory with configuration files and some contain a ./docker directory with docker related files for building the docker images.
-
-Please refer to the README.md files in individual directory for more details.
-
-Within ric-infra, ric-platform and ric-aux, each of the components above can be deployed and undeployed separately.
-There are also scripts for deploying the ric-infra, ric-platform or ric-aux in its entirety.
-
-The ./bin directory contains these scripts
-
-The following sections discuss one-script deployment for each
-
-### To deploy RIC Infrastructure
-
-Edit ./RECIPE_EXAMPLE/RIC_INFRA_RECIPE_EXAMPLE
-You can choose whether to enable Kubernetes deployment, Helm Chart museum and ELFKP stack
-You can specify the Helm release prefix and namespaces used
-You must specify username and password for Docker repo
-Then run the following to deploy:
-```sh
-$ . ./deploy-ric-infra -f ../RECIPE_EXAMPLE/RIC_INFRA_RECIPE_EXAMPLE
-```
-Run the following to undeploy:
-```sh
-$ . ./undeploy-ric-infra 
-```
+├── ric-dep              Deployment scripts, charts and configuration files for RIC platform components
+└── tools                Deployment scripts, charts and configuration files for K8S deployment
 
-### To deploy RIC Platform
+The deployment scripts are designed to be modularized. Each submodule is managed independently in other Git repo and they can be deployed and undeployed separately. These submodules are coupled together throught the ric-common template which provides common references to naming convention, settings, and configurations. Currently ric-dep is the submodule for RIC platform deployment, and ric-aux is the submodule for the auxilary functions deployment (currently ric-aux is still managed by it/dep repo). In the future, more submodules can be added without changing the structure.
 
-Edit ./RECIPE_EXAMPLE/RIC_PLATFORM_RECIPE_EXAMPLE
-You can specify the Helm release prefix and namespaces used
+The one-click RIC deployment/undeployment scripts in the ./bin directory will call the deployment/undeployment scripts in the corresponding submodule directory respectively.
+In each of the submodule directories, ./bin contains the binary and script files and ./helm contains the helm charts. For the rest of the non-submodule directories please refer to the README.md files in them for more details. 
+
+
+### Prerequisites
+
+To deploy RIC, you need to have a cluster that runs kubernetes (version > v.1.16.0) and helm (version v2.14.3).
+Tools to install a K8S environment in an openstack cloud can be found in ./tools/k8s.
+Please refer to the README.md file for more details 
+
+### To deploy RIC Platform
+Choose a deployment recipe (e.g, ./RECIPE_EXAMPLE/PLATFORM/amber_example_recipe.yaml)
+Make a copy of the recipe and edit the key:value pairs in it according to your needs
+Make sure that you have the correct docker image registry, name, and tag spcified for all the components.
 Set the values of extsvcaux/ricip and extsvcaux/auxip to be the external IP addresses of VM hosting RIC cluster and VM hosting AUX cluster, respectively.
-These values should be set in both the override file and the local values.yaml file
+Then run the following to deploy:
 ```sh
-$ . ./deploy-ric-platform -f ../RECIPE_EXAMPLE/RIC_PLATFORM_RECIPE_EXAMPLE
+$ . ./deploy-ric-platform -f <PATH_TO_YOUR_MODIFIED_RECIPE>
 ```
 Run the following to undeploy:
 ```sh
@@ -125,13 +76,11 @@ $ . ./undeploy-ric-platform
 ```
 
 ### To deploy RIC Auxiliary functions
-
-Edit ./RECIPE_EXAMPLE/RIC_PLATFORM_RECIPE_EXAMPLE
-You can specify the Helm release prefix and namespaces used
+Choose a deployment recipe (e.g, ./RECIPE_EXAMPLE/AUX/amber_example_recipe.yaml)
+Make a copy of the recipe and edit the key:value pairs in it according to your needs
 Set the values of extsvcaux/ricip and extsvcaux/auxip to be the external IP addresses of VM hosting RIC cluster and VM hosting AUX cluster, respectively.
-These values should be set in both the override file and the local values.yaml file
 ```sh
-$ . ./deploy-ric-aux -f ../RECIPE_EXAMPLE/RIC_AUX_RECIPE_EXAMPLE
+$ . ./deploy-ric-aux -f <PATH_TO_YOUR_MODIFIED_RECIPE>
 ```
 Run the following to undeploy:
 ```sh
diff --git a/RECIPE_EXAMPLE/AUX b/RECIPE_EXAMPLE/AUX
new file mode 120000 (symlink)
index 0000000..a4ec684
--- /dev/null
@@ -0,0 +1 @@
+../ric-aux/RECIPE_EXAMPLE/
\ No newline at end of file
diff --git a/RECIPE_EXAMPLE/PLATFORM b/RECIPE_EXAMPLE/PLATFORM
new file mode 120000 (symlink)
index 0000000..e82fb53
--- /dev/null
@@ -0,0 +1 @@
+../ric-dep/RECIPE_EXAMPLE
\ No newline at end of file
diff --git a/RECIPE_EXAMPLE/RIC_AUX_RECIPE_EXAMPLE b/RECIPE_EXAMPLE/RIC_AUX_RECIPE_EXAMPLE
deleted file mode 100644 (file)
index 977295e..0000000
+++ /dev/null
@@ -1,241 +0,0 @@
-################################################################################
-#   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:
-  releasePrefix: r1
-  namespace:
-    xapp: ricxapp
-    infra: ricinfra
-    platform: ricplt
-    aux: ricaux
-  # Docker registry from which RIC platform components pull the images
-  repository: nexus3.o-ran-sc.org:10004
-  onapRepository: nexus3.onap.org:10001
-  ubuntuInitRepository: registry.hub.docker.com
-  busyBoxRepository: docker.io
-
-  # 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: "http://aux-entry/helm"
-
-  # 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
-
-  # Endpoint of k8s API server
-  k8sAPIHost: https://kubernetes.default.svc.cluster.local/
-
-
-  # The ingress URL definitions for the ingress controller in four namespaces
-  ingressurl:
-    ric: ric-entry
-    aux: aux-entry
-    dashboard: dashboard.ric.org
-  # Change to an unused port prefix range to prevent port conflicts
-  # with other instances running within the same k8s cluster
-  nodePortPrefix: 302
-  nodePortPrefixExt: 304
-
-  # Change this to define portal port used for webpage forwarding
-  portalFEPort: "8443"
-
-  # ONAP Repository
-  # Uncomment the following to enable the use of a single docker
-  # repository but ONLY if your repository mirrors all ONAP
-  # docker images. This includes all images from dockerhub and
-  # any other repository that hosts images for ONAP components.
-  repository: nexus3.onap.org:10001
-  #repositoryCred:
-  #  user: docker
-  #  password: docker
-
-  # readiness check - temporary repo until images migrated to nexus3
-  readinessRepository: oomk8s
-  # logging agent - temporary repo until images migrated to nexus3
-  loggingRepository: docker.elastic.co
-  loggingImage: beats/filebeat:5.5.0
-
-  # image pull policy
-  pullPolicy: Always
-
-
-  portalHostName: "portal.ric.o-ran-sc.org"
-  cookieDomain: "o-ran-sc.org"
-  # default mount path root directory referenced
-  # by persistent volumes and log files
-  persistence:
-    mountPath: /dockerdata-nfs
-    enableDefaultStorageclass: true
-    parameters: {}
-    storageclassProvisioner: kubernetes.io/no-provisioner
-    volumeReclaimPolicy: Retain
-
-  # override default resource limit flavor for all charts
-  flavor: unlimited
-
-  # flag to enable debugging - application support required
-  debugEnabled: false
-
-  aaf:
-    image: onap/aaf/aaf_core:2.1.15
-    config:
-      image: onap/aaf/aaf_config:2.1.15
-    cass:
-      image: onap/aaf/aaf_cass:2.1.15
-
-
-
-#-------------------------------------------------------------------------
-# Auxiliary Functions
-#-------------------------------------------------------------------------
-aaf-sms:
-  image: onap/aaf/sms:4.0.1
-  aaf-sms-quorumclient:
-    image: onap/aaf/smsquorumclient:4.0.0
-  aaf-sms-vault:
-    image:
-      consul: library/consul:1.0.6
-      vault: library/vault:0.10.0
-
-aaf-sshsm:
-  aaf-sshsm-abrmd:
-    image: onap/aaf/abrmd:4.0.0
-  aaf-sshsm-distcenter:
-    image: onap/aaf/distcenter:4.0.0
-  aaf-sshsm-testca:
-    image: onap/aaf/testcaservice:4.0.0
-
-portal-cassandra:
-  image: onap/music/cassandra_music:3.0.0
-portal-mariadb:
-  config:
-    ricdashboardHostName: "dashboard.ric.org"
-    ricdashboardPort: "32443"
-    ricdashboardProtocol: "https"
-  image: onap/portal-db:2.5.0
-portal-app:
-  image: onap/portal-app:2.5.0
-
-persistence:
-  enabled: false
-
-dashboard:
-  # Override the name using the following option
-  # nameOverride:
-  repositoryOverride: nexus3.o-ran-sc.org:10004
-
-  image:
-    name: o-ran-sc/ric-dashboard
-    tag: 1.3.0
-  caasingress:
-    aux:
-      url:
-        prefix: "https://<CAAS_INGRESS_IP>:16443"
-    plt:
-      url:
-        prefix: "https://<CAAS_INGRESS_IP>:16443"
-  cipher:
-    enc:
-      key: AGLDdG4D04BKm2IxIWEr8o==
-  portalapi:
-    # application.properties
-    security: true
-    username: Default
-    password: password
-    ecomp_redirect_url: https://portal.ric.org:8443/ONAPPORTAL/login.htm
-    ecomp_rest_url:     http://portal-app:8989/ONAPPORTAL/auxapi
-    ueb_app_key: uebkey
-  metrics:
-    url:
-      ac: http://mcdashboard.ric.org:5601/goto/1234567890abcdef?embed=true
-      mc: http://mcdashboard.ric.org:5601/goto/b35690798f2a32d065f5107aecd84308?embed=true
-  datapath: /opt/data/dashboard-data
-
-
-
-ves:
-  onapRepository: "nexus3.onap.org:10001"
-
-  image:
-    name: onap/org.onap.dcaegen2.collectors.ves.vescollector
-    tag: 1.4.5
-
-mrsub:
-  image:
-    name: mrsubp
-    tag: 0.0.1
-    pullPolicy: IfNotPresent
-  logStashHost: "r1-mc-stack-logstash.ricaux"
-  logStashPort: 5044
-  messageRouterHost: "ricaux-message-router.ricaux"
-  messageRouterPort: 3904
-
-
-# image settings for dmaap
-onapRepository: nexus3.onap.org:10001
-image: onap/dmaap/dmaap-mr:1.1.13
-ubuntuInitRepository: docker.io
-ubuntuInitImage: oomk8s/ubuntu-init:2.0.0
-busyBoxRepository: docker.io
-busyBoxImage: busybox:1.30
-
-# image settings for dmaap subchart kafka
-message-router-kafka:
-  ubuntuInitRepository: docker.io
-  ubuntuInitImage: oomk8s/ubuntu-init:2.0.0
-  busyBoxRepository: docker.io
-  busyBoxImage: busybox:1.30
-  onapRepository: nexus3.onap.org:10001
-  image: onap/dmaap/kafka111:1.0.0
-# image settings for dmaap subchart zookeeper
-message-router-zookeeper:
-  ubuntuInitRepository: docker.io
-  ubuntuInitImage: oomk8s/ubuntu-init:2.0.0
-  busyBoxRepository: docker.io
-  busyBoxImage: busybox:1.30
-  onapRepository: nexus3.onap.org:10001
-  image: onap/dmaap/zookeeper:5.0.0
-
-# MC Dashboard components
-elasticsearch:
-  enabled: true
-
-kibana:
-  enabled: true
-
-logstash:
-  enabled: true
-# end of MC Dashboard components
-
-
-extsvcaux:
-  ricip:
-    # The ip address of the ric cluster ingress controller
-    10.0.2.100
-  auxip:
-    # The ip address of the aux cluster ingress controller
-    10.0.2.101
diff --git a/RECIPE_EXAMPLE/RIC_INFRA_AUX_RECIPE_EXAMPLE b/RECIPE_EXAMPLE/RIC_INFRA_AUX_RECIPE_EXAMPLE
deleted file mode 100644 (file)
index 91ca0b1..0000000
+++ /dev/null
@@ -1,141 +0,0 @@
-################################################################################
-#   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:
-  releasePrefix: r1
-  namespace:
-    xapp: ricxapp
-  
-    infra: ricinfra
-    platform: ricplt
-    aux: ricaux
-  # Docker registry from which RIC platform components pull the images
-  repository: nexus3.o-ran-sc.org:10004/o-ran-sc
-
-  # 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: "http:////10.0.2.100:32080/helm"
-
-  # 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
-
-
-  # Endpoint of k8s API server
-  k8sAPIHost: https://kubernetes.default.svc.cluster.local/
-
-  # The ingress URL definitions for the ingress controller in four namespaces
-  ingressurl:
-    ric: ric-entry
-    aux: aux-entry
-    dashboard: dashboard-entry
-
-  tillers:
-    ricxapp:
-      name: ricxapp
-      nameSpace: ricxapp
-      deployNameSpace: ricinfra
-      image:
-        tillerTLSSecrets:
-          repository: nexus3.o-ran-sc.org:10004/o-ran-sc
-          name: it-dep-secret
-          tag: 0.0.2
-        tiller:
-          repository: gcr.io
-          name: kubernetes-helm/tiller
-          tag: v2.12.3
-      secret:
-        create: true
-        tillerSecretName: secret-tiller-ricxapp
-        helmSecretName: secret-helm-client-ricxapp
-      tls:
-       authenticate: true
-       verify: true
-      serviceAccount:
-        name: tiller
-        role:
-        - apiGroups: [""]
-          resources: ["pods", "configmaps", "services"]
-          verbs: ["get", "list", "create", "delete"]
-        - apiGroups: ["extensions", "apps"]
-          resources: ["deployments"]
-          verbs: ["get", "list", "create", "delete"]
-      port: 44134
-
-#-------------------------------------------------------------------------
-# Infrastructure
-#-------------------------------------------------------------------------
-
-
-credential:
-  repositoryCredential:
-    user: docker
-    password: docker
-  
-  
-  helmrepoCredential:
-    user: helm
-    password: helm
-
-  helmCertificate: |2
-    -----BEGIN CERTIFICATE-----
-    <CERT FOR HELM>
-    -----END CERTIFICATE-----
-
-k8s:
-  enable: false
-
-chartmuseum:
-  enable: false
-  repositoryOverride: "docker.io"
-  image:
-    name: chartmuseum/chartmuseum
-    tag: v0.8.2
-  job:
-    image:
-      name: alpine
-      tag: latest
-  storagesize: 2Gi
-  datapath: /opt/data/chartmuseum-data
-
-
-elfkp:
-  enable: true
-
-kong:
-  proxy:
-    http:
-      containerPort: 32080
-    tls:
-      containerPort: 32443
-  image:
-    repository: kong
-    tag: 1.3
-  ingressController:
-    image:
-      repository: kong-docker-kubernetes-ingress-controller.bintray.io/kong-ingress-controller
-      tag: 0.6.0
diff --git a/RECIPE_EXAMPLE/RIC_INFRA_RECIPE_EXAMPLE b/RECIPE_EXAMPLE/RIC_INFRA_RECIPE_EXAMPLE
deleted file mode 100644 (file)
index 60c22b2..0000000
+++ /dev/null
@@ -1,141 +0,0 @@
-################################################################################
-#   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:
-  releasePrefix: r1
-  namespace:
-    xapp: ricxapp
-  
-    infra: ricinfra
-    platform: ricplt
-    aux: ricaux
-  # Docker registry from which RIC platform components pull the images
-  repository: nexus3.o-ran-sc.org:10004/o-ran-sc
-
-  # 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: "http://10.0.2.100:32080/helm"
-
-  # 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
-
-
-  # Endpoint of k8s API server
-  k8sAPIHost: https://kubernetes.default.svc.cluster.local/
-
-  # The ingress URL definitions for the ingress controller in four namespaces
-  ingressurl:
-    ric: ric-entry
-    aux: aux-entry
-    dashboard: dashboard-entry
-
-  tillers:
-    ricxapp:
-      name: ricxapp
-      nameSpace: ricxapp
-      deployNameSpace: ricinfra
-      image:
-        tillerTLSSecrets:
-          repository: nexus3.o-ran-sc.org:10004/o-ran-sc
-          name: it-dep-secret
-          tag: 0.0.2
-        tiller:
-          repository: gcr.io
-          name: kubernetes-helm/tiller
-          tag: v2.12.3
-      secret:
-        create: true
-        tillerSecretName: secret-tiller-ricxapp
-        helmSecretName: secret-helm-client-ricxapp
-      tls:
-       authenticate: true
-       verify: true
-      serviceAccount:
-        name: tiller
-        role:
-        - apiGroups: [""]
-          resources: ["pods", "configmaps", "services"]
-          verbs: ["get", "list", "create", "delete"]
-        - apiGroups: ["extensions", "apps"]
-          resources: ["deployments"]
-          verbs: ["get", "list", "create", "delete"]
-      port: 44134
-
-#-------------------------------------------------------------------------
-# Infrastructure
-#-------------------------------------------------------------------------
-
-
-credential:
-  repositoryCredential:
-    user: docker
-    password: docker
-  
-  
-  helmrepoCredential:
-    user: helm
-    password: helm
-
-  helmCertificate: |2
-    -----BEGIN CERTIFICATE-----
-    <CERT FOR HELM>
-    -----END CERTIFICATE-----
-
-k8s:
-  enable: false
-
-chartmuseum:
-  enable: true
-  repositoryOverride: "docker.io"
-  image:
-    name: chartmuseum/chartmuseum
-    tag: v0.8.2
-  job:
-    image:
-      name: alpine
-      tag: latest
-  storagesize: 2Gi
-  datapath: /opt/data/chartmuseum-data
-
-
-elfkp:
-  enable: false
-
-kong:
-  proxy:
-    http:
-      containerPort: 32080
-    tls:
-      containerPort: 32443
-  image:
-    repository: kong
-    tag: 1.3
-  ingressController:
-    image:
-      repository: kong-docker-kubernetes-ingress-controller.bintray.io/kong-ingress-controller
-      tag: 0.6.0
diff --git a/RECIPE_EXAMPLE/RIC_PLATFORM_RECIPE_EXAMPLE b/RECIPE_EXAMPLE/RIC_PLATFORM_RECIPE_EXAMPLE
deleted file mode 100644 (file)
index 63cd42f..0000000
+++ /dev/null
@@ -1,201 +0,0 @@
-################################################################################
-#   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:
-  releasePrefix: r1
-  namespace:
-    xapp: ricxapp
-    infra: ricinfra
-    platform: ricplt
-    aux: ricaux
-  # Docker registry from which RIC platform components pull the images
-  repository: nexus3.o-ran-sc.org:10004/o-ran-sc
-
-  # 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: "http://aux-entry/helm"
-
-  # 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
-
-  # Endpoint of k8s API server
-  k8sAPIHost: https://kubernetes.default.svc.cluster.local/
-
-  # The ingress URL definitions for the ingress controller in four namespaces
-  ingressurl:
-    ric: ric-entry
-    aux: aux-entry
-    dashboard: dashboard-entry
-
-  tillers:
-    ricxapp:
-      name: ricxapp
-      nameSpace: ricxapp
-      deployNameSpace: ricinfra
-      image:
-        tillerTLSSecrets:
-          repository: nexus3.o-ran-sc.org:10004/o-ran-sc
-          name: it-dep-secret
-          tag: 0.0.2
-        tiller:
-          repository: gcr.io
-          name: kubernetes-helm/tiller
-          tag: v2.12.3
-      secret:
-        create: true
-        tillerSecretName: secret-tiller-ricxapp
-        helmSecretName: secret-helm-client-ricxapp
-      tls:
-       authenticate: true
-       verify: true
-      serviceAccount:
-        name: tiller
-        role:
-        - apiGroups: [""]
-          resources: ["pods", "configmaps", "services"]
-          verbs: ["get", "list", "create", "delete"]
-        - apiGroups: ["extensions", "apps"]
-          resources: ["deployments"]
-          verbs: ["get", "list", "create", "delete"]
-      port: 44134
-
-
-#-------------------------------------------------------------------------
-# Platform Components 
-#-------------------------------------------------------------------------
-# A1 Mediator
-a1mediator:
-  # Use the following option to override the docker registry value
-  # repositoryOverride:
-  image:
-    name: ric-plt-a1
-    tag: 1.0.4
-  rmr_timeout_config:
-    rcv_retry_interval_ms: 500
-    rcv_retry_times: 20
-
-# xApp Manager 
-appmgr:
-  # Use the following option to override the docker registry value
-  # repositoryOverride:
-  image:
-    init:
-      name: it-dep-init
-      tag: 0.0.1
-    name: ric-plt-appmgr
-    tag: 0.1.10
-
-
-
-# DBAAS 
-dbaas:
-  # Use the following option to override the docker registry value
-  # repositoryOverride:
-  backend:
-    iterminationGracePeriodSeconds: 0
-    image:
-      name: ric-plt-dbaas
-      tag: 0.2.2
-
-# E2 Manager
-e2mgr:
-  # Use the following option to override the docker registry value
-  # repositoryOverride:
-  image:
-    name: ric-plt-e2mgr
-    tag: 3.0.1
-  env:
-    RIC_ID: "bbbccc-abcd0e/20"
-  privilegedmode: false
-
-
-# E2 Termination
-e2term:
-  # Use the following option to override the docker registry value
-  # repositoryOverride:
-  image:
-    name: ric-plt-e2
-    tag: 3.0.1
-  env:
-    print: "1"
-  privilegedmode: false
-  hostnetworkmode: false
-
-  dataVolSize: 100Mi
-  storageClassName: local-storage
-  #storageClassName: ric-storage-class
-
-# Routing Manager
-rtmgr:
-  # Use the following option to override the docker registry value
-  # repositoryOverride:
-  image:
-    name: ric-plt-rtmgr
-    tag: 0.3.9
-  loglevel: DEBUG
-
-# Subscription Manager
-submgr:
-  # Use the following option to override the docker registry value
-  # repositoryOverride:
-  image:
-    name: ric-plt-submgr
-    tag: 0.10.7
-
-# VESPA Manager
-vespamgr:
-  # Use the following option to override the docker registry value
-  # repositoryOverride:
-  image:
-    name: ric-plt-vespamgr
-    tag: 0.0.8
-  prometheusurl: "http://rec-prometheus-server.default"
-
-# RAN Resource Monitor
-rsm:
-  image:
-    name: ric-plt-resource-status-manager
-    tag: 3.0.1
-
-# Jaeger Adapter
-jaegeradapter:
-  repositoryOverride: docker.io
-  image:
-    name: jaegertracing/all-in-one
-    tag: 1.12
-    pullPolicy: IfNotPresent
-
-
-# the service for redirecting to AUX cluster
-extsvcplt:
-  auxip:
-    # The ip address of the aux cluster ingress controller
-    10.0.2.101
-  ricip:
-    # The ip address of the ric cluster ingress controller
-    10.0.2.100
index c517862..1d8ba53 100755 (executable)
@@ -51,9 +51,28 @@ fi
 
 ROOT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null && pwd )"
 
-for component in $ROOT_DIR/../ric-aux/*/; do
-    # Will print */ if no directories are available
-    . $component/bin/install -f $OVERRIDEYAML
+# Start Helm local repo if there isn't one
+HELM_REPO_PID=$(ps -x | grep  "helm serve" | grep -v "grep" | awk '{print $1}')
+if [ -z "$HELM_REPO_PID" ]; then
+    nohup helm serve >& /dev/null &
+fi
+
+# Package ric-common and serve it using Helm local repo
+HELM_HOME=$(helm home)
+COMMON_CHART_VERSION=$(cat $ROOT_DIR/../ric-common/Common-Template/helm/ric-common/Chart.yaml | grep version | awk '{print $2}')
+helm package -d /tmp $ROOT_DIR/../ric-common/Common-Template/helm/ric-common
+cp /tmp/ric-common-$COMMON_CHART_VERSION.tgz $HELM_HOME/repository/local/
+
+AUX_COMMON_CHART_VERSION=$(cat $ROOT_DIR/../ric-common/Common-Template/helm/aux-common/Chart.yaml | grep version | awk '{print $2}')
+helm package -d /tmp $ROOT_DIR/../ric-common/Common-Template/helm/aux-common
+cp /tmp/aux-common-$COMMON_CHART_VERSION.tgz $HELM_HOME/repository/local/
+
+helm repo index $HELM_HOME/repository/local/
+
+
+# Make sure that helm local repo is added
+helm repo remove local
+helm repo add local http://127.0.0.1:8879/charts
 
-done
 
+$ROOT_DIR/../ric-aux/bin/install -f $OVERRIDEYAML
diff --git a/bin/deploy-ric-infra b/bin/deploy-ric-infra
deleted file mode 100755 (executable)
index 14b3ac4..0000000
+++ /dev/null
@@ -1,100 +0,0 @@
-#!/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.                                             #
-################################################################################
-
-if [ "$#" -eq 1 ]; then
-    OVERRIDEYAML=$1
-else
-
-    while [ -n "$1" ]; do # while loop starts
-
-        case "$1" in
-
-        -f) OVERRIDEYAML=$2
-            shift
-            ;;
-        *) echo "Option $1 not recognized" ;; # In case you typed a different option other than a,b,c
-
-        esac
-
-        shift
-
-    done
-fi
-
-
-
-if [ -z "$OVERRIDEYAML" ];then
-    echo "****************************************************************************************************************"
-    echo "                                                     ERROR                                                      "
-    echo "****************************************************************************************************************"
-    echo "RIC deployment without deployment recipe is currently disabled. Please specify an recipe with the -f option."
-    echo "****************************************************************************************************************"
-    exit 1
-fi
-
-
-ROOT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null && pwd )"
-
-
-CHARTMUSEUM_BLOCK=$(cat $OVERRIDEYAML | awk '/^chartmuseum:/{getline; while ($0 ~ /^ +.*|^ *$/) {print $0; if (getline == 0) {break}}}')
-ELFKP_BLOCK=$(cat $OVERRIDEYAML | awk '/^elfkp:/{getline; while ($0 ~ /^ +.*|^ *$/) {print $0; if (getline == 0) {break}}}')
-K8S_BLOCK=$(cat $OVERRIDEYAML | awk '/^k8s:/{getline; while ($0 ~ /^ +.*|^ *$/) {print $0; if (getline == 0) {break}}}')
-ESREADER_BLOCK=$(cat $OVERRIDEYAML | awk '/^esreader:/{getline; while ($0 ~ /^ +.*|^ *$/) {print $0; if (getline == 0) {break}}}')
-
-USE_LOCAL_HELM_REPO=$(echo "$CHARTMUSEUM_BLOCK" | grep "enable" | awk '{print $2}')
-DEPLOY_K8S=$(echo "$K8S_BLOCK" | grep "enable" | awk '{print $2}')
-DEPLOY_K8S_MONITORING=$(echo "$ELFKP_BLOCK" | grep "enable" | awk '{print $2}')
-DEPLOY_ESREADER=$(echo "$ESREADER_BLOCK" | grep "enable" | awk 'NR==1 {print $2}')
-
-
-for component in $ROOT_DIR/../ric-infra/*/; do
-       component_name=$(echo $component | awk '{n=split($0, temp,"/"); print temp[n-1];}')
-
-       case "$component_name" in
-               00-Kubernetes)
-                       if [ "$DEPLOY_K8S" == "true" ];then
-                               . $component/bin/install -f $OVERRIDEYAML
-                       fi
-               ;;
-               15-Chartmuseum)
-                       if [ "$USE_LOCAL_HELM_REPO" == "true" ];then
-                               . $component/bin/install -f $OVERRIDEYAML
-                       fi
-               ;;
-               20-Monitoring)
-                       if [ "$DEPLOY_K8S_MONITORING" == "true" ];then
-                               . $component/bin/install -f $OVERRIDEYAML
-                       fi
-               ;;
-               25-ESReader)
-                       if [ "$DEPLOY_ESREADER" == "true" ];then
-                               . $component/bin/install -f $OVERRIDEYAML
-                       fi
-               ;;
-               30-Kong)
-                        . $component/bin/install -f $OVERRIDEYAML
-                        sleep 5
-                ;;
-               *)
-                   . $component/bin/install -f $OVERRIDEYAML
-       
-       esac
-done
-
-
-
index 0826ba6..1d2f837 100755 (executable)
@@ -52,11 +52,28 @@ fi
 
 ROOT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null && pwd )"
 
-for component in $ROOT_DIR/../ric-platform/*/; do
-    # Will print */ if no directories are available
-    . $component/bin/install -f $OVERRIDEYAML
+# Start Helm local repo if there isn't one
+HELM_REPO_PID=$(ps -x | grep  "helm serve" | grep -v "grep" | awk '{print $1}')
+if [ -z "$HELM_REPO_PID" ]; then
+    nohup helm serve >& /dev/null &
+fi
+
+# Package ric-common and serve it using Helm local repo
+HELM_HOME=$(helm home)
+COMMON_CHART_VERSION=$(cat $ROOT_DIR/../ric-common/Common-Template/helm/ric-common/Chart.yaml | grep version | awk '{print $2}')
+helm package -d /tmp $ROOT_DIR/../ric-common/Common-Template/helm/ric-common
+cp /tmp/ric-common-$COMMON_CHART_VERSION.tgz $HELM_HOME/repository/local/
+helm repo index $HELM_HOME/repository/local/
+
+
+# Make sure that helm local repo is added
+helm repo remove local
+helm repo add local http://127.0.0.1:8879/charts
+
+
+
+$ROOT_DIR/../ric-dep/bin/install -f $OVERRIDEYAML
 
-done
 
 
 
index 30386af..34df424 100755 (executable)
@@ -43,6 +43,29 @@ fi
 
 
 ROOT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null && pwd )"
+
+
+# Start Helm local repo if there isn't one
+HELM_REPO_PID=$(ps -x | grep  "helm serve" | grep -v "grep" | awk '{print $1}')
+if [ -z "$HELM_REPO_PID" ]; then
+    nohup helm serve >& /dev/null &
+fi
+
+# Package ric-common and serve it using Helm local repo
+HELM_HOME=$(helm home)
+COMMON_CHART_VERSION=$(cat $ROOT_DIR/../ric-common/Common-Template/helm/ric-common/Chart.yaml | grep version | awk '{print $2}')
+helm package -d /tmp $ROOT_DIR/../ric-common/Common-Template/helm/ric-common
+cp /tmp/ric-common-$COMMON_CHART_VERSION.tgz $HELM_HOME/repository/local/
+helm repo index $HELM_HOME/repository/local/
+
+
+# Make sure that helm local repo is added
+helm repo remove local
+helm repo add local http://127.0.0.1:8879/charts
+
+
+
+
 TEMP_DIR=/tmp
 rm -rf $TEMP_DIR/imagelist
 touch $TEMP_DIR/imagelist
@@ -51,9 +74,7 @@ while IFS= read -r -d $'\0'; do
     CHART_ARRAY+=("$REPLY")
 done < <(find $ROOT_DIR/../ -name Chart.yaml -printf '%h\0')
 
-rm -fr $TEMP_DIR/ric-common*.tgz
 
-helm package -d $TEMP_DIR $ROOT_DIR/../ric-common/Common-Template/helm/ric-common
 echo "***************************************"
 
 
@@ -61,14 +82,11 @@ echo "***************************************"
 for dir in "${CHART_ARRAY[@]}"
 do
   
-    #rm -rf $dir/charts
-    rm -rf $dir/tmpcharts
     echo "Analyzing Chart $(echo $dir | awk '{n=split($0, a, "/"); print a[n]}')"    
     echo $dir 
-    mkdir -p $dir/charts
-    cp $TEMP_DIR/ric-common*.tgz $dir/charts/
 
-    helm dep up $dir > /dev/null 2>&1
+    #helm dep up $dir > /dev/null 2>&1
+    helm dep up $dir 
     
     IMAGE_ARRAY=$(helm template -f $OVERRIDEYAML $dir | grep "image:" | awk '{ gsub(/.*image: /, "", $0); gsub(/"/, "", $0); print $0}' )
     
index 1fa96dc..fe573f6 100755 (executable)
 
 
 ROOT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null && pwd )"
-
-
-for component in $ROOT_DIR/../ric-aux/*/; do
-    # Will print */ if no directories are available
-    . $component/bin/uninstall
-
-done
-
-
+$ROOT_DIR/../ric-aux/bin/uninstall
diff --git a/bin/undeploy-ric-infra b/bin/undeploy-ric-infra
deleted file mode 100755 (executable)
index 9b2f53d..0000000
+++ /dev/null
@@ -1,31 +0,0 @@
-#!/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
-
-
-ROOT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null && pwd )"
-
-
-for component in $ROOT_DIR/../ric-infra/*/; do
-    # Will print */ if no directories are available
-    . $component/bin/uninstall
-
-done
-
-
index 574baae..a1bebc4 100755 (executable)
 
 ROOT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null && pwd )"
 
-
-for component in $ROOT_DIR/../ric-platform/*/; do
-    # Will print */ if no directories are available
-    . $component/bin/uninstall
-
-done
+$ROOT_DIR/../ric-dep/bin/uninstall
 
 
 
index 2978e8a..3cdbab6 100755 (executable)
 OVERRIDEYAML=$1
 
 ROOT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null && pwd )"
-TEMP_DIR=/tmp
+
+# Start Helm local repo if there isn't one
+HELM_REPO_PID=$(ps -x | grep  "helm serve" | grep -v "grep" | awk '{print $1}')
+if [ -z "$HELM_REPO_PID" ]; then
+    nohup helm serve >& /dev/null &
+fi
+
+# Package ric-common and serve it using Helm local repo
+HELM_HOME=$(helm home)
+COMMON_CHART_VERSION=$(cat $ROOT_DIR/../ric-common/Common-Template/helm/ric-common/Chart.yaml | grep version | awk '{print $2}')
+helm package -d /tmp $ROOT_DIR/../ric-common/Common-Template/helm/ric-common
+cp /tmp/ric-common-$COMMON_CHART_VERSION.tgz $HELM_HOME/repository/local/
+
+AUX_COMMON_CHART_VERSION=$(cat $ROOT_DIR/../ric-common/Common-Template/helm/aux-common/Chart.yaml | grep version | awk '{print $2}')
+helm package -d /tmp $ROOT_DIR/../ric-common/Common-Template/helm/aux-common
+cp /tmp/aux-common-$COMMON_CHART_VERSION.tgz $HELM_HOME/repository/local/
+
+
+
+helm repo index $HELM_HOME/repository/local/
+
+
+# Make sure that helm local repo is added
+helm repo remove local
+helm repo add local http://127.0.0.1:8879/charts
+
+# Create array of helm charts
 CHART_ARRAY=()
 while IFS= read -r -d $'\0'; do
     CHART_ARRAY+=("$REPLY")
-done < <(find $ROOT_DIR/../ -name Chart.yaml -printf '%h\0')
+done < <(find $ROOT_DIR/../ -maxdepth 5 -name Chart.yaml -printf '%h\0')
 
-rm -fr $TEMP_DIR/ric-common*.tgz
-
-helm package -d $TEMP_DIR $ROOT_DIR/../ric-common/Common-Template/helm/ric-common
 echo "***************************************"
 
 
-
 for dir in "${CHART_ARRAY[@]}"
 do
   
-    #rm -rf $dir/charts
-    #rm -rf $dir/tmpcharts
-    mkdir -p $dir/charts
-    cp $TEMP_DIR/ric-common*.tgz $dir/charts/
-
     echo "Update chart depenedency"
     helm dep up $dir 
     # Lint clearly marks errors; e.g., [ERROR]
diff --git a/etc/ric.conf b/etc/ric.conf
deleted file mode 100644 (file)
index 038ae2d..0000000
+++ /dev/null
@@ -1,38 +0,0 @@
-################################################################################
-#   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 ---------------------------------------
-
-# helm_release_name defines the release name helm will use to deploy RIC
-# It will be overrided by RICPLT_RELEASE_NAME
-helm_release_name=r1
-
-# namespace defines the namespace that helm will use to deploy RIC
-# It will be overrided by RICPLT_NAMESPACE
-plt_namespace=ricplt
-
-# namespace defines the namespace that helm will use to deploy RIC
-# It will be overrided by RICXAPP_NAMESPACE
-xapp_namespace=ricxapp
-
-# namespace defines the namespace that helm will use to deploy RIC
-# It will be overrided by RICAUX_NAMESPACE
-aux_namespace=ricaux
-
-# namespace defines the namespace that helm will use to deploy RIC
-# It will be overrided by RICINFRA_NAMESPACE
-infra_namespace=ricinfra
diff --git a/ric-aux/85-Ext-Services/bin/install b/ric-aux/85-Ext-Services/bin/install
deleted file mode 100755 (executable)
index 805950e..0000000
+++ /dev/null
@@ -1,66 +0,0 @@
-#!/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.                                             #
-################################################################################
-
-while [ -n "$1" ]; do # while loop starts
-
-    case "$1" in
-
-    -f) OVERRIDEYAML=$2
-        shift
-        ;;
-    -c) LIST_OF_COMPONENTS=$2
-        shift
-        ;;
-    *) echo "Option $1 not recognized" ;; # In case you typed a different option other than a,b,c
-
-    esac
-
-    shift
-
-done
-
-
-if [ -z "$OVERRIDEYAML" ];then
-    echo "****************************************************************************************************************"
-    echo "                                                     ERROR                                                      "
-    echo "****************************************************************************************************************"
-    echo "RIC deployment without deployment recipe is currently disabled. Please specify an recipe with the -f option."
-    echo "****************************************************************************************************************"
-    exit 1
-fi
-
-DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null && pwd )"
-GLOBAL_BLOCK=$(cat $OVERRIDEYAML | awk '/^global:/{getline; while ($0 ~ /^ +.*|^ *$/) {print $0; if (getline == 0) {break}}}')
-NAMESPACE_BLOCK=$(cat $OVERRIDEYAML | awk '/^  namespace:/{getline; while ($0 ~ /^    .*|^ *$/) {print $0; if (getline == 0) {break}}}')
-NAMESPACE=$(echo "$NAMESPACE_BLOCK" | awk '/^ *aux:/{print $2}')
-RELEASE_PREFIX=$(echo "$GLOBAL_BLOCK" | awk '/^ *releasePrefix:/{print $2}')
-COMPONENTS=${LIST_OF_COMPONENTS:-"extsvcaux"}
-
-echo "Deploying RIC infra components [$COMPONENTS]"
-
-
-COMMON_CHART_VERSION=$(cat $DIR/../../../ric-common/Common-Template/helm/ric-common/Chart.yaml | grep version | awk '{print $2}')
-helm package -d /tmp $DIR/../../../ric-common/Common-Template/helm/ric-common
-
-
-for component in $COMPONENTS; do
-
-  mkdir -p $DIR/../helm/$component/charts/
-  cp /tmp/ric-common-$COMMON_CHART_VERSION.tgz $DIR/../helm/$component/charts/
-  helm install -f $OVERRIDEYAML --namespace "${NAMESPACE}" --name "${RELEASE_PREFIX}-$component" $DIR/../helm/$component
-done
diff --git a/ric-aux/85-Ext-Services/bin/uninstall b/ric-aux/85-Ext-Services/bin/uninstall
deleted file mode 100755 (executable)
index 02cee0e..0000000
+++ /dev/null
@@ -1,30 +0,0 @@
-#!/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.                                             #
-################################################################################
-COMPONENTS="extsvcaux"
-
-echo "Undeploying RIC platform components [$COMPONENTS]"
-
-
-
-for component in $COMPONENTS; do
-    RELEASE_LIST=$(helm list | grep "$component" | awk '{print $1}')
-    if [ ! -z "$RELEASE_LIST" ];then
-        helm delete --purge $RELEASE_LIST
-    fi
-
-done
diff --git a/ric-aux/85-Ext-Services/helm/extsvcaux/values.yaml b/ric-aux/85-Ext-Services/helm/extsvcaux/values.yaml
deleted file mode 100644 (file)
index 1316c12..0000000
+++ /dev/null
@@ -1,21 +0,0 @@
-#   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.                                             #
-################################################################################
-
-extsvcaux:
-  # The IP address of the RIC cluster
-  ricip: "0.0.0.0"
-  # The IP address of the AUX cluster
-  auxip: "0.0.0.0"
\ No newline at end of file
diff --git a/ric-aux/RECIPE_EXAMPLE/amber_example_recipe.yaml b/ric-aux/RECIPE_EXAMPLE/amber_example_recipe.yaml
new file mode 100644 (file)
index 0000000..476a5c5
--- /dev/null
@@ -0,0 +1,146 @@
+################################################################################
+#   Copyright (c) 2019 AT&T Intellectual Property.                             #
+#                                                                              #
+#   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
+#-------------------------------------------------------------------------
+
+common:
+  releasePrefix: r3
+
+# If a local docker registry is used, please specify it using the following option 
+#  localregistry: nexus3.o-ran-sc.org:10004
+
+# Change the overall image pull policy using the following option
+#  pullpolicy: IfNotPresent
+
+# Change the namespaces using the following options
+#  namespace:
+#    aux: ricaux
+#    platform: ricplt
+#    xapp: ricxapp
+#    infra: ricinfra
+
+# ricip should be the ingress controller listening IP for the platform cluster
+# auxip should be the ingress controller listening IP for the AUX cluster
+extsvcaux:
+  ricip: "10.0.0.1"
+  auxip: "10.0.0.1"
+
+
+#Specify the docker registry credential using the following
+docker-credential:
+  enabled: true
+  credential:
+    oran:
+      registry: "nexus3.o-ran-sc.org:10002"
+      credential:
+        user: "docker"
+        password: "docker"
+        email: "@"
+
+
+dashboard:
+  imagePullPolicy: IfNotPresent
+  image:
+    registry: "nexus3.o-ran-sc.org:10002/o-ran-sc"
+    name: ric-dashboard
+    tag: 1.3.0
+  # Many URL prefixes use K8S/Kong service names
+  a1med:
+    url:
+      # The default a1mediator prefix is http://ricplt-entry/a1mediator
+      # You can override the value using the following option
+      # prefix:
+      suffix: ''
+  anrxapp:
+    url:
+      # The default anrxapp prefix is http://ricxapp-entry/anr
+      # You can override the value using the following option
+      # prefix:
+      suffix: ''
+  appmgr:
+    url:
+      # The default appmgr prefix is http://ricplt-entry/appmgr
+      # You can override the value using the following option
+      # prefix:
+      suffix: /ric/v1
+  caasingress:
+    # Ignore SSL problems to CaaS-Ingress by enabling this
+    insecure: true
+    aux:
+      url:
+        # The default AUX CaaS-Ingress prefix is TBD
+        # You can override the value using the following option
+        # prefix:
+        suffix: /api
+    plt:
+      url:
+        # The default PLT CaaS-Ingress prefix is TBD
+        # You can override the value using the following option
+        # prefix:
+        suffix: /api
+  e2mgr:
+    url:
+      # The default e2mgr prefix is http://ricplt-entry/e2mgr
+      # You can override the value using the following option
+      # prefix:
+      suffix: /v1
+  cipher:
+    enc:
+      key:
+  portalapi:
+    security: false
+    appname: RIC-Dashboard
+    username: Default
+    password: password
+    ecomp_redirect_url: https://portal.api.simpledemo.onap.org:30225/ONAPPORTAL/login.htm
+    ecomp_rest_url: http://portal-app:8989/ONAPPORTAL/auxapi
+    ueb_app_key: uebkey
+  metrics:
+    url:
+      ac: http://ric-aux-kibana-server:5601/goto/1234567890abcdef?embed=true
+      mc: http://ric-aux-kibana-server:5601/goto/b35690798f2a32d065f5107aecd84308?embed=true
+
+
+portal-mariadb:
+  config:
+    ricdashboardHostName: "dashboard.ricaux.svc.cluster.local"
+    ricdashboardPort: "32443"
+    ricdashboardProtocol: "https"
+
+mrsub:
+  logStashHost: "r1-mc-stack-logstash.ricaux"
+  logStashPort: 5044
+  messageRouterHost: "ricaux-message-router.ricaux"
+  messageRouterPort: 3904
+
+elasticsearch:
+  enabled: true
+
+kibana:
+  enabled: true
+  elasticsearchHosts: "http://elasticsearch-master.ricaux.svc.cluster.local:9200"
+#  serverHost: "172.25.188.62"
+  service:
+    type: "NodePort"
+    nodePort: 30081
+
+logstash:
+  enabled: true
+  elasticsearch:
+    host: "elasticsearch-master.ricaux.svc.cluster.local"
+    port: 9200
similarity index 55%
rename from ric-aux/80-Auxiliary-Functions/bin/install
rename to ric-aux/bin/install
index b10b044..360b32b 100755 (executable)
@@ -45,18 +45,45 @@ if [ -z "$OVERRIDEYAML" ];then
     exit 1
 fi
 
+
+HAS_RIC_COMMON_PACKAGE=$(helm search local/ric-common | grep ric-common)
+
+if [ -z "$HAS_RIC_COMMON_PACKAGE" ];then
+    echo "****************************************************************************************************************"
+    echo "                                                     ERROR                                                      "
+    echo "****************************************************************************************************************"
+    echo "Can't locate the ric-common helm package in the local repo. Please make sure that it is properly installed."
+    echo "****************************************************************************************************************"
+    exit 1
+fi
+
+HAS_AUX_COMMON_PACKAGE=$(helm search local/aux-common | grep aux-common)
+
+if [ -z "$HAS_AUX_COMMON_PACKAGE" ];then
+    echo "****************************************************************************************************************"
+    echo "                                                     ERROR                                                      "
+    echo "****************************************************************************************************************"
+    echo "Can't locate the aux-common helm package in the local repo. Please make sure that it is properly installed."
+    echo "****************************************************************************************************************"
+    exit 1
+fi
+
+
+
 DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null && pwd )"
-GLOBAL_BLOCK=$(cat $OVERRIDEYAML | awk '/^global:/{getline; while ($0 ~ /^ +.*|^ *$/) {print $0; if (getline == 0) {break}}}')
+
+COMMON_BLOCK=$(cat $OVERRIDEYAML | awk '/^common:/{getline; while ($0 ~ /^ +.*|^ *$/) {print $0; if (getline == 0) {break}}}')
 NAMESPACE_BLOCK=$(cat $OVERRIDEYAML | awk '/^  namespace:/{getline; while ($0 ~ /^    .*|^ *$/) {print $0; if (getline == 0) {break}}}')
-NAMESPACE=$(echo "$NAMESPACE_BLOCK" | awk '/^ *aux:/{print $2}')
-RELEASE_PREFIX=$(echo "$GLOBAL_BLOCK" | awk '/^ *releasePrefix:/{print $2}')
-COMPONENTS=${LIST_OF_COMPONENTS:-"dashboard ves message-router mrsub mc-stack portal aaf"}
+AUXNAMESPACE=$(echo "$NAMESPACE_BLOCK" | awk '/^ *aux:/{print $2}')
+INFRANAMESPACE=$(echo "$NAMESPACE_BLOCK" | awk '/^ *infra:/{print $2}')
+RELEASE_PREFIX=$(echo "$COMMON_BLOCK" | awk '/^ *releasePrefix:/{print $2}')
+COMPONENTS=${LIST_OF_COMPONENTS:-"infrastructure dashboard ves message-router mrsub mc-stack portal aaf"}
 
 
 NODENAME=$(kubectl get node | awk 'NR>1{print $1}')
 LABELFOUND=false
 for f in $NODENAME; do
-    LABEL=$(kubectl describe node $f | grep local-storage)
+    LABEL=$(kubectl describe node $f | grep "local-storage=enable")
     if [ ! -z "$LABEL" ]; then
         LABELFOUND=true
     fi
@@ -105,26 +132,51 @@ if [ -z "$FOUND_STORAGECLASS" ] && $LABELFOUND; then
 
 fi
 
-echo "Deploying RIC infra components [$COMPONENTS]"
 
-COMMON_CHART_VERSION=$(cat $DIR/../../../ric-common/Common-Template/helm/ric-common/Chart.yaml | grep version | awk '{print $2}')
-helm package -d /tmp $DIR/../../../ric-common/Common-Template/helm/ric-common
+if ! kubectl get ns ${AUXNAMESPACE:-ricaux}> /dev/null 2>&1; then
+    kubectl create ns ${AUXNAMESPACE:-ricaux}
+fi
+if ! kubectl get ns ${INFRANAMESPACE:-ricinfra}> /dev/null 2>&1; then
+    kubectl create ns ${INFRANAMESPACE:-ricinfra}
+fi
+if ! kubectl get ns onap > /dev/null 2>&1; then
+    kubectl create ns onap
+fi
+
+kubectl create configmap -n ${AUXNAMESPACE:-ricaux} aux-recipe --from-file=recipe=$OVERRIDEYAML
+
+
+echo "Deploying AUX components [$COMPONENTS]"
+
 
 
 for component in $COMPONENTS; do
+    helm dep up $DIR/../helm/$component
     case "$component" in
-            dashboard | ves | message-router | mrsub | mc-stack | portal)
-                mkdir -p $DIR/../helm/$component/charts/
-                cp /tmp/ric-common-$COMMON_CHART_VERSION.tgz $DIR/../helm/$component/charts/
-                helm install -f $OVERRIDEYAML --namespace "${NAMESPACE}" --name "${RELEASE_PREFIX}-$component" $DIR/../helm/$component
-            ;;
             aaf)
-                mkdir -p $DIR/../helm/$component/charts/
-                cp /tmp/ric-common-$COMMON_CHART_VERSION.tgz $DIR/../helm/$component/charts/
-                helm install -f $OVERRIDEYAML --namespace "onap" --name "${RELEASE_PREFIX}-$component" $DIR/../helm/$component
+                NODENAME=$(kubectl get node | awk 'NR>1{print $1}')
+                LABELFOUND=false
+                for f in $NODENAME; do
+                    LABEL=$(kubectl describe node $f | grep "aaf-storage=enable")
+                    if [ ! -z "$LABEL" ]; then
+                        LABELFOUND=true
+                    fi
+                done
+                
+                if  ! $LABELFOUND; then
+                    echo "***********************************************************************************************"
+                    echo "*                                          ERROR!!!!!!!!!!!!!                                 *"
+                    echo "***********************************************************************************************"
+                    echo "* Nodes label \"aaf-storage=enable\" is not found in any of the cluster node.               *"
+                    echo "* Please pick a node and label it using the following command.                                *"
+                    echo "* kubectl label --overwrite nodes <YOUR_NODE_NAME> aaf-storage=enable                       *"
+                    echo "***********************************************************************************************"
+                else
+                   helm install -f $OVERRIDEYAML --namespace "onap" --name "${RELEASE_PREFIX}-$component" $DIR/../helm/$component
+                fi
             ;;
             *)
-                helm install --namespace "${NAMESPACE}" --name "${RELEASE_PREFIX}-$component" $DIR/../helm/$component
+                helm install -f $OVERRIDEYAML --namespace "${AUXNAMESPACE:-ricaux}" --name "${RELEASE_PREFIX}-$component" $DIR/../helm/$component
  
     esac
 
similarity index 56%
rename from ric-aux/80-Auxiliary-Functions/bin/uninstall
rename to ric-aux/bin/uninstall
index 6cb3b3e..50e6d43 100755 (executable)
 ################################################################################
 
 
-COMPONENTS="dashboard message-router ves mrsub mc-stack portal aaf"
+COMPONENTS="dashboard message-router ves mrsub mc-stack portal aaf infrastructure"
+RECIPE_NAMESPACE=$(kubectl get cm --all-namespaces | grep aux-recipe | awk '{print $1}')
+kubectl get configmap  -n $RECIPE_NAMESPACE aux-recipe  -o jsonpath='{.data.recipe}' > /tmp/recipe.yaml
 
-echo "Undeploying RIC aux components [$COMPONENTS]"
+if [ ! -s /tmp/recipe.yaml ]; then
+    echo "AUX recipe is not found. Are you sure the ric platform is deployed successfully?"
+    exit 0
+fi
 
+COMMON_BLOCK=$(cat /tmp/recipe.yaml | awk '/^common:/{getline; while ($0 ~ /^ +.*|^ *$/) {print $0; if (getline == 0) {break}}}')
+NAMESPACE_BLOCK=$(cat /tmp/recipe.yaml | awk '/^  namespace:/{getline; while ($0 ~ /^    .*|^ *$/) {print $0; if (getline == 0) {break}}}')
+AUXNAMESPACE=$(echo "$NAMESPACE_BLOCK" | awk '/^ *aux:/{print $2}')
+INFRANAMESPACE=$(echo "$NAMESPACE_BLOCK" | awk '/^ *infra:/{print $2}')
+RELEASE_PREFIX=$(echo "$COMMON_BLOCK" | awk '/^ *releasePrefix:/{print $2}')
 
+echo "Undeploying AUX components [$COMPONENTS]"
 
-for component in $COMPONENTS; do
-    RELEASE_LIST=$(helm list | grep "$component" | awk '{print $1}')
-    if [ ! -z "$RELEASE_LIST" ];then
-        helm delete --purge $RELEASE_LIST
-    fi
 
+for component in $COMPONENTS; do
+    helm delete --purge ${RELEASE_PREFIX}-$component
 done
+
+kubectl delete cm -n ${AUXNAMESPACE:-ricaux} ricaux-recipe
+
+kubectl delete ns ${INFRANAMESPACE:-ricinfra}
+kubectl delete ns ${AUXNAMESPACE:-ricaux}
+kubectl delete ns onap
similarity index 90%
rename from ric-aux/80-Auxiliary-Functions/helm/aaf/requirements.yaml
rename to ric-aux/helm/aaf/requirements.yaml
index e39a2c3..c640999 100755 (executable)
@@ -13,5 +13,6 @@
 # limitations under the License.
 
 dependencies:
-  - name: ric-common
-    version: ~2.0.0
+  - name: aux-common
+    version: ~3.0.0
+    repository: "@local"
@@ -17,4 +17,5 @@
 
 dependencies:
   - name: ric-common
-    version: ~2.0.0
+    version: ~3.0.0
+    repository: "@local"
@@ -19,9 +19,9 @@ Generate certificates for the docker registry
 */}}
 
 {{- define "dashboard.gen-cert" -}}
-{{- $altNames := list ( include "common.ingressurl.dashboard" . ) -}}
+{{- $altNames := list ( include "common.ingresscontroller.url.dashboard" . ) -}}
 {{- $ca := genCA "docker-registry-ca" 365 -}}
-{{- $cert := genSignedCert ( include "common.ingressurl.dashboard" . ) nil $altNames 365 $ca -}}
+{{- $cert := genSignedCert ( include "common.ingresscontroller.url.dashboard" . ) nil $altNames 365 $ca -}}
 tls.crt: {{ $cert.Cert | b64enc }}
 tls.key: {{ $cert.Key | b64enc }}
 {{- end -}}
@@ -21,7 +21,7 @@ Generate the URLS of the endpoints.
 
 
 {{- define "dashboard.prefix.a1mediator" -}}
-  {{- $ingress := ( include "common.ingressurl.ric" . ) -}}
+  {{- $ingress := ( include "common.ingresscontroller.url.platform" . ) -}}
   {{- if .Values.dashboard.a1med.url.prefix -}}
     {{- printf "%s" .Values.dashboard.a1med.url.prefix -}}
   {{- else -}}
@@ -30,7 +30,7 @@ Generate the URLS of the endpoints.
 {{- end -}}
 
 {{- define "dashboard.prefix.anrxapp" -}}
-  {{- $ingress := ( include "common.ingressurl.ric" . ) -}}
+  {{- $ingress := ( include "common.ingresscontroller.url.platform" . ) -}}
   {{- if .Values.dashboard.anrxapp.url.prefix -}}
     {{- printf "%s" .Values.dashboard.anrxapp.url.prefix -}}
   {{- else -}}
@@ -39,7 +39,7 @@ Generate the URLS of the endpoints.
 {{- end -}}
 
 {{- define "dashboard.prefix.e2mgr" -}}
-  {{- $ingress := ( include "common.ingressurl.ric" . ) -}}
+  {{- $ingress := ( include "common.ingresscontroller.url.platform" . ) -}}
   {{- if .Values.dashboard.e2mgr.url.prefix -}}
     {{- printf "%s" .Values.dashboard.e2mgr.url.prefix -}}
   {{- else -}}
@@ -48,7 +48,7 @@ Generate the URLS of the endpoints.
 {{- end -}}
 
 {{- define "dashboard.prefix.appmgr" -}}
-  {{- $ingress := ( include "common.ingressurl.ric" . ) -}}
+  {{- $ingress := ( include "common.ingresscontroller.url.platform" . ) -}}
   {{- if .Values.dashboard.appmgr.url.prefix -}}
     {{- printf "%s" .Values.dashboard.appmgr.url.prefix -}}
   {{- else -}}
@@ -14,7 +14,8 @@
 #   See the License for the specific language governing permissions and        #
 #   limitations under the License.                                             #
 ################################################################################
-
+{{- $imagectx := dict "ctx" . "defaultregistry" .Values.dashboard.image.registry }}
+{{- $pullpolicyctx := dict "ctx" . "defaultpullpolicy" .Values.dashboard.imagePullPolicy }}
 apiVersion: apps/v1
 kind: Deployment
 metadata:
@@ -39,14 +40,14 @@ spec:
     spec:
       hostname: {{ include "common.name.dashboard" . }}
       imagePullSecrets:
-        - name: {{ include "common.repositoryCred" . }}
+        - name: {{ include "common.dockerregistry.credential" $imagectx }}
       {{- with .Values.dashboard.nodeselector }}
       nodeSelector: {{ toYaml . | trim | nindent 8 -}}
       {{- end }}
       containers:
         - name: {{ include "common.containername.dashboard" . }}
-          image: {{ include "common.repository" . }}/{{ .Values.dashboard.image.name }}:{{ .Values.dashboard.image.tag }}
-          imagePullPolicy: {{ include "common.pullPolicy" . }}
+          image: {{ include "common.dockerregistry.url" $imagectx }}/{{ .Values.dashboard.image.name }}:{{ .Values.dashboard.image.tag }}
+          imagePullPolicy: {{ include "common.dockerregistry.pullpolicy" $pullpolicyctx }}
           ports:
             - name: http
               containerPort: {{ include "common.serviceport.dashboard.container" . }}
@@ -21,10 +21,10 @@ metadata:
 spec:
   tls:
     - hosts:
-      - {{ include "common.ingressurl.dashboard" . }}
+      - {{ include "common.ingresscontroller.url.dashboard" . }}
       secretName: secret-{{ include "common.name.dashboard" . }}
   rules:
-    - host: {{ include "common.ingressurl.dashboard" . }}
+    - host: {{ include "common.ingresscontroller.url.dashboard" . }}
       http:
         paths:
           - backend:
 
 # Deployment values for dashboard.
 
-repository: "nexus3.o-ran-sc.org:10004"
-imagePullPolicy: IfNotPresent
-repositoryCred: docker-reg-cred
 
 dashboard:
+  imagePullPolicy: IfNotPresent
   image:
+    registry: "nexus3.o-ran-sc.org:10002/o-ran-sc"
     name: ric-dashboard
-    tag: 1.2.2
+    tag: 1.3.0
   replicaCount: 1
 
   # Service ports are now defined in
similarity index 92%
rename from ric-platform/50-RIC-Platform/helm/appmgr/Chart.yaml
rename to ric-aux/helm/infrastructure/Chart.yaml
index 11c2f52..4db1920 100644 (file)
@@ -17,6 +17,7 @@
 
 apiVersion: v1
 appVersion: "1.0"
-description: Helm Chart for xAppManager
-name: appmgr
-version: 1.1.0
+description: A Helm chart for setting up k8s env for RIC deployment
+name: infrastructure
+version: 3.0.0
+
diff --git a/ric-aux/helm/infrastructure/requirements.yaml b/ric-aux/helm/infrastructure/requirements.yaml
new file mode 100644 (file)
index 0000000..853e7bf
--- /dev/null
@@ -0,0 +1,37 @@
+################################################################################
+#   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: ric-common
+    version: ~3.0.0
+    repository: "@local"
+  - name: extsvcaux
+    version: 0.2.0
+    repository: "file://subcharts/extsvcaux"
+    condition: extsvcaux.enabled
+  - name: docker-credential
+    version: 1.0.0
+    repository: "file://./subcharts/docker-credential"
+    condition: docker-credential.enabled
+  - name: kong
+    version: 0.17.0
+    repository: "file://./subcharts/kong"
+    condition: kong.enabled
+  - name: certificate-manager
+    version: 0.1.0
+    repository: "file://./subcharts/certificate-manager"
+    condition: certificate-manager.enabled
diff --git a/ric-aux/helm/infrastructure/subcharts/certificate-manager/Chart.yaml b/ric-aux/helm/infrastructure/subcharts/certificate-manager/Chart.yaml
new file mode 100644 (file)
index 0000000..7f93e7d
--- /dev/null
@@ -0,0 +1,5 @@
+apiVersion: v1
+appVersion: "1.0"
+description: Create SSL certificates for RIC
+name: certificate-manager
+version: 0.1.0
diff --git a/ric-aux/helm/infrastructure/subcharts/certificate-manager/templates/secret.yaml b/ric-aux/helm/infrastructure/subcharts/certificate-manager/templates/secret.yaml
new file mode 100644 (file)
index 0000000..f08defd
--- /dev/null
@@ -0,0 +1,68 @@
+################################################################################
+#   Copyright (c) 2019 AT&T Intellectual Property.                             #
+#                                                                              #
+#   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.                                             #
+################################################################################
+{{- $ca := genCA "/C=US/O=O-RAN Alliance/OU=O-RAN Software Community" 9125 -}}
+{{- $pltAltNames := list ( include "common.ingresscontroller.url.platform" . ) -}}
+{{- $auxAltNames := list ( include "common.ingresscontroller.url.aux" . ) -}}
+{{- $pltcert := genSignedCert "/C=US/O=O-RAN Alliance/OU=O-RAN Software Community/CN=RIC-Platform" nil $pltAltNames 9125 $ca -}}
+{{- $auxcert := genSignedCert "/C=US/O=O-RAN Alliance/OU=O-RAN Software Community/CN=helm" nil $auxAltNames 9125 $ca -}}
+
+{{ $auxNameSpace := include "common.namespace.aux" . }}
+{{ $nameSpaceList := list $auxNameSpace }}
+{{- range $nameSpaceList }}
+{{- $namespace := . }}
+---
+apiVersion: v1
+kind: Secret
+metadata:
+  name: secret-ric-ca-cert
+  namespace: {{ $namespace }} 
+data:
+{{- if $.Values.ca.crt }}
+  ca.crt: {{ $.Values.ca.crt | b64enc }}
+{{- else }}
+  ca.crt: {{ $ca.Cert | b64enc }}
+{{- end }}
+
+---
+apiVersion: v1
+kind: Secret
+metadata:
+  name: secret-plt-ingress-cert
+  namespace: {{ $namespace }} 
+data:
+{{- if not ( and $.Values.ingress.plt.crt $.Values.ingress.plt.key ) }}
+  tls.crt: {{ $pltcert.Cert | b64enc }}
+  tls.key: {{ $pltcert.Key | b64enc }}
+{{- else }}
+  tls.crt: {{ $.Values.ingress.plt.crt | b64enc }}
+  tls.key: {{ $.Values.ingress.plt.key | b64enc }}
+{{- end }}
+---
+apiVersion: v1
+kind: Secret
+metadata:
+  name: secret-aux-ingress-cert
+  namespace: {{ $namespace }} 
+data:
+{{- if not ( and $.Values.ingress.aux.crt $.Values.ingress.aux.key ) }}
+  tls.crt: {{ $auxcert.Cert | b64enc }}
+  tls.key: {{ $auxcert.Key | b64enc }}
+{{- else }}
+  tls.crt: {{ $.Values.ingress.aux.crt | b64enc }}
+  tls.key: {{ $.Values.ingress.aux.key | b64enc }}
+{{- end }}
+
+{{- end }}
diff --git a/ric-aux/helm/infrastructure/subcharts/certificate-manager/values.yaml b/ric-aux/helm/infrastructure/subcharts/certificate-manager/values.yaml
new file mode 100644 (file)
index 0000000..b8caa12
--- /dev/null
@@ -0,0 +1,12 @@
+
+ingress:
+  plt:
+    crt: {}
+    key: {}
+  aux:
+    crt: {}
+    key: {}
+
+ca:
+  crt: {}
+  key: {}
@@ -19,4 +19,4 @@ apiVersion: v1
 appVersion: "1.0"
 description: A Helm chart for setting up k8s resources for accessing external and infrastructure resources before RIC deployment"
 name: docker-credential
-version: 1.1.0
+version: 1.0.0
@@ -1,6 +1,5 @@
 ################################################################################
 #   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.           #
 #   See the License for the specific language governing permissions and        #
 #   limitations under the License.                                             #
 ################################################################################
+{{ $auxNameSpace := include "common.namespace.aux" . }}
+{{ $infraNameSpace := include "common.namespace.infra" . }}
+{{ $nameSpaceList := list $auxNameSpace $infraNameSpace }}
+{{- range $nameSpaceList }}
+{{- $namespace := . }}
+{{- range keys $.Values.credential }}
+{{- with index $.Values.credential . }}
+{{- $repo := .registry }}
+{{- $cred := .credential }}
+{{- $user := default "docker" $cred.user }}
+{{- $password := default "docker" $cred.password }}
+{{- $mail := default "@" $cred.mail }}
+{{- $auth := printf "%s:%s" $user $password | b64enc }}
+---
 apiVersion: v1
 kind: Secret
 metadata:
-  name: {{ include "common.dockercred.prefix" . }}-{{ .Values.repository | replace "." "-" | replace ":" "-" | replace "/" "-" }}
+  name: secret-{{ $repo | replace "." "-" | replace ":" "-" | replace "/" "-" }}
+  namespace: {{ $namespace }}
 data:
-  .dockercfg: {{ include "repository.secret" . }}
+  .dockercfg: {{ printf "{\"%s\":{\"username\":\"%s\",\"password\":\"%s\",\"email\":\"%s\",\"auth\":\"%s\"}}" $repo $user $password $mail $auth | b64enc }}
 type: kubernetes.io/dockercfg
+{{- end }}
+{{- end }}
+{{- end }}
diff --git a/ric-aux/helm/infrastructure/subcharts/docker-credential/values.yaml b/ric-aux/helm/infrastructure/subcharts/docker-credential/values.yaml
new file mode 100644 (file)
index 0000000..60054e7
--- /dev/null
@@ -0,0 +1,16 @@
+################################################################################
+#   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.                                             #
+################################################################################
 #   See the License for the specific language governing permissions and        #
 #   limitations under the License.                                             #
 ################################################################################
-
+---
 kind: "Service"
 apiVersion: "v1"
 metadata:
-  name: {{ include "common.ingressurl.ric" . }}
+  name: {{ include "common.ingresscontroller.url.platform" . }}
   namespace: {{ include "common.namespace.aux" . }}
 spec:
   ports:
-    - name: {{ include "common.ingressurl.ric" . }}-http-ingress-port
+    - name: {{ include "common.ingresscontroller.url.platform" . }}-http-ingress-port
       protocol: "TCP"
       port: 80
-    - name: {{ include "common.ingressurl.ric" . }}-https-ingress-port
+    - name: {{ include "common.ingresscontroller.url.platform" . }}-https-ingress-port
       protocol: "TCP"
       port: 443
 ---
@@ -33,13 +33,13 @@ kind: "Endpoints"
 apiVersion: "v1"
 metadata:
   # match with the selector-less service
-  name: {{ include "common.ingressurl.ric" . }}
+  name: {{ include "common.ingresscontroller.url.platform" . }}
   namespace: {{ include "common.namespace.aux" . }}
 subsets: 
   - addresses:
-      - ip: "{{ .Values.extsvcaux.ricip }}"
+      - ip: "{{ .Values.ricip }}"
     ports:
-      - port: {{ include "common.ingresshttpport" . }}
-        name: {{ include "common.ingressurl.ric" . }}-http-ingress-port
-      - port: {{ include "common.ingresshttpsport" . }}
-        name: {{ include "common.ingressurl.ric" . }}-https-ingress-port
+      - port: {{ include "common.ingresscontroller.port.http" . }}
+        name: {{ include "common.ingresscontroller.url.platform" $ }}-http-ingress-port
+      - port: {{ include "common.ingresscontroller.port.https" $ }}
+        name: {{ include "common.ingresscontroller.url.platform" $ }}-https-ingress-port
@@ -14,8 +14,7 @@
 #   limitations under the License.                                             #
 ################################################################################
 
-extsvcplt:
-  # The IP address of the RIC cluster
-  ricip: "0.0.0.0"
-  # The IP address of the AUX cluster
-  auxip: "0.0.0.0"
\ No newline at end of file
+# The IP address of the RIC cluster
+ricip: "10.0.0.1"
+# The IP address of the AUX cluster
+auxip: "10.0.0.1"
@@ -75,14 +75,14 @@ proxy:
     servicePort: 80
     containerPort: 8000
     # Set a nodePort which is available if service type is NodePort
-    nodePort: 32080
+    nodePort: 32080
 
   tls:
     enabled: true
     servicePort: 443
     containerPort: 8443
     # Set a nodePort which is available if service type is NodePort
-    nodePort: 32443
+    nodePort: 32443
 
   type: NodePort
 
@@ -280,7 +280,7 @@ updateStrategy: {}
 # e.g. setting pg_user here will override the value normally set when postgresql.enabled
 # is set below. In general, you should not set values here if they are set elsewhere.
 env:
-  database: postgres
+  database: off
   proxy_access_log: /dev/stdout
   admin_access_log: /dev/stdout
   admin_gui_access_log: /dev/stdout
@@ -365,7 +365,7 @@ cassandra:
 
 # PostgreSQL chart configs
 postgresql:
-  enabled: true
+  enabled: false
   postgresqlUsername: kong
   postgresqlDatabase: kong
   service:
@@ -375,7 +375,7 @@ postgresql:
 # created in k8s.  It uses CRDs for more fine grained control over routing and
 # for Kong specific configuration.
 ingressController:
-  enabled: false
+  enabled: true
   image:
     repository: kong-docker-kubernetes-ingress-controller.bintray.io/kong-ingress-controller
     tag: 0.6.0
similarity index 79%
rename from ric-infra/30-Kong/helm/kong/values.yaml
rename to ric-aux/helm/infrastructure/values.yaml
index 9bec10c..9a454c4 100644 (file)
@@ -1,5 +1,5 @@
-################################################################################
 #   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.           #
 #   limitations under the License.                                             #
 ################################################################################
 
-# Default values for kong_platform.
-# This is a YAML-formatted file.
-# Declare variables to be passed into your templates.
+            
+extsvcaux:
+  enabled: true
+  ricip: "10.0.0.1"
+  auxip: "10.0.0.1"
+
+docker-credential:
+  enabled: true
+  credential:
+    oran:
+      registry: "nexus3.o-ran-sc.org:10002"
+      credential:
+        user: "docker"
+        password: "docker"
+        email: "@"
+
+certificate-manager:
+  enabled: true
+      
 
 kong:
+  enabled: true
   ingressController:
     enabled: true
 
@@ -35,10 +52,8 @@ kong:
       nodePort: 32443
   # These port numbers MUST matche with what's in
   # ric-common/Common-Template/helm/ric-common/templates/_ingresscontroller.tpl file.
-  # If need to change a proxy port here, do not forget to update the 
+  # If need to change a proxy port here, do not forget to update the
   # _ingresscontroller.tpl file with the new port number.
-
-
 postgresql:
   enabled: false
 
diff --git a/ric-aux/helm/message-router/requirements.yaml b/ric-aux/helm/message-router/requirements.yaml
new file mode 100755 (executable)
index 0000000..c640999
--- /dev/null
@@ -0,0 +1,18 @@
+# Copyright © 2017 Amdocs, Bell Canada
+#
+# 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: aux-common
+    version: ~3.0.0
+    repository: "@local"
similarity index 90%
rename from ric-aux/80-Auxiliary-Functions/helm/portal/requirements.yaml
rename to ric-aux/helm/portal/requirements.yaml
index 229a4d3..2032fd7 100755 (executable)
@@ -14,5 +14,6 @@
 # limitations under the License.
 
 dependencies:
-  - name: ric-common
-    version: ~2.0.0
+  - name: aux-common
+    version: ~3.0.0
+    repository: "@local"
diff --git a/ric-aux/helm/ves/requirements.yaml b/ric-aux/helm/ves/requirements.yaml
new file mode 100644 (file)
index 0000000..db3a74b
--- /dev/null
@@ -0,0 +1,21 @@
+################################################################################
+#   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: ric-common
+    version: ~3.0.0
+    repository: "@local"
@@ -56,7 +56,7 @@ spec:
       containers:
       - name: {{ include "common.containername.ves" . }}
         image: {{ .Values.ves.onapRepository }}/{{ .Values.ves.image.name }}:{{ .Values.ves.image.tag }}
-        imagePullPolicy: {{ include "common.pullPolicy" . }}
+        imagePullPolicy: {{ .Values.ves.imagePullPolicy }}
         ports:
         - containerPort: {{ include "common.serviceport.ves.http" . }}
           protocol: TCP
similarity index 97%
rename from ric-aux/80-Auxiliary-Functions/helm/ves/values.yaml
rename to ric-aux/helm/ves/values.yaml
index 389d9c7..c9a1b32 100644 (file)
 # This is a YAML-formatted file.
 # Declare variables to be passed into your templates.
 
-imagePullPolicy: IfNotPresent
 ves:
+  imagePullPolicy: IfNotPresent
   onapRepository: "nexus3.onap.org:10001"
-
   image:
     name: onap/org.onap.dcaegen2.collectors.ves.vescollector
     tag: 1.4.4
@@ -15,7 +15,6 @@
 ################################################################################
 
 apiVersion: v1
-appVersion: "1.0"
-description: A Helm chart for Kubernetes
-name: kong
-version: 1.0.0
+description: Common templates for inclusion in other charts
+name: aux-common
+version: 3.0.0
diff --git a/ric-common/Common-Template/helm/aux-common/templates/_createPassword.tpl b/ric-common/Common-Template/helm/aux-common/templates/_createPassword.tpl
new file mode 100644 (file)
index 0000000..938b0ee
--- /dev/null
@@ -0,0 +1,62 @@
+{{/*
+# Copyright © 2019 Samsung Electronics
+#
+# 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.
+*/}}
+
+{{/*
+  Resolve the master password to be used to derive other passwords. The value of
+  .Values.masterPassword is used by default, unless either override mechanism is
+  used:
+
+  - .Values.global.masterPassword  : override default master password for all charts
+  - .Values.masterPasswordOverride : override global and default masterPassword on a per chart basis
+*/}}
+{{- define "common.masterPassword" -}}
+  {{ if .Values.masterPasswordOverride }}
+    {{- printf "%d" .Values.masterPasswordOverride -}}
+  {{ else if .Values.global.masterPassword }}
+    {{- printf "%d" .Values.global.masterPassword -}}
+  {{ else if .Values.masterPassword }}
+    {{- printf "%d" .Values.masterPassword -}}
+  {{ else }}
+    {{ fail "masterPassword not provided" }}
+  {{ end }}
+{{- end -}}
+
+{{/*
+  Generate a new password based on masterPassword. The new password is not
+  random, it is derived from masterPassword, fully qualified chart name and
+  additional uid provided by the user. This ensures that every time when we
+  run this function from the same place, with the same password and uid we
+  get the same results. This allows to avoid password changes while you are
+  doing upgrade.
+
+  The function can take from one to three arguments (inside a dictionary):
+  - .dot : environment (.)
+  - .uid : unique identifier of password to be generated within this particular chart. Use only when you create more than a single password within one chart
+  - .strength : complexity of derived password. See derivePassword documentation for more details
+
+  Example calls:
+
+    {{ include "common.createPassword" . }}
+    {{ include "common.createPassword" (dict "dot" . "uid" "mysqlRootPasswd") }}
+
+*/}}
+{{- define "common.createPassword" -}}
+  {{- $dot := default . .dot -}}
+  {{- $uid := default "onap" .uid -}}
+  {{- $strength := default "long" .strength -}}
+  {{- $mp := include "common.masterPassword" $dot -}}
+  {{- derivePassword 1 $strength $mp (include "common.fullname" $dot) $uid -}}
+{{- end -}}
diff --git a/ric-common/Common-Template/helm/aux-common/templates/_ingress.tpl b/ric-common/Common-Template/helm/aux-common/templates/_ingress.tpl
new file mode 100644 (file)
index 0000000..b4afe63
--- /dev/null
@@ -0,0 +1,84 @@
+{{- define "ingress.config.port" -}}
+{{- if .Values.ingress -}}
+{{- if or (not .Values.global.ingress.virtualhost) (not .Values.global.ingress.virtualhost.enabled) -}}
+  - http:
+      paths:
+{{- range .Values.ingress.service }}
+        - path: {{  printf "/%s" (required "baseaddr" .baseaddr) }}
+          backend:
+            serviceName: {{ .name }}
+            servicePort: {{ .port }}
+{{- end -}}
+{{- else if .Values.ingress.service -}}
+{{- $burl := (required "baseurl" .Values.global.ingress.virtualhost.baseurl) -}}
+{{ range .Values.ingress.service }}
+  - host: {{ printf "%s.%s" (required "baseaddr" .baseaddr) $burl }}
+    http:
+      paths:
+      - backend:
+          serviceName: {{ .name }}
+          servicePort: {{ .port }}
+{{- end -}}
+{{- else -}}
+        - path: {{ printf "/%s" .Chart.Name }}
+          backend:
+            serviceName: {{ .Chart.Name }}
+            servicePort: {{ .Values.service.externalPort }}
+{{- end -}}
+{{- end -}}
+{{- end -}}
+
+
+{{- define "ingress.config.annotations.ssl" -}}
+{{- if .Values.ingress.config -}}
+{{- if .Values.ingress.config.ssl -}}
+{{- if eq .Values.ingress.config.ssl "redirect" -}}
+kubernetes.io/ingress.class: nginx
+nginx.ingress.kubernetes.io/ssl-passthrough: "true"
+nginx.ingress.kubernetes.io/ssl-redirect: "true"
+{{-  else if eq .Values.ingress.config.ssl "native" -}}
+nginx.ingress.kubernetes.io/ssl-redirect: "true"
+{{-  else if eq .Values.ingress.config.ssl "none" -}}
+nginx.ingress.kubernetes.io/ssl-redirect: "false"
+{{- end -}}
+{{- end -}}
+{{- end -}}
+{{- end -}}
+
+
+{{- define "ingress.config.annotations" -}}
+{{- if .Values.ingress -}}
+{{- if .Values.ingress.annotations -}}
+{{ toYaml .Values.ingress.annotations | indent 4 | trim }}
+{{- end -}}
+{{- end -}}
+{{ include "ingress.config.annotations.ssl" . | indent 4 | trim }}
+{{- end -}}
+
+
+{{- define "common.ingress" -}}
+{{- if .Values.ingress -}}
+{{- if .Values.global.ingress -}}
+{{- if and .Values.ingress.enabled .Values.global.ingress.enabled -}}
+apiVersion: extensions/v1beta1
+kind: Ingress
+metadata:
+  name: {{ include "common.fullname" . }}-ingress
+  annotations:
+    {{ include "ingress.config.annotations" . }}
+  labels:
+    app: {{ .Chart.Name }}
+    chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
+    release: {{ .Release.Name }}
+    heritage: {{ .Release.Service }}
+spec:
+  rules:
+  {{ include "ingress.config.port" . | trim }}
+{{- if .Values.ingress.tls }}
+  tls:
+{{ toYaml .Values.ingress.tls | indent 4 }}
+  {{- end -}}
+{{- end -}}
+{{- end -}}
+{{- end -}}
+{{- end -}}
\ No newline at end of file
diff --git a/ric-common/Common-Template/helm/aux-common/templates/_mariadb.tpl b/ric-common/Common-Template/helm/aux-common/templates/_mariadb.tpl
new file mode 100644 (file)
index 0000000..15fb5a4
--- /dev/null
@@ -0,0 +1,59 @@
+{{/*
+# Copyright © 2019 Orange
+#
+# 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.
+*/}}
+
+{{/*
+  Choose the name of the mariadb service to use.
+*/}}
+{{- define "common.mariadbService" -}}
+  {{- if .Values.global.mariadbGalera.localCluster -}}
+    {{- index .Values "mariadb-galera" "service" "name" -}}
+  {{- else -}}
+    {{- .Values.global.mariadbGalera.service -}}
+  {{- end -}}
+{{- end -}}
+
+{{/*
+  Choose the value of mariadb port to use.
+*/}}
+{{- define "common.mariadbPort" -}}
+  {{- if .Values.global.mariadbGalera.localCluster -}}
+    {{- index .Values "mariadb-galera" "service" "internalPort" -}}
+  {{- else -}}
+    {{- .Values.global.mariadbGalera.internalPort -}}
+  {{- end -}}
+{{- end -}}
+
+{{/*
+  Choose the value of secret to retrieve user value.
+*/}}
+{{- define "common.mariadbSecret" -}}
+  {{- if .Values.global.mariadbGalera.localCluster -}}
+    {{ printf "%s-%s-db-user-credentials" (include "common.fullname" .) (index .Values "mariadb-galera" "nameOverride") -}}
+  {{- else -}}
+    {{ printf "%s-%s" (.Release.Name) (index .Values "mariadb-init" "nameOverride") -}}
+  {{- end -}}
+{{- end -}}
+
+{{/*
+  Choose the value of secret param to retrieve user value.
+*/}}
+{{- define "common.mariadbSecretParam" -}}
+  {{- if .Values.global.mariadbGalera.localCluster -}}
+    {{ printf "password" -}}
+  {{- else -}}
+    {{ printf "db-user-password" -}}
+  {{- end -}}
+{{- end -}}
diff --git a/ric-common/Common-Template/helm/aux-common/templates/_name.tpl b/ric-common/Common-Template/helm/aux-common/templates/_name.tpl
new file mode 100644 (file)
index 0000000..f84ca21
--- /dev/null
@@ -0,0 +1,41 @@
+{{/*
+# Copyright © 2017 Amdocs, Bell Canada
+#
+# 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.
+*/}}
+
+{{/*
+  Expand the name of a chart.
+*/}}
+{{- define "common.name" -}}
+  {{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+
+{{/*
+  Create a default fully qualified application name.
+  Truncated at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
+*/}}
+{{- define "common.fullname" -}}
+  {{- $name := default .Chart.Name .Values.nameOverride -}}
+  {{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+
+{{/*
+  Retrieve the "original" release from the component release:
+  if ONAP is deploy with "helm deploy --name toto", then cassandra components
+  will have "toto-cassandra" as release name.
+  this function would answer back "toto".
+*/}}
+{{- define "common.release" -}}
+  {{- regexReplaceAll "-[a-zA-Z0-9]*$" .Release.Name ""  }}
+{{- end -}}
diff --git a/ric-common/Common-Template/helm/aux-common/templates/_namespace.tpl b/ric-common/Common-Template/helm/aux-common/templates/_namespace.tpl
new file mode 100644 (file)
index 0000000..94c9ee7
--- /dev/null
@@ -0,0 +1,26 @@
+{{/*
+# Copyright © 2017 Amdocs, Bell Canada
+#
+# 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.
+*/}}
+
+{{/*
+  Resolve the namespace to apply to a chart. The default namespace suffix
+  is the name of the chart. This can be overridden if necessary (eg. for subcharts)
+  using the following value:
+
+  - .Values.nsPrefix  : override namespace prefix
+*/}}
+{{- define "common.namespace" -}}
+  {{- default .Release.Namespace .Values.nsPrefix -}}
+{{- end -}}
diff --git a/ric-common/Common-Template/helm/aux-common/templates/_repository.tpl b/ric-common/Common-Template/helm/aux-common/templates/_repository.tpl
new file mode 100644 (file)
index 0000000..272db42
--- /dev/null
@@ -0,0 +1,49 @@
+{{/*
+# Copyright © 2017 Amdocs, Bell Canada
+#
+# 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.
+*/}}
+
+{{/*
+  Resolve the name of the common image repository.
+  The value for .Values.repository is used by default,
+  unless either override mechanism is used.
+
+  - .Values.global.repository  : override default image repository for all images
+  - .Values.repositoryOverride : override global and default image repository on a per image basis
+*/}}
+{{- define "common.repository" -}}
+  {{if .Values.repositoryOverride }}
+    {{- printf "%s" .Values.repositoryOverride -}}
+  {{else}}
+    {{- default .Values.repository .Values.global.repository -}}
+  {{end}}
+{{- end -}}
+
+
+{{/*
+  Resolve the image repository secret token.
+  The value for .Values.global.repositoryCred is used:
+  repositoryCred:
+    user: user
+    password: password
+    mail: email (optional)
+*/}}
+{{- define "common.repository.secret" -}}
+  {{- $repo := include "common.repository" . }}
+  {{- $repo := default "nexus3.onap.org:10001" $repo }}
+  {{- $cred := .Values.global.repositoryCred }}
+  {{- $mail := default "@" $cred.mail }}
+  {{- $auth := printf "%s:%s" $cred.user $cred.password | b64enc }}
+  {{- printf "{\"%s\":{\"username\":\"%s\",\"password\":\"%s\",\"email\":\"%s\",\"auth\":\"%s\"}}" $repo $cred.user $cred.password $mail $auth | b64enc -}}
+{{- end -}}
@@ -1,20 +1,18 @@
-################################################################################
-#   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.                                             #
-################################################################################
-
+{{- /*
+# Copyright © 2018 Amdocs, Bell Canada
+#
+# 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.
+*/ -}}
 
 {{- /*
   Resolve the name of the common resource limit/request flavor.
diff --git a/ric-common/Common-Template/helm/aux-common/templates/_secret.yaml b/ric-common/Common-Template/helm/aux-common/templates/_secret.yaml
new file mode 100644 (file)
index 0000000..523d788
--- /dev/null
@@ -0,0 +1,276 @@
+{{/*
+# Copyright © 2019 AT&T, Samsung Electronics
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#       http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+*/}}
+
+{{/*
+  For internal use only!
+
+  Generates a secret header with given name and desired labels.
+
+  The template takes two arguments:
+    - .global: environment (.)
+    - .name: name of the secret
+
+  Example call:
+    {{ include "common.secret._header" (dict "global" . "name" "myFancyName") }}
+*/}}
+{{- define "common.secret._header" -}}
+{{- $global := .global }}
+{{- $name := .name }}
+apiVersion: v1
+kind: Secret
+metadata:
+  name: {{ $name }}
+  namespace: {{ include "common.namespace" $global }}
+  labels:
+    app: {{ include "common.name" $global }}
+    chart: {{ $global.Chart.Name }}-{{ $global.Chart.Version | replace "+" "_" }}
+    release: {{ $global.Release.Name }}
+    heritage: {{ $global.Release.Service }}
+type: Opaque
+{{- end -}}
+
+{{/*
+  For internal use only!
+
+  Pick a value based on "user input" and generation policy.
+
+  The template takes below arguments:
+    - .global: environment (.)
+    - .secretName: name of the secret where the value will be placed
+    - .secretEnv: map of values which configures this secret. This can contain below keys:
+        - value: Value of secret key provided by user (can be a template inside a string)
+        - policy: What to do if value is missing or empty. Possible options are:
+            - generate: Generate a new password deriving it from master password
+            - required: Fail the deployment if value has not been provided
+          Defaults to generate.
+        - name: Name of the key to which this value should be assigned
+*/}}
+{{- define "common.secret._value" -}}
+  {{- $global := .global }}
+  {{- $name := .secretName }}
+  {{- $secretEnv := .secretEnv }}
+  {{- $value := tpl $secretEnv.value $global }}
+  {{- $policy := default "generate" $secretEnv.policy }}
+
+  {{- if $value }}
+    {{- $value | quote }}
+  {{- else if eq $policy "generate" }}
+    {{- include "common.createPassword" (dict "dot" $global "uid" $name) | quote }}
+  {{- else }}
+    {{- fail (printf "Value for %s secret %s key not provided" $name $secretEnv.name) }}
+  {{- end }}
+{{- end -}}
+
+
+{{/*
+  For internal use only!
+
+  Generate a secret name based on provided name or UID.
+  If UID is provided then the name is generated by appending this UID right after
+  the chart name. If name is provided, it overrides the name generation algorith
+  and is used right away. Both name and uid strings may contain a template to be
+  resolved.
+
+  The template takes below arguments:
+    - .global: environment (.)
+    - .uid: string that uniquely identifies this secret within a helm chart
+    - .name: string that can be used to override default name generation algorithm
+        and provide a custom name for the secret
+*/}}
+{{- define "common.secret._genName" -}}
+  {{- $global := .global }}
+  {{- $uid := tpl (default "" .uid) $global }}
+  {{- $name := tpl (default "" .name) $global }}
+  {{- default (printf "%s-%s" (include "common.fullname" $global) $uid) $name }}
+{{- end -}}
+
+{{/*
+  Get the real secret name by UID or name, based on the configuration provided by user.
+  User may decide to not create a new secret but reuse existing one for this deployment
+  (aka externalSecret). In this case the real name of secret to be used is different
+  than the one declared in secret definition. This easily retrieve current secret real
+  name based on declared name or UID even if it has been overrided by the user using
+  externalSecret option. You should use this template always when you need to reference
+  a secret created using common.secret template by name.
+
+  The template takes below arguments:
+    - .global: environment (.)
+    - .uid: string that uniquely identifies this secret within a helm chart
+        (can be omitted if name has been provided)
+    - .name: name which was used to declare a secret
+        (can be omitted if uid has been provided)
+*/}}
+{{- define "common.secret.getSecretName" -}}
+  {{- $global := .global }}
+  {{- $targetName := include "common.secret._genName" (dict "global" $global "uid" .uid "name" .name) }}
+  {{- range $secret := $global.Values.secrets }}
+    {{- $currName := include "common.secret._genName" (dict "global" $global "uid" $secret.uid "name" $secret.name) }}
+    {{- if eq $currName $targetName }}
+      {{- $externalSecret := tpl (default "" $secret.externalSecret) $global }}
+      {{- default $currName $externalSecret }}
+    {{- end }}
+  {{- end }}
+{{- end -}}
+
+{{/*
+  Convenience template which can be used to easily set the value of environment variable
+  to the value of a key in a secret.
+
+  It takes care of all name mangling, usage of external secrets etc.
+
+  The template takes below arguments:
+    - .global: environment (.)
+    - .uid: string that uniquely identifies this secret within a helm chart
+        (can be omitted if name has been provided)
+    - .name: name which was used to declare a secret
+        (can be omitted if uid has been provided)
+    - .key: Key within this secret which value should be assigned to this variable
+
+  Example usage:
+  env:
+    - name: SECRET_PASSWORD
+      {{- include "common.secret.envFromSecret" (dict "global" . "uid" "secret" "key" "password") | indent 8}}
+*/}}
+{{- define "common.secret.envFromSecret" -}}
+  {{- $key := .key }}
+valueFrom:
+  secretKeyRef:
+    name: {{ include "common.secret.getSecretName" . }}
+    key: {{ $key }}
+{{- end -}}
+
+{{/*
+  Define secrets to be used by chart.
+  Every secret has a type which is one of:
+    - generic:
+        Generic secret template that allows to input some raw data (from files).
+        File Input can be passed as list of files (filePaths) or as a single string
+        (filePath)
+    - genericKV:
+        Type of secret which allows you to define a list of key value pairs.
+        The list is assiged to envs value. Every item may define below items:
+          - name:
+              Identifier of this value within secret
+          - value:
+              String that defines a value associated with given key.
+              This can be a simple string or a template.
+          - policy:
+              Defines what to do if value is not provided by the user.
+              Available options are:
+                - generate:
+                    Generate a value by derriving it from master password
+                - required:
+                    Fail the deployment
+    - password:
+        Type of secret that holds only the password.
+        Only two items can be defined for this type:
+          - password:
+              Equivalent of value field from genericKV
+          - policy:
+              The same meaning as for genericKV policy field
+    - basicAuth:
+        Type of secret that holds both username and password.
+        Below fields are available:
+          - login:
+              The value for login key.
+              This can be a simple string or a template.
+              Providing a value for login is always required.
+          - password:
+              The value for password key.
+              This can be a simple string or a template.
+          - passwordPolicy:
+              The same meaning as the policy field in genericKV.
+              Only the policy for password can be set.
+
+  Every secret can be identified using:
+    - uid:
+        A string to be appended to the chart fullname to generate a secret name.
+    - name:
+        Overrides default secret name generation and allows to set immutable
+        and globaly unique name
+
+  To allow sharing a secret between the components and allow to pre-deploy secrets
+  before ONAP deployment it is possible to use already existing secret instead of
+  creating a new one. For this purpose externalSecret field can be used. If value of
+  this field is evaluated to true no new secret is created, only the name of the
+  secret is aliased to the external one.
+
+  Example usage:
+    secrets.yaml:
+      {{ include "common.secret" . }}
+
+    values.yaml:
+      mysqlLogin: "root"
+
+      mysqlExternalSecret: "some-other-secret-name"
+
+      secrets:
+        - uid: "mysql"
+          externalSecret: '{{ tpl .Values.passExternalSecret . }}'
+          type: basicAuth
+          login: '{{ .Values.mysqlLogin }}'
+          mysqlPassword: '{{ .Values.mysqlPassword }}'
+          passwordPolicy: generate
+
+    In the above example new secret is not going to be created.
+    Already existing one (some-other-secret-name) is going to be used.
+    To force creating a new one, just make sure that mysqlExternalSecret
+    is not set.
+
+*/}}
+{{- define "common.secret" -}}
+  {{- $global := . }}
+  {{- range $secret := .Values.secrets }}
+    {{- $name := include "common.secret._genName" (dict "global" $global "uid" $secret.uid "name" $secret.name) }}
+    {{- $type := default "generic" $secret.type }}
+    {{- $externalSecret := tpl (default "" $secret.externalSecret) $global }}
+    {{- if not $externalSecret }}
+---
+      {{ include "common.secret._header" (dict "global" $global "name" $name) }}
+
+      {{- if eq $type "generic" }}
+data:
+        {{- range $curFilePath := $secret.filePaths }}
+          {{ tpl ($global.Files.Glob $curFilePath).AsSecrets $global | indent 2 }}
+        {{- end }}
+        {{- if $secret.filePath }}
+          {{ tpl ($global.Files.Glob $secret.filePath).AsSecrets $global | indent 2 }}
+        {{- end }}
+      {{- else if eq $type "genericKV" }}
+stringData:
+        {{- if $secret.envs }}
+          {{- range $secretEnv := $secret.envs }}
+            {{- $valueDesc := (dict "global" $global "secretName" $name "secretEnv" $secretEnv) }}
+    {{ $secretEnv.name }}: {{ include "common.secret._value" $valueDesc }}
+          {{- end }}
+        {{- end }}
+      {{- else if eq $type "password" }}
+        {{- $secretEnv := (dict "policy" (default "generate" $secret.policy) "name" "password" "value" $secret.password) }}
+        {{- $valueDesc := (dict "global" $global "secretName" $name "secretEnv" $secretEnv) }}
+stringData:
+  password: {{ include "common.secret._value" $valueDesc }}
+      {{- else if eq $type "basicAuth" }}
+stringData:
+        {{- $secretEnv := (dict "policy" "required" "name" "login" "value" $secret.login) }}
+        {{- $valueDesc := (dict "global" $global "secretName" $name "secretEnv" $secretEnv) }}
+  login: {{ include "common.secret._value" $valueDesc }}
+        {{- $secretEnv := (dict "policy" (default "generate" $secret.passwordPolicy) "name" "password" "value" $secret.password) }}
+        {{- $valueDesc := (dict "global" $global "secretName" $name "secretEnv" $secretEnv) }}
+  password: {{ include "common.secret._value" $valueDesc }}
+      {{- end }}
+    {{- end }}
+  {{- end }}
+{{- end -}}
diff --git a/ric-common/Common-Template/helm/aux-common/templates/_service.tpl b/ric-common/Common-Template/helm/aux-common/templates/_service.tpl
new file mode 100644 (file)
index 0000000..77b77d0
--- /dev/null
@@ -0,0 +1,31 @@
+{{/*
+# Copyright © 2017 Amdocs, Bell Canada
+#
+# 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.
+*/}}
+
+{{/*
+  Resolve the name of a chart's service.
+
+  The default will be the chart name (or .Values.nameOverride if set).
+  And the use of .Values.service.name overrides all.
+
+  - .Values.service.name  : override default service (ie. chart) name
+*/}}
+{{/*
+  Expand the service name for a chart.
+*/}}
+{{- define "common.servicename" -}}
+  {{- $name := default .Chart.Name .Values.nameOverride -}}
+  {{- default $name .Values.service.name | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
\ No newline at end of file
diff --git a/ric-common/Common-Template/helm/aux-common/templates/_storageClass.tpl b/ric-common/Common-Template/helm/aux-common/templates/_storageClass.tpl
new file mode 100644 (file)
index 0000000..8fd1f97
--- /dev/null
@@ -0,0 +1,57 @@
+{{/*
+# Copyright © 2019 Amdocs, Bell Canada, Orange
+#
+# 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.
+*/}}
+
+{{/*
+  Expand the name of the storage class.
+  The value "common.fullname"-data is used by default,
+  unless either override mechanism is used.
+
+  - .Values.global.persistence.storageClass  : override default storageClass for all charts
+  - .Values.persistence.storageClassOverride : override global and default storage class on a per chart basis
+  - .Values.persistence.storageClass         : override default storage class on a per chart basis
+*/}}
+{{- define "common.storageClass" -}}
+  {{- if .Values.persistence.storageClassOverride -}}
+    {{- if ne "-" .Values.persistence.storageClassOverride -}}
+      {{- printf "%s" .Values.persistence.storageClassOverride -}}
+    {{- else -}}
+      {{- $storage_class := "" -}}
+      {{- printf "%q" $storage_class -}}
+    {{- end -}}
+  {{- else -}}
+    {{- if or .Values.persistence.storageClass .Values.global.persistence.storageClass }}
+      {{- if ne "-" (default .Values.persistence.storageClass .Values.global.persistence.storageClass) -}}
+        {{- printf "%s" (default .Values.persistence.storageClass .Values.global.persistence.storageClass) -}}
+      {{- else -}}
+        {{- $storage_class := "" -}}
+        {{- printf "%q" $storage_class -}}
+      {{- end -}}
+    {{- else -}}
+      {{- printf "%s-data" (include "common.fullname" .) -}}
+    {{- end -}}
+  {{- end -}}
+{{- end -}}
+
+{{/*
+  Calculate if we need a PV. If a storageClass is provided, then we don't need.
+*/}}
+{{- define "common.needPV" -}}
+{{- if or (or .Values.persistence.storageClassOverride .Values.persistence.storageClass) .Values.global.persistence.storageClass -}}
+  False
+{{- else -}}
+  True
+{{- end -}}
+{{- end -}}
@@ -14,5 +14,7 @@
 #   limitations under the License.                                             #
 ################################################################################
 
-#
-0 * * * * find {{ .Values.dataRootDir }}/{{ .Values.processedDirectory }} -type f  -mtime +3 -delete
+#################################################################
+# Global configuration default values that can be inherited by
+# all subcharts.
+#################################################################
index 72d1d56..17aecc5 100644 (file)
@@ -18,4 +18,4 @@
 apiVersion: v1
 description: Common templates for inclusion in other charts
 name: ric-common
-version: 2.0.8
+version: 3.0.0
diff --git a/ric-common/Common-Template/helm/ric-common/templates/_a1mediator.tpl b/ric-common/Common-Template/helm/ric-common/templates/_a1mediator.tpl
new file mode 100644 (file)
index 0000000..ec4740f
--- /dev/null
@@ -0,0 +1,66 @@
+################################################################################
+#   Copyright (c) 2019 AT&T Intellectual Property.                             #
+#                                                                              #
+#   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.                                             #
+################################################################################
+
+{{- define "common.name.a1mediator" -}}
+  {{- printf "a1mediator" -}}
+{{- end -}}
+
+{{- define "common.fullname.a1mediator" -}}
+  {{- $name := ( include "common.name.a1mediator" . ) -}}
+  {{- $namespace := ( include "common.namespace.platform" . ) -}}
+  {{- printf "%s-%s" $namespace $name | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+
+{{- define "common.configmapname.a1mediator" -}}
+  {{- $name := ( include "common.fullname.a1mediator" . ) -}}
+  {{- printf "configmap-%s" $name | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+
+{{- define "common.deploymentname.a1mediator" -}}
+  {{- $name := ( include "common.fullname.a1mediator" . ) -}}
+  {{- printf "deployment-%s" $name | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+
+{{- define "common.containername.a1mediator" -}}
+  {{- $name := ( include "common.fullname.a1mediator" . ) -}}
+  {{- printf "container-%s" $name | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+
+{{- define "common.serviceaccountname.a1mediator" -}}
+  {{- $name := ( include "common.fullname.a1mediator" . ) -}}
+  {{- printf "svcacct-%s" $name | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+
+{{- define "common.ingressname.a1mediator" -}}
+  {{- $name := ( include "common.fullname.a1mediator" . ) -}}
+  {{- printf "ingress-%s" $name | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+
+{{- define "common.kongpath.ric.a1mediator" -}}/a1mediator{{- end -}}
+
+{{- define "common.servicename.a1mediator.rmr" -}}
+  {{- $name := ( include "common.fullname.a1mediator" . ) -}}
+  {{- printf "service-%s-rmr" $name | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+
+{{- define "common.servicename.a1mediator.http" -}}
+  {{- $name := ( include "common.fullname.a1mediator" . ) -}}
+  {{- printf "service-%s-http" $name | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+
+{{- define "common.serviceport.a1mediator.rmr.data" -}}4562{{- end -}}
+{{- define "common.serviceport.a1mediator.rmr.route" -}}4561{{- end -}}
+{{- define "common.serviceport.a1mediator.http" -}}10000{{- end -}}
diff --git a/ric-common/Common-Template/helm/ric-common/templates/_appmgr.tpl b/ric-common/Common-Template/helm/ric-common/templates/_appmgr.tpl
new file mode 100644 (file)
index 0000000..bdaf4bb
--- /dev/null
@@ -0,0 +1,80 @@
+################################################################################
+#   Copyright (c) 2019 AT&T Intellectual Property.                             #
+#                                                                              #
+#   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.                                             #
+################################################################################
+
+{{- define "common.name.appmgr" -}}
+  {{- printf "appmgr" -}}
+{{- end -}}
+
+
+{{- define "common.fullname.appmgr" -}}
+  {{- $name := ( include "common.name.appmgr" . ) -}}
+  {{- $namespace := ( include "common.namespace.platform" . ) -}}
+  {{- printf "%s-%s" $namespace $name | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+
+{{- define "common.configmapname.appmgr" -}}
+  {{- $name := ( include "common.fullname.appmgr" . ) -}}
+  {{- printf "configmap-%s" $name | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+
+{{- define "common.deploymentname.appmgr" -}}
+  {{- $name := ( include "common.fullname.appmgr" . ) -}}
+  {{- printf "deployment-%s" $name | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+
+{{- define "common.containername.appmgr" -}}
+  {{- $name := ( include "common.fullname.appmgr" . ) -}}
+  {{- printf "container-%s" $name | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+
+{{- define "common.containername.appmgr.chartmuseum" -}}
+  {{- $name := ( include "common.fullname.appmgr" . ) -}}
+  {{- printf "container-%s-helmrepo" $name | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+
+{{- define "common.serviceaccountname.appmgr" -}}
+  {{- $name := ( include "common.fullname.appmgr" . ) -}}
+  {{- printf "svcacct-%s" $name | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+
+{{- define "common.ingressname.appmgr" -}}
+  {{- $name := ( include "common.fullname.appmgr" . ) -}}
+  {{- printf "ingress-%s" $name | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+
+{{- define "common.kongpath.ric.helmrepo" -}}/helmrepo{{- end -}}
+{{- define "common.kongpath.ric.appmgr" -}}/appmgr{{- end -}}
+
+{{- define "common.servicename.appmgr.rmr" -}}
+  {{- $name := ( include "common.fullname.appmgr" . ) -}}
+  {{- printf "service-%s-rmr" $name | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+
+{{- define "common.servicename.appmgr.http" -}}
+  {{- $name := ( include "common.fullname.appmgr" . ) -}}
+  {{- printf "service-%s-http" $name | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+
+{{- define "common.secretname.appmgr" -}}
+  {{- $name := ( include "common.fullname.appmgr" . ) -}}
+  {{- printf "secret-%s" $name | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+
+{{- define "common.serviceport.appmgr.rmr.data" -}}4560{{- end -}}
+{{- define "common.serviceport.appmgr.rmr.route" -}}4561{{- end -}}
+{{- define "common.serviceport.appmgr.http" -}}8080{{- end -}}
+
+{{- define "common.serviceport.appmgr.chartmuseum.http" -}}27015{{- end -}}
index 1236b4b..54875fd 100644 (file)
@@ -1,6 +1,5 @@
 ################################################################################
 #   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.           #
diff --git a/ric-common/Common-Template/helm/ric-common/templates/_configmapname.tpl b/ric-common/Common-Template/helm/ric-common/templates/_configmapname.tpl
deleted file mode 100644 (file)
index d829c03..0000000
+++ /dev/null
@@ -1,92 +0,0 @@
-################################################################################
-#   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.                                             #
-################################################################################
-
-{{/*
-  Resolve the name of a chart's configmap.
-
-*/}}
-
-
-{{- define "common.configmapname.appmgr" -}}
-  {{- $name := ( include "common.fullname.appmgr" . ) -}}
-  {{- printf "configmap-%s" $name | trunc 63 | trimSuffix "-" -}}
-{{- end -}}
-
-{{- define "common.configmapname.dbaas" -}}
-  {{- $name := ( include "common.fullname.dbaas" . ) -}}
-  {{- printf "configmap-%s" $name | trunc 63 | trimSuffix "-" -}}
-{{- end -}}:
-
-{{- define "common.configmapname.e2mgr" -}}
-  {{- $name := ( include "common.fullname.e2mgr" . ) -}}
-  {{- printf "configmap-%s" $name | trunc 63 | trimSuffix "-" -}}
-{{- end -}}
-
-{{- define "common.configmapname.rsm" -}}
-  {{- $name := ( include "common.fullname.rsm" . ) -}}
-  {{- printf "configmap-%s" $name | trunc 63 | trimSuffix "-" -}}
-{{- end -}}
-
-{{- define "common.configmapname.rtmgr" -}}
-  {{- $name := ( include "common.fullname.rtmgr" . ) -}}
-  {{- printf "configmap-%s" $name | trunc 63 | trimSuffix "-" -}}
-{{- end -}}
-
-{{- define "common.configmapname.submgr" -}}
-  {{- $name := ( include "common.fullname.submgr" . ) -}}
-  {{- printf "configmap-%s" $name | trunc 63 | trimSuffix "-" -}}
-{{- end -}}
-
-{{- define "common.configmapname.a1mediator" -}}
-  {{- $name := ( include "common.fullname.a1mediator" . ) -}}
-  {{- printf "configmap-%s" $name | trunc 63 | trimSuffix "-" -}}
-{{- end -}}
-
-{{- define "common.configmapname.vespamgr" -}}
-  {{- $name := ( include "common.fullname.vespamgr" . ) -}}
-  {{- printf "configmap-%s" $name | trunc 63 | trimSuffix "-" -}}
-{{- end -}}
-
-{{- define "common.configmapname.jaegeradapter" -}}
-  {{- $name := ( include "common.fullname.jaegeradapter" . ) -}}
-  {{- printf "configmap-%s" $name | trunc 63 | trimSuffix "-" -}}
-{{- end -}}
-
-{{- define "common.configmapname.nexus" -}}
-  {{- $name := ( include "common.fullname.nexus" . ) -}}
-  {{- printf "configmap-%s" $name | trunc 63 | trimSuffix "-" -}}
-{{- end -}}
-
-{{- define "common.configmapname.chartmuseum" -}}
-  {{- $name := ( include "common.fullname.chartmuseum" . ) -}}
-  {{- printf "configmap-%s" $name | trunc 63 | trimSuffix "-" -}}
-{{- end -}}
-
-{{- define "common.configmapname.dashboard" -}}
-  {{- $name := ( include "common.fullname.dashboard" . ) -}}
-  {{- printf "configmap-%s" $name | trunc 63 | trimSuffix "-" -}}
-{{- end -}}
-
-{{- define "common.configmapname.messagerouter" -}}
-  {{- $name := ( include "common.fullname.messagerouter" . ) -}}
-  {{- printf "configmap-%s" $name | trunc 63 | trimSuffix "-" -}}
-{{- end -}}
-
-{{- define "common.configmapname.ves" -}}
-  {{- $name := ( include "common.fullname.ves" . ) -}}
-  {{- printf "configmap-%s" $name | trunc 63 | trimSuffix "-" -}}
-{{- end -}}
diff --git a/ric-common/Common-Template/helm/ric-common/templates/_containername.tpl b/ric-common/Common-Template/helm/ric-common/templates/_containername.tpl
deleted file mode 100644 (file)
index e4cb374..0000000
+++ /dev/null
@@ -1,91 +0,0 @@
-################################################################################
-#   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.                                             #
-################################################################################
-
-{{/*
-  Resolve the name of a chart's container.
-*/}}
-
-
-{{- define "common.containername.appmgr" -}}
-  {{- $name := ( include "common.fullname.appmgr" . ) -}}
-  {{- printf "container-%s" $name | trunc 63 | trimSuffix "-" -}}
-{{- end -}}
-
-{{- define "common.containername.dbaas" -}}
-  {{- $name := ( include "common.fullname.dbaas" . ) -}}
-  {{- printf "container-%s" $name | trunc 63 | trimSuffix "-" -}}
-{{- end -}}
-
-{{- define "common.containername.e2mgr" -}}
-  {{- $name := ( include "common.fullname.e2mgr" . ) -}}
-  {{- printf "container-%s" $name | trunc 63 | trimSuffix "-" -}}
-{{- end -}}
-
-{{- define "common.containername.rsm" -}}
-  {{- $name := ( include "common.fullname.rsm" . ) -}}
-  {{- printf "container-%s" $name | trunc 63 | trimSuffix "-" -}}
-{{- end -}}
-
-{{- define "common.containername.rtmgr" -}}
-  {{- $name := ( include "common.fullname.rtmgr" . ) -}}
-  {{- printf "container-%s" $name | trunc 63 | trimSuffix "-" -}}
-{{- end -}}
-
-{{- define "common.containername.submgr" -}}
-  {{- $name := ( include "common.fullname.submgr" . ) -}}
-  {{- printf "container-%s" $name | trunc 63 | trimSuffix "-" -}}
-{{- end -}}
-
-{{- define "common.containername.a1mediator" -}}
-  {{- $name := ( include "common.fullname.a1mediator" . ) -}}
-  {{- printf "container-%s" $name | trunc 63 | trimSuffix "-" -}}
-{{- end -}}
-
-{{- define "common.containername.vespamgr" -}}
-  {{- $name := ( include "common.fullname.vespamgr" . ) -}}
-  {{- printf "container-%s" $name | trunc 63 | trimSuffix "-" -}}
-{{- end -}}
-
-{{- define "common.containername.jaegeradapter" -}}
-  {{- $name := ( include "common.fullname.jaegeradapter" . ) -}}
-  {{- printf "container-%s" $name | trunc 63 | trimSuffix "-" -}}
-{{- end -}}
-
-{{- define "common.containername.nexus" -}}
-  {{- $name := ( include "common.fullname.nexus" . ) -}}
-  {{- printf "container-%s" $name | trunc 63 | trimSuffix "-" -}}
-{{- end -}}
-
-{{- define "common.containername.chartmuseum" -}}
-  {{- $name := ( include "common.fullname.chartmuseum" . ) -}}
-  {{- printf "container-%s" $name | trunc 63 | trimSuffix "-" -}}
-{{- end -}}
-
-{{- define "common.containername.dashboard" -}}
-  {{- $name := ( include "common.fullname.dashboard" . ) -}}
-  {{- printf "container-%s" $name | trunc 63 | trimSuffix "-" -}}
-{{- end -}}
-
-{{- define "common.containername.messagerouter" -}}
-  {{- $name := ( include "common.fullname.messagerouter" . ) -}}
-  {{- printf "container-%s" $name | trunc 63 | trimSuffix "-" -}}
-{{- end -}}
-
-{{- define "common.containername.ves" -}}
-  {{- $name := ( include "common.fullname.ves" . ) -}}
-  {{- printf "container-%s" $name | trunc 63 | trimSuffix "-" -}}
-{{- end -}}
@@ -1,6 +1,5 @@
 ################################################################################
 #   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.           #
 
 
 
-{{- define "helmrepo.secret.user" -}}
-  {{- $user := default "helm" .Values.helmrepoCredential.user -}}
-  {{- printf "%s" $user |b64enc }}
-{{- end -}}
 
 
-{{- define "helmrepo.secret.password" -}}
-  {{- $pass := default "helm" .Values.helmrepoCredential.password -}}
-  {{- printf "%s" $pass |b64enc }}
+{{- define "locate" -}}
+  {{- $ctx := .ctx }}
+  {{- $keylist := .keylist }}
+  {{- $currentkey := first $keylist -}}
+  {{- $restkeys := rest $keylist -}}
+  {{- if empty $restkeys -}}
+    {{- $result := index $ctx $currentkey -}}
+    {{- if not (empty $result) -}}
+      {{- $result -}}
+    {{- end -}}
+  {{- else -}}
+    {{- with index $ctx $currentkey }}
+      {{- $newctx := dict "ctx" . "keylist" $restkeys -}}
+      {{- include "locate" $newctx -}}
+    {{- end -}}
+  {{- end -}}
 {{- end -}}
diff --git a/ric-common/Common-Template/helm/ric-common/templates/_dashboard.tpl b/ric-common/Common-Template/helm/ric-common/templates/_dashboard.tpl
new file mode 100644 (file)
index 0000000..7193400
--- /dev/null
@@ -0,0 +1,59 @@
+################################################################################
+#   Copyright (c) 2019 AT&T Intellectual Property.                             #
+#                                                                              #
+#   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.                                             #
+################################################################################
+
+{{- define "common.name.dashboard" -}}
+  {{- printf "dashboard" -}}
+{{- end -}}
+
+
+{{- define "common.fullname.dashboard" -}}
+  {{- $name := ( include "common.name.dashboard" . ) -}}
+  {{- $namespace := ( include "common.namespace.aux" . ) -}}
+  {{- printf "%s-%s" $namespace $name | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+
+{{- define "common.configmapname.dashboard" -}}
+  {{- $name := ( include "common.fullname.dashboard" . ) -}}
+  {{- printf "configmap-%s" $name | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+
+{{- define "common.deploymentname.dashboard" -}}
+  {{- $name := ( include "common.fullname.dashboard" . ) -}}
+  {{- printf "deployment-%s" $name | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+
+{{- define "common.containername.dashboard" -}}
+  {{- $name := ( include "common.fullname.dashboard" . ) -}}
+  {{- printf "container-%s" $name | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+
+{{- define "common.serviceaccountname.dashboard" -}}
+  {{- $name := ( include "common.fullname.dashboard" . ) -}}
+  {{- printf "svcacct-%s" $name | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+
+{{- define "common.ingressname.dashboard" -}}
+  {{- $name := ( include "common.fullname.dashboard" . ) -}}
+  {{- printf "ingress-%s" $name | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+
+{{- define "common.servicename.dashboard.http" -}}
+  {{- $name := ( include "common.fullname.dashboard" . ) -}}
+  {{- printf "service-%s-http" $name | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+
+{{- define "common.serviceport.dashboard.http" -}}30080{{- end -}}
+{{- define "common.serviceport.dashboard.container" -}}8080{{- end -}}
diff --git a/ric-common/Common-Template/helm/ric-common/templates/_dbaas.tpl b/ric-common/Common-Template/helm/ric-common/templates/_dbaas.tpl
new file mode 100644 (file)
index 0000000..54f9d28
--- /dev/null
@@ -0,0 +1,53 @@
+################################################################################
+#   Copyright (c) 2019 AT&T Intellectual Property.                             #
+#                                                                              #
+#   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.                                             #
+################################################################################
+
+{{- define "common.name.dbaas" -}}
+  {{- printf "dbaas" -}}
+{{- end -}}
+
+{{- define "common.fullname.dbaas" -}}
+  {{- $name := ( include "common.name.dbaas" . ) -}}
+  {{- $namespace := ( include "common.namespace.platform" . ) -}}
+  {{- printf "%s-%s" $namespace $name | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+
+{{- define "common.configmapname.dbaas" -}}
+  {{- $name := ( include "common.fullname.dbaas" . ) -}}
+  {{- printf "configmap-%s" $name | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+
+{{- define "common.deploymentname.dbaas" -}}
+  {{- $name := ( include "common.fullname.dbaas" . ) -}}
+  {{- printf "deployment-%s" $name | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+
+{{- define "common.containername.dbaas" -}}
+  {{- $name := ( include "common.fullname.dbaas" . ) -}}
+  {{- printf "container-%s" $name | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+
+
+{{- define "common.serviceaccountname.dbaas" -}}
+  {{- $name := ( include "common.fullname.dbaas" . ) -}}
+  {{- printf "svcacct-%s" $name | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+
+{{- define "common.servicename.dbaas.tcp" -}}
+  {{- $name := ( include "common.fullname.dbaas" . ) -}}
+  {{- printf "service-%s-tcp" $name | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+
+{{- define "common.serviceport.dbaas.tcp" -}}6379{{- end -}}
diff --git a/ric-common/Common-Template/helm/ric-common/templates/_deploymentname.tpl b/ric-common/Common-Template/helm/ric-common/templates/_deploymentname.tpl
deleted file mode 100644 (file)
index a2704ea..0000000
+++ /dev/null
@@ -1,91 +0,0 @@
-################################################################################
-#   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.                                             #
-################################################################################
-
-{{/*
-  Resolve the name of a chart's deployment.
-*/}}
-
-
-{{- define "common.deploymentname.appmgr" -}}
-  {{- $name := ( include "common.fullname.appmgr" . ) -}}
-  {{- printf "deployment-%s" $name | trunc 63 | trimSuffix "-" -}}
-{{- end -}}
-
-{{- define "common.deploymentname.dbaas" -}}
-  {{- $name := ( include "common.fullname.dbaas" . ) -}}
-  {{- printf "deployment-%s" $name | trunc 63 | trimSuffix "-" -}}
-{{- end -}}
-
-{{- define "common.deploymentname.e2mgr" -}}
-  {{- $name := ( include "common.fullname.e2mgr" . ) -}}
-  {{- printf "deployment-%s" $name | trunc 63 | trimSuffix "-" -}}
-{{- end -}}
-
-{{- define "common.deploymentname.rsm" -}}
-  {{- $name := ( include "common.fullname.rsm" . ) -}}
-  {{- printf "deployment-%s" $name | trunc 63 | trimSuffix "-" -}}
-{{- end -}}
-
-{{- define "common.deploymentname.rtmgr" -}}
-  {{- $name := ( include "common.fullname.rtmgr" . ) -}}
-  {{- printf "deployment-%s" $name | trunc 63 | trimSuffix "-" -}}
-{{- end -}}
-
-{{- define "common.deploymentname.submgr" -}}
-  {{- $name := ( include "common.fullname.submgr" . ) -}}
-  {{- printf "deployment-%s" $name | trunc 63 | trimSuffix "-" -}}
-{{- end -}}
-
-{{- define "common.deploymentname.a1mediator" -}}
-  {{- $name := ( include "common.fullname.a1mediator" . ) -}}
-  {{- printf "deployment-%s" $name | trunc 63 | trimSuffix "-" -}}
-{{- end -}}
-
-{{- define "common.deploymentname.vespamgr" -}}
-  {{- $name := ( include "common.fullname.vespamgr" . ) -}}
-  {{- printf "deployment-%s" $name | trunc 63 | trimSuffix "-" -}}
-{{- end -}}
-
-{{- define "common.deploymentname.jaegeradapter" -}}
-  {{- $name := ( include "common.fullname.jaegeradapter" . ) -}}
-  {{- printf "deployment-%s" $name | trunc 63 | trimSuffix "-" -}}
-{{- end -}}
-
-{{- define "common.deploymentname.nexus" -}}
-  {{- $name := ( include "common.fullname.nexus" . ) -}}
-  {{- printf "deployment-%s" $name | trunc 63 | trimSuffix "-" -}}
-{{- end -}}
-
-{{- define "common.deploymentname.chartmuseum" -}}
-  {{- $name := ( include "common.fullname.chartmuseum" . ) -}}
-  {{- printf "deployment-%s" $name | trunc 63 | trimSuffix "-" -}}
-{{- end -}}
-
-{{- define "common.deploymentname.dashboard" -}}
-  {{- $name := ( include "common.fullname.dashboard" . ) -}}
-  {{- printf "deployment-%s" $name | trunc 63 | trimSuffix "-" -}}
-{{- end -}}
-
-{{- define "common.deploymentname.messagerouter" -}}
-  {{- $name := ( include "common.fullname.messagerouter" . ) -}}
-  {{- printf "deployment-%s" $name | trunc 63 | trimSuffix "-" -}}
-{{- end -}}
-
-{{- define "common.deploymentname.ves" -}}
-  {{- $name := ( include "common.fullname.ves" . ) -}}
-  {{- printf "deployment-%s" $name | trunc 63 | trimSuffix "-" -}}
-{{- end -}}
diff --git a/ric-common/Common-Template/helm/ric-common/templates/_docker.tpl b/ric-common/Common-Template/helm/ric-common/templates/_docker.tpl
new file mode 100644 (file)
index 0000000..62ef171
--- /dev/null
@@ -0,0 +1,63 @@
+################################################################################
+#   Copyright (c) 2019 AT&T Intellectual Property.                             #
+#                                                                              #
+#   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.                                             #
+################################################################################
+
+{{- define "common.dockerregistry.url" -}}
+  {{- $defaultregistry := .defaultregistry }}
+  {{- $keylist := list $.ctx.Chart.Name "registry" -}}
+  {{- $ctx := dict "ctx" $.ctx.Values "keylist" $keylist -}}
+  {{- $overrideregistry := include "locate" $ctx -}}
+  {{- $keylist := list "common" "localregistry" -}}
+  {{- $ctx := dict "ctx" $.ctx.Values "keylist" $keylist -}}
+  {{- $localregistry := include "locate" $ctx -}}
+  {{- if not (empty $overrideregistry) -}}
+    {{- $overrideregistry -}}
+  {{- else -}}
+    {{- if not (empty $localregistry) -}}
+      {{- $localregistry -}}
+    {{- else -}}
+      {{- $defaultregistry -}}
+    {{- end -}}
+  {{- end -}}
+{{- end -}}
+
+
+{{- define "common.dockerregistry.credential" -}}
+  {{- $reponame := include "common.dockerregistry.url" . -}}
+  {{- $postfix := $reponame | replace "." "-" | replace ":" "-" | replace "/" "-" | trunc 63 | trimSuffix "-" -}}
+  {{- printf "secret-%s" $postfix -}}
+{{- end -}}
+
+
+{{- define "common.dockerregistry.pullpolicy" -}}
+  {{- $defaulpullpolicy := .defaultpullpolicy }}
+  {{- $keylist := list $.ctx.Chart.Name "pullpolicy" -}}
+  {{- $ctx := dict "ctx" $.ctx.Values "keylist" $keylist -}}
+  {{- $overridepullpolicy := include "locate" $ctx -}}
+  {{- $keylist := list "common" "pullpolicy" -}}
+  {{- $ctx := dict "ctx" $.ctx.Values "keylist" $keylist -}}
+  {{- $globalpullpolicy := include "locate" $ctx -}}
+  {{- if not (empty $overridepullpolicy) -}}
+    {{- $overridepullpolicy -}}
+  {{- else -}}
+    {{- if not (empty $globalpullpolicy) -}}
+      {{- $globalpullpolicy -}}
+    {{- else -}}
+      {{- $defaulpullpolicy -}}
+    {{- end -}}
+  {{- end -}}
+{{- end -}}
+
+
diff --git a/ric-common/Common-Template/helm/ric-common/templates/_docker_credential_name.tpl b/ric-common/Common-Template/helm/ric-common/templates/_docker_credential_name.tpl
deleted file mode 100644 (file)
index 717d238..0000000
+++ /dev/null
@@ -1,23 +0,0 @@
-################################################################################
-#   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.                                             #
-################################################################################
-
-
-
-
-{{- define "common.dockercred.prefix" -}}
-  {{- printf "secret-docker" -}}
-{{- end -}}
diff --git a/ric-common/Common-Template/helm/ric-common/templates/_dockerregistry.tpl b/ric-common/Common-Template/helm/ric-common/templates/_dockerregistry.tpl
deleted file mode 100644 (file)
index ac692ea..0000000
+++ /dev/null
@@ -1,174 +0,0 @@
-################################################################################
-#   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.                                             #
-################################################################################
-
-{{/*
-  Resolve the name of the common image repository.
-  The value for .Values.repository is used by default,
-  unless either override mechanism is used.
-
-  - .Values.global.repository  : override default image repository for all images
-  - .Values.repositoryOverride : override global and default image repository on a per image basis
-*/}}
-{{- define "common.repository" -}}
-  {{- $componentname := .Chart.Name -}}
-  {{- $firsttier := (index .Values (printf "%s" $componentname)) -}}
-  {{- if $firsttier -}}
-    {{- $secondtier := (index .Values (printf "%s" $componentname) (printf "%s" "repositoryOverride")) -}}
-    {{- if $secondtier -}}
-      {{- printf "%s" $secondtier -}}
-    {{- else -}}
-      {{- if .Values.global -}}
-        {{- if .Values.global.repository -}}
-          {{- printf "%s" .Values.global.repository -}}
-        {{- else -}}
-          {{- printf "%s" .Values.repository -}}
-        {{- end -}}
-      {{- else -}}
-        {{- printf "%s" .Values.repository -}}
-      {{- end -}}  
-    {{- end -}}
-  {{- else -}}
-    {{- if .Values.global -}}
-      {{- if .Values.global.repository -}}
-        {{- printf "%s" .Values.global.repository -}}
-      {{- else -}}
-        {{- printf "%s" .Values.repository -}}
-      {{- end -}}
-    {{- else -}}
-      {{- printf "%s" .Values.repository -}}
-    {{- end -}}  
-  {{- end -}}
-{{- end -}}
-
-
-{{/*
-  Resolve the docker image repository secret token configmap.
-  The secret token should be installed by K8S system admin.
-  The value for .Values.repositoryCred is used by default,
-  unless either override mechanism is used.
-
-  - .Values.global.repositoryCred  : override default docker registry credential
-  - .Values.repositoryCredOverride : override global and default docker registry credential
-*/}}
-{{- define "common.repositoryCred" -}}
-  {{- $componentname := .Chart.Name -}}
-  {{- $firsttier := (index .Values (printf "%s" $componentname)) -}}
-  {{- if $firsttier -}}
-    {{- $secondtier := (index .Values (printf "%s" $componentname) (printf "%s" "repositoryCredOverride")) -}}
-    {{- if $secondtier -}}
-      {{- printf "%s" $secondtier -}}
-    {{- else -}}
-      {{- if .Values.global -}}
-        {{- if .Values.global.repositoryCred -}}
-          {{- printf "%s" .Values.global.repositoryCred -}}
-        {{- else -}}
-          {{- printf "%s" .Values.repositoryCred -}}
-        {{- end -}}
-      {{- else -}}
-        {{- printf "%s" .Values.repositoryCred -}}
-      {{- end -}}
-    {{- end -}}
-  {{- else -}}
-    {{- if .Values.global -}}
-      {{- if .Values.global.repositoryCred -}}
-        {{- printf "%s" .Values.global.repositoryCred -}}
-      {{- else -}}
-        {{- printf "%s" .Values.repositoryCred -}}
-      {{- end -}}
-    {{- else -}}
-      {{- printf "%s" .Values.repositoryCred -}}
-    {{- end -}}
-  {{- end -}}
-{{- end -}}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-{{/*
-  Define the golbal image pull policy.
-  The value for .Values.imagePullPolicy is used by default,
-  unless either override mechanism is used.
-
-  - .Values.global.imagePullPolicy  : override default pull policy
-  - .Values.imagePullPolicyOverride : override global and default pull policy
-*/}}
-{{- define "common.pullPolicy" -}}
-  {{- if .Values.imagePullPolicyOverride -}}
-    {{- printf "%s" .Values.imagePullPolicyOverride -}}
-  {{- else -}}
-    {{- if  .Values.global -}}
-      {{- if .Values.global.imagePullPolicy -}}
-        {{- printf "%s" .Values.global.imagePullPolicy -}}
-      {{- else -}}
-        {{- printf "%s" .Values.imagePullPolicy -}}
-      {{- end -}}
-    {{- else -}}
-      {{- printf "%s" .Values.imagePullPolicy -}}
-    {{- end -}}
-  {{- end -}}
-{{- end -}}
-
-
-{{/*
-  Resolve the docker registry certificate name.
-  The value for .Values.repositoryCert is used by default,
-  unless either override mechanism is used.
-
-  - .Values.global.repositoryCert  : override default repository certificate
-  - .Values.repositoryCertOverride : override global and default repository certificate
-*/}}
-{{- define "common.repositorycert" -}}
-  {{- if .Values.repositoryCertOverride -}}
-    {{- printf "%s" .Values.repositoryCertOverride -}}
-  {{- else -}}
-    {{- if  .Values.global -}}
-      {{- if .Values.global.repositoryCert -}}
-        {{- printf "%s" .Values.global.repositoryCert -}}
-      {{- else -}}
-        {{- printf "%s" .Values.repositoryCert -}}
-      {{- end -}}
-    {{- else -}}
-      {{- printf "%s" .Values.repositoryCert -}}
-    {{- end -}}
-  {{- end -}}
-{{- end -}}
-
-
-
-
-
-
-{{/*
-Generate certificates for the docker registry
-*/}}
-{{- define "common.repository.gen-certs" -}}
-{{- $altNames := list ( printf "docker.%s" .Values.ingress.hostpostfix ) -}}
-{{- $ca := genCA "docker-registry-ca" 365 -}}
-{{- $cert := genSignedCert ( include "nexus.name" . ) nil $altNames 365 $ca -}}
-tls.crt: {{ $cert.Cert | b64enc }}
-tls.key: {{ $cert.Key | b64enc }}
-{{- end -}}
diff --git a/ric-common/Common-Template/helm/ric-common/templates/_e2mgr.tpl b/ric-common/Common-Template/helm/ric-common/templates/_e2mgr.tpl
new file mode 100644 (file)
index 0000000..5275d28
--- /dev/null
@@ -0,0 +1,66 @@
+################################################################################
+#   Copyright (c) 2019 AT&T Intellectual Property.                             #
+#                                                                              #
+#   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.                                             #
+################################################################################
+
+{{- define "common.name.e2mgr" -}}
+  {{- printf "e2mgr" -}}
+{{- end -}}
+
+{{- define "common.fullname.e2mgr" -}}
+  {{- $name := ( include "common.name.e2mgr" . ) -}}
+  {{- $namespace := ( include "common.namespace.platform" . ) -}}
+  {{- printf "%s-%s" $namespace $name | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+
+{{- define "common.configmapname.e2mgr" -}}
+  {{- $name := ( include "common.fullname.e2mgr" . ) -}}
+  {{- printf "configmap-%s" $name | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+
+{{- define "common.deploymentname.e2mgr" -}}
+  {{- $name := ( include "common.fullname.e2mgr" . ) -}}
+  {{- printf "deployment-%s" $name | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+
+{{- define "common.containername.e2mgr" -}}
+  {{- $name := ( include "common.fullname.e2mgr" . ) -}}
+  {{- printf "container-%s" $name | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+
+{{- define "common.serviceaccountname.e2mgr" -}}
+  {{- $name := ( include "common.fullname.e2mgr" . ) -}}
+  {{- printf "svcacct-%s" $name | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+
+{{- define "common.ingressname.e2mgr" -}}
+  {{- $name := ( include "common.fullname.e2mgr" . ) -}}
+  {{- printf "ingress-%s" $name | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+
+{{- define "common.kongpath.ric.e2mgr" -}}/e2mgr{{- end -}}
+
+{{- define "common.servicename.e2mgr.rmr" -}}
+  {{- $name := ( include "common.fullname.e2mgr" . ) -}}
+  {{- printf "service-%s-rmr" $name | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+
+{{- define "common.servicename.e2mgr.http" -}}
+  {{- $name := ( include "common.fullname.e2mgr" . ) -}}
+  {{- printf "service-%s-http" $name | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+
+{{- define "common.serviceport.e2mgr.rmr.data" -}}3801{{- end -}}
+{{- define "common.serviceport.e2mgr.rmr.route" -}}4561{{- end -}}
+{{- define "common.serviceport.e2mgr.http" -}}3800{{- end -}}
index 6ed3195..f83862e 100644 (file)
 #   limitations under the License.                                             #
 ################################################################################
 
-# template for component name
 {{- define "common.name.e2term" -}}
-  {{- if .Values.e2term -}}
-    {{- if .Values.e2term.nameOverride -}}
-      {{- printf "%s" .Values.e2term.nameOverride -}}
-    {{- else -}}
-      {{- printf "e2term" -}}
-    {{- end -}}
-  {{- else -}}
-    {{- printf "e2term" -}}
-  {{- end -}}
+  {{- printf "e2term" -}}
 {{- end -}}
 
 {{- define "common.fullname.e2term" -}}
@@ -81,3 +72,9 @@
   {{- $name := ( include "common.fullname.e2term" . ) -}}
   {{- printf "svcacct-%s" $name | trunc 63 | trimSuffix "-" -}}
 {{- end -}}
+
+
+{{- define "common.ingressname.e2term" -}}
+  {{- $name := ( include "common.fullname.e2term" . ) -}}
+  {{- printf "ingress-%s" $name | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
index 17c0bea..d895ddc 100644 (file)
 #   limitations under the License.                                             #
 ################################################################################
 
-# template for component name
+
 {{- define "common.name.esreader" -}}
-  {{- if .Values.esreader -}}
-    {{- if .Values.esreader.nameOverride -}}
-      {{- printf "%s" .Values.esreader.nameOverride -}}
-    {{- else -}}
-      {{- printf "esreader" -}}
-    {{- end -}}
-  {{- else -}}
-    {{- printf "esreader" -}}
-  {{- end -}}
+  {{- printf "esreader" -}}
 {{- end -}}
 
+
 {{- define "common.fullname.esreader" -}}
   {{- $name := ( include "common.name.esreader" . ) -}}
   {{- $namespace := ( include "common.namespace.infra" . ) -}}
diff --git a/ric-common/Common-Template/helm/ric-common/templates/_helm_credential_name.tpl b/ric-common/Common-Template/helm/ric-common/templates/_helm_credential_name.tpl
deleted file mode 100644 (file)
index cac7f1f..0000000
+++ /dev/null
@@ -1,27 +0,0 @@
-################################################################################
-#   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.                                             #
-################################################################################
-
-
-
-
-{{- define "common.helmcred.prefix" -}}
-  {{- printf "secret-helm" -}}
-{{- end -}}
-
-{{- define "common.helmcert.prefix" -}}
-  {{- printf "configmap-helm" -}}
-{{- end -}}
diff --git a/ric-common/Common-Template/helm/ric-common/templates/_helmrepo.tpl b/ric-common/Common-Template/helm/ric-common/templates/_helmrepo.tpl
deleted file mode 100644 (file)
index 6d28d22..0000000
+++ /dev/null
@@ -1,105 +0,0 @@
-################################################################################
-#   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.                                             #
-################################################################################
-
-{{/*
-  Resolve the name of the common helm repository.
-  The value for .Values.helmRepository is used by default,
-  unless either override mechanism is used.
-
-  - .Values.global.helmRepository  : override default helm repository for all components that use helm
-  - .Values.helmRepositoryOverride : override global and default helm repository on a per component base
-*/}}
-{{- define "common.helmrepository" -}}
-  {{- if .Values.helmRepositoryOverride -}}
-    {{- printf "%s" .Values.helmRepositoryOverride -}}
-  {{- else -}}
-    {{- if  .Values.global -}}
-      {{- if .Values.global.helmRepository -}}
-        {{- printf "%s" .Values.global.helmRepository -}}
-      {{- else -}}
-        {{- printf "%s" .Values.helmRepository -}}
-      {{- end -}}
-    {{- else -}}
-      {{- printf "%s" .Values.helmRepository -}}
-    {{- end -}}
-  {{- end -}}
-{{- end -}}
-
-
-{{/*
-  Resolve the helm repository secret token.
-  The secret token should be installed by K8S system admin.
-  The value for .Values.helmRepositoryCred is used by default,
-  unless either override mechanism is used.
-
-  - .Values.global.helmRepositoryCred  : override default helm repository credential
-  - .Values.helmRepositoryCredOverride : override global and default helm repository credential
-*/}}
-{{- define "common.helmrepositorycred" -}}
-  {{- if .Values.helmRepositoryCredOverride -}}
-    {{- printf "%s" .Values.helmRepositoryCredOverride -}}
-  {{- else -}}
-    {{- if  .Values.global -}}
-      {{- if .Values.global.helmRepositoryCred -}}
-        {{- printf "%s" .Values.global.helmRepositoryCred -}}
-      {{- else -}}
-        {{- printf "%s" .Values.helmRepositoryCred -}}
-      {{- end -}}
-    {{- else -}}
-      {{- printf "%s" .Values.helmRepositoryCred -}}
-    {{- end -}}
-  {{- end -}}
-{{- end -}}
-
-{{/*
-  Resolve the helm repository certificate.
-  The certificate should be installed by K8S system admin.
-  The value for .Values.helmRepositoryCert is used by default,
-  unless either override mechanism is used.
-
-  - .Values.global.helmrepositoryCert  : override default helm repository certificate
-  - .Values.helmRepositoryCertOverride : override global and default helm repository certificate
-*/}}
-{{- define "common.helmrepositorycert" -}}
-  {{- if .Values.helmRepositoryCertOverride -}}
-    {{- printf "%s" .Values.helmRepositoryCertOverride -}}
-  {{- else -}}
-    {{- if  .Values.global -}}
-      {{- if .Values.global.helmRepositoryCert -}}
-        {{- printf "%s" .Values.global.helmRepositoryCert -}}
-      {{- else -}}
-        {{- printf "%s" .Values.helmRepositoryCert -}}
-      {{- end -}}
-    {{- else -}}
-      {{- printf "%s" .Values.helmRepositoryCert -}}
-    {{- end -}}
-  {{- end -}}
-{{- end -}}
-
-
-
-{{/*
-Generate certificates for the helm repo
-*/}}
-{{- define "common.helmrepository.gen-certs" -}}
-{{- $altNames := list ( printf "helm.%s" .Values.ingress.hostpostfix ) -}}
-{{- $ca := genCA "helm-repository-ca" 365 -}}
-{{- $cert := genSignedCert ( include "nexus.name" . ) nil $altNames 365 $ca -}}
-tls.crt: {{ $cert.Cert | b64enc }}
-tls.key: {{ $cert.Key | b64enc }}
-{{- end -}}
-
diff --git a/ric-common/Common-Template/helm/ric-common/templates/_ingress_controller.tpl b/ric-common/Common-Template/helm/ric-common/templates/_ingress_controller.tpl
new file mode 100644 (file)
index 0000000..e136404
--- /dev/null
@@ -0,0 +1,71 @@
+################################################################################
+#   Copyright (c) 2019 AT&T Intellectual Property.                             #
+#                                                                              #
+#   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.                                             #
+################################################################################
+
+{{- define "common.ingresscontroller.url.platform" -}}
+  {{- $keylist := list "common" "ingresscontroller" "url" "platform" -}}
+  {{- $ctx := dict "ctx" $.Values "keylist" $keylist -}}
+  {{- $url := include "locate" $ctx -}}
+  {{- if not (empty $url) -}}
+    {{- $url -}}
+  {{- else -}}
+    {{- printf "ric-entry" -}}
+  {{- end -}}
+{{- end -}}
+
+{{- define "common.ingresscontroller.url.aux" -}}
+  {{- $keylist := list "common" "ingresscontroller" "url" "aux" -}}
+  {{- $ctx := dict "ctx" $.Values "keylist" $keylist -}}
+  {{- $url := include "locate" $ctx -}}
+  {{- if not (empty $url) -}}
+    {{- $url -}}
+  {{- else -}}
+    {{- printf "aux-entry" -}}
+  {{- end -}}
+{{- end -}}
+
+
+{{- define "common.ingresscontroller.url.dashboard" -}}
+  {{- $keylist := list "common" "ingresscontroller" "url" "dashboard" -}}
+  {{- $ctx := dict "ctx" $.Values "keylist" $keylist -}}
+  {{- $url := include "locate" $ctx -}}
+  {{- if not (empty $url) -}}
+    {{- $url -}}
+  {{- else -}}
+    {{- printf "dashboard-entry" -}}
+  {{- end -}}
+{{- end -}}
+
+{{- define "common.ingresscontroller.port.http" -}}
+  {{- $keylist := list "common" "ingresscontroller" "port" "http" -}}
+  {{- $ctx := dict "ctx" $.Values "keylist" $keylist -}}
+  {{- $port := include "locate" $ctx -}}
+  {{- if not (empty $port) -}}
+    {{- $port -}}
+  {{- else -}}
+    {{- printf "32080" -}}
+  {{- end -}}
+{{- end -}}
+
+{{- define "common.ingresscontroller.port.https" -}}
+  {{- $keylist := list "common" "ingresscontroller" "port" "https" -}}
+  {{- $ctx := dict "ctx" $.Values "keylist" $keylist -}}
+  {{- $port := include "locate" $ctx -}}
+  {{- if not (empty $port) -}}
+    {{- $port -}}
+  {{- else -}}
+    {{- printf "32443" -}}
+  {{- end -}}
+{{- end -}}
diff --git a/ric-common/Common-Template/helm/ric-common/templates/_ingresscontroller.tpl b/ric-common/Common-Template/helm/ric-common/templates/_ingresscontroller.tpl
deleted file mode 100644 (file)
index 2d75ee7..0000000
+++ /dev/null
@@ -1,85 +0,0 @@
-################################################################################
-#   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.                                             #
-################################################################################
-
-{{/*
-  Resolve the ingress controller addresses.
-*/}}
-
-####################### Service URL #####################################
-{{- define "common.ingressurl.ric" -}}
-  {{- if .Values.global -}}
-    {{- if .Values.global.ingressurl -}}
-      {{- if .Values.global.ingressurl.ric -}}
-        {{- printf "%s" .Values.global.ingressurl.ric -}}
-      {{- else -}}
-        {{- printf "ric-entry" -}}
-      {{- end -}}
-    {{- else -}}
-      {{- printf "ric-entry" -}}
-    {{- end -}}
-  {{- else -}}
-    {{- printf "ric-entry" -}}
-  {{- end -}}
-{{- end -}}
-
-
-{{- define "common.ingressurl.aux" -}}
-  {{- if .Values.global -}}
-    {{- if .Values.global.ingressurl -}}
-      {{- if .Values.global.ingressurl.aux -}}
-        {{- printf "%s" .Values.global.ingressurl.aux -}}
-      {{- else -}}
-        {{- printf "aux-entry" -}}
-      {{- end -}}
-    {{- else -}}
-      {{- printf "aux-entry" -}}
-    {{- end -}}
-  {{- else -}}
-    {{- printf "aux-entry" -}}
-  {{- end -}}
-{{- end -}}
-
-{{- define "common.ingressurl.dashboard" -}}
-  {{- if .Values.global -}}
-    {{- if .Values.global.ingressurl -}}
-      {{- if .Values.global.ingressurl.dashboard -}}
-        {{- printf "%s" .Values.global.ingressurl.dashboard -}}
-      {{- else -}}
-        {{- printf "dashboard-entry" -}}
-      {{- end -}}
-    {{- else -}}
-      {{- printf "dashboard-entry" -}}
-    {{- end -}}
-  {{- else -}}
-    {{- printf "dashboard-entry" -}}
-  {{- end -}}
-{{- end -}}
-
-
-####################### Ingress Controller Ports ###########################################
-## Currently the below values are hard-coded due to the fact that kong ingress controller  #
-## helm charts are not using this common template. We need to make sure that these values  #
-## agree with the values in the kong helm charts values.yaml files.                        #
-############################################################################################  
-{{- define "common.ingresshttpport" -}}
-  {{- printf "32080" -}}
-{{- end -}}
-
-{{- define "common.ingresshttpsport" -}}
-  {{- printf "32443" -}}
-{{- end -}}
-
diff --git a/ric-common/Common-Template/helm/ric-common/templates/_ingressname.tpl b/ric-common/Common-Template/helm/ric-common/templates/_ingressname.tpl
deleted file mode 100644 (file)
index 66cb741..0000000
+++ /dev/null
@@ -1,73 +0,0 @@
-################################################################################
-#   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.                                             #
-################################################################################
-
-
-
-{{- define "common.ingressname.appmgr" -}}
-  {{- $name := ( include "common.fullname.appmgr" . ) -}}
-  {{- printf "ingress-%s" $name | trunc 63 | trimSuffix "-" -}}
-{{- end -}}
-
-{{- define "common.ingressname.e2mgr" -}}
-  {{- $name := ( include "common.fullname.e2mgr" . ) -}}
-  {{- printf "ingress-%s" $name | trunc 63 | trimSuffix "-" -}}
-{{- end -}}
-
-{{- define "common.ingressname.rsm" -}}
-  {{- $name := ( include "common.fullname.rsm" . ) -}}
-  {{- printf "ingress-%s" $name | trunc 63 | trimSuffix "-" -}}
-{{- end -}}
-
-{{- define "common.ingressname.e2term" -}}
-  {{- $name := ( include "common.fullname.e2term" . ) -}}
-  {{- printf "ingress-%s" $name | trunc 63 | trimSuffix "-" -}}
-{{- end -}}
-
-{{- define "common.ingressname.rtmgr" -}}
-  {{- $name := ( include "common.fullname.rtmgr" . ) -}}
-  {{- printf "ingress-%s" $name | trunc 63 | trimSuffix "-" -}}
-{{- end -}}
-
-{{- define "common.ingressname.submgr" -}}
-  {{- $name := ( include "common.fullname.submgr" . ) -}}
-  {{- printf "ingress-%s" $name | trunc 63 | trimSuffix "-" -}}
-{{- end -}}
-
-{{- define "common.ingressname.a1mediator" -}}
-  {{- $name := ( include "common.fullname.a1mediator" . ) -}}
-  {{- printf "ingress-%s" $name | trunc 63 | trimSuffix "-" -}}
-{{- end -}}
-
-{{- define "common.ingressname.nexus" -}}
-  {{- $name := ( include "common.fullname.nexus" . ) -}}
-  {{- printf "ingress-%s" $name | trunc 63 | trimSuffix "-" -}}
-{{- end -}}
-
-{{- define "common.ingressname.chartmuseum" -}}
-  {{- $name := ( include "common.fullname.chartmuseum" . ) -}}
-  {{- printf "ingress-%s" $name | trunc 63 | trimSuffix "-" -}}
-{{- end -}}
-
-{{- define "common.ingressname.ves" -}}
-  {{- $name := ( include "common.fullname.ves" . ) -}}
-  {{- printf "ingress-%s" $name | trunc 63 | trimSuffix "-" -}}
-{{- end -}}
-
-{{- define "common.ingressname.dashboard" -}}
-  {{- $name := ( include "common.fullname.dashboard" . ) -}}
-  {{- printf "ingress-%s" $name | trunc 63 | trimSuffix "-" -}}
-{{- end -}}
diff --git a/ric-common/Common-Template/helm/ric-common/templates/_jaegeradapter.tpl b/ric-common/Common-Template/helm/ric-common/templates/_jaegeradapter.tpl
new file mode 100644 (file)
index 0000000..0743710
--- /dev/null
@@ -0,0 +1,72 @@
+################################################################################
+#   Copyright (c) 2019 AT&T Intellectual Property.                             #
+#                                                                              #
+#   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.                                             #
+################################################################################
+
+{{- define "common.name.jaegeradapter" -}}
+  {{- printf "jaegeradapter" -}}
+{{- end -}}
+
+{{- define "common.fullname.jaegeradapter" -}}
+  {{- $name := ( include "common.name.jaegeradapter" . ) -}}
+  {{- $namespace := ( include "common.namespace.platform" . ) -}}
+  {{- printf "%s-%s" $namespace $name | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+
+{{- define "common.configmapname.jaegeradapter" -}}
+  {{- $name := ( include "common.fullname.jaegeradapter" . ) -}}
+  {{- printf "configmap-%s" $name | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+
+{{- define "common.deploymentname.jaegeradapter" -}}
+  {{- $name := ( include "common.fullname.jaegeradapter" . ) -}}
+  {{- printf "deployment-%s" $name | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+
+{{- define "common.containername.jaegeradapter" -}}
+  {{- $name := ( include "common.fullname.jaegeradapter" . ) -}}
+  {{- printf "container-%s" $name | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+
+
+{{- define "common.servicename.jaegeradapter.query" -}}
+  {{- $name := ( include "common.fullname.jaegeradapter" . ) -}}
+  {{- printf "service-%s-query" $name | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+{{- define "common.servicename.jaegeradapter.collector" -}}
+  {{- $name := ( include "common.fullname.jaegeradapter" . ) -}}
+  {{- printf "service-%s-collector" $name | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+{{- define "common.servicename.jaegeradapter.agent" -}}
+  {{- $name := ( include "common.fullname.jaegeradapter" . ) -}}
+  {{- printf "service-%s-agent" $name | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+
+{{- define "common.serviceport.jaegeradapter.zipkincompact" -}}5775{{- end -}}
+{{- define "common.serviceport.jaegeradapter.jaegercompact" -}}6831{{- end -}}
+{{- define "common.serviceport.jaegeradapter.jaegerbinary" -}}6832{{- end -}}
+{{- define "common.serviceport.jaegeradapter.httpquery" -}}16686{{- end -}}
+{{- define "common.serviceport.jaegeradapter.httpconfig" -}}5778{{- end -}}
+{{- define "common.serviceport.jaegeradapter.zipkinhttp" -}}9411{{- end -}}
+{{- define "common.serviceport.jaegeradapter.jaegerhttp" -}}14268{{- end -}}
+{{- define "common.serviceport.jaegeradapter.jaegerhttpt" -}}14267{{- end -}}
+
+{{- define "common.portname.jaegeradapter.zipkincompact" -}}"zipkincompact"{{- end -}}
+{{- define "common.portname.jaegeradapter.jaegercompact" -}}"jaegercompact"{{- end -}}
+{{- define "common.portname.jaegeradapter.jaegerbinary" -}}"jaegerbinary"{{- end -}}
+{{- define "common.portname.jaegeradapter.zipkinhttp" -}}"zipkinhttp"{{- end -}}
+{{- define "common.portname.jaegeradapter.jaegerhttp" -}}"jaegerhttp"{{- end -}}
+{{- define "common.portname.jaegeradapter.jaegerhttpt" -}}"jaegerhttpt"{{- end -}}
+{{- define "common.portname.jaegeradapter.httpquery" -}}"httpquery"{{- end -}}
+{{- define "common.portname.jaegeradapter.httpconfig" -}}"httpconfig"{{- end -}}
diff --git a/ric-common/Common-Template/helm/ric-common/templates/_kongpath.tpl b/ric-common/Common-Template/helm/ric-common/templates/_kongpath.tpl
deleted file mode 100644 (file)
index 636f649..0000000
+++ /dev/null
@@ -1,26 +0,0 @@
-################################################################################
-#   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 file defines the URL paths that kong proxies for different servicess.
-*/}}
-{{- define "common.kongpath.aux.vescollector" -}}/vescollector{{- end -}}
-{{- define "common.kongpath.aux.helm" -}}/helm{{- end -}}
-{{- define "common.kongpath.ric.appmgr" -}}/appmgr{{- end -}}
-{{- define "common.kongpath.ric.a1mediator" -}}/a1mediator{{- end -}}
-{{- define "common.kongpath.ric.e2mgr" -}}/e2mgr{{- end -}}
-{{- define "common.kongpath.ric.rsm" -}}/rsm{{- end -}}
index 5b80f5e..7e50e03 100644 (file)
 #   limitations under the License.                                             #
 ################################################################################
 
-# template for component name
 {{- define "common.name.logstash" -}}
-  {{- if .Values.logstash -}}
-    {{- if .Values.logstash.nameOverride -}}
-      {{- printf "%s" .Values.logstash.nameOverride -}}
-    {{- else -}}
-      {{- printf "logstash" -}}
-    {{- end -}}
-  {{- else -}}
-    {{- printf "logstash" -}}
-  {{- end -}}
+  {{- printf "logstash" -}}
 {{- end -}}
 
+
 {{- define "common.fullname.logstash" -}}
   {{- $name := ( include "common.name.logstash" . ) -}}
   {{- $namespace := ( include "common.namespace.aux" . ) -}}
@@ -1,5 +1,5 @@
 ################################################################################
-#   Copyright (c) 2019 ATT Intellectual Property.                             #
+#   Copyright (c) 2019 AT&T Intellectual Property.                             #
 #                                                                              #
 #   Licensed under the Apache License, Version 2.0 (the "License");            #
 #   you may not use this file except in compliance with the License.           #
 #   limitations under the License.                                             #
 ################################################################################
 
-# template for component name
 {{- define "common.name.messagerouter" -}}
-  {{- if .Values.messagerouter -}}
-    {{- if .Values.messagerouter.nameOverride -}}
-      {{- printf "%s" .Values.messagerouter.nameOverride -}}
-    {{- else -}}
-      {{- printf "messagerouter" -}}
-    {{- end -}}
-  {{- else -}}
-    {{- printf "messagerouter" -}}
-  {{- end -}}
+  {{- printf "messagerouter" -}}
 {{- end -}}
 
 {{- define "common.fullname.messagerouter" -}}
   {{- printf "%s-%s" $namespace $name | trunc 63 | trimSuffix "-" -}}
 {{- end -}}
 
-
+{{- define "common.configmapname.messagerouter" -}}
+  {{- $name := ( include "common.fullname.messagerouter" . ) -}}
+  {{- printf "configmap-%s" $name | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
 
 {{- define "common.deploymentname.messagerouter" -}}
   {{- $name := ( include "common.fullname.messagerouter" . ) -}}
   {{- printf "deployment-%s" $name | trunc 63 | trimSuffix "-" -}}
 {{- end -}}
 
-
-{{- define "common.configmapname.messagerouter" -}}
+{{- define "common.containername.messagerouter" -}}
   {{- $name := ( include "common.fullname.messagerouter" . ) -}}
-  {{- printf "configmap-%s" $name | trunc 63 | trimSuffix "-" -}}
+  {{- printf "container-%s" $name | trunc 63 | trimSuffix "-" -}}
 {{- end -}}
 
-
-
-{{- define "common.containername.messagerouter" -}}
+{{- define "common.serviceaccountname.messagerouter" -}}
   {{- $name := ( include "common.fullname.messagerouter" . ) -}}
-  {{- printf "container-%s" $name | trunc 63 | trimSuffix "-" -}}
+  {{- printf "svcacct-%s" $name | trunc 63 | trimSuffix "-" -}}
 {{- end -}}
 
+{{- define "common.servicename.messagerouter.tcp" -}}
+  {{- $name := ( include "common.fullname.messagerouter" . ) -}}
+  {{- printf "service-%s-tcp" $name | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
 
 {{- define "common.serviceport.messagerouter.http" -}}3904{{- end -}}
+{{- define "common.serviceport.messagerouter.https" -}}3905{{- end -}}
+{{- define "common.serviceport.messagerouter.kafka" -}}9092{{- end -}}
+{{- define "common.serviceport.messagerouter.zookeeper" -}}2181{{- end -}}
+
 {{- define "common.servicename.messagerouter.http" -}}ricaux-messagerouter{{- end -}}
+
index 9a38261..15583d5 100644 (file)
 #   limitations under the License.                                             #
 ################################################################################
 
-# template for component name
+
 {{- define "common.name.mrsub" -}}
-  {{- if .Values.mrsub -}}
-    {{- if .Values.mrsub.nameOverride -}}
-      {{- printf "%s" .Values.mrsub.nameOverride -}}
-    {{- else -}}
-      {{- printf "mrsub" -}}
-    {{- end -}}
-  {{- else -}}
-    {{- printf "mrsub" -}}
-  {{- end -}}
+  {{- printf "mrsub" -}}
 {{- end -}}
 
 {{- define "common.fullname.mrsub" -}}
diff --git a/ric-common/Common-Template/helm/ric-common/templates/_name.tpl b/ric-common/Common-Template/helm/ric-common/templates/_name.tpl
deleted file mode 100644 (file)
index d2f17e9..0000000
+++ /dev/null
@@ -1,332 +0,0 @@
-################################################################################
-#   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 is the root file that define the name of each component. Value here will be used to define other K8S resource name.
-*/}}
-
-
-
-{{- define "common.name.appmgr" -}}
-  {{- if .Values.appmgr -}}
-    {{- if .Values.appmgr.nameOverride -}}
-      {{- printf "%s" .Values.appmgr.nameOverride -}}
-    {{- else -}}
-      {{- printf "appmgr" -}}
-    {{- end -}}
-  {{- else -}}
-    {{- printf "appmgr" -}}
-  {{- end -}}
-{{- end -}}
-
-{{- define "common.fullname.appmgr" -}}
-  {{- $name := ( include "common.name.appmgr" . ) -}}
-  {{- $namespace := ( include "common.namespace.platform" . ) -}}
-  {{- printf "%s-%s" $namespace $name | trunc 63 | trimSuffix "-" -}}
-{{- end -}}
-
-
-{{- define "common.name.dbaas" -}}
-  {{- if .Values.dbaas -}}
-    {{- if .Values.dbaas.nameOverride -}}
-      {{- printf "%s" .Values.dbaas.nameOverride -}}
-    {{- else -}}
-      {{- printf "dbaas" -}}
-    {{- end -}}
-  {{- else -}}
-    {{- printf "dbaas" -}}
-  {{- end -}}
-{{- end -}}
-
-{{- define "common.fullname.dbaas" -}}
-  {{- $name := ( include "common.name.dbaas" . ) -}}
-  {{- $namespace := ( include "common.namespace.platform" . ) -}}
-  {{- printf "%s-%s" $namespace $name | trunc 63 | trimSuffix "-" -}}
-{{- end -}}
-
-
-
-
-
-
-
-
-
-
-
-{{- define "common.name.e2mgr" -}}
-  {{- if .Values.e2mgr -}}
-    {{- if .Values.e2mgr.nameOverride -}}
-      {{- printf "%s" .Values.e2mgr.nameOverride -}}
-    {{- else -}}
-      {{- printf "e2mgr" -}}
-    {{- end -}}
-  {{- else -}}
-    {{- printf "e2mgr" -}}
-  {{- end -}}
-{{- end -}}
-
-
-{{- define "common.fullname.e2mgr" -}}
-  {{- $name := ( include "common.name.e2mgr" . ) -}}
-  {{- $namespace := ( include "common.namespace.platform" . ) -}}
-  {{- printf "%s-%s" $namespace $name | trunc 63 | trimSuffix "-" -}}
-{{- end -}}
-
-
-{{- define "common.name.rsm" -}}
-  {{- if .Values.rsm -}}
-    {{- if .Values.rsm.nameOverride -}}
-      {{- printf "%s" .Values.rsm.nameOverride -}}
-    {{- else -}}
-      {{- printf "rsm" -}}
-    {{- end -}}
-  {{- else -}}
-    {{- printf "rsm" -}}
-  {{- end -}}
-{{- end -}}
-
-
-{{- define "common.fullname.rsm" -}}
-  {{- $name := ( include "common.name.rsm" . ) -}}
-  {{- $namespace := ( include "common.namespace.platform" . ) -}}
-  {{- printf "%s-%s" $namespace $name | trunc 63 | trimSuffix "-" -}}
-{{- end -}}
-
-
-
-
-
-
-
-{{- define "common.name.rtmgr" -}}
-  {{- if .Values.rtmgr -}}
-    {{- if .Values.rtmgr.nameOverride -}}
-      {{- printf "%s" .Values.rtmgr.nameOverride -}}
-    {{- else -}}
-      {{- printf "rtmgr" -}}
-    {{- end -}}
-  {{- else -}}
-    {{- printf "rtmgr" -}}
-  {{- end -}}
-{{- end -}}
-
-
-{{- define "common.fullname.rtmgr" -}}
-  {{- $name := ( include "common.name.rtmgr" . ) -}}
-  {{- $namespace := ( include "common.namespace.platform" . ) -}}
-  {{- printf "%s-%s" $namespace $name | trunc 63 | trimSuffix "-" -}}
-{{- end -}}
-
-
-
-
-
-
-{{- define "common.name.submgr" -}}
-  {{- if .Values.submgr -}}
-    {{- if .Values.submgr.nameOverride -}}
-      {{- printf "%s" .Values.submgr.nameOverride -}}
-    {{- else -}}
-      {{- printf "submgr" -}}
-    {{- end -}}
-  {{- else -}}
-    {{- printf "submgr" -}}
-  {{- end -}}
-{{- end -}}
-
-
-{{- define "common.fullname.submgr" -}}
-  {{- $name := ( include "common.name.submgr" . ) -}}
-  {{- $namespace := ( include "common.namespace.platform" . ) -}}
-  {{- printf "%s-%s" $namespace $name | trunc 63 | trimSuffix "-" -}}
-{{- end -}}
-
-
-
-
-
-
-{{- define "common.name.a1mediator" -}}
-  {{- if .Values.a1mediator -}}
-    {{- if .Values.a1mediator.nameOverride -}}
-      {{- printf "%s" .Values.a1mediator.nameOverride -}}
-    {{- else -}}
-      {{- printf "a1mediator" -}}
-    {{- end -}}
-  {{- else -}}
-    {{- printf "a1mediator" -}}
-  {{- end -}}
-{{- end -}}
-
-
-{{- define "common.fullname.a1mediator" -}}
-  {{- $name := ( include "common.name.a1mediator" . ) -}}
-  {{- $namespace := ( include "common.namespace.platform" . ) -}}
-  {{- printf "%s-%s" $namespace $name | trunc 63 | trimSuffix "-" -}}
-{{- end -}}
-
-
-{{- define "common.name.vespamgr" -}}
-  {{- if .Values.vespamgr -}}
-    {{- if .Values.vespamgr.nameOverride -}}
-      {{- printf "%s" .Values.vespamgr.nameOverride -}}
-    {{- else -}}
-      {{- printf "vespamgr" -}}
-    {{- end -}}
-  {{- else -}}
-    {{- printf "vespamgr" -}}
-  {{- end -}}
-{{- end -}}
-
-
-{{- define "common.fullname.vespamgr" -}}
-  {{- $name := ( include "common.name.vespamgr" . ) -}}
-  {{- $namespace := ( include "common.namespace.platform" . ) -}}
-  {{- printf "%s-%s" $namespace $name | trunc 63 | trimSuffix "-" -}}
-{{- end -}}
-
-
-{{- define "common.name.jaegeradapter" -}}
-  {{- if .Values.jaegeradapter -}}
-    {{- if .Values.jaegeradapter.nameOverride -}}
-      {{- printf "%s" .Values.jaegeradapter.nameOverride -}}
-    {{- else -}}
-      {{- printf "jaegeradapter" -}}
-    {{- end -}}
-  {{- else -}}
-    {{- printf "jaegeradapter" -}}
-  {{- end -}}
-{{- end -}}
-
-{{- define "common.fullname.jaegeradapter" -}}
-  {{- $name := ( include "common.name.jaegeradapter" . ) -}}
-  {{- $namespace := ( include "common.namespace.platform" . ) -}}
-  {{- printf "%s-%s" $namespace $name | trunc 63 | trimSuffix "-" -}}
-{{- end -}}
-
-
-
-{{- define "common.name.nexus" -}}
-  {{- if .Values.nexus -}}
-    {{- if .Values.nexus.nameOverride -}}
-      {{- printf "%s" .Values.nexus.nameOverride -}}
-    {{- else -}}
-      {{- printf "nexus" -}}
-    {{- end -}}
-  {{- else -}}
-    {{- printf "nexus" -}}
-  {{- end -}}
-{{- end -}}
-
-
-{{- define "common.fullname.nexus" -}}
-  {{- $name := ( include "common.name.nexus" . ) -}}
-  {{- $namespace := ( include "common.namespace.infra" . ) -}}
-  {{- printf "%s-%s" $namespace $name | trunc 63 | trimSuffix "-" -}}
-{{- end -}}
-
-{{- define "common.name.chartmuseum" -}}
-  {{- if .Values.chartmuseum -}}
-    {{- if .Values.chartmuseum.nameOverride -}}
-      {{- printf "%s" .Values.chartmuseum.nameOverride -}}
-    {{- else -}}
-      {{- printf "chartmuseum" -}}
-    {{- end -}}
-  {{- else -}}
-    {{- printf "chartmuseum" -}}
-  {{- end -}}
-{{- end -}}
-
-
-{{- define "common.fullname.chartmuseum" -}}
-  {{- $name := ( include "common.name.chartmuseum" . ) -}}
-  {{- $namespace := ( include "common.namespace.infra" . ) -}}
-  {{- printf "%s-%s" $namespace $name | trunc 63 | trimSuffix "-" -}}
-{{- end -}}
-
-{{- define "common.name.dashboard" -}}
-  {{- if .Values.dashboard -}}
-    {{- if .Values.dashboard.nameOverride -}}
-      {{- printf "%s" .Values.dashboard.nameOverride -}}
-    {{- else -}}
-      {{- printf "dashboard" -}}
-    {{- end -}}
-  {{- else -}}
-    {{- printf "dashboard" -}}
-  {{- end -}}
-{{- end -}}
-
-
-{{- define "common.fullname.dashboard" -}}
-  {{- $name := ( include "common.name.dashboard" . ) -}}
-  {{- $namespace := ( include "common.namespace.aux" . ) -}}
-  {{- printf "%s-%s" $namespace $name | trunc 63 | trimSuffix "-" -}}
-{{- end -}}
-
-{{- define "common.name.messagerouter" -}}
-  {{- if .Values.messagerouter -}}
-    {{- if .Values.messagerouter.nameOverride -}}
-      {{- printf "%s" .Values.messagerouter.nameOverride -}}
-    {{- else -}}
-      {{- printf "messagerouter" -}}
-    {{- end -}}
-  {{- else -}}
-    {{- printf "messagerouter" -}}
-  {{- end -}}
-{{- end -}}
-
-
-{{- define "common.fullname.messagerouter" -}}
-  {{- $name := ( include "common.name.messagerouter" . ) -}}
-  {{- $namespace := ( include "common.namespace.aux" . ) -}}
-  {{- printf "%s-%s" $namespace $name | trunc 63 | trimSuffix "-" -}}
-{{- end -}}
-
-
-{{- define "common.name.ves" -}}
-  {{- if .Values.ves -}}
-    {{- if .Values.ves.nameOverride -}}
-      {{- printf "%s" .Values.ves.nameOverride -}}
-    {{- else -}}
-      {{- printf "ves" -}}
-    {{- end -}}
-  {{- else -}}
-    {{- printf "ves" -}}
-  {{- end -}}
-{{- end -}}
-
-
-{{- define "common.fullname.ves" -}}
-  {{- $name := ( include "common.name.ves" . ) -}}
-  {{- $namespace := ( include "common.namespace.aux" . ) -}}
-  {{- printf "%s-%s" $namespace $name | trunc 63 | trimSuffix "-" -}}
-{{- end -}}
-
-{{- define "common.name" -}}
-  {{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" -}}
-{{- end -}}
-
-{{/*
-  Create a default fully qualified application name.
-  Truncated at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
-*/}}
-{{- define "common.fullname" -}}
-  {{- $name := default .Chart.Name .Values.nameOverride -}}
-  {{- printf "%s-%s" .Release.Namespace $name | trunc 63 | trimSuffix "-" -}}
-{{- end -}}
index c506a59..d2df3ee 100644 (file)
@@ -1,6 +1,5 @@
 ################################################################################
 #   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.           #
 #   limitations under the License.                                             #
 ################################################################################
 
-{{/*
-  Resolve the namespace to apply to a chart. The default namespace suffix
-  is the name of the chart. This can be overridden if necessary (eg. for subcharts)
-  using the following value:
-
-  - .Values.nsPrefix  : override namespace prefix
-*/}}
-
 {{- define "common.namespace.platform" -}}
-  {{- if .Values.global -}}
-    {{- if .Values.global.namespace -}}
-      {{- if .Values.global.namespace.platform -}}
-        {{- printf "%s" .Values.global.namespace.platform -}}
-      {{- else -}}
-        {{- printf "ricplt" -}}
-      {{- end -}}
-    {{- else -}}
-      {{- printf "ricplt" -}}
-    {{- end -}}
+  {{- $keylist := list "common" "namespace" "platform" -}}
+  {{- $ctx := dict "ctx" $.Values "keylist" $keylist -}}
+  {{- $namespace := include "locate" $ctx -}}
+  {{- if not (empty $namespace) -}}
+    {{- $namespace -}}
   {{- else -}}
     {{- printf "ricplt" -}}
   {{- end -}}
 {{- end -}}
 
-{{- define "common.namespace.aux" -}}
-  {{- if .Values.global -}}
-    {{- if .Values.global.namespace -}}
-      {{- if .Values.global.namespace.aux -}}
-        {{- printf "%s" .Values.global.namespace.aux -}}
-      {{- else -}}
-        {{- printf "ricaux" -}}
-      {{- end -}}
-    {{- else -}}
-      {{- printf "ricaux" -}}
-    {{- end -}}
+{{- define "common.namespace.infra" -}}
+  {{- $keylist := list "common" "namespace" "infra" -}}
+  {{- $ctx := dict "ctx" $.Values "keylist" $keylist -}}
+  {{- $namespace := include "locate" $ctx -}}
+  {{- if not (empty $namespace) -}}
+    {{- $namespace -}}
   {{- else -}}
-    {{- printf "ricaux" -}}
+    {{- printf "ricinfra" -}}
   {{- end -}}
 {{- end -}}
 
 {{- define "common.namespace.xapp" -}}
-  {{- if .Values.global -}}
-    {{- if .Values.global.namespace -}}
-      {{- if .Values.global.namespace.xapp -}}
-        {{- printf "%s" .Values.global.namespace.xapp -}}
-      {{- else -}}
-        {{- printf "ricxapp" -}}
-      {{- end -}}
-    {{- else -}}
-      {{- printf "ricxapp" -}}
-    {{- end -}}
+  {{- $keylist := list "common" "namespace" "xapp" -}}
+  {{- $ctx := dict "ctx" $.Values "keylist" $keylist -}}
+  {{- $namespace := include "locate" $ctx -}}
+  {{- if not (empty $namespace) -}}
+    {{- $namespace -}}
   {{- else -}}
     {{- printf "ricxapp" -}}
   {{- end -}}
 {{- end -}}
 
-{{- define "common.namespace.infra" -}}
-  {{- if .Values.global -}}
-    {{- if .Values.global.namespace -}}
-      {{- if .Values.global.namespace.infra -}}
-        {{- printf "%s" .Values.global.namespace.infra -}}
-      {{- else -}}
-        {{- printf "ricinfra" -}}
-      {{- end -}}
-    {{- else -}}
-      {{- printf "ricinfra" -}}
-    {{- end -}}
+
+{{- define "common.namespace.aux" -}}
+  {{- $keylist := list "common" "namespace" "aux" -}}
+  {{- $ctx := dict "ctx" $.Values "keylist" $keylist -}}
+  {{- $namespace := include "locate" $ctx -}}
+  {{- if not (empty $namespace) -}}
+    {{- $namespace -}}
   {{- else -}}
-    {{- printf "ricinfra" -}}
+    {{- printf "ricaux" -}}
   {{- end -}}
 {{- end -}}
-
-{{- define "common.namespace" -}}
-  {{- default .Release.Namespace .Values.nsPrefix -}}
-{{- end -}}
diff --git a/ric-common/Common-Template/helm/ric-common/templates/_ports.tpl b/ric-common/Common-Template/helm/ric-common/templates/_ports.tpl
deleted file mode 100644 (file)
index 22d345a..0000000
+++ /dev/null
@@ -1,92 +0,0 @@
-################################################################################
-#   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 file defines the port numbers various components expose.
-
-  To ensure compatibility when switching between ClusterIP and headless service
-  types, the service port and container port must be the same.
-
-  For inter-component communications, the sender shall use 
-  {{ include "common.serviceport.XXXX" . }} template in its chart to
-  configure the destination port.  The receiver side MUST keep the
-  port numbers consistent with the ports that the container code implements.
-*/}}
-
-{{- define "common.serviceport.e2mgr.rmr.data" -}}3801{{- end -}}
-{{- define "common.serviceport.e2mgr.rmr.route" -}}4561{{- end -}}
-{{- define "common.serviceport.e2mgr.http" -}}3800{{- end -}}
-
-{{- define "common.serviceport.rsm.rmr.data" -}}4801{{- end -}}
-{{- define "common.serviceport.rsm.rmr.route" -}}4561{{- end -}}
-{{- define "common.serviceport.rsm.http" -}}4800{{- end -}}
-
-{{- define "common.serviceport.a1mediator.rmr.data" -}}4562{{- end -}}
-{{- define "common.serviceport.a1mediator.rmr.route" -}}4561{{- end -}}
-{{- define "common.serviceport.a1mediator.http" -}}10000{{- end -}}
-
-{{- define "common.serviceport.rtmgr.rmr.data" -}}4560{{- end -}}
-{{- define "common.serviceport.rtmgr.rmr.route" -}}4561{{- end -}}
-{{- define "common.serviceport.rtmgr.http" -}}3800{{- end -}}
-
-{{- define "common.serviceport.submgr.rmr.data" -}}4560{{- end -}}
-{{- define "common.serviceport.submgr.rmr.route" -}}4561{{- end -}}
-{{- define "common.serviceport.submgr.http" -}}3800{{- end -}}
-
-{{- define "common.serviceport.appmgr.rmr.data" -}}4560{{- end -}}
-{{- define "common.serviceport.appmgr.rmr.route" -}}4561{{- end -}}
-{{- define "common.serviceport.appmgr.http" -}}8080{{- end -}}
-
-{{- define "common.serviceport.vespamgr.http" -}}8080{{- end -}}
-
-{{- define "common.serviceport.jaegeradapter.zipkincompact" -}}5775{{- end -}}
-{{- define "common.serviceport.jaegeradapter.jaegercompact" -}}6831{{- end -}}
-{{- define "common.serviceport.jaegeradapter.jaegerbinary" -}}6832{{- end -}}
-{{- define "common.serviceport.jaegeradapter.httpquery" -}}16686{{- end -}}
-{{- define "common.serviceport.jaegeradapter.httpconfig" -}}5778{{- end -}}
-{{- define "common.serviceport.jaegeradapter.zipkinhttp" -}}9411{{- end -}}
-{{- define "common.serviceport.jaegeradapter.jaegerhttp" -}}14268{{- end -}}
-{{- define "common.serviceport.jaegeradapter.jaegerhttpt" -}}14267{{- end -}}
-{{- define "common.portname.jaegeradapter.zipkincompact" -}}"zipkincompact"{{- end -}}
-{{- define "common.portname.jaegeradapter.jaegercompact" -}}"jaegercompact"{{- end -}}
-{{- define "common.portname.jaegeradapter.jaegerbinary" -}}"jaegerbinary"{{- end -}}
-{{- define "common.portname.jaegeradapter.zipkinhttp" -}}"zipkinhttp"{{- end -}}
-{{- define "common.portname.jaegeradapter.jaegerhttp" -}}"jaegerhttp"{{- end -}}
-{{- define "common.portname.jaegeradapter.jaegerhttpt" -}}"jaegerhttpt"{{- end -}}
-{{- define "common.portname.jaegeradapter.httpquery" -}}"httpquery"{{- end -}}
-{{- define "common.portname.jaegeradapter.httpconfig" -}}"httpconfig"{{- end -}}
-
-
-
-
-{{- define "common.serviceport.nexus.http" -}}8080{{- end -}}
-
-{{- define "common.serviceport.chartmuseum.http" -}}8080{{- end -}}
-
-{{- define "common.serviceport.dashboard.http" -}}30080{{- end -}}
-{{- define "common.serviceport.dashboard.container" -}}8080{{- end -}}
-
-{{- define "common.serviceport.dbaas.tcp" -}}6379{{- end -}}
-
-{{- define "common.serviceport.messagerouter.http" -}}3904{{- end -}}
-{{- define "common.serviceport.messagerouter.https" -}}3905{{- end -}}
-{{- define "common.serviceport.messagerouter.kafka" -}}9092{{- end -}}
-{{- define "common.serviceport.messagerouter.zookeeper" -}}2181{{- end -}}
-
-{{- define "common.serviceport.ves.http" -}}8080{{- end -}}
-{{- define "common.serviceport.ves.https" -}}8443{{- end -}}
diff --git a/ric-common/Common-Template/helm/ric-common/templates/_rsm.tpl b/ric-common/Common-Template/helm/ric-common/templates/_rsm.tpl
new file mode 100644 (file)
index 0000000..4fe5d46
--- /dev/null
@@ -0,0 +1,66 @@
+################################################################################
+#   Copyright (c) 2019 AT&T Intellectual Property.                             #
+#                                                                              #
+#   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.                                             #
+################################################################################
+
+{{- define "common.name.rsm" -}}
+  {{- printf "rsm" -}}
+{{- end -}}
+
+{{- define "common.fullname.rsm" -}}
+  {{- $name := ( include "common.name.rsm" . ) -}}
+  {{- $namespace := ( include "common.namespace.platform" . ) -}}
+  {{- printf "%s-%s" $namespace $name | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+
+{{- define "common.configmapname.rsm" -}}
+  {{- $name := ( include "common.fullname.rsm" . ) -}}
+  {{- printf "configmap-%s" $name | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+
+{{- define "common.deploymentname.rsm" -}}
+  {{- $name := ( include "common.fullname.rsm" . ) -}}
+  {{- printf "deployment-%s" $name | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+
+{{- define "common.containername.rsm" -}}
+  {{- $name := ( include "common.fullname.rsm" . ) -}}
+  {{- printf "container-%s" $name | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+
+{{- define "common.serviceaccountname.rsm" -}}
+  {{- $name := ( include "common.fullname.rsm" . ) -}}
+  {{- printf "svcacct-%s" $name | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+
+{{- define "common.ingressname.rsm" -}}
+  {{- $name := ( include "common.fullname.rsm" . ) -}}
+  {{- printf "ingress-%s" $name | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+
+{{- define "common.kongpath.ric.rsm" -}}/rsm{{- end -}}
+
+{{- define "common.servicename.rsm.rmr" -}}
+  {{- $name := ( include "common.fullname.rsm" . ) -}}
+  {{- printf "service-%s-rmr" $name | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+
+{{- define "common.servicename.rsm.http" -}}
+  {{- $name := ( include "common.fullname.rsm" . ) -}}
+  {{- printf "service-%s-http" $name | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+
+{{- define "common.serviceport.rsm.rmr.data" -}}4801{{- end -}}
+{{- define "common.serviceport.rsm.rmr.route" -}}4561{{- end -}}
+{{- define "common.serviceport.rsm.http" -}}4800{{- end -}}
diff --git a/ric-common/Common-Template/helm/ric-common/templates/_rtmgr.tpl b/ric-common/Common-Template/helm/ric-common/templates/_rtmgr.tpl
new file mode 100644 (file)
index 0000000..f3dd2ab
--- /dev/null
@@ -0,0 +1,64 @@
+################################################################################
+#   Copyright (c) 2019 AT&T Intellectual Property.                             #
+#                                                                              #
+#   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.                                             #
+################################################################################
+
+{{- define "common.name.rtmgr" -}}
+  {{- printf "rtmgr" -}}
+{{- end -}}
+
+{{- define "common.fullname.rtmgr" -}}
+  {{- $name := ( include "common.name.rtmgr" . ) -}}
+  {{- $namespace := ( include "common.namespace.platform" . ) -}}
+  {{- printf "%s-%s" $namespace $name | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+
+{{- define "common.configmapname.rtmgr" -}}
+  {{- $name := ( include "common.fullname.rtmgr" . ) -}}
+  {{- printf "configmap-%s" $name | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+
+{{- define "common.deploymentname.rtmgr" -}}
+  {{- $name := ( include "common.fullname.rtmgr" . ) -}}
+  {{- printf "deployment-%s" $name | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+
+{{- define "common.containername.rtmgr" -}}
+  {{- $name := ( include "common.fullname.rtmgr" . ) -}}
+  {{- printf "container-%s" $name | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+
+{{- define "common.serviceaccountname.rtmgr" -}}
+  {{- $name := ( include "common.fullname.rtmgr" . ) -}}
+  {{- printf "svcacct-%s" $name | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+
+{{- define "common.ingressname.rtmgr" -}}
+  {{- $name := ( include "common.fullname.rtmgr" . ) -}}
+  {{- printf "ingress-%s" $name | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+
+{{- define "common.servicename.rtmgr.rmr" -}}
+  {{- $name := ( include "common.fullname.rtmgr" . ) -}}
+  {{- printf "service-%s-rmr" $name | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+
+{{- define "common.servicename.rtmgr.http" -}}
+  {{- $name := ( include "common.fullname.rtmgr" . ) -}}
+  {{- printf "service-%s-http" $name | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+
+{{- define "common.serviceport.rtmgr.rmr.data" -}}4560{{- end -}}
+{{- define "common.serviceport.rtmgr.rmr.route" -}}4561{{- end -}}
+{{- define "common.serviceport.rtmgr.http" -}}3800{{- end -}}
diff --git a/ric-common/Common-Template/helm/ric-common/templates/_serviceaccountname.tpl b/ric-common/Common-Template/helm/ric-common/templates/_serviceaccountname.tpl
deleted file mode 100644 (file)
index ba84006..0000000
+++ /dev/null
@@ -1,77 +0,0 @@
-################################################################################
-#   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.                                             #
-################################################################################
-
-{{/*
-  Resolve the name of a chart's serviceaccount
-*/}}
-
-
-{{- define "common.serviceaccountname.appmgr" -}}
-  {{- $name := ( include "common.fullname.appmgr" . ) -}}
-  {{- printf "svcacct-%s" $name | trunc 63 | trimSuffix "-" -}}
-{{- end -}}
-
-{{- define "common.serviceaccountname.dbaas" -}}
-  {{- $name := ( include "common.fullname.dbaas" . ) -}}
-  {{- printf "svcacct-%s" $name | trunc 63 | trimSuffix "-" -}}
-{{- end -}}
-
-{{- define "common.serviceaccountname.e2mgr" -}}
-  {{- $name := ( include "common.fullname.e2mgr" . ) -}}
-  {{- printf "svcacct-%s" $name | trunc 63 | trimSuffix "-" -}}
-{{- end -}}
-
-
-{{- define "common.serviceaccountname.rsm" -}}
-  {{- $name := ( include "common.fullname.rsm" . ) -}}
-  {{- printf "svcacct-%s" $name | trunc 63 | trimSuffix "-" -}}
-{{- end -}}
-
-{{- define "common.serviceaccountname.rtmgr" -}}
-  {{- $name := ( include "common.fullname.rtmgr" . ) -}}
-  {{- printf "svcacct-%s" $name | trunc 63 | trimSuffix "-" -}}
-{{- end -}}
-
-{{- define "common.serviceaccountname.a1mediator" -}}
-  {{- $name := ( include "common.fullname.a1mediator" . ) -}}
-  {{- printf "svcacct-%s" $name | trunc 63 | trimSuffix "-" -}}
-{{- end -}}
-
-{{- define "common.serviceaccountname.nexus" -}}
-  {{- $name := ( include "common.fullname.nexus" . ) -}}
-  {{- printf "svcacct-%s" $name | trunc 63 | trimSuffix "-" -}}
-{{- end -}}
-
-{{- define "common.serviceaccountname.chartmuseum" -}}
-  {{- $name := ( include "common.fullname.chartmuseum" . ) -}}
-  {{- printf "svcacct-%s" $name | trunc 63 | trimSuffix "-" -}}
-{{- end -}}
-
-{{- define "common.serviceaccountname.dashboard" -}}
-  {{- $name := ( include "common.fullname.dashboard" . ) -}}
-  {{- printf "svcacct-%s" $name | trunc 63 | trimSuffix "-" -}}
-{{- end -}}
-
-{{- define "common.serviceaccountname.messagerouter" -}}
-  {{- $name := ( include "common.fullname.messagerouter" . ) -}}
-  {{- printf "svcacct-%s" $name | trunc 63 | trimSuffix "-" -}}
-{{- end -}}
-
-{{- define "common.serviceaccountname.ves" -}}
-  {{- $name := ( include "common.fullname.ves" . ) -}}
-  {{- printf "svcacct-%s" $name | trunc 63 | trimSuffix "-" -}}
-{{- end -}}
diff --git a/ric-common/Common-Template/helm/ric-common/templates/_servicename.tpl b/ric-common/Common-Template/helm/ric-common/templates/_servicename.tpl
deleted file mode 100644 (file)
index 5e89606..0000000
+++ /dev/null
@@ -1,170 +0,0 @@
-################################################################################
-#   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.                                             #
-################################################################################
-
-{{/*
-  Resolve the name of a chart's service.
-
-  The default will be the chart name (or .Values.nameOverride if set).
-  And the use of .Values.service.name overrides all.
-
-  - .Values.service.name  : override default service (ie. chart) name
-*/}}
-{{/*
-  Expand the service name for a chart.
-*/}}
-
-
-###################### RMR Service ##################################
-{{- define "common.servicename.appmgr.rmr" -}}
-  {{- $name := ( include "common.fullname.appmgr" . ) -}}
-  {{- printf "service-%s-rmr" $name | trunc 63 | trimSuffix "-" -}}
-{{- end -}}
-
-
-{{- define "common.servicename.e2mgr.rmr" -}}
-  {{- $name := ( include "common.fullname.e2mgr" . ) -}}
-  {{- printf "service-%s-rmr" $name | trunc 63 | trimSuffix "-" -}}
-{{- end -}}
-
-{{- define "common.servicename.rsm.rmr" -}}
-  {{- $name := ( include "common.fullname.rsm" . ) -}}
-  {{- printf "service-%s-rmr" $name | trunc 63 | trimSuffix "-" -}}
-{{- end -}}
-
-{{- define "common.servicename.rtmgr.rmr" -}}
-  {{- $name := ( include "common.fullname.rtmgr" . ) -}}
-  {{- printf "service-%s-rmr" $name | trunc 63 | trimSuffix "-" -}}
-{{- end -}}
-
-{{- define "common.servicename.submgr.rmr" -}}
-  {{- $name := ( include "common.fullname.submgr" . ) -}}
-  {{- printf "service-%s-rmr" $name | trunc 63 | trimSuffix "-" -}}
-{{- end -}}
-
-{{- define "common.servicename.a1mediator.rmr" -}}
-  {{- $name := ( include "common.fullname.a1mediator" . ) -}}
-  {{- printf "service-%s-rmr" $name | trunc 63 | trimSuffix "-" -}}
-{{- end -}}
-
-
-###################### Http Service ##################################
-
-{{- define "common.servicename.appmgr.http" -}}
-  {{- $name := ( include "common.fullname.appmgr" . ) -}}
-  {{- printf "service-%s-http" $name | trunc 63 | trimSuffix "-" -}}
-{{- end -}}
-
-{{- define "common.servicename.e2mgr.http" -}}
-  {{- $name := ( include "common.fullname.e2mgr" . ) -}}
-  {{- printf "service-%s-http" $name | trunc 63 | trimSuffix "-" -}}
-{{- end -}}
-
-{{- define "common.servicename.rsm.http" -}}
-  {{- $name := ( include "common.fullname.rsm" . ) -}}
-  {{- printf "service-%s-http" $name | trunc 63 | trimSuffix "-" -}}
-{{- end -}}
-
-{{- define "common.servicename.rtmgr.http" -}}
-  {{- $name := ( include "common.fullname.rtmgr" . ) -}}
-  {{- printf "service-%s-http" $name | trunc 63 | trimSuffix "-" -}}
-{{- end -}}
-
-{{- define "common.servicename.submgr.http" -}}
-  {{- $name := ( include "common.fullname.submgr" . ) -}}
-  {{- printf "service-%s-http" $name | trunc 63 | trimSuffix "-" -}}
-{{- end -}}
-
-{{- define "common.servicename.a1mediator.http" -}}
-  {{- $name := ( include "common.fullname.a1mediator" . ) -}}
-  {{- printf "service-%s-http" $name | trunc 63 | trimSuffix "-" -}}
-{{- end -}}
-
-{{- define "common.servicename.vespamgr.http" -}}
-  {{- $name := ( include "common.fullname.vespamgr" . ) -}}
-  {{- printf "service-%s-http" $name | trunc 63 | trimSuffix "-" -}}
-{{- end -}}
-
-{{- define "common.servicename.nexus.http" -}}
-  {{- $name := ( include "common.fullname.nexus" . ) -}}
-  {{- printf "service-%s-http" $name | trunc 63 | trimSuffix "-" -}}
-{{- end -}}
-
-{{- define "common.servicename.chartmuseum.http" -}}
-  {{- $name := ( include "common.fullname.chartmuseum" . ) -}}
-  {{- printf "service-%s-http" $name | trunc 63 | trimSuffix "-" -}}
-{{- end -}}
-
-{{- define "common.servicename.dashboard.http" -}}
-  {{- $name := ( include "common.fullname.dashboard" . ) -}}
-  {{- printf "service-%s-http" $name | trunc 63 | trimSuffix "-" -}}
-{{- end -}}
-
-{{- define "common.servicename.ves.http" -}}
-  {{- $name := ( include "common.fullname.ves" . ) -}}
-  {{- printf "service-%s-http" $name | trunc 63 | trimSuffix "-" -}}
-{{- end -}}
-
-{{- define "common.servicename.jaegeradapter.query" -}}
-  {{- $name := ( include "common.fullname.jaegeradapter" . ) -}}
-  {{- printf "service-%s-query" $name | trunc 63 | trimSuffix "-" -}}
-{{- end -}}
-{{- define "common.servicename.jaegeradapter.collector" -}}
-  {{- $name := ( include "common.fullname.jaegeradapter" . ) -}}
-  {{- printf "service-%s-collector" $name | trunc 63 | trimSuffix "-" -}}
-{{- end -}}
-{{- define "common.servicename.jaegeradapter.agent" -}}
-  {{- $name := ( include "common.fullname.jaegeradapter" . ) -}}
-  {{- printf "service-%s-agent" $name | trunc 63 | trimSuffix "-" -}}
-{{- end -}}
-
-###################### TCP Service ##################################
-
-{{- define "common.servicename.dbaas.tcp" -}}
-  {{- $name := ( include "common.fullname.dbaas" . ) -}}
-  {{- printf "service-%s-tcp" $name | trunc 63 | trimSuffix "-" -}}
-{{- end -}}
-
-{{- define "common.servicename.messagerouter.tcp" -}}
-  {{- $name := ( include "common.fullname.messagerouter" . ) -}}
-  {{- printf "service-%s-tcp" $name | trunc 63 | trimSuffix "-" -}}
-{{- end -}}
-
-{{- define "common.servicename.ves.tcp" -}}
-  {{- $name := ( include "common.fullname.ves" . ) -}}
-  {{- printf "service-%s-tcp" $name | trunc 63 | trimSuffix "-" -}}
-{{- end -}}
-
-
-
-#################### Default ###############
-
-
-{{/*
-  Resolve the name of a chart's service.
-
-  The default will be the chart name (or .Values.nameOverride if set).
-  And the use of .Values.service.name overrides all.
-
-  - .Values.service.name  : override default service (ie. chart) name
-*/}}
-{{/*
-  Expand the service name for a chart.
-*/}}
-{{- define "common.servicename" -}}
-  {{- $name := default .Chart.Name .Values.nameOverride -}}
-  {{- default $name .Values.service.name | trunc 63 | trimSuffix "-" -}}
-{{- end -}}
diff --git a/ric-common/Common-Template/helm/ric-common/templates/_submgr.tpl b/ric-common/Common-Template/helm/ric-common/templates/_submgr.tpl
new file mode 100644 (file)
index 0000000..b4b06c1
--- /dev/null
@@ -0,0 +1,55 @@
+################################################################################
+#   Copyright (c) 2019 AT&T Intellectual Property.                             #
+#                                                                              #
+#   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.                                             #
+################################################################################
+
+{{- define "common.name.submgr" -}}
+  {{- printf "submgr" -}}
+{{- end -}}
+
+{{- define "common.fullname.submgr" -}}
+  {{- $name := ( include "common.name.submgr" . ) -}}
+  {{- $namespace := ( include "common.namespace.platform" . ) -}}
+  {{- printf "%s-%s" $namespace $name | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+
+{{- define "common.configmapname.submgr" -}}
+  {{- $name := ( include "common.fullname.submgr" . ) -}}
+  {{- printf "configmap-%s" $name | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+
+
+{{- define "common.deploymentname.submgr" -}}
+  {{- $name := ( include "common.fullname.submgr" . ) -}}
+  {{- printf "deployment-%s" $name | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+
+{{- define "common.containername.submgr" -}}
+  {{- $name := ( include "common.fullname.submgr" . ) -}}
+  {{- printf "container-%s" $name | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+
+{{- define "common.servicename.submgr.rmr" -}}
+  {{- $name := ( include "common.fullname.submgr" . ) -}}
+  {{- printf "service-%s-rmr" $name | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+
+{{- define "common.servicename.submgr.http" -}}
+  {{- $name := ( include "common.fullname.submgr" . ) -}}
+  {{- printf "service-%s-http" $name | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+
+{{- define "common.serviceport.submgr.rmr.data" -}}4560{{- end -}}
+{{- define "common.serviceport.submgr.rmr.route" -}}4561{{- end -}}
+{{- define "common.serviceport.submgr.http" -}}3800{{- end -}}
@@ -35,9 +35,9 @@
 
 {{- define "printer" -}}
   {{- $topctx := .ctx }}
-  {{- if hasKey $topctx.Values "global" }}
-    {{- if hasKey $topctx.Values.global "tillers" }}
-      {{- $ctx := index $topctx.Values.global.tillers .key -}}
+  {{- if hasKey $topctx.Values "common" }}
+    {{- if hasKey $topctx.Values.common "tillers" }}
+      {{- $ctx := index $topctx.Values.common.tillers .key -}}
       {{- if not (empty $ctx) -}}
         {{- $newctx := dict "ctx" $ctx "printkeys" .printkey -}}     
         {{- include "recursiveprinter" $newctx -}}
@@ -92,6 +92,7 @@
   {{- default false (include "printer" $newctx) -}}
 {{- end -}}
 
+
 {{- define "common.tillerHelmClientTLSSecret" -}}
   {{- $tlsverify := include "common.tillerTLSVerify" . }}
   {{- $tlsauthenticate := include "common.tillerTLSAuthenticate" . }}
 {{- end -}}
 
 
-
-
 {{- define "common.serviceaccountname.tiller" -}}
   {{- $name := ( include "common.tillerName" . ) -}}
   {{- printf "svcacct-tiller-%s" $name | trunc 63 | trimSuffix "-" -}}
 
 {{- define "common.servicename.tiller" -}}
   {{- $topctx := .ctx }}
-  {{- if hasKey $topctx.Values "global" }}
-    {{- if hasKey $topctx.Values.global "tillers" }}
-      {{- $ctx := index $topctx.Values.global.tillers .key -}}
+  {{- if hasKey $topctx.Values "common" }}
+    {{- if hasKey $topctx.Values.common "tillers" }}
+      {{- $ctx := index $topctx.Values.common.tillers .key -}}
       {{- if not (empty $ctx) -}}
         {{- if hasKey $ctx "name" -}}
           {{- $name := include "common.tillerName" . -}}
diff --git a/ric-common/Common-Template/helm/ric-common/templates/_ves.tpl b/ric-common/Common-Template/helm/ric-common/templates/_ves.tpl
new file mode 100644 (file)
index 0000000..e768551
--- /dev/null
@@ -0,0 +1,66 @@
+################################################################################
+#   Copyright (c) 2019 AT&T Intellectual Property.                             #
+#                                                                              #
+#   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.                                             #
+################################################################################
+
+{{- define "common.name.ves" -}}
+  {{- printf "ves" -}}
+{{- end -}}
+
+
+{{- define "common.fullname.ves" -}}
+  {{- $name := ( include "common.name.ves" . ) -}}
+  {{- $namespace := ( include "common.namespace.aux" . ) -}}
+  {{- printf "%s-%s" $namespace $name | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+
+{{- define "common.configmapname.ves" -}}
+  {{- $name := ( include "common.fullname.ves" . ) -}}
+  {{- printf "configmap-%s" $name | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+
+{{- define "common.deploymentname.ves" -}}
+  {{- $name := ( include "common.fullname.ves" . ) -}}
+  {{- printf "deployment-%s" $name | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+
+{{- define "common.containername.ves" -}}
+  {{- $name := ( include "common.fullname.ves" . ) -}}
+  {{- printf "container-%s" $name | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+
+{{- define "common.serviceaccountname.ves" -}}
+  {{- $name := ( include "common.fullname.ves" . ) -}}
+  {{- printf "svcacct-%s" $name | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+
+{{- define "common.ingressname.ves" -}}
+  {{- $name := ( include "common.fullname.ves" . ) -}}
+  {{- printf "ingress-%s" $name | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+
+{{- define "common.kongpath.aux.vescollector" -}}/vescollector{{- end -}}
+
+{{- define "common.servicename.ves.http" -}}
+  {{- $name := ( include "common.fullname.ves" . ) -}}
+  {{- printf "service-%s-http" $name | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+
+{{- define "common.servicename.ves.tcp" -}}
+  {{- $name := ( include "common.fullname.ves" . ) -}}
+  {{- printf "service-%s-tcp" $name | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+
+{{- define "common.serviceport.ves.http" -}}8080{{- end -}}
+{{- define "common.serviceport.ves.https" -}}8443{{- end -}}
 #   limitations under the License.                                             #
 ################################################################################
 
-{{/* vim: set filetype=mustache: */}}
-{{/*
-Expand the name of the chart.
-*/}}
-{{- define "dbaas.name" -}}
-{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" -}}
+{{- define "common.name.vespamgr" -}}
+  {{- printf "vespamgr" -}}
 {{- end -}}
 
-{{/*
-Create a default fully qualified app name.
-We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
-If release name contains chart name it will be used as a full name.
-*/}}
-{{- define "dbaas.fullname" -}}
-{{- if .Values.fullnameOverride -}}
-{{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" -}}
-{{- else -}}
-{{- $name := default .Chart.Name .Values.nameOverride -}}
-{{- if contains $name .Release.Name -}}
-{{- .Release.Name | trunc 63 | trimSuffix "-" -}}
-{{- else -}}
-{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" -}}
+{{- define "common.fullname.vespamgr" -}}
+  {{- $name := ( include "common.name.vespamgr" . ) -}}
+  {{- $namespace := ( include "common.namespace.platform" . ) -}}
+  {{- printf "%s-%s" $namespace $name | trunc 63 | trimSuffix "-" -}}
 {{- end -}}
+
+{{- define "common.configmapname.vespamgr" -}}
+  {{- $name := ( include "common.fullname.vespamgr" . ) -}}
+  {{- printf "configmap-%s" $name | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+
+{{- define "common.deploymentname.vespamgr" -}}
+  {{- $name := ( include "common.fullname.vespamgr" . ) -}}
+  {{- printf "deployment-%s" $name | trunc 63 | trimSuffix "-" -}}
 {{- end -}}
+
+{{- define "common.containername.vespamgr" -}}
+  {{- $name := ( include "common.fullname.vespamgr" . ) -}}
+  {{- printf "container-%s" $name | trunc 63 | trimSuffix "-" -}}
 {{- end -}}
 
-{{/*
-Create chart name and version as used by the chart label.
-*/}}
-{{- define "dbaas.chart" -}}
-{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" -}}
+{{- define "common.servicename.vespamgr.http" -}}
+  {{- $name := ( include "common.fullname.vespamgr" . ) -}}
+  {{- printf "service-%s-http" $name | trunc 63 | trimSuffix "-" -}}
 {{- end -}}
 
+{{- define "common.serviceport.vespamgr.http" -}}8080{{- end -}}
diff --git a/ric-common/Docker-Credential/bin/install b/ric-common/Docker-Credential/bin/install
deleted file mode 100755 (executable)
index 010a026..0000000
+++ /dev/null
@@ -1,52 +0,0 @@
-#!/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.                                             #
-################################################################################
-
-
-
-NAMESPACE=$1
-
-DOCKERREG=$2
-
-DOCKERREG_NORMALIZED=${DOCKERREG/:/.}
-DOCKERREG_NORMALIZED=${DOCKERREG_NORMALIZED/\//.}
-
-DOCKERUSERNAME=$3
-
-DOCKERPASSWORD=$4
-
-DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null && pwd )"
-
-
-source $DIR/../etc/credential.conf
-
-if [ -z "$RICPLT_RELEASE_NAME" ];then
-   RELEASE_NAME=$helm_release_name
-else
-   RELEASE_NAME=$RICPLT_RELEASE_NAME
-fi
-
-COMMON_CHART_VERSION=$(cat $DIR/../../Common-Template/helm/ric-common/Chart.yaml | grep version | awk '{print $2}')
-helm package -d /tmp $DIR/../../Common-Template/helm/ric-common
-
-
-mkdir -p  $DIR/../helm/docker-credential/charts/
-cp /tmp/ric-common-$COMMON_CHART_VERSION.tgz $DIR/../helm/docker-credential/charts/
-
-
-helm install --namespace "${NAMESPACE}" --name "${RELEASE_NAME}-cred-${NAMESPACE}-${DOCKERREG_NORMALIZED}" --set repository="$DOCKERREG" --set repositoryCredential.user="$DOCKERUSERNAME" --set repositoryCredential.password="$DOCKERPASSWORD" $DIR/../helm/docker-credential
-
diff --git a/ric-common/Docker-Credential/bin/uninstall b/ric-common/Docker-Credential/bin/uninstall
deleted file mode 100755 (executable)
index 777f3ea..0000000
+++ /dev/null
@@ -1,39 +0,0 @@
-#!/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.                                             #
-################################################################################
-
-
-
-NAMESPACE=$1
-
-DOCKERREG=$2
-
-DOCKERREG_NORMALIZED=${DOCKERREG/:/.}
-DOCKERREG_NORMALIZED=${DOCKERREG_NORMALIZED/\//.}
-DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null && pwd )"
-
-
-source $DIR/../etc/credential.conf
-
-if [ -z "$RICPLT_RELEASE_NAME" ];then
-   RELEASE_NAME=$helm_release_name
-else
-   RELEASE_NAME=$RICPLT_RELEASE_NAME
-fi
-
-helm delete --purge "${RELEASE_NAME}-cred-${NAMESPACE}-${DOCKERREG_NORMALIZED}"
-
diff --git a/ric-common/Docker-Credential/etc/credential.conf b/ric-common/Docker-Credential/etc/credential.conf
deleted file mode 100644 (file)
index 8bee714..0000000
+++ /dev/null
@@ -1,23 +0,0 @@
-################################################################################
-#   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.                                             #
-################################################################################
-
-
-# helm_release_name defines the release name helm will use to deploy the credential
-# It will be overrided by RICPLT_RELEASE_NAME
-helm_release_name=r0
-
-
diff --git a/ric-common/Docker-Credential/helm/docker-credential/templates/_helper.tpl b/ric-common/Docker-Credential/helm/docker-credential/templates/_helper.tpl
deleted file mode 100644 (file)
index b3dd35f..0000000
+++ /dev/null
@@ -1,35 +0,0 @@
-################################################################################
-#   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.                                             #
-################################################################################
-
-{{/*
-  Resolve the image repository secret token.
-  The value for .Values.global.repositoryCred is used:
-  repositoryCred:
-    user: user
-    password: password
-    mail: email (optional)
-*/}}
-{{- define "repository.secret" -}}
-  {{- $repo := .Values.repository }}
-  {{- $cred := .Values.repositoryCredential }}
-  {{- $user := default "docker" $cred.user }}
-  {{- $password := default "docker" $cred.password }}
-  {{- $mail := default "@" $cred.mail }}
-  {{- $auth := printf "%s:%s" $user $password | b64enc }}
-  {{- printf "{\"%s\":{\"username\":\"%s\",\"password\":\"%s\",\"email\":\"%s\",\"auth\":\"%s\"}}" $repo $user $password $mail $auth | b64enc -}}
-{{- end -}}
-
diff --git a/ric-common/Docker-Credential/helm/docker-credential/values.yaml b/ric-common/Docker-Credential/helm/docker-credential/values.yaml
deleted file mode 100644 (file)
index 4b02dc9..0000000
+++ /dev/null
@@ -1,27 +0,0 @@
-################################################################################
-#   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.                                             #
-################################################################################
-
-# Values for setting up Kubernetes resources for accessing infrastructure such as docker registry
-# helm repo, etc.
-
-repository: "nexus3.o-ran-sc.org:10004"
-
-repositoryCredential:
-  user: "docker"
-  password: "docker"
-
-
diff --git a/ric-common/Helm-Credential/bin/install b/ric-common/Helm-Credential/bin/install
deleted file mode 100755 (executable)
index 60b6d9d..0000000
+++ /dev/null
@@ -1,55 +0,0 @@
-#!/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.                                             #
-################################################################################
-NAMESPACE=$1
-
-HELMREPO=$2
-
-HELMREPO_NORMALIZED=${HELMREPO/:/.}
-
-HELMREPO_NORMALIZED=${HELMREPO_NORMALIZED/\//.}
-
-HELMUSERNAME=$3
-
-HELMPASSWORD=$4
-
-HELMCERTPATH=$5
-
-DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null && pwd )"
-
-cp $HELMCERTPATH $DIR/../helm/helm-credential/cert/tls.crt
-
-
-source $DIR/../etc/credential.conf
-
-if [ -z "$RICPLT_RELEASE_NAME" ];then
-   RELEASE_NAME=$helm_release_name
-else
-   RELEASE_NAME=$RICPLT_RELEASE_NAME
-fi
-
-COMMON_CHART_VERSION=$(cat $DIR/../../Common-Template/helm/ric-common/Chart.yaml | grep version | awk '{print $2}')
-helm package -d /tmp $DIR/../../Common-Template/helm/ric-common
-
-
-mkdir -p  $DIR/../helm/helm-credential/charts/
-cp /tmp/ric-common-$COMMON_CHART_VERSION.tgz $DIR/../helm/helm-credential/charts/
-
-helm install --namespace "${NAMESPACE}" --name "${RELEASE_NAME}-cred-${NAMESPACE}-${HELMREPO_NORMALIZED}" --set helmrepo="$HELMREPO" --set helmrepoCredential.user="$DOCKERUSERNAME" --set helmrepoCredential.password="$DOCKERPASSWORD"  $DIR/../helm/helm-credential
-
-
-rm $DIR/../helm/helm-credential/cert/tls.crt
diff --git a/ric-common/Helm-Credential/bin/uninstall b/ric-common/Helm-Credential/bin/uninstall
deleted file mode 100755 (executable)
index caee118..0000000
+++ /dev/null
@@ -1,41 +0,0 @@
-#!/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.                                             #
-################################################################################
-NAMESPACE=$1
-
-HELMREPO=$2
-
-HELMREPO_NORMALIZED=${HELMREPO/:/.}
-
-HELMREPO_NORMALIZED=${HELMREPO_NORMALIZED/\//.}
-
-
-DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null && pwd )"
-
-
-source $DIR/../etc/credential.conf
-
-if [ -z "$RICPLT_RELEASE_NAME" ];then
-   RELEASE_NAME=$helm_release_name
-else
-   RELEASE_NAME=$RICPLT_RELEASE_NAME
-fi
-
-
-helm delete --purge "${RELEASE_NAME}-cred-${NAMESPACE}-${HELMREPO_NORMALIZED}"
-
-
diff --git a/ric-common/Helm-Credential/etc/credential.conf b/ric-common/Helm-Credential/etc/credential.conf
deleted file mode 100644 (file)
index 8bee714..0000000
+++ /dev/null
@@ -1,23 +0,0 @@
-################################################################################
-#   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.                                             #
-################################################################################
-
-
-# helm_release_name defines the release name helm will use to deploy the credential
-# It will be overrided by RICPLT_RELEASE_NAME
-helm_release_name=r0
-
-
diff --git a/ric-common/Helm-Credential/helm/helm-credential/Chart.yaml b/ric-common/Helm-Credential/helm/helm-credential/Chart.yaml
deleted file mode 100644 (file)
index 17b41bb..0000000
+++ /dev/null
@@ -1,22 +0,0 @@
-################################################################################
-#   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.                                             #
-################################################################################
-
-apiVersion: v1
-appVersion: "1.0"
-description: A Helm chart for setting up k8s resources for accessing external and infrastructure resources before RIC deployment"
-name: helm-credential
-version: 1.1.0
diff --git a/ric-common/Helm-Credential/helm/helm-credential/templates/config-helm-cert.yaml b/ric-common/Helm-Credential/helm/helm-credential/templates/config-helm-cert.yaml
deleted file mode 100644 (file)
index 8485c3e..0000000
+++ /dev/null
@@ -1,23 +0,0 @@
-################################################################################
-#   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.                                             #
-################################################################################
-
-apiVersion: v1
-kind: ConfigMap
-metadata:
-  name: {{ include "common.helmcert.prefix" . }}-{{ .Values.helmrepo | replace "." "-" | replace ":" "-" | replace "/" "-" }}
-data:
-  {{ (.Files.Glob "cert/tls.crt").AsConfig | nindent 2 }}
diff --git a/ric-common/Helm-Credential/helm/helm-credential/templates/secrets-helm-xapp.yaml b/ric-common/Helm-Credential/helm/helm-credential/templates/secrets-helm-xapp.yaml
deleted file mode 100644 (file)
index 2c7034b..0000000
+++ /dev/null
@@ -1,25 +0,0 @@
-################################################################################
-#   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.                                             #
-################################################################################
-
-apiVersion: v1
-kind: Secret
-metadata:
-  name: {{ include "common.helmcred.prefix" . }}-{{ .Values.helmrepo | replace "." "-" | replace ":" "-" | replace "/" "-" }}
-type: Opaque
-data:
-  helm_repo_username: {{ include "helmrepo.secret.user" . }}
-  helm_repo_password: {{ include "helmrepo.secret.password" . }}
diff --git a/ric-common/Helm-Credential/helm/helm-credential/values.yaml b/ric-common/Helm-Credential/helm/helm-credential/values.yaml
deleted file mode 100644 (file)
index dc1008d..0000000
+++ /dev/null
@@ -1,26 +0,0 @@
-################################################################################
-#   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.                                             #
-################################################################################
-
-# Values for setting up Kubernetes resources for accessing infrastructure such as docker registry
-# helm repo, etc.
-
-helmrepo: "ricaux-entry/helm"
-
-
-helmrepoCredential:
-  user: "helm"
-  password: "helm"
diff --git a/ric-dep b/ric-dep
new file mode 160000 (submodule)
index 0000000..d68f2e9
--- /dev/null
+++ b/ric-dep
@@ -0,0 +1 @@
+Subproject commit d68f2e965abec2c1078a9c62a9dc27a16e1d359d
diff --git a/ric-infra/15-Chartmuseum/bin/install b/ric-infra/15-Chartmuseum/bin/install
deleted file mode 100755 (executable)
index 572ae3e..0000000
+++ /dev/null
@@ -1,120 +0,0 @@
-#!/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.                                             #
-################################################################################
-
-
-while [ -n "$1" ]; do # while loop starts
-
-    case "$1" in
-
-    -f) OVERRIDEYAML=$2
-        shift
-        ;;
-    -c) LIST_OF_COMPONENTS=$2
-        shift
-        ;;
-    *) echo "Option $1 not recognized" ;; # In case you typed a different option other than a,b,c
-
-    esac
-
-    shift
-
-done
-
-
-if [ -z "$OVERRIDEYAML" ];then
-    echo "****************************************************************************************************************"
-    echo "                                                     ERROR                                                      "
-    echo "****************************************************************************************************************"
-    echo "RIC deployment without deployment recipe is currently disabled. Please specify an recipe with the -f option."
-    echo "****************************************************************************************************************"
-    exit 1
-fi
-
-
-
-DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null && pwd )"
-GLOBAL_BLOCK=$(cat $OVERRIDEYAML | awk '/^global:/{getline; while ($0 ~ /^ +.*|^ *$/) {print $0; if (getline == 0) {break}}}')
-NAMESPACE_BLOCK=$(cat $OVERRIDEYAML | awk '/^  namespace:/{getline; while ($0 ~ /^    .*|^ *$/) {print $0; if (getline == 0) {break}}}')
-NAMESPACE=$(echo "$NAMESPACE_BLOCK" | awk '/^ *infra:/{print $2}')
-RELEASE_PREFIX=$(echo "$GLOBAL_BLOCK" | awk '/^ *releasePrefix:/{print $2}')
-COMPONENTS=${LIST_OF_COMPONENTS:-"chartmuseum"}
-
-
-NODENAME=$(kubectl get node | awk 'NR>1{print $1}')
-
-LABELFOUND=false
-for f in $NODENAME; do
-    LABEL=$(kubectl describe node $f | grep local-storage)
-    if [ ! -z "$LABEL" ]; then
-       LABELFOUND=true
-    fi
-done
-
-FOUND_STORAGECLASS=$(grep storageclass $OVERRIDEYAML)
-
-if  ! $LABELFOUND && [ -z "$FOUND_STORAGECLASS" ]; then
-    echo "***********************************************************************************************"
-    echo "*                                          ERROR!!!!!!!!!!!!!                                 *"
-    echo "***********************************************************************************************"
-    echo "* Nodes label \"local-storage=enable\" is not found in any of the cluster node.               *"
-    echo "* Please pick a node and label it using the following command.                                *"
-    echo "* kubectl label --overwrite nodes <YOUR_NODE_NAME> local-storage=enable                       *"
-    echo "***********************************************************************************************"
-
-    exit 1
-fi
-
-if [ -z "$FOUND_STORAGECLASS" ] && $LABELFOUND; then
-
-    DATAPATH=$(cat $DIR/../helm/chartmuseum/values.yaml | grep datapath | awk '{ print $2}' )
-
-
-    if [ ! -z $OVERRIDEYAML ]; then
-        DATAPATHOVERRIDE=$(cat $OVERRIDEYAML | grep datapath | awk '{ print $2}' )
-    fi 
-
-    if [ ! -z "$DATAPATHOVERRIDE" ]; then
-       DATAPATH=$DATAPATHOVERRIDE
-    fi
-
-    if [ ! -d "$DATAPATH" ]; then
-       mkdir -p $DATAPATH || { echo "Directory $DATAPATH does not exist and you don't have permission to create it. Please choose a different datapath." ; exit 1 ; }
-    fi
-
-    echo "***********************************************************************************************"
-    echo "*                                          WARNING!!!!!!!!!!!!!                               *"
-    echo "***********************************************************************************************"
-    echo "* Chartmuseume will use local storage. Please make sure that directory                        *"
-    echo "* $DATAPATH                                                                                   *"
-    echo "* contains the proper files.                                                                  *"
-    echo "***********************************************************************************************"
-fi 
-
-echo "Deploying RIC infra components [$COMPONENTS]"
-
-
-COMMON_CHART_VERSION=$(cat $DIR/../../../ric-common/Common-Template/helm/ric-common/Chart.yaml | grep version | awk '{print $2}')
-helm package -d /tmp $DIR/../../../ric-common/Common-Template/helm/ric-common
-
-
-for component in $COMPONENTS; do
-
-  mkdir -p $DIR/../helm/$component/charts/
-  cp /tmp/ric-common-$COMMON_CHART_VERSION.tgz $DIR/../helm/$component/charts/
-  helm install -f $OVERRIDEYAML --namespace "${NAMESPACE}" --name "${RELEASE_PREFIX}-$component" $DIR/../helm/$component
-done
diff --git a/ric-infra/15-Chartmuseum/bin/uninstall b/ric-infra/15-Chartmuseum/bin/uninstall
deleted file mode 100755 (executable)
index 82d57a7..0000000
+++ /dev/null
@@ -1,30 +0,0 @@
-#!/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.                                             #
-################################################################################
-
-COMPONENTS="chartmuseum"
-
-echo "Undeploying RIC infra components [$COMPONENTS]"
-
-
-for component in $COMPONENTS; do
-    RELEASE_LIST=$(helm list | grep "$component" | awk '{print $1}')
-    if [ ! -z "$RELEASE_LIST" ];then
-        helm delete --purge $RELEASE_LIST
-    fi
-
-done
diff --git a/ric-infra/15-Chartmuseum/helm/chartmuseum/Chart.yaml b/ric-infra/15-Chartmuseum/helm/chartmuseum/Chart.yaml
deleted file mode 100644 (file)
index 7594952..0000000
+++ /dev/null
@@ -1,23 +0,0 @@
-################################################################################
-#   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.                                             #
-################################################################################
-
-
-apiVersion: v1
-description: A Helm chart for helm repository for RIC
-name: chartmuseum
-version: 0.0.1
-appVersion: 0.1
diff --git a/ric-infra/15-Chartmuseum/helm/chartmuseum/requirements.yaml b/ric-infra/15-Chartmuseum/helm/chartmuseum/requirements.yaml
deleted file mode 100644 (file)
index 2ab71b4..0000000
+++ /dev/null
@@ -1,20 +0,0 @@
-################################################################################
-#   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: ric-common
-    version: ~2.0.0
diff --git a/ric-infra/15-Chartmuseum/helm/chartmuseum/templates/_gen-cert.tpl b/ric-infra/15-Chartmuseum/helm/chartmuseum/templates/_gen-cert.tpl
deleted file mode 100644 (file)
index 7de54a1..0000000
+++ /dev/null
@@ -1,29 +0,0 @@
-################################################################################
-#   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.                                             #
-################################################################################i
-
-{{/*
-Generate certificates for the docker registry
-*/}}
-
-{{- define "chartmuseum.gen-cert" -}}
-{{- $altNames := list ( include "common.ingressurl.aux" . ) -}}
-{{- $ca := genCA "docker-registry-ca" 365 -}}
-{{- $cert := genSignedCert ( include "common.ingressurl.aux" . ) nil $altNames 365 $ca -}}
-tls.crt: {{ $cert.Cert | b64enc }}
-tls.key: {{ $cert.Key | b64enc }}
-{{- end -}}
-
diff --git a/ric-infra/15-Chartmuseum/helm/chartmuseum/templates/deployment.yaml b/ric-infra/15-Chartmuseum/helm/chartmuseum/templates/deployment.yaml
deleted file mode 100644 (file)
index f3bf341..0000000
+++ /dev/null
@@ -1,66 +0,0 @@
-################################################################################
-#   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.                                             #
-################################################################################
-
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: {{ include "common.deploymentname.chartmuseum" .}}
-  labels:
-    app: {{ include "common.namespace.infra" . }}-{{ include "common.name.chartmuseum" . }}
-    chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
-    release: {{ .Release.Name }}
-    heritage: {{ .Release.Service }}
-spec:
-  replicas: {{ .Values.chartmuseum.replicaCount }}
-  selector:
-    matchLabels:
-      app: {{ include "common.namespace.infra" . }}-{{ include "common.name.chartmuseum" . }}
-      release: {{ .Release.Name }}
-  template:
-    metadata:
-      labels:
-        app: {{ include "common.namespace.infra" . }}-{{ include "common.name.chartmuseum" . }}
-        release: {{ .Release.Name }}
-    spec:
-      securityContext:
-        fsGroup: 0
-        runAsUser: 0
-      hostname: {{ .Chart.Name }}
-      imagePullSecrets:
-        - name: {{ include "common.repositoryCred" . }}
-      containers:
-        - name: {{ include "common.containername.chartmuseum" . }} 
-          image: {{ include "common.repository" . }}/{{ .Values.chartmuseum.image.name }}:{{ .Values.chartmuseum.image.tag }}
-          imagePullPolicy: {{ include "common.pullPolicy" . }}
-          envFrom:
-            - configMapRef:
-                name: {{ include "common.configmapname.chartmuseum" . }}-env
-          #          volumeMounts:
-          #- name: certs
-          #  mountPath: /var/run/certs
-          #  readOnly: true
-          ports:
-            - name: http
-              containerPort: {{ include "common.serviceport.chartmuseum.http" . }}
-              protocol: TCP
-          volumeMounts:
-            - name: chart-data
-              mountPath: /charts
-      volumes:
-        - name: chart-data
-          persistentVolumeClaim:
-            claimName: pvc-{{ include "common.name.chartmuseum" . }}
diff --git a/ric-infra/15-Chartmuseum/helm/chartmuseum/templates/env.yaml b/ric-infra/15-Chartmuseum/helm/chartmuseum/templates/env.yaml
deleted file mode 100644 (file)
index 8565e88..0000000
+++ /dev/null
@@ -1,24 +0,0 @@
-################################################################################
-#   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.                                             #
-################################################################################
-apiVersion: v1
-kind: ConfigMap
-metadata:
-  name: {{ include "common.configmapname.chartmuseum" . }}-env
-data:
-   DEBUG: "true"
-   STORAGE: "local"
-   STORAGE_LOCAL_ROOTDIR: "/charts"
diff --git a/ric-infra/15-Chartmuseum/helm/chartmuseum/templates/ingress.yaml b/ric-infra/15-Chartmuseum/helm/chartmuseum/templates/ingress.yaml
deleted file mode 100644 (file)
index 747942a..0000000
+++ /dev/null
@@ -1,32 +0,0 @@
-################################################################################
-#   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.                                             #
-################################################################################
-apiVersion: networking.k8s.io/v1beta1
-kind: Ingress
-metadata:
-  name: {{ include "common.ingressname.chartmuseum" . }}
-spec:
-  tls:
-    - hosts:
-      - {{ include "common.ingressurl.aux" . }}
-      secretName: secret-{{ include "common.name.chartmuseum" . }}
-  rules:
-    - http:
-        paths:
-          - backend:
-              serviceName: {{ include "common.servicename.chartmuseum.http" . }}
-              servicePort: http
-            path: "/helm"
diff --git a/ric-infra/15-Chartmuseum/helm/chartmuseum/templates/job-save-certs.yaml b/ric-infra/15-Chartmuseum/helm/chartmuseum/templates/job-save-certs.yaml
deleted file mode 100644 (file)
index 6253d53..0000000
+++ /dev/null
@@ -1,47 +0,0 @@
-################################################################################
-#   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.                                             #
-################################################################################
-
-apiVersion: batch/v1
-kind: Job
-metadata:
-  name: job-{{ include "common.fullname.chartmuseum" . }}-save-certs
-spec:
-  template:
-    spec:
-      imagePullSecrets:
-        - name: {{ include "common.repositoryCred" . }}
-      containers:
-      - name: cert-copy
-        image: {{ include "common.repository" . }}/{{ .Values.chartmuseum.job.image.name }}:{{ .Values.chartmuseum.job.image.tag }}
-        imagePullPolicy: {{ include "common.pullPolicy" . }}
-        command: [ "/bin/sh","-c","cp -rL /var/run/helmcerts/..data/tls.crt /var/run/certs-copy/helmtls.crt"]
-        #        command: ["tail", "-f", "/dev/null"]
-        volumeMounts:
-        - name: helmcerts
-          mountPath: /var/run/helmcerts
-          readOnly: true
-        - name:  write-to-volume
-          mountPath: /var/run/certs-copy
-      volumes:
-      - name: helmcerts
-        secret:
-          secretName: secret-{{ include "common.name.chartmuseum" . }}
-      - name: write-to-volume
-        hostPath:
-          path: /tmp
-      restartPolicy: Never
-  backoffLimit: 4
diff --git a/ric-infra/15-Chartmuseum/helm/chartmuseum/templates/persistentVolume.yaml b/ric-infra/15-Chartmuseum/helm/chartmuseum/templates/persistentVolume.yaml
deleted file mode 100644 (file)
index 42939be..0000000
+++ /dev/null
@@ -1,34 +0,0 @@
-{{- if not .Values.chartmuseum.storageclass }}
-
-kind: StorageClass
-apiVersion: storage.k8s.io/v1
-metadata:
-  name: storageclass-{{ include "common.name.chartmuseum" . }}
-provisioner: kubernetes.io/no-provisioner
-volumeBindingMode: WaitForFirstConsumer
-
----
-
-apiVersion: v1
-kind: PersistentVolume
-metadata:
-  name: pv-{{ include "common.name.chartmuseum" . }}
-spec:
-  capacity:
-    storage: {{ .Values.chartmuseum.storagesize }}
-  accessModes:
-  - ReadWriteOnce
-  persistentVolumeReclaimPolicy: Retain
-  storageClassName: storageclass-{{ include "common.name.chartmuseum" . }}
-  local:
-    path: {{ .Values.chartmuseum.datapath }}
-  nodeAffinity:
-    required:
-      nodeSelectorTerms:
-      - matchExpressions:
-        - key: local-storage
-          operator: In
-          values:
-          - enable
-{{- end -}}
-
diff --git a/ric-infra/15-Chartmuseum/helm/chartmuseum/templates/persistentVolumeClaim.yaml b/ric-infra/15-Chartmuseum/helm/chartmuseum/templates/persistentVolumeClaim.yaml
deleted file mode 100644 (file)
index 9a945b2..0000000
+++ /dev/null
@@ -1,11 +0,0 @@
-kind: PersistentVolumeClaim
-apiVersion: v1
-metadata:
-  name:  pvc-{{ include "common.name.chartmuseum" . }}
-spec:
-  accessModes:
-  - ReadWriteOnce
-  storageClassName: {{ .Values.chartmuseum.storageclass | default (printf "storageclass-%s" ( include "common.name.chartmuseum" . )) }} 
-  resources:
-    requests:
-      storage: {{ .Values.chartmuseum.storagesize }}
diff --git a/ric-infra/15-Chartmuseum/helm/chartmuseum/templates/secret.yaml b/ric-infra/15-Chartmuseum/helm/chartmuseum/templates/secret.yaml
deleted file mode 100644 (file)
index 5490528..0000000
+++ /dev/null
@@ -1,27 +0,0 @@
-################################################################################
-#   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.                                             #
-################################################################################
-
-apiVersion: v1
-kind: Secret
-type: kubernetes.io/tls
-metadata:
-  name: secret-{{ include "common.name.chartmuseum" . }}
-  annotations:
-    "helm.sh/hook": "pre-install"
-    "helm.sh/hook-delete-policy": "before-hook-creation"
-data:
-{{ ( include "chartmuseum.gen-cert" . ) | indent 2 }}
diff --git a/ric-infra/15-Chartmuseum/helm/chartmuseum/templates/service.yaml b/ric-infra/15-Chartmuseum/helm/chartmuseum/templates/service.yaml
deleted file mode 100644 (file)
index 89e3592..0000000
+++ /dev/null
@@ -1,37 +0,0 @@
-################################################################################
-#   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.                                             #
-################################################################################
-
-apiVersion: v1
-kind: Service
-metadata:
-  name: {{ include "common.servicename.chartmuseum.http" . }}
-  namespace: {{ include "common.namespace.infra" . }}
-  labels:
-    app: {{ include "common.namespace.infra" . }}-{{ include "common.name.chartmuseum" . }}
-    chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
-    release: {{ .Release.Name }}
-    heritage: {{ .Release.Service }}
-spec:
-  type: ClusterIP
-  ports:
-    - port: {{ include "common.serviceport.chartmuseum.http" . }}
-      targetPort: http
-      protocol: TCP
-      name: http
-  selector:
-    app: {{ include "common.namespace.infra" . }}-{{ include "common.name.chartmuseum" . }}
-    release: {{ .Release.Name }}
diff --git a/ric-infra/15-Chartmuseum/helm/chartmuseum/values.yaml b/ric-infra/15-Chartmuseum/helm/chartmuseum/values.yaml
deleted file mode 100644 (file)
index 026e3fd..0000000
+++ /dev/null
@@ -1,44 +0,0 @@
-################################################################################
-#   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.                                             #
-################################################################################
-
-# Default values for nexus.
-# This is a YAML-formatted file.
-# Declare variables to be passed into your templates.
-repository: "docker.io"
-imagePullPolicy: IfNotPresent
-repositoryCred: docker-reg-cred
-helmRepositoryCert: xapp-mgr-certs
-
-chartmuseum:
-  repositoryOverride: "docker.io"
-  replicaCount: 1
-
-
-  job:
-    image:
-      name: alpine
-      tag: latest
-
-# This is designed to be deployed using local image
-  image:
-    name: chartmuseum/chartmuseum
-    tag: v0.8.2
-
-# Specify a storage class to bypass the local storage definition.
-# storageclass:
-  storagesize: 2Gi
-  datapath: /opt/data/chartmuseum-data
diff --git a/ric-infra/20-Monitoring/bin/install b/ric-infra/20-Monitoring/bin/install
deleted file mode 100755 (executable)
index c2819ae..0000000
+++ /dev/null
@@ -1,76 +0,0 @@
-#!/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.                                             #
-################################################################################
-while [ -n "$1" ]; do # while loop starts
-
-    case "$1" in
-
-    -f) OVERRIDEYAML=$2
-        shift
-        ;;
-    -c) LIST_OF_COMPONENTS=$2
-        shift
-        ;;
-    *) echo "Option $1 not recognized" ;; # In case you typed a different option other than a,b,c
-
-    esac
-
-    shift
-
-done
-
-
-if [ -z "$OVERRIDEYAML" ];then
-    echo "****************************************************************************************************************"
-    echo "                                                     ERROR                                                      "
-    echo "****************************************************************************************************************"
-    echo "RIC deployment without deployment recipe is currently disabled. Please specify an recipe with the -f option."
-    echo "****************************************************************************************************************"
-    exit 1
-fi
-
-DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null && pwd )"
-GLOBAL_BLOCK=$(cat $OVERRIDEYAML | awk '/^global:/{getline; while ($0 ~ /^ +.*|^ *$/) {print $0; if (getline == 0) {break}}}')
-NAMESPACE_BLOCK=$(cat $OVERRIDEYAML | awk '/^  namespace:/{getline; while ($0 ~ /^    .*|^ *$/) {print $0; if (getline == 0) {break}}}')
-NAMESPACE=$(echo "$NAMESPACE_BLOCK" | awk '/^ *infra:/{print $2}')
-RELEASE_PREFIX=$(echo "$GLOBAL_BLOCK" | awk '/^ *releasePrefix:/{print $2}')
-COMPONENTS=${LIST_OF_COMPONENTS:-"elfkp"}
-
-echo "Deploying RIC infra components [$COMPONENTS]"
-
-
-
-
-for component in $COMPONENTS; do
-
-  mkdir -p $DIR/../helm/$component/charts/
-  pushd $DIR/../helm/$component/
-  helm dep update
-  popd
-
-  #ELASTIC_SEARCH_HOST="${RELEASE_NAME}-${component}-elasticsearch-client.${NAMESPACE}.svc.cluster.local"
-  #ELASTIC_SEARCH_PORT=9200
-  #CMD="helm install --debug \
-  #   --namespace ${NAMESPACE} --name ${RELEASE_NAME}-${component_clean} \
-  #   -f ../helm/$component/values.yaml \
-  #   --set kibana.env.ELASTICSEARCH_URL=http://${ELASTIC_SEARCH_HOST}:${ELASTIC_SEARCH_PORT} \
-  #   --set logstash.elasticsearch.host=${ELASTIC_SEARCH_HOST} \
-  #   --set logstash.elasticsearch.host=${ELASTIC_SEARCH_PORT} \
-  #   $component"
-  #eval "$CMD"
-  helm install -f $OVERRIDEYAML --namespace "${NAMESPACE}" --name "${RELEASE_PREFIX}-$component" $DIR/../helm/$component
-done
diff --git a/ric-infra/20-Monitoring/bin/uninstall b/ric-infra/20-Monitoring/bin/uninstall
deleted file mode 100755 (executable)
index f9cccca..0000000
+++ /dev/null
@@ -1,30 +0,0 @@
-#!/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.                                             #
-################################################################################
-COMPONENTS="elfkp"
-
-echo "Undeploying RIC infra components [$COMPONENTS]"
-
-
-
-for component in $COMPONENTS; do
-    RELEASE_LIST=$(helm list | grep "$component" | awk '{print $1}')
-    if [ ! -z "$RELEASE_LIST" ];then
-        helm delete --purge $RELEASE_LIST
-    fi
-
-done
diff --git a/ric-infra/20-Monitoring/helm/elfkp/.helm/repository/local/index.yaml b/ric-infra/20-Monitoring/helm/elfkp/.helm/repository/local/index.yaml
deleted file mode 100644 (file)
index e69de29..0000000
diff --git a/ric-infra/20-Monitoring/helm/elfkp/Chart.yaml b/ric-infra/20-Monitoring/helm/elfkp/Chart.yaml
deleted file mode 100644 (file)
index b81f82e..0000000
+++ /dev/null
@@ -1,8 +0,0 @@
-apiVersion: v1
-description: A Helm chart for metric and monitoring (ELFK stack and Prometheus) for RIC
-name: elfkp
-version: 0.0.1
-appVersion: 0.1
-maintainers:
-- name: wrider
-  email: lji@research.att.com
diff --git a/ric-infra/20-Monitoring/helm/elfkp/requirements.yaml b/ric-infra/20-Monitoring/helm/elfkp/requirements.yaml
deleted file mode 100644 (file)
index cc2ca5a..0000000
+++ /dev/null
@@ -1,9 +0,0 @@
-dependencies:
-- name: elastic-stack
-  version: 1.7.0
-  repository: https://kubernetes-charts.storage.googleapis.com/
-  condition: elastic-stack.enabled
-- name: prometheus
-  version: 8.11.4
-  repository: https://kubernetes-charts.storage.googleapis.com/
-  condition: prometheus.enabled
diff --git a/ric-infra/20-Monitoring/helm/elfkp/values.yaml b/ric-infra/20-Monitoring/helm/elfkp/values.yaml
deleted file mode 100644 (file)
index 3b7ec19..0000000
+++ /dev/null
@@ -1,121 +0,0 @@
-# Default values for elk.
-# This is a YAML-formatted file.
-# Declare variables to be passed into your templates.
-
-prometheus:
-  enabled: true
-
-  # individual component configs
-  # full listing: https://github.com/helm/charts/tree/master/stable/prometheus
-  alertmanager:
-    enabled: true
-    persistentVolume:
-      enabled: false
-  kubeStateMetrics:
-    enabled: false
-  nodeExporter:
-    enabled: false
-  pushgateway:
-    enabled: false
-    persistentVolume:
-      enabled: false
-  server:
-    ingress:
-      enabled: true
-      hosts:
-        - prometheus-entry
-    persistentVolume:
-            enabled: false
-
-
-fluentd-elasticsearch:
-  enabled: true
-
-elastic-stack:
-  enabled: true
-
-  # individual component configs
-  # full listing: https://github.com/helm/charts/tree/master/stable/elastic-stack
-  elasticsearch:
-    enabled: true
-    data:
-      persistence:
-        enabled: false
-    master:
-      persistence:
-        enabled: false
-
-  kibana:
-    enabled: true
-    files:
-      kibana.yml:
-        elasticsearch.url: http://r1-elfkp-elasticsearch-client:9200
-    env:
-      ELASTICSEARCH_URL: http://r1-elfkp-elasticsearch-client:9200
-      ELASTICSEARCH_HOSTS: http://r1-elfkp-elasticsearch-client:9200
-    ingress:
-      enabled: true
-      hosts:
-        - "kibana-entry"
-
-  logstash:
-    enabled: false
-    persistence:
-      enabled: false
-    # elasticsearch:
-    #   host: elastic-stack-elasticsearch-client
-
-  filebeat:
-    enabled: false
-    # config:
-    #   output.file.enabled: false
-    #   output.logstash:
-    #     hosts: ["elastic-stack-logstash:5044"]
-    # indexTemplateLoad:
-    #   - elastic-stack-elasticsearch-client:9200
-
-  fluentd:
-    enabled: true
-    output:
-      host: r1-elfkp-elasticsearch-client
-
-  fluent-bit:
-    enabled: false
-
-  fluentd-elasticsearch:
-    enabled: true
-    elasticsearch:
-      host: 'r1-elfkp-elasticsearch-client'
-
-  nginx-ldapauth-proxy:
-    enabled: false
-    # Example config to get it working with ELK. Adjust as you need to.
-    # proxy:
-    #   port: 5601
-    #   # This is the internal hostname for the kibana service
-    #   host: "elk-kibana.default.svc.cluster.local"
-    #   authName: "ELK:Infrastructure:LDAP"
-    #   ldapHost: "ldap.example.com"
-    #   ldapDN: "dc=example,dc=com"
-    #   ldapFilter: "objectClass=organizationalPerson"
-    #   ldapBindDN: "cn=reader,dc=example,dc=com"
-    #   requires:
-    #     - name: "ELK-USER"
-    #       filter: "cn=elkuser,ou=groups,dc=example,dc=com"
-    # ingress:
-    #   enabled: true
-    #   hosts:
-    #     - "elk.example.com"
-    #   annotations:
-    #     kubernetes.io/ingress.class: nginx
-    #   tls:
-    #     - hosts:
-    #       - elk.example.com
-    #       secretName: example-elk-tls
-    # secrets:
-    #   ldapBindPassword: PASSWORD
-  elasticsearch-curator:
-    enabled: false
-
-  elasticsearch-exporter:
-    enabled: false
diff --git a/ric-infra/30-Kong/bin/install b/ric-infra/30-Kong/bin/install
deleted file mode 100755 (executable)
index 518fd44..0000000
+++ /dev/null
@@ -1,63 +0,0 @@
-#!/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.                                             #
-################################################################################
-
-
-while [ -n "$1" ]; do # while loop starts
-
-    case "$1" in
-
-    -f) OVERRIDEYAML=$2
-        shift
-        ;;
-    -c) LIST_OF_COMPONENTS=$2
-        shift
-        ;;
-    *) echo "Option $1 not recognized" ;; # In case you typed a different option other than a,b,c
-
-    esac
-
-    shift
-
-done
-
-
-if [ -z "$OVERRIDEYAML" ];then
-    echo "****************************************************************************************************************"
-    echo "                                                     ERROR                                                      "
-    echo "****************************************************************************************************************"
-    echo "RIC deployment without deployment recipe is currently disabled. Please specify an recipe with the -f option."
-    echo "****************************************************************************************************************"
-    exit 1
-fi
-
-DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null && pwd )"
-GLOBAL_BLOCK=$(cat $OVERRIDEYAML | awk '/^global:/{getline; while ($0 ~ /^ +.*|^ *$/) {print $0; if (getline == 0) {break}}}')
-NAMESPACE_BLOCK=$(cat $OVERRIDEYAML | awk '/^  namespace:/{getline; while ($0 ~ /^    .*|^ *$/) {print $0; if (getline == 0) {break}}}')
-NAMESPACE=$(echo "$NAMESPACE_BLOCK" | awk '/^ *infra:/{print $2}')
-RELEASE_PREFIX=$(echo "$GLOBAL_BLOCK" | awk '/^ *releasePrefix:/{print $2}')
-COMPONENTS=${LIST_OF_COMPONENTS:-"kong"}
-
-echo "Deploying RIC infra components [$COMPONENTS]"
-
-
-
-
-for component in $COMPONENTS; do
-
-  helm install -f $OVERRIDEYAML --namespace "${NAMESPACE}" --name "${RELEASE_PREFIX}-$component" $DIR/../helm/$component
-done
diff --git a/ric-infra/30-Kong/bin/uninstall b/ric-infra/30-Kong/bin/uninstall
deleted file mode 100755 (executable)
index b7ce8f3..0000000
+++ /dev/null
@@ -1,36 +0,0 @@
-#!/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.                                             #
-################################################################################
-
-
-
-
-
-COMPONENTS="kong"
-
-echo "Undeploying RIC infra components [$COMPONENTS]"
-
-
-
-for component in $COMPONENTS; do
-    RELEASE_LIST=$(helm list | grep "$component" | awk '{print $1}')
-    if [ ! -z "$RELEASE_LIST" ];then
-        helm delete --purge $RELEASE_LIST
-    fi
-
-done
-
diff --git a/ric-infra/30-Kong/helm/.helmignore b/ric-infra/30-Kong/helm/.helmignore
deleted file mode 100644 (file)
index 50af031..0000000
+++ /dev/null
@@ -1,22 +0,0 @@
-# Patterns to ignore when building packages.
-# This supports shell glob matching, relative path matching, and
-# negation (prefixed with !). Only one pattern per line.
-.DS_Store
-# Common VCS dirs
-.git/
-.gitignore
-.bzr/
-.bzrignore
-.hg/
-.hgignore
-.svn/
-# Common backup files
-*.swp
-*.bak
-*.tmp
-*~
-# Various IDEs
-.project
-.idea/
-*.tmproj
-.vscode/
diff --git a/ric-infra/30-Kong/helm/kong/.helmignore b/ric-infra/30-Kong/helm/kong/.helmignore
deleted file mode 100644 (file)
index 50af031..0000000
+++ /dev/null
@@ -1,22 +0,0 @@
-# Patterns to ignore when building packages.
-# This supports shell glob matching, relative path matching, and
-# negation (prefixed with !). Only one pattern per line.
-.DS_Store
-# Common VCS dirs
-.git/
-.gitignore
-.bzr/
-.bzrignore
-.hg/
-.hgignore
-.svn/
-# Common backup files
-*.swp
-*.bak
-*.tmp
-*~
-# Various IDEs
-.project
-.idea/
-*.tmproj
-.vscode/
diff --git a/ric-infra/30-Kong/helm/kong/requirements.yaml b/ric-infra/30-Kong/helm/kong/requirements.yaml
deleted file mode 100644 (file)
index d41853f..0000000
+++ /dev/null
@@ -1,20 +0,0 @@
-################################################################################
-#   Copyright (c) 2019 AT&T Intellectual Property.                             #
-#                                                                              #
-#   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: kong
-    repository: '@stable'
-    version: ~0.17.0
diff --git a/ric-infra/40-Credential/bin/install b/ric-infra/40-Credential/bin/install
deleted file mode 100755 (executable)
index a8ed393..0000000
+++ /dev/null
@@ -1,72 +0,0 @@
-#!/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.                                             #
-################################################################################
-
-while [ -n "$1" ]; do # while loop starts
-
-    case "$1" in
-
-    -f) OVERRIDEYAML=$2
-        shift
-        ;;
-    -c) LIST_OF_COMPONENTS=$2
-        shift
-        ;;
-    *) echo "Option $1 not recognized" ;; # In case you typed a different option other than a,b,c
-
-    esac
-
-    shift
-
-done
-
-
-if [ -z "$OVERRIDEYAML" ];then
-    echo "****************************************************************************************************************"
-    echo "                                                     ERROR                                                      "
-    echo "****************************************************************************************************************"
-    echo "RIC deployment without deployment recipe is currently disabled. Please specify an recipe with the -f option."
-    echo "****************************************************************************************************************"
-    exit 1
-fi
-
-DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null && pwd )"
-GLOBAL_BLOCK=$(cat $OVERRIDEYAML | awk '/^global:/{getline; while ($0 ~ /^ +.*|^ *$/) {print $0; if (getline == 0) {break}}}')
-NAMESPACE_BLOCK=$(cat $OVERRIDEYAML | awk '/^  namespace:/{getline; while ($0 ~ /^    .*|^ *$/) {print $0; if (getline == 0) {break}}}')
-INFRA_NAMESPACE=$(echo "$NAMESPACE_BLOCK" | awk '/^ *infra:/{print $2}')
-AUX_NAMESPACE=$(echo "$NAMESPACE_BLOCK" | awk '/^ *aux:/{print $2}')
-XAPP_NAMESPACE=$(echo "$NAMESPACE_BLOCK" | awk '/^ *xapp:/{print $2}')
-PLT_NAMESPACE=$(echo "$NAMESPACE_BLOCK" | awk '/^ *platform:/{print $2}')
-RELEASE_PREFIX=$(echo "$GLOBAL_BLOCK" | awk '/^ *releasePrefix:/{print $2}')
-COMPONENTS=${LIST_OF_COMPONENTS:-"credential"}
-
-echo "Deploying RIC infra components [$COMPONENTS]"
-
-COMMON_CHART_VERSION=$(cat $DIR/../../../ric-common/Common-Template/helm/ric-common/Chart.yaml | grep version | awk '{print $2}')
-helm package -d /tmp $DIR/../../../ric-common/Common-Template/helm/ric-common
-
-
-for component in $COMPONENTS; do
-
-  mkdir -p $DIR/../helm/$component/charts/
-  cp /tmp/ric-common-$COMMON_CHART_VERSION.tgz $DIR/../helm/$component/charts/
-  helm install -f $OVERRIDEYAML --namespace "${PLT_NAMESPACE}" --name "${RELEASE_PREFIX}-${PLT_NAMESPACE}-credential" $DIR/../helm/$component
-  helm install -f $OVERRIDEYAML --namespace "${XAPP_NAMESPACE}" --name "${RELEASE_PREFIX}-${XAPP_NAMESPACE}-credential" $DIR/../helm/$component
-  helm install -f $OVERRIDEYAML --namespace "${AUX_NAMESPACE}" --name "${RELEASE_PREFIX}-${AUX_NAMESPACE}-credential" $DIR/../helm/$component
-  helm install -f $OVERRIDEYAML --namespace "${INFRA_NAMESPACE}" --name "${RELEASE_PREFIX}-${INFRA_NAMESPACE}-credential" $DIR/../helm/$component
-done
-
diff --git a/ric-infra/40-Credential/bin/uninstall b/ric-infra/40-Credential/bin/uninstall
deleted file mode 100755 (executable)
index c45136f..0000000
+++ /dev/null
@@ -1,31 +0,0 @@
-#!/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.                                             #
-################################################################################
-
-
-COMPONENTS="credential"
-
-echo "Undeploying RIC infra components [$COMPONENTS]"
-
-
-for component in $COMPONENTS; do
-    RELEASE_LIST=$(helm list | grep "$component" | awk '{print $1}')
-    if [ ! -z "$RELEASE_LIST" ];then
-        helm delete --purge $RELEASE_LIST
-    fi
-
-done
diff --git a/ric-infra/40-Credential/helm/credential/Chart.yaml b/ric-infra/40-Credential/helm/credential/Chart.yaml
deleted file mode 100644 (file)
index 69bdcc4..0000000
+++ /dev/null
@@ -1,22 +0,0 @@
-################################################################################
-#   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.                                             #
-################################################################################
-
-apiVersion: v1
-appVersion: "1.0"
-description: A Helm chart for setting up k8s resources for accessing external and infrastructure resources before RIC deployment"
-name: credential
-version: 1.1.0
diff --git a/ric-infra/40-Credential/helm/credential/requirements.yaml b/ric-infra/40-Credential/helm/credential/requirements.yaml
deleted file mode 100644 (file)
index 2ab71b4..0000000
+++ /dev/null
@@ -1,20 +0,0 @@
-################################################################################
-#   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: ric-common
-    version: ~2.0.0
diff --git a/ric-infra/40-Credential/helm/credential/templates/_helper.tpl b/ric-infra/40-Credential/helm/credential/templates/_helper.tpl
deleted file mode 100644 (file)
index e908b87..0000000
+++ /dev/null
@@ -1,48 +0,0 @@
-################################################################################
-#   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.                                             #
-################################################################################
-
-
-{{/*
-  Resolve the image repository secret token.
-  The value for .Values.global.repositoryCred is used:
-  repositoryCred:
-    user: user
-    password: password
-    mail: email (optional)
-*/}}
-{{- define "repository.secret" -}}
-  {{- $repo := include "common.repository" . }}
-  {{- $cred := .Values.credential.repositoryCredential }}
-  {{- $user := default "docker" $cred.user }}
-  {{- $password := default "docker" $cred.password }}
-  {{- $mail := default "@" $cred.mail }}
-  {{- $auth := printf "%s:%s" $user $password | b64enc }}
-  {{- printf "{\"%s\":{\"username\":\"%s\",\"password\":\"%s\",\"email\":\"%s\",\"auth\":\"%s\"}}" $repo $user $password $mail $auth | b64enc -}}
-{{- end -}}
-
-
-
-{{- define "helmrepo.secret.user" -}}
-  {{- $user := default "helm" .Values.credential.helmrepoCredential.user -}}
-  {{- printf "%s" $user |b64enc }}
-{{- end -}}
-
-
-{{- define "helmrepo.secret.password" -}}
-  {{- $pass := default "helm" .Values.credential.helmrepoCredential.password -}}
-  {{- printf "%s" $pass |b64enc }}
-{{- end -}}
diff --git a/ric-infra/40-Credential/helm/credential/templates/config-helm-cert.yaml b/ric-infra/40-Credential/helm/credential/templates/config-helm-cert.yaml
deleted file mode 100644 (file)
index 0962061..0000000
+++ /dev/null
@@ -1,25 +0,0 @@
-################################################################################
-#   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.                                             #
-################################################################################
-
-apiVersion: v1
-kind: ConfigMap
-metadata:
-  name: xapp-mgr-certs
-data:
-  tls.crt: |
-  {{- .Values.credential.helmCertificate | nindent 4 }}
-
diff --git a/ric-infra/40-Credential/helm/credential/templates/secrets-docker-reg.yaml b/ric-infra/40-Credential/helm/credential/templates/secrets-docker-reg.yaml
deleted file mode 100644 (file)
index 83866e5..0000000
+++ /dev/null
@@ -1,23 +0,0 @@
-################################################################################
-#   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.                                             #
-################################################################################
-apiVersion: v1
-kind: Secret
-metadata:
-  name: docker-reg-cred
-data:
-  .dockercfg: {{ include "repository.secret" . }}
-type: kubernetes.io/dockercfg
diff --git a/ric-infra/40-Credential/helm/credential/templates/secrets-helm-xapp.yaml b/ric-infra/40-Credential/helm/credential/templates/secrets-helm-xapp.yaml
deleted file mode 100644 (file)
index 24b226d..0000000
+++ /dev/null
@@ -1,25 +0,0 @@
-################################################################################
-#   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.                                             #
-################################################################################
-
-apiVersion: v1
-kind: Secret
-metadata:
-  name: xapp-mgr-creds
-type: Opaque
-data:
-  helm_repo_username: {{ include "helmrepo.secret.user" . }}
-  helm_repo_password: {{ include "helmrepo.secret.password" . }}
diff --git a/ric-infra/40-Credential/helm/credential/values.yaml b/ric-infra/40-Credential/helm/credential/values.yaml
deleted file mode 100644 (file)
index e47f912..0000000
+++ /dev/null
@@ -1,37 +0,0 @@
-################################################################################
-#   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.                                             #
-################################################################################
-
-# Values for setting up Kubernetes resources for accessing infrastructure such as docker registry
-# helm repo, etc.
-
-repository: "nexus3.o-ran-sc.org:10004"
-
-
-credential:
-  repositoryCredential:
-    user: "docker"
-    password: "docker"
-  
-  
-  helmrepoCredential:
-    user: "helm"
-    password: "helm"
-  
-  helmCertificate: |2 
-    -----BEGIN CERTIFICATE-----
-    <CERT FOR HELM>
-    -----END CERTIFICATE-----
diff --git a/ric-infra/45-Tiller/bin/install b/ric-infra/45-Tiller/bin/install
deleted file mode 100755 (executable)
index caecdd9..0000000
+++ /dev/null
@@ -1,69 +0,0 @@
-#!/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.                                             #
-################################################################################
-
-while [ -n "$1" ]; do # while loop starts
-
-    case "$1" in
-
-    -f) OVERRIDEYAML=$2
-        shift
-        ;;
-    -c) LIST_OF_COMPONENTS=$2
-        shift
-        ;;
-    *) echo "Option $1 not recognized" ;; # In case you typed a different option other than a,b,c
-
-    esac
-
-    shift
-
-done
-
-
-if [ -z "$OVERRIDEYAML" ];then
-    echo "****************************************************************************************************************"
-    echo "                                                     ERROR                                                      "
-    echo "****************************************************************************************************************"
-    echo "RIC deployment without deployment recipe is currently disabled. Please specify an recipe with the -f option."
-    echo "****************************************************************************************************************"
-    exit 1
-fi
-
-DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null && pwd )"
-GLOBAL_BLOCK=$(cat $OVERRIDEYAML | awk '/^global:/{getline; while ($0 ~ /^ +.*|^ *$/) {print $0; if (getline == 0) {break}}}')
-NAMESPACE_BLOCK=$(cat $OVERRIDEYAML | awk '/^  namespace:/{getline; while ($0 ~ /^    .*|^ *$/) {print $0; if (getline == 0) {break}}}')
-NAMESPACE=$(echo "$NAMESPACE_BLOCK" | awk '/^ *infra:/{print $2}')
-RELEASE_PREFIX=$(echo "$GLOBAL_BLOCK" | awk '/^ *releasePrefix:/{print $2}')
-COMPONENTS=${LIST_OF_COMPONENTS:-"xapp-tiller"}
-
-echo "Deploying RIC infra components [$COMPONENTS]"
-
-
-COMMON_CHART_VERSION=$(cat $DIR/../../../ric-common/Common-Template/helm/ric-common/Chart.yaml | grep version | awk '{print $2}')
-helm package -d /tmp $DIR/../../../ric-common/Common-Template/helm/ric-common
-
-
-for component in $COMPONENTS; do
-
-  mkdir -p $DIR/../helm/$component/charts/
-  cp /tmp/ric-common-$COMMON_CHART_VERSION.tgz $DIR/../helm/$component/charts/
-  EMPTY_CHART=$(helm template -f $OVERRIDEYAML $DIR/../helm/$component | grep apiVersion:)
-  if [ ! -z "$EMPTY_CHART" ]; then
-    helm install -f $OVERRIDEYAML --namespace "${NAMESPACE}" --name "${RELEASE_PREFIX}-$component" $DIR/../helm/$component
-  fi
-done
diff --git a/ric-infra/45-Tiller/bin/uninstall b/ric-infra/45-Tiller/bin/uninstall
deleted file mode 100755 (executable)
index 8045ef8..0000000
+++ /dev/null
@@ -1,37 +0,0 @@
-#!/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.                                             #
-################################################################################
-
-
-COMPONENTS="xapp-tiller"
-
-echo "Undeploying RIC infra components [$COMPONENTS]"
-for component in $COMPONENTS; do
-    RELEASE_LIST=$(helm list | grep "$component" | awk '{print $1}')
-    if [ ! -z "$RELEASE_LIST" ];then
-        NAMESPACE=$(helm list | grep "$component" | awk 'END{print $11}')
-       helm delete --purge $RELEASE_LIST
-
-        SECRET_LIST=$(kubectl get secret -n $NAMESPACE | awk '{ if ($2=="Opaque"){ print $1}}')
-        
-        for component in $SECRET_LIST; do
-          kubectl delete secret -n $NAMESPACE $component
-        done
-    fi
-
-done
-
diff --git a/ric-infra/45-Tiller/docker/Dockerfile b/ric-infra/45-Tiller/docker/Dockerfile
deleted file mode 100644 (file)
index e4c393b..0000000
+++ /dev/null
@@ -1,38 +0,0 @@
-############################################################################
-#   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.
-############################################################################
-FROM alpine
-
-MAINTAINER "RIC"
-
-LABEL name="A container with support for creating Kubernetes SSL secrets"
-
-RUN apk update
-
-RUN apk add openssl
-
-# unfortunately not available by itself in apk
-ADD https://storage.googleapis.com/kubernetes-release/release/v1.14.1/bin/linux/amd64/kubectl /bin/kubectl
-RUN chmod +x /bin/kubectl
-
-COPY bin/cert-gen.sh /bin/cert-gen.sh
-COPY bin/svcacct-to-kubeconfig.sh /bin/svcacct-to-kubeconfig.sh
-COPY bin/tls-secrets.sh /tls-secrets.sh
-
-RUN mkdir /pki
-
-CMD /tls-secrets.sh
-
diff --git a/ric-infra/45-Tiller/docker/bin/cert-gen.sh b/ric-infra/45-Tiller/docker/bin/cert-gen.sh
deleted file mode 100755 (executable)
index 29fba98..0000000
+++ /dev/null
@@ -1,84 +0,0 @@
-#!/bin/sh
-
-#   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.
-
-dnBase=${CERT_DN:-'/C=US/O=O-RAN Alliance/OU=O-RAN Software Community'}
-keyBits=${KEY_BITS:-4096}
-
-CAHome=${CA_DIR:-'/pki'}
-CADays=${CA_CERT_EXPIRY:-9125}
-CAKey=${CAHome}/${CA_KEY_NAME:-ca.key.pem}
-CACert=${CAHome}/${CA_CERT_NAME:-ca.cert.pem}
-#
-CertHome=${CERT_DIR:-$CAHome}
-#
-TillerDays=${TILLER_CERT_EXPIRY:-3650}
-TillerKey=${CertHome}/${TILLER_KEY_NAME:-tiller.key.pem}
-TillerCert=${CertHome}/${TILLER_CERT_NAME:-tiller.cert.pem}
-TillerCN=${TILLER_CN:-tiller}
-#
-HelmDays=${HELM_CERT_EXPIRY:-3650}
-HelmKey=${CertHome}/${HELM_KEY_NAME:-helm.key.pem}
-HelmCert=${CertHome}/${HELM_CERT_NAME:-helm.cert.pem}
-HelmCN=${HELM_CN:-helm}
-
-# 1. CA
-if [ ! -d ${CAHome} ]; then
-  mkdir -p ${CAHome}
-fi
-if [ ! -f ${CAKey} ]; then
-  openssl genrsa -out ${CAKey} ${keyBits}
-fi
-if [ ! -f ${CACert} ]; then
- openssl req -new -x509 -extensions v3_ca -sha256 -days ${CADays} \
-  -key ${CAKey} \
-  -out ${CACert} \
-  -subj "${dnBase}" 
-fi
-
-# 2. tiller server cert
-if [ ! -f ${TillerKey} ]; then
- openssl genrsa -out ${TillerKey} ${keyBits}
-fi
-if [ ! -f ${TillerCert} ]; then
- CSR=`mktemp`
- openssl req -new -sha256 \
-  -key ${TillerKey} \
-  -out ${CSR} \
-  -subj "${dnBase}/CN=${TillerCN}"
- openssl x509 -req -CAcreateserial -days ${TillerDays} \
-  -CA ${CACert} \
-  -CAkey ${CAKey} \
-  -in ${CSR} \
-  -out ${TillerCert}
-fi
-
-# 3. helm client cert
-if [ ! -f ${HelmKey} ]; then
- openssl genrsa -out ${HelmKey} ${keyBits}
-fi
-if [ ! -f ${HelmCert} ]; then
- CSR=`mktemp`
- openssl req -new -sha256 \
-  -key ${HelmKey} \
-  -out ${CSR} \
-  -subj "${dnBase}/CN=${HelmCN}"
- openssl x509 -req -CAcreateserial -days ${HelmDays} \
-  -CA ${CACert} \
-  -CAkey ${CAKey} \
-  -in ${CSR} \
-  -out ${HelmCert}
-fi
diff --git a/ric-infra/45-Tiller/docker/bin/svcacct-to-kubeconfig.sh b/ric-infra/45-Tiller/docker/bin/svcacct-to-kubeconfig.sh
deleted file mode 100755 (executable)
index 475c12b..0000000
+++ /dev/null
@@ -1,45 +0,0 @@
-#!/bin/sh
-
-#   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.
-
-# generate a kubconfig (at ${KUBECONFIG} file from the automatically-mounted
-# service account token.
-# ENVIRONMENT:
-# SVCACCT_NAME: the name of the service account user.  default "default"
-# CLUSTER_NAME: the name of the kubernetes cluster.  default "kubernetes"
-# KUBECONFIG: where the generated file will be deposited.
-SVCACCT_TOKEN=`cat /var/run/secrets/kubernetes.io/serviceaccount/token`
-CLUSTER_CA=`base64 /var/run/secrets/kubernetes.io/serviceaccount/ca.crt|tr -d '\n'`
-
-cat >${KUBECONFIG} <<__EOF__
-ApiVersion: v1
-kind: Config
-users:
-- name: ${SVCACCT_NAME:-default}
-  user:
-    token: ${SVCACCT_TOKEN}
-clusters:
-- cluster:
-    certificate-authority-data: ${CLUSTER_CA}
-    server: ${CLUSTER_SERVER:-https://kubernetes.default.svc.cluster.local/}
-  name: ${CLUSTER_NAME:-kubernetes}
-contexts:
-- context:
-    cluster: ${CLUSTER_NAME:-kubernetes}
-    user: ${SVCACCT_NAME:-default}
-  name: svcs-acct-context
-current-context: svcs-acct-context
-__EOF__
diff --git a/ric-infra/45-Tiller/docker/bin/tls-secrets.sh b/ric-infra/45-Tiller/docker/bin/tls-secrets.sh
deleted file mode 100755 (executable)
index b265750..0000000
+++ /dev/null
@@ -1,51 +0,0 @@
-#!/bin/sh
-
-#   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.
-
-set -x
-
-export ENTITIES=${ENTITIES:-helm tiller}
-export KUBECONFIG=${KUBECONFIG:-/kubeconfig}
-export CA_DIR=${CA_DIR:-/pki}
-if [ ! -z ${TARGET_NAMESPACE} ]; then
-  SECRET_NS="--namespace ${TARGET_NAMESPACE}"
-else
-  SECRET_NS=''
-fi
-
-if [ ! -f ${KUBECONFIG} ]; then
-  export SVCACCT_NAME=${SVCACCT_NAME:-tiller}
-  /bin/svcacct-to-kubeconfig.sh
-fi    
-
-if [ ! -f ${CA_DIR}/helm.key.pem -o \
-     ! -f ${CA_DIR}/tiller.key.pem ]; then
- /bin/cert-gen.sh
-fi    
-
-# i'm assuming we can just lose the CA key.
-for entity in ${ENTITIES}; do
- kubectl create secret generic \
-  --from-file=ca.crt=/pki/ca.cert.pem \
-  --from-file=tls.crt=/pki/${entity}.cert.pem \
-  --from-file=tls.key=/pki/${entity}.key.pem \
-  ${SECRET_NS} ${entity}
- kubectl label secret \
-  ${SECRET_NS} ${entity} \
-  app=helm \
-  name=${entity}
-done
diff --git a/ric-infra/45-Tiller/docker/container-tag.yaml b/ric-infra/45-Tiller/docker/container-tag.yaml
deleted file mode 100644 (file)
index 12585e7..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
----
-tag: 0.0.2
diff --git a/ric-infra/45-Tiller/helm/xapp-tiller/Chart.yaml b/ric-infra/45-Tiller/helm/xapp-tiller/Chart.yaml
deleted file mode 100644 (file)
index e02844a..0000000
+++ /dev/null
@@ -1,5 +0,0 @@
-apiVersion: v1
-appVersion: "1.0"
-description: Create SSL secrets for tiller
-name: xapp-tiller
-version: 0.1.0
diff --git a/ric-infra/45-Tiller/helm/xapp-tiller/requirements.yaml b/ric-infra/45-Tiller/helm/xapp-tiller/requirements.yaml
deleted file mode 100644 (file)
index 2ab71b4..0000000
+++ /dev/null
@@ -1,20 +0,0 @@
-################################################################################
-#   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: ric-common
-    version: ~2.0.0
diff --git a/ric-infra/45-Tiller/helm/xapp-tiller/templates/deployment-tiller.yaml b/ric-infra/45-Tiller/helm/xapp-tiller/templates/deployment-tiller.yaml
deleted file mode 100644 (file)
index ddc9677..0000000
+++ /dev/null
@@ -1,207 +0,0 @@
-{{/*
-   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.
-*/}}
-{{- if .Values.global }}
-{{- if .Values.global.tillers }}
-{{- $topCtx :=  . }}
-{{- range keys .Values.global.tillers }}
-{{- $key := . }}
-{{- with index $topCtx.Values.global.tillers . }}
-{{- $nameSpace := .nameSpace }}
-{{- $deployNameSpace := .deployNameSpace }}
-{{- $img := .image.tiller }}
-{{- $secretName := default "tiller-secret" .secret.tillerSecretName }}
-{{- $ctx := dict "ctx" $topCtx "key" $key }}
----
-apiVersion: v1
-kind: ServiceAccount
-metadata:
-  name: {{ include "common.serviceaccountname.tiller" $ctx }}
-  namespace: {{ $deployNameSpace }}
----  
-apiVersion: rbac.authorization.k8s.io/v1beta1
-kind: Role
-metadata:
-  name: {{ include "common.tillerName" $ctx }}-tiller-base
-  namespace: {{ $nameSpace }}
-rules:
-- apiGroups: [""]
-  resources: ["secrets"]
-  resourceNames: [ {{ $secretName }} ]
-  verbs: ["get"]
-- apiGroups: [""]
-  resources: ["pods/portforward"]
-  verbs: ["create"]
-- apiGroups: [""]
-  resources: ["namespaces"]
-  verbs: ["get"]
-- apiGroups: [""]  
-  resources: ["pods", "configmaps", "deployments", "services"]
-  verbs: ["get", "list", "create", "delete"]
----
-apiVersion: rbac.authorization.k8s.io/v1beta1
-kind: RoleBinding
-metadata:
-  name: {{ include "common.serviceaccountname.tiller" $ctx }}-{{ $nameSpace }}-tiller-base
-  namespace: {{ $nameSpace }}
-roleRef:
-  apiGroup: rbac.authorization.k8s.io
-  kind: Role
-  name: {{ include "common.tillerName" $ctx }}-tiller-base
-subjects:
-  - kind: ServiceAccount
-    name: {{ include "common.serviceaccountname.tiller" $ctx }}
-    namespace: {{ $deployNameSpace }}
----  
-apiVersion: rbac.authorization.k8s.io/v1beta1
-kind: Role
-metadata:
-  name: {{ include "common.tillerName" $ctx }}-tiller-operation
-  namespace: {{ $deployNameSpace }}
-rules:
-- apiGroups: [""]  
-  resources: ["configmaps"]
-  verbs: ["get", "list", "create", "delete", "update"]
----
-apiVersion: rbac.authorization.k8s.io/v1beta1
-kind: RoleBinding
-metadata:
-  name: {{ include "common.serviceaccountname.tiller" $ctx }}-{{ $nameSpace }}-tiller-operation
-  namespace: {{ $deployNameSpace }}
-roleRef:
-  apiGroup: rbac.authorization.k8s.io
-  kind: Role
-  name: {{ include "common.tillerName" $ctx }}-tiller-operation
-subjects:
-  - kind: ServiceAccount
-    name: {{ include "common.serviceaccountname.tiller" $ctx }}
-    namespace: {{ $deployNameSpace }}
-{{- if .serviceAccount.role }}
----
-apiVersion: rbac.authorization.k8s.io/v1beta1
-kind: Role
-metadata:
-  name: {{ include "common.tillerName" $ctx }}-tiller-deployer
-  namespace: {{ $nameSpace }}
-rules:
-{{ toYaml .serviceAccount.role }}
----
-apiVersion: rbac.authorization.k8s.io/v1beta1
-kind: RoleBinding
-metadata:
-  name: {{ include "common.serviceaccountname.tiller" $ctx }}-{{ $nameSpace }}-tiller-deployer
-  namespace: {{ $nameSpace }}
-roleRef:
-  apiGroup: rbac.authorization.k8s.io
-  kind: Role
-  name: {{ include "common.tillerName" $ctx }}-tiller-deployer
-subjects:
-  - kind: ServiceAccount
-    name: {{ include "common.serviceaccountname.tiller" $ctx }}
-    namespace: {{ $deployNameSpace }}
-{{- end }}
----
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  labels:
-    app: helm
-    name: tiller
-  name: {{ include "common.deploymentname.tiller" $ctx }}
-  namespace: {{ $deployNameSpace }}
-spec:
-  replicas: 1
-  selector:
-    matchLabels:
-      app: helm
-      name: tiller
-  template:
-    metadata:
-      labels:
-        app: helm
-        name: tiller
-    spec:
-      automountServiceAccountToken: true
-      imagePullSecrets:
-      {{- if $img.repositoryCred }}
-        - name: {{ $img.repositoryCred }}
-      {{- else }}
-        - name: {{ include "common.repositoryCred" $topCtx }}
-      {{- end }}
-      containers:
-      - env:
-        - name: TILLER_NAMESPACE
-          value: {{ $deployNameSpace }}
-        - name: TILLER_HISTORY_MAX
-          value: "0"
-        - name: TILLER_TLS_VERIFY
-          value: "1"
-        - name: TILLER_TLS_ENABLE
-          value: "1"
-        - name: TILLER_TLS_CERTS
-          value: /etc/certs
-        image: {{ if $img.repository }}{{- $img.repository -}}/{{ else }}{{ include "common.repository" $topCtx -}}/{{- end -}}{{- $img.name -}}{{- if $img.tag -}} : {{- $img.tag -}} {{- end }}
-        imagePullPolicy: {{ default "IfNotPresent" $img.pullPolicy }}
-        livenessProbe:
-          httpGet:
-            path: /liveness
-            port: 44135
-          initialDelaySeconds: 1
-          timeoutSeconds: 1
-        name: tiller
-        ports:
-        - containerPort: 44134
-          name: tiller
-        - containerPort: 44135
-          name: http
-        readinessProbe:
-          httpGet:
-            path: /readiness
-            port: 44135
-          initialDelaySeconds: 1
-          timeoutSeconds: 1
-        volumeMounts:
-        - mountPath: /etc/certs
-          name: tiller-certs
-          readOnly: true
-      serviceAccountName: {{ include "common.serviceaccountname.tiller" $ctx }}
-      volumes:
-      - name: tiller-certs
-        secret:
-          secretName: {{ $secretName }}
----
-apiVersion: v1
-kind: Service
-metadata:
-  creationTimestamp: null
-  labels:
-    app: helm
-    name: tiller
-  name: {{ include "common.servicename.tiller" $ctx }}
-  namespace: {{ $deployNameSpace }}
-spec:
-  ports:
-  - name: tiller
-    port: {{ default 44134 .port }}
-    targetPort: tiller
-  selector:
-    app: helm
-    name: tiller
-  type: ClusterIP
-{{- end }}
-{{- end }}
-{{- end }}
-{{- end }}
diff --git a/ric-infra/45-Tiller/helm/xapp-tiller/templates/job-tiller-secrets.yaml b/ric-infra/45-Tiller/helm/xapp-tiller/templates/job-tiller-secrets.yaml
deleted file mode 100644 (file)
index 0fcf772..0000000
+++ /dev/null
@@ -1,104 +0,0 @@
-{{/*
-   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.
-*/}}
-{{- if .Values.global }}
-{{- $kubeapiServerEndpoint := .Values.global.k8sAPIHost }}
-{{- if .Values.global.tillers }}
-{{- $topCtx := . }}
-{{- range keys .Values.global.tillers }}
-{{- $key := . }}
-{{- with index $topCtx.Values.global.tillers  . }}
-{{- $img := .image.tillerTLSSecrets }}
-{{- $tillerSecret := default "tiller-secret" .secret.tillerSecretName }}
-{{- $helmSecret := default "helm-secret" .secret.helmSecretName }}
-{{- $serviceAccountName := default "tiller" .serviceAccount }}
-{{- $nameSpace := .nameSpace }}
-{{- $deployNameSpace := .deployNameSpace }}
-{{- $img := .image.tillerTLSSecrets }}
-{{- $ctx := dict "ctx" $topCtx "key" $key }}
-{{- if .secret.create }}
-{{- $serviceAccountName := randAlpha 6 | lower | printf "tiller-secret-creator-%s" }}
----
-apiVersion: v1
-kind: ServiceAccount
-metadata:
-  name: {{ $serviceAccountName }}
-  namespace: {{ $deployNameSpace }}
----
-apiVersion: rbac.authorization.k8s.io/v1beta1
-kind: Role
-metadata:
-  name: {{ $serviceAccountName }}-secret-create
-  namespace: {{ $deployNameSpace }}
-rules:
-- apiGroups: [""]
-  resources: ["secrets"]
-  verbs: ["create", "get", "patch"]
----
-apiVersion: rbac.authorization.k8s.io/v1beta1
-kind: RoleBinding
-metadata:
-  name: {{ $serviceAccountName }}-secret-create
-  namespace: {{ $deployNameSpace }}
-roleRef:
-  apiGroup: rbac.authorization.k8s.io
-  kind: Role
-  name: {{ $serviceAccountName }}-secret-create
-subjects:
-  - kind: ServiceAccount
-    name: {{ $serviceAccountName }}
-    namespace: {{ $deployNameSpace }}
----
-apiVersion: batch/v1
-kind: Job
-metadata:
-  name: tiller-secret-generator
-  namespace: {{ $deployNameSpace }}
-spec:
-  template:
-    spec:
-      serviceAccountName: {{ $serviceAccountName }}
-      restartPolicy: Never
-      imagePullSecrets:
-      {{- if $img.repositoryCred }}
-        - name: {{ $img.repositoryCred }}
-      {{- else }}
-        - name: {{ include "common.repositoryCred" $topCtx }}
-      {{- end }}
-      containers:
-        - name: tiller-secret-generator
-          image: {{ if $img.repository }}{{- $img.repository -}}/{{ else }} {{ include "common.repository" $topCtx -}}/{{- end -}}{{- $img.name -}}{{- if $img.tag -}} : {{- $img.tag -}} {{- end }}
-          imagePullPolicy: {{ default "IfNotPresent" $img.pullPolicy }}
-          env:
-            - name: ENTITIES
-              value: {{ tuple $tillerSecret $helmSecret | join " "  }}
-            - name: TILLER_KEY_NAME
-              value: {{ $tillerSecret }}.key.pem
-            - name: TILLER_CERT_NAME
-              value: {{ $tillerSecret }}.cert.pem
-            - name: HELM_KEY_NAME
-              value: {{ $helmSecret }}.key.pem
-            - name: HELM_CERT_NAME
-              value: {{ $helmSecret }}.cert.pem
-            - name: TILLER_CN
-              value: {{ default ( include "common.servicename.tiller" $ctx ) .hostname }}
-            - name: CLUSTER_SERVER
-              value: {{ default "https://kubernetes.default.svc.cluster.local/" $kubeapiServerEndpoint }}
-{{- end }}
-{{- end }}
-{{- end }}
-{{- end }}
-{{- end }}
diff --git a/ric-infra/45-Tiller/helm/xapp-tiller/values.yaml b/ric-infra/45-Tiller/helm/xapp-tiller/values.yaml
deleted file mode 100644 (file)
index d31fc93..0000000
+++ /dev/null
@@ -1,27 +0,0 @@
-tillers:
-#   kubeapiServerEndpoint: https://kubernetes.default.svc.cluster.local/
-#   ricxapp:
-#     image:
-#       tillerTLSSecrets:
-#         name: it-dep-secrets
-#       tiller:
-#         repository: gcr.io
-#         name: kubernetes-helm/tiller
-#         tag: v2.12.3
-#     secret:
-#       create: true
-#       tillerSecretName: ricxapp-tiller-secret
-#       helmSecretName: ricxapp-helm-secret
-#     tls:
-#      authenticate: true
-#      verify: true
-#     serviceAccount:
-#       name: tiller
-#       role:
-#       - apiGroups: [""]
-#         resources: ["pods", "configmaps", "services"]
-#         verbs: ["get", "list", "create", "delete"]
-#       - apiGroups: ["extensions", "apps"]
-#         resources: ["deployments"]
-#         verbs: ["get", "list", "create", "delete"]
-#     port: 44134
diff --git a/ric-infra/README.md b/ric-infra/README.md
deleted file mode 100644 (file)
index 80b46d7..0000000
+++ /dev/null
@@ -1,78 +0,0 @@
-# RIC Infrastructure Support
-  
-Helm charts, configuration files, and automation scripts that deploy a development enviroment for RIC.
-A developer should start from here to create a kubernetes cluster that is pre-configured for RIC.
-Such a development cluster is mimicking a closed field-trial environment. 
-
-
-### Directory Structure
-.
-├── 00-Kubernetes             Contains scripts to deploy K8S cluster
-├── 15-Chartmuseum            Contains scripts and helm charts to deploy the Helm chart museum
-├── 20-Monitoring             Helm charts for installing ELFK stack
-├── 30-Kong                   Helm charts for installing Kong Proxy/Ingress Controller
-├── 40-Credential             Helm charts to onboard credential and secrets for docker registry and helm repo
-├── 45-Tiller                 
-└── README.md                 This file
-
-
-### To deploy the Kubernetes cluster
-```sh
-$ # Modify the configuration files in ./00-Kubernetes/etc/
-$ . ./00-Kubernetes/bin/install
-```
-
-
-### To deploy the Chartmuseum
-```sh
-$ # An override file must be used.
-$ # Modify the override file, for example ../RECIPE_EXAMPLE/RIC_INFRA_RECIPE_EXAMPLE
-$ #. ./15-Chartmuseum/bin/install -f YOUR_OVERRIDE_FILE
-$ # To uninstall,
-$ . ./15-Chartmuseum/bin/uninstall
-```
-
-
-### To deploy ELFK stack
-```sh
-$ # An override file must be used.
-$ # Modify the override file, for example ../RECIPE_EXAMPLE/RIC_INFRA_RECIPE_EXAMPLE
-$ . ./20-Monitoring/bin/install -f YOUR_OVERRIDE_FILE
-$ # To uninstall,
-$ . ./20-Monitoring/bin/uninstall
-```
-
-
-### To deploy Kong
-```sh
-$ # An override file must be used.
-$ # Modify the override file, for example ../RECIPE_EXAMPLE/RIC_INFRA_RECIPE_EXAMPLE
-$ . ./30-Kong/bin/install -f YOUR_OVERRIDE_FILE
-$ # To uninstall,
-$ . ./30-Kong/bin/uninstall
-```
-
-
-### To onboard credentials
-```sh
-$ # Modify the user name and password in ./40-Credential/helm/values.yaml
-$ # Alternatively, include the credential information in an override value yaml file
-$ . ./40-Credential/bin/install
-$ # If you have an override value.yaml file, please use
-$ #. ./40-Credential/bin/install YOUR_OVERRIDE_FILE
-```
-
-### Credential Deployment Options
-You can configure the Helm release name, Kubernetes namespace using configuration files located in ./40-Credential/etc/
-Please make sure that the namespace is the same one as the one used for RIC platform components.
-
-
-### To deploy an additional Tiller for xapp deployment
-```sh
-$ # An override file must be used.
-$ # Modify the override file, for example ../RECIPE_EXAMPLE/RIC_INFRA_RECIPE_EXAMPLE
-$ . ./45-Tiller/bin/install -f YOUR_OVERRIDE_FILE
-$ # To uninstall,
-$ . ./45-Tiller/bin/uninstall
-```
-
diff --git a/ric-platform/50-RIC-Platform/bin/install b/ric-platform/50-RIC-Platform/bin/install
deleted file mode 100755 (executable)
index 7e46ad9..0000000
+++ /dev/null
@@ -1,65 +0,0 @@
-#!/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.                                             #
-################################################################################
-while [ -n "$1" ]; do # while loop starts
-
-    case "$1" in
-
-    -f) OVERRIDEYAML=$2
-        shift
-        ;;
-    -c) LIST_OF_COMPONENTS=$2
-        shift
-        ;;
-    *) echo "Option $1 not recognized" ;; # In case you typed a different option other than a,b,c
-
-    esac
-
-    shift
-
-done
-
-
-if [ -z "$OVERRIDEYAML" ];then
-    echo "****************************************************************************************************************"
-    echo "                                                     ERROR                                                      "
-    echo "****************************************************************************************************************"
-    echo "RIC deployment without deployment recipe is currently disabled. Please specify an recipe with the -f option."
-    echo "****************************************************************************************************************"
-    exit 1
-fi
-
-DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null && pwd )"
-GLOBAL_BLOCK=$(cat $OVERRIDEYAML | awk '/^global:/{getline; while ($0 ~ /^ +.*|^ *$/) {print $0; if (getline == 0) {break}}}')
-NAMESPACE_BLOCK=$(cat $OVERRIDEYAML | awk '/^  namespace:/{getline; while ($0 ~ /^    .*|^ *$/) {print $0; if (getline == 0) {break}}}')
-NAMESPACE=$(echo "$NAMESPACE_BLOCK" | awk '/^ *platform:/{print $2}')
-RELEASE_PREFIX=$(echo "$GLOBAL_BLOCK" | awk '/^ *releasePrefix:/{print $2}')
-COMPONENTS=${LIST_OF_COMPONENTS:-"appmgr rtmgr dbaas1 e2mgr e2term a1mediator submgr vespamgr rsm jaegeradapter"}
-
-echo "Deploying RIC infra components [$COMPONENTS]"
-
-
-COMMON_CHART_VERSION=$(cat $DIR/../../../ric-common/Common-Template/helm/ric-common/Chart.yaml | grep version | awk '{print $2}')
-helm package -d /tmp $DIR/../../../ric-common/Common-Template/helm/ric-common
-
-
-for component in $COMPONENTS; do
-
-  mkdir -p $DIR/../helm/$component/charts/
-  cp /tmp/ric-common-$COMMON_CHART_VERSION.tgz $DIR/../helm/$component/charts/
-  helm install -f $OVERRIDEYAML --namespace "${NAMESPACE}" --name "${RELEASE_PREFIX}-$component" $DIR/../helm/$component
-done
diff --git a/ric-platform/50-RIC-Platform/bin/uninstall b/ric-platform/50-RIC-Platform/bin/uninstall
deleted file mode 100755 (executable)
index 88c021e..0000000
+++ /dev/null
@@ -1,31 +0,0 @@
-#!/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.                                             #
-################################################################################
-
-COMPONENTS="appmgr rtmgr dbaas1 e2mgr e2term a1mediator submgr vespamgr rsm jaegeradapter"
-
-echo "Undeploying RIC platform components [$COMPONENTS]"
-
-
-
-for component in $COMPONENTS; do
-    RELEASE_LIST=$(helm list | grep "$component" | awk '{print $1}')
-    if [ ! -z "$RELEASE_LIST" ];then
-        helm delete --purge $RELEASE_LIST
-    fi
-
-done
diff --git a/ric-platform/50-RIC-Platform/helm/a1mediator/.gitignore b/ric-platform/50-RIC-Platform/helm/a1mediator/.gitignore
deleted file mode 100644 (file)
index d8651e0..0000000
+++ /dev/null
@@ -1 +0,0 @@
-NOTES.txt
diff --git a/ric-platform/50-RIC-Platform/helm/a1mediator/.helmignore b/ric-platform/50-RIC-Platform/helm/a1mediator/.helmignore
deleted file mode 100644 (file)
index 50af031..0000000
+++ /dev/null
@@ -1,22 +0,0 @@
-# Patterns to ignore when building packages.
-# This supports shell glob matching, relative path matching, and
-# negation (prefixed with !). Only one pattern per line.
-.DS_Store
-# Common VCS dirs
-.git/
-.gitignore
-.bzr/
-.bzrignore
-.hg/
-.hgignore
-.svn/
-# Common backup files
-*.swp
-*.bak
-*.tmp
-*~
-# Various IDEs
-.project
-.idea/
-*.tmproj
-.vscode/
diff --git a/ric-platform/50-RIC-Platform/helm/a1mediator/Chart.yaml b/ric-platform/50-RIC-Platform/helm/a1mediator/Chart.yaml
deleted file mode 100644 (file)
index 28d5951..0000000
+++ /dev/null
@@ -1,4 +0,0 @@
-apiVersion: v1
-description: A1 Helm chart for Kubernetes
-name: a1mediator
-version: 2.0.0
diff --git a/ric-platform/50-RIC-Platform/helm/a1mediator/requirements.yaml b/ric-platform/50-RIC-Platform/helm/a1mediator/requirements.yaml
deleted file mode 100644 (file)
index 2ab71b4..0000000
+++ /dev/null
@@ -1,20 +0,0 @@
-################################################################################
-#   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: ric-common
-    version: ~2.0.0
diff --git a/ric-platform/50-RIC-Platform/helm/a1mediator/templates/config.yaml b/ric-platform/50-RIC-Platform/helm/a1mediator/templates/config.yaml
deleted file mode 100644 (file)
index 97a07b3..0000000
+++ /dev/null
@@ -1,34 +0,0 @@
-################################################################################
-#   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.                                             #
-################################################################################
-
----
-apiVersion: v1
-kind: ConfigMap
-metadata:
-  name: {{ include "common.configmapname.a1mediator" . }}-a1conf
-data:
-  local.rt: |
-    newrt|start
-    # Warning! this is not a functioning table because the subscription manager and route manager are now involved in a1 flows
-    # the real routing table requires subscription ids as routing is now done over sub ids, but this isn't known until xapp deploy time, it's a dynamic process triggered by the xapp manager
-    # there is a single message type for all messages a1 sends out now, subid is the other necessary piece of info
-    # there are two message types a1 listens for; 20011 (instance response) and 20012 (query)
-    # xapps likely use rts to reply with 20012 so the routing entry isn't needed for that in most cases
-    mse|20010|SUBID|service-ricxapp-admctrl-rmr.{{ include "common.namespace.xapp" . }}:4563
-    rte|20011|{{ include "common.servicename.a1mediator.rmr" . }}.{{ include "common.namespace.platform" . }}:{{ include "common.serviceport.a1mediator.rmr.data" . }}
-    rte|20012|{{ include "common.servicename.a1mediator.rmr" . }}.{{ include "common.namespace.platform" . }}:{{ include "common.serviceport.a1mediator.rmr.data" . }}
-    newrt|end
diff --git a/ric-platform/50-RIC-Platform/helm/a1mediator/templates/deployment.yaml b/ric-platform/50-RIC-Platform/helm/a1mediator/templates/deployment.yaml
deleted file mode 100644 (file)
index 4430483..0000000
+++ /dev/null
@@ -1,80 +0,0 @@
-################################################################################
-#   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.                                             #
-################################################################################
-
----
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: {{ include "common.deploymentname.a1mediator" . }}
-  namespace: {{ include "common.namespace.platform" . }}
-  labels:
-    app: {{ include "common.namespace.platform" . }}-{{ include "common.name.a1mediator" . }}
-    chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
-    release: {{ .Release.Name }}
-    heritage: {{ .Release.Service }}
-spec:
-  replicas: {{ .Values.a1mediator.replicaCount }}
-  selector:
-    matchLabels:
-      app: {{ include "common.namespace.platform" . }}-{{ include "common.name.a1mediator" . }}
-      release: {{ .Release.Name }}
-  template:
-    metadata:
-      {{- if .Values.a1mediator.annotations }}
-      annotations:
-        {{- .Values.a1mediator.annotations | nindent 8 -}}
-      {{ end }}
-      labels:
-        app: {{ include "common.namespace.platform" . }}-{{ include "common.name.a1mediator" . }}
-        release: {{ .Release.Name }}
-    spec:
-      hostname: {{ include "common.name.a1mediator" . }}
-      imagePullSecrets:
-        - name: {{ include "common.repositoryCred" . }}
-      containers:
-        - name: {{ include "common.containername.a1mediator" . }}
-          volumeMounts:
-          - name: a1conf
-            mountPath: /opt/route/local.rt
-            subPath: local.rt
-          envFrom:
-            - configMapRef:
-                name: {{ include "common.configmapname.a1mediator" . }}-env
-          image: {{ include "common.repository" . }}/{{ .Values.a1mediator.image.name }}:{{ .Values.a1mediator.image.tag }}
-          imagePullPolicy: {{ include "common.pullPolicy" . }}
-          ports:
-            - name: http
-              containerPort: {{ include "common.serviceport.a1mediator.http" . }}
-              protocol: TCP
-            - name: rmrroute
-              containerPort: {{ include "common.serviceport.a1mediator.rmr.route" . }}
-              protocol: TCP
-            - name: rmrdata
-              containerPort: {{ include "common.serviceport.a1mediator.rmr.data" . }}
-              protocol: TCP
-          livenessProbe:
-            httpGet:
-              path: /a1-p/healthcheck
-              port: http
-          readinessProbe:
-            httpGet:
-              path: /a1-p/healthcheck
-              port: http
-      volumes:
-        - name: "a1conf"
-          configMap:
-            name:  {{ include "common.configmapname.a1mediator" . }}-a1conf
diff --git a/ric-platform/50-RIC-Platform/helm/a1mediator/templates/env.yaml b/ric-platform/50-RIC-Platform/helm/a1mediator/templates/env.yaml
deleted file mode 100644 (file)
index e60850a..0000000
+++ /dev/null
@@ -1,33 +0,0 @@
-################################################################################
-#   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.                                             #
-################################################################################
-apiVersion: v1
-kind: ConfigMap
-metadata:
-  name: {{ include "common.configmapname.a1mediator" . }}-env
-data:
-  DBAAS_SERVICE_HOST: {{ include "common.servicename.dbaas.tcp" . | quote }}
-  DBAAS_SERVICE_PORT: {{ include "common.serviceport.dbaas.tcp" . | quote }}
-  DBAAS_PORT_6379_TCP_ADDR: {{ include "common.servicename.dbaas.tcp" . | quote }}
-  DBAAS_PORT_6379_TCP_PORT: {{ include "common.serviceport.dbaas.tcp" . | quote }}
-  RMR_RTG_SVC: {{ include "common.serviceport.a1mediator.rmr.route" . | quote }}
-  PYTHONUNBUFFERED: "1"
-  A1_RMR_RETRY_TIMES: "{{ .Values.a1mediator.rmr_timeout_config.a1_rcv_retry_times }}"
-  # this sets the source field in messages from a1 to point back to a1s service name, rather than it's random pod name
-  # In my private testing, this is needed! however it wasn't here in it/dep. If routing doesn't work, possibly add this back.
-  # RMR_SRC_ID: curlybrace curlybrace .Values.rmrservice.name curlybrace curlybrace
-  INSTANCE_DELETE_NO_RESP_TTL: "{{ .Values.a1mediator.rmr_timeout_config.ins_del_no_resp_ttl }}"
-  INSTANCE_DELETE_RESP_TTL: "{{ .Values.a1mediator.rmr_timeout_config.ins_del_resp_ttl }}"
diff --git a/ric-platform/50-RIC-Platform/helm/a1mediator/templates/ingress-a1mediator.yaml b/ric-platform/50-RIC-Platform/helm/a1mediator/templates/ingress-a1mediator.yaml
deleted file mode 100644 (file)
index 8a04744..0000000
+++ /dev/null
@@ -1,12 +0,0 @@
-apiVersion: networking.k8s.io/v1beta1
-kind: Ingress
-metadata:
-  name: {{ include "common.ingressname.a1mediator" . }}
-spec:
-  rules:
-  - http:
-      paths:
-      - path: {{ include "common.kongpath.ric.a1mediator" . }}
-        backend:
-          serviceName: {{ include "common.servicename.a1mediator.http" . }}
-          servicePort: {{ include "common.serviceport.a1mediator.http" . }}
diff --git a/ric-platform/50-RIC-Platform/helm/a1mediator/templates/service-http.yaml b/ric-platform/50-RIC-Platform/helm/a1mediator/templates/service-http.yaml
deleted file mode 100644 (file)
index 1c0e679..0000000
+++ /dev/null
@@ -1,37 +0,0 @@
-################################################################################
-#   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.                                             #
-################################################################################
-
-apiVersion: v1
-kind: Service
-metadata:
-  name: {{ include "common.servicename.a1mediator.http" . }}
-  namespace: {{ include "common.namespace.platform" . }}
-  labels:
-    app: {{ include "common.namespace.platform" . }}-{{ include "common.name.a1mediator" . }}
-    chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
-    release: {{ .Release.Name }}
-    heritage: {{ .Release.Service }}
-spec:
-  type: ClusterIP
-  ports:
-    - port: {{ include "common.serviceport.a1mediator.http" . }}
-      protocol: "TCP"
-      name: "http"
-      targetPort: "http"
-  selector:
-    app: {{ include "common.namespace.platform" . }}-{{ include "common.name.a1mediator" . }}
-    release: {{ .Release.Name }}
diff --git a/ric-platform/50-RIC-Platform/helm/a1mediator/templates/service-rmr.yaml b/ric-platform/50-RIC-Platform/helm/a1mediator/templates/service-rmr.yaml
deleted file mode 100644 (file)
index c8f19f0..0000000
+++ /dev/null
@@ -1,41 +0,0 @@
-################################################################################
-#   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.                                             #
-################################################################################
-
-apiVersion: v1
-kind: Service
-metadata:
-  name: {{ include "common.servicename.a1mediator.rmr" . }}
-  namespace: {{ include "common.namespace.platform" . }}
-  labels:
-    app: {{ include "common.namespace.platform" . }}-{{ include "common.name.a1mediator" . }}
-    chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
-    release: {{ .Release.Name }}
-    heritage: {{ .Release.Service }}
-spec:
-  type: ClusterIP
-  ports:
-    - port: {{ include "common.serviceport.a1mediator.rmr.route" . }}
-      protocol: "TCP"
-      name: "rmrroute"
-      targetPort: "rmrroute"
-    - port: {{ include "common.serviceport.a1mediator.rmr.data" . }}
-      protocol: "TCP"
-      name: "rmrdata"
-      targetPort: "rmrdata"
-  selector:
-    app: {{ include "common.namespace.platform" . }}-{{ include "common.name.a1mediator" . }}
-    release: {{ .Release.Name }}
diff --git a/ric-platform/50-RIC-Platform/helm/a1mediator/values.yaml b/ric-platform/50-RIC-Platform/helm/a1mediator/values.yaml
deleted file mode 100644 (file)
index 72298b5..0000000
+++ /dev/null
@@ -1,43 +0,0 @@
-################################################################################
-#   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.                                             #
-################################################################################
-
-#################################################################
-# Application configuration defaults.
-#################################################################
-# application image
-
-repository: "nexus3.o-ran-sc.org:10004"
-imagePullPolicy: IfNotPresent
-repositoryCred: docker-reg-cred
-
-a1mediator:
-  replicaCount: 1
-
-  image:
-    name: ric-plt-a1
-    tag: 2.0.0
-
-  # Service ports are now defined in
-  # ric-common/Common-Template/helm/ric-common/templates/_ports.tpl file.
-  # If need to change a service port, make the code change necessary, then
-  # update the _ports.tpl file with the new port number.
-
-# these are ENV variables that A1 takes; see docs
-  rmr_timeout_config:
-    a1_rcv_retry_times: 20
-    ins_del_no_resp_ttl: 5
-    ins_del_resp_ttl: 10
diff --git a/ric-platform/50-RIC-Platform/helm/appmgr/.helmignore b/ric-platform/50-RIC-Platform/helm/appmgr/.helmignore
deleted file mode 100644 (file)
index 50af031..0000000
+++ /dev/null
@@ -1,22 +0,0 @@
-# Patterns to ignore when building packages.
-# This supports shell glob matching, relative path matching, and
-# negation (prefixed with !). Only one pattern per line.
-.DS_Store
-# Common VCS dirs
-.git/
-.gitignore
-.bzr/
-.bzrignore
-.hg/
-.hgignore
-.svn/
-# Common backup files
-*.swp
-*.bak
-*.tmp
-*~
-# Various IDEs
-.project
-.idea/
-*.tmproj
-.vscode/
diff --git a/ric-platform/50-RIC-Platform/helm/appmgr/requirements.yaml b/ric-platform/50-RIC-Platform/helm/appmgr/requirements.yaml
deleted file mode 100644 (file)
index 2ab71b4..0000000
+++ /dev/null
@@ -1,20 +0,0 @@
-################################################################################
-#   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: ric-common
-    version: ~2.0.0
diff --git a/ric-platform/50-RIC-Platform/helm/appmgr/resources/appmgr.yaml b/ric-platform/50-RIC-Platform/helm/appmgr/resources/appmgr.yaml
deleted file mode 100644 (file)
index 6240038..0000000
+++ /dev/null
@@ -1,25 +0,0 @@
-"local":
-  # Port on which the xapp-manager REST services are provided
-  "host": __REST_PORT__
-"helm":
-  # Remote helm repo URL. UPDATE this as required.
-  "repo": __HELM_REPO__
-
-  # Repo name referred within the xapp-manager
-  "repo-name": __REPO_NAME__
-
-  # Tiller service details in the cluster. UPDATE this as required.
-  "tiller-service": __TILLER_SERVICE__
-  "tiller-namespace": __TILLER_NAMESPACE__
-  "tiller-port": __TILLER_PORT__
-  # helm username and password files
-  "helm-username-file": "/opt/ric/secret/helm_repo_username"
-  "helm-password-file": "/opt/ric/secret/helm_repo_password"
-  "retry": 1
-"xapp":
-  #Namespace to install xAPPs
-  "namespace": __XAPP_NAMESPACE__
-  "tarDir": "/tmp"
-  "schema": "descriptors/schema.json"
-  "config": "config/config-file.json"
-  "tmpConfig": "/tmp/config-file.json"
diff --git a/ric-platform/50-RIC-Platform/helm/appmgr/templates/appconfig.yaml b/ric-platform/50-RIC-Platform/helm/appmgr/templates/appconfig.yaml
deleted file mode 100644 (file)
index 311283a..0000000
+++ /dev/null
@@ -1,32 +0,0 @@
-################################################################################
-#   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.                                             #
-################################################################################
-{{- $tillerKey := .Values.appmgr.tillerkey | default "ricxapp" }}
-{{- $topCtx :=  . }}
-{{- $ctx := dict "ctx" $topCtx "key" $tillerKey }}
-apiVersion: v1
-kind: ConfigMap
-metadata:
-  name: {{ include "common.configmapname.appmgr" . }}-appconfig
-data:
-    {{- $restport := (printf ":%s" (include "common.serviceport.appmgr.http" .) ) | quote -}}
-    {{- $helmrepo := include "common.helmrepository" . | quote -}}
-    {{- $reponame := default "helm-repo" .Values.appmgr.reponame | quote -}}
-    {{- $tillerdeploynamespace := include "common.tillerDeployNameSpace" $ctx -}}
-    {{- $tillerservice := include "common.servicename.tiller" $ctx -}}
-    {{- $tillerport := include "common.tillerPort" $ctx | quote -}}
-    {{- $xappnamespace := include "common.namespace.xapp" . | quote -}}
-    {{- (.Files.Glob "resources/appmgr.yaml").AsConfig | replace "__XAPP_NAMESPACE__" $xappnamespace | replace "__HELM_REPO__" $helmrepo | replace "__REST_PORT__" $restport | replace "__REPO_NAME__" $reponame | replace "__TILLER_SERVICE__" $tillerservice | replace "__TILLER_NAMESPACE__" $tillerdeploynamespace | replace "__TILLER_PORT__" $tillerport | nindent 2 }}
diff --git a/ric-platform/50-RIC-Platform/helm/appmgr/templates/bin/_appmgr-tiller-secret-copier.sh.tpl b/ric-platform/50-RIC-Platform/helm/appmgr/templates/bin/_appmgr-tiller-secret-copier.sh.tpl
deleted file mode 100644 (file)
index 4b17cfb..0000000
+++ /dev/null
@@ -1,41 +0,0 @@
-{{/*
-   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.
-*/}}
-#!/bin/sh
-if [ -x /svcacct-to-kubeconfig.sh ] ; then
- /svcacct-to-kubeconfig.sh
-fi
-
-if [ ! -z "${HELM_TLS_CA_CERT}" ]; then
-  kubectl -n ${SECRET_NAMESPACE} get secret -o yaml ${SECRET_NAME} | \
-   grep 'ca.crt:' | \
-   awk '{print $2}' | \
-   base64 -d > ${HELM_TLS_CA_CERT}
-fi
-
-if [ ! -z "${HELM_TLS_CERT}" ]; then
-  kubectl -n ${SECRET_NAMESPACE} get secret -o yaml ${SECRET_NAME} | \
-   grep 'tls.crt:' | \
-   awk '{print $2}' | \
-   base64 -d > ${HELM_TLS_CERT}
-fi
-
-if [ ! -z "${HELM_TLS_KEY}" ]; then
-  kubectl -n ${SECRET_NAMESPACE} get secret -o yaml ${SECRET_NAME} | \
-   grep 'tls.key:' | \
-   awk '{print $2}' | \
-   base64 -d > ${HELM_TLS_KEY}
-fi
diff --git a/ric-platform/50-RIC-Platform/helm/appmgr/templates/bin/_svcacct-to-kubeconfig.sh.tpl b/ric-platform/50-RIC-Platform/helm/appmgr/templates/bin/_svcacct-to-kubeconfig.sh.tpl
deleted file mode 100755 (executable)
index 1340317..0000000
+++ /dev/null
@@ -1,46 +0,0 @@
-{{/*
-   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.
-*/}}
-#!/bin/sh
-
-# generate a kubconfig (at ${KUBECONFIG} file from the automatically-mounted
-# service account token.
-# ENVIRONMENT:
-# SVCACCT_NAME: the name of the service account user.  default "default"
-# CLUSTER_NAME: the name of the kubernetes cluster.  default "kubernetes"
-# KUBECONFIG: where the generated file will be deposited.
-SVCACCT_TOKEN=`cat /var/run/secrets/kubernetes.io/serviceaccount/token`
-CLUSTER_CA=`base64 /var/run/secrets/kubernetes.io/serviceaccount/ca.crt|tr -d '\n'`
-
-cat >${KUBECONFIG} <<__EOF__
-ApiVersion: v1
-kind: Config
-users:
-- name: ${SVCACCT_NAME:-default}
-  user:
-    token: ${SVCACCT_TOKEN}
-clusters:
-- cluster:
-    certificate-authority-data: ${CLUSTER_CA}
-    server: ${K8S_API_HOST:-https://kubernetes.default.svc.cluster.local/}
-  name: ${CLUSTER_NAME:-kubernetes}
-contexts:
-- context:
-    cluster: ${CLUSTER_NAME:-kubernetes}
-    user: ${SVCACCT_NAME:-default}
-  name: svcs-acct-context
-current-context: svcs-acct-context
-__EOF__
diff --git a/ric-platform/50-RIC-Platform/helm/appmgr/templates/configmap-bin.yaml b/ric-platform/50-RIC-Platform/helm/appmgr/templates/configmap-bin.yaml
deleted file mode 100644 (file)
index dfd0714..0000000
+++ /dev/null
@@ -1,26 +0,0 @@
-################################################################################
-#   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.                                             #
-################################################################################
-
-apiVersion: v1
-kind: ConfigMap
-metadata:
-  name: {{ include "common.configmapname.appmgr" . }}-bin
-data:
-  appmgr-tiller-secret-copier.sh: |
-   {{-  include "appmgr/templates/bin/_appmgr-tiller-secret-copier.sh.tpl" . | indent 4 }}
-  svcacct-to-kubeconfig.sh: |
-   {{-  include "appmgr/templates/bin/_svcacct-to-kubeconfig.sh.tpl" . | indent 4 }}
diff --git a/ric-platform/50-RIC-Platform/helm/appmgr/templates/deployment.yaml b/ric-platform/50-RIC-Platform/helm/appmgr/templates/deployment.yaml
deleted file mode 100644 (file)
index 8ab8d16..0000000
+++ /dev/null
@@ -1,148 +0,0 @@
-################################################################################
-#   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.                                             #
-################################################################################
-{{- $tillerKey := .Values.appmgr.tillerkey | default "ricxapp" }}
-{{- $topCtx :=  . }}
-{{- $ctx := dict "ctx" $topCtx "key" $tillerKey }}
-{{- $secretPath := .Values.appmgr.appsecretpath | default "/opt/ric/secret" }}
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: {{ include "common.deploymentname.appmgr" . }}
-  namespace: {{ include "common.namespace.platform" . }}
-  labels:
-    app: {{ include "common.namespace.platform" . }}-{{ include "common.name.appmgr" . }}
-    chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
-    release: {{ .Release.Name }}
-    heritage: {{ .Release.Service }}
-spec:
-  replicas: {{ .Values.appmgr.replicaCount }}
-  selector:
-    matchLabels:
-      app: {{ include "common.namespace.platform" . }}-{{ include "common.name.appmgr" . }}
-      release: {{ .Release.Name }}
-  template:
-    metadata:
-      {{- if .Values.appmgr.annotations }}
-      annotations:
-        {{- .Values.appmgr.annotations | nindent 8 -}}
-      {{ end }}
-      labels:
-        app: {{ include "common.namespace.platform" . }}-{{ include "common.name.appmgr" . }}
-        release: {{ .Release.Name }}
-    spec:
-      hostname: {{ include "common.name.appmgr" . }}
-      serviceAccountName: {{ include "common.serviceaccountname.appmgr" . }}
-      imagePullSecrets:
-        - name: {{ include "common.repositoryCred" . }}
-{{- if or (eq ( include "common.tillerTLSVerify" $ctx ) "true" )  (eq ( include "common.tillerTLSAuthenticate" $ctx ) "true") }}
-      initContainers:
-        - name: {{ include "common.containername.appmgr" . }}-copy-tiller-secret
-          image: {{ include "common.repository" . }}/{{ .Values.appmgr.image.init.name }}:{{ .Values.appmgr.image.init.tag }}
-          imagePullPolicy: {{ default "IfNotPresent" .pullPolicy }}
-          env:
-            - name: SVCACCT_NAME
-              value: {{ include "common.serviceaccountname.appmgr" . }}
-            - name: CLUSTER_NAME
-              value: {{ default "kubernetes" .Values.global.clusterName }}
-            - name: KUBECONFIG
-              value: /tmp/kubeconfig
-            - name: K8S_API_HOST
-              value: {{ default "kubernetes.default.svc.cluster.local" .Values.global.k8sAPIHost }}
-            - name: SECRET_NAMESPACE
-              value: {{ include "common.tillerDeployNameSpace" $ctx }}
-            - name: SECRET_NAME
-              value: {{ include "common.tillerHelmClientTLSSecret" $ctx }}
-          envFrom:
-            - configMapRef:
-                name: {{ include "common.configmapname.appmgr" . }}-env
-          command: ["/appmgr-tiller-secret-copier.sh"]
-          volumeMounts:
-            - name: helm-secret-volume
-              mountPath: {{ $secretPath }}
-              readOnly: false
-            - name: appmgr-bin-volume
-              mountPath: /svcacct-to-kubeconfig.sh
-              subPath: svcacct-to-kubeconfig.sh
-            - name: appmgr-bin-volume
-              mountPath: /appmgr-tiller-secret-copier.sh
-              subPath: appmgr-tiller-secret-copier.sh
-{{- end }}      
-      containers:
-        - name: {{ include "common.containername.appmgr" . }}
-          image: {{ include "common.repository" . }}/{{ .Values.appmgr.image.name }}:{{ .Values.appmgr.image.tag }}
-          imagePullPolicy: {{ include "common.pullPolicy" . }}
-          ports:
-            - name: http
-              containerPort: {{ include "common.serviceport.appmgr.http" . }}
-              protocol: TCP
-            - name: rmrroute
-              containerPort: {{ include "common.serviceport.appmgr.rmr.route" . }}
-              protocol: TCP
-            - name: rmrdata
-              containerPort: {{ include "common.serviceport.appmgr.rmr.data" . }}
-              protocol: TCP
-          volumeMounts:
-            - name: config-volume
-              mountPath: {{ .Values.appmgr.appconfigpath }}/appmgr.yaml
-              subPath: appmgr.yaml
-            - name: cert-volume
-              mountPath: {{ .Values.appmgr.appcertpath }}
-            - name: helm-secret-volume
-              mountPath: {{ $secretPath }}
-              readOnly: false
-            - name: secret-volume
-              mountPath: {{ $secretPath }}/helm_repo_username
-              subPath: helm_repo_username
-            - name: secret-volume
-              mountPath: {{ $secretPath }}/helm_repo_password
-              subPath: helm_repo_password
-          envFrom:
-            - configMapRef:
-                name: {{ include "common.configmapname.appmgr" . }}-env
-          livenessProbe:
-            #exec:
-            #  command:
-            #    - /bin/bash
-            #    - -c
-            #    - ps -ef | grep {{ .Values.livenessprocessname }}| grep -v "grep"
-            #initialDelaySeconds: 120
-            #periodSeconds: 30
-          readinessProbe:
-          #  httpGet:
-          #    path: /
-          #    port: http
-          restartPolicy: Always
-          securityContext:
-            # ubuntu
-            #runAsUser: 1000
-            #allowPrivilegeEscalation: false
-      volumes:
-        - name: config-volume
-          configMap:
-            name: {{ include "common.configmapname.appmgr" . }}-appconfig
-        - name: cert-volume
-          configMap:
-            name: {{ include "common.helmrepositorycert" . }}
-        - name: secret-volume
-          secret:
-            secretName: {{ include "common.helmrepositorycred" . }}
-        - name: helm-secret-volume
-          emptyDir: {}
-        - name: appmgr-bin-volume
-          configMap:
-            name: {{ include "common.configmapname.appmgr" . }}-bin
-            defaultMode: 0755
diff --git a/ric-platform/50-RIC-Platform/helm/appmgr/templates/env.yaml b/ric-platform/50-RIC-Platform/helm/appmgr/templates/env.yaml
deleted file mode 100644 (file)
index e87d3e1..0000000
+++ /dev/null
@@ -1,46 +0,0 @@
-################################################################################
-#   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.                                             #
-################################################################################
-{{- $tillerKey := .Values.appmgr.tillerkey | default "ricxapp" }}
-{{- $topCtx :=  . }}
-{{- $ctx := dict "ctx" $topCtx "key" $tillerKey }}
-apiVersion: v1
-kind: ConfigMap
-metadata:
-  name: {{ include "common.configmapname.appmgr" . }}-env
-data:
-  NAME: "xappmgr"
-  DBAAS_SERVICE_HOST: {{ include "common.servicename.dbaas.tcp" . | quote }}
-  DBAAS_SERVICE_PORT: {{ include "common.serviceport.dbaas.tcp" . | quote }}
-  DBAAS_PORT_6379_TCP_ADDR: {{ include "common.servicename.dbaas.tcp" . | quote }}
-  DBAAS_PORT_6379_TCP_PORT: {{ include "common.serviceport.dbaas.tcp" . | quote }} 
-  RMR_RTG_SVC: {{ include "common.serviceport.appmgr.rmr.route" . | quote }}
-{{- $certPath := .Values.appmgr.appcertpath | default "/opt/ric/certificates" }}
-{{- $secretPath := .Values.appmgr.appsecretpath | default "/opt/ric/secret" }}
-{{- $servicename := include "common.servicename.tiller" $ctx }}
-{{- $servicenamespace := include "common.tillerDeployNameSpace" $ctx }}
-{{- $serviceport := include "common.tillerPort" $ctx }}
-  HELM_HOST: {{ printf "%s.%s:%s" $servicename $servicenamespace $serviceport | quote }}
-{{- if eq (include "common.tillerTLSVerify" $ctx) "true" }}
-  HELM_TLS_VERIFY: "true"
-  HELM_TLS_CA_CERT: "{{ $secretPath }}/tiller-ca.cert"
-  HELM_TLS_HOSTNAME: {{ $servicename | quote }}
-{{- end }}
-{{- if eq (include "common.tillerTLSAuthenticate" $ctx) "true"  }}
-  HELM_TLS_ENABLED: "true"
-  HELM_TLS_CERT: "{{ $secretPath }}/helm-client.cert"
-  HELM_TLS_KEY: "{{ $secretPath }}/helm-client.key"
-{{- end }}  
diff --git a/ric-platform/50-RIC-Platform/helm/appmgr/templates/ingress-appmgr.yaml b/ric-platform/50-RIC-Platform/helm/appmgr/templates/ingress-appmgr.yaml
deleted file mode 100644 (file)
index e515d12..0000000
+++ /dev/null
@@ -1,12 +0,0 @@
-apiVersion: networking.k8s.io/v1beta1
-kind: Ingress
-metadata:
-  name: {{ include "common.ingressname.appmgr" . }}
-spec:
-  rules:
-  - http:
-      paths:
-      - path: {{ include "common.kongpath.ric.appmgr" . }}
-        backend:
-          serviceName: {{ include "common.servicename.appmgr.http" . }}
-          servicePort: {{ include "common.serviceport.appmgr.http" . }}
diff --git a/ric-platform/50-RIC-Platform/helm/appmgr/templates/service-http.yaml b/ric-platform/50-RIC-Platform/helm/appmgr/templates/service-http.yaml
deleted file mode 100644 (file)
index 57a7d97..0000000
+++ /dev/null
@@ -1,38 +0,0 @@
-################################################################################
-#   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.                                             #
-################################################################################
-
-apiVersion: v1
-kind: Service
-metadata:
-  name: {{ include "common.servicename.appmgr.http" . }}
-  namespace: {{ include "common.namespace.platform" . }}
-  labels:
-    app: {{ include "common.namespace.platform" . }}-{{ include "common.name.appmgr" . }}
-    chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
-    release: {{ .Release.Name }}
-    heritage: {{ .Release.Service }} 
-spec:
-  type: ClusterIP
-  ports:
-    - port: {{ include "common.serviceport.appmgr.http" . }}
-      protocol: "TCP"
-      name: "http"
-      targetPort: "http"
-  selector:
-    app: {{ include "common.namespace.platform" . }}-{{ include "common.name.appmgr" . }}
-    release: {{ .Release.Name }}
-
diff --git a/ric-platform/50-RIC-Platform/helm/appmgr/templates/service-rmr.yaml b/ric-platform/50-RIC-Platform/helm/appmgr/templates/service-rmr.yaml
deleted file mode 100644 (file)
index a0608cb..0000000
+++ /dev/null
@@ -1,42 +0,0 @@
-################################################################################
-#   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.                                             #
-################################################################################
-
-apiVersion: v1
-kind: Service
-metadata:
-  name: {{ include "common.servicename.appmgr.rmr" . }}
-  namespace: {{ include "common.namespace.platform" . }}
-  labels:
-    app: {{ include "common.namespace.platform" . }}-{{ include "common.name.appmgr" . }}
-    chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
-    release: {{ .Release.Name }}
-    heritage: {{ .Release.Service }} 
-spec:
-  type: ClusterIP
-  ports:
-    - port: {{ include "common.serviceport.appmgr.rmr.route" . }}
-      protocol: "TCP"
-      name: "rmrroute"
-      targetPort: "rmrroute"
-    - port: {{ include "common.serviceport.appmgr.rmr.data" . }}
-      protocol: "TCP"
-      name: "rmrdata"
-      targetPort: "rmrdata"
-  selector:
-    app: {{ include "common.namespace.platform" . }}-{{ include "common.name.appmgr" . }}
-    release: {{ .Release.Name }}
-
diff --git a/ric-platform/50-RIC-Platform/helm/appmgr/templates/serviceaccount.yaml b/ric-platform/50-RIC-Platform/helm/appmgr/templates/serviceaccount.yaml
deleted file mode 100644 (file)
index 96da29a..0000000
+++ /dev/null
@@ -1,66 +0,0 @@
-{{- $tillerKey := .Values.appmgr.tillerkey | default "ricxapp" }}
-{{- $topCtx :=  . }}
-{{- $ctx := dict "ctx" $topCtx "key" $tillerKey }}
----
-apiVersion: v1
-kind: ServiceAccount
-metadata:
-  name: {{ include "common.serviceaccountname.appmgr" . }}
-  namespace: {{ include "common.namespace.platform" . }}
----
-apiVersion: rbac.authorization.k8s.io/v1beta1
-kind: Role
-metadata:
-  name: {{ include "common.serviceaccountname.appmgr" . }}-{{ include "common.tillerNameSpace" $ctx }}-access
-  namespace: {{ include "common.tillerDeployNameSpace" $ctx }}
-rules:
-- apiGroups: [""]
-  resources: ["pods/portforward"]
-  verbs: ["create"]
-- apiGroups: [""]  
-  resources: ["pods", "configmaps", "deployments", "services"]
-  verbs: ["get", "list", "create", "delete"]
-{{- if or (eq (include "common.tillerTLSVerify" $ctx) "true" )  (eq (include "common.tillerTLSAuthenticate" $ctx) "true") }}
-- apiGroups: [""]
-  resources: ["secrets"]
-  resourceNames: [ {{ include "common.tillerHelmClientTLSSecret" $ctx | quote }} ]
-  verbs: ["get"]
-{{- end }}  
----
-apiVersion: rbac.authorization.k8s.io/v1beta1
-kind: RoleBinding
-metadata:
-  name: {{ include "common.serviceaccountname.appmgr" . }}-{{ include "common.tillerNameSpace" $ctx }}-access
-  namespace: {{ include "common.tillerDeployNameSpace" $ctx }}
-roleRef:
-  apiGroup: rbac.authorization.k8s.io
-  kind: Role
-  name: {{ include "common.serviceaccountname.appmgr" . }}-{{ include "common.tillerNameSpace" $ctx }}-access
-subjects:
-  - kind: ServiceAccount
-    name: {{ include "common.serviceaccountname.appmgr" . }}
-    namespace: {{ include "common.namespace.platform" . }}
----
-apiVersion: rbac.authorization.k8s.io/v1beta1
-kind: Role
-metadata:
-  name: {{ include "common.serviceaccountname.appmgr" . }}-{{ include "common.tillerNameSpace" $ctx }}-getappconfig
-  namespace: {{ include "common.tillerNameSpace" $ctx }}
-rules:
-- apiGroups: [""]  
-  resources: ["configmaps", "endpoints"]
-  verbs: ["get"]
----
-apiVersion: rbac.authorization.k8s.io/v1beta1
-kind: RoleBinding
-metadata:
-  name: {{ include "common.serviceaccountname.appmgr" . }}-{{ include "common.namespace.xapp" . }}-getappconfig
-  namespace: {{ include "common.tillerNameSpace" $ctx }}
-roleRef:
-  apiGroup: rbac.authorization.k8s.io
-  kind: Role
-  name: {{ include "common.serviceaccountname.appmgr" . }}-{{ include "common.tillerNameSpace" $ctx }}-getappconfig
-subjects:
-  - kind: ServiceAccount
-    name: {{ include "common.serviceaccountname.appmgr" . }}
-    namespace: {{ include "common.namespace.platform" . }}
diff --git a/ric-platform/50-RIC-Platform/helm/appmgr/values.yaml b/ric-platform/50-RIC-Platform/helm/appmgr/values.yaml
deleted file mode 100644 (file)
index d36600c..0000000
+++ /dev/null
@@ -1,98 +0,0 @@
-################################################################################
-#   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.                                             #
-################################################################################
-
-repository: "nexus3.o-ran-sc.org:10004"
-#repositoryOverride: "nexus3.o-ran-sc.org:10004"
-imagePullPolicy: IfNotPresent
-repositoryCred: docker-reg-cred
-
-# 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
-#helmRepositoryOverride: ""
-helmRepository: "https://helm-entry" 
-
-# Default secret name for Helm Repo credential. .Value.golbal.helmRepositoryCred will
-# override the default value. You can further override uing
-#helmRepositoryCredOverride:""
-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-certs
-
-# Helm Tiller for xApp
-# The global setting will override this default value
-# You can further override using helmRepositoryTillerOverride: ""
-helmRepositoryTiller: "tiller-deploy" 
-
-# Helm Tiller Namespace for xApp
-# The global setting will override this default value
-# You can further override using helmRepositoryTillerNamespaceOverride: ""
-helmRepositoryTillerNamespace: "kube-system" 
-
-
-# Helm Tiller port for xApp
-# 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
-   init:
-     name: it-dep-init
-     tag: latest
-   name: ric-plt-appmgr
-   tag: 0.1.3
-
-  # This section describes xAppManager
-  replicaCount: 1
-
-  reponame: "helm-repo"
-
-  # Service ports are now defined in 
-  # ric-common/Common-Template/helm/ric-common/templates/_ports.tpl file.
-  # If need to change a service port, make the code change necessary, then
-  # update the _ports.tpl file with the new port number.
-
-  # config
-  # Path referred in xapp-manager for retrieving configuration details
-  appconfigpath: /opt/ric/config
-
-
-  # 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
-
-  tillerkey: "ricxapp"
diff --git a/ric-platform/50-RIC-Platform/helm/dbaas1/Chart.yaml b/ric-platform/50-RIC-Platform/helm/dbaas1/Chart.yaml
deleted file mode 100644 (file)
index 0af02a3..0000000
+++ /dev/null
@@ -1,21 +0,0 @@
-################################################################################
-#   Copyright (c) 2019 AT&T Intellectual Property.                             #
-#                                                                              #
-#   Licensed under the Apache License, Version 2.0 (the "License");            #
-#   you may not use this file except in compliance with the License.           #
-#   You may obtain a copy of the License at                                    #
-#                                                                              #
-#       http://www.apache.org/licenses/LICENSE-2.0                             #
-#                                                                              #
-#   Unless required by applicable law or agreed to in writing, software        #
-#   distributed under the License is distributed on an "AS IS" BASIS,          #
-#   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.   #
-#   See the License for the specific language governing permissions and        #
-#   limitations under the License.                                             #
-################################################################################
-
-apiVersion: v1
-appVersion: "1.0"
-description: DBaaS realized with standalone, non-persistent, non-redundant Redis
-name: dbaas1
-version: 1.1.0
diff --git a/ric-platform/50-RIC-Platform/helm/dbaas1/requirements.yaml b/ric-platform/50-RIC-Platform/helm/dbaas1/requirements.yaml
deleted file mode 100644 (file)
index e753fb5..0000000
+++ /dev/null
@@ -1,19 +0,0 @@
-################################################################################
-#   Copyright (c) 2019 AT&T Intellectual Property.                             #
-#                                                                              #
-#   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: ric-common
-    version: ~2.0.0
diff --git a/ric-platform/50-RIC-Platform/helm/dbaas1/templates/deployment.yaml b/ric-platform/50-RIC-Platform/helm/dbaas1/templates/deployment.yaml
deleted file mode 100644 (file)
index 44b0a81..0000000
+++ /dev/null
@@ -1,54 +0,0 @@
-################################################################################
-#   Copyright (c) 2019 AT&T Intellectual Property.                             #
-#                                                                              #
-#   Licensed under the Apache License, Version 2.0 (the "License");            #
-#   you may not use this file except in compliance with the License.           #
-#   You may obtain a copy of the License at                                    #
-#                                                                              #
-#       http://www.apache.org/licenses/LICENSE-2.0                             #
-#                                                                              #
-#   Unless required by applicable law or agreed to in writing, software        #
-#   distributed under the License is distributed on an "AS IS" BASIS,          #
-#   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.   #
-#   See the License for the specific language governing permissions and        #
-#   limitations under the License.                                             #
-################################################################################
-
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: {{ include "common.deploymentname.dbaas" . }}
-  namespace: {{ include "common.namespace.platform" . }}
-  labels:
-    app: {{ include "common.namespace.platform" . }}-{{ include "common.name.dbaas" . }}
-    chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
-    release: {{ .Release.Name }}
-    heritage: {{ .Release.Service }}
-spec:
-  replicas: {{ .Values.dbaas.backend.replicas }}
-  selector:
-    matchLabels:
-      app: {{ include "common.namespace.platform" . }}-{{ include "common.name.dbaas" . }}
-      release: {{ .Release.Name }}
-  template:
-    metadata:
-      {{- if .Values.dbaas.annotations }}
-      annotations:
-        {{- .Values.dbaas.annotations | nindent 8 -}}
-      {{ end }}
-      labels:
-        app: {{ include "common.namespace.platform" . }}-{{ include "common.name.dbaas" . }}
-        release: {{ .Release.Name }}
-    spec:
-      imagePullSecrets:
-       - name: {{ include "common.repositoryCred" . }}
-      terminationGracePeriodSeconds: {{ .Values.dbaas.backend.terminationGracePeriodSeconds }}
-      containers:
-      - image: {{ include "common.repository" . }}/{{ .Values.dbaas.backend.image.name }}:{{ .Values.dbaas.backend.image.tag }}
-        imagePullPolicy: {{ include "common.pullPolicy" . }}
-        ports:
-        - containerPort: {{ include "common.serviceport.dbaas.tcp" . }}
-          name: sql
-          protocol: TCP
-        name: {{ include "common.containername.dbaas" . }}
-      restartPolicy: Always
diff --git a/ric-platform/50-RIC-Platform/helm/dbaas1/templates/service.yaml b/ric-platform/50-RIC-Platform/helm/dbaas1/templates/service.yaml
deleted file mode 100644 (file)
index 591594b..0000000
+++ /dev/null
@@ -1,35 +0,0 @@
-################################################################################
-#   Copyright (c) 2019 AT&T Intellectual Property.                             #
-#                                                                              #
-#   Licensed under the Apache License, Version 2.0 (the "License");            #
-#   you may not use this file except in compliance with the License.           #
-#   You may obtain a copy of the License at                                    #
-#                                                                              #
-#       http://www.apache.org/licenses/LICENSE-2.0                             #
-#                                                                              #
-#   Unless required by applicable law or agreed to in writing, software        #
-#   distributed under the License is distributed on an "AS IS" BASIS,          #
-#   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.   #
-#   See the License for the specific language governing permissions and        #
-#   limitations under the License.                                             #
-################################################################################
-
-apiVersion: v1
-kind: Service
-metadata:
-  name: {{ include "common.servicename.dbaas.tcp" . }}
-  namespace: {{ include "common.namespace.platform" . }}
-  labels:
-    app: {{ include "common.namespace.platform" . }}-{{ include "common.name.dbaas" . }}
-    chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
-    release: {{ .Release.Name }}
-    heritage: {{ .Release.Service }} 
-spec:
-  selector:
-    app: {{ include "common.namespace.platform" . }}-{{ include "common.name.dbaas" . }}
-    release: {{ .Release.Name }}
-  ports:
-  - port: {{ include "common.serviceport.dbaas.tcp" . }}
-    targetPort: "sql"
-    protocol: "TCP"
-    name: "sql"
diff --git a/ric-platform/50-RIC-Platform/helm/dbaas1/values.yaml b/ric-platform/50-RIC-Platform/helm/dbaas1/values.yaml
deleted file mode 100644 (file)
index 11be791..0000000
+++ /dev/null
@@ -1,32 +0,0 @@
-################################################################################
-#   Copyright (c) 2019 AT&T Intellectual Property.                             #
-#                                                                              #
-#   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.                                             #
-################################################################################
-
-repository: "nexus3.o-ran-sc.org:10004"
-imagePullPolicy: IfNotPresent
-repositoryCred: docker-reg-cred
-
-dbaas:
-  backend:
-    terminationGracePeriodSeconds: 0
-    replicas: 1
-    image:
-      name: ric-plt-dbaas
-      tag: 0.1.0
-
-    # Service ports are now defined in
-    # ric-common/Common-Template/helm/ric-common/templates/_ports.tpl file.
-    # If need to change a service port, make the code change necessary, then
-    # update the _ports.tpl file with the new port number.
diff --git a/ric-platform/50-RIC-Platform/helm/e2mgr/Chart.yaml b/ric-platform/50-RIC-Platform/helm/e2mgr/Chart.yaml
deleted file mode 100644 (file)
index 3623833..0000000
+++ /dev/null
@@ -1,22 +0,0 @@
-################################################################################
-#   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.                                             #
-################################################################################
-
-appVersion: "1.0"
-apiVersion: v1
-description: Oran e2mgr Helm charts
-name: e2mgr
-version: 1.1.0
diff --git a/ric-platform/50-RIC-Platform/helm/e2mgr/requirements.yaml b/ric-platform/50-RIC-Platform/helm/e2mgr/requirements.yaml
deleted file mode 100644 (file)
index 2ab71b4..0000000
+++ /dev/null
@@ -1,20 +0,0 @@
-################################################################################
-#   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: ric-common
-    version: ~2.0.0
diff --git a/ric-platform/50-RIC-Platform/helm/e2mgr/templates/configmap.yaml b/ric-platform/50-RIC-Platform/helm/e2mgr/templates/configmap.yaml
deleted file mode 100644 (file)
index 7a1cccb..0000000
+++ /dev/null
@@ -1,133 +0,0 @@
-################################################################################
-#   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.                                             #
-################################################################################
----
-apiVersion: v1
-kind: ConfigMap
-metadata:
-  name: {{ include "common.configmapname.e2mgr" . }}-router-configmap
-  namespace: {{ include "common.namespace.platform" . }}
-data:
-  rmr_verbose: |
-    0
-  router.txt: |
-    newrt|start
-    rte|1080|{{ include "common.servicename.e2mgr.rmr" .      }}.{{ include "common.namespace.platform" . }}:{{ include "common.serviceport.e2mgr.rmr.data" . }}
-    rte|1090|{{ include "common.servicename.e2term.rmr" .     }}.{{ include "common.namespace.platform" . }}:{{ include "common.serviceport.e2term.rmr.data" . }}
-    rte|1100|{{ include "common.servicename.e2term.rmr" .     }}.{{ include "common.namespace.platform" . }}:{{ include "common.serviceport.e2term.rmr.data" . }}
-    rte|1101|{{ include "common.servicename.e2term.rmr" .     }}.{{ include "common.namespace.platform" . }}:{{ include "common.serviceport.e2term.rmr.data" . }}
-    rte|1200|{{ include "common.servicename.rsm.rmr" .     }}.{{ include "common.namespace.platform" . }}:{{ include "common.serviceport.rsm.rmr.data" . }}
-    rte|1210|{{ include "common.servicename.rsm.rmr" .     }}.{{ include "common.namespace.platform" . }}:{{ include "common.serviceport.rsm.rmr.data" . }}
-    rte|1220|{{ include "common.servicename.rsm.rmr" .     }}.{{ include "common.namespace.platform" . }}:{{ include "common.serviceport.rsm.rmr.data" . }}
-    rte|10020|{{ include "common.servicename.e2mgr.rmr" .      }}.{{ include "common.namespace.platform" . }}:{{ include "common.serviceport.e2mgr.rmr.data" . }}
-    rte|10060|{{ include "common.servicename.e2term.rmr" .     }}.{{ include "common.namespace.platform" . }}:{{ include "common.serviceport.e2term.rmr.data" . }}
-    rte|10061|{{ include "common.servicename.e2mgr.rmr" .      }}.{{ include "common.namespace.platform" . }}:{{ include "common.serviceport.e2mgr.rmr.data" . }}
-    rte|10062|{{ include "common.servicename.e2mgr.rmr" .      }}.{{ include "common.namespace.platform" . }}:{{ include "common.serviceport.e2mgr.rmr.data" . }}
-    rte|10070|{{ include "common.servicename.e2term.rmr" .     }}.{{ include "common.namespace.platform" . }}:{{ include "common.serviceport.e2term.rmr.data" . }}
-    rte|10071|{{ include "common.servicename.e2term.rmr" .     }}.{{ include "common.namespace.platform" . }}:{{ include "common.serviceport.e2term.rmr.data" . }}
-    rte|10080|{{ include "common.servicename.e2mgr.rmr" .      }}.{{ include "common.namespace.platform" . }}:{{ include "common.serviceport.e2mgr.rmr.data" . }}
-    rte|10360|{{ include "common.servicename.e2term.rmr" .     }}.{{ include "common.namespace.platform" . }}:{{ include "common.serviceport.e2term.rmr.data" . }}
-    rte|10361|{{ include "common.servicename.e2mgr.rmr" .      }}.{{ include "common.namespace.platform" . }}:{{ include "common.serviceport.e2mgr.rmr.data" . }}
-    rte|10362|{{ include "common.servicename.e2mgr.rmr" .      }}.{{ include "common.namespace.platform" . }}:{{ include "common.serviceport.e2mgr.rmr.data" . }}
-    rte|10370|{{ include "common.servicename.e2mgr.rmr" .      }}.{{ include "common.namespace.platform" . }}:{{ include "common.serviceport.e2mgr.rmr.data" . }}
-    rte|10371|{{ include "common.servicename.e2term.rmr" .     }}.{{ include "common.namespace.platform" . }}:{{ include "common.serviceport.e2term.rmr.data" . }}
-    rte|12010|{{ include "common.servicename.e2term.rmr" .     }}.{{ include "common.namespace.platform" . }}:{{ include "common.serviceport.e2term.rmr.data" . }}
-    rte|12020|{{ include "common.servicename.e2term.rmr" .     }}.{{ include "common.namespace.platform" . }}:{{ include "common.serviceport.e2term.rmr.data" . }}
-    rte|20001|{{ include "common.servicename.a1mediator.rmr" . }}.{{ include "common.namespace.platform" . }}:{{ include "common.serviceport.a1mediator.rmr.data" . }}
-    newrt|end
-
----
-
-apiVersion: v1
-kind: ConfigMap
-metadata:
-  name: {{ include "common.configmapname.e2mgr" . }}-configuration-configmap
-  namespace: {{ include "common.namespace.platform" . }}
-data:
-  configuration.yaml: |
-    logging:
-      {{- if hasKey .Values.e2mgr "logLevel" }}
-      logLevel: {{ .Values.e2mgr.logLevel }}
-      {{- else }}
-      logLevel:  "info" 
-      {{- end }}     
-    http:
-      {{- if hasKey .Values.e2mgr "httpPort" }}
-      port: {{ .Values.e2mgr.httpPort }}
-      {{- else }}
-      port: 3800
-      {{- end }}
-    rmr:
-      {{- if hasKey .Values.e2mgr "rmrPort" }}
-      port: {{ .Values.e2mgr.rmrPort }}
-      {{- else }}
-      port: 3801
-      {{- end }}
-      {{- if hasKey .Values.e2mgr "maxMsgSize" }}
-      maxMsgSize: {{ .Values.e2mgr.maxMsgSize }}
-      {{- else }}
-      maxMsgSize: 4096
-      {{- end }}
-    routingManager:
-      {{- if hasKey .Values.e2mgr "baseUrl" }}
-      baseUrl: {{ .Values.e2mgr.baseUrl }}
-      {{- else }}
-      baseUrl: "http://service-ricplt-rtmgr-http:3800/ric/v1/handles/"
-      {{- end }}
-
-    {{- if hasKey .Values.e2mgr "notificationResponseBuffer" }}
-    notificationResponseBuffer: {{ .Values.e2mgr.notificationResponseBuffer }}
-    {{- else }}
-    notificationResponseBuffer: 100
-    {{- end }} 
-
-    {{- if hasKey .Values.e2mgr "bigRedButtonTimeoutSec" }}
-    bigRedButtonTimeoutSec: {{ .Values.e2mgr.bigRedButtonTimeoutSec }}
-    {{- else }}
-    bigRedButtonTimeoutSec: 5
-    {{- end }}   
-
-    {{- if hasKey .Values.e2mgr "maxConnectionAttempts" }}
-    maxConnectionAttempts: {{ .Values.e2mgr.maxConnectionAttempts }}
-    {{- else }} 
-    maxConnectionAttempts: 3
-    {{- end }}       
-    
-    {{- if hasKey .Values.e2mgr "maxRnibConnectionAttempts" }}
-    maxRnibConnectionAttempts: {{ .Values.e2mgr.maxRnibConnectionAttempts }}
-    {{- else }} 
-    maxRnibConnectionAttempts: 3
-    {{- end }}   
-
-    {{- if hasKey .Values.e2mgr "rnibRetryIntervalMs" }}
-    rnibRetryIntervalMs: {{ .Values.e2mgr.rnibRetryIntervalMs }}
-    {{- else }} 
-    rnibRetryIntervalMs: 10
-    {{- end }}
-
-    {{- if hasKey .Values.e2mgr "keepAliveResponseTimeoutMs" }}
-    keepAliveResponseTimeoutMs: {{ .Values.e2mgr.keepAliveResponseTimeoutMs }}
-    {{- else }}
-    keepAliveResponseTimeoutMs: 4500
-    {{- end }}
-
-    {{- if hasKey .Values.e2mgr "keepAliveDelayMs" }}
-    keepAliveDelayMs: {{ .Values.e2mgr.keepAliveDelayMs }}
-    {{- else }}
-    keepAliveDelayMs: 1500
-    {{- end }}
-
----
diff --git a/ric-platform/50-RIC-Platform/helm/e2mgr/templates/deployment.yaml b/ric-platform/50-RIC-Platform/helm/e2mgr/templates/deployment.yaml
deleted file mode 100644 (file)
index 446bb9e..0000000
+++ /dev/null
@@ -1,78 +0,0 @@
-################################################################################
-#   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.                                             #
-################################################################################
-
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: {{ include "common.deploymentname.e2mgr" .}}
-  namespace: {{ include "common.namespace.platform" . }}
-  labels:
-    app: {{ include "common.namespace.platform" . }}-{{ include "common.name.e2mgr" . }}
-    chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
-    release: {{ .Release.Name }}
-    heritage: {{ .Release.Service }}
-spec:
-  replicas: {{ .Values.e2mgr.replicaCount }}
-  selector:
-    matchLabels:
-      app: {{ include "common.namespace.platform" . }}-{{ include "common.name.e2mgr" . }}
-      release: {{ .Release.Name }}
-  template:
-    metadata:
-      {{- if .Values.e2mgr.annotations }}
-      annotations:
-        {{- .Values.e2mgr.annotations | nindent 8 -}}
-      {{ end }}
-      labels:
-        app: {{ include "common.namespace.platform" . }}-{{ include "common.name.e2mgr" . }}
-        release: {{ .Release.Name }}
-    spec:
-      hostname: {{ include "common.name.e2mgr" . }} 
-      imagePullSecrets:
-        - name: {{ include "common.repositoryCred" . }}
-      containers:
-        - name: {{ include "common.containername.e2mgr" . }}
-          image: {{ include "common.repository" . }}/{{ .Values.e2mgr.image.name }}:{{ .Values.e2mgr.image.tag }}
-          imagePullPolicy: {{ include "common.pullPolicy" . }}
-          volumeMounts:
-          - mountPath: /opt/E2Manager/router.txt
-            name: local-router-file
-            subPath: router.txt
-          - mountPath: /opt/E2Manager/resources/configuration.yaml
-            name: local-configuration-file
-            subPath: configuration.yaml
-          envFrom:
-            - configMapRef:
-                name: {{ include "common.configmapname.e2mgr" . }}-env
-          ports:
-            - name: "http"
-              containerPort: {{ include "common.serviceport.e2mgr.http" . }}
-            - name: "rmrroute"
-              containerPort: {{ include "common.serviceport.e2mgr.rmr.route" . }}
-            - name: "rmrdata"
-              containerPort: {{ include "common.serviceport.e2mgr.rmr.data" . }}
-          stdin: true
-          tty: true
-          securityContext:
-            privileged: {{ .Values.e2mgr.privilegedmode}}
-      volumes:
-        - name: local-router-file
-          configMap:
-            name: {{ include "common.configmapname.e2mgr" . }}-router-configmap
-        - name: local-configuration-file
-          configMap:
-            name: {{ include "common.configmapname.e2mgr" . }}-configuration-configmap
diff --git a/ric-platform/50-RIC-Platform/helm/e2mgr/templates/env.yaml b/ric-platform/50-RIC-Platform/helm/e2mgr/templates/env.yaml
deleted file mode 100644 (file)
index 3c95c5b..0000000
+++ /dev/null
@@ -1,30 +0,0 @@
-################################################################################
-#   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.                                             #
-################################################################################
-apiVersion: v1
-kind: ConfigMap
-metadata:
-  name: {{ include "common.configmapname.e2mgr" . }}-env
-data:
-   DBAAS_SERVICE_HOST: {{ include "common.servicename.dbaas.tcp" . | quote }}
-   DBAAS_SERVICE_PORT: {{ include "common.serviceport.dbaas.tcp" . | quote }}
-   DBAAS_PORT_6379_TCP_ADDR: {{ include "common.servicename.dbaas.tcp" . | quote }}
-   DBAAS_PORT_6379_TCP_PORT: {{ include "common.serviceport.dbaas.tcp" . | quote }} 
-   RMR_RTG_SVC: {{ include "common.serviceport.e2mgr.rmr.route" . | quote }}
-   RMR_SRC_ID: {{ include "common.servicename.e2mgr.rmr" . }}.{{ include "common.namespace.platform" . }}
-   RIC_ID: "{{ .Values.e2mgr.env.RIC_ID }}"
-   #nano: {{ include "common.serviceport.e2mgr.rmr.data" . | quote }}
-
diff --git a/ric-platform/50-RIC-Platform/helm/e2mgr/templates/ingress-e2mgr.yaml b/ric-platform/50-RIC-Platform/helm/e2mgr/templates/ingress-e2mgr.yaml
deleted file mode 100644 (file)
index 015aff2..0000000
+++ /dev/null
@@ -1,12 +0,0 @@
-apiVersion: networking.k8s.io/v1beta1
-kind: Ingress
-metadata:
-  name: {{ include "common.ingressname.e2mgr" . }}
-spec:
-  rules:
-  - http:
-      paths:
-      - path: {{ include "common.kongpath.ric.e2mgr" . }}
-        backend:
-          serviceName: {{ include "common.servicename.e2mgr.http" . }}
-          servicePort: {{ include "common.serviceport.e2mgr.http" . }}
diff --git a/ric-platform/50-RIC-Platform/helm/e2mgr/templates/service-http.yaml b/ric-platform/50-RIC-Platform/helm/e2mgr/templates/service-http.yaml
deleted file mode 100644 (file)
index 53319bc..0000000
+++ /dev/null
@@ -1,37 +0,0 @@
-################################################################################
-#   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.                                             #
-################################################################################
-
-apiVersion: v1
-kind: Service
-metadata:
-  name: {{ include "common.servicename.e2mgr.http" . }}
-  namespace: {{ include "common.namespace.platform" . }}
-  labels:
-    app: {{ include "common.namespace.platform" . }}-{{ include "common.name.e2mgr" . }}
-    chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
-    release: {{ .Release.Name }}
-    heritage: {{ .Release.Service }}
-spec:
-  type: ClusterIP
-  ports:
-    - port: {{ include "common.serviceport.e2mgr.http" . }}
-      protocol: "TCP"
-      name: "http"
-      targetPort: "http" 
-  selector:
-    app: {{ include "common.namespace.platform" . }}-{{ include "common.name.e2mgr" . }}
-    release: {{ .Release.Name }}
diff --git a/ric-platform/50-RIC-Platform/helm/e2mgr/templates/service-rmr.yaml b/ric-platform/50-RIC-Platform/helm/e2mgr/templates/service-rmr.yaml
deleted file mode 100644 (file)
index a9e9416..0000000
+++ /dev/null
@@ -1,41 +0,0 @@
-################################################################################
-#   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.                                             #
-################################################################################
-
-apiVersion: v1
-kind: Service
-metadata:
-  name: {{ include "common.servicename.e2mgr.rmr" . }}
-  namespace: {{ include "common.namespace.platform" . }}
-  labels:
-    app: {{ include "common.namespace.platform" . }}-{{ include "common.name.e2mgr" . }}
-    chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
-    release: {{ .Release.Name }}
-    heritage: {{ .Release.Service }}
-spec:
-  type: ClusterIP
-  ports:
-    - port: {{ include "common.serviceport.e2mgr.rmr.route" . }}
-      protocol: "TCP"
-      name: "rmrroute"
-      targetPort: "rmrroute"
-    - port: {{ include "common.serviceport.e2mgr.rmr.data" . }}
-      protocol: "TCP"
-      name: "rmrdata"
-      targetPort: "rmrdata"
-  selector:
-    app: {{ include "common.namespace.platform" . }}-{{ include "common.name.e2mgr" . }}
-    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
deleted file mode 100644 (file)
index ed90d34..0000000
+++ /dev/null
@@ -1,55 +0,0 @@
-################################################################################
-#   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.                                             #
-################################################################################
-
-#################################################################
-# Application configuration defaults.
-#################################################################
-# application image
-
-repository: "nexus3.o-ran-sc.org:10004"
-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: ""
-
-
-e2mgr:
-  image:
-    name: e2mgr
-    tag: 1.6.0 
-
-  privilegedmode: false
-  
-  replicaCount: 1
-  
-  env:
-    RIC_ID: "bbbccc-abcd0e/20"
-
-
-  # Service ports are now defined in 
-  # ric-common/Common-Template/helm/ric-common/templates/_ports.tpl file.
-  # If need to change a service port, make the code change necessary, then
-  # update the _ports.tpl file with the new port number.
diff --git a/ric-platform/50-RIC-Platform/helm/e2term/.helmignore b/ric-platform/50-RIC-Platform/helm/e2term/.helmignore
deleted file mode 100644 (file)
index 50af031..0000000
+++ /dev/null
@@ -1,22 +0,0 @@
-# Patterns to ignore when building packages.
-# This supports shell glob matching, relative path matching, and
-# negation (prefixed with !). Only one pattern per line.
-.DS_Store
-# Common VCS dirs
-.git/
-.gitignore
-.bzr/
-.bzrignore
-.hg/
-.hgignore
-.svn/
-# Common backup files
-*.swp
-*.bak
-*.tmp
-*~
-# Various IDEs
-.project
-.idea/
-*.tmproj
-.vscode/
diff --git a/ric-platform/50-RIC-Platform/helm/e2term/Chart.yaml b/ric-platform/50-RIC-Platform/helm/e2term/Chart.yaml
deleted file mode 100644 (file)
index 8029c10..0000000
+++ /dev/null
@@ -1,22 +0,0 @@
-################################################################################
-#   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.                                             #
-################################################################################
-
-apiVersion: v1
-appVersion: "1.0"
-description: O-RAN RIC E2 Termination Helm charts
-name: e2term
-version: 1.1.0
diff --git a/ric-platform/50-RIC-Platform/helm/e2term/requirements.yaml b/ric-platform/50-RIC-Platform/helm/e2term/requirements.yaml
deleted file mode 100644 (file)
index 2ab71b4..0000000
+++ /dev/null
@@ -1,20 +0,0 @@
-################################################################################
-#   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: ric-common
-    version: ~2.0.0
diff --git a/ric-platform/50-RIC-Platform/helm/e2term/resources/cleaner.sh b/ric-platform/50-RIC-Platform/helm/e2term/resources/cleaner.sh
deleted file mode 100644 (file)
index f297fd7..0000000
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/bin/sh
-################################################################################
-#   Copyright (c) 2019 AT&T Intellectual Property.                             #
-#                                                                              #
-#   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.                                             #
-################################################################################
-
-(
-echo "$0 cleaning old files under $1 older than $2 days" > /tmp/cleaner.log
-while true; do
-  find $1 -type f -mtime +$2 -delete 
-  sleep 86400 
-done
-) >/dev/null 2>&1 & 
-disown -a
diff --git a/ric-platform/50-RIC-Platform/helm/e2term/resources/configfile.properties b/ric-platform/50-RIC-Platform/helm/e2term/resources/configfile.properties
deleted file mode 100644 (file)
index f83a815..0000000
+++ /dev/null
@@ -1,18 +0,0 @@
-Processors: pub
-pub.Class: com.att.research.basin.pubsubx.Publisher
-pub.Threads: 2
-pub.PublishURL: {{ .Values.e2term.pizpub.publishURL }}
-pub.User: {{ .Values.e2term.pizpub.user }}
-pub.Password: {{ .Values.e2term.pizpub.password }}
-pub.meta.feed_id: {{ .Values.e2term.pizpub.feedId }}
-pub.meta.version: 1
-pub.meta.splits: 1
-Factories: scanner
-scanner.Class: com.att.research.basin.pubsubx.FileScanner
-scanner.Destination: pub
-scanner.Directory: {{ .Values.e2term.pizpub.dataRootDir }}/{{ .Values.e2term.pizpub.scanDirectory }}
-scanner.MinAgeSeconds: 10
-scanner.ScanIntervalSeconds: 10
-scanner.DeleteOrGZip: delete
-scanner.LinkDirectory: {{ .Values.e2term.pizpub.dataRootDir }}/{{ .Values.e2term.pizpub.processedDirectory }}
-scanner.meta.record_count: countNewLines
diff --git a/ric-platform/50-RIC-Platform/helm/e2term/templates/configmap-pizpub.yaml b/ric-platform/50-RIC-Platform/helm/e2term/templates/configmap-pizpub.yaml
deleted file mode 100644 (file)
index a669834..0000000
+++ /dev/null
@@ -1,24 +0,0 @@
-################################################################################
-#   Copyright (c) 2019 AT&T Intellectual Property.                             #
-#                                                                              #
-#   Licensed under the Apache License, Version 2.0 (the "License");            #
-#   you may not use this file except in compliance with the License.           #
-#   You may obtain a copy of the License at                                    #
-#                                                                              #
-#       http://www.apache.org/licenses/LICENSE-2.0                             #
-#                                                                              #
-#   Unless required by applicable law or agreed to in writing, software        #
-#   distributed under the License is distributed on an "AS IS" BASIS,          #
-#   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.   #
-#   See the License for the specific language governing permissions and        #
-#   limitations under the License.                                             #
-################################################################################
-{{ if .Values.e2term.pizpub.enabled  }}
-apiVersion: v1
-kind: ConfigMap
-metadata:
-  name: {{ include "common.configmapname.e2term" . }}-pizpub
-  namespace: {{ include "common.namespace.platform" . }}
-data:
-{{ tpl (.Files.Glob "resources/*").AsConfig . | indent 2 }}
-{{ end }}
diff --git a/ric-platform/50-RIC-Platform/helm/e2term/templates/configmap.yaml b/ric-platform/50-RIC-Platform/helm/e2term/templates/configmap.yaml
deleted file mode 100644 (file)
index 316a64e..0000000
+++ /dev/null
@@ -1,59 +0,0 @@
-################################################################################
-#   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.                                             #
-################################################################################
----
-apiVersion: v1
-kind: ConfigMap
-metadata:
-  name: {{ include "common.configmapname.e2term" . }}-router-configmap
-  namespace: {{ include "common.namespace.platform" . }}
-data:
-  rmr_verbose: |
-    0
-  router.txt: |
-    newrt|start
-    rte|1080|{{ include "common.servicename.e2mgr.rmr" .      }}.{{ include "common.namespace.platform" . }}:{{ include "common.serviceport.e2mgr.rmr.data" . }}
-    rte|1090|{{ include "common.servicename.e2term.rmr" .     }}.{{ include "common.namespace.platform" . }}:{{ include "common.serviceport.e2term.rmr.data" . }}
-    rte|1100|{{ include "common.servicename.e2mgr.rmr" .      }}.{{ include "common.namespace.platform" . }}:{{ include "common.serviceport.e2mgr.rmr.data" . }}
-    rte|10020|{{ include "common.servicename.e2mgr.rmr" .      }}.{{ include "common.namespace.platform" . }}:{{ include "common.serviceport.e2mgr.rmr.data" . }}
-    rte|10060|{{ include "common.servicename.e2term.rmr" .     }}.{{ include "common.namespace.platform" . }}:{{ include "common.serviceport.e2term.rmr.data" . }}
-    rte|10061|{{ include "common.servicename.e2mgr.rmr" .      }}.{{ include "common.namespace.platform" . }}:{{ include "common.serviceport.e2mgr.rmr.data" . }}
-    rte|10062|{{ include "common.servicename.e2mgr.rmr" .      }}.{{ include "common.namespace.platform" . }}:{{ include "common.serviceport.e2mgr.rmr.data" . }}
-    rte|10030|{{ include "common.servicename.e2mgr.rmr" .      }}.{{ include "common.namespace.platform" . }}:{{ include "common.serviceport.e2mgr.rmr.data" . }}
-    rte|10070|{{ include "common.servicename.e2mgr.rmr" .      }}.{{ include "common.namespace.platform" . }}:{{ include "common.serviceport.e2mgr.rmr.data" . }}
-    rte|10071|{{ include "common.servicename.e2mgr.rmr" .      }}.{{ include "common.namespace.platform" . }}:{{ include "common.serviceport.e2mgr.rmr.data" . }}
-    rte|10080|{{ include "common.servicename.e2mgr.rmr" .      }}.{{ include "common.namespace.platform" . }}:{{ include "common.serviceport.e2mgr.rmr.data" . }}
-    rte|10091|{{ include "common.servicename.rsm.rmr" .      }}.{{ include "common.namespace.platform" . }}:{{ include "common.serviceport.rsm.rmr.data" . }}
-    rte|10092|{{ include "common.servicename.rsm.rmr" .      }}.{{ include "common.namespace.platform" . }}:{{ include "common.serviceport.rsm.rmr.data" . }}
-    rte|10360|{{ include "common.servicename.e2term.rmr" .     }}.{{ include "common.namespace.platform" . }}:{{ include "common.serviceport.e2term.rmr.data" . }}
-    rte|10361|{{ include "common.servicename.e2mgr.rmr" .      }}.{{ include "common.namespace.platform" . }}:{{ include "common.serviceport.e2mgr.rmr.data" . }}
-    rte|10362|{{ include "common.servicename.e2mgr.rmr" .      }}.{{ include "common.namespace.platform" . }}:{{ include "common.serviceport.e2mgr.rmr.data" . }}
-    rte|10370|{{ include "common.servicename.e2mgr.rmr" .      }}.{{ include "common.namespace.platform" . }}:{{ include "common.serviceport.e2mgr.rmr.data" . }}
-    rte|10371|{{ include "common.servicename.e2term.rmr" .     }}.{{ include "common.namespace.platform" . }}:{{ include "common.serviceport.e2term.rmr.data" . }}
-    rte|12010|{{ include "common.servicename.e2term.rmr" .     }}.{{ include "common.namespace.platform" . }}:{{ include "common.serviceport.e2term.rmr.data" . }}
-    rte|12020|{{ include "common.servicename.e2term.rmr" .     }}.{{ include "common.namespace.platform" . }}:{{ include "common.serviceport.e2term.rmr.data" . }}
-    rte|20001|{{ include "common.servicename.a1mediator.rmr" . }}.{{ include "common.namespace.platform" . }}:{{ include "common.serviceport.a1mediator.rmr.data" . }}
-    rte|12011|service-ricxapp-ueec-rmr.{{ include "common.namespace.xapp" . }}:4560;service-admission-ctrl-xapp-rmr.{{ include "common.namespace.xapp" . }}:4560
-    rte|12050|service-ricxapp-ueec-rmr.{{ include "common.namespace.xapp" . }}:4560;service-admission-ctrl-xapp-rmr.{{ include "common.namespace.xapp" . }}:4560
-    rte|12012|service-ricxapp-ueec-rmr.{{ include "common.namespace.xapp" . }}:4560;service-admission-ctrl-xapp-rmr.{{ include "common.namespace.xapp" . }}:4560
-    rte|12021|service-ricxapp-ueec-rmr.{{ include "common.namespace.xapp" . }}:4560;service-admission-ctrl-xapp-rmr.{{ include "common.namespace.xapp" . }}:4560
-    rte|12022|service-ricxapp-ueec-rmr.{{ include "common.namespace.xapp" . }}:4560;service-admission-ctrl-xapp-rmr.{{ include "common.namespace.xapp" . }}:4560
-    rte|12041|service-ricxapp-ueec-rmr.{{ include "common.namespace.xapp" . }}:4560;service-admission-ctrl-xapp-rmr.{{ include "common.namespace.xapp" . }}:4560
-    rte|12042|service-ricxapp-ueec-rmr.{{ include "common.namespace.xapp" . }}:4560;service-admission-ctrl-xapp-rmr.{{ include "common.namespace.xapp" . }}:4560
-    rte|12050|service-ricxapp-ueec-rmr.{{ include "common.namespace.xapp" . }}:4560;service-admission-ctrl-xapp-rmr.{{ include "common.namespace.xapp" . }}:4560
-    rte|20000|service-ricxapp-ueec-rmr.{{ include "common.namespace.xapp" . }}:4560;service-admission-ctrl-xapp-rmr.{{ include "common.namespace.xapp" . }}:4560
-    newrt|end
-
diff --git a/ric-platform/50-RIC-Platform/helm/e2term/templates/deployment.yaml b/ric-platform/50-RIC-Platform/helm/e2term/templates/deployment.yaml
deleted file mode 100644 (file)
index feab426..0000000
+++ /dev/null
@@ -1,119 +0,0 @@
-################################################################################
-#   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.                                             #
-################################################################################
-
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: {{ include "common.deploymentname.e2term" . }}
-  namespace: {{ include "common.namespace.platform" . }}
-  labels:
-    app: {{ include "common.namespace.platform" . }}-{{ include "common.name.e2term" . }}
-    chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
-    release: {{ .Release.Name }}
-    heritage: {{ .Release.Service }}
-spec:
-  replicas: {{ .Values.e2term.replicaCount }}
-  selector:
-    matchLabels:
-      app: {{ include "common.namespace.platform" . }}-{{ include "common.name.e2term" . }}
-      release: {{ .Release.Name }}
-  template:
-    metadata:
-      {{- if .Values.e2term.annotations }}
-      annotations:
-        {{- .Values.e2term.annotations | nindent 8 -}}
-      {{ end }}
-      labels:
-        app: {{ include "common.namespace.platform" . }}-{{ include "common.name.e2term" . }}
-        release: {{ .Release.Name }}
-    spec:
-      hostname: {{ include "common.name.e2term" . }}
-      hostNetwork: {{ .Values.e2term.hostnetworkmode }}
-      dnsPolicy: ClusterFirstWithHostNet
-      imagePullSecrets:
-        - name: {{ include "common.repositoryCred" . }}
-      {{- with .Values.e2term.nodeselector }}
-      nodeSelector: {{ toYaml . | trim | nindent 8 -}}
-      {{- end }}
-      containers:
-        - name: {{ include "common.containername.e2term" . }}
-          image: {{ include "common.repository" . }}/{{ .Values.e2term.image.name }}:{{ .Values.e2term.image.tag }}
-          imagePullPolicy: {{ include "common.pullPolicy" . }}
-          volumeMounts:
-          - mountPath: /opt/e2/router.txt
-            name: local-router-file
-            subPath: router.txt
-          - mountPath: /tmp/rmr_verbose
-            name: local-router-file
-            subPath: rmr_verbose
-{{ if .Values.e2term.pizpub.enabled }}
-          - mountPath: "{{ .Values.e2term.env.messagecollectorfile }}"
-            name: vol-shared
-            readOnly: false
-            subPath: "{{ .Values.e2term.pizpub.scanDirectory }}"
-{{ else }}
-          - mountPath: "{{ .Values.e2term.env.messagecollectorfile }}"
-            name: vol-shared
-            readOnly: false
-{{ end }}
-          envFrom:
-            - configMapRef:
-                name: {{ include "common.configmapname.e2term" . }}-env
-          ports:
-            - name: "rmrroute"
-              containerPort: {{ include "common.serviceport.e2term.rmr.route" . }}
-            - name: "rmrdata"
-              containerPort: {{ include "common.serviceport.e2term.rmr.data" . }}
-          stdin: true
-          tty: true
-          securityContext:
-            privileged: {{ .Values.e2term.privilegedmode }}
-
-{{ if .Values.e2term.pizpub.enabled }}
-        - name: {{ include "common.containername.e2term" . }}-pizpub
-          image: {{ include "common.repository" . }}/{{ .Values.e2term.pizpub.imageName }}:{{ .Values.e2term.pizpub.imageVersion }}
-          imagePullPolicy: {{ include "common.pullPolicy" . }}
-          volumeMounts:
-          - mountPath: /etc/localtime
-            name: localtime
-            readOnly: true
-          - mountPath: "{{ .Values.e2term.pizpub.dataRootDir }}"
-            name: vol-shared
-            readOnly: false
-          - name: pizpub-config
-            mountPath: /opt/app/config/conf/
-          lifecycle:
-            postStart:
-              exec:
-                command: ["/bin/sh", "/opt/app/config/conf/cleaner.sh", "{{ .Values.e2term.pizpub.dataRootDir }}/{{ .Values.e2term.pizpub.processedDirectory }}", "3"]
-{{ end }}
-      volumes:
-        - name: local-router-file
-          configMap:
-            name: {{ include "common.configmapname.e2term" . }}-router-configmap
-{{ if .Values.e2term.pizpub.enabled }}
-        - name: localtime
-          hostPath:
-            path: /etc/localtime
-        - name: pizpub-config
-          configMap:
-            name: {{ include "common.configmapname.e2term" . }}-pizpub
-{{ end }}
-        - name: vol-shared
-          persistentVolumeClaim:
-            claimName: {{ include "common.pvcname.e2term" . }}
-
diff --git a/ric-platform/50-RIC-Platform/helm/e2term/templates/e2term-pv.yaml b/ric-platform/50-RIC-Platform/helm/e2term/templates/e2term-pv.yaml
deleted file mode 100644 (file)
index 2f46132..0000000
+++ /dev/null
@@ -1,31 +0,0 @@
-################################################################################
-#   Copyright (c) 2019 AT&T Intellectual Property.                             #
-#                                                                              #
-#   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.                                             #
-################################################################################1
-{{if eq .Values.e2term.storageClassName "local-storage" }}
-apiVersion: v1
-kind: PersistentVolume
-metadata:
-  name: {{ include "common.pvname.e2term" . }}
-  labels:
-    type: local
-spec:
-  storageClassName: {{ .Values.e2term.storageClassName }}
-  capacity:
-    storage: {{ .Values.e2term.dataVolSize }}
-  accessModes:
-    - ReadWriteOnce
-  hostPath:
-    path: /mnt/{{ include "common.pvname.e2term" . }}
-{{ end }}
diff --git a/ric-platform/50-RIC-Platform/helm/e2term/templates/e2term-pvc.yaml b/ric-platform/50-RIC-Platform/helm/e2term/templates/e2term-pvc.yaml
deleted file mode 100644 (file)
index df01541..0000000
+++ /dev/null
@@ -1,28 +0,0 @@
-################################################################################
-#   Copyright (c) 2019 AT&T Intellectual Property.                             #
-#                                                                              #
-#   Licensed under the Apache License, Version 2.0 (the "License");            #
-#   you may not use this file except in compliance with the License.           #
-#   You may obtain a copy of the License at                                    #
-#                                                                              #
-#       http://www.apache.org/licenses/LICENSE-2.0                             #
-#                                                                              #
-#   Unless required by applicable law or agreed to in writing, software        #
-#   distributed under the License is distributed on an "AS IS" BASIS,          #
-#   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.   #
-#   See the License for the specific language governing permissions and        #
-#   limitations under the License.                                             #
-################################################################################
-
-kind: PersistentVolumeClaim
-apiVersion: v1
-metadata:
-  name: {{ include "common.pvcname.e2term" . }}
-spec:
-  accessModes:
-    - ReadWriteOnce
-  resources:
-    requests:
-      storage: {{ .Values.e2term.dataVolSize }}
-  storageClassName: {{ .Values.e2term.storageClassName }}
-  #volumeName: {{ include "common.pvname.e2term" . }}
diff --git a/ric-platform/50-RIC-Platform/helm/e2term/templates/env.yaml b/ric-platform/50-RIC-Platform/helm/e2term/templates/env.yaml
deleted file mode 100644 (file)
index aa2ae94..0000000
+++ /dev/null
@@ -1,33 +0,0 @@
-################################################################################
-#   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.                                             #
-################################################################################
-apiVersion: v1
-kind: ConfigMap
-metadata:
-  name: {{ include "common.configmapname.e2term" . }}-env
-data:
-  DBAAS_SERVICE_HOST: {{ include "common.servicename.dbaas.tcp" . | quote }}
-  DBAAS_SERVICE_PORT: {{ include "common.serviceport.dbaas.tcp" . | quote }}
-  DBAAS_PORT_6379_TCP_ADDR: {{ include "common.servicename.dbaas.tcp" . | quote }}
-  DBAAS_PORT_6379_TCP_PORT: {{ include "common.serviceport.dbaas.tcp" . | quote }}
-  RMR_SRC_ID: {{ include "common.servicename.e2term.rmr" . }}.{{ include "common.namespace.platform" . }}
-  RMR_RTG_SVC: {{ include "common.serviceport.e2term.rmr.route" . | quote }}
-  RMR_SEED_RT: "router.txt"
-  RMR_VCTL_FILE: "/tmp/rmr_verbose"
-  sctp: {{ include "common.serviceport.e2term.sctp" . | quote }}
-  nano: {{ include "common.serviceport.e2term.rmr.data" . | quote }}
-  print: "{{ .Values.e2term.env.print }}"
-  volume: "{{ .Values.e2term.env.messagecollectorfile }}"
diff --git a/ric-platform/50-RIC-Platform/helm/e2term/templates/service-rmr.yaml b/ric-platform/50-RIC-Platform/helm/e2term/templates/service-rmr.yaml
deleted file mode 100644 (file)
index f9443a5..0000000
+++ /dev/null
@@ -1,41 +0,0 @@
-################################################################################
-#   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.                                             #
-################################################################################
-
-apiVersion: v1
-kind: Service
-metadata:
-  name: {{ include "common.servicename.e2term.rmr" . }}
-  namespace: {{ include "common.namespace.platform" . }}
-  labels:
-    app: {{ include "common.namespace.platform" . }}-{{ include "common.name.e2term" . }}
-    chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
-    release: {{ .Release.Name }}
-    heritage: {{ .Release.Service }} 
-spec:
-  type: ClusterIP
-  ports:
-    - port: {{ include "common.serviceport.e2term.rmr.route" . }}
-      protocol: "TCP"
-      targetPort: "rmrroute"
-      name: "rmrroute"
-    - port: {{ include "common.serviceport.e2term.rmr.data" . }}
-      protocol: "TCP"
-      targetPort: "rmrdata"
-      name: "rmrdata"
-  selector:
-      app: {{ include "common.namespace.platform" . }}-{{ include "common.name.e2term" . }}
-      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
deleted file mode 100644 (file)
index 427d56a..0000000
+++ /dev/null
@@ -1,58 +0,0 @@
-################################################################################
-#   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.                                             #
-################################################################################
-
-#################################################################
-# Application configuration defaults.
-#################################################################
-repository: "nexus3.o-ran-sc.org:10004"
-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: ""
-
-e2term:
-  image:
-    name: e2
-    tag: 1.6.0
-  
-  privilegedmode: true
-  hostnetworkmode: true
-
-  replicaCount: 1
-  env:
-    print: "1"
-    messagecollectorfile: "/data/outgoing/"
-  # Service ports are now defined in 
-  # ric-common/Common-Template/helm/ric-common/templates/_ports.tpl file.
-  # If need to change a service port, make the code change necessary, then
-  # update the _ports.tpl file with the new port number.
-
-  dataVolSize: 100Mi
-  storageClassName: local-storage
-  #storageClassName: ric-storage-class
-
-  pizpub:
-    enabled: false
diff --git a/ric-platform/50-RIC-Platform/helm/jaegeradapter/.helmignore b/ric-platform/50-RIC-Platform/helm/jaegeradapter/.helmignore
deleted file mode 100644 (file)
index d29b399..0000000
+++ /dev/null
@@ -1,37 +0,0 @@
-#   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.
-
-# Patterns to ignore when building packages.
-# This supports shell glob matching, relative path matching, and
-# negation (prefixed with !). Only one pattern per line.
-.DS_Store
-# Common VCS dirs
-.git/
-.gitignore
-.bzr/
-.bzrignore
-.hg/
-.hgignore
-.svn/
-# Common backup files
-*.swp
-*.bak
-*.tmp
-*~
-# Various IDEs
-.project
-.idea/
-*.tmproj
-.vscode/
diff --git a/ric-platform/50-RIC-Platform/helm/jaegeradapter/Chart.yaml b/ric-platform/50-RIC-Platform/helm/jaegeradapter/Chart.yaml
deleted file mode 100644 (file)
index 91fe7fc..0000000
+++ /dev/null
@@ -1,19 +0,0 @@
-#   Copyright (c) 2019 AT&T Intellectual Property.
-#
-#   Licensed under the Apache License, Version 2.0 (the "License");
-#   you may not use this file except in compliance with the License.
-#   You may obtain a copy of the License at
-#
-#       http://www.apache.org/licenses/LICENSE-2.0
-#
-#   Unless required by applicable law or agreed to in writing, software
-#   distributed under the License is distributed on an "AS IS" BASIS,
-#   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#   See the License for the specific language governing permissions and
-#   limitations under the License.
-
-apiVersion: v1
-appVersion: "1.0"
-description: A Helm chart for Kubernetes
-name: jaegeradapter
-version: 0.1.0
diff --git a/ric-platform/50-RIC-Platform/helm/jaegeradapter/requirements.yaml b/ric-platform/50-RIC-Platform/helm/jaegeradapter/requirements.yaml
deleted file mode 100644 (file)
index f8e2a9a..0000000
+++ /dev/null
@@ -1,20 +0,0 @@
-################################################################################
-#   Copyright (c) 2019 AT&T Intellectual Property.                             #
-#                                                                              #
-#   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: ric-common
-    version: ~2.0.7
-
diff --git a/ric-platform/50-RIC-Platform/helm/jaegeradapter/templates/agent-service.yaml b/ric-platform/50-RIC-Platform/helm/jaegeradapter/templates/agent-service.yaml
deleted file mode 100644 (file)
index 13b44cb..0000000
+++ /dev/null
@@ -1,43 +0,0 @@
-#   Copyright (c) 2019 AT&T Intellectual Property.
-#
-#   Licensed under the Apache License, Version 2.0 (the "License");
-#   you may not use this file except in compliance with the License.
-#   You may obtain a copy of the License at
-#
-#       http://www.apache.org/licenses/LICENSE-2.0
-#
-#   Unless required by applicable law or agreed to in writing, software
-#   distributed under the License is distributed on an "AS IS" BASIS,
-#   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#   See the License for the specific language governing permissions and
-#   limitations under the License.
-
-apiVersion: v1
-kind: Service
-metadata:
-  name: {{ include "common.servicename.jaegeradapter.agent" . }}
-  namespace: {{ include "common.namespace.platform" . }}
-  labels:
-    app: {{ include "common.namespace.platform" . }}-{{ include "common.name.jaegeradapter" . }}
-    chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
-    release: {{ .Release.Name }}
-    heritage: {{ .Release.Service }}
-spec:
-  type: ClusterIP
-  ports:
-    - name: {{ include "common.portname.jaegeradapter.zipkincompact" . }}
-      port: {{ include "common.serviceport.jaegeradapter.zipkincompact" . }}
-      protocol: UDP
-      targetPort: {{ include "common.serviceport.jaegeradapter.zipkincompact" . }}
-    - name: {{ include "common.portname.jaegeradapter.jaegercompact" . }} 
-      port: {{ include "common.serviceport.jaegeradapter.jaegercompact" . }} 
-      protocol: UDP
-      targetPort: {{ include "common.serviceport.jaegeradapter.jaegercompact" . }} 
-    - name: {{ include "common.portname.jaegeradapter.jaegerbinary" . }}
-      port: {{ include "common.serviceport.jaegeradapter.jaegerbinary" . }}
-      protocol: UDP
-      targetPort: {{ include "common.serviceport.jaegeradapter.jaegerbinary" . }}
-  selector:
-    app: {{ include "common.namespace.platform" . }}-{{ include "common.name.jaegeradapter" . }}
-    release: {{ .Release.Name }}
-
diff --git a/ric-platform/50-RIC-Platform/helm/jaegeradapter/templates/collector-service.yaml b/ric-platform/50-RIC-Platform/helm/jaegeradapter/templates/collector-service.yaml
deleted file mode 100644 (file)
index 130055c..0000000
+++ /dev/null
@@ -1,43 +0,0 @@
-#   Copyright (c) 2019 AT&T Intellectual Property.
-#
-#   Licensed under the Apache License, Version 2.0 (the "License");
-#   you may not use this file except in compliance with the License.
-#   You may obtain a copy of the License at
-#
-#       http://www.apache.org/licenses/LICENSE-2.0
-#
-#   Unless required by applicable law or agreed to in writing, software
-#   distributed under the License is distributed on an "AS IS" BASIS,
-#   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#   See the License for the specific language governing permissions and
-#   limitations under the License.
-
-apiVersion: v1
-kind: Service
-metadata:
-  name: {{ include "common.servicename.jaegeradapter.collector" . }}
-  namespace: {{ include "common.namespace.platform" . }}
-  labels:
-    app: {{ include "common.namespace.platform" . }}-{{ include "common.name.jaegeradapter" . }}
-    chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
-    release: {{ .Release.Name }}
-    heritage: {{ .Release.Service }}
-spec:
-  type: ClusterIP
-  ports:
-    - name: {{ include "common.portname.jaegeradapter.jaegerhttpt" . }}
-      port: {{ include "common.serviceport.jaegeradapter.jaegerhttpt" . }}
-      protocol: TCP
-      targetPort: {{ include "common.serviceport.jaegeradapter.jaegerhttpt" . }}
-    - name: {{ include "common.portname.jaegeradapter.jaegerhttp" . }} 
-      port: {{ include "common.serviceport.jaegeradapter.jaegerhttp" . }} 
-      protocol: TCP
-      targetPort: {{ include "common.serviceport.jaegeradapter.jaegerhttp" . }} 
-    - name: {{ include "common.portname.jaegeradapter.zipkinhttp" . }}
-      port: {{ include "common.serviceport.jaegeradapter.zipkinhttp" . }}
-      protocol: TCP
-      targetPort: {{ include "common.serviceport.jaegeradapter.zipkinhttp" . }}
-  selector:
-    app: {{ include "common.namespace.platform" . }}-{{ include "common.name.jaegeradapter" . }}
-    release: {{ .Release.Name }}
-
diff --git a/ric-platform/50-RIC-Platform/helm/jaegeradapter/templates/deployment.yaml b/ric-platform/50-RIC-Platform/helm/jaegeradapter/templates/deployment.yaml
deleted file mode 100644 (file)
index a80c0d6..0000000
+++ /dev/null
@@ -1,84 +0,0 @@
-#   Copyright (c) 2019 AT&T Intellectual Property.
-#
-#   Licensed under the Apache License, Version 2.0 (the "License");
-#   you may not use this file except in compliance with the License.
-#   You may obtain a copy of the License at
-#
-#       http://www.apache.org/licenses/LICENSE-2.0
-#
-#   Unless required by applicable law or agreed to in writing, software
-#   distributed under the License is distributed on an "AS IS" BASIS,
-#   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#   See the License for the specific language governing permissions and
-#   limitations under the License.
-
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: {{ include "common.deploymentname.jaegeradapter" . }}
-  namespace: {{ include "common.namespace.platform" . }}
-  labels:
-    app: {{ include "common.namespace.platform" . }}-{{ include "common.name.jaegeradapter" . }}
-    chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
-    release: {{ .Release.Name }}
-    heritage: {{ .Release.Service }}
-spec:
-  replicas: {{ .Values.jaegeradapter.replicaCount }}
-  selector:
-    matchLabels:
-      app: {{ include "common.namespace.platform" . }}-{{ include "common.name.jaegeradapter" . }}
-      release: {{ .Release.Name }}
-  template:
-    metadata:
-      {{- if .Values.jaegeradapter.annotations }}
-      annotations:
-        {{- .Values.jaegeradapter.annotations | nindent 8 -}}
-      {{ end }}
-      labels:
-        app: {{ include "common.namespace.platform" . }}-{{ include "common.name.jaegeradapter" . }}
-        release: {{ .Release.Name }}
-    spec:
-      hostname: {{ include "common.name.jaegeradapter" . }}
-      imagePullSecrets:
-        - name: {{ include "common.repositoryCred" . }}
-      containers:
-        - name: {{ include "common.containername.jaegeradapter" . }}
-          image: {{ include "common.repository" . }}/{{ .Values.jaegeradapter.image.name }}:{{ .Values.jaegeradapter.image.tag }}
-          imagePullPolicy: {{ include "common.pullPolicy" . }}
-          envFrom:
-            - configMapRef:
-                name: {{ include "common.configmapname.jaegeradapter" . }}
-          ports:
-            - name: {{ include "common.portname.jaegeradapter.zipkincompact" . }} 
-              containerPort: {{ include "common.serviceport.jaegeradapter.zipkincompact" . }}
-              protocol: UDP
-            - name: {{ include "common.portname.jaegeradapter.jaegercompact" . }}  
-              containerPort: {{ include "common.serviceport.jaegeradapter.jaegercompact" . }}
-              protocol: UDP
-            - name: {{ include "common.portname.jaegeradapter.jaegerbinary" . }} 
-              containerPort: {{ include "common.serviceport.jaegeradapter.jaegerbinary" . }}
-              protocol: UDP
-            - name: {{ include "common.portname.jaegeradapter.httpquery" . }} 
-              containerPort: {{ include "common.serviceport.jaegeradapter.httpquery" . }}
-              protocol: TCP
-            - name: {{ include "common.portname.jaegeradapter.httpconfig" . }} 
-              containerPort: {{ include "common.serviceport.jaegeradapter.httpconfig" . }}
-              protocol: TCP
-            - name: {{ include "common.portname.jaegeradapter.zipkinhttp" . }} 
-              containerPort: {{ include "common.serviceport.jaegeradapter.zipkinhttp" . }}
-              protocol: TCP
-            - name: {{ include "common.portname.jaegeradapter.jaegerhttp" . }} 
-              containerPort: {{ include "common.serviceport.jaegeradapter.jaegerhttp" . }}
-              protocol: TCP
-            - name: {{ include "common.portname.jaegeradapter.jaegerhttpt" . }}
-              containerPort: {{ include "common.serviceport.jaegeradapter.jaegerhttpt" . }}
-              protocol: TCP
-          livenessProbe:
-            httpGet:
-              path: /
-              port: {{ include "common.serviceport.jaegeradapter.httpquery" . }}
-          readinessProbe:
-            httpGet:
-              path: /
-              port: {{ include "common.serviceport.jaegeradapter.httpquery" . }}
-              initialDelaySeconds: 5
diff --git a/ric-platform/50-RIC-Platform/helm/jaegeradapter/templates/env.yaml b/ric-platform/50-RIC-Platform/helm/jaegeradapter/templates/env.yaml
deleted file mode 100644 (file)
index e21b8d9..0000000
+++ /dev/null
@@ -1,11 +0,0 @@
-apiVersion: v1
-kind: ConfigMap
-metadata:
-  name: {{ include "common.configmapname.jaegeradapter" . }}
-  namespace: {{ include "common.namespace.platform" . }}
-data:
-  TRACING_ENABLED: "0"
-  TRACING_JAEGER_SAMPLER_TYPE: "const"
-  TRACING_JAEGER_SAMPLER_PARAM: "1"
-  TRACING_JAEGER_AGENT_ADDR: {{ include "common.servicename.jaegeradapter.agent" . }}.{{ include "common.namespace.platform" . }}
-  TRACING_JAEGER_LOG_LEVEL: "error"
diff --git a/ric-platform/50-RIC-Platform/helm/jaegeradapter/templates/query-service.yaml b/ric-platform/50-RIC-Platform/helm/jaegeradapter/templates/query-service.yaml
deleted file mode 100644 (file)
index dc0f6ba..0000000
+++ /dev/null
@@ -1,35 +0,0 @@
-#   Copyright (c) 2019 AT&T Intellectual Property.
-#
-#   Licensed under the Apache License, Version 2.0 (the "License");
-#   you may not use this file except in compliance with the License.
-#   You may obtain a copy of the License at
-#
-#       http://www.apache.org/licenses/LICENSE-2.0
-#
-#   Unless required by applicable law or agreed to in writing, software
-#   distributed under the License is distributed on an "AS IS" BASIS,
-#   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#   See the License for the specific language governing permissions and
-#   limitations under the License.
-
-apiVersion: v1
-kind: Service
-metadata:
-  name: {{ include "common.servicename.jaegeradapter.query" . }}
-  namespace: {{ include "common.namespace.platform" . }}
-  labels:
-    app: {{ include "common.namespace.platform" . }}-{{ include "common.name.jaegeradapter" . }}
-    chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
-    release: {{ .Release.Name }}
-    heritage: {{ .Release.Service }}
-spec:
-  type: ClusterIP
-  ports:
-  - name: {{ include "common.portname.jaegeradapter.httpquery" . }}
-    port: {{ include "common.serviceport.jaegeradapter.httpquery" . }}
-    protocol: TCP
-    targetPort: {{ include "common.serviceport.jaegeradapter.httpquery" . }}
-  selector:
-    app: {{ include "common.namespace.platform" . }}-{{ include "common.name.jaegeradapter" . }}
-    release: {{ .Release.Name }}
-
diff --git a/ric-platform/50-RIC-Platform/helm/jaegeradapter/values.yaml b/ric-platform/50-RIC-Platform/helm/jaegeradapter/values.yaml
deleted file mode 100644 (file)
index 664f82e..0000000
+++ /dev/null
@@ -1,38 +0,0 @@
-#   Copyright (c) 2019 AT&T Intellectual Property.
-#
-#   Licensed under the Apache License, Version 2.0 (the "License");
-#   you may not use this file except in compliance with the License.
-#   You may obtain a copy of the License at
-#
-#       http://www.apache.org/licenses/LICENSE-2.0
-#
-#   Unless required by applicable law or agreed to in writing, software
-#   distributed under the License is distributed on an "AS IS" BASIS,
-#   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#   See the License for the specific language governing permissions and
-#   limitations under the License.
-
-# Default values for jaeger-all-in-one.
-# This is a YAML-formatted file.
-# Declare variables to be passed into your templates.
-
-repository: "nexus3.o-ran-sc.org:10004"
-imagePullPolicy: IfNotPresent
-repositoryCred: docker-reg-cred
-
-jaegeradapter:
-  replicaCount: 1
-
-  repositoryOverride: docker.io
-  image:
-    name: jaegertracing/all-in-one
-    tag: 1.12
-    pullPolicy: IfNotPresent
-
-  nameOverride: ""
-  fullnameOverride: ""
-
-  ingress:
-    enabled: false
-    annotations: {}
-    tls: []
diff --git a/ric-platform/50-RIC-Platform/helm/rsm/Chart.yaml b/ric-platform/50-RIC-Platform/helm/rsm/Chart.yaml
deleted file mode 100755 (executable)
index 96f586c..0000000
+++ /dev/null
@@ -1,21 +0,0 @@
-################################################################################
-#   Copyright (c) 2019 AT&T Intellectual Property.                             #
-#                                                                              #
-#   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.                                             #
-################################################################################
-
-appVersion: "1.0"
-apiVersion: v1
-description: Oran rsm Helm charts
-name: rsm
-version: 2.0.6
diff --git a/ric-platform/50-RIC-Platform/helm/rsm/requirements.yaml b/ric-platform/50-RIC-Platform/helm/rsm/requirements.yaml
deleted file mode 100755 (executable)
index 75eee1b..0000000
+++ /dev/null
@@ -1,19 +0,0 @@
-################################################################################
-#   Copyright (c) 2019 AT&T Intellectual Property.                             #
-#                                                                              #
-#   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: ric-common
-    version: ~2.0.6
diff --git a/ric-platform/50-RIC-Platform/helm/rsm/templates/configmap.yaml b/ric-platform/50-RIC-Platform/helm/rsm/templates/configmap.yaml
deleted file mode 100755 (executable)
index c5882b1..0000000
+++ /dev/null
@@ -1,76 +0,0 @@
-################################################################################
-#   Copyright (c) 2019 AT&T Intellectual Property.                             #
-#                                                                              #
-#   Licensed under the Apache License, Version 2.0 (the "License");            #
-#   you may not use this file except in compliance with the License.           #
-#   You may obtain a copy of the License at                                    #
-#                                                                              #
-#       http://www.apache.org/licenses/LICENSE-2.0                             #
-#                                                                              #
-#   Unless required by applicable law or agreed to in writing, software        #
-#   distributed under the License is distributed on an "AS IS" BASIS,          #
-#   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.   #
-#   See the License for the specific language governing permissions and        #
-#   limitations under the License.                                             #
-################################################################################
----
-apiVersion: v1
-kind: ConfigMap
-metadata:
-  name: {{ include "common.configmapname.rsm" . }}-router-configmap
-  namespace: {{ include "common.namespace.platform" . }}
-data:
-  rmr_verbose: |
-    0
-  router.txt: |
-    newrt|start
-    rte|10090|{{ include "common.servicename.e2term.rmr" .      }}.{{ include "common.namespace.platform" . }}:{{ include "common.serviceport.e2term.rmr.data" . }}
-    newrt|end
----
-apiVersion: v1
-kind: ConfigMap
-metadata:
-  name: {{ include "common.configmapname.rsm" . }}
-  namespace: {{ include "common.namespace.platform" . }}
-data:
-  configuration.yaml: |
-    logging:
-      {{- if hasKey .Values.rsm "logLevel" }}
-      logLevel: {{ .Values.rsm.logLevel }}
-      {{- else }}
-      logLevel:  "info"
-      {{- end }}
-    http:
-      {{- if hasKey .Values.rsm "httpPort" }}
-      port: {{ .Values.rsm.httpPort }}
-      {{- else }}
-      port: 4800
-      {{- end }}
-    rmr:
-      {{- if hasKey .Values.rsm "rmrPort" }}
-      port: {{ .Values.rsm.rmrPort }}
-      {{- else }}
-      port: 4801
-      {{- end }}
-      {{- if hasKey .Values.rsm "maxMsgSize" }}
-      maxMsgSize: {{ .Values.rsm.maxMsgSize }}
-      {{- else }}
-      maxMsgSize: 4096
-      {{- end }}
-      {{- if hasKey .Values.rsm "readyIntervalSec" }}
-      readyIntervalSec: {{ .Values.rsm.readyIntervalSec }}
-      {{- else }}
-      readyIntervalSec: 1
-      {{- end }}
-    rnib:
-      {{- if hasKey .Values.rsm "maxRnibConnectionAttempts" }}
-      maxRnibConnectionAttempts: {{ .Values.rsm.maxRnibConnectionAttempts }}
-      {{- else }}
-      maxRnibConnectionAttempts: 3
-      {{- end }}
-      {{- if hasKey .Values.rsm "rnibRetryIntervalMs" }}
-      rnibRetryIntervalMs: {{ .Values.rsm.rnibRetryIntervalMs }}
-      {{- else }}
-      rnibRetryIntervalMs: 10
-      {{- end }}
----
diff --git a/ric-platform/50-RIC-Platform/helm/rsm/templates/deployment.yaml b/ric-platform/50-RIC-Platform/helm/rsm/templates/deployment.yaml
deleted file mode 100755 (executable)
index 28c836f..0000000
+++ /dev/null
@@ -1,83 +0,0 @@
-################################################################################
-#   Copyright (c) 2019 AT&T Intellectual Property.                             #
-#                                                                              #
-#   Licensed under the Apache License, Version 2.0 (the "License");            #
-#   you may not use this file except in compliance with the License.           #
-#   You may obtain a copy of the License at                                    #
-#                                                                              #
-#       http://www.apache.org/licenses/LICENSE-2.0                             #
-#                                                                              #
-#   Unless required by applicable law or agreed to in writing, software        #
-#   distributed under the License is distributed on an "AS IS" BASIS,          #
-#   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.   #
-#   See the License for the specific language governing permissions and        #
-#   limitations under the License.                                             #
-################################################################################
-
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: {{ include "common.deploymentname.rsm" .}}
-  namespace: {{ include "common.namespace.platform" . }}
-  labels:
-    app: {{ include "common.namespace.platform" . }}-{{ include "common.name.rsm" . }}
-    chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
-    release: {{ .Release.Name }}
-    heritage: {{ .Release.Service }}
-spec:
-  replicas: {{ .Values.rsm.replicaCount }}
-  selector:
-    matchLabels:
-      app: {{ include "common.namespace.platform" . }}-{{ include "common.name.rsm" . }}
-      release: {{ .Release.Name }}
-  template:
-    metadata:
-      {{- if .Values.rsm.annotations }}
-      annotations:
-        {{- .Values.rsm.annotations | nindent 8 -}}
-      {{ end }}
-      labels:
-        app: {{ include "common.namespace.platform" . }}-{{ include "common.name.rsm" . }}
-        release: {{ .Release.Name }}
-    spec:
-      initContainers:
-      - name: redis-init
-        image: "redis"
-        imagePullPolicy: IfNotPresent
-        command: ['sh', '-c', 'redis-cli -h service-ricplt-dbaas-tcp -p 6379 set "{rsm},CFG:GENERAL:v1.0.0"  "{\"enableResourceStatus\":true,\"partialSuccessAllowed\":true,\"prbPeriodic\":true,\"tnlLoadIndPeriodic\":true,\"wwLoadIndPeriodic\":true,\"absStatusPeriodic\":true,\"rsrpMeasurementPeriodic\":true,\"csiPeriodic\":true,\"periodicityMs\":1,\"periodicityRsrpMeasurementMs\":3,\"periodicityCsiMs\":4}" nx']
-
-      hostname: {{ include "common.name.rsm" . }} 
-      imagePullSecrets:
-        - name: {{ include "common.repositoryCred" . }}
-      containers:
-        - name: {{ include "common.containername.rsm" . }}
-          image: {{ include "common.repository" . }}/{{ .Values.rsm.image.name }}:{{ .Values.rsm.image.tag }}
-          imagePullPolicy: {{ include "common.pullPolicy" . }}
-          volumeMounts:
-          - mountPath: /opt/RSM/router.txt
-            name: local-router-file
-            subPath: router.txt
-          - mountPath: /opt/RSM/resources/configuration.yaml
-            name: local-configuration-file
-            subPath: configuration.yaml
-          envFrom:
-            - configMapRef:
-                name: {{ include "common.configmapname.rsm" . }}-env
-          ports:
-            - name: "http"
-              containerPort: {{ include "common.serviceport.rsm.http" . }}
-            - name: "rmrroute"
-              containerPort: {{ include "common.serviceport.rsm.rmr.route" . }}
-            - name: "rmrdata"
-              containerPort: {{ include "common.serviceport.rsm.rmr.data" . }}
-          stdin: true
-          tty: true
-          securityContext:
-            privileged: {{ .Values.rsm.privilegedmode}}
-      volumes:
-        - name: local-router-file
-          configMap:
-            name: {{ include "common.configmapname.rsm" . }}-router-configmap
-        - name: local-configuration-file
-          configMap:
-            name: {{ include "common.configmapname.rsm" . }}
diff --git a/ric-platform/50-RIC-Platform/helm/rsm/templates/env.yaml b/ric-platform/50-RIC-Platform/helm/rsm/templates/env.yaml
deleted file mode 100755 (executable)
index 9fad361..0000000
+++ /dev/null
@@ -1,28 +0,0 @@
-################################################################################
-#   Copyright (c) 2019 AT&T Intellectual Property.                             #
-#                                                                              #
-#   Licensed under the Apache License, Version 2.0 (the "License");            #
-#   you may not use this file except in compliance with the License.           #
-#   You may obtain a copy of the License at                                    #
-#                                                                              #
-#       http://www.apache.org/licenses/LICENSE-2.0                             #
-#                                                                              #
-#   Unless required by applicable law or agreed to in writing, software        #
-#   distributed under the License is distributed on an "AS IS" BASIS,          #
-#   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.   #
-#   See the License for the specific language governing permissions and        #
-#   limitations under the License.                                             #
-################################################################################
-apiVersion: v1
-kind: ConfigMap
-metadata:
-  name: {{ include "common.configmapname.rsm" . }}-env
-data:
-   DBAAS_SERVICE_HOST: {{ include "common.servicename.dbaas.tcp" . | quote }}
-   DBAAS_SERVICE_PORT: {{ include "common.serviceport.dbaas.tcp" . | quote }}
-   DBAAS_PORT_6379_TCP_ADDR: {{ include "common.servicename.dbaas.tcp" . | quote }}
-   DBAAS_PORT_6379_TCP_PORT: {{ include "common.serviceport.dbaas.tcp" . | quote }} 
-   RMR_RTG_SVC: {{ include "common.serviceport.rsm.rmr.route" . | quote }}
-   
-   
-
diff --git a/ric-platform/50-RIC-Platform/helm/rsm/templates/ingress-rsm.yaml b/ric-platform/50-RIC-Platform/helm/rsm/templates/ingress-rsm.yaml
deleted file mode 100755 (executable)
index bbafd62..0000000
+++ /dev/null
@@ -1,27 +0,0 @@
-################################################################################
-#   Copyright (c) 2019 AT&T Intellectual Property.                             #
-#                                                                              #
-#   Licensed under the Apache License, Version 2.0 (the "License");            #
-#   you may not use this file except in compliance with the License.           #
-#   You may obtain a copy of the License at                                    #
-#                                                                              #
-#       http://www.apache.org/licenses/LICENSE-2.0                             #
-#                                                                              #
-#   Unless required by applicable law or agreed to in writing, software        #
-#   distributed under the License is distributed on an "AS IS" BASIS,          #
-#   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.   #
-#   See the License for the specific language governing permissions and        #
-#   limitations under the License.                                             #
-################################################################################
-apiVersion: networking.k8s.io/v1beta1
-kind: Ingress
-metadata:
-  name: {{ include "common.ingressname.rsm" . }}
-spec:
-  rules:
-  - http:
-      paths:
-      - path: {{ include "common.kongpath.ric.rsm" . }}
-        backend:
-          serviceName: {{ include "common.servicename.rsm.http" . }}
-          servicePort: {{ include "common.serviceport.rsm.http" . }}
diff --git a/ric-platform/50-RIC-Platform/helm/rsm/templates/service-http.yaml b/ric-platform/50-RIC-Platform/helm/rsm/templates/service-http.yaml
deleted file mode 100755 (executable)
index 05dbb50..0000000
+++ /dev/null
@@ -1,36 +0,0 @@
-################################################################################
-#   Copyright (c) 2019 AT&T Intellectual Property.                             #
-#                                                                              #
-#   Licensed under the Apache License, Version 2.0 (the "License");            #
-#   you may not use this file except in compliance with the License.           #
-#   You may obtain a copy of the License at                                    #
-#                                                                              #
-#       http://www.apache.org/licenses/LICENSE-2.0                             #
-#                                                                              #
-#   Unless required by applicable law or agreed to in writing, software        #
-#   distributed under the License is distributed on an "AS IS" BASIS,          #
-#   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.   #
-#   See the License for the specific language governing permissions and        #
-#   limitations under the License.                                             #
-################################################################################
-
-apiVersion: v1
-kind: Service
-metadata:
-  name: {{ include "common.servicename.rsm.http" . }}
-  namespace: {{ include "common.namespace.platform" . }}
-  labels:
-    app: {{ include "common.namespace.platform" . }}-{{ include "common.name.rsm" . }}
-    chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
-    release: {{ .Release.Name }}
-    heritage: {{ .Release.Service }}
-spec:
-  type: ClusterIP
-  ports:
-    - port: {{ include "common.serviceport.rsm.http" . }}
-      protocol: "TCP"
-      name: "http"
-      targetPort: "http" 
-  selector:
-    app: {{ include "common.namespace.platform" . }}-{{ include "common.name.rsm" . }}
-    release: {{ .Release.Name }}
diff --git a/ric-platform/50-RIC-Platform/helm/rsm/templates/service-rmr.yaml b/ric-platform/50-RIC-Platform/helm/rsm/templates/service-rmr.yaml
deleted file mode 100755 (executable)
index c328bc8..0000000
+++ /dev/null
@@ -1,40 +0,0 @@
-################################################################################
-#   Copyright (c) 2019 AT&T Intellectual Property.                             #
-#                                                                              #
-#   Licensed under the Apache License, Version 2.0 (the "License");            #
-#   you may not use this file except in compliance with the License.           #
-#   You may obtain a copy of the License at                                    #
-#                                                                              #
-#       http://www.apache.org/licenses/LICENSE-2.0                             #
-#                                                                              #
-#   Unless required by applicable law or agreed to in writing, software        #
-#   distributed under the License is distributed on an "AS IS" BASIS,          #
-#   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.   #
-#   See the License for the specific language governing permissions and        #
-#   limitations under the License.                                             #
-################################################################################
-
-apiVersion: v1
-kind: Service
-metadata:
-  name: {{ include "common.servicename.rsm.rmr" . }}
-  namespace: {{ include "common.namespace.platform" . }}
-  labels:
-    app: {{ include "common.namespace.platform" . }}-{{ include "common.name.rsm" . }}
-    chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
-    release: {{ .Release.Name }}
-    heritage: {{ .Release.Service }}
-spec:
-  type: ClusterIP
-  ports:
-    - port: {{ include "common.serviceport.rsm.rmr.route" . }}
-      protocol: "TCP"
-      name: "rmrroute"
-      targetPort: "rmrroute"
-    - port: {{ include "common.serviceport.rsm.rmr.data" . }}
-      protocol: "TCP"
-      name: "rmrdata"
-      targetPort: "rmrdata"
-  selector:
-    app: {{ include "common.namespace.platform" . }}-{{ include "common.name.rsm" . }}
-    release: {{ .Release.Name }}
diff --git a/ric-platform/50-RIC-Platform/helm/rsm/values.yaml b/ric-platform/50-RIC-Platform/helm/rsm/values.yaml
deleted file mode 100755 (executable)
index cdd19e0..0000000
+++ /dev/null
@@ -1,51 +0,0 @@
-################################################################################
-#   Copyright (c) 2019 AT&T Intellectual Property.                             #
-#                                                                              #
-#   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.                                             #
-################################################################################
-
-#################################################################
-# Application configuration defaults.
-#################################################################
-# application image
-
-repository: "nexus3.o-ran-sc.org:10004"
-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: ""
-
-
-rsm:
-  image:
-    name: ric-plt-rsm
-    tag: 2.0.6
-
-  privilegedmode: false
-
-  replicaCount: 1
-
-
-  # Service ports are now defined in
-  # ric-common/Common-Template/helm/ric-common/templates/_ports.tpl file.
-  # If need to change a service port, make the code change necessary, then
-  # update the _ports.tpl file with the new port number.
diff --git a/ric-platform/50-RIC-Platform/helm/rtmgr/.helmignore b/ric-platform/50-RIC-Platform/helm/rtmgr/.helmignore
deleted file mode 100644 (file)
index 50af031..0000000
+++ /dev/null
@@ -1,22 +0,0 @@
-# Patterns to ignore when building packages.
-# This supports shell glob matching, relative path matching, and
-# negation (prefixed with !). Only one pattern per line.
-.DS_Store
-# Common VCS dirs
-.git/
-.gitignore
-.bzr/
-.bzrignore
-.hg/
-.hgignore
-.svn/
-# Common backup files
-*.swp
-*.bak
-*.tmp
-*~
-# Various IDEs
-.project
-.idea/
-*.tmproj
-.vscode/
diff --git a/ric-platform/50-RIC-Platform/helm/rtmgr/Chart.yaml b/ric-platform/50-RIC-Platform/helm/rtmgr/Chart.yaml
deleted file mode 100644 (file)
index 49b8e01..0000000
+++ /dev/null
@@ -1,22 +0,0 @@
-################################################################################
-#   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.                                             #
-################################################################################
-
-apiVersion: v1
-appVersion: "1.0"
-description: Helm chart for RIC Routing Manager
-name: rtmgr
-version: 1.1.0
diff --git a/ric-platform/50-RIC-Platform/helm/rtmgr/requirements.yaml b/ric-platform/50-RIC-Platform/helm/rtmgr/requirements.yaml
deleted file mode 100644 (file)
index 2ab71b4..0000000
+++ /dev/null
@@ -1,20 +0,0 @@
-################################################################################
-#   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: ric-common
-    version: ~2.0.0
diff --git a/ric-platform/50-RIC-Platform/helm/rtmgr/templates/config.yaml b/ric-platform/50-RIC-Platform/helm/rtmgr/templates/config.yaml
deleted file mode 100644 (file)
index 750f66b..0000000
+++ /dev/null
@@ -1,115 +0,0 @@
-#
-#==================================================================================
-#   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.
-#==================================================================================
-#
-#
-#   Abstract:           Configuration values for the routing manager
-#   Date:               29 May 2019
-#
-apiVersion: v1
-kind: ConfigMap
-metadata:
-  name: {{ include "common.configmapname.rtmgr" . }}-rtmgrcfg
-data:
-  # FQDN and port info of the platform components for routing manager to form
-  # and distribute corresponding routes to them
-  rtmgrcfg: |
-       "PlatformComponents":
-         -    
-           "name": "E2TERM"
-           "fqdn": "{{ printf "%s.%s" (include "common.servicename.e2term.rmr" .) (include "common.namespace.platform" .) }}"
-           "port": {{ include "common.serviceport.e2term.rmr.data" . }}
-         -
-           "name": "SUBMAN"
-           "fqdn": "{{ printf "%s.%s" (include "common.servicename.submgr.rmr" .) (include "common.namespace.platform" .) }}"
-           "port": {{ include "common.serviceport.submgr.rmr.data" . }}
-         -
-           "name": "E2MAN"
-           "fqdn": "{{ printf "%s.%s" (include "common.servicename.e2mgr.rmr" .) (include "common.namespace.platform" .) }}"
-           "port": {{ include "common.serviceport.e2mgr.rmr.data" . }}
-         -
-           "name": "RSM"
-           "fqdn": "{{ printf "%s.%s" (include "common.servicename.rsm.rmr" .) (include "common.namespace.platform" .) }}"
-           "port": {{ include "common.serviceport.rsm.rmr.data" . }}
-         -
-           "name": "A1MEDIATOR"
-           "fqdn": "{{ printf "%s.%s" (include "common.servicename.a1mediator.rmr" .) (include "common.namespace.platform" .) }}"
-           "port": {{ include "common.serviceport.a1mediator.rmr.data" . }}
-       "XMURL":
-         "http://{{ include "common.servicename.appmgr.http" . }}:{{ include "common.serviceport.appmgr.http" . }}/ric/v1/xapps"
-       "RTFILE":
-         "/db/rt.json"
-       "CFGFILE":
-         "/cfg/rtmgr-config.yaml"
-       "RPE":
-         "{{ .Values.rtmgr.rpe }}"
-       "SBI":
-         "{{ .Values.rtmgr.sbi }}"
-       "SBIURL": 
-         "{{ .Values.rtmgr.sbiurl }}"
-       "NBI": 
-         "{{ .Values.rtmgr.nbi }}"
-       "NBIURL":
-         "http://{{ include "common.servicename.rtmgr.http" . }}:{{ include "common.serviceport.rtmgr.http" . }}"
-       "SDL":
-         "file"
-       "local":
-         "host": ":8080"
-       "logger":
-         "level": 4
-       "rmr":
-         "protPort": "tcp:4560"
-         "maxSize": 2072
-         "numWorkers": 1
-       "PlatformRoutes": [
-         { 'messagetype': 'RIC_SUB_REQ', 'senderendpoint': 'SUBMAN', 'subscriptionid': -1, 'endpoint': '', 'meid': '%meid'},
-         { 'messagetype': 'RIC_SUB_DEL_REQ', 'senderendpoint': 'SUBMAN', 'subscriptionid': -1,'endpoint': '', 'meid': '%meid'},
-         { 'messagetype': 'RIC_SUB_RESP', 'senderendpoint': '', 'subscriptionid': -1, 'endpoint': 'SUBMAN', 'meid': ''},
-         { 'messagetype': 'RIC_SUB_DEL_RESP', 'senderendpoint': '', 'subscriptionid': -1, 'endpoint': 'SUBMAN', 'meid': ''},
-         { 'messagetype': 'RIC_SUB_FAILURE', 'senderendpoint': '', 'subscriptionid': -1, 'endpoint': 'SUBMAN', 'meid': ''},
-         { 'messagetype': 'RIC_SUB_DEL_FAILURE', 'senderendpoint': '', 'subscriptionid': -1, 'endpoint': 'SUBMAN', 'meid': ''},
-         { 'messagetype': 'RIC_X2_SETUP_REQ', 'senderendpoint': 'E2MAN', 'subscriptionid': -1, 'endpoint': '', 'meid': '%meid'},
-         { 'messagetype': 'RIC_X2_RESET', 'senderendpoint': 'E2MAN', 'subscriptionid': -1, 'endpoint': '', 'meid': '%meid'},
-         { 'messagetype': 'RIC_X2_RESET_RESP', 'senderendpoint': 'E2MAN', 'subscriptionid': -1, 'endpoint': '', 'meid': '%meid'},
-         { 'messagetype': 'RIC_ENDC_X2_SETUP_REQ', 'senderendpoint': 'E2MAN', 'subscriptionid': -1, 'endpoint': '', 'meid': '%meid'},
-         { 'messagetype': 'RIC_ENB_CONF_UPDATE_ACK', 'senderendpoint': 'E2MAN', 'subscriptionid': -1, 'endpoint': '', 'meid': '%meid'},
-         { 'messagetype': 'RIC_ENB_CONF_UPDATE_FAILURE', 'senderendpoint': 'E2MAN', 'subscriptionid': -1, 'endpoint': '', 'meid': '%meid'},
-         { 'messagetype': 'RIC_ENDC_CONF_UPDATE_ACK', 'senderendpoint': 'E2MAN', 'subscriptionid': -1, 'endpoint': '', 'meid': '%meid'},
-         { 'messagetype': 'RIC_ENDC_CONF_UPDATE_FAILURE', 'senderendpoint': 'E2MAN', 'subscriptionid': -1, 'endpoint': '', 'meid': '%meid'},
-         { 'messagetype': 'E2_TERM_INIT', 'senderendpoint': '', 'subscriptionid': -1, 'endpoint': 'E2MAN', 'meid': ''},
-         { 'messagetype': 'RIC_X2_SETUP_RESP', 'senderendpoint': '', 'subscriptionid': -1, 'endpoint': 'E2MAN', 'meid': ''},
-         { 'messagetype': 'RIC_X2_SETUP_FAILURE', 'senderendpoint': '', 'subscriptionid': -1, 'endpoint': 'E2MAN', 'meid': ''},
-         { 'messagetype': 'RIC_X2_RESET', 'senderendpoint': '', 'subscriptionid': -1, 'endpoint': 'E2MAN', 'meid': ''},
-         { 'messagetype': 'RIC_X2_RESET_RESP', 'senderendpoint': '', 'subscriptionid': -1, 'endpoint': 'E2MAN', 'meid': ''},
-         { 'messagetype': 'RIC_ENDC_X2_SETUP_RESP', 'senderendpoint': '', 'subscriptionid': -1, 'endpoint': 'E2MAN', 'meid': ''},
-         { 'messagetype': 'RIC_ENDC_X2_SETUP_FAILURE', 'senderendpoint': '', 'subscriptionid': -1, 'endpoint': 'E2MAN', 'meid': ''},
-         { 'messagetype': 'RIC_ENDC_CONF_UPDATE', 'senderendpoint': '', 'subscriptionid': -1, 'endpoint': 'E2MAN', 'meid': ''},
-         { 'messagetype': 'RIC_SCTP_CONNECTION_FAILURE', 'senderendpoint': '', 'subscriptionid': -1, 'endpoint': 'E2MAN', 'meid': ''},
-         { 'messagetype': 'RIC_ERROR_INDICATION', 'senderendpoint': '', 'subscriptionid': -1, 'endpoint': 'E2MAN', 'meid': ''},
-         { 'messagetype': 'RIC_ENB_CONF_UPDATE', 'senderendpoint': '', 'subscriptionid': -1, 'endpoint': 'E2MAN', 'meid': ''},
-         { 'messagetype': 'RIC_ENB_LOAD_INFORMATION', 'senderendpoint': '', 'subscriptionid': -1, 'endpoint': 'E2MAN', 'meid': ''},
-         { 'messagetype': 'E2_TERM_KEEP_ALIVE_RESP', 'senderendpoint': '', 'subscriptionid': -1, 'endpoint': 'E2MAN', 'meid': ''},
-         { 'messagetype': 'RAN_CONNECTED', 'senderendpoint': 'E2MAN', 'subscriptionid': -1, 'endpoint': 'RSM', 'meid': ''},
-         { 'messagetype': 'RAN_RESTARTED', 'senderendpoint': 'E2MAN', 'subscriptionid': -1, 'endpoint': 'RSM', 'meid': ''},
-         { 'messagetype': 'RAN_RECONFIGURED', 'senderendpoint': 'E2MAN', 'subscriptionid': -1, 'endpoint': 'RSM', 'meid': ''},
-         { 'messagetype': 'RIC_RES_STATUS_REQ', 'senderendpoint': 'RSM', 'subscriptionid': -1, 'endpoint': '', 'meid': '%meid'},
-         { 'messagetype': 'RIC_RES_STATUS_RESP', 'senderendpoint': '', 'subscriptionid': -1, 'endpoint': 'RSM', 'meid': ''},
-         { 'messagetype': 'RIC_RES_STATUS_FAILURE', 'senderendpoint': '', 'subscriptionid': -1, 'endpoint': 'RSM', 'meid': ''},
-         { 'messagetype': 'A1_POLICY_QUERY', 'senderendpoint': '', 'subscriptionid': -1, 'endpoint': 'A1MEDIATOR', 'meid': ''},
-         { 'messagetype': 'A1_POLICY_RESP', 'senderendpoint': '', 'subscriptionid': -1, 'endpoint': 'A1MEDIATOR', 'meid': ''},
-          ]
diff --git a/ric-platform/50-RIC-Platform/helm/rtmgr/templates/deployment.yaml b/ric-platform/50-RIC-Platform/helm/rtmgr/templates/deployment.yaml
deleted file mode 100644 (file)
index b5db46c..0000000
+++ /dev/null
@@ -1,75 +0,0 @@
-################################################################################
-#   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.                                             #
-################################################################################
-
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: {{ include "common.deploymentname.rtmgr" . }}
-  namespace: {{ include "common.namespace.platform" . }}
-  labels:
-    app: {{ include "common.namespace.platform" . }}-{{ include "common.name.rtmgr" . }}
-    chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
-    release: {{ .Release.Name }}
-    heritage: {{ .Release.Service }}
-spec:
-  replicas: {{ .Values.rtmgr.replicaCount }}
-  selector:
-    matchLabels:
-      app: {{ include "common.namespace.platform" . }}-{{ include "common.name.rtmgr" . }}
-      release: {{ .Release.Name }}
-  template:
-    metadata:
-      {{- if .Values.rtmgr.annotations }}
-      annotations:
-        {{- .Values.rtmgr.annotations | nindent 8 -}}
-      {{ end }}
-      labels:
-        app: {{ include "common.namespace.platform" . }}-{{ include "common.name.rtmgr" . }}
-        release: {{ .Release.Name }}
-    spec:
-      hostname: {{ include "common.name.rtmgr" . }}
-      imagePullSecrets:
-        - name: {{ include "common.repositoryCred" . }}
-      containers:
-        - name: {{ include "common.containername.rtmgr" . }}
-          image: {{ include "common.repository" . }}/{{ .Values.rtmgr.image.name }}:{{ .Values.rtmgr.image.tag }}
-          imagePullPolicy: {{ include "common.pullPolicy" . }}
-          command: ["/run_rtmgr.sh"]
-          #command: ["/bin/sh"]
-          #args: ["-c", "while true; do echo hello; sleep 10;done"]
-          envFrom:
-            - configMapRef:
-                name: {{ include "common.configmapname.rtmgr" . }}-env
-          volumeMounts:
-            - mountPath: /cfg
-              name: rtmgrcfg
-              readOnly: true
-          ports:
-            - name: "http"
-              containerPort: {{ include "common.serviceport.rtmgr.http" . }}
-            - name: "rmrroute"
-              containerPort: {{ include "common.serviceport.rtmgr.rmr.route" . }}
-            - name: "rmrdata"
-              containerPort: {{ include "common.serviceport.rtmgr.rmr.data" . }}
-      volumes:
-        - name: "rtmgrcfg"
-          configMap:
-            name: {{ include "common.configmapname.rtmgr" . }}-rtmgrcfg
-            items:
-              - key: rtmgrcfg
-                path: rtmgr-config.yaml
-                mode: 0644
diff --git a/ric-platform/50-RIC-Platform/helm/rtmgr/templates/env.yaml b/ric-platform/50-RIC-Platform/helm/rtmgr/templates/env.yaml
deleted file mode 100644 (file)
index 564529b..0000000
+++ /dev/null
@@ -1,30 +0,0 @@
-###############################################################################
-#   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.                                             #
-################################################################################
-apiVersion: v1
-kind: ConfigMap
-metadata:
-  name: {{ include "common.configmapname.rtmgr" . }}-env
-data:
-   DBAAS_SERVICE_HOST: {{ include "common.servicename.dbaas.tcp" . | quote }}
-   DBAAS_SERVICE_PORT: {{ include "common.serviceport.dbaas.tcp" . | quote }}
-   DBAAS_PORT_6379_TCP_ADDR: {{ include "common.servicename.dbaas.tcp" . | quote }}
-   DBAAS_PORT_6379_TCP_PORT: {{ include "common.serviceport.dbaas.tcp" . | quote }} 
-   RMR_RTG_SVC: {{ include "common.serviceport.rtmgr.rmr.route" . | quote }}
-   CFGFILE: "/cfg/rtmgr-config.yaml"
-   #RMR_SEED_RT: "/uta_rtg_ric.rt"
-   #RMR_SRC_ID: "service-ricplt-rtmgr-rmr.ricplt"
-   XMURL: "http://{{ include "common.servicename.appmgr.http" . }}:{{ include "common.serviceport.appmgr.http" . }}/ric/v1/xapps"
diff --git a/ric-platform/50-RIC-Platform/helm/rtmgr/templates/service-http.yaml b/ric-platform/50-RIC-Platform/helm/rtmgr/templates/service-http.yaml
deleted file mode 100644 (file)
index 7132a15..0000000
+++ /dev/null
@@ -1,38 +0,0 @@
-################################################################################
-#   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.                                             #
-################################################################################
-
-apiVersion: v1
-kind: Service
-metadata:
-  name: {{ include "common.servicename.rtmgr.http" . }}
-  namespace: {{ include "common.namespace.platform" . }}
-  labels:
-    app: {{ include "common.namespace.platform" . }}-{{ include "common.name.rtmgr" . }}
-    chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
-    release: {{ .Release.Name }}
-    heritage: {{ .Release.Service }} 
-spec:
-  type: ClusterIP
-  ports:
-    - port: {{ include "common.serviceport.rtmgr.http" . }}
-      protocol: "TCP"
-      name: "http"
-      targetPort: "http"
-  selector:
-    app: {{ include "common.namespace.platform" . }}-{{ include "common.name.rtmgr" . }}
-    release: {{ .Release.Name }}
-
diff --git a/ric-platform/50-RIC-Platform/helm/rtmgr/templates/service-rmr.yaml b/ric-platform/50-RIC-Platform/helm/rtmgr/templates/service-rmr.yaml
deleted file mode 100644 (file)
index ac2f31e..0000000
+++ /dev/null
@@ -1,41 +0,0 @@
-################################################################################
-#   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.                                             #
-################################################################################
-
-apiVersion: v1
-kind: Service
-metadata:
-  name: {{ include "common.servicename.rtmgr.rmr" . }}
-  namespace: {{ include "common.namespace.platform" . }}
-  labels:
-    app: {{ include "common.namespace.platform" . }}-{{ include "common.name.rtmgr" . }}
-    chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
-    release: {{ .Release.Name }}
-    heritage: {{ .Release.Service }} 
-spec:
-  type: ClusterIP
-  ports:
-    - port: {{ include "common.serviceport.rtmgr.rmr.route" . }}
-      protocol: TCP
-      targetPort: "rmrroute"
-      name: "rmrroute"
-    - port: {{ include "common.serviceport.rtmgr.rmr.data" . }}
-      protocol: TCP
-      targetPort: "rmrdata"
-      name: "rmrdata"
-  selector:
-    app: {{ include "common.namespace.platform" . }}-{{ include "common.name.rtmgr" . }}
-    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
deleted file mode 100644 (file)
index d32f718..0000000
+++ /dev/null
@@ -1,51 +0,0 @@
-################################################################################
-#   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.                                             #
-################################################################################
-
-# Default values for rtmgr.
-# This is a YAML-formatted file.
-# Declare variables to be passed into your templates.
-
-repository: "nexus3.o-ran-sc.org:10004"
-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: ""
-
-rtmgr:
-  image:
-    name: rtmgr
-    tag: 0.0.2
-  
-  rpe: rmrpush
-  sbi: nngpush
-  sbiurl: 0.0.0.0
-  nbi: httpRESTful
-  nbiurl: http://0.0.0.0:8888
-
-  # Service ports are now defined in 
-  # ric-common/Common-Template/helm/ric-common/templates/_ports.tpl file.
-  # If need to change a service port, make the code change necessary, then
-  # update the _ports.tpl file with the new port number.
diff --git a/ric-platform/50-RIC-Platform/helm/submgr/Chart.yaml b/ric-platform/50-RIC-Platform/helm/submgr/Chart.yaml
deleted file mode 100644 (file)
index d51c729..0000000
+++ /dev/null
@@ -1,22 +0,0 @@
-################################################################################
-#   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.                                             #
-################################################################################
-
-appVersion: "1.0"
-apiVersion: v1
-description: Oran Subscription Manager Helm charts
-name: submgr
-version: 1.1.0
diff --git a/ric-platform/50-RIC-Platform/helm/submgr/requirements.yaml b/ric-platform/50-RIC-Platform/helm/submgr/requirements.yaml
deleted file mode 100644 (file)
index 2ab71b4..0000000
+++ /dev/null
@@ -1,20 +0,0 @@
-################################################################################
-#   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: ric-common
-    version: ~2.0.0
diff --git a/ric-platform/50-RIC-Platform/helm/submgr/templates/configmap.yaml b/ric-platform/50-RIC-Platform/helm/submgr/templates/configmap.yaml
deleted file mode 100644 (file)
index a8ee386..0000000
+++ /dev/null
@@ -1,35 +0,0 @@
-#==================================================================================
-#   Copyright (c) 2019 AT&T Intellectual Property.
-#
-#   Licensed under the Apache License, Version 2.0 (the "License");
-#   you may not use this file except in compliance with the License.
-#   You may obtain a copy of the License at
-#
-#       http://www.apache.org/licenses/LICENSE-2.0
-#
-#   Unless required by applicable law or agreed to in writing, software
-#   distributed under the License is distributed on an "AS IS" BASIS,
-#   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#   See the License for the specific language governing permissions and
-#   limitations under the License.
-#==================================================================================
-apiVersion: v1
-kind: ConfigMap
-metadata:
-  name: submgrcfg
-  namespace: ricplt
-data:
-  # FQDN and port info of rtmgr
-  submgrcfg: |
-    "local":
-      "host": ":8080"
-    "logger":
-      "level": 3
-    "rmr":
-      "protPort" : "tcp:4560"
-      "maxSize": 2072
-      "numWorkers": 1
-    "rtmgr":
-      "hostAddr": {{ include "common.servicename.rtmgr.http" . | quote }}
-      "port"    : {{ include "common.serviceport.rtmgr.http" . }}
-      "baseUrl" : "/ric/v1"
diff --git a/ric-platform/50-RIC-Platform/helm/submgr/templates/deployment.yaml b/ric-platform/50-RIC-Platform/helm/submgr/templates/deployment.yaml
deleted file mode 100644 (file)
index ff75994..0000000
+++ /dev/null
@@ -1,81 +0,0 @@
-#
-#==================================================================================
-#   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.
-#==================================================================================
-#
-#
-#   Abstract: Subscription Manager Kubernetes manifest
-#   Date:              28 May 2019
-#
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: {{ include "common.deploymentname.submgr" . }}
-  namespace: {{ include "common.namespace.platform" . }}
-  labels:
-    app: {{ include "common.namespace.platform" . }}-{{ include "common.name.submgr" . }}
-    chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
-    release: {{ .Release.Name }}
-    heritage: {{ .Release.Service }}
-spec:
-  replicas: {{ .Values.submgr.replicaCount }}
-  selector:
-    matchLabels:
-      app: {{ include "common.namespace.platform" . }}-{{ include "common.name.submgr" . }}
-      release: {{ .Release.Name }}
-  template:
-    metadata:
-      {{- if .Values.submgr.annotations }}
-      annotations:
-        {{- .Values.submgr.annotations | nindent 8 -}}
-      {{ end }}
-      labels:
-        app: {{ include "common.namespace.platform" . }}-{{ include "common.name.submgr" . }}
-        release: {{ .Release.Name }}
-    spec:
-      hostname: {{ include "common.name.submgr" . }}
-      imagePullSecrets:
-        - name: {{ include "common.repositoryCred" . }}
-      containers:
-        - name: {{ include "common.containername.submgr" . }}
-          image: {{ include "common.repository" . }}/{{ .Values.submgr.image.name }}:{{ .Values.submgr.image.tag }}
-          imagePullPolicy: {{ include "common.pullPolicy" . }}
-          command: ["/run_submgr.sh"]
-          envFrom:
-            - configMapRef:
-                name: {{ include "common.configmapname.submgr" . }}-env
-          ports:
-            - name: http
-              containerPort: {{ include "common.serviceport.submgr.http" . }}
-              protocol: TCP
-            - name: rmrroute
-              containerPort: {{ include "common.serviceport.submgr.rmr.route" . }}
-              protocol: TCP
-            - name: rmrdata
-              containerPort: {{ include "common.serviceport.submgr.rmr.data" . }}
-              protocol: TCP
-          volumeMounts:
-            - name: config-volume
-              mountPath: /cfg
-      volumes:
-        - name: config-volume
-          configMap:
-            name: submgrcfg
-            items:
-              - key: submgrcfg
-                path: submgr-config.yaml
-                mode: 0644
-
diff --git a/ric-platform/50-RIC-Platform/helm/submgr/templates/env.yaml b/ric-platform/50-RIC-Platform/helm/submgr/templates/env.yaml
deleted file mode 100644 (file)
index 9e65676..0000000
+++ /dev/null
@@ -1,29 +0,0 @@
-################################################################################
-#   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.                                             #
-################################################################################
-apiVersion: v1
-kind: ConfigMap
-metadata:
-  name: {{ include "common.configmapname.submgr" . }}-env
-data:
-  DBAAS_SERVICE_HOST: {{ include "common.servicename.dbaas.tcp" . | quote }}
-  DBAAS_SERVICE_PORT: {{ include "common.serviceport.dbaas.tcp" . | quote }}
-  DBAAS_PORT_6379_TCP_ADDR: {{ include "common.servicename.dbaas.tcp" . | quote }}
-  DBAAS_PORT_6379_TCP_PORT: {{ include "common.serviceport.dbaas.tcp" . | quote }} 
-  RMR_RTG_SVC: {{ include "common.serviceport.submgr.rmr.route" . | quote }}
-  RMR_SRC_ID: {{ include "common.servicename.submgr.rmr" . }}.{{ include "common.namespace.platform" . }}
-  CFGFILE: "/cfg/submgr-config.yaml"
-  SUBMGR_SEED_SN: "1"
diff --git a/ric-platform/50-RIC-Platform/helm/submgr/templates/service-http.yaml b/ric-platform/50-RIC-Platform/helm/submgr/templates/service-http.yaml
deleted file mode 100644 (file)
index ed2d790..0000000
+++ /dev/null
@@ -1,42 +0,0 @@
-#
-#==================================================================================
-#   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.
-#==================================================================================
-#
-#
-#   Abstract: Subscription Manager service manifest 
-#   Date:              28 May 2019
-#
-kind: Service
-apiVersion: v1
-metadata:
-  name: {{ include "common.servicename.submgr.http" . }}
-  namespace: {{ include "common.namespace.platform" . }}
-  labels:
-    app: {{ include "common.namespace.platform" . }}-{{ include "common.name.submgr" . }}
-    chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
-    release: {{ .Release.Name }}
-    heritage: {{ .Release.Service }}
-spec:
-  selector:
-    app: {{ include "common.namespace.platform" . }}-{{ include "common.name.submgr" . }}
-    release: {{ .Release.Name }}
-  clusterIP: None
-  ports:
-  - name: http
-    port: {{ include "common.serviceport.submgr.http" . }}
-    protocol: TCP
-    targetPort: http
\ No newline at end of file
diff --git a/ric-platform/50-RIC-Platform/helm/submgr/templates/service-rmr.yaml b/ric-platform/50-RIC-Platform/helm/submgr/templates/service-rmr.yaml
deleted file mode 100644 (file)
index 3e8107e..0000000
+++ /dev/null
@@ -1,47 +0,0 @@
-#
-#==================================================================================
-#   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.
-#==================================================================================
-#
-#
-#   Abstract: Subscription Manager service manifest 
-#   Date:              28 May 2019
-#
-kind: Service
-apiVersion: v1
-metadata:
-  name: {{ include "common.servicename.submgr.rmr" . }}
-  namespace: {{ include "common.namespace.platform" . }}
-  labels:
-    app: {{ include "common.namespace.platform" . }}-{{ include "common.name.submgr" . }}
-    chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
-    release: {{ .Release.Name }}
-    heritage: {{ .Release.Service }}
-spec:
-  selector:
-    app: {{ include "common.namespace.platform" . }}-{{ include "common.name.submgr" . }}
-    release: {{ .Release.Name }}       
-  clusterIP: None
-  ports:
-  - name: rmrdata
-    port: {{ include "common.serviceport.submgr.rmr.data" . }}
-    protocol: TCP
-    targetPort: rmrdata
-  - name: rmrroute
-    port: {{ include "common.serviceport.submgr.rmr.route" . }}
-    protocol: TCP
-    targetPort: rmrroute
-
diff --git a/ric-platform/50-RIC-Platform/helm/submgr/values.yaml b/ric-platform/50-RIC-Platform/helm/submgr/values.yaml
deleted file mode 100644 (file)
index b0f6d99..0000000
+++ /dev/null
@@ -1,33 +0,0 @@
-################################################################################
-#   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.                                             #
-################################################################################
-
-#################################################################
-# Application configuration defaults.
-#################################################################
-# application image
-
-repository: "nexus3.o-ran-sc.org:10004"
-imagePullPolicy: IfNotPresent
-repositoryCred: docker-reg-cred
-
-submgr:
-
-  image:
-    name: ric-plt-submgr
-    tag: 0.10.5
-
-  replicaCount: 1
diff --git a/ric-platform/50-RIC-Platform/helm/vespamgr/.helmignore b/ric-platform/50-RIC-Platform/helm/vespamgr/.helmignore
deleted file mode 100644 (file)
index d29b399..0000000
+++ /dev/null
@@ -1,37 +0,0 @@
-#   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.
-
-# Patterns to ignore when building packages.
-# This supports shell glob matching, relative path matching, and
-# negation (prefixed with !). Only one pattern per line.
-.DS_Store
-# Common VCS dirs
-.git/
-.gitignore
-.bzr/
-.bzrignore
-.hg/
-.hgignore
-.svn/
-# Common backup files
-*.swp
-*.bak
-*.tmp
-*~
-# Various IDEs
-.project
-.idea/
-*.tmproj
-.vscode/
diff --git a/ric-platform/50-RIC-Platform/helm/vespamgr/Chart.yaml b/ric-platform/50-RIC-Platform/helm/vespamgr/Chart.yaml
deleted file mode 100644 (file)
index 8b224af..0000000
+++ /dev/null
@@ -1,20 +0,0 @@
-#   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.
-
-apiVersion: v1
-appVersion: "1.0"
-description: A Helm chart for Kubernetes
-name: vespamgr
-version: 0.0.1
diff --git a/ric-platform/50-RIC-Platform/helm/vespamgr/README b/ric-platform/50-RIC-Platform/helm/vespamgr/README
deleted file mode 100644 (file)
index 9e7d7fe..0000000
+++ /dev/null
@@ -1 +0,0 @@
-The files under this directory and the subdirectories can be used as an example.
diff --git a/ric-platform/50-RIC-Platform/helm/vespamgr/requirements.yaml b/ric-platform/50-RIC-Platform/helm/vespamgr/requirements.yaml
deleted file mode 100644 (file)
index 2ab71b4..0000000
+++ /dev/null
@@ -1,20 +0,0 @@
-################################################################################
-#   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: ric-common
-    version: ~2.0.0
diff --git a/ric-platform/50-RIC-Platform/helm/vespamgr/templates/deployment.yaml b/ric-platform/50-RIC-Platform/helm/vespamgr/templates/deployment.yaml
deleted file mode 100644 (file)
index 289045c..0000000
+++ /dev/null
@@ -1,71 +0,0 @@
-#   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.
-
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: {{ include "common.deploymentname.vespamgr" . }}
-  namespace: {{ include "common.namespace.platform" . }}
-  labels:
-    app: {{ include "common.namespace.platform" . }}-{{ include "common.name.vespamgr" . }}
-    chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
-    release: {{ .Release.Name }}
-    heritage: {{ .Release.Service }}
-spec:
-  replicas: {{ .Values.vespamgr.replicaCount }}
-  selector:
-    matchLabels:
-      app: {{ include "common.namespace.platform" . }}-{{ include "common.name.vespamgr" . }}
-      release: {{ .Release.Name }}
-  template:
-    metadata:
-      {{- if .Values.vespamgr.annotations }}
-      annotations:
-        {{- .Values.vespamgr.annotations | nindent 8 -}}
-      {{ end }}
-      labels:
-        app: {{ include "common.namespace.platform" . }}-{{ include "common.name.vespamgr" . }}
-        release: {{ .Release.Name }}
-    spec:
-      hostname: {{ include "common.name.vespamgr" . }}
-      imagePullSecrets:
-        - name: {{ include "common.repositoryCred" . }}
-      {{- with .Values.vespamgr.nodeselector }}
-      nodeSelector: {{ toYaml . | trim | nindent 8 -}}
-      {{- end }}
-      containers:
-        - name: {{ include "common.containername.vespamgr" . }}
-          image: {{ include "common.repository" . }}/{{ .Values.vespamgr.image.name }}:{{ .Values.vespamgr.image.tag }}
-          imagePullPolicy: {{ include "common.pullPolicy" . }}
-          ports:
-            - name: http
-              containerPort: {{ include "common.serviceport.vespamgr.http" . }}
-              protocol: TCP
-          envFrom:
-            - configMapRef:
-                name: {{ include "common.configmapname.vespamgr" . }}
-            - secretRef:
-                name: vespa-secrets
-          env:
-            - name: VESMGR_APPMGRDOMAIN
-              value: appmgr-service
-          livenessProbe:
-            httpGet:
-              path: /supervision
-              port: 8080
-            initialDelaySeconds: 30
-            periodSeconds: 60
-            timeoutSeconds: 20
-
diff --git a/ric-platform/50-RIC-Platform/helm/vespamgr/templates/secret.yaml b/ric-platform/50-RIC-Platform/helm/vespamgr/templates/secret.yaml
deleted file mode 100644 (file)
index 3473c4b..0000000
+++ /dev/null
@@ -1,8 +0,0 @@
-apiVersion: v1
-kind: Secret
-metadata:
-  name: vespa-secrets
-type: Opaque
-data:
-  VESMGR_PRICOLLECTOR_USER: "c2FtcGxlMQo="
-  VESMGR_PRICOLLECTOR_PASSWORD: "c2FtcGxlMQo="
diff --git a/ric-platform/50-RIC-Platform/helm/vespamgr/templates/service.yaml b/ric-platform/50-RIC-Platform/helm/vespamgr/templates/service.yaml
deleted file mode 100644 (file)
index cb26519..0000000
+++ /dev/null
@@ -1,35 +0,0 @@
-#   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.
-
-apiVersion: v1
-kind: Service
-metadata:
-  name: {{ include "common.servicename.vespamgr.http" . }}
-  namespace: {{ include "common.namespace.platform" . }}
-  labels:
-    app: {{ include "common.namespace.platform" . }}-{{ include "common.name.vespamgr" . }}
-    chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
-    release: {{ .Release.Name }}
-    heritage: {{ .Release.Service }}
-spec:
-  type: ClusterIP
-  ports:
-    - port: {{ include "common.serviceport.vespamgr.http" . }}
-      protocol: "TCP"
-      name: "http"
-      targetPort: "http"
-  selector:
-    app: {{ include "common.namespace.platform" . }}-{{ include "common.name.vespamgr" . }}
-    release: {{ .Release.Name }}
diff --git a/ric-platform/50-RIC-Platform/helm/vespamgr/templates/vespa-config.yaml b/ric-platform/50-RIC-Platform/helm/vespamgr/templates/vespa-config.yaml
deleted file mode 100644 (file)
index 6149f15..0000000
+++ /dev/null
@@ -1,13 +0,0 @@
-apiVersion: v1
-kind: ConfigMap
-metadata:
-  name: {{ include "common.configmapname.vespamgr" . }}
-  namespace: {{ include "common.namespace.platform" . }}
-data:
-  VESMGR_HB_INTERVAL: "60s"
-  VESMGR_MEAS_INTERVAL: "30s"
-  VESMGR_PRICOLLECTOR_ADDR: {{ include "common.ingressurl.aux" . | quote }}
-  VESMGR_PRICOLLECTOR_SERVERROOT: {{ include "common.kongpath.aux.vescollector" . | quote }}
-  VESMGR_PRICOLLECTOR_PORT: {{ include "common.ingresshttpsport" . | quote }}
-  VESMGR_PRICOLLECTOR_SECURE: "false"
-  VESMGR_PROMETHEUS_ADDR: {{ .Values.vespamgr.prometheusurl }}
diff --git a/ric-platform/50-RIC-Platform/helm/vespamgr/values.yaml b/ric-platform/50-RIC-Platform/helm/vespamgr/values.yaml
deleted file mode 100644 (file)
index ffe1c1c..0000000
+++ /dev/null
@@ -1,39 +0,0 @@
-################################################################################
-#   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.                                             #
-################################################################################
-
-#################################################################
-# Application configuration defaults.
-#################################################################
-# application image
-
-repository: "nexus3.o-ran-sc.org:10004"
-imagePullPolicy: IfNotPresent
-repositoryCred: docker-reg-cred
-
-vespamgr:
-  replicaCount: 1
-
-  image:
-    name: ric-plt-vespamgr
-    tag: 0.0.3
-
-  # Service ports are now defined in
-  # ric-common/Common-Template/helm/ric-common/templates/_ports.tpl file.
-  # If need to change a service port, make the code change necessary, then
-  # update the _ports.tpl file with the new port number.
-  
-  prometheusurl: "http://rec-prometheus-server.default"
diff --git a/ric-platform/55-Ext-Services/bin/install b/ric-platform/55-Ext-Services/bin/install
deleted file mode 100755 (executable)
index aa97b28..0000000
+++ /dev/null
@@ -1,65 +0,0 @@
-#!/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.                                             #
-################################################################################
-while [ -n "$1" ]; do # while loop starts
-
-    case "$1" in
-
-    -f) OVERRIDEYAML=$2
-        shift
-        ;;
-    -c) LIST_OF_COMPONENTS=$2
-        shift
-        ;;
-    *) echo "Option $1 not recognized" ;; # In case you typed a different option other than a,b,c
-
-    esac
-
-    shift
-
-done
-
-
-if [ -z "$OVERRIDEYAML" ];then
-    echo "****************************************************************************************************************"
-    echo "                                                     ERROR                                                      "
-    echo "****************************************************************************************************************"
-    echo "RIC deployment without deployment recipe is currently disabled. Please specify an recipe with the -f option."
-    echo "****************************************************************************************************************"
-    exit 1
-fi
-
-DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null && pwd )"
-GLOBAL_BLOCK=$(cat $OVERRIDEYAML | awk '/^global:/{getline; while ($0 ~ /^ +.*|^ *$/) {print $0; if (getline == 0) {break}}}')
-NAMESPACE_BLOCK=$(cat $OVERRIDEYAML | awk '/^  namespace:/{getline; while ($0 ~ /^    .*|^ *$/) {print $0; if (getline == 0) {break}}}')
-NAMESPACE=$(echo "$NAMESPACE_BLOCK" | awk '/^ *platform:/{print $2}')
-RELEASE_PREFIX=$(echo "$GLOBAL_BLOCK" | awk '/^ *releasePrefix:/{print $2}')
-COMPONENTS=${LIST_OF_COMPONENTS:-"extsvcplt"}
-
-echo "Deploying RIC infra components [$COMPONENTS]"
-
-
-COMMON_CHART_VERSION=$(cat $DIR/../../../ric-common/Common-Template/helm/ric-common/Chart.yaml | grep version | awk '{print $2}')
-helm package -d /tmp $DIR/../../../ric-common/Common-Template/helm/ric-common
-
-
-for component in $COMPONENTS; do
-
-  mkdir -p $DIR/../helm/$component/charts/
-  cp /tmp/ric-common-$COMMON_CHART_VERSION.tgz $DIR/../helm/$component/charts/
-  helm install -f $OVERRIDEYAML --namespace "${NAMESPACE}" --name "${RELEASE_PREFIX}-$component" $DIR/../helm/$component
-done
diff --git a/ric-platform/55-Ext-Services/bin/uninstall b/ric-platform/55-Ext-Services/bin/uninstall
deleted file mode 100755 (executable)
index 67db3a9..0000000
+++ /dev/null
@@ -1,34 +0,0 @@
-#!/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.                                             #
-################################################################################
-
-
-
-COMPONENTS="extsvcplt"
-
-echo "Undeploying RIC platform components [$COMPONENTS]"
-
-
-
-for component in $COMPONENTS; do
-    RELEASE_LIST=$(helm list | grep "$component" | awk '{print $1}')
-    if [ ! -z "$RELEASE_LIST" ];then
-        helm delete --purge $RELEASE_LIST
-    fi
-
-done
-
diff --git a/ric-platform/55-Ext-Services/etc/ext.conf b/ric-platform/55-Ext-Services/etc/ext.conf
deleted file mode 100644 (file)
index 92008b5..0000000
+++ /dev/null
@@ -1,37 +0,0 @@
-################################################################################
-#   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.                                             #
-################################################################################
-
-
-# helm_release_name defines the release name helm will use to deploy RIC
-# It will be overrided by RICPLT_RELEASE_NAME
-helm_release_name=r1
-
-# namespace defines the namespace that helm will use to deploy RIC
-# It will be overrided by RICPLT_NAMESPACE
-plt_namespace=ricplt
-
-# namespace defines the namespace that helm will use to deploy RIC
-# It will be overrided by RICXAPP_NAMESPACE
-xapp_namespace=ricxapp
-
-# namespace defines the namespace that helm will use to deploy RIC
-# It will be overrided by RICAUX_NAMESPACE
-aux_namespace=ricaux
-
-# namespace defines the namespace that helm will use to deploy RIC
-# It will be overrided by RICINFRA_NAMESPACE
-infra_namespace=ricinfra
diff --git a/ric-platform/55-Ext-Services/helm/extsvcplt/Chart.yaml b/ric-platform/55-Ext-Services/helm/extsvcplt/Chart.yaml
deleted file mode 100644 (file)
index 9cd80bf..0000000
+++ /dev/null
@@ -1,23 +0,0 @@
-################################################################################
-#   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.                                             #
-################################################################################
-
-apiVersion: v1
-appVersion: "1.0"
-description: A Helm chart for setting up services with endpoints referencing external services so that these external services can be accessed as if they are in the same namespace.
-name: extsvcplt
-version: 0.2.0
-
diff --git a/ric-platform/55-Ext-Services/helm/extsvcplt/requirements.yaml b/ric-platform/55-Ext-Services/helm/extsvcplt/requirements.yaml
deleted file mode 100644 (file)
index 2ab71b4..0000000
+++ /dev/null
@@ -1,20 +0,0 @@
-################################################################################
-#   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: ric-common
-    version: ~2.0.0
diff --git a/ric-platform/55-Ext-Services/helm/extsvcplt/templates/services-aux.yaml b/ric-platform/55-Ext-Services/helm/extsvcplt/templates/services-aux.yaml
deleted file mode 100644 (file)
index 5987322..0000000
+++ /dev/null
@@ -1,50 +0,0 @@
-################################################################################
-#   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.                                             #
-################################################################################
-{{ $platformNameSpace := include "common.namespace.platform" . }}
-{{ $xAppNameSpace := include "common.namespace.xapp" . }}
-{{ $nameSpaceList := list $platformNameSpace $xAppNameSpace }}
-{{- range $nameSpaceList }}
----
-kind: "Service"
-apiVersion: "v1"
-metadata:
-  name: {{ include "common.ingressurl.aux" $ }}
-  namespace: {{ . }}
-spec:
-  ports:
-    - name: {{ include "common.ingressurl.aux" $ }}-http-ingress-port
-      protocol: "TCP"
-      port: 80
-    - name: {{ include "common.ingressurl.aux" $ }}-https-ingress-port
-      protocol: "TCP"
-      port: 443
----
-kind: "Endpoints"
-apiVersion: "v1"
-metadata:
-  # match with the selector-less service
-  name: {{ include "common.ingressurl.aux" $ }}
-  namespace: {{ . }}
-subsets: 
-  - addresses:
-      - ip: "{{ $.Values.extsvcplt.auxip }}"
-    ports:
-      - port: {{ include "common.ingresshttpport" $ }}
-        name: {{ include "common.ingressurl.aux" $ }}-http-ingress-port
-      - port: {{ include "common.ingresshttpsport" $ }}
-        name: {{ include "common.ingressurl.aux" $ }}-https-ingress-port
-{{- end -}}
diff --git a/ric-platform/README.md b/ric-platform/README.md
deleted file mode 100644 (file)
index 915c7d3..0000000
+++ /dev/null
@@ -1,50 +0,0 @@
-# RIC Platform Components
-  
-Helm charts, deployment scripts and configuration files for RIC platform components.
-
-### Directory Structure
-.
-├── 50-RIC-Platform      Deployment scripts, charts and configuration files for RIC platform components
-│   ├── bin              Contains deployment and uninstall scripts
-│   └── helm             Contains helm charts
-├── 55-Ext-Services      Deployment scripts and chart for external service used by RIC to reach services outside of cluster
-└── README.md            This file
-
-
-In the one-click deployment solution, the above setting will be overrided by environment variables shown below.
-*RICPLT_RELEASE_NAME
-*RICPLT_NAMESPACE
-
-
-### To Deploy RIC Platform
-```sh
-$ # An override file must be used.
-$ # Modify the override file, for example ../RECIPE_EXAMPLE/RIC_PLATFORM_RECIPE_EXAMPLE
-$ #. ./50-RIC-Platform/bin/install -f YOUR_OVERRIDE_FILE
-```
-
-### RIC Platform Deployment Options
-You can configure the Helm release name, Kubernetes namespaces using the override file with
-parameters global.releasePrefix and global.namespace
-
-### To Undeploy RIC Platform
-```sh
-$ . ./50-RIC-Platform/bin/uninstall
-```
-
-### To Deploy External services
-The IP address described below should be the interface IP address of the VM hosting the aux cluster.
-If the aux cluster is multi-node, any of the nodes can be specified here.
-
-```sh
-$ # An override file must be used.
-$ # Modify the override file, for example ../RECIPE_EXAMPLE/RIC_PLATFORM_RECIPE_EXAMPLE
-$ # Set the values of extsvcaux/ricip and extsvcaux/auxip to be the external IP addresses of VM hosting RIC cluster and VM hosting AUX cluster, respectively.
-$ # These values should be set in the override file
-$ . ./55-Ext-Services/bin/install -f YOUR_OVERRIDE_FILE
-```
-
-### To Undeploy External services
-```sh
-$ . ./55-Ext-Services/bin/uninstall
-```
\ No newline at end of file