Merge R3 into master 64/2464/5
authorZhe Huang <zhehuang@research.att.com>
Mon, 10 Feb 2020 18:45:15 +0000 (13:45 -0500)
committerZhe Huang <zhehuang@research.att.com>
Tue, 11 Feb 2020 18:09:59 +0000 (13:09 -0500)
Signed-off-by: Zhe Huang <zhehuang@research.att.com>
Change-Id: I845fdd9ae589e2f803e6ef949cec68f0db8a7a70

696 files changed:
.gitmodules [new file with mode: 0644]
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
ci/package-tag.yaml
ci/tiller-secret-gen/Dockerfile [moved from ric-infra/45-Tiller/docker/Dockerfile with 100% similarity]
ci/tiller-secret-gen/bin/cert-gen.sh [moved from ric-infra/45-Tiller/docker/bin/cert-gen.sh with 100% similarity]
ci/tiller-secret-gen/bin/svcacct-to-kubeconfig.sh [moved from ric-infra/45-Tiller/docker/bin/svcacct-to-kubeconfig.sh with 100% similarity]
ci/tiller-secret-gen/bin/tls-secrets.sh [moved from ric-infra/45-Tiller/docker/bin/tls-secrets.sh with 100% similarity]
ci/tiller-secret-gen/container-tag.yaml [moved from ric-infra/45-Tiller/docker/container-tag.yaml with 100% similarity]
docs/installation-aux.rst
docs/installation-guides.rst
docs/installation-k8s1node.rst
docs/installation-ric.rst
docs/installation-virtualbox.rst
docs/installation-xapps.rst
etc/ric.conf [deleted file]
ric-aux/80-Auxiliary-Functions/helm/dashboard/templates/_genurl.tpl [deleted file]
ric-aux/80-Auxiliary-Functions/helm/dashboard/templates/persistentVolume.yaml [deleted file]
ric-aux/80-Auxiliary-Functions/helm/dashboard/templates/persistentVolumeClaim.yaml [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/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 99% 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/appconfig.yaml [moved from ric-aux/80-Auxiliary-Functions/helm/dashboard/templates/appconfig.yaml with 63% similarity]
ric-aux/helm/dashboard/templates/deployment.yaml [moved from ric-aux/80-Auxiliary-Functions/helm/dashboard/templates/deployment.yaml with 86% 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-platform/50-RIC-Platform/helm/a1mediator/templates/service-http.yaml with 63% similarity]
ric-aux/helm/dashboard/templates/persistentVolumeClaim.yaml [moved from ric-common/Docker-Credential/helm/docker-credential/templates/secrets-docker-reg.yaml with 80% 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 65% 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-infra/40-Credential/helm/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 [new file with mode: 0755]
ric-aux/helm/infrastructure/subcharts/kong/FAQs.md [new file with mode: 0755]
ric-aux/helm/infrastructure/subcharts/kong/README.md [new file with mode: 0755]
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 94% similarity]
ric-aux/helm/infrastructure/subcharts/kong/charts/postgresql/README.md [new file with mode: 0755]
ric-aux/helm/infrastructure/subcharts/kong/charts/postgresql/ci/default-values.yaml [new file with mode: 0755]
ric-aux/helm/infrastructure/subcharts/kong/charts/postgresql/ci/shmvolume-disabled-values.yaml [new file with mode: 0755]
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 [new file with mode: 0755]
ric-aux/helm/infrastructure/subcharts/kong/charts/postgresql/templates/_helpers.tpl [new file with mode: 0755]
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-configmap.yaml [new file with mode: 0755]
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 91% similarity]
ric-aux/helm/infrastructure/subcharts/kong/charts/postgresql/templates/networkpolicy.yaml [new file with mode: 0755]
ric-aux/helm/infrastructure/subcharts/kong/charts/postgresql/templates/prometheusrule.yaml [new file with mode: 0755]
ric-aux/helm/infrastructure/subcharts/kong/charts/postgresql/templates/secrets.yaml [new file with mode: 0755]
ric-aux/helm/infrastructure/subcharts/kong/charts/postgresql/templates/serviceaccount.yaml [new file with mode: 0755]
ric-aux/helm/infrastructure/subcharts/kong/charts/postgresql/templates/servicemonitor.yaml [new file with mode: 0755]
ric-aux/helm/infrastructure/subcharts/kong/charts/postgresql/templates/statefulset-slaves.yaml [new file with mode: 0755]
ric-aux/helm/infrastructure/subcharts/kong/charts/postgresql/templates/statefulset.yaml [new file with mode: 0755]
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 80% 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 77% 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 64% 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.yaml with 52% similarity]
ric-aux/helm/infrastructure/subcharts/kong/charts/postgresql/values.schema.json [new file with mode: 0755]
ric-aux/helm/infrastructure/subcharts/kong/charts/postgresql/values.yaml [moved from ric-infra/30-Kong/helm/kong/charts/kong/charts/postgresql/values-production.yaml with 50% similarity]
ric-aux/helm/infrastructure/subcharts/kong/ci/default-values.yaml [new file with mode: 0755]
ric-aux/helm/infrastructure/subcharts/kong/ci/test1-values.yaml [new file with mode: 0755]
ric-aux/helm/infrastructure/subcharts/kong/ci/test2-values.yaml [new file with mode: 0755]
ric-aux/helm/infrastructure/subcharts/kong/ci/test3-values.yaml [new file with mode: 0755]
ric-aux/helm/infrastructure/subcharts/kong/requirements.yaml [new file with mode: 0755]
ric-aux/helm/infrastructure/subcharts/kong/templates/NOTES.txt [new file with mode: 0755]
ric-aux/helm/infrastructure/subcharts/kong/templates/_helpers.tpl [new file with mode: 0755]
ric-aux/helm/infrastructure/subcharts/kong/templates/admission-webhook.yaml [new file with mode: 0755]
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 76% 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 67% similarity]
ric-aux/helm/infrastructure/subcharts/kong/templates/controller-rbac-resources.yaml [new file with mode: 0755]
ric-aux/helm/infrastructure/subcharts/kong/templates/controller-service-account.yaml [new file with mode: 0755]
ric-aux/helm/infrastructure/subcharts/kong/templates/custom-resource-definitions.yaml [moved from ric-infra/30-Kong/helm/kong/charts/kong/templates/crd-kongingress.yaml with 51% similarity]
ric-aux/helm/infrastructure/subcharts/kong/templates/deployment.yaml [new file with mode: 0755]
ric-aux/helm/infrastructure/subcharts/kong/templates/ingress-admin.yaml [new file with mode: 0755]
ric-aux/helm/infrastructure/subcharts/kong/templates/ingress-manager.yaml [new file with mode: 0755]
ric-aux/helm/infrastructure/subcharts/kong/templates/ingress-portal-api.yaml [new file with mode: 0755]
ric-aux/helm/infrastructure/subcharts/kong/templates/ingress-portal.yaml [new file with mode: 0755]
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 66% similarity]
ric-aux/helm/infrastructure/subcharts/kong/templates/migrations-post-upgrade.yaml [new file with mode: 0755]
ric-aux/helm/infrastructure/subcharts/kong/templates/migrations-pre-upgrade.yaml [new file with mode: 0755]
ric-aux/helm/infrastructure/subcharts/kong/templates/migrations.yaml [new file with mode: 0755]
ric-aux/helm/infrastructure/subcharts/kong/templates/pdb.yaml [moved from ric-infra/30-Kong/helm/kong/charts/kong/templates/pdb.yaml with 68% similarity]
ric-aux/helm/infrastructure/subcharts/kong/templates/psp.yaml [new file with mode: 0755]
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 78% 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 85% 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 85% 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 85% 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 82% similarity]
ric-aux/helm/infrastructure/subcharts/kong/templates/servicemonitor.yaml [moved from ric-infra/30-Kong/helm/kong/charts/kong/templates/servicemonitor.yaml with 73% similarity]
ric-aux/helm/infrastructure/subcharts/kong/values.yaml [moved from ric-infra/30-Kong/helm/kong/charts/kong/values.yaml with 66% similarity]
ric-aux/helm/infrastructure/values.yaml [moved from ric-infra/30-Kong/helm/kong/values.yaml with 73% 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/_dbaasha.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/charts/kong/Chart.yaml [deleted file]
ric-infra/30-Kong/helm/kong/charts/kong/README.md [deleted file]
ric-infra/30-Kong/helm/kong/charts/kong/charts/cassandra/.helmignore [deleted file]
ric-infra/30-Kong/helm/kong/charts/kong/charts/cassandra/Chart.yaml [deleted file]
ric-infra/30-Kong/helm/kong/charts/kong/charts/cassandra/README.md [deleted file]
ric-infra/30-Kong/helm/kong/charts/kong/charts/cassandra/sample/create-storage-gce.yaml [deleted file]
ric-infra/30-Kong/helm/kong/charts/kong/charts/cassandra/templates/NOTES.txt [deleted file]
ric-infra/30-Kong/helm/kong/charts/kong/charts/cassandra/templates/_helpers.tpl [deleted file]
ric-infra/30-Kong/helm/kong/charts/kong/charts/cassandra/templates/backup/cronjob.yaml [deleted file]
ric-infra/30-Kong/helm/kong/charts/kong/charts/cassandra/templates/backup/rbac.yaml [deleted file]
ric-infra/30-Kong/helm/kong/charts/kong/charts/cassandra/templates/configmap.yaml [deleted file]
ric-infra/30-Kong/helm/kong/charts/kong/charts/cassandra/templates/pdb.yaml [deleted file]
ric-infra/30-Kong/helm/kong/charts/kong/charts/cassandra/templates/service.yaml [deleted file]
ric-infra/30-Kong/helm/kong/charts/kong/charts/cassandra/templates/statefulset.yaml [deleted file]
ric-infra/30-Kong/helm/kong/charts/kong/charts/cassandra/values.yaml [deleted file]
ric-infra/30-Kong/helm/kong/charts/kong/charts/postgresql/README.md [deleted file]
ric-infra/30-Kong/helm/kong/charts/kong/charts/postgresql/templates/NOTES.txt [deleted file]
ric-infra/30-Kong/helm/kong/charts/kong/charts/postgresql/templates/_helpers.tpl [deleted file]
ric-infra/30-Kong/helm/kong/charts/kong/charts/postgresql/templates/networkpolicy.yaml [deleted file]
ric-infra/30-Kong/helm/kong/charts/kong/charts/postgresql/templates/secrets.yaml [deleted file]
ric-infra/30-Kong/helm/kong/charts/kong/charts/postgresql/templates/statefulset-slaves.yaml [deleted file]
ric-infra/30-Kong/helm/kong/charts/kong/charts/postgresql/templates/statefulset.yaml [deleted file]
ric-infra/30-Kong/helm/kong/charts/kong/ci/cassandra.yaml [deleted file]
ric-infra/30-Kong/helm/kong/charts/kong/ci/dbless-no-kic-internal-declarative-config-values.yaml [deleted file]
ric-infra/30-Kong/helm/kong/charts/kong/ci/dbless-no-kic-values.yaml [deleted file]
ric-infra/30-Kong/helm/kong/charts/kong/ci/dbless-values.yaml [deleted file]
ric-infra/30-Kong/helm/kong/charts/kong/ci/default-values.yaml [deleted file]
ric-infra/30-Kong/helm/kong/charts/kong/ci/ingressController-values.yaml [deleted file]
ric-infra/30-Kong/helm/kong/charts/kong/ci/loadbalancer-values.yaml [deleted file]
ric-infra/30-Kong/helm/kong/charts/kong/requirements.yaml [deleted file]
ric-infra/30-Kong/helm/kong/charts/kong/templates/NOTES.txt [deleted file]
ric-infra/30-Kong/helm/kong/charts/kong/templates/_helpers.tpl [deleted file]
ric-infra/30-Kong/helm/kong/charts/kong/templates/controller-cluster-role.yaml [deleted file]
ric-infra/30-Kong/helm/kong/charts/kong/templates/controller-deployment.yaml [deleted file]
ric-infra/30-Kong/helm/kong/charts/kong/templates/controller-pdb.yaml [deleted file]
ric-infra/30-Kong/helm/kong/charts/kong/templates/controller-rbac-cluster-role-binding.yaml [deleted file]
ric-infra/30-Kong/helm/kong/charts/kong/templates/controller-rbac-role-binding.yaml [deleted file]
ric-infra/30-Kong/helm/kong/charts/kong/templates/controller-rbac-role.yaml [deleted file]
ric-infra/30-Kong/helm/kong/charts/kong/templates/controller-service-account.yaml [deleted file]
ric-infra/30-Kong/helm/kong/charts/kong/templates/crd-kongconsumer.yaml [deleted file]
ric-infra/30-Kong/helm/kong/charts/kong/templates/crd-kongcredential.yaml [deleted file]
ric-infra/30-Kong/helm/kong/charts/kong/templates/crd-kongplugins.yaml [deleted file]
ric-infra/30-Kong/helm/kong/charts/kong/templates/deployment.yaml [deleted file]
ric-infra/30-Kong/helm/kong/charts/kong/templates/ingress-admin.yaml [deleted file]
ric-infra/30-Kong/helm/kong/charts/kong/templates/ingress-manager.yaml [deleted file]
ric-infra/30-Kong/helm/kong/charts/kong/templates/ingress-portal-api.yaml [deleted file]
ric-infra/30-Kong/helm/kong/charts/kong/templates/ingress-portal.yaml [deleted file]
ric-infra/30-Kong/helm/kong/charts/kong/templates/migrations-post-upgrade.yaml [deleted file]
ric-infra/30-Kong/helm/kong/charts/kong/templates/migrations-pre-upgrade.yaml [deleted file]
ric-infra/30-Kong/helm/kong/charts/kong/templates/migrations.yaml [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-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/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-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 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..cf7b7a9 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
+
+echo "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/
+
+echo "Make sure that helm local repo is added"
+helm repo remove local
+helm repo add local http://127.0.0.1:8879/charts
+
+echo "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 
+    echo "Update chart dependency for directory $dir"
+    helm dep up $dir
     # Lint clearly marks errors; e.g., [ERROR]
     if [ -z $OVERRIDEYAML ]; then
         helm lint $dir > /tmp/output 2>&1
@@ -52,8 +65,8 @@ do
         helm lint -f $OVERRIDEYAML $dir> /tmp/output 2>&1
     fi
     echo "***************************************************************************************************************"
-    cat /tmp/output 
-    
+    cat /tmp/output
+
     egrep -q '^Error: [0-9]* chart\(s\) linted, [0-9]* chart\(s\) failed' /tmp/output && exit 1
     echo "***************************************************************************************************************"
 
@@ -63,15 +76,8 @@ do
        helm template -f $OVERRIDEYAML $dir > /tmp/output 2>&1
     fi
     echo "***************************************************************************************************************"
-    cat /tmp/output 
-   sleep 1 
+    cat /tmp/output
+   sleep 1
     egrep -n '%!.\(.*=.*\)' /tmp/output && echo "Error: Type mismatch." && exit 1
     echo "***************************************************************************************************************"
-
 done
-#Error: 1 chart(s) linted, 1 chart(s) failed
-
-
-
-exit 0
-
index c3e0540..be581bf 100644 (file)
@@ -14,4 +14,4 @@
 #   See the License for the specific language governing permissions and        #
 #   limitations under the License.                                             #
 ################################################################################
-tag: 2.0.6
+tag: 3.0.0
index f3befca..3727b01 100644 (file)
@@ -29,16 +29,42 @@ Run the following commands in a root shell:
 
 .. code:: bash
 
-  git clone http://gerrit.o-ran-sc.org/r/it/dep
-  cd RECIPE_EXAMPLE
+  git clone https://gerrit.o-ran-sc.org/r/it/dep
+  cd dep
+  git submodule update --init --recursive --remote
 
-Edit the recipe files RIC_INFRA_RECIPE_EXAMPLE and RIC_PLATFORM_RECIPE_EXAMPLE.
-In particular the following values often need adaptation to local deployments:
 
-#. Docker registry URL
-#. Docker registry credential
-#. Helm repo credential
-#. Component docker container image tags.
+Modify the deployment recipe
+----------------------------
+
+Edit the recipe file ./RECIPE_EXAMPLE/AUX/example_recipe.yaml.
+
+- Specify the IP addresses used by the RIC and AUX cluster ingress controller (e.g., the main interface IP) in the following section.
+  If you are only testing the AUX cluster, you can put down any private IPs (e.g., 10.0.2.1 and 10.0.2.2).
+
+.. code:: bash
+
+  extsvcplt:
+    ricip: ""
+    auxip: ""
+
+- To specify which version of the RIC platform components will be deployed, update the RIC platform component container tags in their corresponding section.
+- You can specify which docker registry will be used for each component. If the docker registry requires login credential, you can add the credential in the following section.
+  Note that the installation script has already included credentials for O-RAN Linux Foundation docker registries. Please do not create duplicate entries.
+
+.. code:: bash
+
+  docker-credential:
+    enabled: true
+    credential:
+      SOME_KEY_NAME:
+        registry: ""
+        credential:
+          user: ""
+          password: ""
+          email: ""
+
+For more advanced recipe configuration options, refer to the recipe configuration guideline.
 
 
 Deploying the Aux Group
@@ -49,8 +75,7 @@ After the recipes are edited, the AUX group is ready to be deployed.
 .. code:: bash
 
   cd dep/bin
-  ./deploy-ric-infra ../RECIPE_EXAMPLE/RIC_INFRA_AUX_RECIPE_EXAMPLE
-  ./deploy-ric-aux ../RECIPE_EXAMPLE/RIC_INFRA_RECIPE_EXAMPLE
+  ./deploy-ric-aux ../RECIPE_EXAMPLE/AUX/example_recipe.yaml
 
 
 Checking the Deployment Status
@@ -60,4 +85,34 @@ Now check the deployment status and results similar to the below indicate a comp
 
 .. code::
 
-  TBD
+  # helm list
+  NAME                  REVISION        UPDATED                         STATUS          CHART                   APP VERSION     NAMESPACE
+  r3-aaf                1               Mon Jan 27 13:24:59 2020        DEPLOYED        aaf-5.0.0                               onap
+  r3-dashboard          1               Mon Jan 27 13:22:52 2020        DEPLOYED        dashboard-1.2.2         1.0             ricaux
+  r3-infrastructure     1               Mon Jan 27 13:22:44 2020        DEPLOYED        infrastructure-3.0.0    1.0             ricaux
+  r3-mc-stack           1               Mon Jan 27 13:23:37 2020        DEPLOYED        mc-stack-0.0.1          1               ricaux
+  r3-message-router     1               Mon Jan 27 13:23:09 2020        DEPLOYED        message-router-1.1.0                    ricaux
+  r3-mrsub              1               Mon Jan 27 13:23:24 2020        DEPLOYED        mrsub-0.1.0             1.0             ricaux
+  r3-portal             1               Mon Jan 27 13:24:12 2020        DEPLOYED        portal-5.0.0                            ricaux
+  r3-ves                1               Mon Jan 27 13:23:01 2020        DEPLOYED        ves-1.1.1               1.0             ricaux
+  # kubectl get pods -n ricaux
+  NAME                                           READY   STATUS     RESTARTS   AGE
+  deployment-ricaux-dashboard-f78d7b556-m5nbw    1/1     Running    0          6m30s
+  deployment-ricaux-ves-69db8c797-v9457          1/1     Running    0          6m24s
+  elasticsearch-master-0                         1/1     Running    0          5m36s
+  r3-infrastructure-kong-7697bccc78-nsln7        2/2     Running    3          6m40s
+  r3-mc-stack-kibana-78f648bdc8-nfw48            1/1     Running    0          5m37s
+  r3-mc-stack-logstash-0                         1/1     Running    0          5m36s
+  r3-message-router-message-router-0             1/1     Running    3          6m11s
+  r3-message-router-message-router-kafka-0       1/1     Running    1          6m11s
+  r3-message-router-message-router-kafka-1       1/1     Running    2          6m11s
+  r3-message-router-message-router-kafka-2       1/1     Running    1          6m11s
+  r3-message-router-message-router-zookeeper-0   1/1     Running    0          6m11s
+  r3-message-router-message-router-zookeeper-1   1/1     Running    0          6m11s
+  r3-message-router-message-router-zookeeper-2   1/1     Running    0          6m11s
+  r3-mrsub-5c94f5b8dd-wxcw5                      1/1     Running    0          5m58s
+  r3-portal-portal-app-8445f7f457-dj4z8          2/2     Running    0          4m53s
+  r3-portal-portal-cassandra-79cf998f69-xhpqg    1/1     Running    0          4m53s
+  r3-portal-portal-db-755b7dc667-kjg5p           1/1     Running    0          4m53s
+  r3-portal-portal-db-config-bfjnc               2/2     Running    0          4m53s
+  r3-portal-portal-zookeeper-5f8f77cfcc-t6z7w    1/1     Running    0          4m53s
index 6f734a0..f871754 100644 (file)
@@ -33,15 +33,19 @@ Version history
 | **Date**           | **Ver.**           | **Author**         | **Comment**        |
 |                    |                    |                    |                    |
 +--------------------+--------------------+--------------------+--------------------+
-| 2019-11-25         | 0.1.0              |Lusheng Ji          | First draft        |
+| 2019-11-25         | 0.1.0              |Lusheng Ji          | Amber              |
 |                    |                    |                    |                    |
 +--------------------+--------------------+--------------------+--------------------+
+| 2020-01-23         | 0.2.0              |Zhe Huang           | Bronze RC          |
+|                    |                    |                    |                    |
++--------------------+--------------------+--------------------+--------------------+
+
 
 
 Overview
 ========
 
-The installation of Amber Near Realtime RAN Intelligent Controller is spread onto two separate
+The installation of Near Realtime RAN Intelligent Controller is spread onto two separate
 Kubernetes clusters.  The first cluster is used for deploying the Near Realtime RIC (platform and
 applications), and the other is for deploying other auxiliary functions.  They are referred to as
 RIC cluster and AUX cluster respectively.
@@ -52,7 +56,7 @@ The following diagram depicts the installation architecture.
    :width: 600
 
 Within the RIC cluster, Kubernetes resources are deployed using three name spaces: ricinfra, ricplt,
-and ricxapp.  Similarly, within the AUX cluster, Kubernetes resources are deployed using two name spaces:
+and ricxapp by default.  Similarly, within the AUX cluster, Kubernetes resources are deployed using two name spaces:
 ricinfra, and ricaux.
 
 For each cluster, there is a Kong ingress controller that proxies incoming API calls into the cluster.
@@ -67,10 +71,22 @@ together to realize cross-cluster communication.
    :width: 600
 
 
+
+Prerequisites
+=============
+
+Both RIC and AUX clusters need to fulfill the following prerequisites.
+
+- Kubernetes v.1.16.0 or above
+- helm v2.12.3 or above
+- Read-write access to directory /mnt
+
+The following two sections show two example methods to create an environment for installing RIC.
+
 VirtualBox VMs as Installation Hosts
-====================================
+------------------------------------
 
-The deployment of Amber Near Realtime RIC can be done on a wide range of hosts, including
+The deployment of Near Realtime RIC can be done on a wide range of hosts, including
 bare metal servers, OpenStack VMs, and VirtualBox VMs.  This section provides detailed instructions
 for setting up Oracle VirtualBox VMs to be used as installation hosts.
 
@@ -78,7 +94,7 @@ for setting up Oracle VirtualBox VMs to be used as installation hosts.
 
 
 One-Node Kubernetes Cluster
-===========================
+---------------------------
 
 This section describes how to set up a one-node Kubernetes cluster onto a VM installation host.
 
index 0cdd669..ad1a82c 100644 (file)
 .. ===============LICENSE_END=========================================================
 
 
-Script for Setting Up 1-Node Kubernetes Cluster
------------------------------------------------
+Script for Setting Up 1-node Kubernetes Cluster
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 The it/dep repo can be used for generating a simple script that can help setting up a
 one-node Kubernetes cluster for dev and testing purposes.  Related files are under the
-**ric-infra/00-Kubernetes** directory.  Clone the it/dep git repository on the target VM. 
+**tools/k8s/bin** directory. Clone the repository on the target VM:
 
 ::
 
@@ -29,7 +29,7 @@ one-node Kubernetes cluster for dev and testing purposes.  Related files are und
 
 
 Configurations
---------------
+^^^^^^^^^^^^^^
 
 The generation of the script reads in the parameters from the following files:
 
@@ -46,7 +46,7 @@ The generation of the script reads in the parameters from the following files:
 
 
 Generating Set-up Script
-------------------------
+^^^^^^^^^^^^^^^^^^^^^^^^
 
 After the configurations are updated, the following steps will create a script file that can be
 used for setting up a one-node Kubernetes cluster.  You must run this command on a Linux machine
@@ -54,14 +54,14 @@ with the 'envsubst' command installed.
 
 ::
 
-  % cd bin
+  % cd tools/k8s/bin
   % ./gen-cloud-init.sh
 
 A file named **k8s-1node-cloud-init.sh** would now appear under the bin directory.
 
 
 Setting up Kubernetes Cluster
------------------------------
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 The new **k8s-1node-cloud-init.sh** file is now ready for setting up the Kubernetes cluster.
 
index 1bf1368..61454ec 100644 (file)
@@ -19,7 +19,7 @@
 Getting and Preparing Deployment Scripts
 ----------------------------------------
 
-Clone the it/dep git repository that has deployment scripts and support files on the target VM. 
+Clone the it/dep git repository that has deployment scripts and support files on the target VM.
 (You might have already done this in a previous step.)
 
 ::
@@ -29,40 +29,50 @@ Clone the it/dep git repository that has deployment scripts and support files on
 Check out the appropriate branch of the repository with the release you want to deploy.
 For example:
 
-::
+  git clone https://gerrit.o-ran-sc.org/r/it/dep
+  cd dep
+  git submodule update --init --recursive --remote
+
+Modify the deployment recipe
+----------------------------
 
-  % git checkout Amber
+Edit the recipe files ./RECIPE_EXAMPLE/PLATFORM/example_recipe.yaml.
 
-In the RECIPE_EXAMPLE directory, edit the recipe files RIC_INFRA_RECIPE_EXAMPLE and
-RIC_PLATFORM_RECIPE_EXAMPLE. In particular the following values often need adaptation
-to local deployments:
+- Specify the IP addresses used by the RIC and AUX cluster ingress controller (e.g., the main interface IP) in the following section. If you do not plan to set up an AUX cluster, you can put down any private IPs (e.g., 10.0.2.1 and 10.0.2.2).
+
+.. code:: bash
 
-#. Docker registry URL (property "repository"). This is the default source for
-   container images. For example,
-   nexus3.o-ran-sc.org:10004/o-ran-sc is the staging registry and has freshly built images;
-   nexus3.o-ran-sc.org:10002/o-ran-sc is the release registry and has stable images.
-#. Docker registry credential. This is a name of a Kubernetes credential. Some registries
-   allow anonymous read access, including nexus3.o-ran-sc.org.
-#. Helm repo and credential. The xApp Manager deploys xApps from charts in this repo.
-   No changes are required here for basic dev testing of platform components.
-#. Component docker container image repository override and tag.  The recipes specify
-   the docker image to use in terms of name and tag.  These entries also allow override
-   of the default docker registry URL (see above); for example, the default might be the
-   releases registry and then a component under test is deployed from the staging registry.
+  extsvcplt:
+    ricip: ""
+    auxip: ""
+
+- To specify which version of the RIC platform components will be deployed, update the RIC platform component container tags in their corresponding section.
+- You can specify which docker registry will be used for each component. If the docker registry requires login credential, you can add the credential in the following section. Please note that the installation suite has already included credentials for O-RAN Linux Foundation docker registries. Please do not create duplicate entries.
+
+.. code:: bash
+
+  docker-credential:
+    enabled: true
+    credential:
+      SOME_KEY_NAME:
+        registry: ""
+        credential:
+          user: ""
+          password: ""
+          email: ""
+
+For more advanced recipe configuration options, please refer to the recipe configuration guideline.
 
 
 Deploying the Infrastructure and Platform Groups
 ------------------------------------------------
 
-After the recipes are edited, the Near Realtime RIC is ready to be deployed.
-Perform the following steps in a root shell.
+After the recipes are edited, the Near Realtime RIC platform is ready to be deployed.
 
 .. code:: bash
 
-  % sudo -i
-  # cd dep/bin
-  # ./deploy-ric-infra ../RECIPE_EXAMPLE/RIC_INFRA_RECIPE_EXAMPLE
-  # ./deploy-ric-platform ../RECIPE_EXAMPLE/RIC_PLATFORM_RECIPE_EXAMPLE
+  cd dep/bin
+  ./deploy-ric-platform ../RECIPE_EXAMPLE/PLATFORM/example_recipe.yaml
 
 
 Checking the Deployment Status
@@ -70,53 +80,43 @@ Checking the Deployment Status
 
 Now check the deployment status after a short wait. Results similar to the
 output shown below indicate a complete and successful deployment. Check the
-STATUS column from both kubectl outputs to ensure that all are either 
+STATUS column from both kubectl outputs to ensure that all are either
 "Completed" or "Running", and that none are "Error" or "ImagePullBackOff".
 
 .. code::
 
   # helm list
-  NAME                   REVISION UPDATED                   STATUS     CHART                   APP VERSION     NAMESPACE
-  r1-a1mediator          1        Tue Nov 26 00:47:12 2019  DEPLOYED   a1mediator-2.0.0        1.0         ricplt
-  r1-appmgr              1        Tue Nov 26 00:47:09 2019  DEPLOYED   appmgr-1.1.0            1.0             ricplt
-  r1-chartmuseum                1        Tue Nov 26 03:16:42 2019  DEPLOYED    chartmuseum-0.0.1   0.1         ricinfra
-  r1-dbaas1              1        Tue Nov 26 00:47:10 2019  DEPLOYED   dbaas1-1.1.0            1.0             ricplt
-  r1-e2mgr               1        Tue Nov 26 00:47:10 2019  DEPLOYED   e2mgr-1.1.0             1.0             ricplt
-  r1-e2term              1        Tue Nov 26 00:47:11 2019  DEPLOYED   e2term-1.1.0            1.0             ricplt
-  r1-extsvcplt           1        Tue Nov 26 00:47:17 2019  DEPLOYED   extsvcplt-0.2.0         1.0             ricplt
-  r1-jaegeradapter       1        Tue Nov 26 00:47:16 2019  DEPLOYED   jaegeradapter-0.1.0     1.0             ricplt
-  r1-kong                1        Tue Nov 26 00:45:36 2019  DEPLOYED   kong-1.0.0              1.0             ricinfra
-  r1-ricaux-credential   1        Tue Nov 26 00:45:42 2019  DEPLOYED   credential-1.1.0        1.0             ricaux
-  r1-ricinfra-credential 1        Tue Nov 26 00:45:43 2019  DEPLOYED   credential-1.1.0        1.0             ricinfra
-  r1-ricplt-credential   1        Tue Nov 26 00:45:42 2019  DEPLOYED   credential-1.1.0        1.0             ricplt
-  r1-ricxapp-credential  1        Tue Nov 26 00:45:42 2019  DEPLOYED   credential-1.1.0        1.0             ricxapp
-  r1-rsm                 1        Tue Nov 26 00:47:15 2019  DEPLOYED   rsm-2.0.6               1.0             ricplt
-  r1-rtmgr               1        Tue Nov 26 00:47:09 2019  DEPLOYED   rtmgr-1.1.0             1.0             ricplt
-  r1-submgr              1        Tue Nov 26 00:47:13 2019  DEPLOYED   submgr-1.1.0            1.0             ricplt
-  r1-vespamgr            1        Tue Nov 26 00:47:14 2019  DEPLOYED   vespamgr-0.0.1          1.0             ricplt
-  r1-xapp-tiller         1        Tue Nov 26 00:45:44 2019  DEPLOYED   xapp-tiller-0.1.0       1.0             ricinfra
-
-  # kubectl get pods -n ricinfra
-  NAME                                              READY   STATUS     RESTARTS   AGE
-  deployment-ricinfra-chartmuseum-7d97f4b995-gkxsq  1/1     Running    0          133m
-  deployment-tiller-ricxapp-65f9cbc8d7-qcr5t        1/1     Running    0          133m
-  job-ricinfra-chartmuseum-save-certs-5ntnk         0/1     Completed  0          133m
-  r1-kong-kong-84695ff65d-9sjwg                     2/2     Running    2          133m
-  tiller-secret-generator-w6bnd                     0/1     Completed  0          133m
+  NAME                  REVISION        UPDATED                         STATUS          CHART                   APP VERSION     NAMESPACE
+  r3-a1mediator         1               Thu Jan 23 14:29:12 2020        DEPLOYED        a1mediator-3.0.0        1.0             ricplt
+  r3-appmgr             1               Thu Jan 23 14:28:14 2020        DEPLOYED        appmgr-3.0.0            1.0             ricplt
+  r3-dbaas1             1               Thu Jan 23 14:28:40 2020        DEPLOYED        dbaas1-3.0.0            1.0             ricplt
+  r3-e2mgr              1               Thu Jan 23 14:28:52 2020        DEPLOYED        e2mgr-3.0.0             1.0             ricplt
+  r3-e2term             1               Thu Jan 23 14:29:04 2020        DEPLOYED        e2term-3.0.0            1.0             ricplt
+  r3-infrastructure     1               Thu Jan 23 14:28:02 2020        DEPLOYED        infrastructure-3.0.0    1.0             ricplt
+  r3-jaegeradapter      1               Thu Jan 23 14:29:47 2020        DEPLOYED        jaegeradapter-3.0.0     1.0             ricplt
+  r3-rsm                1               Thu Jan 23 14:29:39 2020        DEPLOYED        rsm-3.0.0               1.0             ricplt
+  r3-rtmgr              1               Thu Jan 23 14:28:27 2020        DEPLOYED        rtmgr-3.0.0             1.0             ricplt
+  r3-submgr             1               Thu Jan 23 14:29:23 2020        DEPLOYED        submgr-3.0.0            1.0             ricplt
+  r3-vespamgr           1               Thu Jan 23 14:29:31 2020        DEPLOYED        vespamgr-3.0.0          1.0             ricplt
 
   # kubectl get pods -n ricplt
-  NAME                                              READY   STATUS     RESTARTS   AGE
-  deployment-ricplt-a1mediator-5c4df477f9-6zxxx     1/1     Running    0          132m
-  deployment-ricplt-appmgr-65bc8b958c-tggg7         1/1     Running    0          132m
-  deployment-ricplt-dbaas-74bf584449-k484v          1/1     Running    0          132m
-  deployment-ricplt-e2mgr-74cd9865bc-hpn6b          1/1     Running    0          132m
-  deployment-ricplt-e2term-cc7b5d99-pkctr           1/1     Running    0          132m
-  deployment-ricplt-jaegeradapter-cc49c64dc-vj622   1/1     Running    0          131m
-  deployment-ricplt-rsm-599cd4d6c8-4jhft            1/1     Running    0          131m
-  deployment-ricplt-rtmgr-85d89868d6-58wvl          1/1     Running    1          132m
-  deployment-ricplt-submgr-7cbd697c7f-p9x4x         1/1     Running    0          132m
-  deployment-ricplt-vespamgr-7bb4c7585f-9z6qm       1/1     Running    0          132m
+  NAME                                               READY   STATUS             RESTARTS   AGE
+  deployment-ricplt-a1mediator-69f6d68fb4-7trcl      1/1     Running            0          159m
+  deployment-ricplt-appmgr-845d85c989-qxd98          2/2     Running            0          160m
+  deployment-ricplt-dbaas-7c44fb4697-flplq           1/1     Running            0          159m
+  deployment-ricplt-e2mgr-569fb7588b-wrxrd           1/1     Running            0          159m
+  deployment-ricplt-e2term-alpha-db949d978-rnd2r     1/1     Running            0          159m
+  deployment-ricplt-jaegeradapter-585b4f8d69-tmx7c   1/1     Running            0          158m
+  deployment-ricplt-rsm-755f7c5c85-j7fgf             1/1     Running            0          158m
+  deployment-ricplt-rtmgr-c7cdb5b58-2tk4z            1/1     Running            0          160m
+  deployment-ricplt-submgr-5b4864dcd7-zwknw          1/1     Running            0          159m
+  deployment-ricplt-vespamgr-864f95c9c9-5wth4        1/1     Running            0          158m
+  r3-infrastructure-kong-68f5fd46dd-lpwvd            2/2     Running            3          160m
 
+  # kubectl get pods -n ricinfra
+  NAME                                        READY   STATUS      RESTARTS   AGE
+  deployment-tiller-ricxapp-d4f98ff65-9q6nb   1/1     Running     0          163m
+  tiller-secret-generator-plpbf               0/1     Completed   0          163m
 
 Checking Container Health
 -------------------------
@@ -139,7 +139,7 @@ The output should look as follows.
   > Host: 10.0.2.100:32080
   > User-Agent: curl/7.58.0
   > Accept: */*
-  > 
+  >
   < HTTP/1.1 200 OK
   < Content-Type: application/json
   < Content-Length: 0
@@ -148,7 +148,7 @@ The output should look as follows.
   < X-Kong-Upstream-Latency: 0
   < X-Kong-Proxy-Latency: 2
   < Via: kong/1.3.1
-  < 
+  <
   * Connection #0 to host 10.0.2.100 left intact
 
 
@@ -162,41 +162,28 @@ within the it-dep repository.
 
   # cd bin
   # ./undeploy-ric-platform
-  # ./undeploy-ric-infra
 
 Results similar to below indicate a complete and successful cleanup.
 
 .. code::
 
-  # ./undeploy-ric-platform 
-  Undeploying RIC platform components [appmgr rtmgr dbaas1 e2mgr e2term a1mediator submgr vespamgr rsm jaegeradapter]
-  release "r1-appmgr" deleted
-  release "r1-rtmgr" deleted
-  release "r1-dbaas1" deleted
-  release "r1-e2mgr" deleted
-  release "r1-e2term" deleted
-  release "r1-a1mediator" deleted
-  release "r1-submgr" deleted
-  release "r1-vespamgr" deleted
-  release "r1-rsm" deleted
-  release "r1-jaegeradapter" deleted
-  Undeploying RIC platform components [extsvcplt]
-  release "r1-extsvcplt" deleted
-  
-  # ./undeploy-ric-infra
-  Please reset your kubernetes cluster manually.
-  Undeploying RIC infra components [chartmuseum]
-  release "r1-chartmuseum" deleted
-  Undeploying RIC infra components [elfkp]
-  Undeploying RIC infra components [kong]
-  release "r1-kong" deleted
-  Undeploying RIC infra components [credential]
-  release "r1-ricaux-credential" deleted
-  release "r1-ricinfra-credential" deleted
-  release "r1-ricplt-credential" deleted
-  release "r1-ricxapp-credential" deleted
-  Undeploying RIC infra components [xapp-tiller]
-  release "r1-xapp-tiller" deleted
+  # ./undeploy-ric-platform
+  Undeploying RIC platform components [appmgr rtmgr dbaas1 e2mgr e2term a1mediator submgr vespamgr rsm jaegeradapter infrastructure]
+  release "r3-appmgr" deleted
+  release "r3-rtmgr" deleted
+  release "r3-dbaas1" deleted
+  release "r3-e2mgr" deleted
+  release "r3-e2term" deleted
+  release "r3-a1mediator" deleted
+  release "r3-submgr" deleted
+  release "r3-vespamgr" deleted
+  release "r3-rsm" deleted
+  release "r3-jaegeradapter" deleted
+  release "r3-infrastructure" deleted
+  configmap "ricplt-recipe" deleted
+  namespace "ricxapp" deleted
+  namespace "ricinfra" deleted
+  namespace "ricplt" deleted
 
 
 Restarting the VM
index 2f824cb..98bc2bb 100644 (file)
@@ -18,7 +18,7 @@
 
 
 Networking
-----------
+^^^^^^^^^^
 The set up requires two VMs connected by a private network.  With VirtualBox, this can be
 done by going under its "Preferences" menu and setting up a private NAT network.
 
@@ -37,7 +37,7 @@ done by going under its "Preferences" menu and setting up a private NAT network.
 
 
 Creating VMs
-------------
+^^^^^^^^^^^^
 
 Create a VirtualBox VM:
 
@@ -57,14 +57,14 @@ Repeat the process and create the second VM named **myaux**.
 
 
 Booting VM and OS Installation
-------------------------------
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 Follow the OS installation steps to install OS to the VM virtual disk media.  During the setup you must
 configure static IP addresses as discussed next.  And make sure to install openssh server.
 
 
 VM Network Configuration
-------------------------
+^^^^^^^^^^^^^^^^^^^^^^^^
 
 Depending on the version of the OS, the networking may be configured during the OS installation or after.
 The network interface is configured with a static IP address:
@@ -76,7 +76,7 @@ The network interface is configured with a static IP address:
 
 
 Accessing the VMs
------------------
+^^^^^^^^^^^^^^^^^
 
 Because of the port forwarding configurations, the VMs are accessible from the VirtualBox host via ssh.
 
index d5af024..3d94fe9 100644 (file)
 Loading xApp Helm Charts
 ------------------------
 
-The RIC Platform App Manager deploys RIC applications (a.k.a. xApps) using Helm charts stored in a private Helm repo.
-In the dev testing deployment described in this documentation, this private Helm repo is the Chart Museum pod that is deployed within the ric infrastructure group into the RIC cluster.
+The RIC Platform App Manager deploys RIC applications (a.k.a. xApps) using Helm charts stored in a private local Helm repo.
+The Helm local repo is deployed as a sidecar of the App Manager pod, and its APIs are exposed using an ingress controller with TLS enabled.
+You can use both HTTP and HTTPS to access it.
 
-The Helm repo location and credential for access the repo are specified in both the infrastructure and platform recipe files.
+Before any xApp can be deployed, its Helm chart must be loaded into this private Helm repo.
+The example below shows the command sequences that upload and delete the xApp Helm charts:
 
-Before any xApp can be deployed, its Helm chart must be loaded into this private Helm repo before the App manager can deploy them.
-The example below show a command sequence that completes:
-
-#. Add the Helm repo at the Helm client running on the RIC cluster host VM (via Kong Ingress Controller);
-#. Load the xApp Helm chart into the Helm repo;
-#. Update the local cache for the Helm repo and check the Helm chart is loaded;
-#. Calling App Manager to deploy the xApp;
-#. Calling App Manager to delete the xApp;
+#. Load the xApp Helm charts into the Helm repo;
+#. Verify the xApp Helm charts;
+#. Call App Manager to deploy the xApp;
+#. Call App Manager to delete the xApp;
 #. Delete the xApp helm chart from the private Helm repo.
 
-.. code:: bash
+In the following example, the <INGRESS_CONTROLLER_IP> is the IP address that the RIC cluster ingress controller is listening to.
+If you are using a VM, it is the IP address of the main interface.
+If you are using REC clusters, it is the DANM network IP address you assigned in the recipe.
+If the commands are executed inside the host machine, you can use "localhost" as the <INGRESS_CONTROLLER_IP>.
 
-   # add the Chart Museum as repo cm
-   helm repo add cm http://10.0.2.100:32080/helm
 
-   # load admin-xapp Helm chart to the Chart Museum
-   curl -L -u helm:helm --data-binary "@admin-xapp-1.0.7.tgz" \
-      http://10.0.2.100:32080/helm/api/charts
+.. code:: bash
+
+   # load admin-xapp Helm chart to the Helm repo
+   curl -L --data-binary "@admin-xapp-1.0.7.tgz" http://<INGRESS_CONTROLLER_IP>:32080/helmrepo
 
-   # check the local cache of repo cm
-   helm repo update cm
-   # verify that the Helm chart is loaded and accessible
-   helm search cm/
-   # the new admin-app chart should show up here.
+   # verify the xApp Helm charts
+   curl -L http://<INGRESS_CONTROLLER_IP>:32080/helmrepo/index.yaml
 
    # test App Manager health check API
-   curl -v http://10.0.2.100:32080/appmgr/ric/v1/health/ready
+   curl -v http://<INGRESS_CONTROLLER_IP>:32080/appmgr/ric/v1/health/ready
    # expecting a 200 response
 
    # list deployed xApps
-   curl http://10.0.2.100:32080/appmgr/ric/v1/xapps
+   curl http://<INGRESS_CONTROLLER_IP>:32080/appmgr/ric/v1/xapps
    # expecting a []
-       
-   # deploy xApp
-   curl -X POST http://10.0.2.100:32080/appmgr/ric/v1/xapps -d '{"name": "admin-xapp"}'
+
+   # deploy xApp, the xApp name has to be the same as the xApp Helm chart name
+   curl -X POST http://<INGRESS_CONTROLLER_IP>/appmgr/ric/v1/xapps -d '{"name": "admin-xapp"}'
    # expecting: {"name":"admin-app","status":"deployed","version":"1.0","instances":null}
-       
+
    # check again deployed xApp
-   curl http://10.0.2.10:32080/appmgr/ric/v1/xapps
+   curl http://<INGRESS_CONTROLLER_IP>:32080/appmgr/ric/v1/xapps
    # expecting a JSON array with an entry for admin-app
-       
+
    # check pods using kubectl
    kubectl get pods --all-namespaces
    # expecting the admin-xapp pod showing up
-       
+
    # underlay the xapp
-   curl -X DELETE http://10.0.2.100:32080/appmgr/ric/v1/xapps/admin-xapp
+   curl -X DELETE http://<INGRESS_CONTROLLER_IP>:32080/appmgr/ric/v1/xapps/admin-xapp
 
    # check pods using kubectl
    kubectl get pods --all-namespaces
    # expecting the admin-xapp pod gone or shown as terminating
 
    # to delete a chart
-   curl -L -X DELETE -u helm:helm http://10.0.2.100:32080/api/charts/admin-xapp/0.0.5
+   curl -L -X DELETE -u helm:helm http://<INGRESS_CONTROLLER_IP>:32080/api/charts/admin-xapp/0.0.5
 
 For more xApp deployment and usage examples, please see the documentation for the it/test repository.
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/80-Auxiliary-Functions/helm/dashboard/templates/_genurl.tpl b/ric-aux/80-Auxiliary-Functions/helm/dashboard/templates/_genurl.tpl
deleted file mode 100644 (file)
index 5684f21..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.                                             #
-################################################################################
-{{/* vim: set filetype=mustache: */}}
-{{/*
-Generate the URLS of the endpoints.
-*/}}
-
-
-{{- define "dashboard.prefix.a1mediator" -}}
-  {{- $ingress := ( include "common.ingressurl.ric" . ) -}}
-  {{- if .Values.dashboard.a1med.url.prefix -}}
-    {{- printf "%s" .Values.dashboard.a1med.url.prefix -}}
-  {{- else -}}
-    {{- printf "http://%s/a1mediator" $ingress -}}
-  {{- end -}}
-{{- end -}}
-
-{{- define "dashboard.prefix.anrxapp" -}}
-  {{- $ingress := ( include "common.ingressurl.ric" . ) -}}
-  {{- if .Values.dashboard.anrxapp.url.prefix -}}
-    {{- printf "%s" .Values.dashboard.anrxapp.url.prefix -}}
-  {{- else -}}
-    {{- printf "http://%s/anr" $ingress -}}
-  {{- end -}}
-{{- end -}}
-
-{{- define "dashboard.prefix.e2mgr" -}}
-  {{- $ingress := ( include "common.ingressurl.ric" . ) -}}
-  {{- if .Values.dashboard.e2mgr.url.prefix -}}
-    {{- printf "%s" .Values.dashboard.e2mgr.url.prefix -}}
-  {{- else -}}
-    {{- printf "http://%s/e2mgr" $ingress -}}
-  {{- end -}}
-{{- end -}}
-
-{{- define "dashboard.prefix.appmgr" -}}
-  {{- $ingress := ( include "common.ingressurl.ric" . ) -}}
-  {{- if .Values.dashboard.appmgr.url.prefix -}}
-    {{- printf "%s" .Values.dashboard.appmgr.url.prefix -}}
-  {{- else -}}
-    {{- printf "http://%s/appmgr" $ingress -}}
-  {{- end -}}
-{{- end -}}
-
diff --git a/ric-aux/80-Auxiliary-Functions/helm/dashboard/templates/persistentVolume.yaml b/ric-aux/80-Auxiliary-Functions/helm/dashboard/templates/persistentVolume.yaml
deleted file mode 100644 (file)
index 01bc7b3..0000000
+++ /dev/null
@@ -1,34 +0,0 @@
-{{- if not .Values.dashboard.storageclass }}
-
-kind: StorageClass
-apiVersion: storage.k8s.io/v1
-metadata:
-  name: storageclass-{{ include "common.name.dashboard" . }}
-provisioner: kubernetes.io/no-provisioner
-volumeBindingMode: WaitForFirstConsumer
-
----
-
-apiVersion: v1
-kind: PersistentVolume
-metadata:
-  name: pv-{{ include "common.name.dashboard" . }}
-spec:
-  capacity:
-    storage: {{ .Values.dashboard.storagesize }}
-  accessModes:
-  - ReadWriteOnce
-  persistentVolumeReclaimPolicy: Retain
-  storageClassName: storageclass-{{ include "common.name.dashboard" . }}
-  local:
-    path: {{ .Values.dashboard.datapath }}
-  nodeAffinity:
-    required:
-      nodeSelectorTerms:
-      - matchExpressions:
-        - key: local-storage
-          operator: In
-          values:
-          - enable
-{{- end -}}
-
diff --git a/ric-aux/80-Auxiliary-Functions/helm/dashboard/templates/persistentVolumeClaim.yaml b/ric-aux/80-Auxiliary-Functions/helm/dashboard/templates/persistentVolumeClaim.yaml
deleted file mode 100644 (file)
index c436a42..0000000
+++ /dev/null
@@ -1,11 +0,0 @@
-kind: PersistentVolumeClaim
-apiVersion: v1
-metadata:
-  name:  pvc-{{ include "common.name.dashboard" . }}
-spec:
-  accessModes:
-  - ReadWriteOnce
-  storageClassName: {{ .Values.dashboard.storageclass | default (printf "storageclass-%s" ( include "common.name.dashboard" . )) }}
-  resources:
-    requests:
-      storage: {{ .Values.dashboard.storagesize }}
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/example_recipe.yaml b/ric-aux/RECIPE_EXAMPLE/example_recipe.yaml
new file mode 100644 (file)
index 0000000..81c9d3a
--- /dev/null
@@ -0,0 +1,115 @@
+################################################################################
+#   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
+# The release and staging LF repos' credentials have already been included.
+# Please do not create duplicate entries
+#docker-credential:
+#  enabled: true
+#  credential:
+#    SOME_KEY_NAME:
+#      registry: ""
+#      credential:
+#        user: ""
+#        password: ""
+#        email: ""
+
+
+dashboard:
+  imagePullPolicy: IfNotPresent
+  image:
+    registry: nexus3.o-ran-sc.org:10004/o-ran-sc
+    name: ric-dashboard
+    tag: 2.0.0
+  cipher:
+    enc:
+      key: AGLDdG4D04BKm2IxIWEr8o==
+  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
+  # instances are passed as string and reformatted into YAML
+  ricinstances: |
+    regions:
+      -
+        name: Region PIZ-R4
+        instances:
+          -
+            key: i1
+            name: RIC
+            appUrlPrefix: http://ric-entry
+            caasUrlPrefix: http://caas-ingress-is-REC-only
+            pltUrlPrefix: http://ric-entry
+
+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"
similarity index 99%
rename from ric-aux/80-Auxiliary-Functions/helm/dashboard/Chart.yaml
rename to ric-aux/helm/dashboard/Chart.yaml
index 110927a..95d3478 100644 (file)
@@ -19,5 +19,5 @@ apiVersion: v1
 appVersion: "1.0"
 description: Helm Chart for RIC Dashboard
 name: dashboard
-version: 1.2.2
+version: 2.0.0
 icon: https://gerrit.o-ran-sc.org/r/gitweb?p=portal/ric-dashboard.git;a=blob;f=webapp-frontend/src/assets/at_t.png;h=3cced1d5ce4668fbf3b33064aaaa6920bc8130b6;hb=HEAD
@@ -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 -}}
@@ -27,28 +27,35 @@ metadata:
   name: {{ include "common.configmapname.dashboard" . }}-appconfig
 data:
   # one key per file
-  application.properties: |
-    server.port        = {{ include "common.serviceport.dashboard.container" . }}
-    userfile           = {{ .Values.dashboard.userfile }}
-    a1med.url.prefix   = {{ include "dashboard.prefix.a1mediator" . }}
-    a1med.url.suffix   = {{ .Values.dashboard.a1med.url.suffix   }}
-    anrxapp.url.prefix = {{ include "dashboard.prefix.anrxapp" . }}
-    anrxapp.url.suffix = {{ .Values.dashboard.anrxapp.url.suffix }}
-    appmgr.url.prefix  = {{ include "dashboard.prefix.appmgr" .  }}
-    appmgr.url.suffix  = {{ .Values.dashboard.appmgr.url.suffix  }}
-    caasingress.insecure = {{ .Values.dashboard.caasingress.insecure  }}
-    caasingress.aux.url.prefix  = {{ .Values.dashboard.caasingress.aux.url.prefix }}
-    caasingress.aux.url.suffix  = {{ .Values.dashboard.caasingress.aux.url.suffix }}
-    caasingress.plt.url.prefix  = {{ .Values.dashboard.caasingress.plt.url.prefix  }}
-    caasingress.plt.url.suffix  = {{ .Values.dashboard.caasingress.plt.url.suffix  }}
-    e2mgr.url.prefix   = {{ include "dashboard.prefix.e2mgr" .   }}
-    e2mgr.url.suffix   = {{ .Values.dashboard.e2mgr.url.suffix   }}
-    portalapi.security = {{ .Values.dashboard.portalapi.security }}
-    portalapi.appname  = {{ .Values.dashboard.portalapi.appname  }}
-    portalapi.username = {{ .Values.dashboard.portalapi.username }}
-    portalapi.password = {{ .Values.dashboard.portalapi.password }}
-    metrics.url.ac     = {{ .Values.dashboard.metrics.url.ac     }}
-    metrics.url.mc     = {{ .Values.dashboard.metrics.url.mc     }}
+  application.yaml: |
+    server:
+      port: {{ include "common.serviceport.dashboard.container" . }}
+    userfile: {{ .Values.dashboard.userfile }}
+    portalapi:
+      # constants for all deployments
+      decryptor: org.oransc.ric.portal.dashboard.portalapi.PortalSdkDecryptorAes
+      usercookie: UserId
+      # different in all deployments
+      security: {{ .Values.dashboard.portalapi.security }}
+      appname: {{ .Values.dashboard.portalapi.appname  }}
+      username: {{ .Values.dashboard.portalapi.username }}
+      password: {{ .Values.dashboard.portalapi.password }}
+    a1med:
+      url:
+        suffix: {{ .Values.dashboard.a1med.url.suffix   }}
+    appmgr:
+      url:
+        suffix: {{ .Values.dashboard.appmgr.url.suffix  }}
+    e2mgr:
+      url:
+        suffix: {{ .Values.dashboard.e2mgr.url.suffix   }}
+    caasingress:
+      insecure: {{ .Values.dashboard.caasingress.insecure  }}
+      plt:
+        url:
+          suffix: {{ .Values.dashboard.caasingress.plt.url.suffix  }}
+    ricinstances:
+{{ tpl .Values.dashboard.ricinstances . | indent 6 }}
 
   key.properties: |
     cipher.enc.key     = {{ .Values.dashboard.cipher.enc.key }}
@@ -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,22 +40,22 @@ 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" . }}
               protocol: TCP
           volumeMounts:
             - name: appconfig
-              mountPath: /config/application.properties
-              subPath: application.properties
+              mountPath: /config/application.yaml
+              subPath: application.yaml
               readOnly: true
             - name: appconfig
               mountPath: /maven/key.properties
@@ -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:
 #   See the License for the specific language governing permissions and        #
 #   limitations under the License.                                             #
 ################################################################################
+{{- if not .Values.dashboard.storageclass }}
+
+kind: StorageClass
+apiVersion: storage.k8s.io/v1
+metadata:
+  name: storageclass-{{ include "common.name.dashboard" . }}
+provisioner: kubernetes.io/no-provisioner
+volumeBindingMode: WaitForFirstConsumer
+
+---
 
 apiVersion: v1
-kind: Service
+kind: PersistentVolume
 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 }}
+  name: pv-{{ include "common.name.dashboard" . }}
 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 }}
+  capacity:
+    storage: {{ .Values.dashboard.storagesize }}
+  accessModes:
+  - ReadWriteOnce
+  persistentVolumeReclaimPolicy: Retain
+  storageClassName: storageclass-{{ include "common.name.dashboard" . }}
+  local:
+    path: {{ .Values.dashboard.datapath }}
+  nodeAffinity:
+    required:
+      nodeSelectorTerms:
+      - matchExpressions:
+        - key: local-storage
+          operator: In
+          values:
+          - enable
+{{- end -}}
+
 #   See the License for the specific language governing permissions and        #
 #   limitations under the License.                                             #
 ################################################################################
+kind: PersistentVolumeClaim
 apiVersion: v1
-kind: Secret
 metadata:
-  name: {{ include "common.dockercred.prefix" . }}-{{ .Values.repository | replace "." "-" | replace ":" "-" | replace "/" "-" }}
-data:
-  .dockercfg: {{ include "repository.secret" . }}
-type: kubernetes.io/dockercfg
+  name:  pvc-{{ include "common.name.dashboard" . }}
+spec:
+  accessModes:
+  - ReadWriteOnce
+  storageClassName: {{ .Values.dashboard.storageclass | default (printf "storageclass-%s" ( include "common.name.dashboard" . )) }}
+  resources:
+    requests:
+      storage: {{ .Values.dashboard.storagesize }}
 
 # 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: 2.0.0
   replicaCount: 1
 
   # Service ports are now defined in
@@ -42,47 +40,27 @@ dashboard:
   userfile: /dashboard-data/users.json
   # on the server
   datapath: /opt/data/dashboard-data
-  
-  # Many URL prefixes use K8S/Kong service names
+  # The URL prefixes are specific to instances
+  # and may be K8S service names, see below.
   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: ''
+      # uses pltUrlPrefix
+      suffix: /a1mediator
   appmgr:
     url:
-      # The default appmgr prefix is http://ricplt-entry/appmgr
-      # You can override the value using the following option
-      # prefix:
-      suffix: /ric/v1
+      # uses pltUrlPrefix
+      suffix: /appmgr/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:
+        # uses caasUrlPrefix
         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
+      # uses pltUrlPrefix
+      suffix: /e2mgr/v1
   cipher:
     enc:
       key:
@@ -94,7 +72,32 @@ dashboard:
     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
+  # Instance keys must be unique, but region names are for users only.
+  # Regions and instances are shown here only as documentation of the format.
+  ricinstances: |
+    regions:
+      -
+        name: Region AAA
+        instances:
+          -
+            key: i1
+            name: Primary RIC Instance
+            appUrlPrefix: App prefix 1
+            caasUrlPrefix: Caas prefix 1
+            pltUrlPrefix: Plt prefix 1
+          -
+            key: i2
+            name: RIC Instance Nr Two
+            appUrlPrefix: App prefix 2
+            caasUrlPrefix: Caas prefix 2
+            pltUrlPrefix: Plt prefix 2
+      -
+        name: Region DDD
+        instances:
+          -
+            key: i3
+            name: RIC Instance in region D
+            appUrlPrefix: App prefix 3
+            caasUrlPrefix: Caas prefix 3
+            pltUrlPrefix: Plt prefix 3
+# end
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..3d535f4
--- /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.36.6
+    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: docker-reg-cred
+  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"
diff --git a/ric-aux/helm/infrastructure/subcharts/kong/Chart.yaml b/ric-aux/helm/infrastructure/subcharts/kong/Chart.yaml
new file mode 100755 (executable)
index 0000000..bfb0c8a
--- /dev/null
@@ -0,0 +1,13 @@
+apiVersion: v1
+appVersion: "1.4"
+description: DEPRECATED The Cloud-Native Ingress and API-management
+engine: gotpl
+home: https://konghq.com/
+icon: https://s3.amazonaws.com/downloads.kong/universe/assets/icon-kong-inc-large.png
+maintainers:
+- email: shashi@konghq.com
+  name: shashiranjan84
+- email: harry@konghq.com
+  name: hbagdi
+name: kong
+version: 0.36.6
diff --git a/ric-aux/helm/infrastructure/subcharts/kong/FAQs.md b/ric-aux/helm/infrastructure/subcharts/kong/FAQs.md
new file mode 100755 (executable)
index 0000000..1bac262
--- /dev/null
@@ -0,0 +1,32 @@
+# Frequently Asked Questions (FAQs)
+
+#### Kong fails to start after `helm upgrade` when Postgres is used. What do I do?
+
+You may be running into this issue: https://github.com/helm/charts/issues/12575.
+This issue is caused due to: https://github.com/helm/helm/issues/3053.
+
+The problem that happens is that Postgres database has the old password but
+the new secret has a different password, which is used by Kong, and password
+based authentication fails.
+
+The solution to the problem is to specify a password to the `postgresql` chart.
+This is to ensure that the password is not generated randomly but is set to
+the same one that is user-provided on each upgrade.
+
+#### Kong fails to start on a fresh installation with Postgres. What do I do?
+
+Please make sure that there is no `PersistentVolumes` present from a previous
+release. If there are, it can lead to data or passwords being out of sync
+and result in connection issues.
+
+A simple way to find out is to use the following command:
+
+```
+kubectl get pv -n <your-namespace>
+```
+
+And then based on the `AGE` column, determine if you have an old volume.
+If you do, then please delete the release, delete the volume, and then
+do a fresh installation. PersistentVolumes can remain in the cluster even if
+you delete the namespace itself (the namespace in which they were present).
+
diff --git a/ric-aux/helm/infrastructure/subcharts/kong/README.md b/ric-aux/helm/infrastructure/subcharts/kong/README.md
new file mode 100755 (executable)
index 0000000..83b665d
--- /dev/null
@@ -0,0 +1,746 @@
+# DEPRECATED
+
+This chart has been deprecated in favor of
+Kong's official chart [repository](https://github.com/kong/charts).
+
+All users are advised to immediately migrate over to the new repository.
+
+## Kong for Kubernetes
+
+[Kong for Kubernetes](https://github.com/Kong/kubernetes-ingress-controller)
+is an open-source Ingress Controller for Kubernetes that offers
+API management capabilities with a plugin architecture.
+
+This chart bootstraps all the components needed to run Kong on a
+[Kubernetes](http://kubernetes.io) cluster using the
+[Helm](https://helm.sh) package manager.
+
+## TL;DR;
+
+```bash
+$ helm repo update
+$ helm install stable/kong
+```
+
+## Table of content
+
+- [Prerequisites](#prerequisites)
+- [Install](#install)
+- [Uninstall](#uninstall)
+- [Kong Enterprise](#kong-enterprise)
+- [FAQs](#faqs)
+- [Deployment Options](#deployment-options)
+  - [Database](#database)
+  - [Runtime package](#runtime-package)
+  - [Configuration method](#configuration-method)
+- [Configuration](#configuration)
+  - [Kong Parameters](#kong-parameters)
+  - [Ingress Controller Parameters](#ingress-controller-parameters)
+  - [General Parameters](#general-parameters)
+  - [The `env` section](#the-env-section)
+- [Kong Enterprise Parameters](#kong-enterprise-parameters)
+  - [Prerequisites](#prerequisites-1)
+    - [Kong Enterprise License](#kong-enterprise-license)
+    - [Kong Enterprise Docker registry access](#kong-enterprise-docker-registry-access)
+  - [Service location hints](#service-location-hints)
+  - [RBAC](#rbac)
+  - [Sessions](#sessions)
+  - [Email/SMTP](#emailsmtp)
+- [Changelog](#changelog)
+- [Seeking help](#seeking-help)
+
+## Prerequisites
+
+- Kubernetes 1.12+
+- PV provisioner support in the underlying infrastructure if persistence
+  is needed for Kong datastore.
+
+## Install
+
+To install the chart with the release name `my-release`:
+
+```bash
+$ helm repo update
+$ helm install --name my-release stable/kong
+```
+
+## Uninstall
+
+To uninstall/delete the `my-release` deployment:
+
+```bash
+$ helm delete my-release
+```
+
+The command removes all the Kubernetes components associated with the
+chart and deletes the release.
+
+> **Tip**: List all releases using `helm list`
+
+## FAQs
+
+Please read the
+[FAQs](https://github.com/helm/charts/blob/master/stable/kong/FAQs.md)
+document.
+
+## Kong Enterprise
+
+If using Kong Enterprise, several additional steps are necessary before
+installing the chart:
+
+- set `enterprise.enabled` to `true` in `values.yaml` file
+- Update values.yaml to use a Kong Enterprise image
+- Satisfy the two  prerequsisites below for
+  [Enterprise License](#kong-enterprise-license) and
+  [Enterprise Docker Registry](#kong-enterprise-docker-registry-access)
+
+Once you have these set, it is possible to install Kong Enterprise
+
+Please read through
+[Kong Enterprise considerations](#kong-enterprise-parameters)
+to understand all settings that are enterprise specific.
+
+## Deployment Options
+
+Kong is a highly configurable piece of software that can be deployed
+in a number of different ways, depending on your use-case.
+
+All combinations of various runtimes, databases and configuration methods are
+supported by this Helm chart.
+The recommended approach is to use the Ingress Controller based configuration
+along-with DB-less mode.
+
+Following sections detail on various high-level architecture options available:
+
+### Database
+
+Kong can run with or without a database (DB-less).
+By default, this chart installs Kong without a database.
+
+Although Kong can run with Postgres and Cassandra, the recommended database,
+if you would like to use one, is Postgres for Kubernetes installations.
+If your use-case warrants Cassandra, you should run the Cassandra cluster
+outside of Kubernetes.
+
+The database to use for Kong can be controlled via the `env.database` parameter.
+For more details, please read the [env](#the-env-section) section.
+
+Furthermore, this chart allows you to bring your own database that you manage
+or spin up a new Postgres instance using the `postgres.enabled` parameter.
+
+> Cassandra deployment via a sub-chart was previously supported but
+the support has now been dropped due to stability issues.
+You can still deploy Cassandra on your own and configure Kong to use
+that via the `env.database` parameter.
+
+#### DB-less  deployment
+
+When deploying Kong in DB-less mode(`env.database: "off"`)
+and without the Ingress Controller(`ingressController.enabled: false`),
+you have to provide a declarative configuration for Kong to run.
+The configuration can be provided using an existing ConfigMap
+(`dblessConfig.configMap`) or or the whole configuration can be put into the
+`values.yaml` file for deployment itself, under the `dblessConfig.config`
+parameter. See the example configuration in the default values.yaml
+for more details.
+
+### Runtime package
+
+There are three different packages of Kong that are available:
+
+- **Kong Gateway**  
+  This is the [Open-Source](https://github.com/kong/kong) offering. It is a
+  full-blown API Gateway and Ingress solution with a wide-array of functionality.
+  When Kong Gateway is combined with the Ingress based configuration method,
+  you get Kong for Kubernetes. This is the default deployment for this Helm
+  Chart.
+- **Kong Enterprise K8S**  
+  This package builds up on top of the Open-Source Gateway and bundles in all
+  the Enterprise-only plugins as well.
+  When Kong Enterprise K8S is combined with the Ingress based
+  configuration method, you get Kong for Kubernetes Enterprise.
+  This package also comes with 24x7 support from Kong Inc.
+- **Kong Enterprise**  
+  This is the full-blown Enterprise package which packs with itself all the
+  Enterprise functionality like Manager, Portal, Vitals, etc.
+  This package can't be run in DB-less mode.
+
+The package to run can be changed via `image.repository` and `image.tag`
+parameters. If you would like to run the Enterprise package, please read
+the [Kong Enterprise Parameters](#kong-enterprise-parameters) section.
+
+### Configuration method
+
+Kong can be configured via two methods:
+- **Ingress and CRDs**  
+  The configuration for Kong is done via `kubectl` and Kubernetes-native APIs.
+  This is also known as Kong Ingress Controller or Kong for Kubernetes and is
+  the default deployment pattern for this Helm Chart. The configuration
+  for Kong is managed via Ingress and a few
+  [Custom Resources](https://github.com/Kong/kubernetes-ingress-controller/blob/master/docs/concepts/custom-resources.md).
+  For more details, please read the
+  [documentation](https://github.com/Kong/kubernetes-ingress-controller/tree/master/docs)
+  on Kong Ingress Controller.
+  To configure and fine-tune the controller, please read the
+  [Ingress Controller Parameters](#ingress-controller-parameters) section.
+- **Admin API**  
+  This is the traditional method of running and configuring Kong.
+  By default, the Admin API of Kong is not exposed as a Service. This
+  can be controlled via `admin.enabled` and `env.admin_listen` parameters.
+
+## Configuration
+
+### Kong parameters
+
+| Parameter                          | Description                                                                           | Default             |
+| ---------------------------------- | ------------------------------------------------------------------------------------- | ------------------- |
+| image.repository                   | Kong image                                                                            | `kong`              |
+| image.tag                          | Kong image version                                                                    | `1.3`               |
+| image.pullPolicy                   | Image pull policy                                                                     | `IfNotPresent`      |
+| image.pullSecrets                  | Image pull secrets                                                                    | `null`              |
+| replicaCount                       | Kong instance count                                                                   | `1`                 |
+| admin.enabled                      | Create Admin Service                                                                  | `false`             |
+| admin.useTLS                       | Secure Admin traffic                                                                  | `true`              |
+| admin.servicePort                  | TCP port on which the Kong admin service is exposed                                   | `8444`              |
+| admin.containerPort                | TCP port on which Kong app listens for admin traffic                                  | `8444`              |
+| admin.nodePort                     | Node port when service type is `NodePort`                                             |                     |
+| admin.hostPort                     | Host port to use for admin traffic                                                    |                     |
+| admin.type                         | k8s service type, Options: NodePort, ClusterIP, LoadBalancer                          | `NodePort`          |
+| admin.loadBalancerIP               | Will reuse an existing ingress static IP for the admin service                        | `null`              |
+| admin.loadBalancerSourceRanges     | Limit admin access to CIDRs if set and service type is `LoadBalancer`                 | `[]`                |
+| admin.ingress.enabled              | Enable ingress resource creation (works with proxy.type=ClusterIP)                    | `false`             |
+| admin.ingress.tls                  | Name of secret resource, containing TLS secret                                        |                     |
+| admin.ingress.hosts                | List of ingress hosts.                                                                | `[]`                |
+| admin.ingress.path                 | Ingress path.                                                                         | `/`                 |
+| admin.ingress.annotations          | Ingress annotations. See documentation for your ingress controller for details        | `{}`                |
+| proxy.http.enabled                 | Enables http on the proxy                                                             | true                |
+| proxy.http.servicePort             | Service port to use for http                                                          | 80                  |
+| proxy.http.containerPort           | Container port to use for http                                                        | 8000                |
+| proxy.http.nodePort                | Node port to use for http                                                             | 32080               |
+| proxy.http.hostPort                | Host port to use for http                                                             |                     |
+| proxy.tls.enabled                  | Enables TLS on the proxy                                                              | true                |
+| proxy.tls.containerPort            | Container port to use for TLS                                                         | 8443                |
+| proxy.tls.servicePort              | Service port to use for TLS                                                           | 8443                |
+| proxy.tls.nodePort                 | Node port to use for TLS                                                              | 32443               |
+| proxy.tls.hostPort                 | Host port to use for TLS                                                              |                     |
+| proxy.tls.overrideServiceTargetPort| Override service port to use for TLS without touching Kong containerPort              |                     |
+| proxy.type                         | k8s service type. Options: NodePort, ClusterIP, LoadBalancer                          | `LoadBalancer`      |
+| proxy.clusterIP                    | k8s service clusterIP                                                                 |                     |
+| proxy.loadBalancerSourceRanges     | Limit proxy access to CIDRs if set and service type is `LoadBalancer`                 | `[]`                |
+| proxy.loadBalancerIP               | To reuse an existing ingress static IP for the admin service                          |                     |
+| proxy.externalIPs                  | IPs for which nodes in the cluster will also accept traffic for the proxy             | `[]`                |
+| proxy.externalTrafficPolicy        | k8s service's externalTrafficPolicy. Options: Cluster, Local                          |                     |
+| proxy.ingress.enabled              | Enable ingress resource creation (works with proxy.type=ClusterIP)                    | `false`             |
+| proxy.ingress.tls                  | Name of secret resource, containing TLS secret                                        |                     |
+| proxy.ingress.hosts                | List of ingress hosts.                                                                | `[]`                |
+| proxy.ingress.path                 | Ingress path.                                                                         | `/`                 |
+| proxy.ingress.annotations          | Ingress annotations. See documentation for your ingress controller for details        | `{}`                |
+| plugins                            | Install custom plugins into Kong via ConfigMaps or Secrets                            | `{}`                |
+| env                                | Additional [Kong configurations](https://getkong.org/docs/latest/configuration/)      |                     |
+| runMigrations                      | Run Kong migrations job                                                               | `true`              |
+| waitImage.repository               | Image used to wait for database to become ready                                       | `busybox`           |
+| waitImage.tag                      | Tag for image used to wait for database to become ready                               | `latest`            |
+| waitImage.pullPolicy               | Wait image pull policy                                                                | `IfNotPresent`      |
+| postgresql.enabled                 | Spin up a new postgres instance for Kong                                              | `false`             |
+| dblessConfig.configMap             | Name of an existing ConfigMap containing the `kong.yml` file. This must have the key `kong.yml`.| `` |
+| dblessConfig.config                | Yaml configuration file for the dbless (declarative) configuration of Kong | see in `values.yaml`    |
+
+### Ingress Controller Parameters
+
+All of the following properties are nested under the `ingressController`
+section of `values.yaml` file:
+
+| Parameter                          | Description                                                                           | Default                                                                      |
+| ---------------------------------- | ------------------------------------------------------------------------------------- | ---------------------------------------------------------------------------- |
+| enabled                            | Deploy the ingress controller, rbac and crd                                           | true                                                                         |
+| replicaCount                       | Number of desired ingress controllers                                                 | 1                                                                            |
+| image.repository                   | Docker image with the ingress controller                                              | kong-docker-kubernetes-ingress-controller.bintray.io/kong-ingress-controller |
+| image.tag                          | Version of the ingress controller                                                     | 0.7.0                                                                        |
+| readinessProbe                     | Kong ingress controllers readiness probe                                              |                                                                              |
+| livenessProbe                      | Kong ingress controllers liveness probe                                               |                                                                              |
+| env                                | Specify Kong Ingress Controller configuration via environment variables               |                                                                              |
+| ingressClass                       | The ingress-class value for controller                                                | kong                                                                         |
+| admissionWebhook.enabled           | Whether to enable the validating admission webhook                                    | false                                                                        |
+| admissionWebhook.failurePolicy     | How unrecognized errors from the admission endpoint are handled (Ignore or Fail)      | Fail                                                                         |
+| admissionWebhook.port              | The port the ingress controller will listen on for admission webhooks                 | 8080                                                                         |
+
+For a complete list of all configuration values you can set in the 
+`env` section, please read the Kong Ingress Controller's
+[configuration document](https://github.com/Kong/kubernetes-ingress-controller/blob/master/docs/references/cli-arguments.md).
+
+### General Parameters
+
+| Parameter                          | Description                                                                           | Default             |
+| ---------------------------------- | ------------------------------------------------------------------------------------- | ------------------- |
+| updateStrategy                     | update strategy for deployment                                                        | `{}`                |
+| readinessProbe                     | Kong readiness probe                                                                  |                     |
+| livenessProbe                      | Kong liveness probe                                                                   |                     |
+| affinity                           | Node/pod affinities                                                                   |                     |
+| nodeSelector                       | Node labels for pod assignment                                                        | `{}`                |
+| podAnnotations                     | Annotations to add to each pod                                                        | `{}`                |
+| resources                          | Pod resource requests & limits                                                        | `{}`                |
+| tolerations                        | List of node taints to tolerate                                                       | `[]`                |
+| podDisruptionBudget.enabled        | Enable PodDisruptionBudget for Kong                                                   | `false`             |
+| podDisruptionBudget.maxUnavailable | Represents the minimum number of Pods that can be unavailable (integer or percentage) | `50%`               |
+| podDisruptionBudget.minAvailable   | Represents the number of Pods that must be available (integer or percentage)          |                     |
+| podSecurityPolicy.enabled          | Enable podSecurityPolicy for Kong                                                     | `false`             |
+| serviceMonitor.enabled             | Create ServiceMonitor for Prometheus Operator                                         | false               |
+| serviceMonitor.interval            | Scrapping interval                                                                    | 10s                 |
+| serviceMonitor.namespace           | Where to create ServiceMonitor                                                        |                     |
+| secretVolumes                      | Mount given secrets as a volume in Kong container to override default certs and keys. | `[]`                |
+| serviceMonitor.labels              | ServiceMonito Labels                                                                  | {}                  |
+
+#### The `env` section
+
+The `env` section can be used to configured all properties of Kong.
+Any key value put under this section translates to environment variables
+used to control Kong's configuration. Every key is prefixed with `KONG_`
+and upper-cased before setting the environment variable.
+
+Furthermore, all `kong.env` parameters can also accept a mapping instead of a
+value to ensure the parameters can be set through configmaps and secrets.
+
+An example :
+
+```yaml
+kong:
+  env:                       # load PG password from a secret dynamically
+     pg_user: kong
+     pg_password:
+       valueFrom:
+         secretKeyRef:
+            key: kong
+            name: postgres
+  nginx_worker_processes: "2"
+```
+
+For complete list of Kong configurations please check the
+[Kong configuration docs](https://docs.konghq.com/latest/configuration).
+
+> **Tip**: You can use the default [values.yaml](values.yaml)
+
+##### Admin/Proxy listener override
+
+If you specify `env.admin_listen` or `env.proxy_listen`, this chart will use
+the value provided by you as opposed to constructing a listen variable
+from fields like `proxy.http.containerPort` and `proxy.http.enabled`.
+This allows you to be more prescriptive when defining listen directives.
+
+**Note:** Overriding `env.proxy_listen` and `env.admin_listen` will
+potentially cause `admin.containerPort`, `proxy.http.containerPort` and
+`proxy.tls.containerPort` to become out of sync,
+and therefore must be updated accordingly.
+
+For example, updating to `env.proxy_listen: 0.0.0.0:4444, 0.0.0.0:4443 ssl`
+will need `proxy.http.containerPort: 4444` and `proxy.tls.containerPort: 4443`
+to be set in order for the service definition to work properly.
+
+## Kong Enterprise Parameters
+
+### Overview
+
+Kong Enterprise requires some additional configuration not needed when using
+Kong Open-Source. To use Kong Enterprise, at the minimum,
+you need to do the following:
+
+- set `enterprise.enabled` to `true` in `values.yaml` file
+- Update values.yaml to use a Kong Enterprise image
+- Satisfy the two  prerequsisites below for Enterprise License and
+  Enterprise Docker Registry
+
+Once you have these set, it is possible to install Kong Enterprise,
+but please make sure to review the below sections for other settings that
+you should consider configuring before installing Kong.
+
+Some of the more important configuration is grouped in sections
+under the `.enterprise` key in values.yaml, though most enterprise-specific
+configuration can be placed under the `.env` key.
+
+### Prerequisites
+
+#### Kong Enterprise License
+
+All Kong Enterprise deployments require a license. If you do not have a copy
+of yours, please contact Kong Support. Once you have it, you will need to
+store it in a Secret. Save your secret in a file named `license` (no extension)
+and then create and inspect your secret:
+
+```bash
+$ kubectl create secret generic kong-enterprise-license --from-file=./license
+```
+
+Set the secret name in `values.yaml`, in the `.enterprise.license_secret` key.
+Please ensure the above secret is created in the same namespace in which
+Kong is going to be deployed.
+
+#### Kong Enterprise Docker registry access
+
+Next, we need to setup Docker credentials in order to allow Kubernetes
+nodes to pull down Kong Enterprise Docker image, which is hosted as a private
+repository.
+
+As part of your sign up for Kong Enterprise, you should have received
+credentials for these as well.
+
+```bash
+$ kubectl create secret docker-registry kong-enterprise-docker \
+    --docker-server=kong-docker-kong-enterprise-k8s.bintray.io \
+    --docker-username=<your-username> \
+    --docker-password=<your-password>
+secret/kong-enterprise-docker created
+```
+
+Set the secret name in `values.yaml` in the `image.pullSecrets` section.
+Again, Please ensure the above secret is created in the same namespace in which
+Kong is going to be deployed.
+
+### Service location hints
+
+Kong Enterprise add two GUIs, Kong Manager and the Kong Developer Portal, that
+must know where other Kong services (namely the admin and files APIs) can be
+accessed in order to function properly. Kong's default behavior for attempting
+to locate these absent configuration is unlikely to work in common Kubernetes
+environments. Because of this, you should set each of `admin_gui_url`,
+`admin_api_uri`, `proxy_url`, `portal_api_url`, `portal_gui_host`, and
+`portal_gui_protocol` under the `.env` key in values.yaml to locations where
+each of their respective services can be accessed to ensure that Kong services
+can locate one another and properly set CORS headers. See the
+[Property Reference documentation](https://docs.konghq.com/enterprise/latest/property-reference/)
+for more details on these settings.
+
+### RBAC
+
+You can create a default RBAC superuser when initially setting up an
+environment, by setting the `KONG_PASSWORD` environment variable on the initial
+migration Job's Pod. This will create a `kong_admin` admin whose token and
+basic-auth password match the value of `KONG_PASSWORD`.
+You can create a secret holding the initial password value and then
+mount the secret as an environment variable using the `env` section.
+
+Note that RBAC is **NOT** currently enabled on the admin API container for the
+controller Pod when the ingress controller is enabled. This admin API container
+is not exposed outside the Pod, so only the controller can interact with it. We
+intend to add RBAC to this container in the future after updating the controller
+to add support for storing its RBAC token in a Secret, as currently it would
+need to be stored in plaintext. RBAC is still enforced on the admin API of the
+main deployment when using the ingress controller, as that admin API *is*
+accessible outside the Pod.
+
+### Sessions
+
+Login sessions for Kong Manager and the Developer Portal make use of
+[the Kong Sessions plugin](https://docs.konghq.com/enterprise/latest/kong-manager/authentication/sessions).
+Their configuration must be stored in Secrets, as it contains an HMAC key.
+If using either RBAC or the Portal, create a Secret with `admin_gui_session_conf`
+and `portal_session_conf` keys.
+
+```
+$ cat admin_gui_session_conf
+{"cookie_name":"admin_session","cookie_samesite":"off","secret":"admin-secret-CHANGEME","cookie_secure":true,"storage":"kong"}
+$ cat portal_session_conf
+{"cookie_name":"portal_session","cookie_samesite":"off","secret":"portal-secret-CHANGEME","cookie_secure":true,"storage":"kong"}
+$ kubectl create secret generic kong-session-config --from-file=admin_gui_session_conf --from-file=portal_session_conf
+secret/kong-session-config created
+```
+The exact plugin settings may vary in your environment. The `secret` should
+always be changed for both configurations.
+
+After creating your secret, set its name in values.yaml, in the
+`.enterprise.rbac.session_conf_secret` and
+`.enterprise.portal.session_conf_secret` keys.
+
+### Email/SMTP
+
+Email is used to send invitations for
+[Kong Admins](https://docs.konghq.com/enterprise/latest/kong-manager/networking/email)
+and [Developers](https://docs.konghq.com/enterprise/latest/developer-portal/configuration/smtp).
+
+Email invitations rely on setting a number of SMTP settings at once. For
+convenience, these are grouped under the `.enterprise.smtp` key in values.yaml.
+Setting `.enterprise.smtp.disabled: true` will set `KONG_SMTP_MOCK=on` and
+allow Admin/Developer invites to proceed without sending email. Note, however,
+that these have limited functionality without sending email.
+
+If your SMTP server requires authentication, you should the `username` and
+`smtp_password_secret` keys under `.enterprise.smtp.auth`.
+`smtp_password_secret` must be a Secret containing an `smtp_password` key whose
+value is your SMTP password.
+
+## Changelog
+
+### 0.36.6
+
+This version has no code changes and Kong's chart is now deprecated in this
+repository. Please use Kong's official
+[chart repository](https://github.com/kong/charts).
+
+### 0.36.5
+
+> PR https://github.com/helm/charts/pull/20099
+
+#### Improvements
+
+- Allow `grpc` protocol for KongPlugins
+
+### 0.36.4
+
+> PR https://github.com/helm/charts/pull/20051
+
+#### Fixed
+
+- Issue: [`Ingress Controller errors when chart is redeployed with Admission
+  Webhook enabled`](https://github.com/helm/charts/issues/20050)
+
+### 0.36.3
+
+> PR https://github.com/helm/charts/pull/19992
+
+#### Fixed
+
+- Fix spacing in ServiceMonitor when label is specified in config
+
+### 0.36.2
+
+> PR https://github.com/helm/charts/pull/19955
+
+#### Fixed
+
+- Set `sideEffects` and `admissionReviewVersions` for Admission Webhook
+- timeouts for liveness and readiness probes has been changed from `1s` to `5s`
+
+### 0.36.1
+
+> PR https://github.com/helm/charts/pull/19946
+
+#### Fixed
+
+- Added missing watch permission to custom resources
+
+### 0.36.0
+
+> PR https://github.com/helm/charts/pull/19916
+
+#### Upgrade Instructions
+
+- When upgrading from <0.35.0, in-place chart upgrades will fail.
+  It is necessary to delete the helm release with `helm del --purge $RELEASE` and redeploy from scratch.
+  Note that this will cause downtime for the kong proxy. 
+
+#### Improvements 
+
+- Fixed Deployment's label selector that prevented in-place chart upgrades.
+
+### 0.35.1
+
+> PR https://github.com/helm/charts/pull/19914
+
+#### Improvements
+
+- Update CRDs to Ingress Controller 0.7
+- Optimize readiness and liveness probes for more responsive health checks
+- Fixed incorrect space in NOTES.txt
+
+### 0.35.0
+
+> PR [#19856](https://github.com/helm/charts/pull/19856)
+
+#### Improvements
+
+- Labels on all resources have been updated to adhere to the Helm Chart
+  guideline here:
+  https://v2.helm.sh/docs/developing_charts/#syncing-your-chart-repository
+
+### 0.34.2
+
+> PR [#19854](https://github.com/helm/charts/pull/19854)
+
+This release contains no user-visible changes
+
+#### Under the hood
+
+ - Various tests have been consolidated to speed up CI.
+
+### 0.34.1
+
+> PR [#19887](https://github.com/helm/charts/pull/19887)
+
+#### Fixed
+
+- Correct indentation for Job securityContexts.
+
+### 0.34.0
+
+> PR [#19885](https://github.com/helm/charts/pull/19885)
+
+#### New features
+
+- Update default version of Ingress Controller to 0.7.0
+
+### 0.33.1
+
+> PR [#19852](https://github.com/helm/charts/pull/19852)
+
+#### Fixed
+
+- Correct an issue with white space handling within `final_env` helper.
+
+### 0.33.0
+
+> PR [#19840](https://github.com/helm/charts/pull/19840)
+
+#### Dependencies
+
+- Postgres sub-chart has been bumped up to 8.1.2
+
+#### Fixed
+
+- Removed podDisruption budge for Ingress Controller. Ingress Controller and
+  Kong run in the same pod so this was no longer applicable
+- Migration job now receives the same environment variable and configuration
+  as that of the Kong pod.
+- If Kong is configured to run with Postgres, the Kong pods now always wait
+  for Postgres to start. Previously this was done only when the sub-chart
+  Postgres was deployed.
+- A hard-coded container name is used for kong: `proxy`. Previously this
+  was auto-generated by Helm. This deterministic naming allows for simpler
+  scripts and documentation.
+
+#### Under the hood
+
+Following changes have no end user visible effects:
+
+- All Custom Resource Definitions have been consolidated into a single
+  template file
+- All RBAC resources have been consolidated into a single template file
+- `wait-for-postgres` container has been refactored and de-duplicated
+
+### 0.32.1
+
+#### Improvements
+
+- This is a doc only release. No code changes have been done.
+- Post installation steps have been simplified and now point to a getting
+  started page
+- Misc updates to README:
+  - Document missing variables
+  - Remove outdated variables
+  - Revamp and rewrite major portions of the README
+  - Added a table of content to make the content navigable
+
+### 0.32.0
+
+#### Improvements
+
+- Create and mount emptyDir volumes for `/tmp` and `/kong_prefix` to allow
+  for read-only root filesystem securityContexts and PodSecurityPolicys.
+- Use read-only mounts for custom plugin volumes.
+- Update stock PodSecurityPolicy to allow emptyDir access.
+- Override the standard `/usr/local/kong` prefix to the mounted emptyDir
+  at `/kong_prefix` in `.Values.env`.
+- Add securityContext injection points to template. By default,
+  it sets Kong pods to run with UID 1000.
+
+#### Fixes
+
+- Correct behavior for the Vitals toggle.
+  Vitals defaults to on in all current Kong Enterprise releases, and
+  the existing template only created the Vitals environment variable
+  if `.Values.enterprise.enabled == true`. Inverted template to create
+  it (and set it to "off") if that setting is instead disabled.
+- Correct an issue where custom plugin configurations would block Kong
+  from starting.
+
+### 0.31.0
+
+#### Breaking changes
+
+- Admin Service is disabled by default (`admin.enabled`)
+- Default for `proxy.type` has been changed to `LoadBalancer`
+
+#### New features
+
+- Update default version of Kong to 1.4
+- Update default version of Ingress Controller to 0.6.2
+- Add support to disable kong-admin service via `admin.enabled` flag.
+
+### 0.31.2
+
+#### Fixes
+
+- Do not remove white space between documents when rendering
+  `migrations-pre-upgrade.yaml`
+
+### 0.30.1
+
+#### New Features
+
+- Add support for specifying Proxy service ClusterIP
+
+### 0.30.0
+
+#### Breaking changes
+
+- `admin_gui_auth_conf_secret` is now required for Kong Manager
+  authentication methods other than `basic-auth`.
+  Users defining values for `admin_gui_auth_conf` should migrate them to
+  an externally-defined secret with a key of `admin_gui_auth_conf` and
+  reference the secret name in `admin_gui_auth_conf_secret`.
+
+### 0.29.0
+
+#### New Features
+
+- Add support for specifying Ingress Controller environment variables.
+
+### 0.28.0
+
+#### New Features
+
+- Added support for the Validating Admission Webhook with the Ingress Controller.
+
+### 0.27.2
+
+#### Fixes
+
+- Do not create a ServiceAccount if it is not necessary.
+- If a configuration change requires creating a ServiceAccount,
+  create a temporary ServiceAccount to allow pre-upgrade tasks to
+  complete before the regular ServiceAccount is created.
+
+### 0.27.1
+
+#### Documentation updates
+- Retroactive changelog update for 0.24 breaking changes.
+
+### 0.27.0
+
+#### Breaking changes
+
+- DB-less mode is enabled by default.
+- Kong is installed as an Ingress Controller for the cluster by default.
+
+### 0.25.0
+
+#### New features
+
+- Add support for PodSecurityPolicy
+- Require creation of a ServiceAccount
+
+### 0.24.0
+
+#### Breaking changes
+
+- The configuration format for ingresses in values.yaml has changed. 
+Previously, all ingresses accepted an array of hostnames, and would create
+ingress rules for each. Ingress configuration for services other than the proxy
+now accepts a single hostname, which allows simpler TLS configuration and
+automatic population of `admin_api_uri` and similar settings. Configuration for
+the proxy ingress is unchanged, but its documentation now accurately reflects
+the TLS configuration needed.
+
+## Seeking help
+
+If you run into an issue, bug or have a question, please reach out to the Kong
+community via [Kong Nation](https://discuss.konghq.com).
+Please do not open issues in [this](https://github.com/helm/charts) repository
+as the maintainers will not be notified and won't respond.
@@ -1,5 +1,5 @@
 apiVersion: v1
-appVersion: 10.6.0
+appVersion: 11.6.0
 description: Chart for PostgreSQL, an object-relational database management system
   (ORDBMS) with an emphasis on extensibility and on standards-compliance.
 engine: gotpl
@@ -20,4 +20,4 @@ maintainers:
 name: postgresql
 sources:
 - https://github.com/bitnami/bitnami-docker-postgresql
-version: 3.9.5
+version: 8.1.2
diff --git a/ric-aux/helm/infrastructure/subcharts/kong/charts/postgresql/README.md b/ric-aux/helm/infrastructure/subcharts/kong/charts/postgresql/README.md
new file mode 100755 (executable)
index 0000000..d3a66f9
--- /dev/null
@@ -0,0 +1,535 @@
+# PostgreSQL
+
+[PostgreSQL](https://www.postgresql.org/) is an object-relational database management system (ORDBMS) with an emphasis on extensibility and on standards-compliance.
+
+For HA, please see [this repo](https://github.com/bitnami/charts/tree/master/bitnami/postgresql-ha)
+
+## TL;DR;
+
+```console
+$ helm install stable/postgresql
+```
+
+## Introduction
+
+This chart bootstraps a [PostgreSQL](https://github.com/bitnami/bitnami-docker-postgresql) deployment on a [Kubernetes](http://kubernetes.io) cluster using the [Helm](https://helm.sh) package manager.
+
+Bitnami charts can be used with [Kubeapps](https://kubeapps.com/) for deployment and management of Helm Charts in clusters. This chart has been tested to work with NGINX Ingress, cert-manager, fluentd and Prometheus on top of the [BKPR](https://kubeprod.io/).
+
+## Prerequisites
+
+- Kubernetes 1.12+
+- Helm 2.11+ or Helm 3.0-beta3+
+- PV provisioner support in the underlying infrastructure
+
+## Installing the Chart
+To install the chart with the release name `my-release`:
+
+```console
+$ helm install --name my-release stable/postgresql
+```
+
+The command deploys PostgreSQL on the Kubernetes cluster in the default configuration. The [Parameters](#parameters) section lists the parameters that can be configured during installation.
+
+> **Tip**: List all releases using `helm list`
+
+## Uninstalling the Chart
+
+To uninstall/delete the `my-release` deployment:
+
+```console
+$ helm delete my-release
+```
+
+The command removes all the Kubernetes components associated with the chart and deletes the release.
+
+## Parameters
+
+The following tables lists the configurable parameters of the PostgreSQL chart and their default values.
+
+|                   Parameter                   |                                                                                Description                                                                                |                            Default                            |
+|-----------------------------------------------|---------------------------------------------------------------------------------------------------------------------------------------------------------------------------|---------------------------------------------------------------|
+| `global.imageRegistry`                        | Global Docker Image registry                                                                                                                                              | `nil`                                                         |
+| `global.postgresql.postgresqlDatabase`        | PostgreSQL database (overrides `postgresqlDatabase`)                                                                                                                      | `nil`                                                         |
+| `global.postgresql.postgresqlUsername`        | PostgreSQL username (overrides `postgresqlUsername`)                                                                                                                      | `nil`                                                         |
+| `global.postgresql.existingSecret`            | Name of existing secret to use for PostgreSQL passwords (overrides `existingSecret`)                                                                                      | `nil`                                                         |
+| `global.postgresql.postgresqlPassword`        | PostgreSQL admin password (overrides `postgresqlPassword`)                                                                                                                | `nil`                                                         |
+| `global.postgresql.servicePort`               | PostgreSQL port (overrides `service.port`)                                                                                                                                | `nil`                                                         |
+| `global.postgresql.replicationPassword`       | Replication user password (overrides `replication.password`)                                                                                                              | `nil`                                                         |
+| `global.imagePullSecrets`                     | Global Docker registry secret names as an array                                                                                                                           | `[]` (does not add image pull secrets to deployed pods)       |
+| `global.storageClass`                         | Global storage class for dynamic provisioning                                                                                                                             | `nil`                                                         |
+| `image.registry`                              | PostgreSQL Image registry                                                                                                                                                 | `docker.io`                                                   |
+| `image.repository`                            | PostgreSQL Image name                                                                                                                                                     | `bitnami/postgresql`                                          |
+| `image.tag`                                   | PostgreSQL Image tag                                                                                                                                                      | `{TAG_NAME}`                                                  |
+| `image.pullPolicy`                            | PostgreSQL Image pull policy                                                                                                                                              | `IfNotPresent`                                                |
+| `image.pullSecrets`                           | Specify Image pull secrets                                                                                                                                                | `nil` (does not add image pull secrets to deployed pods)      |
+| `image.debug`                                 | Specify if debug values should be set                                                                                                                                     | `false`                                                       |
+| `nameOverride`                                | String to partially override postgresql.fullname template with a string (will prepend the release name)                                                                   | `nil`                                                         |
+| `fullnameOverride`                            | String to fully override postgresql.fullname template with a string                                                                                                       | `nil`                                                         |
+| `volumePermissions.image.registry`            | Init container volume-permissions image registry                                                                                                                          | `docker.io`                                                   |
+| `volumePermissions.image.repository`          | Init container volume-permissions image name                                                                                                                              | `bitnami/minideb`                                             |
+| `volumePermissions.image.tag`                 | Init container volume-permissions image tag                                                                                                                               | `stretch`                                                     |
+| `volumePermissions.image.pullPolicy`          | Init container volume-permissions image pull policy                                                                                                                       | `Always`                                                      |
+| `volumePermissions.securityContext.runAsUser` | User ID for the init container                                                                                                                                            | `0`                                                           |
+| `usePasswordFile`                             | Have the secrets mounted as a file instead of env vars                                                                                                                    | `false`                                                       |
+| `ldap.enabled`                                | Enable LDAP support                                                                                                                                                       | `false`                                                       |
+| `ldap.existingSecret`                         | Name of existing secret to use for LDAP passwords                                                                                                                         | `nil`                                                         |
+| `ldap.url`                                    | LDAP URL beginning in the form `ldap[s]://host[:port]/basedn[?[attribute][?[scope][?[filter]]]]`                                                                          | `nil`                                                         |
+| `ldap.server`                                 | IP address or name of the LDAP server.                                                                                                                                    | `nil`                                                         |
+| `ldap.port`                                   | Port number on the LDAP server to connect to                                                                                                                              | `nil`                                                         |
+| `ldap.scheme`                                 | Set to `ldaps` to use LDAPS.                                                                                                                                              | `nil`                                                         |
+| `ldap.tls`                                    | Set to `1` to use TLS encryption                                                                                                                                          | `nil`                                                         |
+| `ldap.prefix`                                 | String to prepend to the user name when forming the DN to bind                                                                                                            | `nil`                                                         |
+| `ldap.suffix`                                 | String to append to the user name when forming the DN to bind                                                                                                             | `nil`                                                         |
+| `ldap.search_attr`                            | Attribute to match agains the user name in the search                                                                                                                     | `nil`                                                         |
+| `ldap.search_filter`                          | The search filter to use when doing search+bind authentication                                                                                                            | `nil`                                                         |
+| `ldap.baseDN`                                 | Root DN to begin the search for the user in                                                                                                                               | `nil`                                                         |
+| `ldap.bindDN`                                 | DN of user to bind to LDAP                                                                                                                                                | `nil`                                                         |
+| `ldap.bind_password`                          | Password for the user to bind to LDAP                                                                                                                                     | `nil`                                                         |
+| `replication.enabled`                         | Enable replication                                                                                                                                                        | `false`                                                       |
+| `replication.user`                            | Replication user                                                                                                                                                          | `repl_user`                                                   |
+| `replication.password`                        | Replication user password                                                                                                                                                 | `repl_password`                                               |
+| `replication.slaveReplicas`                   | Number of slaves replicas                                                                                                                                                 | `1`                                                           |
+| `replication.synchronousCommit`               | Set synchronous commit mode. Allowed values: `on`, `remote_apply`, `remote_write`, `local` and `off`                                                                      | `off`                                                         |
+| `replication.numSynchronousReplicas`          | Number of replicas that will have synchronous replication. Note: Cannot be greater than `replication.slaveReplicas`.                                                      | `0`                                                           |
+| `replication.applicationName`                 | Cluster application name. Useful for advanced replication settings                                                                                                        | `my_application`                                              |
+| `existingSecret`                              | Name of existing secret to use for PostgreSQL passwords                                                                                                                   | `nil`                                                         |
+| `postgresqlPostgresPassword`                  | PostgreSQL admin password (used when `postgresqlUsername` is not `postgres`)                                                                                              | _random 10 character alphanumeric string_                     |
+| `postgresqlUsername`                          | PostgreSQL admin user                                                                                                                                                     | `postgres`                                                    |
+| `postgresqlPassword`                          | PostgreSQL admin password                                                                                                                                                 | _random 10 character alphanumeric string_                     |
+| `postgresqlDatabase`                          | PostgreSQL database                                                                                                                                                       | `nil`                                                         |
+| `postgresqlDataDir`                           | PostgreSQL data dir folder                                                                                                                                                | `/bitnami/postgresql` (same value as persistence.mountPath)   |
+| `extraEnv`                                    | Any extra environment variables you would like to pass on to the pod. The value is evaluated as a template.                                                               | `[]`                                                          |
+| `postgresqlInitdbArgs`                        | PostgreSQL initdb extra arguments                                                                                                                                         | `nil`                                                         |
+| `postgresqlInitdbWalDir`                      | PostgreSQL location for transaction log                                                                                                                                   | `nil`                                                         |
+| `postgresqlConfiguration`                     | Runtime Config Parameters                                                                                                                                                 | `nil`                                                         |
+| `postgresqlExtendedConf`                      | Extended Runtime Config Parameters (appended to main or default configuration)                                                                                            | `nil`                                                         |
+| `pgHbaConfiguration`                          | Content of pg_hba.conf                                                                                                                                                    | `nil (do not create pg_hba.conf)`                             |
+| `configurationConfigMap`                      | ConfigMap with the PostgreSQL configuration files (Note: Overrides `postgresqlConfiguration` and `pgHbaConfiguration`). The value is evaluated as a template.             | `nil`                                                         |
+| `extendedConfConfigMap`                       | ConfigMap with the extended PostgreSQL configuration files. The value is evaluated as a template.                                                                         | `nil`                                                         |
+| `initdbScripts`                               | Dictionary of initdb scripts                                                                                                                                              | `nil`                                                         |
+| `initdbUsername`                              | PostgreSQL user to execute the .sql and sql.gz scripts                                                                                                                    | `nil`                                                         |
+| `initdbPassword`                              | Password for the user specified in `initdbUsername`                                                                                                                       | `nil`                                                         |
+| `initdbScriptsConfigMap`                      | ConfigMap with the initdb scripts (Note: Overrides `initdbScripts`). The value is evaluated as a template.                                                                | `nil`                                                         |
+| `initdbScriptsSecret`                         | Secret with initdb scripts that contain sensitive information (Note: can be used with `initdbScriptsConfigMap` or `initdbScripts`). The value is evaluated as a template. | `nil`                                                         |
+| `service.type`                                | Kubernetes Service type                                                                                                                                                   | `ClusterIP`                                                   |
+| `service.port`                                | PostgreSQL port                                                                                                                                                           | `5432`                                                        |
+| `service.nodePort`                            | Kubernetes Service nodePort                                                                                                                                               | `nil`                                                         |
+| `service.annotations`                         | Annotations for PostgreSQL service, the value is evaluated as a template.                                                                                                 | {}                                                            |
+| `service.loadBalancerIP`                      | loadBalancerIP if service type is `LoadBalancer`                                                                                                                          | `nil`                                                         |
+| `service.loadBalancerSourceRanges`            | Address that are allowed when svc is LoadBalancer                                                                                                                         | []                                                            |
+| `schedulerName`                               | Name of the k8s scheduler (other than default)                                                                                                                            | `nil`                                                         |
+| `shmVolume.enabled`                           | Enable emptyDir volume for /dev/shm for master and slave(s) Pod(s)                                                                                                        | `true`                                                        |
+| `persistence.enabled`                         | Enable persistence using PVC                                                                                                                                              | `true`                                                        |
+| `persistence.existingClaim`                   | Provide an existing `PersistentVolumeClaim`, the value is evaluated as a template.                                                                                        | `nil`                                                         |
+| `persistence.mountPath`                       | Path to mount the volume at                                                                                                                                               | `/bitnami/postgresql`                                         |
+| `persistence.subPath`                         | Subdirectory of the volume to mount at                                                                                                                                    | `""`                                                          |
+| `persistence.storageClass`                    | PVC Storage Class for PostgreSQL volume                                                                                                                                   | `nil`                                                         |
+| `persistence.accessModes`                     | PVC Access Mode for PostgreSQL volume                                                                                                                                     | `[ReadWriteOnce]`                                             |
+| `persistence.size`                            | PVC Storage Request for PostgreSQL volume                                                                                                                                 | `8Gi`                                                         |
+| `persistence.annotations`                     | Annotations for the PVC                                                                                                                                                   | `{}`                                                          |
+| `master.nodeSelector`                         | Node labels for pod assignment (postgresql master)                                                                                                                        | `{}`                                                          |
+| `master.affinity`                             | Affinity labels for pod assignment (postgresql master)                                                                                                                    | `{}`                                                          |
+| `master.tolerations`                          | Toleration labels for pod assignment (postgresql master)                                                                                                                  | `[]`                                                          |
+| `master.anotations`                           | Map of annotations to add to the statefulset (postgresql master)                                                                                                          | `{}`                                                          |
+| `master.labels`                               | Map of labels to add to the statefulset (postgresql master)                                                                                                               | `{}`                                                          |
+| `master.podAnnotations`                       | Map of annotations to add to the pods (postgresql master)                                                                                                                 | `{}`                                                          |
+| `master.podLabels`                            | Map of labels to add to the pods (postgresql master)                                                                                                                      | `{}`                                                          |
+| `master.priorityClassName`                    | Priority Class to use for each pod (postgresql master)                                                                                                                    | `nil`                                                          |
+| `master.extraInitContainers`                  | Additional init containers to add to the pods (postgresql master)                                                                                                         | `[]`                                                          |
+| `master.extraVolumeMounts`                    | Additional volume mounts to add to the pods (postgresql master)                                                                                                           | `[]`                                                          |
+| `master.extraVolumes`                         | Additional volumes to add to the pods (postgresql master)                                                                                                                 | `[]`                                                          |
+| `slave.nodeSelector`                          | Node labels for pod assignment (postgresql slave)                                                                                                                         | `{}`                                                          |
+| `slave.affinity`                              | Affinity labels for pod assignment (postgresql slave)                                                                                                                     | `{}`                                                          |
+| `slave.tolerations`                           | Toleration labels for pod assignment (postgresql slave)                                                                                                                   | `[]`                                                          |
+| `slave.anotations`                            | Map of annotations to add to the statefulsets (postgresql slave)                                                                                                          | `{}`                                                          |
+| `slave.labels`                                | Map of labels to add to the statefulsets (postgresql slave)                                                                                                               | `{}`                                                          |
+| `slave.podAnnotations`                        | Map of annotations to add to the pods (postgresql slave)                                                                                                                  | `{}`                                                          |
+| `slave.podLabels`                             | Map of labels to add to the pods (postgresql slave)                                                                                                                       | `{}`                                                          |
+| `slave.priorityClassName`                     | Priority Class to use for each pod (postgresql slave)                                                                                                                     | `nil`                                                          |
+| `slave.extraInitContainers`                   | Additional init containers to add to the pods (postgresql slave)                                                                                                          | `[]`                                                          |
+| `slave.extraVolumeMounts`                     | Additional volume mounts to add to the pods (postgresql slave)                                                                                                            | `[]`                                                          |
+| `slave.extraVolumes`                          | Additional volumes to add to the pods (postgresql slave)                                                                                                                  | `[]`                                                          |
+| `terminationGracePeriodSeconds`               | Seconds the pod needs to terminate gracefully                                                                                                                             | `nil`                                                         |
+| `resources`                                   | CPU/Memory resource requests/limits                                                                                                                                       | Memory: `256Mi`, CPU: `250m`                                  |
+| `securityContext.enabled`                     | Enable security context                                                                                                                                                   | `true`                                                        |
+| `securityContext.fsGroup`                     | Group ID for the container                                                                                                                                                | `1001`                                                        |
+| `securityContext.runAsUser`                   | User ID for the container                                                                                                                                                 | `1001`                                                        |
+| `serviceAccount.enabled`                      | Enable service account (Note: Service Account will only be automatically created if `serviceAccount.name` is not set)                                                     | `false`                                                       |
+| `serviceAcccount.name`                        | Name of existing service account                                                                                                                                          | `nil`                                                         |
+| `livenessProbe.enabled`                       | Would you like a livenessProbe to be enabled                                                                                                                              | `true`                                                        |
+| `networkPolicy.enabled`                       | Enable NetworkPolicy                                                                                                                                                      | `false`                                                       |
+| `networkPolicy.allowExternal`                 | Don't require client label for connections                                                                                                                                | `true`                                                        |
+| `networkPolicy.explicitNamespacesSelector`    | A Kubernetes LabelSelector to explicitly select namespaces from which ingress traffic could be allowed                                                                    | `nil`                                                         |
+| `livenessProbe.initialDelaySeconds`           | Delay before liveness probe is initiated                                                                                                                                  | 30                                                            |
+| `livenessProbe.periodSeconds`                 | How often to perform the probe                                                                                                                                            | 10                                                            |
+| `livenessProbe.timeoutSeconds`                | When the probe times out                                                                                                                                                  | 5                                                             |
+| `livenessProbe.failureThreshold`              | Minimum consecutive failures for the probe to be considered failed after having succeeded.                                                                                | 6                                                             |
+| `livenessProbe.successThreshold`              | Minimum consecutive successes for the probe to be considered successful after having failed                                                                               | 1                                                             |
+| `readinessProbe.enabled`                      | would you like a readinessProbe to be enabled                                                                                                                             | `true`                                                        |
+| `readinessProbe.initialDelaySeconds`          | Delay before readiness probe is initiated                                                                                                                                 | 5                                                             |
+| `readinessProbe.periodSeconds`                | How often to perform the probe                                                                                                                                            | 10                                                            |
+| `readinessProbe.timeoutSeconds`               | When the probe times out                                                                                                                                                  | 5                                                             |
+| `readinessProbe.failureThreshold`             | Minimum consecutive failures for the probe to be considered failed after having succeeded.                                                                                | 6                                                             |
+| `readinessProbe.successThreshold`             | Minimum consecutive successes for the probe to be considered successful after having failed                                                                               | 1                                                             |
+| `metrics.enabled`                             | Start a prometheus exporter                                                                                                                                               | `false`                                                       |
+| `metrics.service.type`                        | Kubernetes Service type                                                                                                                                                   | `ClusterIP`                                                   |
+| `service.clusterIP`                           | Static clusterIP or None for headless services                                                                                                                            | `nil`                                                         |
+| `metrics.service.annotations`                 | Additional annotations for metrics exporter pod                                                                                                                           | `{ prometheus.io/scrape: "true", prometheus.io/port: "9187"}` |
+| `metrics.service.loadBalancerIP`              | loadBalancerIP if redis metrics service type is `LoadBalancer`                                                                                                            | `nil`                                                         |
+| `metrics.serviceMonitor.enabled`              | Set this to `true` to create ServiceMonitor for Prometheus operator                                                                                                       | `false`                                                       |
+| `metrics.serviceMonitor.additionalLabels`     | Additional labels that can be used so ServiceMonitor will be discovered by Prometheus                                                                                     | `{}`                                                          |
+| `metrics.serviceMonitor.namespace`            | Optional namespace in which to create ServiceMonitor                                                                                                                      | `nil`                                                         |
+| `metrics.serviceMonitor.interval`             | Scrape interval. If not set, the Prometheus default scrape interval is used                                                                                               | `nil`                                                         |
+| `metrics.serviceMonitor.scrapeTimeout`        | Scrape timeout. If not set, the Prometheus default scrape timeout is used                                                                                                 | `nil`                                                         |
+| `metrics.prometheusRule.enabled`              | Set this to true to create prometheusRules for Prometheus operator                                                                                                        | `false`                                                       |
+| `metrics.prometheusRule.additionalLabels`     | Additional labels that can be used so prometheusRules will be discovered by Prometheus                                                                                    | `{}`                                                          |
+| `metrics.prometheusRule.namespace`            | namespace where prometheusRules resource should be created                                                                                                                | the same namespace as postgresql                              |
+| `metrics.prometheusRule.rules`                | [rules](https://prometheus.io/docs/prometheus/latest/configuration/alerting_rules/) to be created, check values for an example.                                            | `[]`                                                          |
+| `metrics.image.registry`                      | PostgreSQL Image registry                                                                                                                                                 | `docker.io`                                                   |
+| `metrics.image.repository`                    | PostgreSQL Image name                                                                                                                                                     | `bitnami/postgres-exporter`                                   |
+| `metrics.image.tag`                           | PostgreSQL Image tag                                                                                                                                                      | `{TAG_NAME}`                                                  |
+| `metrics.image.pullPolicy`                    | PostgreSQL Image pull policy                                                                                                                                              | `IfNotPresent`                                                |
+| `metrics.image.pullSecrets`                   | Specify Image pull secrets                                                                                                                                                | `nil` (does not add image pull secrets to deployed pods)      |
+| `metrics.customMetrics`                       | Additional custom metrics                                                                                                                                                 | `nil`                                                         |
+| `metrics.securityContext.enabled`             | Enable security context for metrics                                                                                                                                       | `false`                                                       |
+| `metrics.securityContext.runAsUser`           | User ID for the container for metrics                                                                                                                                     | `1001`                                                        |
+| `metrics.livenessProbe.initialDelaySeconds`   | Delay before liveness probe is initiated                                                                                                                                  | 30                                                            |
+| `metrics.livenessProbe.periodSeconds`         | How often to perform the probe                                                                                                                                            | 10                                                            |
+| `metrics.livenessProbe.timeoutSeconds`        | When the probe times out                                                                                                                                                  | 5                                                             |
+| `metrics.livenessProbe.failureThreshold`      | Minimum consecutive failures for the probe to be considered failed after having succeeded.                                                                                | 6                                                             |
+| `metrics.livenessProbe.successThreshold`      | Minimum consecutive successes for the probe to be considered successful after having failed                                                                               | 1                                                             |
+| `metrics.readinessProbe.enabled`              | would you like a readinessProbe to be enabled                                                                                                                             | `true`                                                        |
+| `metrics.readinessProbe.initialDelaySeconds`  | Delay before liveness probe is initiated                                                                                                                                  | 5                                                             |
+| `metrics.readinessProbe.periodSeconds`        | How often to perform the probe                                                                                                                                            | 10                                                            |
+| `metrics.readinessProbe.timeoutSeconds`       | When the probe times out                                                                                                                                                  | 5                                                             |
+| `metrics.readinessProbe.failureThreshold`     | Minimum consecutive failures for the probe to be considered failed after having succeeded.                                                                                | 6                                                             |
+| `metrics.readinessProbe.successThreshold`     | Minimum consecutive successes for the probe to be considered successful after having failed                                                                               | 1                                                             |
+| `updateStrategy`                              | Update strategy policy                                                                                                                                                    | `{type: "RollingUpdate"}`                                     |
+
+Specify each parameter using the `--set key=value[,key=value]` argument to `helm install`. For example,
+
+```console
+$ helm install --name my-release \
+  --set postgresqlPassword=secretpassword,postgresqlDatabase=my-database \
+    stable/postgresql
+```
+
+The above command sets the PostgreSQL `postgres` account password to `secretpassword`. Additionally it creates a database named `my-database`.
+
+Alternatively, a YAML file that specifies the values for the parameters can be provided while installing the chart. For example,
+
+```console
+$ helm install --name my-release -f values.yaml stable/postgresql
+```
+
+> **Tip**: You can use the default [values.yaml](values.yaml)
+
+## Configuration and installation details
+
+### [Rolling VS Immutable tags](https://docs.bitnami.com/containers/how-to/understand-rolling-tags-containers/)
+
+It is strongly recommended to use immutable tags in a production environment. This ensures your deployment does not change automatically if the same tag is updated with a different image.
+
+Bitnami will release a new chart updating its containers if a new version of the main container, significant changes, or critical vulnerabilities exist.
+
+### Production configuration and horizontal scaling
+
+This chart includes a `values-production.yaml` file where you can find some parameters oriented to production configuration in comparison to the regular `values.yaml`. You can use this file instead of the default one.
+
+- Enable replication:
+```diff
+- replication.enabled: false
++ replication.enabled: true
+```
+
+- Number of slaves replicas:
+```diff
+- replication.slaveReplicas: 1
++ replication.slaveReplicas: 2
+```
+
+- Set synchronous commit mode:
+```diff
+- replication.synchronousCommit: "off"
++ replication.synchronousCommit: "on"
+```
+
+- Number of replicas that will have synchronous replication:
+```diff
+- replication.numSynchronousReplicas: 0
++ replication.numSynchronousReplicas: 1
+```
+
+- Start a prometheus exporter:
+```diff
+- metrics.enabled: false
++ metrics.enabled: true
+```
+
+To horizontally scale this chart, you can use the `--replicas` flag to modify the number of nodes in your PostgreSQL deployment. Also you can use the `values-production.yaml` file or modify the parameters shown above.
+
+### Change PostgreSQL version
+
+To modify the PostgreSQL version used in this chart you can specify a [valid image tag](https://hub.docker.com/r/bitnami/postgresql/tags/) using the `image.tag` parameter. For example, `image.tag=12.0.0-debian-9-r0`
+
+### postgresql.conf / pg_hba.conf files as configMap
+
+This helm chart also supports to customize the whole configuration file.
+
+Add your custom file to "files/postgresql.conf" in your working directory. This file will be mounted as configMap to the containers and it will be used for configuring the PostgreSQL server.
+
+Alternatively, you can specify PostgreSQL configuration parameters using the `postgresqlConfiguration` parameter as a dict, using camelCase, e.g. {"sharedBuffers": "500MB"}.
+
+In addition to these options, you can also set an external ConfigMap with all the configuration files. This is done by setting the `configurationConfigMap` parameter. Note that this will override the two previous options.
+
+### Allow settings to be loaded from files other than the default `postgresql.conf`
+
+If you don't want to provide the whole PostgreSQL configuration file and only specify certain parameters, you can add your extended `.conf` files to "files/conf.d/" in your working directory.
+Those files will be mounted as configMap to the containers adding/overwriting the default configuration using the `include_dir` directive that allows settings to be loaded from files other than the default `postgresql.conf`.
+
+Alternatively, you can also set an external ConfigMap with all the extra configuration files. This is done by setting the `extendedConfConfigMap` parameter. Note that this will override the previous option.
+
+### Initialize a fresh instance
+
+The [Bitnami PostgreSQL](https://github.com/bitnami/bitnami-docker-postgresql) image allows you to use your custom scripts to initialize a fresh instance. In order to execute the scripts, they must be located inside the chart folder `files/docker-entrypoint-initdb.d` so they can be consumed as a ConfigMap.
+
+Alternatively, you can specify custom scripts using the `initdbScripts` parameter as dict.
+
+In addition to these options, you can also set an external ConfigMap with all the initialization scripts. This is done by setting the `initdbScriptsConfigMap` parameter. Note that this will override the two previous options. If your initialization scripts contain sensitive information such as credentials or passwords, you can use the `initdbScriptsSecret` parameter.
+
+The allowed extensions are `.sh`, `.sql` and `.sql.gz`.
+
+### Metrics
+
+The chart optionally can start a metrics exporter for [prometheus](https://prometheus.io). The metrics endpoint (port 9187) is not exposed and it is expected that the metrics are collected from inside the k8s cluster using something similar as the described in the [example Prometheus scrape configuration](https://github.com/prometheus/prometheus/blob/master/documentation/examples/prometheus-kubernetes.yml).
+
+The exporter allows to create custom metrics from additional SQL queries. See the Chart's `values.yaml` for an example and consult the [exporters documentation](https://github.com/wrouesnel/postgres_exporter#adding-new-metrics-via-a-config-file) for more details.
+
+### Use of global variables
+
+In more complex scenarios, we may have the following tree of dependencies
+
+```
+                     +--------------+
+                     |              |
+        +------------+   Chart 1    +-----------+
+        |            |              |           |
+        |            --------+------+           |
+        |                    |                  |
+        |                    |                  |
+        |                    |                  |
+        |                    |                  |
+        v                    v                  v
++-------+------+    +--------+------+  +--------+------+
+|              |    |               |  |               |
+|  PostgreSQL  |    |  Sub-chart 1  |  |  Sub-chart 2  |
+|              |    |               |  |               |
++--------------+    +---------------+  +---------------+
+```
+
+The three charts below depend on the parent chart Chart 1. However, subcharts 1 and 2 may need to connect to PostgreSQL as well. In order to do so, subcharts 1 and 2 need to know the PostgreSQL credentials, so one option for deploying could be deploy Chart 1 with the following parameters:
+
+```
+postgresql.postgresqlPassword=testtest
+subchart1.postgresql.postgresqlPassword=testtest
+subchart2.postgresql.postgresqlPassword=testtest
+postgresql.postgresqlDatabase=db1
+subchart1.postgresql.postgresqlDatabase=db1
+subchart2.postgresql.postgresqlDatabase=db1
+```
+
+If the number of dependent sub-charts increases, installing the chart with parameters can become increasingly difficult. An alternative would be to set the credentials using global variables as follows:
+
+```
+global.postgresql.postgresqlPassword=testtest
+global.postgresql.postgresqlDatabase=db1
+```
+
+This way, the credentials will be available in all of the subcharts.
+
+## Persistence
+
+The [Bitnami PostgreSQL](https://github.com/bitnami/bitnami-docker-postgresql) image stores the PostgreSQL data and configurations at the `/bitnami/postgresql` path of the container.
+
+Persistent Volume Claims are used to keep the data across deployments. This is known to work in GCE, AWS, and minikube.
+See the [Parameters](#parameters) section to configure the PVC or to disable persistence.
+
+If you already have data in it, you will fail to sync to standby nodes for all commits, details can refer to [code](https://github.com/bitnami/bitnami-docker-postgresql/blob/8725fe1d7d30ebe8d9a16e9175d05f7ad9260c93/9.6/debian-9/rootfs/libpostgresql.sh#L518-L556). If you need to use those data, please covert them to sql and import after `helm install` finished.
+
+## NetworkPolicy
+
+To enable network policy for PostgreSQL, install [a networking plugin that implements the Kubernetes NetworkPolicy spec](https://kubernetes.io/docs/tasks/administer-cluster/declare-network-policy#before-you-begin), and set `networkPolicy.enabled` to `true`.
+
+For Kubernetes v1.5 & v1.6, you must also turn on NetworkPolicy by setting the DefaultDeny namespace annotation. Note: this will enforce policy for _all_ pods in the namespace:
+
+```console
+$ kubectl annotate namespace default "net.beta.kubernetes.io/network-policy={\"ingress\":{\"isolation\":\"DefaultDeny\"}}"
+```
+
+With NetworkPolicy enabled, traffic will be limited to just port 5432.
+
+For more precise policy, set `networkPolicy.allowExternal=false`. This will only allow pods with the generated client label to connect to PostgreSQL.
+This label will be displayed in the output of a successful install.
+
+## Differences between Bitnami PostgreSQL image and [Docker Official](https://hub.docker.com/_/postgres) image
+
+- The Docker Official PostgreSQL image does not support replication. If you pass any replication environment variable, this would be ignored. The only environment variables supported by the Docker Official image are POSTGRES_USER, POSTGRES_DB, POSTGRES_PASSWORD, POSTGRES_INITDB_ARGS, POSTGRES_INITDB_WALDIR and PGDATA. All the remaining environment variables are specific to the Bitnami PostgreSQL image.
+- The Bitnami PostgreSQL image is non-root by default. This requires that you run the pod with `securityContext` and updates the permissions of the volume with an `initContainer`. A key benefit of this configuration is that the pod follows security best practices and is prepared to run on Kubernetes distributions with hard security constraints like OpenShift.
+
+### Deploy chart using Docker Official PostgreSQL Image
+
+From chart version 4.0.0, it is possible to use this chart with the Docker Official PostgreSQL image.
+Besides specifying the new Docker repository and tag, it is important to modify the PostgreSQL data directory and volume mount point. Basically, the PostgreSQL data dir cannot be the mount point directly, it has to be a subdirectory.
+
+```
+helm install --name postgres \
+             --set image.repository=postgres \
+             --set image.tag=10.6 \
+             --set postgresqlDataDir=/data/pgdata \
+             --set persistence.mountPath=/data/ \
+             stable/postgresql
+```
+
+## Upgrade
+
+It's necessary to specify the existing passwords while performing an upgrade to ensure the secrets are not updated with invalid randomly generated passwords. Remember to specify the existing values of the `postgresqlPassword` and `replication.password` parameters when upgrading the chart:
+
+```bash
+$ helm upgrade my-release bitnami/influxdb \
+    --set postgresqlPassword=[POSTGRESQL_PASSWORD] \
+    --set replication.password=[REPLICATION_PASSWORD]
+```
+
+> Note: you need to substitute the placeholders _[POSTGRESQL_PASSWORD]_, and _[REPLICATION_PASSWORD]_ with the values obtained from instructions in the installation notes.
+
+## 8.0.0
+
+Prefixes the port names with their protocols to comply with Istio conventions.
+
+If you depend on the port names in your setup, make sure to update them to reflect this change.
+
+## 7.1.0
+
+Adds support for LDAP configuration.
+
+## 7.0.0
+
+Helm performs a lookup for the object based on its group (apps), version (v1), and kind (Deployment). Also known as its GroupVersionKind, or GVK. Changing the GVK is considered a compatibility breaker from Kubernetes' point of view, so you cannot "upgrade" those objects to the new GVK in-place. Earlier versions of Helm 3 did not perform the lookup correctly which has since been fixed to match the spec.
+
+In https://github.com/helm/charts/pull/17281 the `apiVersion` of the statefulset resources was updated to `apps/v1` in tune with the api's deprecated, resulting in compatibility breakage.
+
+This major version bump signifies this change.
+
+## 6.5.7
+
+In this version, the chart will use PostgreSQL with the Postgis extension included. The version used with Postgresql version 10, 11 and 12 is Postgis 2.5. It has been compiled with the following dependencies:
+
+ - protobuf
+ - protobuf-c
+ - json-c
+ - geos
+ - proj
+
+## 5.0.0
+
+In this version, the **chart is using PostgreSQL 11 instead of PostgreSQL 10**. You can find the main difference and notable changes in the following links: [https://www.postgresql.org/about/news/1894/](https://www.postgresql.org/about/news/1894/) and [https://www.postgresql.org/about/featurematrix/](https://www.postgresql.org/about/featurematrix/).
+
+For major releases of PostgreSQL, the internal data storage format is subject to change, thus complicating upgrades, you can see some errors like the following one in the logs:
+
+```bash
+Welcome to the Bitnami postgresql container
+Subscribe to project updates by watching https://github.com/bitnami/bitnami-docker-postgresql
+Submit issues and feature requests at https://github.com/bitnami/bitnami-docker-postgresql/issues
+Send us your feedback at containers@bitnami.com
+
+INFO  ==> ** Starting PostgreSQL setup **
+NFO  ==> Validating settings in POSTGRESQL_* env vars..
+INFO  ==> Initializing PostgreSQL database...
+INFO  ==> postgresql.conf file not detected. Generating it...
+INFO  ==> pg_hba.conf file not detected. Generating it...
+INFO  ==> Deploying PostgreSQL with persisted data...
+INFO  ==> Configuring replication parameters
+INFO  ==> Loading custom scripts...
+INFO  ==> Enabling remote connections
+INFO  ==> Stopping PostgreSQL...
+INFO  ==> ** PostgreSQL setup finished! **
+
+INFO  ==> ** Starting PostgreSQL **
+  [1] FATAL:  database files are incompatible with server
+  [1] DETAIL:  The data directory was initialized by PostgreSQL version 10, which is not compatible with this version 11.3.
+```
+In this case, you should migrate the data from the old chart to the new one following an approach similar to that described in [this section](https://www.postgresql.org/docs/current/upgrading.html#UPGRADING-VIA-PGDUMPALL) from the official documentation. Basically, create a database dump in the old chart, move and restore it in the new one.
+
+### 4.0.0
+
+This chart will use by default the Bitnami PostgreSQL container starting from version `10.7.0-r68`. This version moves the initialization logic from node.js to bash. This new version of the chart requires setting the `POSTGRES_PASSWORD` in the slaves as well, in order to properly configure the `pg_hba.conf` file. Users from previous versions of the chart are advised to upgrade immediately.
+
+IMPORTANT: If you do not want to upgrade the chart version then make sure you use the `10.7.0-r68` version of the container. Otherwise, you will get this error
+
+```
+The POSTGRESQL_PASSWORD environment variable is empty or not set. Set the environment variable ALLOW_EMPTY_PASSWORD=yes to allow the container to be started with blank passwords. This is recommended only for development
+```
+
+### 3.0.0
+
+This releases make it possible to specify different nodeSelector, affinity and tolerations for master and slave pods.
+It also fixes an issue with `postgresql.master.fullname` helper template not obeying fullnameOverride.
+
+#### Breaking changes
+
+- `affinty` has been renamed to `master.affinity` and `slave.affinity`.
+- `tolerations` has been renamed to `master.tolerations` and `slave.tolerations`.
+- `nodeSelector` has been renamed to `master.nodeSelector` and `slave.nodeSelector`.
+
+### 2.0.0
+
+In order to upgrade from the `0.X.X` branch to `1.X.X`, you should follow the below steps:
+
+ - Obtain the service name (`SERVICE_NAME`) and password (`OLD_PASSWORD`) of the existing postgresql chart. You can find the instructions to obtain the password in the NOTES.txt, the service name can be obtained by running
+
+ ```console
+$ kubectl get svc
+ ```
+
+- Install (not upgrade) the new version
+
+```console
+$ helm repo update
+$ helm install --name my-release stable/postgresql
+```
+
+- Connect to the new pod (you can obtain the name by running `kubectl get pods`):
+
+```console
+$ kubectl exec -it NAME bash
+```
+
+- Once logged in, create a dump file from the previous database using `pg_dump`, for that we should connect to the previous postgresql chart:
+
+```console
+$ pg_dump -h SERVICE_NAME -U postgres DATABASE_NAME > /tmp/backup.sql
+```
+
+After run above command you should be prompted for a password, this password is the previous chart password (`OLD_PASSWORD`).
+This operation could take some time depending on the database size.
+
+- Once you have the backup file, you can restore it with a command like the one below:
+
+```console
+$ psql -U postgres DATABASE_NAME < /tmp/backup.sql
+```
+
+In this case, you are accessing to the local postgresql, so the password should be the new one (you can find it in NOTES.txt).
+
+If you want to restore the database and the database schema does not exist, it is necessary to first follow the steps described below.
+
+```console
+$ psql -U postgres
+postgres=# drop database DATABASE_NAME;
+postgres=# create database DATABASE_NAME;
+postgres=# create user USER_NAME;
+postgres=# alter role USER_NAME with password 'BITNAMI_USER_PASSWORD';
+postgres=# grant all privileges on database DATABASE_NAME to USER_NAME;
+postgres=# alter database DATABASE_NAME owner to USER_NAME;
+```
diff --git a/ric-aux/helm/infrastructure/subcharts/kong/charts/postgresql/ci/default-values.yaml b/ric-aux/helm/infrastructure/subcharts/kong/charts/postgresql/ci/default-values.yaml
new file mode 100755 (executable)
index 0000000..fc2ba60
--- /dev/null
@@ -0,0 +1 @@
+# Leave this file empty to ensure that CI runs builds against the default configuration in values.yaml.
diff --git a/ric-aux/helm/infrastructure/subcharts/kong/charts/postgresql/ci/shmvolume-disabled-values.yaml b/ric-aux/helm/infrastructure/subcharts/kong/charts/postgresql/ci/shmvolume-disabled-values.yaml
new file mode 100755 (executable)
index 0000000..347d3b4
--- /dev/null
@@ -0,0 +1,2 @@
+shmVolume:
+  enabled: false
diff --git a/ric-aux/helm/infrastructure/subcharts/kong/charts/postgresql/templates/NOTES.txt b/ric-aux/helm/infrastructure/subcharts/kong/charts/postgresql/templates/NOTES.txt
new file mode 100755 (executable)
index 0000000..3b5e6c6
--- /dev/null
@@ -0,0 +1,60 @@
+** Please be patient while the chart is being deployed **
+
+PostgreSQL can be accessed via port {{ template "postgresql.port" . }} on the following DNS name from within your cluster:
+
+    {{ template "postgresql.fullname" . }}.{{ .Release.Namespace }}.svc.cluster.local - Read/Write connection
+{{- if .Values.replication.enabled }}
+    {{ template "postgresql.fullname" . }}-read.{{ .Release.Namespace }}.svc.cluster.local - Read only connection
+{{- end }}
+
+{{- if and .Values.postgresqlPostgresPassword (not (eq .Values.postgresqlUsername "postgres")) }}
+
+To get the password for "postgres" run:
+
+    export POSTGRES_ADMIN_PASSWORD=$(kubectl get secret --namespace {{ .Release.Namespace }} {{ template "postgresql.secretName" . }} -o jsonpath="{.data.postgresql-postgres-password}" | base64 --decode)
+{{- end }}
+
+To get the password for "{{ template "postgresql.username" . }}" run:
+
+    export POSTGRES_PASSWORD=$(kubectl get secret --namespace {{ .Release.Namespace }} {{ template "postgresql.secretName" . }} -o jsonpath="{.data.postgresql-password}" | base64 --decode)
+
+To connect to your database run the following command:
+
+    kubectl run {{ template "postgresql.fullname" . }}-client --rm --tty -i --restart='Never' --namespace {{ .Release.Namespace }} --image {{ template "postgresql.image" . }} --env="PGPASSWORD=$POSTGRES_PASSWORD" {{- if and (.Values.networkPolicy.enabled) (not .Values.networkPolicy.allowExternal) }}
+   --labels="{{ template "postgresql.fullname" . }}-client=true" {{- end }} --command -- psql --host {{ template "postgresql.fullname" . }} -U {{ .Values.postgresqlUsername }} -d {{- if .Values.postgresqlDatabase }} {{ .Values.postgresqlDatabase }}{{- else }} postgres{{- end }} -p {{ template "postgresql.port" . }}
+
+{{ if and (.Values.networkPolicy.enabled) (not .Values.networkPolicy.allowExternal) }}
+Note: Since NetworkPolicy is enabled, only pods with label {{ template "postgresql.fullname" . }}-client=true" will be able to connect to this PostgreSQL cluster.
+{{- end }}
+
+To connect to your database from outside the cluster execute the following commands:
+
+{{- if contains "NodePort" .Values.service.type }}
+
+    export NODE_IP=$(kubectl get nodes --namespace {{ .Release.Namespace }} -o jsonpath="{.items[0].status.addresses[0].address}")
+    export NODE_PORT=$(kubectl get --namespace {{ .Release.Namespace }} -o jsonpath="{.spec.ports[0].nodePort}" services {{ template "postgresql.fullname" . }})
+    {{ if (include "postgresql.password" . )  }}PGPASSWORD="$POSTGRES_PASSWORD" {{ end }}psql --host $NODE_IP --port $NODE_PORT -U {{ .Values.postgresqlUsername }} -d {{- if .Values.postgresqlDatabase }} {{ .Values.postgresqlDatabase }}{{- else }} postgres{{- end }}
+
+{{- else if contains "LoadBalancer" .Values.service.type }}
+
+  NOTE: It may take a few minutes for the LoadBalancer IP to be available.
+        Watch the status with: 'kubectl get svc --namespace {{ .Release.Namespace }} -w {{ template "postgresql.fullname" . }}'
+
+    export SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ template "postgresql.fullname" . }} --template "{{"{{ range (index .status.loadBalancer.ingress 0) }}{{.}}{{ end }}"}}")
+    {{ if (include "postgresql.password" . ) }}PGPASSWORD="$POSTGRES_PASSWORD" {{ end }}psql --host $SERVICE_IP --port {{ template "postgresql.port" . }} -U {{ .Values.postgresqlUsername }} -d {{- if .Values.postgresqlDatabase }} {{ .Values.postgresqlDatabase }}{{- else }} postgres{{- end }}
+
+{{- else if contains "ClusterIP" .Values.service.type }}
+
+    kubectl port-forward --namespace {{ .Release.Namespace }} svc/{{ template "postgresql.fullname" . }} {{ template "postgresql.port" . }}:{{ template "postgresql.port" . }} &
+    {{ if (include "postgresql.password" . ) }}PGPASSWORD="$POSTGRES_PASSWORD" {{ end }}psql --host 127.0.0.1 -U {{ .Values.postgresqlUsername }} -d {{- if .Values.postgresqlDatabase }} {{ .Values.postgresqlDatabase }}{{- else }} postgres{{- end }} -p {{ template "postgresql.port" . }}
+
+{{- end }}
+
+{{- include "postgresql.validateValues" . -}}
+
+{{- if and (contains "bitnami/" .Values.image.repository) (not (.Values.image.tag | toString | regexFind "-r\\d+$|sha256:")) }}
+
+WARNING: Rolling tag detected ({{ .Values.image.repository }}:{{ .Values.image.tag }}), please note that it is strongly recommended to avoid using rolling tags in a production environment.
++info https://docs.bitnami.com/containers/how-to/understand-rolling-tags-containers/
+
+{{- end }}
diff --git a/ric-aux/helm/infrastructure/subcharts/kong/charts/postgresql/templates/_helpers.tpl b/ric-aux/helm/infrastructure/subcharts/kong/charts/postgresql/templates/_helpers.tpl
new file mode 100755 (executable)
index 0000000..3ee5572
--- /dev/null
@@ -0,0 +1,420 @@
+{{/* vim: set filetype=mustache: */}}
+{{/*
+Expand the name of the chart.
+*/}}
+{{- define "postgresql.name" -}}
+{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" -}}
+{{- 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).
+*/}}
+{{- define "postgresql.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 "-" -}}
+{{- end -}}
+{{- end -}}
+{{- 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).
+*/}}
+{{- define "postgresql.master.fullname" -}}
+{{- $name := default .Chart.Name .Values.nameOverride -}}
+{{- $fullname := default (printf "%s-%s" .Release.Name $name) .Values.fullnameOverride -}}
+{{- if .Values.replication.enabled -}}
+{{- printf "%s-%s" $fullname "master" | trunc 63 | trimSuffix "-" -}}
+{{- else -}}
+{{- printf "%s" $fullname | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+{{- end -}}
+
+{{/*
+Return the appropriate apiVersion for networkpolicy.
+*/}}
+{{- define "postgresql.networkPolicy.apiVersion" -}}
+{{- if semverCompare ">=1.4-0, <1.7-0" .Capabilities.KubeVersion.GitVersion -}}
+"extensions/v1beta1"
+{{- else if semverCompare "^1.7-0" .Capabilities.KubeVersion.GitVersion -}}
+"networking.k8s.io/v1"
+{{- end -}}
+{{- end -}}
+
+{{/*
+Create chart name and version as used by the chart label.
+*/}}
+{{- define "postgresql.chart" -}}
+{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+
+{{/*
+Return the proper PostgreSQL image name
+*/}}
+{{- define "postgresql.image" -}}
+{{- $registryName := .Values.image.registry -}}
+{{- $repositoryName := .Values.image.repository -}}
+{{- $tag := .Values.image.tag | toString -}}
+{{/*
+Helm 2.11 supports the assignment of a value to a variable defined in a different scope,
+but Helm 2.9 and 2.10 doesn't support it, so we need to implement this if-else logic.
+Also, we can't use a single if because lazy evaluation is not an option
+*/}}
+{{- if .Values.global }}
+    {{- if .Values.global.imageRegistry }}
+        {{- printf "%s/%s:%s" .Values.global.imageRegistry $repositoryName $tag -}}
+    {{- else -}}
+        {{- printf "%s/%s:%s" $registryName $repositoryName $tag -}}
+    {{- end -}}
+{{- else -}}
+    {{- printf "%s/%s:%s" $registryName $repositoryName $tag -}}
+{{- end -}}
+{{- end -}}
+
+{{/*
+Return PostgreSQL postgres user password
+*/}}
+{{- define "postgresql.postgres.password" -}}
+{{- if .Values.global.postgresql.postgresqlPostgresPassword }}
+    {{- .Values.global.postgresql.postgresqlPostgresPassword -}}
+{{- else if .Values.postgresqlPostgresPassword -}}
+    {{- .Values.postgresqlPostgresPassword -}}
+{{- else -}}
+    {{- randAlphaNum 10 -}}
+{{- end -}}
+{{- end -}}
+
+{{/*
+Return PostgreSQL password
+*/}}
+{{- define "postgresql.password" -}}
+{{- if .Values.global.postgresql.postgresqlPassword }}
+    {{- .Values.global.postgresql.postgresqlPassword -}}
+{{- else if .Values.postgresqlPassword -}}
+    {{- .Values.postgresqlPassword -}}
+{{- else -}}
+    {{- randAlphaNum 10 -}}
+{{- end -}}
+{{- end -}}
+
+{{/*
+Return PostgreSQL replication password
+*/}}
+{{- define "postgresql.replication.password" -}}
+{{- if .Values.global.postgresql.replicationPassword }}
+    {{- .Values.global.postgresql.replicationPassword -}}
+{{- else if .Values.replication.password -}}
+    {{- .Values.replication.password -}}
+{{- else -}}
+    {{- randAlphaNum 10 -}}
+{{- end -}}
+{{- end -}}
+
+{{/*
+Return PostgreSQL username
+*/}}
+{{- define "postgresql.username" -}}
+{{- if .Values.global.postgresql.postgresqlUsername }}
+    {{- .Values.global.postgresql.postgresqlUsername -}}
+{{- else -}}
+    {{- .Values.postgresqlUsername -}}
+{{- end -}}
+{{- end -}}
+
+
+{{/*
+Return PostgreSQL replication username
+*/}}
+{{- define "postgresql.replication.username" -}}
+{{- if .Values.global.postgresql.replicationUser }}
+    {{- .Values.global.postgresql.replicationUser -}}
+{{- else -}}
+    {{- .Values.replication.user -}}
+{{- end -}}
+{{- end -}}
+
+{{/*
+Return PostgreSQL port
+*/}}
+{{- define "postgresql.port" -}}
+{{- if .Values.global.postgresql.servicePort }}
+    {{- .Values.global.postgresql.servicePort -}}
+{{- else -}}
+    {{- .Values.service.port -}}
+{{- end -}}
+{{- end -}}
+
+{{/*
+Return PostgreSQL created database
+*/}}
+{{- define "postgresql.database" -}}
+{{- if .Values.global.postgresql.postgresqlDatabase }}
+    {{- .Values.global.postgresql.postgresqlDatabase -}}
+{{- else if .Values.postgresqlDatabase -}}
+    {{- .Values.postgresqlDatabase -}}
+{{- end -}}
+{{- end -}}
+
+{{/*
+Return the proper image name to change the volume permissions
+*/}}
+{{- define "postgresql.volumePermissions.image" -}}
+{{- $registryName := .Values.volumePermissions.image.registry -}}
+{{- $repositoryName := .Values.volumePermissions.image.repository -}}
+{{- $tag := .Values.volumePermissions.image.tag | toString -}}
+{{/*
+Helm 2.11 supports the assignment of a value to a variable defined in a different scope,
+but Helm 2.9 and 2.10 doesn't support it, so we need to implement this if-else logic.
+Also, we can't use a single if because lazy evaluation is not an option
+*/}}
+{{- if .Values.global }}
+    {{- if .Values.global.imageRegistry }}
+        {{- printf "%s/%s:%s" .Values.global.imageRegistry $repositoryName $tag -}}
+    {{- else -}}
+        {{- printf "%s/%s:%s" $registryName $repositoryName $tag -}}
+    {{- end -}}
+{{- else -}}
+    {{- printf "%s/%s:%s" $registryName $repositoryName $tag -}}
+{{- end -}}
+{{- end -}}
+
+{{/*
+Return the proper PostgreSQL metrics image name
+*/}}
+{{- define "postgresql.metrics.image" -}}
+{{- $registryName :=  default "docker.io" .Values.metrics.image.registry -}}
+{{- $repositoryName := .Values.metrics.image.repository -}}
+{{- $tag := default "latest" .Values.metrics.image.tag | toString -}}
+{{/*
+Helm 2.11 supports the assignment of a value to a variable defined in a different scope,
+but Helm 2.9 and 2.10 doesn't support it, so we need to implement this if-else logic.
+Also, we can't use a single if because lazy evaluation is not an option
+*/}}
+{{- if .Values.global }}
+    {{- if .Values.global.imageRegistry }}
+        {{- printf "%s/%s:%s" .Values.global.imageRegistry $repositoryName $tag -}}
+    {{- else -}}
+        {{- printf "%s/%s:%s" $registryName $repositoryName $tag -}}
+    {{- end -}}
+{{- else -}}
+    {{- printf "%s/%s:%s" $registryName $repositoryName $tag -}}
+{{- end -}}
+{{- end -}}
+
+{{/*
+Get the password secret.
+*/}}
+{{- define "postgresql.secretName" -}}
+{{- if .Values.global.postgresql.existingSecret }}
+    {{- printf "%s" .Values.global.postgresql.existingSecret -}}
+{{- else if .Values.existingSecret -}}
+    {{- printf "%s" .Values.existingSecret -}}
+{{- else -}}
+    {{- printf "%s" (include "postgresql.fullname" .) -}}
+{{- end -}}
+{{- end -}}
+
+{{/*
+Return true if a secret object should be created
+*/}}
+{{- define "postgresql.createSecret" -}}
+{{- if .Values.global.postgresql.existingSecret }}
+{{- else if .Values.existingSecret -}}
+{{- else -}}
+    {{- true -}}
+{{- end -}}
+{{- end -}}
+
+{{/*
+Get the configuration ConfigMap name.
+*/}}
+{{- define "postgresql.configurationCM" -}}
+{{- if .Values.configurationConfigMap -}}
+{{- printf "%s" (tpl .Values.configurationConfigMap $) -}}
+{{- else -}}
+{{- printf "%s-configuration" (include "postgresql.fullname" .) -}}
+{{- end -}}
+{{- end -}}
+
+{{/*
+Get the extended configuration ConfigMap name.
+*/}}
+{{- define "postgresql.extendedConfigurationCM" -}}
+{{- if .Values.extendedConfConfigMap -}}
+{{- printf "%s" (tpl .Values.extendedConfConfigMap $) -}}
+{{- else -}}
+{{- printf "%s-extended-configuration" (include "postgresql.fullname" .) -}}
+{{- end -}}
+{{- end -}}
+
+{{/*
+Get the initialization scripts ConfigMap name.
+*/}}
+{{- define "postgresql.initdbScriptsCM" -}}
+{{- if .Values.initdbScriptsConfigMap -}}
+{{- printf "%s" (tpl .Values.initdbScriptsConfigMap $) -}}
+{{- else -}}
+{{- printf "%s-init-scripts" (include "postgresql.fullname" .) -}}
+{{- end -}}
+{{- end -}}
+
+{{/*
+Get the initialization scripts Secret name.
+*/}}
+{{- define "postgresql.initdbScriptsSecret" -}}
+{{- printf "%s" (tpl .Values.initdbScriptsSecret $) -}}
+{{- end -}}
+
+{{/*
+Get the metrics ConfigMap name.
+*/}}
+{{- define "postgresql.metricsCM" -}}
+{{- printf "%s-metrics" (include "postgresql.fullname" .) -}}
+{{- end -}}
+
+{{/*
+Return the proper Docker Image Registry Secret Names
+*/}}
+{{- define "postgresql.imagePullSecrets" -}}
+{{/*
+Helm 2.11 supports the assignment of a value to a variable defined in a different scope,
+but Helm 2.9 and 2.10 does not support it, so we need to implement this if-else logic.
+Also, we can not use a single if because lazy evaluation is not an option
+*/}}
+{{- if .Values.global }}
+{{- if .Values.global.imagePullSecrets }}
+imagePullSecrets:
+{{- range .Values.global.imagePullSecrets }}
+  - name: {{ . }}
+{{- end }}
+{{- else if or .Values.image.pullSecrets .Values.metrics.image.pullSecrets .Values.volumePermissions.image.pullSecrets }}
+imagePullSecrets:
+{{- range .Values.image.pullSecrets }}
+  - name: {{ . }}
+{{- end }}
+{{- range .Values.metrics.image.pullSecrets }}
+  - name: {{ . }}
+{{- end }}
+{{- range .Values.volumePermissions.image.pullSecrets }}
+  - name: {{ . }}
+{{- end }}
+{{- end -}}
+{{- else if or .Values.image.pullSecrets .Values.metrics.image.pullSecrets .Values.volumePermissions.image.pullSecrets }}
+imagePullSecrets:
+{{- range .Values.image.pullSecrets }}
+  - name: {{ . }}
+{{- end }}
+{{- range .Values.metrics.image.pullSecrets }}
+  - name: {{ . }}
+{{- end }}
+{{- range .Values.volumePermissions.image.pullSecrets }}
+  - name: {{ . }}
+{{- end }}
+{{- end -}}
+{{- end -}}
+
+{{/*
+Get the readiness probe command
+*/}}
+{{- define "postgresql.readinessProbeCommand" -}}
+- |
+{{- if (include "postgresql.database" .) }}
+  exec pg_isready -U {{ include "postgresql.username" . | quote }} -d {{ (include "postgresql.database" .) | quote }} -h 127.0.0.1 -p {{ template "postgresql.port" . }}
+{{- else }}
+  exec pg_isready -U {{ include "postgresql.username" . | quote }} -h 127.0.0.1 -p {{ template "postgresql.port" . }}
+{{- end }}
+{{- if contains "bitnami/" .Values.image.repository }}
+  [ -f /opt/bitnami/postgresql/tmp/.initialized ] || [ -f /bitnami/postgresql/.initialized ]
+{{- end -}}
+{{- end -}}
+
+{{/*
+Return  the proper Storage Class
+*/}}
+{{- define "postgresql.storageClass" -}}
+{{/*
+Helm 2.11 supports the assignment of a value to a variable defined in a different scope,
+but Helm 2.9 and 2.10 does not support it, so we need to implement this if-else logic.
+*/}}
+{{- if .Values.global -}}
+    {{- if .Values.global.storageClass -}}
+        {{- if (eq "-" .Values.global.storageClass) -}}
+            {{- printf "storageClassName: \"\"" -}}
+        {{- else }}
+            {{- printf "storageClassName: %s" .Values.global.storageClass -}}
+        {{- end -}}
+    {{- else -}}
+        {{- if .Values.persistence.storageClass -}}
+              {{- if (eq "-" .Values.persistence.storageClass) -}}
+                  {{- printf "storageClassName: \"\"" -}}
+              {{- else }}
+                  {{- printf "storageClassName: %s" .Values.persistence.storageClass -}}
+              {{- end -}}
+        {{- end -}}
+    {{- end -}}
+{{- else -}}
+    {{- if .Values.persistence.storageClass -}}
+        {{- if (eq "-" .Values.persistence.storageClass) -}}
+            {{- printf "storageClassName: \"\"" -}}
+        {{- else }}
+            {{- printf "storageClassName: %s" .Values.persistence.storageClass -}}
+        {{- end -}}
+    {{- end -}}
+{{- end -}}
+{{- end -}}
+
+{{/*
+Renders a value that contains template.
+Usage:
+{{ include "postgresql.tplValue" ( dict "value" .Values.path.to.the.Value "context" $) }}
+*/}}
+{{- define "postgresql.tplValue" -}}
+    {{- if typeIs "string" .value }}
+        {{- tpl .value .context }}
+    {{- else }}
+        {{- tpl (.value | toYaml) .context }}
+    {{- end }}
+{{- end -}}
+
+{{/*
+Return the appropriate apiVersion for statefulset.
+*/}}
+{{- define "postgresql.statefulset.apiVersion" -}}
+{{- if semverCompare "<1.14-0" .Capabilities.KubeVersion.GitVersion -}}
+{{- print "apps/v1beta2" -}}
+{{- else -}}
+{{- print "apps/v1" -}}
+{{- end -}}
+{{- end -}}
+
+{{/*
+Compile all warnings into a single message, and call fail.
+*/}}
+{{- define "postgresql.validateValues" -}}
+{{- $messages := list -}}
+{{- $messages := append $messages (include "postgresql.validateValues.ldapConfigurationMethod" .) -}}
+{{- $messages := without $messages "" -}}
+{{- $message := join "\n" $messages -}}
+
+{{- if $message -}}
+{{- printf "\nVALUES VALIDATION:\n%s" $message | fail -}}
+{{- end -}}
+{{- end -}}
+
+{{/*
+Validate values of Postgresql - If ldap.url is used then you don't need the other settings for ldap
+*/}}
+{{- define "postgresql.validateValues.ldapConfigurationMethod" -}}
+{{- if and .Values.ldap.enabled (and (not (empty .Values.ldap.url)) (not (empty .Values.ldap.server))) }}
+postgresql: ldap.url, ldap.server
+    You cannot set both `ldap.url` and `ldap.server` at the same time.
+    Please provide a unique way to configure LDAP.
+    More info at https://www.postgresql.org/docs/current/auth-ldap.html
+{{- end -}}
+{{- end -}}
diff --git a/ric-aux/helm/infrastructure/subcharts/kong/charts/postgresql/templates/metrics-configmap.yaml b/ric-aux/helm/infrastructure/subcharts/kong/charts/postgresql/templates/metrics-configmap.yaml
new file mode 100755 (executable)
index 0000000..524aa2f
--- /dev/null
@@ -0,0 +1,13 @@
+{{- if and .Values.metrics.enabled .Values.metrics.customMetrics }}
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: {{ template "postgresql.metricsCM" . }}
+  labels:
+    app: {{ template "postgresql.name" . }}
+    chart: {{ template "postgresql.chart" . }}
+    release: {{ .Release.Name | quote }}
+    heritage: {{ .Release.Service | quote }}
+data:
+  custom-metrics.yaml: {{ toYaml .Values.metrics.customMetrics | quote }}
+{{- end }}
@@ -16,9 +16,9 @@ spec:
   loadBalancerIP: {{ .Values.metrics.service.loadBalancerIP }}
   {{- end }}
   ports:
-  - name: metrics
-    port: 9187
-    targetPort: metrics
+    - name: http-metrics
+      port: 9187
+      targetPort: http-metrics
   selector:
     app: {{ template "postgresql.name" . }}
     release: {{ .Release.Name }}
diff --git a/ric-aux/helm/infrastructure/subcharts/kong/charts/postgresql/templates/networkpolicy.yaml b/ric-aux/helm/infrastructure/subcharts/kong/charts/postgresql/templates/networkpolicy.yaml
new file mode 100755 (executable)
index 0000000..ea1fc9b
--- /dev/null
@@ -0,0 +1,38 @@
+{{- if .Values.networkPolicy.enabled }}
+kind: NetworkPolicy
+apiVersion: {{ template "postgresql.networkPolicy.apiVersion" . }}
+metadata:
+  name: {{ template "postgresql.fullname" . }}
+  labels:
+    app: {{ template "postgresql.name" . }}
+    chart: {{ template "postgresql.chart" . }}
+    release: {{ .Release.Name | quote }}
+    heritage: {{ .Release.Service | quote }}
+spec:
+  podSelector:
+    matchLabels:
+      app: {{ template "postgresql.name" . }}
+      release: {{ .Release.Name | quote }}
+  ingress:
+    # Allow inbound connections
+    - ports:
+        - port: {{ template "postgresql.port" . }}
+      {{- if not .Values.networkPolicy.allowExternal }}
+      from:
+        - podSelector:
+            matchLabels:
+              {{ template "postgresql.fullname" . }}-client: "true"
+          {{- if .Values.networkPolicy.explicitNamespacesSelector }}
+          namespaceSelector:
+{{ toYaml .Values.networkPolicy.explicitNamespacesSelector | indent 12 }}
+          {{- end }}
+        - podSelector:
+            matchLabels:
+              app: {{ template "postgresql.name" . }}
+              release: {{ .Release.Name | quote }}
+              role: slave
+      {{- end }}
+    # Allow prometheus scrapes
+    - ports:
+        - port: 9187
+{{- end }}
diff --git a/ric-aux/helm/infrastructure/subcharts/kong/charts/postgresql/templates/prometheusrule.yaml b/ric-aux/helm/infrastructure/subcharts/kong/charts/postgresql/templates/prometheusrule.yaml
new file mode 100755 (executable)
index 0000000..44f1242
--- /dev/null
@@ -0,0 +1,23 @@
+{{- if and .Values.metrics.enabled .Values.metrics.prometheusRule.enabled }}
+apiVersion: monitoring.coreos.com/v1
+kind: PrometheusRule
+metadata:
+  name: {{ template "postgresql.fullname" . }}
+{{- with .Values.metrics.prometheusRule.namespace }}
+  namespace: {{ . }}
+{{- end }}
+  labels:
+    app: {{ template "postgresql.name" . }}
+    chart: {{ template "postgresql.chart" . }}
+    release: {{ .Release.Name | quote }}
+    heritage: {{ .Release.Service | quote }}
+{{- with .Values.metrics.prometheusRule.additionalLabels }}
+{{ toYaml . | indent 4 }}
+{{- end }}
+spec:
+{{- with .Values.metrics.prometheusRule.rules }}
+  groups:
+    - name: {{ template "postgresql.name" $ }}
+      rules: {{ tpl (toYaml .) $ | nindent 8 }}
+{{- end }}
+{{- end }}
diff --git a/ric-aux/helm/infrastructure/subcharts/kong/charts/postgresql/templates/secrets.yaml b/ric-aux/helm/infrastructure/subcharts/kong/charts/postgresql/templates/secrets.yaml
new file mode 100755 (executable)
index 0000000..094d18b
--- /dev/null
@@ -0,0 +1,23 @@
+{{- if (include "postgresql.createSecret" .) }}
+apiVersion: v1
+kind: Secret
+metadata:
+  name: {{ template "postgresql.fullname" . }}
+  labels:
+    app: {{ template "postgresql.name" . }}
+    chart: {{ template "postgresql.chart" . }}
+    release: {{ .Release.Name | quote }}
+    heritage: {{ .Release.Service | quote }}
+type: Opaque
+data:
+  {{- if and .Values.postgresqlPostgresPassword (not (eq .Values.postgresqlUsername "postgres")) }}
+  postgresql-postgres-password: {{ include "postgresql.postgres.password" . | b64enc | quote }}
+  {{- end }}
+  postgresql-password: {{ include "postgresql.password" . | b64enc | quote }}
+  {{- if .Values.replication.enabled }}
+  postgresql-replication-password: {{ include "postgresql.replication.password" . | b64enc | quote }}
+  {{- end }}
+  {{- if (and .Values.ldap.enabled .Values.ldap.bind_password)}}
+  postgresql-ldap-password: {{ .Values.ldap.bind_password | b64enc | quote }}
+  {{- end }}
+{{- end -}}
diff --git a/ric-aux/helm/infrastructure/subcharts/kong/charts/postgresql/templates/serviceaccount.yaml b/ric-aux/helm/infrastructure/subcharts/kong/charts/postgresql/templates/serviceaccount.yaml
new file mode 100755 (executable)
index 0000000..27e5b51
--- /dev/null
@@ -0,0 +1,11 @@
+{{- if and (.Values.serviceAccount.enabled) (not .Values.serviceAccount.name) }}
+apiVersion: v1
+kind: ServiceAccount
+metadata:
+  labels:
+    app: {{ template "postgresql.name" . }}
+    chart: {{ template "postgresql.chart" . }}
+    release: {{ .Release.Name | quote }}
+    heritage: {{ .Release.Service | quote }}
+  name: {{ template "postgresql.fullname" . }}
+{{- end }}
\ No newline at end of file
diff --git a/ric-aux/helm/infrastructure/subcharts/kong/charts/postgresql/templates/servicemonitor.yaml b/ric-aux/helm/infrastructure/subcharts/kong/charts/postgresql/templates/servicemonitor.yaml
new file mode 100755 (executable)
index 0000000..f3a529a
--- /dev/null
@@ -0,0 +1,33 @@
+{{- if and .Values.metrics.enabled .Values.metrics.serviceMonitor.enabled }}
+apiVersion: monitoring.coreos.com/v1
+kind: ServiceMonitor
+metadata:
+  name: {{ include "postgresql.fullname" . }}
+  {{- if .Values.metrics.serviceMonitor.namespace }}
+  namespace: {{ .Values.metrics.serviceMonitor.namespace }}
+  {{- end }}
+  labels:
+    app: {{ template "postgresql.name" . }}
+    chart: {{ template "postgresql.chart" . }}
+    release: {{ .Release.Name | quote }}
+    heritage: {{ .Release.Service | quote }}
+    {{- if .Values.metrics.serviceMonitor.additionalLabels }}
+{{ toYaml .Values.metrics.serviceMonitor.additionalLabels | indent 4 }}
+    {{- end }}
+spec:
+  endpoints:
+    - port: http-metrics
+      {{- if .Values.metrics.serviceMonitor.interval }}
+      interval: {{ .Values.metrics.serviceMonitor.interval }}
+      {{- end }}
+      {{- if .Values.metrics.serviceMonitor.scrapeTimeout }}
+      scrapeTimeout: {{ .Values.metrics.serviceMonitor.scrapeTimeout }}
+      {{- end }}
+  namespaceSelector:
+    matchNames:
+      - {{ .Release.Namespace }}
+  selector:
+    matchLabels:
+      app: {{ template "postgresql.name" . }}
+      release: {{ .Release.Name }}
+{{- end }}
diff --git a/ric-aux/helm/infrastructure/subcharts/kong/charts/postgresql/templates/statefulset-slaves.yaml b/ric-aux/helm/infrastructure/subcharts/kong/charts/postgresql/templates/statefulset-slaves.yaml
new file mode 100755 (executable)
index 0000000..3506199
--- /dev/null
@@ -0,0 +1,284 @@
+{{- if .Values.replication.enabled }}
+apiVersion: {{ template "postgresql.statefulset.apiVersion" . }}
+kind: StatefulSet
+metadata:
+  name: "{{ template "postgresql.fullname" . }}-slave"
+  labels:
+    app: {{ template "postgresql.name" . }}
+    chart: {{ template "postgresql.chart" . }}
+    release: {{ .Release.Name | quote }}
+    heritage: {{ .Release.Service | quote }}
+{{- with .Values.slave.labels }}
+{{ toYaml . | indent 4 }}
+{{- end }}
+{{- with .Values.slave.annotations }}
+  annotations:
+{{ toYaml . | indent 4 }}
+{{- end }}
+spec:
+  serviceName: {{ template "postgresql.fullname" . }}-headless
+  replicas: {{ .Values.replication.slaveReplicas }}
+  selector:
+    matchLabels:
+      app: {{ template "postgresql.name" . }}
+      release: {{ .Release.Name | quote }}
+      role: slave
+  template:
+    metadata:
+      name: {{ template "postgresql.fullname" . }}
+      labels:
+        app: {{ template "postgresql.name" . }}
+        chart: {{ template "postgresql.chart" . }}
+        release: {{ .Release.Name | quote }}
+        heritage: {{ .Release.Service | quote }}
+        role: slave
+{{- with .Values.slave.podLabels }}
+{{ toYaml . | indent 8 }}
+{{- end }}
+{{- with .Values.slave.podAnnotations }}
+      annotations:
+{{ toYaml . | indent 8 }}
+{{- end }}
+    spec:
+      {{- if .Values.schedulerName }}
+      schedulerName: "{{ .Values.schedulerName }}"
+      {{- end }}
+{{- include "postgresql.imagePullSecrets" . | indent 6 }}
+      {{- if .Values.slave.nodeSelector }}
+      nodeSelector:
+{{ toYaml .Values.slave.nodeSelector | indent 8 }}
+      {{- end }}
+      {{- if .Values.slave.affinity }}
+      affinity:
+{{ toYaml .Values.slave.affinity | indent 8 }}
+      {{- end }}
+      {{- if .Values.slave.tolerations }}
+      tolerations:
+{{ toYaml .Values.slave.tolerations | indent 8 }}
+      {{- end }}
+      {{- if .Values.terminationGracePeriodSeconds }}
+      terminationGracePeriodSeconds: {{ .Values.terminationGracePeriodSeconds }}
+      {{- end }}
+      {{- if .Values.securityContext.enabled }}
+      securityContext:
+        fsGroup: {{ .Values.securityContext.fsGroup }}
+      {{- end }}
+      {{- if .Values.serviceAccount.enabled }}
+      serviceAccountName: {{ default (include "postgresql.fullname" . ) .Values.serviceAccount.name}}
+      {{- end }}
+      {{- if or .Values.slave.extraInitContainers (and .Values.volumePermissions.enabled .Values.persistence.enabled) .Values.shmVolume.enabled }}
+      initContainers:
+      {{- if or (and .Values.volumePermissions.enabled .Values.persistence.enabled) .Values.shmVolume.enabled }}
+        - name: init-chmod-data
+          image: {{ template "postgresql.volumePermissions.image" . }}
+          imagePullPolicy: "{{ .Values.volumePermissions.image.pullPolicy }}"
+          {{- if .Values.resources }}
+          resources: {{- toYaml .Values.resources | nindent 12 }}
+          {{- end }}
+          command:
+            - /bin/sh
+            - -c
+            - |
+              mkdir -p {{ .Values.persistence.mountPath }}/data
+              chmod 700 {{ .Values.persistence.mountPath }}/data
+              find {{ .Values.persistence.mountPath }} -mindepth 0 -maxdepth 1 -not -name ".snapshot" -not -name "lost+found" | \
+                xargs chown -R {{ .Values.securityContext.runAsUser }}:{{ .Values.securityContext.fsGroup }}
+              {{- if .Values.shmVolume.enabled }}
+              chmod -R 777 /dev/shm
+              {{- end }}
+          securityContext:
+            runAsUser: {{ .Values.volumePermissions.securityContext.runAsUser }}
+          volumeMounts:
+            - name: data
+              mountPath: {{ .Values.persistence.mountPath }}
+              subPath: {{ .Values.persistence.subPath }}
+            {{- if .Values.shmVolume.enabled }}
+            - name: dshm
+              mountPath: /dev/shm
+            {{- end }}
+      {{- end }}
+      {{- if .Values.slave.extraInitContainers }}
+{{ tpl .Values.slave.extraInitContainers . | indent 8 }}
+      {{- end }}
+      {{- end }}
+      {{- if .Values.slave.priorityClassName }}
+      priorityClassName: {{ .Values.slave.priorityClassName }}
+      {{- end }}
+      containers:
+        - name: {{ template "postgresql.fullname" . }}
+          image: {{ template "postgresql.image" . }}
+          imagePullPolicy: "{{ .Values.image.pullPolicy }}"
+          {{- if .Values.resources }}
+          resources: {{- toYaml .Values.resources | nindent 12 }}
+          {{- end }}
+          {{- if .Values.securityContext.enabled }}
+          securityContext:
+            runAsUser: {{ .Values.securityContext.runAsUser }}
+          {{- end }}
+          env:
+            - name: BITNAMI_DEBUG
+              value: {{ ternary "true" "false" .Values.image.debug | quote }}
+            - name: POSTGRESQL_VOLUME_DIR
+              value: "{{ .Values.persistence.mountPath }}"
+            - name: POSTGRESQL_PORT_NUMBER
+              value: "{{ template "postgresql.port" . }}"
+            {{- if .Values.persistence.mountPath }}
+            - name: PGDATA
+              value: {{ .Values.postgresqlDataDir | quote }}
+            {{- end }}
+            - name: POSTGRES_REPLICATION_MODE
+              value: "slave"
+            - name: POSTGRES_REPLICATION_USER
+              value: {{ include "postgresql.replication.username" . | quote }}
+            {{- if .Values.usePasswordFile }}
+            - name: POSTGRES_REPLICATION_PASSWORD_FILE
+              value: "/opt/bitnami/postgresql/secrets/postgresql-replication-password"
+            {{- else }}
+            - name: POSTGRES_REPLICATION_PASSWORD
+              valueFrom:
+                secretKeyRef:
+                  name: {{ template "postgresql.secretName" . }}
+                  key: postgresql-replication-password
+            {{- end }}
+            - name: POSTGRES_CLUSTER_APP_NAME
+              value: {{ .Values.replication.applicationName }}
+            - name: POSTGRES_MASTER_HOST
+              value: {{ template "postgresql.fullname" . }}
+            - name: POSTGRES_MASTER_PORT_NUMBER
+              value: {{ include "postgresql.port" . | quote }}
+            {{- if and .Values.postgresqlPostgresPassword (not (eq .Values.postgresqlUsername "postgres")) }}
+            {{- if .Values.usePasswordFile }}
+            - name: POSTGRES_POSTGRES_PASSWORD_FILE
+              value: "/opt/bitnami/postgresql/secrets/postgresql-postgres-password"
+            {{- else }}
+            - name: POSTGRES_POSTGRES_PASSWORD
+              valueFrom:
+                secretKeyRef:
+                  name: {{ template "postgresql.secretName" . }}
+                  key: postgresql-postgres-password
+            {{- end }}
+            {{- end }}
+            {{- if .Values.usePasswordFile }}
+            - name: POSTGRES_PASSWORD_FILE
+              value: "/opt/bitnami/postgresql/secrets/postgresql-password"
+            {{- else }}
+            - name: POSTGRES_PASSWORD
+              valueFrom:
+                secretKeyRef:
+                  name: {{ template "postgresql.secretName" . }}
+                  key: postgresql-password
+            {{- end }}
+          ports:
+            - name: tcp-postgresql
+              containerPort: {{ template "postgresql.port" . }}
+          {{- if .Values.livenessProbe.enabled }}
+          livenessProbe:
+            exec:
+              command:
+                - /bin/sh
+                - -c
+                {{- if (include "postgresql.database" .) }}
+                - exec pg_isready -U {{ include "postgresql.username" . | quote }} -d {{ (include "postgresql.database" .) | quote }} -h 127.0.0.1 -p {{ template "postgresql.port" . }}
+                {{- else }}
+                - exec pg_isready -U {{ include "postgresql.username" . | quote }} -h 127.0.0.1 -p {{ template "postgresql.port" . }}
+                {{- end }}
+            initialDelaySeconds: {{ .Values.livenessProbe.initialDelaySeconds }}
+            periodSeconds: {{ .Values.livenessProbe.periodSeconds }}
+            timeoutSeconds: {{ .Values.livenessProbe.timeoutSeconds }}
+            successThreshold: {{ .Values.livenessProbe.successThreshold }}
+            failureThreshold: {{ .Values.livenessProbe.failureThreshold }}
+          {{- end }}
+          {{- if .Values.readinessProbe.enabled }}
+          readinessProbe:
+            exec:
+              command:
+                - /bin/sh
+                - -c
+                - -e
+                {{- include "postgresql.readinessProbeCommand" . | nindent 16 }}
+            initialDelaySeconds: {{ .Values.readinessProbe.initialDelaySeconds }}
+            periodSeconds: {{ .Values.readinessProbe.periodSeconds }}
+            timeoutSeconds: {{ .Values.readinessProbe.timeoutSeconds }}
+            successThreshold: {{ .Values.readinessProbe.successThreshold }}
+            failureThreshold: {{ .Values.readinessProbe.failureThreshold }}
+          {{- end }}
+          volumeMounts:
+            {{- if .Values.usePasswordFile }}
+            - name: postgresql-password
+              mountPath: /opt/bitnami/postgresql/secrets/
+            {{- end }}
+            {{- if .Values.shmVolume.enabled }}
+            - name: dshm
+              mountPath: /dev/shm
+            {{- end }}
+            {{- if .Values.persistence.enabled }}
+            - name: data
+              mountPath: {{ .Values.persistence.mountPath }}
+              subPath: {{ .Values.persistence.subPath }}
+            {{ end }}
+            {{- if or (.Files.Glob "files/conf.d/*.conf") .Values.postgresqlExtendedConf .Values.extendedConfConfigMap }}
+            - name: postgresql-extended-config
+              mountPath: /bitnami/postgresql/conf/conf.d/
+            {{- end }}
+            {{- if or (.Files.Glob "files/postgresql.conf") (.Files.Glob "files/pg_hba.conf") .Values.postgresqlConfiguration .Values.pgHbaConfiguration .Values.configurationConfigMap }}
+            - name: postgresql-config
+              mountPath: /bitnami/postgresql/conf
+            {{- end }}
+            {{- if .Values.slave.extraVolumeMounts }}
+            {{- toYaml .Values.slave.extraVolumeMounts | nindent 12 }}
+            {{- end }}
+      volumes:
+        {{- if .Values.usePasswordFile }}
+        - name: postgresql-password
+          secret:
+            secretName: {{ template "postgresql.secretName" . }}
+        {{- end }}
+        {{- if or (.Files.Glob "files/postgresql.conf") (.Files.Glob "files/pg_hba.conf") .Values.postgresqlConfiguration .Values.pgHbaConfiguration .Values.configurationConfigMap}}
+        - name: postgresql-config
+          configMap:
+            name: {{ template "postgresql.configurationCM" . }}
+        {{- end }}
+        {{- if or (.Files.Glob "files/conf.d/*.conf") .Values.postgresqlExtendedConf .Values.extendedConfConfigMap }}
+        - name: postgresql-extended-config
+          configMap:
+            name: {{ template "postgresql.extendedConfigurationCM" . }}
+        {{- end }}
+        {{- if .Values.shmVolume.enabled }}
+        - name: dshm
+          emptyDir:
+            medium: Memory
+            sizeLimit: 1Gi
+        {{- end }}
+        {{- if not .Values.persistence.enabled }}
+        - name: data
+          emptyDir: {}
+        {{- end }}
+        {{- if .Values.slave.extraVolumes }}
+        {{- toYaml .Values.slave.extraVolumes | nindent 8 }}
+        {{- end }}
+  updateStrategy:
+    type: {{ .Values.updateStrategy.type }}
+    {{- if (eq "Recreate" .Values.updateStrategy.type) }}
+    rollingUpdate: null
+    {{- end }}
+{{- if .Values.persistence.enabled }}
+  volumeClaimTemplates:
+    - metadata:
+        name: data
+      {{- with .Values.persistence.annotations }}
+        annotations:
+        {{- range $key, $value := . }}
+          {{ $key }}: {{ $value }}
+        {{- end }}
+      {{- end }}
+      spec:
+        accessModes:
+        {{- range .Values.persistence.accessModes }}
+          - {{ . | quote }}
+        {{- end }}
+        resources:
+          requests:
+            storage: {{ .Values.persistence.size | quote }}
+        {{ include "postgresql.storageClass" . }}
+{{- end }}
+{{- end }}
diff --git a/ric-aux/helm/infrastructure/subcharts/kong/charts/postgresql/templates/statefulset.yaml b/ric-aux/helm/infrastructure/subcharts/kong/charts/postgresql/templates/statefulset.yaml
new file mode 100755 (executable)
index 0000000..7b1b4cf
--- /dev/null
@@ -0,0 +1,438 @@
+apiVersion: {{ template "postgresql.statefulset.apiVersion" . }}
+kind: StatefulSet
+metadata:
+  name: {{ template "postgresql.master.fullname" . }}
+  labels:
+    app: {{ template "postgresql.name" . }}
+    chart: {{ template "postgresql.chart" . }}
+    release: {{ .Release.Name | quote }}
+    heritage: {{ .Release.Service | quote }}
+{{- with .Values.master.labels }}
+{{ toYaml . | indent 4 }}
+{{- end }}
+{{- with .Values.master.annotations }}
+  annotations:
+{{ toYaml . | indent 4 }}
+{{- end }}
+spec:
+  serviceName: {{ template "postgresql.fullname" . }}-headless
+  replicas: 1
+  updateStrategy:
+    type: {{ .Values.updateStrategy.type }}
+    {{- if (eq "Recreate" .Values.updateStrategy.type) }}
+    rollingUpdate: null
+    {{- end }}
+  selector:
+    matchLabels:
+      app: {{ template "postgresql.name" . }}
+      release: {{ .Release.Name | quote }}
+      role: master
+  template:
+    metadata:
+      name: {{ template "postgresql.fullname" . }}
+      labels:
+        app: {{ template "postgresql.name" . }}
+        chart: {{ template "postgresql.chart" . }}
+        release: {{ .Release.Name | quote }}
+        heritage: {{ .Release.Service | quote }}
+        role: master
+{{- with .Values.master.podLabels }}
+{{ toYaml . | indent 8 }}
+{{- end }}
+{{- with .Values.master.podAnnotations }}
+      annotations:
+{{ toYaml . | indent 8 }}
+{{- end }}
+    spec:
+      {{- if .Values.schedulerName }}
+      schedulerName: "{{ .Values.schedulerName }}"
+      {{- end }}
+{{- include "postgresql.imagePullSecrets" . | indent 6 }}
+      {{- if .Values.master.nodeSelector }}
+      nodeSelector:
+{{ toYaml .Values.master.nodeSelector | indent 8 }}
+      {{- end }}
+      {{- if .Values.master.affinity }}
+      affinity:
+{{ toYaml .Values.master.affinity | indent 8 }}
+      {{- end }}
+      {{- if .Values.master.tolerations }}
+      tolerations:
+{{ toYaml .Values.master.tolerations | indent 8 }}
+      {{- end }}
+      {{- if .Values.terminationGracePeriodSeconds }}
+      terminationGracePeriodSeconds: {{ .Values.terminationGracePeriodSeconds }}
+      {{- end }}
+      {{- if .Values.securityContext.enabled }}
+      securityContext:
+        fsGroup: {{ .Values.securityContext.fsGroup }}
+      {{- end }}
+      {{- if .Values.serviceAccount.enabled }}
+      serviceAccountName: {{ default (include "postgresql.fullname" . ) .Values.serviceAccount.name }}
+      {{- end }}
+      {{- if or .Values.master.extraInitContainers (and .Values.volumePermissions.enabled .Values.persistence.enabled) .Values.shmVolume.enabled }}
+      initContainers:
+      {{- if or (and .Values.volumePermissions.enabled .Values.persistence.enabled) .Values.shmVolume.enabled }}
+        - name: init-chmod-data
+          image: {{ template "postgresql.volumePermissions.image" . }}
+          imagePullPolicy: "{{ .Values.volumePermissions.image.pullPolicy }}"
+          {{- if .Values.resources }}
+          resources: {{- toYaml .Values.resources | nindent 12 }}
+          {{- end }}
+          command:
+            - /bin/sh
+            - -c
+            - |
+              mkdir -p {{ .Values.persistence.mountPath }}/data
+              chmod 700 {{ .Values.persistence.mountPath }}/data
+              find {{ .Values.persistence.mountPath }} -mindepth 0 -maxdepth 1 -not -name ".snapshot" -not -name "lost+found" | \
+                xargs chown -R {{ .Values.securityContext.runAsUser }}:{{ .Values.securityContext.fsGroup }}
+              {{- if .Values.shmVolume.enabled }}
+              chmod -R 777 /dev/shm
+              {{- end }}
+          securityContext:
+            runAsUser: {{ .Values.volumePermissions.securityContext.runAsUser }}
+          volumeMounts:
+            - name: data
+              mountPath: {{ .Values.persistence.mountPath }}
+              subPath: {{ .Values.persistence.subPath }}
+            {{- if .Values.shmVolume.enabled }}
+            - name: dshm
+              mountPath: /dev/shm
+            {{- end }}
+      {{- end }}
+      {{- if .Values.master.extraInitContainers }}
+{{ tpl .Values.master.extraInitContainers . | indent 8 }}
+      {{- end }}
+      {{- end }}
+      {{- if .Values.master.priorityClassName }}
+      priorityClassName: {{ .Values.master.priorityClassName }}
+      {{- end }}
+      containers:
+        - name: {{ template "postgresql.fullname" . }}
+          image: {{ template "postgresql.image" . }}
+          imagePullPolicy: "{{ .Values.image.pullPolicy }}"
+          {{- if .Values.resources }}
+          resources: {{- toYaml .Values.resources | nindent 12 }}
+          {{- end }}
+          {{- if .Values.securityContext.enabled }}
+          securityContext:
+            runAsUser: {{ .Values.securityContext.runAsUser }}
+          {{- end }}
+          env:
+            - name: BITNAMI_DEBUG
+              value: {{ ternary "true" "false" .Values.image.debug | quote }}
+            - name: POSTGRESQL_PORT_NUMBER
+              value: "{{ template "postgresql.port" . }}"
+            - name: POSTGRESQL_VOLUME_DIR
+              value: "{{ .Values.persistence.mountPath }}"
+            {{- if .Values.postgresqlInitdbArgs }}
+            - name: POSTGRES_INITDB_ARGS
+              value: {{ .Values.postgresqlInitdbArgs | quote }}
+            {{- end }}
+            {{- if .Values.postgresqlInitdbWalDir }}
+            - name: POSTGRES_INITDB_WALDIR
+              value: {{ .Values.postgresqlInitdbWalDir | quote }}
+            {{- end }}
+            {{- if .Values.initdbUser }}
+            - name: POSTGRESQL_INITSCRIPTS_USERNAME
+              value: {{ .Values.initdbUser }}
+            {{- end }}
+            {{- if .Values.initdbPassword }}
+            - name: POSTGRESQL_INITSCRIPTS_PASSWORD
+              value: .Values.initdbPassword
+            {{- end }}
+            {{- if .Values.persistence.mountPath }}
+            - name: PGDATA
+              value: {{ .Values.postgresqlDataDir | quote }}
+            {{- end }}
+            {{- if .Values.replication.enabled }}
+            - name: POSTGRES_REPLICATION_MODE
+              value: "master"
+            - name: POSTGRES_REPLICATION_USER
+              value: {{ include "postgresql.replication.username" . | quote }}
+            {{- if .Values.usePasswordFile }}
+            - name: POSTGRES_REPLICATION_PASSWORD_FILE
+              value: "/opt/bitnami/postgresql/secrets/postgresql-replication-password"
+            {{- else }}
+            - name: POSTGRES_REPLICATION_PASSWORD
+              valueFrom:
+                secretKeyRef:
+                  name: {{ template "postgresql.secretName" . }}
+                  key: postgresql-replication-password
+            {{- end }}
+            {{- if not (eq .Values.replication.synchronousCommit "off")}}
+            - name: POSTGRES_SYNCHRONOUS_COMMIT_MODE
+              value: {{ .Values.replication.synchronousCommit | quote }}
+            - name: POSTGRES_NUM_SYNCHRONOUS_REPLICAS
+              value: {{ .Values.replication.numSynchronousReplicas | quote }}
+            {{- end }}
+            - name: POSTGRES_CLUSTER_APP_NAME
+              value: {{ .Values.replication.applicationName }}
+            {{- end }}
+            {{- if and .Values.postgresqlPostgresPassword (not (eq .Values.postgresqlUsername "postgres")) }}
+            {{- if .Values.usePasswordFile }}
+            - name: POSTGRES_POSTGRES_PASSWORD_FILE
+              value: "/opt/bitnami/postgresql/secrets/postgresql-postgres-password"
+            {{- else }}
+            - name: POSTGRES_POSTGRES_PASSWORD
+              valueFrom:
+                secretKeyRef:
+                  name: {{ template "postgresql.secretName" . }}
+                  key: postgresql-postgres-password
+            {{- end }}
+            {{- end }}
+            - name: POSTGRES_USER
+              value: {{ include "postgresql.username" . | quote }}
+            {{- if .Values.usePasswordFile }}
+            - name: POSTGRES_PASSWORD_FILE
+              value: "/opt/bitnami/postgresql/secrets/postgresql-password"
+            {{- else }}
+            - name: POSTGRES_PASSWORD
+              valueFrom:
+                secretKeyRef:
+                  name: {{ template "postgresql.secretName" . }}
+                  key: postgresql-password
+            {{- end }}
+            {{- if (include "postgresql.database" .) }}
+            - name: POSTGRES_DB
+              value: {{ (include "postgresql.database" .) | quote }}
+            {{- end }}
+            {{- if .Values.extraEnv }}
+            {{- include "postgresql.tplValue" (dict "value" .Values.extraEnv "context" $) | nindent 12 }}
+            {{- end }}
+            - name: POSTGRESQL_ENABLE_LDAP
+              value: {{ ternary "yes" "no" .Values.ldap.enabled | quote }}
+            {{- if .Values.ldap.enabled }}
+            - name: POSTGRESQL_LDAP_SERVER
+              value: {{ .Values.ldap.server }}
+            - name: POSTGRESQL_LDAP_PORT
+              value: {{ .Values.ldap.port | quote }}
+            - name: POSTGRESQL_LDAP_SCHEME
+              value: {{ .Values.ldap.scheme }}
+            {{- if .Values.ldap.tls }}
+            - name: POSTGRESQL_LDAP_TLS
+              value: "1"
+            {{- end}}
+            - name: POSTGRESQL_LDAP_PREFIX
+              value: {{ .Values.ldap.prefix | quote }}
+            - name: POSTGRESQL_LDAP_SUFFIX
+              value: {{ .Values.ldap.suffix | quote}}
+            - name: POSTGRESQL_LDAP_BASE_DN
+              value: {{ .Values.ldap.baseDN }}
+            - name: POSTGRESQL_LDAP_BIND_DN
+              value: {{ .Values.ldap.bindDN }}
+            {{- if (not (empty .Values.ldap.bind_password)) }}
+            - name: POSTGRESQL_LDAP_BIND_PASSWORD
+              valueFrom:
+                secretKeyRef:
+                  name: {{ template "postgresql.secretName" . }}
+                  key: postgresql-ldap-password
+            {{- end}}
+            - name: POSTGRESQL_LDAP_SEARCH_ATTR
+              value: {{ .Values.ldap.search_attr }}
+            - name: POSTGRESQL_LDAP_SEARCH_FILTER
+              value: {{ .Values.ldap.search_filter }}
+            - name: POSTGRESQL_LDAP_URL
+              value: {{ .Values.ldap.url }}
+            {{- end}}
+          ports:
+            - name: tcp-postgresql
+              containerPort: {{ template "postgresql.port" . }}
+          {{- if .Values.livenessProbe.enabled }}
+          livenessProbe:
+            exec:
+              command:
+                - /bin/sh
+                - -c
+                {{- if (include "postgresql.database" .) }}
+                - exec pg_isready -U {{ include "postgresql.username" . | quote }} -d {{ (include "postgresql.database" .) | quote }} -h 127.0.0.1 -p {{ template "postgresql.port" . }}
+                {{- else }}
+                - exec pg_isready -U {{ include "postgresql.username" . | quote }} -h 127.0.0.1 -p {{ template "postgresql.port" . }}
+                {{- end }}
+            initialDelaySeconds: {{ .Values.livenessProbe.initialDelaySeconds }}
+            periodSeconds: {{ .Values.livenessProbe.periodSeconds }}
+            timeoutSeconds: {{ .Values.livenessProbe.timeoutSeconds }}
+            successThreshold: {{ .Values.livenessProbe.successThreshold }}
+            failureThreshold: {{ .Values.livenessProbe.failureThreshold }}
+          {{- end }}
+          {{- if .Values.readinessProbe.enabled }}
+          readinessProbe:
+            exec:
+              command:
+                - /bin/sh
+                - -c
+                - -e
+                {{- include "postgresql.readinessProbeCommand" . | nindent 16 }}
+            initialDelaySeconds: {{ .Values.readinessProbe.initialDelaySeconds }}
+            periodSeconds: {{ .Values.readinessProbe.periodSeconds }}
+            timeoutSeconds: {{ .Values.readinessProbe.timeoutSeconds }}
+            successThreshold: {{ .Values.readinessProbe.successThreshold }}
+            failureThreshold: {{ .Values.readinessProbe.failureThreshold }}
+          {{- end }}
+          volumeMounts:
+            {{- if or (.Files.Glob "files/docker-entrypoint-initdb.d/*.{sh,sql,sql.gz}") .Values.initdbScriptsConfigMap .Values.initdbScripts }}
+            - name: custom-init-scripts
+              mountPath: /docker-entrypoint-initdb.d/
+            {{- end }}
+            {{- if .Values.initdbScriptsSecret }}
+            - name: custom-init-scripts-secret
+              mountPath: /docker-entrypoint-initdb.d/secret
+            {{- end }}
+            {{- if or (.Files.Glob "files/conf.d/*.conf") .Values.postgresqlExtendedConf .Values.extendedConfConfigMap }}
+            - name: postgresql-extended-config
+              mountPath: /bitnami/postgresql/conf/conf.d/
+            {{- end }}
+            {{- if .Values.usePasswordFile }}
+            - name: postgresql-password
+              mountPath: /opt/bitnami/postgresql/secrets/
+            {{- end }}
+            {{- if .Values.shmVolume.enabled }}
+            - name: dshm
+              mountPath: /dev/shm
+            {{- end }}
+            {{- if .Values.persistence.enabled }}
+            - name: data
+              mountPath: {{ .Values.persistence.mountPath }}
+              subPath: {{ .Values.persistence.subPath }}
+            {{- end }}
+            {{- if or (.Files.Glob "files/postgresql.conf") (.Files.Glob "files/pg_hba.conf") .Values.postgresqlConfiguration .Values.pgHbaConfiguration .Values.configurationConfigMap }}
+            - name: postgresql-config
+              mountPath: /bitnami/postgresql/conf
+            {{- end }}
+            {{- if .Values.master.extraVolumeMounts }}
+            {{- toYaml .Values.master.extraVolumeMounts | nindent 12 }}
+            {{- end }}
+{{- if .Values.metrics.enabled }}
+        - name: metrics
+          image: {{ template "postgresql.metrics.image" . }}
+          imagePullPolicy: {{ .Values.metrics.image.pullPolicy | quote }}
+         {{- if .Values.metrics.securityContext.enabled }}
+          securityContext:
+            runAsUser: {{ .Values.metrics.securityContext.runAsUser }}
+        {{- end }}
+          env:
+            {{- $database := required "In order to enable metrics you need to specify a database (.Values.postgresqlDatabase or .Values.global.postgresql.postgresqlDatabase)" (include "postgresql.database" .) }}
+            - name: DATA_SOURCE_URI
+              value: {{ printf "127.0.0.1:%d/%s?sslmode=disable" (int (include "postgresql.port" .)) $database | quote }}
+            {{- if .Values.usePasswordFile }}
+            - name: DATA_SOURCE_PASS_FILE
+              value: "/opt/bitnami/postgresql/secrets/postgresql-password"
+            {{- else }}
+            - name: DATA_SOURCE_PASS
+              valueFrom:
+                secretKeyRef:
+                  name: {{ template "postgresql.secretName" . }}
+                  key: postgresql-password
+            {{- end }}
+            - name: DATA_SOURCE_USER
+              value: {{ template "postgresql.username" . }}
+          {{- if .Values.livenessProbe.enabled }}
+          livenessProbe:
+            httpGet:
+              path: /
+              port: http-metrics
+            initialDelaySeconds: {{ .Values.metrics.livenessProbe.initialDelaySeconds }}
+            periodSeconds: {{ .Values.metrics.livenessProbe.periodSeconds }}
+            timeoutSeconds: {{ .Values.metrics.livenessProbe.timeoutSeconds }}
+            successThreshold: {{ .Values.metrics.livenessProbe.successThreshold }}
+            failureThreshold: {{ .Values.metrics.livenessProbe.failureThreshold }}
+          {{- end }}
+          {{- if .Values.readinessProbe.enabled }}
+          readinessProbe:
+            httpGet:
+              path: /
+              port: http-metrics
+            initialDelaySeconds: {{ .Values.metrics.readinessProbe.initialDelaySeconds }}
+            periodSeconds: {{ .Values.metrics.readinessProbe.periodSeconds }}
+            timeoutSeconds: {{ .Values.metrics.readinessProbe.timeoutSeconds }}
+            successThreshold: {{ .Values.metrics.readinessProbe.successThreshold }}
+            failureThreshold: {{ .Values.metrics.readinessProbe.failureThreshold }}
+          {{- end }}
+          volumeMounts:
+            {{- if .Values.usePasswordFile }}
+            - name: postgresql-password
+              mountPath: /opt/bitnami/postgresql/secrets/
+            {{- end }}
+            {{- if .Values.metrics.customMetrics }}
+            - name: custom-metrics
+              mountPath: /conf
+              readOnly: true
+          args: ["--extend.query-path", "/conf/custom-metrics.yaml"]
+            {{- end }}
+          ports:
+            - name: http-metrics
+              containerPort: 9187
+          {{- if .Values.metrics.resources }}
+          resources: {{- toYaml .Values.metrics.resources | nindent 12 }}
+          {{- end }}
+{{- end }}
+      volumes:
+        {{- if or (.Files.Glob "files/postgresql.conf") (.Files.Glob "files/pg_hba.conf") .Values.postgresqlConfiguration .Values.pgHbaConfiguration .Values.configurationConfigMap}}
+        - name: postgresql-config
+          configMap:
+            name: {{ template "postgresql.configurationCM" . }}
+        {{- end }}
+        {{- if or (.Files.Glob "files/conf.d/*.conf") .Values.postgresqlExtendedConf .Values.extendedConfConfigMap }}
+        - name: postgresql-extended-config
+          configMap:
+            name: {{ template "postgresql.extendedConfigurationCM" . }}
+        {{- end }}
+        {{- if .Values.usePasswordFile }}
+        - name: postgresql-password
+          secret:
+            secretName: {{ template "postgresql.secretName" . }}
+        {{- end }}
+        {{- if  or (.Files.Glob "files/docker-entrypoint-initdb.d/*.{sh,sql,sql.gz}") .Values.initdbScriptsConfigMap .Values.initdbScripts }}
+        - name: custom-init-scripts
+          configMap:
+            name: {{ template "postgresql.initdbScriptsCM" . }}
+        {{- end }}
+        {{- if .Values.initdbScriptsSecret }}
+        - name: custom-init-scripts-secret
+          secret:
+            secretName: {{ template "postgresql.initdbScriptsSecret" . }}
+        {{- end }}
+        {{- if .Values.master.extraVolumes }}
+        {{- toYaml .Values.master.extraVolumes | nindent 8 }}
+        {{- end }}
+        {{- if and .Values.metrics.enabled .Values.metrics.customMetrics }}
+        - name: custom-metrics
+          configMap:
+            name: {{ template "postgresql.metricsCM" . }}
+        {{- end }}
+        {{- if .Values.shmVolume.enabled }}
+        - name: dshm
+          emptyDir:
+            medium: Memory
+            sizeLimit: 1Gi
+        {{- end }}
+{{- if and .Values.persistence.enabled .Values.persistence.existingClaim }}
+        - name: data
+          persistentVolumeClaim:
+{{- with .Values.persistence.existingClaim }}
+            claimName: {{ tpl . $ }}
+{{- end }}
+{{- else if not .Values.persistence.enabled }}
+        - name: data
+          emptyDir: {}
+{{- else if and .Values.persistence.enabled (not .Values.persistence.existingClaim) }}
+  volumeClaimTemplates:
+    - metadata:
+        name: data
+      {{- with .Values.persistence.annotations }}
+        annotations:
+        {{- range $key, $value := . }}
+          {{ $key }}: {{ $value }}
+        {{- end }}
+      {{- end }}
+      spec:
+        accessModes:
+        {{- range .Values.persistence.accessModes }}
+          - {{ . | quote }}
+        {{- end }}
+        resources:
+          requests:
+            storage: {{ .Values.persistence.size | quote }}
+        {{ include "postgresql.storageClass" . }}
+{{- end }}
@@ -11,9 +11,9 @@ spec:
   type: ClusterIP
   clusterIP: None
   ports:
-  - name: postgresql
-    port: 5432
-    targetPort: postgresql
+    - name: tcp-postgresql
+      port: {{ template "postgresql.port" . }}
+      targetPort: tcp-postgresql
   selector:
     app: {{ template "postgresql.name" . }}
     release: {{ .Release.Name | quote }}
@@ -18,12 +18,12 @@ spec:
   loadBalancerIP: {{ .Values.service.loadBalancerIP }}
   {{- end }}
   ports:
-  - name: postgresql
-    port:  {{ .Values.service.port }}
-    targetPort: postgresql
-    {{- if .Values.service.nodePort }}
-    nodePort: {{ .Values.service.nodePort }}
-    {{- end }}
+    - name: tcp-postgresql
+      port:  {{ template "postgresql.port" . }}
+      targetPort: tcp-postgresql
+      {{- if .Values.service.nodePort }}
+      nodePort: {{ .Values.service.nodePort }}
+      {{- end }}
   selector:
     app: {{ template "postgresql.name" . }}
     release: {{ .Release.Name | quote }}
@@ -9,23 +9,29 @@ metadata:
     heritage: {{ .Release.Service | quote }}
 {{- with .Values.service.annotations }}
   annotations:
-{{ toYaml . | indent 4 }}
+{{ tpl (toYaml .) $ | indent 4 }}
 {{- end }}
 spec:
   type: {{ .Values.service.type }}
   {{- if and .Values.service.loadBalancerIP (eq .Values.service.type "LoadBalancer") }}
   loadBalancerIP: {{ .Values.service.loadBalancerIP }}
+  {{- end }}
+  {{- if and (eq .Values.service.type "LoadBalancer") .Values.service.loadBalancerSourceRanges }}
+  loadBalancerSourceRanges:
+  {{ with .Values.service.loadBalancerSourceRanges }}
+{{ toYaml . | indent 4 }}
+{{- end }}
   {{- end }}
   {{- if and (eq .Values.service.type "ClusterIP") .Values.service.clusterIP }}
   clusterIP: {{ .Values.service.clusterIP }}
   {{- end }}
   ports:
-  - name: postgresql
-    port: {{ .Values.service.port }}
-    targetPort: postgresql
-    {{- if .Values.service.nodePort }}
-    nodePort: {{ .Values.service.nodePort }}
-    {{- end }}
+    - name: tcp-postgresql
+      port: {{ template "postgresql.port" . }}
+      targetPort: tcp-postgresql
+      {{- if .Values.service.nodePort }}
+      nodePort: {{ .Values.service.nodePort }}
+      {{- end }}
   selector:
     app: {{ template "postgresql.name" . }}
     release: {{ .Release.Name | quote }}
@@ -1,8 +1,13 @@
-## Global Docker image registry
-### Please, note that this will override the image registry for all the images, including dependencies, configured to use the global value
-###
-## global:
-##   imageRegistry:
+## Global Docker image parameters
+## Please, note that this will override the image parameters, including dependencies, configured to use the global value
+## Current available global Docker image parameters: imageRegistry and imagePullSecrets
+##
+global:
+  postgresql: {}
+#   imageRegistry: myRegistryName
+#   imagePullSecrets:
+#     - myRegistryKeySecretName
+#   storageClass: myStorageClass
 
 ## Bitnami PostgreSQL image version
 ## ref: https://hub.docker.com/r/bitnami/postgresql/tags/
 image:
   registry: docker.io
   repository: bitnami/postgresql
-  tag: 10.6.0
+  tag: 11.6.0-debian-9-r0
   ## Specify a imagePullPolicy
   ## Defaults to 'Always' if image tag is 'latest', else set to 'IfNotPresent'
   ## ref: http://kubernetes.io/docs/user-guide/images/#pre-pulling-images
   ##
-  pullPolicy: Always
-
+  pullPolicy: IfNotPresent
   ## Optionally specify an array of imagePullSecrets.
   ## Secrets must be manually created in the namespace.
   ## ref: https://kubernetes.io/docs/tasks/configure-pod-container/pull-image-private-registry/
   ##
   # pullSecrets:
-  #   - myRegistrKeySecretName
+  #   - myRegistryKeySecretName
 
   ## Set to true if you would like to see extra information on logs
   ## It turns BASH and NAMI debugging in minideb
   ## ref:  https://github.com/bitnami/minideb-extras/#turn-on-bash-debugging
   debug: false
 
+## String to partially override postgresql.fullname template (will maintain the release name)
+##
+# nameOverride:
+
+## String to fully override postgresql.fullname template
+##
+# fullnameOverride:
+
 ##
 ## Init containers parameters:
 ## volumePermissions: Change the owner of the persist volume mountpoint to RunAsUser:fsGroup
@@ -38,16 +50,27 @@ volumePermissions:
   image:
     registry: docker.io
     repository: bitnami/minideb
-    tag: latest
+    tag: stretch
     ## Specify a imagePullPolicy
     ## Defaults to 'Always' if image tag is 'latest', else set to 'IfNotPresent'
     ## ref: http://kubernetes.io/docs/user-guide/images/#pre-pulling-images
     ##
     pullPolicy: Always
+    ## Optionally specify an array of imagePullSecrets.
+    ## Secrets must be manually created in the namespace.
+    ## ref: https://kubernetes.io/docs/tasks/configure-pod-container/pull-image-private-registry/
+    ##
+    # pullSecrets:
+    #   - myRegistryKeySecretName
   ## Init container Security Context
   securityContext:
     runAsUser: 0
 
+## Use an alternate scheduler, e.g. "stork".
+## ref: https://kubernetes.io/docs/tasks/administer-cluster/configure-multiple-schedulers/
+##
+# schedulerName:
+
 ## Pod Security Context
 ## ref: https://kubernetes.io/docs/tasks/configure-pod-container/security-context/
 ##
@@ -56,21 +79,32 @@ securityContext:
   fsGroup: 1001
   runAsUser: 1001
 
-replication:
+## Pod Service Account
+## ref: https://kubernetes.io/docs/tasks/configure-pod-container/configure-service-account/
+serviceAccount:
   enabled: false
+  ## Name of an already existing service account. Setting this value disables the automatic service account creation.
+  # name:
+
+replication:
+  enabled: true
   user: repl_user
   password: repl_password
-  slaveReplicas: 1
+  slaveReplicas: 2
   ## Set synchronous commit mode: on, off, remote_apply, remote_write and local
   ## ref: https://www.postgresql.org/docs/9.6/runtime-config-wal.html#GUC-WAL-LEVEL
-  synchronousCommit: "off"
+  synchronousCommit: "on"
   ## From the number of `slaveReplicas` defined above, set the number of those that will have synchronous replication
   ## NOTE: It cannot be > slaveReplicas
-  numSynchronousReplicas: 0
+  numSynchronousReplicas: 1
   ## Replication Cluster application name. Useful for defining multiple replication policies
   applicationName: my_application
 
-## PostgreSQL admin user
+## PostgreSQL admin password (used when `postgresqlUsername` is not `postgres`)
+## ref: https://github.com/bitnami/bitnami-docker-postgresql/blob/master/README.md#creating-a-database-user-on-first-run (see note!)
+# postgresqlPostgresPassword:
+
+## PostgreSQL user (has superuser privileges if username is `postgres`)
 ## ref: https://github.com/bitnami/bitnami-docker-postgresql/blob/master/README.md#setting-the-root-password-on-first-run
 postgresqlUsername: postgres
 
@@ -90,6 +124,30 @@ postgresqlUsername: postgres
 ##
 # postgresqlDatabase:
 
+## PostgreSQL data dir
+## ref: https://github.com/bitnami/bitnami-docker-postgresql/blob/master/README.md
+##
+postgresqlDataDir: /bitnami/postgresql/data
+
+## An array to add extra environment variables
+## For example:
+## extraEnv:
+##   - name: FOO
+##     value: "bar"
+##
+# extraEnv:
+extraEnv: []
+
+## Specify extra initdb args
+## ref: https://github.com/bitnami/bitnami-docker-postgresql/blob/master/README.md
+##
+# postgresqlInitdbArgs:
+
+## Specify a custom location for the PostgreSQL transaction log
+## ref: https://github.com/bitnami/bitnami-docker-postgresql/blob/master/README.md
+##
+# postgresqlInitdbWalDir:
+
 ## PostgreSQL configuration
 ## Specify runtime configuration parameters as a dict, using camelCase, e.g.
 ## {"sharedBuffers": "500MB"}
@@ -122,23 +180,48 @@ postgresqlUsername: postgres
 # extendedConfConfigMap:
 
 ## initdb scripts
-## Specify dictionnary of scripts to be run at first boot
+## Specify dictionary of scripts to be run at first boot
 ## Alternatively, you can put your scripts under the files/docker-entrypoint-initdb.d directory
 ##
 # initdbScripts:
-#   my_init_script.sh:|
+#   my_init_script.sh: |
 #      #!/bin/sh
 #      echo "Do something."
-#
+
+## Specify the PostgreSQL username and password to execute the initdb scripts
+# initdbUser:
+# initdbPassword:
+
 ## ConfigMap with scripts to be run at first boot
 ## NOTE: This will override initdbScripts
 # initdbScriptsConfigMap:
 
+## Secret with scripts to be run at first boot (in case it contains sensitive information)
+## NOTE: This can work along initdbScripts or initdbScriptsConfigMap
+# initdbScriptsSecret:
+
 ## Optional duration in seconds the pod needs to terminate gracefully.
 ## ref: https://kubernetes.io/docs/concepts/workloads/pods/pod/#termination-of-pods
 ##
 # terminationGracePeriodSeconds: 30
 
+## LDAP configuration
+##
+ldap:
+  enabled: false
+  url: ""
+  server: ""
+  port: ""
+  prefix: ""
+  suffix: ""
+  baseDN: ""
+  bindDN: ""
+  bind_password:
+  search_attr: ""
+  search_filter: ""
+  scheme: ""
+  tls: false
+
 ## PostgreSQL service configuration
 service:
   ## PosgresSQL service type
@@ -151,13 +234,32 @@ service:
   ##
   # nodePort:
 
-  ## Provide any additional annotations which may be required. This can be used to
+  ## Provide any additional annotations which may be required.
+  ## The value is evaluated as a template, so, for example, the value can depend on .Release or .Chart
   annotations: {}
   ## Set the LoadBalancer service type to internal only.
   ## ref: https://kubernetes.io/docs/concepts/services-networking/service/#internal-load-balancer
   ##
   # loadBalancerIP:
 
+  ## Load Balancer sources
+  ## https://kubernetes.io/docs/tasks/access-application-cluster/configure-cloud-provider-firewall/#restrict-access-for-loadbalancer-service
+  ##
+  # loadBalancerSourceRanges:
+  # - 10.10.10.0/24
+
+## Start master and slave(s) pod(s) without limitations on shm memory.
+## By default docker and containerd (and possibly other container runtimes)
+## limit `/dev/shm` to `64M` (see e.g. the
+## [docker issue](https://github.com/docker-library/postgres/issues/416) and the
+## [containerd issue](https://github.com/containerd/containerd/issues/3654),
+## which could be not enough if PostgreSQL uses parallel workers heavily.
+## If this option is present and value is `true`,
+## to the target database pod will be mounted a new tmpfs volume to remove
+## this limitation.
+shmVolume:
+  enabled: true
+
 ## PostgreSQL data Persistent Volume Storage Class
 ## If defined, storageClassName: <storageClass>
 ## If set to "-", storageClassName: "", which disables dynamic provisioning
@@ -169,8 +271,20 @@ persistence:
   enabled: true
   ## A manually managed Persistent Volume and Claim
   ## If defined, PVC must be created manually before volume will be bound
+  ## The value is evaluated as a template, so, for example, the name can depend on .Release or .Chart
+  ##
   # existingClaim:
+
+  ## The path the volume will be mounted at, useful when using different
+  ## PostgreSQL images.
+  ##
   mountPath: /bitnami/postgresql
+
+  ## The subdirectory of the volume to mount to, useful in dev environments
+  ## and one PV for multiple services.
+  ##
+  subPath: ""
+
   # storageClass: "-"
   accessModes:
     - ReadWriteOnce
@@ -186,25 +300,49 @@ updateStrategy:
 ## PostgreSQL Master parameters
 ##
 master:
-  ## Node, affinity and tolerations labels for pod assignment
+  ## Node, affinity, tolerations, and priorityclass settings for pod assignment
   ## ref: https://kubernetes.io/docs/concepts/configuration/assign-pod-node/#nodeselector
   ## ref: https://kubernetes.io/docs/concepts/configuration/assign-pod-node/#affinity-and-anti-affinity
   ## ref: https://kubernetes.io/docs/concepts/configuration/assign-pod-node/#taints-and-tolerations-beta-feature
+  ## ref: https://kubernetes.io/docs/concepts/configuration/pod-priority-preemption
   nodeSelector: {}
   affinity: {}
   tolerations: []
+  labels: {}
+  annotations: {}
+  podLabels: {}
+  podAnnotations: {}
+  priorityClassName: ""
+  ## Additional PostgreSQL Master Volume mounts
+  ##
+  extraVolumeMounts: []
+  ## Additional PostgreSQL Master Volumes
+  ##
+  extraVolumes: []
 
 ##
 ## PostgreSQL Slave parameters
 ##
 slave:
-  ## Node, affinity and tolerations labels for pod assignment
+  ## Node, affinity, tolerations, and priorityclass settings for pod assignment
   ## ref: https://kubernetes.io/docs/concepts/configuration/assign-pod-node/#nodeselector
   ## ref: https://kubernetes.io/docs/concepts/configuration/assign-pod-node/#affinity-and-anti-affinity
   ## ref: https://kubernetes.io/docs/concepts/configuration/assign-pod-node/#taints-and-tolerations-beta-feature
+  ## ref: https://kubernetes.io/docs/concepts/configuration/pod-priority-preemption
   nodeSelector: {}
   affinity: {}
   tolerations: []
+  labels: {}
+  annotations: {}
+  podLabels: {}
+  podAnnotations: {}
+  priorityClassName: ""
+  ## Additional PostgreSQL Slave Volume mounts
+  ##
+  extraVolumeMounts: []
+  ## Additional PostgreSQL Slave Volumes
+  ##
+  extraVolumes: []
 
 ## Configure resource requests and limits
 ## ref: http://kubernetes.io/docs/user-guide/compute-resources/
@@ -215,7 +353,7 @@ resources:
     cpu: 250m
 
 networkPolicy:
-  ## Enable creation of NetworkPolicy resources.
+  ## Enable creation of NetworkPolicy resources. Only Ingress traffic is filtered for now.
   ##
   enabled: false
 
@@ -226,6 +364,17 @@ networkPolicy:
   ##
   allowExternal: true
 
+  ## if explicitNamespacesSelector is missing or set to {}, only client Pods that are in the networkPolicy's namespace
+  ## and that match other criteria, the ones that have the good label, can reach the DB.
+  ## But sometimes, we want the DB to be accessible to clients from other namespaces, in this case, we can use this
+  ## LabelSelector to select these namespaces, note that the networkPolicy's namespace should also be explicitly added.
+  ##
+  # explicitNamespacesSelector:
+    # matchLabels:
+      # role: frontend
+    # matchExpressions:
+      # - {key: role, operator: In, values: [frontend]}
+
 ## Configure extra options for liveness and readiness probes
 ## ref: https://kubernetes.io/docs/tasks/configure-pod-container/configure-liveness-readiness-probes/#configure-probes)
 livenessProbe:
@@ -247,7 +396,7 @@ readinessProbe:
 ## Configure metrics exporter
 ##
 metrics:
-  enabled: false
+  enabled: true
   # resources: {}
   service:
     type: ClusterIP
@@ -255,18 +404,59 @@ metrics:
       prometheus.io/scrape: "true"
       prometheus.io/port: "9187"
     loadBalancerIP:
+  serviceMonitor:
+    enabled: false
+    additionalLabels: {}
+    # namespace: monitoring
+    # interval: 30s
+    # scrapeTimeout: 10s
+  ## Custom PrometheusRule to be defined
+  ## The value is evaluated as a template, so, for example, the value can depend on .Release or .Chart
+  ## ref: https://github.com/coreos/prometheus-operator#customresourcedefinitions
+  prometheusRule:
+    enabled: false
+    additionalLabels: {}
+    namespace: ""
+    rules: []
+      ## These are just examples rules, please adapt them to your needs.
+      ## Make sure to constraint the rules to the current postgresql service.
+      # - alert: HugeReplicationLag
+      #   expr: pg_replication_lag{service="{{ template "postgresql.fullname" . }}-metrics"} / 3600 > 1
+      #   for: 1m
+      #   labels:
+      #     severity: critical
+      #   annotations:
+      #     description: replication for {{ template "postgresql.fullname" . }} PostgreSQL is lagging by {{ "{{ $value }}" }} hour(s).
+      #     summary: PostgreSQL replication is lagging by {{ "{{ $value }}" }} hour(s).
   image:
     registry: docker.io
-    repository: wrouesnel/postgres_exporter
-    tag: v0.4.6
+    repository: bitnami/postgres-exporter
+    tag: 0.7.0-debian-9-r12
     pullPolicy: IfNotPresent
     ## Optionally specify an array of imagePullSecrets.
     ## Secrets must be manually created in the namespace.
     ## ref: https://kubernetes.io/docs/tasks/configure-pod-container/pull-image-private-registry/
     ##
     # pullSecrets:
-    #   - myRegistrKeySecretName
-
+    #   - myRegistryKeySecretName
+  ## Define additional custom metrics
+  ## ref: https://github.com/wrouesnel/postgres_exporter#adding-new-metrics-via-a-config-file
+  # customMetrics:
+  #   pg_database:
+  #     query: "SELECT d.datname AS name, CASE WHEN pg_catalog.has_database_privilege(d.datname, 'CONNECT') THEN pg_catalog.pg_database_size(d.datname) ELSE 0 END AS size FROM pg_catalog.pg_database d where datname not in ('template0', 'template1', 'postgres')"
+  #     metrics:
+  #       - name:
+  #           usage: "LABEL"
+  #           description: "Name of the database"
+  #       - size_bytes:
+  #           usage: "GAUGE"
+  #           description: "Size of the database in bytes"
+  ## Pod Security Context
+  ## ref: https://kubernetes.io/docs/tasks/configure-pod-container/security-context/
+  ##
+  securityContext:
+    enabled: false
+    runAsUser: 1001
   ## ref: https://kubernetes.io/docs/tasks/configure-pod-container/configure-liveness-readiness-probes/#configure-probes)
   ## Configure extra options for liveness and readiness probes
   livenessProbe:
@@ -284,6 +474,3 @@ metrics:
     timeoutSeconds: 5
     failureThreshold: 6
     successThreshold: 1
-
-# Define custom environment variables to pass to the image here
-extraEnv: {}
diff --git a/ric-aux/helm/infrastructure/subcharts/kong/charts/postgresql/values.schema.json b/ric-aux/helm/infrastructure/subcharts/kong/charts/postgresql/values.schema.json
new file mode 100755 (executable)
index 0000000..ac2de6e
--- /dev/null
@@ -0,0 +1,103 @@
+{
+  "$schema": "http://json-schema.org/schema#",
+  "type": "object",
+  "properties": {
+    "postgresqlUsername": {
+      "type": "string",
+      "title": "Admin user",
+      "form": true
+    },
+    "postgresqlPassword": {
+      "type": "string",
+      "title": "Password",
+      "form": true
+    },
+    "persistence": {
+      "type": "object",
+      "properties": {
+        "size": {
+          "type": "string",
+          "title": "Persistent Volume Size",
+          "form": true,
+          "render": "slider",
+          "sliderMin": 1,
+          "sliderMax": 100,
+          "sliderUnit": "Gi"
+        }
+      }
+    },
+    "resources": {
+      "type": "object",
+      "title": "Required Resources",
+      "description": "Configure resource requests",
+      "form": true,
+      "properties": {
+        "requests": {
+          "type": "object",
+          "properties": {
+            "memory": {
+              "type": "string",
+              "form": true,
+              "render": "slider",
+              "title": "Memory Request",
+              "sliderMin": 10,
+              "sliderMax": 2048,
+              "sliderUnit": "Mi"
+            },
+            "cpu": {
+              "type": "string",
+              "form": true,
+              "render": "slider",
+              "title": "CPU Request",
+              "sliderMin": 10,
+              "sliderMax": 2000,
+              "sliderUnit": "m"
+            }
+          }
+        }
+      }
+    },
+    "replication": {
+      "type": "object",
+      "form": true,
+      "title": "Replication Details",
+      "properties": {
+        "enabled": {
+          "type": "boolean",
+          "title": "Enable Replication",
+          "form": true
+        },
+        "slaveReplicas": {
+          "type": "integer",
+          "title": "Slave Replicas",
+          "form": true,
+          "hidden": {
+            "condition": false,
+            "value": "replication.enabled"
+          }
+        }
+      }
+    },
+    "volumePermissions": {
+      "type": "object",
+      "properties": {
+        "enabled": {
+          "type": "boolean",
+          "form": true,
+          "title": "Enable Init Containers",
+          "description": "Change the owner of the persist volume mountpoint to RunAsUser:fsGroup"
+        }
+      }
+    },
+    "metrics": {
+      "type": "object",
+      "properties": {
+        "enabled": {
+          "type": "boolean",
+          "title": "Configure metrics exporter",
+          "form": true
+        }
+      }
+    }
+  }
+}
@@ -1,8 +1,13 @@
-## Global Docker image registry
-### Please, note that this will override the image registry for all the images, including dependencies, configured to use the global value
-###
-## global:
-##   imageRegistry:
+## Global Docker image parameters
+## Please, note that this will override the image parameters, including dependencies, configured to use the global value
+## Current available global Docker image parameters: imageRegistry and imagePullSecrets
+##
+global:
+  postgresql: {}
+#   imageRegistry: myRegistryName
+#   imagePullSecrets:
+#     - myRegistryKeySecretName
+#   storageClass: myStorageClass
 
 ## Bitnami PostgreSQL image version
 ## ref: https://hub.docker.com/r/bitnami/postgresql/tags/
 image:
   registry: docker.io
   repository: bitnami/postgresql
-  tag: 10.6.0
+  tag: 11.6.0-debian-9-r0
   ## Specify a imagePullPolicy
   ## Defaults to 'Always' if image tag is 'latest', else set to 'IfNotPresent'
   ## ref: http://kubernetes.io/docs/user-guide/images/#pre-pulling-images
   ##
-  pullPolicy: Always
-
+  pullPolicy: IfNotPresent
   ## Optionally specify an array of imagePullSecrets.
   ## Secrets must be manually created in the namespace.
   ## ref: https://kubernetes.io/docs/tasks/configure-pod-container/pull-image-private-registry/
   ##
   # pullSecrets:
-  #   - myRegistrKeySecretName
+  #   - myRegistryKeySecretName
 
   ## Set to true if you would like to see extra information on logs
   ## It turns BASH and NAMI debugging in minideb
   ## ref:  https://github.com/bitnami/minideb-extras/#turn-on-bash-debugging
   debug: false
 
+## String to partially override postgresql.fullname template (will maintain the release name)
+##
+# nameOverride:
+
+## String to fully override postgresql.fullname template
+##
+# fullnameOverride:
+
 ##
 ## Init containers parameters:
 ## volumePermissions: Change the owner of the persist volume mountpoint to RunAsUser:fsGroup
@@ -38,16 +50,27 @@ volumePermissions:
   image:
     registry: docker.io
     repository: bitnami/minideb
-    tag: latest
+    tag: stretch
     ## Specify a imagePullPolicy
     ## Defaults to 'Always' if image tag is 'latest', else set to 'IfNotPresent'
     ## ref: http://kubernetes.io/docs/user-guide/images/#pre-pulling-images
     ##
     pullPolicy: Always
+    ## Optionally specify an array of imagePullSecrets.
+    ## Secrets must be manually created in the namespace.
+    ## ref: https://kubernetes.io/docs/tasks/configure-pod-container/pull-image-private-registry/
+    ##
+    # pullSecrets:
+    #   - myRegistryKeySecretName
   ## Init container Security Context
   securityContext:
     runAsUser: 0
 
+## Use an alternate scheduler, e.g. "stork".
+## ref: https://kubernetes.io/docs/tasks/administer-cluster/configure-multiple-schedulers/
+##
+# schedulerName:
+
 ## Pod Security Context
 ## ref: https://kubernetes.io/docs/tasks/configure-pod-container/security-context/
 ##
@@ -56,21 +79,32 @@ securityContext:
   fsGroup: 1001
   runAsUser: 1001
 
+## Pod Service Account
+## ref: https://kubernetes.io/docs/tasks/configure-pod-container/configure-service-account/
+serviceAccount:
+  enabled: false
+  ## Name of an already existing service account. Setting this value disables the automatic service account creation.
+  # name:
+
 replication:
-  enabled: true
+  enabled: false
   user: repl_user
   password: repl_password
-  slaveReplicas: 2
+  slaveReplicas: 1
   ## Set synchronous commit mode: on, off, remote_apply, remote_write and local
   ## ref: https://www.postgresql.org/docs/9.6/runtime-config-wal.html#GUC-WAL-LEVEL
-  synchronousCommit: "on"
+  synchronousCommit: "off"
   ## From the number of `slaveReplicas` defined above, set the number of those that will have synchronous replication
   ## NOTE: It cannot be > slaveReplicas
-  numSynchronousReplicas: 1
+  numSynchronousReplicas: 0
   ## Replication Cluster application name. Useful for defining multiple replication policies
   applicationName: my_application
 
-## PostgreSQL admin user
+## PostgreSQL admin password (used when `postgresqlUsername` is not `postgres`)
+## ref: https://github.com/bitnami/bitnami-docker-postgresql/blob/master/README.md#creating-a-database-user-on-first-run (see note!)
+# postgresqlPostgresPassword:
+
+## PostgreSQL user (has superuser privileges if username is `postgres`)
 ## ref: https://github.com/bitnami/bitnami-docker-postgresql/blob/master/README.md#setting-the-root-password-on-first-run
 postgresqlUsername: postgres
 
@@ -79,16 +113,40 @@ postgresqlUsername: postgres
 ##
 # postgresqlPassword:
 
+## PostgreSQL password using existing secret
+## existingSecret: secret
+
+## Mount PostgreSQL secret as a file instead of passing environment variable
+# usePasswordFile: false
+
 ## Create a database
 ## ref: https://github.com/bitnami/bitnami-docker-postgresql/blob/master/README.md#creating-a-database-on-first-run
 ##
 # postgresqlDatabase:
 
-## PostgreSQL password using existing secret
-## existingSecret: secret
+## PostgreSQL data dir
+## ref: https://github.com/bitnami/bitnami-docker-postgresql/blob/master/README.md
+##
+postgresqlDataDir: /bitnami/postgresql/data
 
-## Mount PostgreSQL secret as a file instead of passing environment variable
-# usePasswordFile: false
+## An array to add extra environment variables
+## For example:
+## extraEnv:
+##   - name: FOO
+##     value: "bar"
+##
+# extraEnv:
+extraEnv: []
+
+## Specify extra initdb args
+## ref: https://github.com/bitnami/bitnami-docker-postgresql/blob/master/README.md
+##
+# postgresqlInitdbArgs:
+
+## Specify a custom location for the PostgreSQL transaction log
+## ref: https://github.com/bitnami/bitnami-docker-postgresql/blob/master/README.md
+##
+# postgresqlInitdbWalDir:
 
 ## PostgreSQL configuration
 ## Specify runtime configuration parameters as a dict, using camelCase, e.g.
@@ -122,11 +180,11 @@ postgresqlUsername: postgres
 # extendedConfConfigMap:
 
 ## initdb scripts
-## Specify dictionnary of scripts to be run at first boot
+## Specify dictionary of scripts to be run at first boot
 ## Alternatively, you can put your scripts under the files/docker-entrypoint-initdb.d directory
 ##
 # initdbScripts:
-#   my_init_script.sh:|
+#   my_init_script.sh: |
 #      #!/bin/sh
 #      echo "Do something."
 
@@ -134,10 +192,41 @@ postgresqlUsername: postgres
 ## NOTE: This will override initdbScripts
 # initdbScriptsConfigMap:
 
+## Secret with scripts to be run at first boot (in case it contains sensitive information)
+## NOTE: This can work along initdbScripts or initdbScriptsConfigMap
+# initdbScriptsSecret:
+
+## Specify the PostgreSQL username and password to execute the initdb scripts
+# initdbUser:
+# initdbPassword:
+
+## Optional duration in seconds the pod needs to terminate gracefully.
+## ref: https://kubernetes.io/docs/concepts/workloads/pods/pod/#termination-of-pods
+##
+# terminationGracePeriodSeconds: 30
+
+## LDAP configuration
+##
+ldap:
+  enabled: false
+  url: ""
+  server: ""
+  port: ""
+  prefix: ""
+  suffix: ""
+  baseDN: ""
+  bindDN: ""
+  bind_password:
+  search_attr: ""
+  search_filter: ""
+  scheme: ""
+  tls: false
+
 ## PostgreSQL service configuration
 service:
   ## PosgresSQL service type
   type: ClusterIP
+  # clusterIP: None
   port: 5432
 
   ## Specify the nodePort value for the LoadBalancer and NodePort service types.
@@ -145,13 +234,32 @@ service:
   ##
   # nodePort:
 
-  ## Provide any additional annotations which may be required. This can be used to
+  ## Provide any additional annotations which may be required.
+  ## The value is evaluated as a template, so, for example, the value can depend on .Release or .Chart
   annotations: {}
   ## Set the LoadBalancer service type to internal only.
   ## ref: https://kubernetes.io/docs/concepts/services-networking/service/#internal-load-balancer
   ##
   # loadBalancerIP:
 
+  ## Load Balancer sources
+  ## https://kubernetes.io/docs/tasks/access-application-cluster/configure-cloud-provider-firewall/#restrict-access-for-loadbalancer-service
+  ##
+  # loadBalancerSourceRanges:
+  # - 10.10.10.0/24
+
+## Start master and slave(s) pod(s) without limitations on shm memory.
+## By default docker and containerd (and possibly other container runtimes)
+## limit `/dev/shm` to `64M` (see e.g. the
+## [docker issue](https://github.com/docker-library/postgres/issues/416) and the
+## [containerd issue](https://github.com/containerd/containerd/issues/3654),
+## which could be not enough if PostgreSQL uses parallel workers heavily.
+## If this option is present and value is `true`,
+## to the target database pod will be mounted a new tmpfs volume to remove
+## this limitation.
+shmVolume:
+  enabled: true
+
 ## PostgreSQL data Persistent Volume Storage Class
 ## If defined, storageClassName: <storageClass>
 ## If set to "-", storageClassName: "", which disables dynamic provisioning
@@ -163,8 +271,20 @@ persistence:
   enabled: true
   ## A manually managed Persistent Volume and Claim
   ## If defined, PVC must be created manually before volume will be bound
+  ## The value is evaluated as a template, so, for example, the name can depend on .Release or .Chart
+  ##
   # existingClaim:
+
+  ## The path the volume will be mounted at, useful when using different
+  ## PostgreSQL images.
+  ##
   mountPath: /bitnami/postgresql
+
+  ## The subdirectory of the volume to mount to, useful in dev environments
+  ## and one PV for multiple services.
+  ##
+  subPath: ""
+
   # storageClass: "-"
   accessModes:
     - ReadWriteOnce
@@ -180,25 +300,57 @@ updateStrategy:
 ## PostgreSQL Master parameters
 ##
 master:
-  ## Node, affinity and tolerations labels for pod assignment
+  ## Node, affinity, tolerations, and priorityclass settings for pod assignment
   ## ref: https://kubernetes.io/docs/concepts/configuration/assign-pod-node/#nodeselector
   ## ref: https://kubernetes.io/docs/concepts/configuration/assign-pod-node/#affinity-and-anti-affinity
   ## ref: https://kubernetes.io/docs/concepts/configuration/assign-pod-node/#taints-and-tolerations-beta-feature
+  ## ref: https://kubernetes.io/docs/concepts/configuration/pod-priority-preemption
   nodeSelector: {}
   affinity: {}
   tolerations: []
+  labels: {}
+  annotations: {}
+  podLabels: {}
+  podAnnotations: {}
+  priorityClassName: ""
+  extraInitContainers: |
+  # - name: do-something
+  #   image: busybox
+  #   command: ['do', 'something']
+  ## Additional PostgreSQL Master Volume mounts
+  ##
+  extraVolumeMounts: []
+  ## Additional PostgreSQL Master Volumes
+  ##
+  extraVolumes: []
 
 ##
 ## PostgreSQL Slave parameters
 ##
 slave:
-  ## Node, affinity and tolerations labels for pod assignment
+  ## Node, affinity, tolerations, and priorityclass settings for pod assignment
   ## ref: https://kubernetes.io/docs/concepts/configuration/assign-pod-node/#nodeselector
   ## ref: https://kubernetes.io/docs/concepts/configuration/assign-pod-node/#affinity-and-anti-affinity
   ## ref: https://kubernetes.io/docs/concepts/configuration/assign-pod-node/#taints-and-tolerations-beta-feature
+  ## ref: https://kubernetes.io/docs/concepts/configuration/pod-priority-preemption
   nodeSelector: {}
   affinity: {}
   tolerations: []
+  labels: {}
+  annotations: {}
+  podLabels: {}
+  podAnnotations: {}
+  priorityClassName: ""
+  extraInitContainers: |
+  # - name: do-something
+  #   image: busybox
+  #   command: ['do', 'something']
+  ## Additional PostgreSQL Slave Volume mounts
+  ##
+  extraVolumeMounts: []
+  ## Additional PostgreSQL Slave Volumes
+  ##
+  extraVolumes: []
 
 ## Configure resource requests and limits
 ## ref: http://kubernetes.io/docs/user-guide/compute-resources/
@@ -209,7 +361,7 @@ resources:
     cpu: 250m
 
 networkPolicy:
-  ## Enable creation of NetworkPolicy resources.
+  ## Enable creation of NetworkPolicy resources. Only Ingress traffic is filtered for now.
   ##
   enabled: false
 
@@ -220,6 +372,17 @@ networkPolicy:
   ##
   allowExternal: true
 
+  ## if explicitNamespacesSelector is missing or set to {}, only client Pods that are in the networkPolicy's namespace
+  ## and that match other criteria, the ones that have the good label, can reach the DB.
+  ## But sometimes, we want the DB to be accessible to clients from other namespaces, in this case, we can use this
+  ## LabelSelector to select these namespaces, note that the networkPolicy's namespace should also be explicitly added.
+  ##
+  # explicitNamespacesSelector:
+    # matchLabels:
+      # role: frontend
+    # matchExpressions:
+      # - {key: role, operator: In, values: [frontend]}
+
 ## Configure extra options for liveness and readiness probes
 ## ref: https://kubernetes.io/docs/tasks/configure-pod-container/configure-liveness-readiness-probes/#configure-probes)
 livenessProbe:
@@ -241,7 +404,7 @@ readinessProbe:
 ## Configure metrics exporter
 ##
 metrics:
-  enabled: true
+  enabled: false
   # resources: {}
   service:
     type: ClusterIP
@@ -249,18 +412,59 @@ metrics:
       prometheus.io/scrape: "true"
       prometheus.io/port: "9187"
     loadBalancerIP:
+  serviceMonitor:
+    enabled: false
+    additionalLabels: {}
+    # namespace: monitoring
+    # interval: 30s
+    # scrapeTimeout: 10s
+  ## Custom PrometheusRule to be defined
+  ## The value is evaluated as a template, so, for example, the value can depend on .Release or .Chart
+  ## ref: https://github.com/coreos/prometheus-operator#customresourcedefinitions
+  prometheusRule:
+    enabled: false
+    additionalLabels: {}
+    namespace: ""
+    rules: []
+      ## These are just examples rules, please adapt them to your needs.
+      ## Make sure to constraint the rules to the current postgresql service.
+      # - alert: HugeReplicationLag
+      #   expr: pg_replication_lag{service="{{ template "postgresql.fullname" . }}-metrics"} / 3600 > 1
+      #   for: 1m
+      #   labels:
+      #     severity: critical
+      #   annotations:
+      #     description: replication for {{ template "postgresql.fullname" . }} PostgreSQL is lagging by {{ "{{ $value }}" }} hour(s).
+      #     summary: PostgreSQL replication is lagging by {{ "{{ $value }}" }} hour(s).
   image:
     registry: docker.io
-    repository: wrouesnel/postgres_exporter
-    tag: v0.4.6
+    repository: bitnami/postgres-exporter
+    tag: 0.7.0-debian-9-r12
     pullPolicy: IfNotPresent
     ## Optionally specify an array of imagePullSecrets.
     ## Secrets must be manually created in the namespace.
     ## ref: https://kubernetes.io/docs/tasks/configure-pod-container/pull-image-private-registry/
     ##
     # pullSecrets:
-    #   - myRegistrKeySecretName
-
+    #   - myRegistryKeySecretName
+  ## Define additional custom metrics
+  ## ref: https://github.com/wrouesnel/postgres_exporter#adding-new-metrics-via-a-config-file
+  # customMetrics:
+  #   pg_database:
+  #     query: "SELECT d.datname AS name, CASE WHEN pg_catalog.has_database_privilege(d.datname, 'CONNECT') THEN pg_catalog.pg_database_size(d.datname) ELSE 0 END AS size FROM pg_catalog.pg_database d where datname not in ('template0', 'template1', 'postgres')"
+  #     metrics:
+  #       - name:
+  #           usage: "LABEL"
+  #           description: "Name of the database"
+  #       - size_bytes:
+  #           usage: "GAUGE"
+  #           description: "Size of the database in bytes"
+  ## Pod Security Context
+  ## ref: https://kubernetes.io/docs/tasks/configure-pod-container/security-context/
+  ##
+  securityContext:
+    enabled: false
+    runAsUser: 1001
   ## ref: https://kubernetes.io/docs/tasks/configure-pod-container/configure-liveness-readiness-probes/#configure-probes)
   ## Configure extra options for liveness and readiness probes
   livenessProbe:
@@ -278,6 +482,3 @@ metrics:
     timeoutSeconds: 5
     failureThreshold: 6
     successThreshold: 1
-
-# Define custom environment variables to pass to the image here
-extraEnv: {}
diff --git a/ric-aux/helm/infrastructure/subcharts/kong/ci/default-values.yaml b/ric-aux/helm/infrastructure/subcharts/kong/ci/default-values.yaml
new file mode 100755 (executable)
index 0000000..fe8b694
--- /dev/null
@@ -0,0 +1,3 @@
+# install chart with default values
+proxy:
+  type: NodePort
diff --git a/ric-aux/helm/infrastructure/subcharts/kong/ci/test1-values.yaml b/ric-aux/helm/infrastructure/subcharts/kong/ci/test1-values.yaml
new file mode 100755 (executable)
index 0000000..c77ae44
--- /dev/null
@@ -0,0 +1,28 @@
+# This tests the following unrealted aspects of Ingress Controller
+# - ingressController deploys without a database (default)
+ingressController:
+  enabled: true
+# - webhook is enabled and deploys
+  admissionWebhook:
+    enabled: true
+# - environment variables can be injected into ingress controller container
+  env:
+    kong_admin_header: "foo:bar"
+# - podSecurityPolicies are enabled
+podSecurityPolicy:
+  enabled: true
+# - ingress resources are created with hosts
+admin:
+  type: NodePort
+  ingress:
+    enabled: true
+    hosts: ["test.com", "test2.com"]
+    annotations: {}
+    path: /
+proxy:
+  type: NodePort
+  ingress:
+    enabled: true
+    hosts: ["test.com", "test2.com"]
+    annotations: {}
+    path: /
diff --git a/ric-aux/helm/infrastructure/subcharts/kong/ci/test2-values.yaml b/ric-aux/helm/infrastructure/subcharts/kong/ci/test2-values.yaml
new file mode 100755 (executable)
index 0000000..735588d
--- /dev/null
@@ -0,0 +1,37 @@
+# This tests the following unrealted aspects of Ingress Controller
+# - ingressController deploys with a database
+ingressController:
+  enabled: true
+postgresql:
+  enabled: true
+  postgresqlUsername: kong
+  postgresqlDatabase: kong
+  service:
+    port: 5432
+env:
+  database: "postgres"
+# - ingress resources are created without hosts
+admin:
+  type: NodePort
+  ingress:
+    enabled: true
+    hosts: []
+    path: /
+proxy:
+  type: NodePort
+  ingress:
+    enabled: true
+    hosts: []
+    annotations: {}
+    path: /
+  useTLS: true
+
+# - PDB is enabled
+podDisruptionBudget:
+  enabled: true
+# update strategy
+updateStrategy:
+  type: "RollingUpdate"
+  rollingUpdate:
+    maxSurge: 1
+    maxUnavailable: 0
diff --git a/ric-aux/helm/infrastructure/subcharts/kong/ci/test3-values.yaml b/ric-aux/helm/infrastructure/subcharts/kong/ci/test3-values.yaml
new file mode 100755 (executable)
index 0000000..3b4f58e
--- /dev/null
@@ -0,0 +1,28 @@
+# CI test for testing dbless deployment without ingress controllers
+# - disable ingress controller
+ingressController:
+  enabled: false
+# - disable DB for kong
+env:
+  database: "off"
+postgresql:
+  enabled: false
+# - supply DBless config for kong
+dblessConfig:
+  # Or the configuration is passed in full-text below
+  config:
+    _format_version: "1.1"
+    services:
+      - name: test-svc
+        url: http://example.com
+        routes:
+        - name: test
+          paths:
+          - /test
+        plugins:
+        - name: request-termination
+          config:
+            status_code: 200
+            message: "dbless-config"
+proxy:
+  type: NodePort
diff --git a/ric-aux/helm/infrastructure/subcharts/kong/requirements.yaml b/ric-aux/helm/infrastructure/subcharts/kong/requirements.yaml
new file mode 100755 (executable)
index 0000000..98315ed
--- /dev/null
@@ -0,0 +1,5 @@
+dependencies:
+- name: postgresql
+  version: ~8.1.0
+  repository: https://kubernetes-charts.storage.googleapis.com/
+  condition: postgresql.enabled
diff --git a/ric-aux/helm/infrastructure/subcharts/kong/templates/NOTES.txt b/ric-aux/helm/infrastructure/subcharts/kong/templates/NOTES.txt
new file mode 100755 (executable)
index 0000000..d7ee3f3
--- /dev/null
@@ -0,0 +1,16 @@
+To connect to Kong, please execute the following command
+
+
+{{- if contains "LoadBalancer" .Values.proxy.type }}
+  HOST=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ template "kong.fullname" . }}-proxy -o jsonpath='{.status.loadBalancer.ingress[0].ip}')
+  PORT=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ template "kong.fullname" . }}-proxy -o jsonpath='{.spec.ports[0].port}')
+{{- else if contains "NodePort" .Values.proxy.type -}}
+  HOST=$(kubectl get nodes --namespace {{ .Release.Namespace }} -o jsonpath='{.items[0].status.addresses[0].address}')
+  PORT=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ template "kong.fullname" . }}-proxy -o jsonpath='{.spec.ports[0].nodePort}')
+{{- end -}}
+export PROXY_IP=${HOST}:${PORT}
+curl $PROXY_IP
+
+Once installed, please follow along the getting started guide to start using Kong:
+https://bit.ly/k4k8s-get-started
+
diff --git a/ric-aux/helm/infrastructure/subcharts/kong/templates/_helpers.tpl b/ric-aux/helm/infrastructure/subcharts/kong/templates/_helpers.tpl
new file mode 100755 (executable)
index 0000000..853b83f
--- /dev/null
@@ -0,0 +1,509 @@
+{{/* vim: set filetype=mustache: */}}
+{{/*
+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).
+*/}}
+
+{{- define "kong.name" -}}
+{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+
+{{- define "kong.fullname" -}}
+{{- $name := default .Chart.Name .Values.nameOverride -}}
+{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+
+{{- define "kong.chart" -}}
+{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+
+{{- define "kong.metaLabels" -}}
+app.kubernetes.io/name: {{ template "kong.name" . }}
+helm.sh/chart: {{ template "kong.chart" . }}
+app.kubernetes.io/instance: "{{ .Release.Name }}"
+app.kubernetes.io/managed-by: "{{ .Release.Service }}"
+app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
+{{- end -}}
+
+{{- define "kong.selectorLabels" -}}
+app.kubernetes.io/name: {{ template "kong.name" . }}
+app.kubernetes.io/component: app
+app.kubernetes.io/instance: "{{ .Release.Name }}"
+{{- end -}}
+
+{{- define "kong.postgresql.fullname" -}}
+{{- $name := default "postgresql" .Values.postgresql.nameOverride -}}
+{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+
+{{- define "kong.dblessConfig.fullname" -}}
+{{- $name := default "kong-custom-dbless-config" .Values.dblessConfig.nameOverride -}}
+{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+
+{{/*
+Create the name of the service account to use
+*/}}
+{{- define "kong.serviceAccountName" -}}
+{{- if .Values.ingressController.serviceAccount.create -}}
+    {{ default (include "kong.fullname" .) .Values.ingressController.serviceAccount.name }}
+{{- else -}}
+    {{ default "default" .Values.ingressController.serviceAccount.name }}
+{{- end -}}
+{{- end -}}
+
+{{/*
+Create the KONG_PROXY_LISTEN value string
+*/}}
+{{- define "kong.kongProxyListenValue" -}}
+
+{{- if and .Values.proxy.http.enabled .Values.proxy.tls.enabled -}}
+   0.0.0.0:{{ .Values.proxy.http.containerPort }},0.0.0.0:{{ .Values.proxy.tls.containerPort }} ssl
+{{- else -}}
+{{- if .Values.proxy.http.enabled -}}
+   0.0.0.0:{{ .Values.proxy.http.containerPort }}
+{{- end -}}
+{{- if .Values.proxy.tls.enabled -}}
+   0.0.0.0:{{ .Values.proxy.tls.containerPort }} ssl
+{{- end -}}
+{{- end -}}
+
+{{- end }}
+
+{{/*
+Create the KONG_ADMIN_GUI_LISTEN value string
+*/}}
+{{- define "kong.kongManagerListenValue" -}}
+
+{{- if and .Values.manager.http.enabled .Values.manager.tls.enabled -}}
+   0.0.0.0:{{ .Values.manager.http.containerPort }},0.0.0.0:{{ .Values.manager.tls.containerPort }} ssl
+{{- else -}}
+{{- if .Values.manager.http.enabled -}}
+   0.0.0.0:{{ .Values.manager.http.containerPort }}
+{{- end -}}
+{{- if .Values.manager.tls.enabled -}}
+   0.0.0.0:{{ .Values.manager.tls.containerPort }} ssl
+{{- end -}}
+{{- end -}}
+
+{{- end }}
+
+{{/*
+Create the KONG_PORTAL_GUI_LISTEN value string
+*/}}
+{{- define "kong.kongPortalListenValue" -}}
+
+{{- if and .Values.portal.http.enabled .Values.portal.tls.enabled -}}
+   0.0.0.0:{{ .Values.portal.http.containerPort }},0.0.0.0:{{ .Values.portal.tls.containerPort }} ssl
+{{- else -}}
+{{- if .Values.portal.http.enabled -}}
+   0.0.0.0:{{ .Values.portal.http.containerPort }}
+{{- end -}}
+{{- if .Values.portal.tls.enabled -}}
+   0.0.0.0:{{ .Values.portal.tls.containerPort }} ssl
+{{- end -}}
+{{- end -}}
+
+{{- end }}
+
+{{/*
+Create the KONG_PORTAL_API_LISTEN value string
+*/}}
+{{- define "kong.kongPortalApiListenValue" -}}
+
+{{- if and .Values.portalapi.http.enabled .Values.portalapi.tls.enabled -}}
+   0.0.0.0:{{ .Values.portalapi.http.containerPort }},0.0.0.0:{{ .Values.portalapi.tls.containerPort }} ssl
+{{- else -}}
+{{- if .Values.portalapi.http.enabled -}}
+   0.0.0.0:{{ .Values.portalapi.http.containerPort }}
+{{- end -}}
+{{- if .Values.portalapi.tls.enabled -}}
+   0.0.0.0:{{ .Values.portalapi.tls.containerPort }} ssl
+{{- end -}}
+{{- end -}}
+
+{{- end }}
+
+{{/*
+Create the ingress servicePort value string
+*/}}
+
+{{- define "kong.ingress.servicePort" -}}
+{{- if .tls.enabled -}}
+   {{ .tls.servicePort }}
+{{- else -}}
+   {{ .http.servicePort }}
+{{- end -}}
+{{- end -}}
+
+{{/*
+Generate an appropriate external URL from a Kong service's ingress configuration
+Strips trailing slashes from the path. Manager at least does not handle these
+intelligently and will append its own slash regardless, and the admin API cannot handle
+the extra slash.
+*/}}
+
+{{- define "kong.ingress.serviceUrl" -}}
+{{- if .tls -}}
+    https://{{ .hostname }}{{ .path | trimSuffix "/" }}
+{{- else -}}
+    http://{{ .hostname }}{{ .path | trimSuffix "/" }}
+{{- end -}}
+{{- end -}}
+
+{{/*
+The name of the service used for the ingress controller's validation webhook
+*/}}
+
+{{- define "kong.service.validationWebhook" -}}
+{{ include "kong.fullname" . }}-validation-webhook
+{{- end -}}
+
+{{- define "kong.env" -}}
+{{- range $key, $val := .Values.env }}
+- name: KONG_{{ $key | upper}}
+{{- $valueType := printf "%T" $val -}}
+{{ if eq $valueType "map[string]interface {}" }}
+{{ toYaml $val | indent 2 -}}
+{{- else }}
+  value: {{ $val | quote -}}
+{{- end -}}
+{{- end -}}
+{{- end -}}
+
+{{- define "kong.ingressController.env" -}}
+{{- range $key, $val := .Values.ingressController.env }}
+- name: CONTROLLER_{{ $key | upper}}
+{{- $valueType := printf "%T" $val -}}
+{{ if eq $valueType "map[string]interface {}" }}
+{{ toYaml $val | indent 2 -}}
+{{- else }}
+  value: {{ $val | quote -}}
+{{- end -}}
+{{- end -}}
+{{- end -}}
+
+{{- define "kong.volumes" -}}
+- name: {{ template "kong.fullname" . }}-prefix-dir
+  emptyDir: {}
+- name: {{ template "kong.fullname" . }}-tmp
+  emptyDir: {}
+{{- range .Values.plugins.configMaps }}
+- name: kong-plugin-{{ .pluginName }}
+  configMap:
+    name: {{ .name }}
+{{- end }}
+{{- range .Values.plugins.secrets }}
+- name: kong-plugin-{{ .pluginName }}
+  secret:
+    secretName: {{ .name }}
+{{- end }}
+- name: custom-nginx-template-volume
+  configMap:
+    name: {{ template "kong.fullname" . }}-default-custom-server-blocks
+{{- if (and (not .Values.ingressController.enabled) (eq .Values.env.database "off")) }}
+- name: kong-custom-dbless-config-volume
+  configMap:
+    {{- if .Values.dblessConfig.configMap }}
+    name: {{ .Values.dblessConfig.configMap }}
+    {{- else }}
+    name: {{ template "kong.dblessConfig.fullname" . }}
+    {{- end }}
+{{- end }}
+{{- if .Values.ingressController.admissionWebhook.enabled }}
+- name: webhook-cert
+  secret:
+    secretName: {{ template "kong.fullname" . }}-validation-webhook-keypair
+{{- end }}
+{{- range $secretVolume := .Values.secretVolumes }}
+- name: {{ . }}
+  secret:
+    secretName: {{ . }}
+{{- end }}
+{{- end -}}
+
+{{- define "kong.volumeMounts" -}}
+- name: {{ template "kong.fullname" . }}-prefix-dir
+  mountPath: /kong_prefix/
+- name: {{ template "kong.fullname" . }}-tmp
+  mountPath: /tmp
+- name: custom-nginx-template-volume
+  mountPath: /kong
+{{- if (and (not .Values.ingressController.enabled) (eq .Values.env.database "off")) }}
+- name: kong-custom-dbless-config-volume
+  mountPath: /kong_dbless/
+{{- end }}
+{{- range .Values.secretVolumes }}
+- name:  {{ . }}
+  mountPath: /etc/secrets/{{ . }}
+{{- end }}
+{{- range .Values.plugins.configMaps }}
+- name:  kong-plugin-{{ .pluginName }}
+  mountPath: /opt/kong/plugins/{{ .pluginName }}
+  readOnly: true
+{{- end }}
+{{- range .Values.plugins.secrets }}
+- name:  kong-plugin-{{ .pluginName }}
+  mountPath: /opt/kong/plugins/{{ .pluginName }}
+  readOnly: true
+{{- end }}
+{{- end -}}
+
+{{- define "kong.plugins" -}}
+{{ $myList := list "bundled" }}
+{{- range .Values.plugins.configMaps -}}
+{{- $myList = append $myList .pluginName -}}
+{{- end -}}
+{{- range .Values.plugins.secrets -}}
+  {{ $myList = append $myList .pluginName -}}
+{{- end }}
+{{- $myList | join "," -}}
+{{- end -}}
+
+{{- define "kong.wait-for-db" -}}
+- name: wait-for-db
+  image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
+  imagePullPolicy: {{ .Values.image.pullPolicy }}
+  env:
+  {{- if .Values.enterprise.enabled }}
+  {{- include "kong.license" . | nindent 2 }}
+  {{- end }}
+  {{- if .Values.postgresql.enabled }}
+  - name: KONG_PG_HOST
+    value: {{ template "kong.postgresql.fullname" . }}
+  - name: KONG_PG_PORT
+    value: "{{ .Values.postgresql.service.port }}"
+  - name: KONG_PG_PASSWORD
+    valueFrom:
+      secretKeyRef:
+        name: {{ template "kong.postgresql.fullname" . }}
+        key: postgresql-password
+  {{- end }}
+  - name: KONG_LUA_PACKAGE_PATH
+    value: "/opt/?.lua;;"
+  - name: KONG_PLUGINS
+    value: {{ template "kong.plugins" . }}
+  {{- include "kong.env" .  | nindent 2 }}
+  command: [ "/bin/sh", "-c", "until kong start; do echo 'waiting for db'; sleep 1; done; kong stop" ]
+  volumeMounts:
+  {{- include "kong.volumeMounts" . | nindent 4 }}
+{{- end -}}
+
+{{- define "kong.controller-container" -}}
+- name: ingress-controller
+  args:
+  - /kong-ingress-controller
+  # Service from were we extract the IP address/es to use in Ingress status
+  - --publish-service={{ .Release.Namespace }}/{{ template "kong.fullname" . }}-proxy
+  # Set the ingress class
+  - --ingress-class={{ .Values.ingressController.ingressClass }}
+  - --election-id=kong-ingress-controller-leader-{{ .Values.ingressController.ingressClass }}
+  # the kong URL points to the kong admin api server
+  {{- if .Values.admin.useTLS }}
+  - --kong-url=https://localhost:{{ .Values.admin.containerPort }}
+  - --admin-tls-skip-verify # TODO make this configurable
+  {{- else }}
+  - --kong-url=http://localhost:{{ .Values.admin.containerPort }}
+  {{- end }}
+  {{- if .Values.ingressController.admissionWebhook.enabled }}
+  - --admission-webhook-listen=0.0.0.0:{{ .Values.ingressController.admissionWebhook.port }}
+  {{- end }}
+  env:
+  - name: POD_NAME
+    valueFrom:
+      fieldRef:
+        apiVersion: v1
+        fieldPath: metadata.name
+  - name: POD_NAMESPACE
+    valueFrom:
+      fieldRef:
+        apiVersion: v1
+        fieldPath: metadata.namespace
+{{- include "kong.ingressController.env" .  | indent 2 }}
+  image: "{{ .Values.ingressController.image.repository }}:{{ .Values.ingressController.image.tag }}"
+  imagePullPolicy: {{ .Values.image.pullPolicy }}
+  readinessProbe:
+{{ toYaml .Values.ingressController.readinessProbe | indent 4 }}
+  livenessProbe:
+{{ toYaml .Values.ingressController.livenessProbe | indent 4 }}
+  resources:
+{{ toYaml .Values.ingressController.resources | indent 4 }}
+{{- if .Values.ingressController.admissionWebhook.enabled }}
+  volumeMounts:
+  - name: webhook-cert
+    mountPath: /admission-webhook
+    readOnly: true
+{{- end }}
+{{- end -}}
+
+{{/*
+Retrieve Kong Enterprise license from a secret and make it available in env vars
+*/}}
+{{- define "kong.license" -}}
+- name: KONG_LICENSE_DATA
+  valueFrom:
+    secretKeyRef:
+      name: {{ .Values.enterprise.license_secret }}
+      key: license
+{{- end -}}
+
+{{/*
+Use the Pod security context defined in Values or set the UID by default
+*/}}
+{{- define "kong.podsecuritycontext" -}}
+{{ .Values.securityContext | toYaml }}
+{{- end -}}
+
+{{/*
+The environment values passed to Kong; this should come after all
+the template that it itself is using form the above sections.
+*/}}
+{{- define "kong.final_env" -}}
+- name: KONG_LUA_PACKAGE_PATH
+  value: "/opt/?.lua;;"
+{{- if not .Values.env.admin_listen }}
+{{- if .Values.admin.useTLS }}
+- name: KONG_ADMIN_LISTEN
+  value: "0.0.0.0:{{ .Values.admin.containerPort }} ssl"
+{{- else }}
+- name: KONG_ADMIN_LISTEN
+  value: 0.0.0.0:{{ .Values.admin.containerPort }}
+{{- end }}
+{{- end }}
+{{- if .Values.admin.ingress.enabled }}
+- name: KONG_ADMIN_API_URI
+  value: {{ include "kong.ingress.serviceUrl" .Values.admin.ingress }}
+{{- end }}
+{{- if not .Values.env.proxy_listen }}
+- name: KONG_PROXY_LISTEN
+  value: {{ template "kong.kongProxyListenValue" . }}
+{{- end }}
+{{- if and (not .Values.env.admin_gui_listen) (.Values.enterprise.enabled) }}
+- name: KONG_ADMIN_GUI_LISTEN
+  value: {{ template "kong.kongManagerListenValue" . }}
+{{- end }}
+{{- if and (.Values.manager.ingress.enabled) (.Values.enterprise.enabled) }}
+- name: KONG_ADMIN_GUI_URL
+  value: {{ include "kong.ingress.serviceUrl" .Values.manager.ingress }}
+{{- end }}
+{{- if and (not .Values.env.portal_gui_listen) (.Values.enterprise.enabled) (.Values.enterprise.portal.enabled) }}
+- name: KONG_PORTAL_GUI_LISTEN
+  value: {{ template "kong.kongPortalListenValue" . }}
+{{- end }}
+{{- if and (.Values.portal.ingress.enabled) (.Values.enterprise.enabled) (.Values.enterprise.portal.enabled) }}
+- name: KONG_PORTAL_GUI_HOST
+  value: {{ .Values.portal.ingress.hostname }}
+{{- if .Values.portal.ingress.tls }}
+- name: KONG_PORTAL_GUI_PROTOCOL
+  value: https
+{{- else }}
+- name: KONG_PORTAL_GUI_PROTOCOL
+  value: http
+{{- end }}
+{{- end }}
+{{- if and (not .Values.env.portal_api_listen) (.Values.enterprise.enabled) (.Values.enterprise.portal.enabled) }}
+- name: KONG_PORTAL_API_LISTEN
+  value: {{ template "kong.kongPortalApiListenValue" . }}
+{{- end }}
+{{- if and (.Values.portalapi.ingress.enabled) (.Values.enterprise.enabled) (.Values.enterprise.portal.enabled) }}
+- name: KONG_PORTAL_API_URL
+  value: {{ include "kong.ingress.serviceUrl" .Values.portalapi.ingress }}
+{{- end }}
+- name: KONG_NGINX_DAEMON
+  value: "off"
+{{- if .Values.enterprise.enabled }}
+{{- if not .Values.enterprise.vitals.enabled }}
+- name: KONG_VITALS
+  value: "off"
+{{- end }}
+{{- if .Values.enterprise.portal.enabled }}
+- name: KONG_PORTAL
+  value: "on"
+{{- if .Values.enterprise.portal.portal_auth }}
+- name: KONG_PORTAL_AUTH
+  value: {{ .Values.enterprise.portal.portal_auth }}
+- name: KONG_PORTAL_SESSION_CONF
+  valueFrom:
+    secretKeyRef:
+      name: {{ .Values.enterprise.portal.session_conf_secret }}
+      key: portal_session_conf
+{{- end }}
+{{- end }}
+{{- if .Values.enterprise.rbac.enabled }}
+- name: KONG_ENFORCE_RBAC
+  value: "on"
+- name: KONG_ADMIN_GUI_AUTH
+  value: {{ .Values.enterprise.rbac.admin_gui_auth | default "basic-auth" }}
+{{- if not (eq .Values.enterprise.rbac.admin_gui_auth "basic-auth") }}
+- name: KONG_ADMIN_GUI_AUTH_CONF
+  valueFrom:
+    secretKeyRef:
+      name: {{ .Values.enterprise.rbac.admin_gui_auth_conf_secret }}
+      key: admin_gui_auth_conf
+{{- end }}
+- name: KONG_ADMIN_GUI_SESSION_CONF
+  valueFrom:
+    secretKeyRef:
+      name: {{ .Values.enterprise.rbac.session_conf_secret }}
+      key: admin_gui_session_conf
+{{- end }}
+{{- if .Values.enterprise.smtp.enabled }}
+- name: KONG_PORTAL_EMAILS_FROM
+  value: {{ .Values.enterprise.smtp.portal_emails_from }}
+- name: KONG_PORTAL_EMAILS_REPLY_TO
+  value: {{ .Values.enterprise.smtp.portal_emails_reply_to }}
+- name: KONG_ADMIN_EMAILS_FROM
+  value: {{ .Values.enterprise.smtp.admin_emails_from }}
+- name: KONG_ADMIN_EMAILS_REPLY_TO
+  value: {{ .Values.enterprise.smtp.admin_emails_reply_to }}
+- name: KONG_SMTP_HOST
+  value: {{ .Values.enterprise.smtp.smtp_host }}
+- name: KONG_SMTP_PORT
+  value: {{ .Values.enterprise.smtp.smtp_port | quote }}
+- name: KONG_SMTP_STARTTLS
+  value: {{ .Values.enterprise.smtp.smtp_starttls | quote }}
+{{- if .Values.enterprise.smtp.auth.smtp_username }}
+- name: KONG_SMTP_USERNAME
+  value: {{ .Values.enterprise.smtp.auth.smtp_username }}
+- name: KONG_SMTP_PASSWORD
+  valueFrom:
+    secretKeyRef:
+      name: {{ .Values.enterprise.smtp.auth.smtp_password_secret }}
+      key: smtp_password
+{{- end }}
+{{- else }}
+- name: KONG_SMTP_MOCK
+  value: "on"
+{{- end }}
+{{ include "kong.license" . }}
+{{- end }}
+- name: KONG_NGINX_HTTP_INCLUDE
+  value: /kong/servers.conf
+{{- if .Values.postgresql.enabled }}
+- name: KONG_PG_HOST
+  value: {{ template "kong.postgresql.fullname" . }}
+- name: KONG_PG_PORT
+  value: "{{ .Values.postgresql.service.port }}"
+- name: KONG_PG_PASSWORD
+  valueFrom:
+    secretKeyRef:
+      name: {{ template "kong.postgresql.fullname" . }}
+      key: postgresql-password
+{{- end }}
+{{- if (and (not .Values.ingressController.enabled) (eq .Values.env.database "off")) }}
+- name: KONG_DECLARATIVE_CONFIG
+  value: "/kong_dbless/kong.yml"
+{{- end }}
+- name: KONG_PLUGINS
+  value: {{ template "kong.plugins" . }}
+{{- include "kong.env" . }}
+{{- end -}}
+
+{{- define "kong.wait-for-postgres" -}}
+- name: wait-for-postgres
+  image: "{{ .Values.waitImage.repository }}:{{ .Values.waitImage.tag }}"
+  imagePullPolicy: {{ .Values.waitImage.pullPolicy }}
+  env:
+  {{- include "kong.final_env" . | nindent 2 }}
+  command: [ "/bin/sh", "-c", "until nc -zv $KONG_PG_HOST $KONG_PG_PORT -w1; do echo 'waiting for db'; sleep 1; done" ]
+{{- end -}}
diff --git a/ric-aux/helm/infrastructure/subcharts/kong/templates/admission-webhook.yaml b/ric-aux/helm/infrastructure/subcharts/kong/templates/admission-webhook.yaml
new file mode 100755 (executable)
index 0000000..8e37eeb
--- /dev/null
@@ -0,0 +1,63 @@
+{{- if .Values.ingressController.admissionWebhook.enabled }}
+{{- $cn := printf "%s.%s.svc" ( include "kong.service.validationWebhook" . ) .Release.Namespace }}
+{{- $ca := genCA "kong-admission-ca" 3650 -}}
+{{- $cert := genSignedCert $cn nil nil 3650 $ca -}}
+kind: ValidatingWebhookConfiguration
+{{- if .Capabilities.APIVersions.Has "admissionregistration.k8s.io/v1" }}
+apiVersion: admissionregistration.k8s.io/v1
+{{- else }}
+apiVersion: admissionregistration.k8s.io/v1beta1
+{{- end }}
+metadata:
+  name: {{ template "kong.fullname" . }}-validations
+  labels:
+    {{- include "kong.metaLabels" . | nindent 4 }}
+webhooks:
+- name: validations.kong.konghq.com
+  failurePolicy: {{ .Values.ingressController.admissionWebhook.failurePolicy }}
+  sideEffects: None
+  admissionReviewVersions: ["v1beta1"]
+  rules:
+  - apiGroups:
+    - configuration.konghq.com
+    apiVersions:
+    - '*'
+    operations:
+    - CREATE
+    - UPDATE
+    resources:
+    - kongconsumers
+    - kongplugins
+  clientConfig:
+    caBundle: {{ b64enc $ca.Cert }}
+    service:
+      name: {{ template "kong.service.validationWebhook" . }}
+      namespace: {{ .Release.Namespace }}
+---
+apiVersion: v1
+kind: Service
+metadata:
+  name: {{ template "kong.service.validationWebhook" . }}
+  labels:
+    {{- include "kong.metaLabels" . | nindent 4 }}
+spec:
+  ports:
+  - name: webhook
+    port: 443
+    protocol: TCP
+    targetPort: webhook
+  selector:
+    {{- include "kong.metaLabels" . | nindent 4 }}
+    app.kubernetes.io/component: app
+---
+apiVersion: v1
+kind: Secret
+metadata:
+  name: {{ template "kong.fullname" . }}-validation-webhook-keypair
+  labels:
+    {{- include "kong.metaLabels" . | nindent 4 }}
+type: kubernetes.io/tls
+data:
+  tls.crt: {{ b64enc $cert.Cert }}
+  tls.key: {{ b64enc $cert.Key }}
+{{ end }}
@@ -3,17 +3,18 @@ kind: ConfigMap
 metadata:
   name: {{ template "kong.fullname" . }}-default-custom-server-blocks
   labels:
-    app: {{ template "kong.name" . }}
-    chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
-    release: "{{ .Release.Name }}"
-    heritage: "{{ .Release.Service }}"
+    {{- include "kong.metaLabels" . | nindent 4 }}
 data:
   servers.conf: |
-    # Prometheus metrics server
+    # Prometheus metrics and health-checking server
     server {
         server_name kong_prometheus_exporter;
         listen 0.0.0.0:9542; # can be any other port as well
         access_log off;
+        location /status {
+            default_type text/plain;
+            return 200;
+        }
         location /metrics {
             default_type text/plain;
             content_by_lua_block {
@@ -5,10 +5,7 @@ kind: ConfigMap
 metadata:
   name: {{ template "kong.dblessConfig.fullname" . }}
   labels:
-    app: {{ template "kong.name" . }}
-    chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
-    release: "{{ .Release.Name }}"
-    heritage: "{{ .Release.Service }}"
+    {{- include "kong.metaLabels" . | nindent 4 }}
 data:
   kong.yml: |
 {{ .Values.dblessConfig.config | toYaml | indent 4 }}
diff --git a/ric-aux/helm/infrastructure/subcharts/kong/templates/controller-rbac-resources.yaml b/ric-aux/helm/infrastructure/subcharts/kong/templates/controller-rbac-resources.yaml
new file mode 100755 (executable)
index 0000000..22fc78e
--- /dev/null
@@ -0,0 +1,141 @@
+{{- if and .Values.ingressController.rbac.create .Values.ingressController.enabled -}}
+apiVersion: rbac.authorization.k8s.io/v1beta1
+kind: Role
+metadata:
+  name:  {{ template "kong.fullname" . }}
+  namespace: {{ .Release.namespace }}
+  labels:
+    {{- include "kong.metaLabels" . | nindent 4 }}
+rules:
+  - apiGroups:
+      - ""
+    resources:
+      - configmaps
+      - pods
+      - secrets
+      - namespaces
+    verbs:
+      - get
+  - apiGroups:
+      - ""
+    resources:
+      - configmaps
+    resourceNames:
+      # Defaults to "<election-id>-<ingress-class>"
+      # Here: "<kong-ingress-controller-leader-nginx>-<nginx>"
+      # This has to be adapted if you change either parameter
+      # when launching the nginx-ingress-controller.
+      - "kong-ingress-controller-leader-{{ .Values.ingressController.ingressClass }}-{{ .Values.ingressController.ingressClass }}"
+    verbs:
+      - get
+      - update
+  - apiGroups:
+      - ""
+    resources:
+      - configmaps
+    verbs:
+      - create
+  - apiGroups:
+      - ""
+    resources:
+      - endpoints
+    verbs:
+      - get
+---
+apiVersion: rbac.authorization.k8s.io/v1beta1
+kind: RoleBinding
+metadata:
+  name:  {{ template "kong.fullname" . }}
+  namespace: {{ .Release.Namespace }}
+  labels:
+    {{- include "kong.metaLabels" . | nindent 4 }}
+roleRef:
+  apiGroup: rbac.authorization.k8s.io
+  kind: Role
+  name: {{ template "kong.fullname" . }}
+subjects:
+  - kind: ServiceAccount
+    name: {{ template "kong.serviceAccountName" . }}
+    namespace: {{ .Release.Namespace }}
+---
+apiVersion: rbac.authorization.k8s.io/v1beta1
+kind: ClusterRole
+metadata:
+  labels:
+    {{- include "kong.metaLabels" . | nindent 4 }}
+  name:  {{ template "kong.fullname" . }}
+rules:
+  - apiGroups:
+      - ""
+    resources:
+      - endpoints
+      - nodes
+      - pods
+      - secrets
+    verbs:
+      - list
+      - watch
+  - apiGroups:
+      - ""
+    resources:
+      - nodes
+    verbs:
+      - get
+  - apiGroups:
+      - ""
+    resources:
+      - services
+    verbs:
+      - get
+      - list
+      - watch
+  - apiGroups:
+      - "extensions"
+      - "networking.k8s.io"
+    resources:
+      - ingresses
+    verbs:
+      - get
+      - list
+      - watch
+  - apiGroups:
+      - ""
+    resources:
+        - events
+    verbs:
+        - create
+        - patch
+  - apiGroups:
+      - "extensions"
+      - "networking.k8s.io"
+    resources:
+      - ingresses/status
+    verbs:
+      - update
+  - apiGroups:
+      - "configuration.konghq.com"
+    resources:
+      - kongplugins
+      - kongcredentials
+      - kongconsumers
+      - kongingresses
+    verbs:
+      - get
+      - list
+      - watch
+---
+apiVersion: rbac.authorization.k8s.io/v1beta1
+kind: ClusterRoleBinding
+metadata:
+  name:  {{ template "kong.fullname" . }}
+  labels:
+    {{- include "kong.metaLabels" . | nindent 4 }}
+roleRef:
+  apiGroup: rbac.authorization.k8s.io
+  kind: ClusterRole
+  name:  {{ template "kong.fullname" . }}
+subjects:
+  - kind: ServiceAccount
+    name: {{ template "kong.serviceAccountName" . }}
+    namespace: {{ .Release.Namespace }}
+{{- end -}}
diff --git a/ric-aux/helm/infrastructure/subcharts/kong/templates/controller-service-account.yaml b/ric-aux/helm/infrastructure/subcharts/kong/templates/controller-service-account.yaml
new file mode 100755 (executable)
index 0000000..c6a7554
--- /dev/null
@@ -0,0 +1,9 @@
+{{- if or .Values.podSecurityPolicy.enabled (and .Values.ingressController.enabled .Values.ingressController.serviceAccount.create) -}}
+apiVersion: v1
+kind: ServiceAccount
+metadata:
+  name: {{ template "kong.serviceAccountName" . }}
+  namespace: {{ .Release.namespace }}
+  labels:
+    {{- include "kong.metaLabels" . | nindent 4 }}
+{{- end -}}
 {{- if and .Values.ingressController.enabled .Values.ingressController.installCRDs -}}
 apiVersion: apiextensions.k8s.io/v1beta1
 kind: CustomResourceDefinition
+metadata:
+  name: kongconsumers.configuration.konghq.com
+  labels:
+    {{- include "kong.metaLabels" . | nindent 4 }}
+spec:
+  group: configuration.konghq.com
+  version: v1
+  scope: Namespaced
+  names:
+    kind: KongConsumer
+    plural: kongconsumers
+    shortNames:
+    - kc
+  additionalPrinterColumns:
+  - name: Username
+    type: string
+    description: Username of a Kong Consumer
+    JSONPath: .username
+  - name: Age
+    type: date
+    description: Age
+    JSONPath: .metadata.creationTimestamp
+  validation:
+    openAPIV3Schema:
+      properties:
+        username:
+          type: string
+        custom_id:
+          type: string
+        credentials:
+          type: array
+          items:
+            type: string
+---
+apiVersion: apiextensions.k8s.io/v1beta1
+kind: CustomResourceDefinition
+metadata:
+  name: kongcredentials.configuration.konghq.com
+  labels:
+    {{- include "kong.metaLabels" . | nindent 4 }}
+spec:
+  group: configuration.konghq.com
+  version: v1
+  scope: Namespaced
+  names:
+    kind: KongCredential
+    plural: kongcredentials
+  additionalPrinterColumns:
+  - name: Credential-type
+    type: string
+    description: Type of credential
+    JSONPath: .type
+  - name: Age
+    type: date
+    description: Age
+    JSONPath: .metadata.creationTimestamp
+  - name: Consumer-Ref
+    type: string
+    description: Owner of the credential
+    JSONPath: .consumerRef
+  validation:
+    openAPIV3Schema:
+      required:
+      - consumerRef
+      - type
+      properties:
+        consumerRef:
+          type: string
+        type:
+          type: string
+---
+apiVersion: apiextensions.k8s.io/v1beta1
+kind: CustomResourceDefinition
+metadata:
+  name: kongplugins.configuration.konghq.com
+  labels:
+    {{- include "kong.metaLabels" . | nindent 4 }}
+spec:
+  group: configuration.konghq.com
+  version: v1
+  scope: Namespaced
+  names:
+    kind: KongPlugin
+    plural: kongplugins
+    shortNames:
+    - kp
+  additionalPrinterColumns:
+  - name: Plugin-Type
+    type: string
+    description: Name of the plugin
+    JSONPath: .plugin
+  - name: Age
+    type: date
+    description: Age
+    JSONPath: .metadata.creationTimestamp
+  - name: Disabled
+    type: boolean
+    description: Indicates if the plugin is disabled
+    JSONPath: .disabled
+    priority: 1
+  - name: Config
+    type: string
+    description: Configuration of the plugin
+    JSONPath: .config
+    priority: 1
+  validation:
+    openAPIV3Schema:
+      required:
+      - plugin
+      properties:
+        plugin:
+          type: string
+        disabled:
+          type: boolean
+        config:
+          type: object
+        run_on:
+          type: string
+          enum:
+          - first
+          - second
+          - all
+        protocols:
+          type: array
+          items:
+            type: string
+            enum:
+            - http
+            - https
+            - tcp
+            - tls
+            - grpc
+            - grpcs
+---
+apiVersion: apiextensions.k8s.io/v1beta1
+kind: CustomResourceDefinition
 metadata:
   name: kongingresses.configuration.konghq.com
   labels:
-    app: {{ template "kong.name" . }}
-    chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
-    release: "{{ .Release.Name }}"
-    heritage: "{{ .Release.Service }}"
+    {{- include "kong.metaLabels" . | nindent 4 }}
 spec:
   group: configuration.konghq.com
   version: v1
@@ -20,14 +153,18 @@ spec:
   validation:
     openAPIV3Schema:
       properties:
-        upstream:
-          type: object
         route:
           properties:
             methods:
               type: array
               items:
                 type: string
+            headers:
+              type: object
+              additionalProperties:
+                type: array
+                items:
+                  type: string
             regex_priority:
               type: integer
             strip_path:
@@ -41,6 +178,10 @@ spec:
                 enum:
                 - http
                 - https
+                - grpc
+                - grpcs
+            https_redirect_status_code:
+              type: integer
         proxy:
           type: object
           properties:
@@ -49,6 +190,8 @@ spec:
               enum:
               - http
               - https
+              - grpc
+              - grpcs
             path:
               type: string
               pattern: ^/.*$
@@ -67,6 +210,14 @@ spec:
         upstream:
           type: object
           properties:
+            algorithm:
+              type: string
+              enum:
+              - "round-robin"
+              - "consistent-hashing"
+              - "least-connections"
+            host_header:
+              type: string
             hash_on:
               type: string
             hash_on_cookie:
diff --git a/ric-aux/helm/infrastructure/subcharts/kong/templates/deployment.yaml b/ric-aux/helm/infrastructure/subcharts/kong/templates/deployment.yaml
new file mode 100755 (executable)
index 0000000..de07aa7
--- /dev/null
@@ -0,0 +1,164 @@
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: {{ template "kong.fullname" . }}
+  labels:
+    {{- include "kong.metaLabels" . | nindent 4 }}
+    app.kubernetes.io/component: app
+spec:
+  replicas: {{ .Values.replicaCount }}
+  selector:
+    matchLabels:
+      {{- include "kong.selectorLabels" . | nindent 6 }}
+  {{- if .Values.updateStrategy }}
+  strategy:
+{{ toYaml .Values.updateStrategy | indent 4 }}
+  {{- end }}
+
+  template:
+    metadata:
+      annotations:
+        {{- if .Values.ingressController.admissionWebhook.enabled }}
+        checksum/admission-webhook.yaml: {{ include (print $.Template.BasePath "/admission-webhook.yaml") . | sha256sum }}
+        {{- end }}
+        {{- if (and (not .Values.ingressController.enabled) (eq .Values.env.database "off" )) }}
+        {{- if .Values.dblessConfig.config }}
+        checksum/dbless.config: {{ toYaml .Values.dblessConfig.config | sha256sum }}
+        {{- end }}
+        {{- end }}
+        {{- if .Values.podAnnotations }}
+{{ toYaml .Values.podAnnotations | indent 8 }}
+        {{- end }}
+      labels:
+        {{- include "kong.metaLabels" . | nindent 8 }}
+        app.kubernetes.io/component: app
+    spec:
+      {{- if or .Values.ingressController.enabled .Values.podSecurityPolicy.enabled }}
+      serviceAccountName: {{ template "kong.serviceAccountName" . }}
+      {{ end }}
+      {{- if .Values.image.pullSecrets }}
+      imagePullSecrets:
+      {{- range .Values.image.pullSecrets }}
+        - name: {{ . }}
+      {{- end }}
+      {{- end }}
+      {{- if not (eq .Values.env.database "off") }}
+      initContainers:
+      {{- include "kong.wait-for-db" . | nindent 6 }}
+      {{ end }}
+      containers:
+      {{- if .Values.ingressController.enabled }}
+      {{- include "kong.controller-container" . | nindent 6 }}
+      {{ end }}
+      - name: "proxy"
+        image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
+        imagePullPolicy: {{ .Values.image.pullPolicy }}
+        env:
+        {{- include "kong.final_env" . | nindent 8 }}
+        lifecycle:
+          preStop:
+            exec:
+              command: [ "/bin/sh", "-c", "kong quit" ]
+        ports:
+        - name: admin
+          containerPort: {{ .Values.admin.containerPort }}
+          {{- if .Values.admin.hostPort }}
+          hostPort: {{ .Values.admin.hostPort }}
+          {{- end}}
+          protocol: TCP
+        {{- if .Values.proxy.http.enabled }}
+        - name: proxy
+          containerPort: {{ .Values.proxy.http.containerPort }}
+          {{- if .Values.proxy.http.hostPort }}
+          hostPort: {{ .Values.proxy.http.hostPort }}
+          {{- end}}
+          protocol: TCP
+        {{- end }}
+        {{- if .Values.proxy.tls.enabled }}
+        - name: proxy-tls
+          containerPort: {{ .Values.proxy.tls.containerPort }}
+          {{- if .Values.proxy.tls.hostPort }}
+          hostPort: {{ .Values.proxy.tls.hostPort }}
+          {{- end}}
+          protocol: TCP
+        {{- end }}
+        - name: metrics
+          containerPort: 9542
+          protocol: TCP
+        {{- if .Values.ingressController.admissionWebhook.enabled }}
+        - name: webhook
+          containerPort: {{ .Values.ingressController.admissionWebhook.port }}
+          protocol: TCP
+        {{- end }}
+        {{- if .Values.enterprise.enabled }}
+        {{- if .Values.manager.http.enabled }}
+        - name: manager
+          containerPort: {{ .Values.manager.http.containerPort }}
+          {{- if .Values.manager.http.hostPort }}
+          hostPort: {{ .Values.manager.http.hostPort }}
+          {{- end}}
+          protocol: TCP
+        {{- end }}
+        {{- if .Values.manager.tls.enabled }}
+        - name: manager-tls
+          containerPort: {{ .Values.manager.tls.containerPort }}
+          {{- if .Values.manager.tls.hostPort }}
+          hostPort: {{ .Values.manager.tls.hostPort }}
+          {{- end}}
+          protocol: TCP
+        {{- end }}
+        {{- if .Values.portal.http.enabled }}
+        - name: portal
+          containerPort: {{ .Values.portal.http.containerPort }}
+          {{- if .Values.portal.http.hostPort }}
+          hostPort: {{ .Values.portal.http.hostPort }}
+          {{- end}}
+          protocol: TCP
+        {{- end }}
+        {{- if .Values.portal.tls.enabled }}
+        - name: portal-tls
+          containerPort: {{ .Values.portal.tls.containerPort }}
+          {{- if .Values.portal.tls.hostPort }}
+          hostPort: {{ .Values.portal.tls.hostPort }}
+          {{- end}}
+          protocol: TCP
+        {{- end }}
+        {{- if .Values.portalapi.http.enabled }}
+        - name: portalapi
+          containerPort: {{ .Values.portalapi.http.containerPort }}
+          {{- if .Values.portalapi.http.hostPort }}
+          hostPort: {{ .Values.portalapi.http.hostPort }}
+          {{- end}}
+          protocol: TCP
+        {{- end }}
+        {{- if .Values.portalapi.tls.enabled }}
+        - name: portalapi-tls
+          containerPort: {{ .Values.portalapi.tls.containerPort }}
+          {{- if .Values.portalapi.tls.hostPort }}
+          hostPort: {{ .Values.portalapi.tls.hostPort }}
+          {{- end}}
+          protocol: TCP
+        {{- end }}
+        {{- end }}
+        volumeMounts:
+        {{- include "kong.volumeMounts" . | nindent 10 }}
+        readinessProbe:
+{{ toYaml .Values.readinessProbe | indent 10 }}
+        livenessProbe:
+{{ toYaml .Values.livenessProbe | indent 10 }}
+        resources:
+{{ toYaml .Values.resources | indent 10 }}
+    {{- if .Values.affinity }}
+      affinity:
+{{ toYaml .Values.affinity | indent 8 }}
+    {{- end }}
+      securityContext:
+      {{- include "kong.podsecuritycontext" . | nindent 8 }}
+    {{- if .Values.nodeSelector }}
+      nodeSelector:
+{{ toYaml .Values.nodeSelector | indent 8 }}
+    {{- end }}
+      tolerations:
+{{ toYaml .Values.tolerations | indent 8 }}
+      volumes:
+      {{- include "kong.volumes" . | nindent 8 -}}
diff --git a/ric-aux/helm/infrastructure/subcharts/kong/templates/ingress-admin.yaml b/ric-aux/helm/infrastructure/subcharts/kong/templates/ingress-admin.yaml
new file mode 100755 (executable)
index 0000000..e5d6119
--- /dev/null
@@ -0,0 +1,32 @@
+{{- if .Values.admin.ingress.enabled -}}
+{{- $serviceName := include "kong.fullname" . -}}
+{{- $servicePort := .Values.admin.servicePort -}}
+{{- $path := .Values.admin.ingress.path -}}
+{{- $tls := .Values.admin.ingress.tls -}}
+{{- $hostname := .Values.admin.ingress.hostname -}}
+apiVersion: extensions/v1beta1
+kind: Ingress
+metadata:
+  name: {{ template "kong.fullname" . }}-admin
+  labels:
+    {{- include "kong.metaLabels" . | nindent 4 }}
+  annotations:
+    {{- range $key, $value := .Values.admin.ingress.annotations }}
+      {{ $key }}: {{ $value | quote }}
+    {{- end }}
+spec:
+  rules:
+  - host: {{ $hostname }}
+    http:
+      paths:
+        - path: {{ $path }}
+          backend:
+            serviceName: {{ $serviceName }}-admin
+            servicePort: {{ $servicePort }}
+  {{- if $tls }}
+  tls:
+  - hosts:
+    - {{ $hostname }}
+    secretName: {{ $tls }}
+  {{- end -}}
+{{- end -}}
diff --git a/ric-aux/helm/infrastructure/subcharts/kong/templates/ingress-manager.yaml b/ric-aux/helm/infrastructure/subcharts/kong/templates/ingress-manager.yaml
new file mode 100755 (executable)
index 0000000..e4f3543
--- /dev/null
@@ -0,0 +1,34 @@
+{{- if .Values.enterprise.enabled }}
+{{- if .Values.manager.ingress.enabled -}}
+{{- $serviceName := include "kong.fullname" . -}}
+{{- $servicePort := include "kong.ingress.servicePort" .Values.manager -}}
+{{- $path := .Values.manager.ingress.path -}}
+{{- $tls := .Values.manager.ingress.tls -}}
+{{- $hostname := .Values.manager.ingress.hostname -}}
+apiVersion: extensions/v1beta1
+kind: Ingress
+metadata:
+  name: {{ template "kong.fullname" . }}-manager
+  labels:
+    {{- include "kong.metaLabels" . | nindent 4 }}
+  annotations:
+    {{- range $key, $value := .Values.manager.ingress.annotations }}
+      {{ $key }}: {{ $value | quote }}
+    {{- end }}
+spec:
+  rules:
+  - host: {{ $hostname }}
+    http:
+      paths:
+        - path: {{ $path }}
+          backend:
+            serviceName: {{ $serviceName }}-manager
+            servicePort: {{ $servicePort }}
+  {{- if $tls }}
+  tls:
+  - hosts:
+    - {{ $hostname }}
+    secretName: {{ $tls }}
+  {{- end -}}
+{{- end -}}
+{{- end -}}
diff --git a/ric-aux/helm/infrastructure/subcharts/kong/templates/ingress-portal-api.yaml b/ric-aux/helm/infrastructure/subcharts/kong/templates/ingress-portal-api.yaml
new file mode 100755 (executable)
index 0000000..3e10269
--- /dev/null
@@ -0,0 +1,34 @@
+{{- if .Values.enterprise.enabled }}
+{{- if .Values.portalapi.ingress.enabled -}}
+{{- $serviceName := include "kong.fullname" . -}}
+{{- $servicePort := include "kong.ingress.servicePort" .Values.portalapi -}}
+{{- $path := .Values.portalapi.ingress.path -}}
+{{- $tls := .Values.portalapi.ingress.tls -}}
+{{- $hostname := .Values.portalapi.ingress.hostname -}}
+apiVersion: extensions/v1beta1
+kind: Ingress
+metadata:
+  name: {{ template "kong.fullname" . }}-portalapi
+  labels:
+    {{- include "kong.metaLabels" . | nindent 4 }}
+  annotations:
+    {{- range $key, $value := .Values.portalapi.ingress.annotations }}
+      {{ $key }}: {{ $value | quote }}
+    {{- end }}
+spec:
+  rules:
+  - host: {{ $hostname }}
+    http:
+      paths:
+        - path: {{ $path }}
+          backend:
+            serviceName: {{ $serviceName }}-portalapi
+            servicePort: {{ $servicePort }}
+  {{- if $tls }}
+  tls:
+  - hosts:
+    - {{ $hostname }}
+    secretName: {{ $tls }}
+  {{- end -}}
+{{- end -}}
+{{- end -}}
diff --git a/ric-aux/helm/infrastructure/subcharts/kong/templates/ingress-portal.yaml b/ric-aux/helm/infrastructure/subcharts/kong/templates/ingress-portal.yaml
new file mode 100755 (executable)
index 0000000..521adef
--- /dev/null
@@ -0,0 +1,34 @@
+{{- if .Values.enterprise.enabled }}
+{{- if .Values.portal.ingress.enabled -}}
+{{- $serviceName := include "kong.fullname" . -}}
+{{- $servicePort := include "kong.ingress.servicePort" .Values.portal -}}
+{{- $path := .Values.portal.ingress.path -}}
+{{- $tls := .Values.portal.ingress.tls -}}
+{{- $hostname := .Values.portal.ingress.hostname -}}
+apiVersion: extensions/v1beta1
+kind: Ingress
+metadata:
+  name: {{ template "kong.fullname" . }}-portal
+  labels:
+    {{- include "kong.metaLabels" . | nindent 4 }}
+  annotations:
+    {{- range $key, $value := .Values.portal.ingress.annotations }}
+      {{ $key }}: {{ $value | quote }}
+    {{- end }}
+spec:
+  rules:
+  - host: {{ $hostname }}
+    http:
+      paths:
+        - path: {{ $path }}
+          backend:
+            serviceName: {{ $serviceName }}-portal
+            servicePort: {{ $servicePort }}
+  {{- if $tls }}
+  tls:
+  - hosts:
+    - {{ $hostname }}
+    secretName: {{ $tls }}
+  {{- end -}}
+{{- end -}}
+{{- end -}}
@@ -2,23 +2,29 @@
 {{- $serviceName := include "kong.fullname" . -}}
 {{- $servicePort := include "kong.ingress.servicePort" .Values.proxy -}}
 {{- $path := .Values.proxy.ingress.path -}}
-apiVersion: networking.k8s.io/v1beta1
+{{- $hosts_count := len .Values.proxy.ingress.hosts -}}
+apiVersion: extensions/v1beta1
 kind: Ingress
 metadata:
   name: {{ template "kong.fullname" . }}-proxy
   labels:
-    app: {{ template "kong.name" . }}
-    chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
-    release: "{{ .Release.Name }}"
-    heritage: "{{ .Release.Service }}"
+    {{- include "kong.metaLabels" . | nindent 4 }}
   annotations:
     {{- range $key, $value := .Values.proxy.ingress.annotations }}
       {{ $key }}: {{ $value | quote }}
     {{- end }}
 spec:
   rules:
+    {{- if eq $hosts_count 0 }}
+    - http:
+        paths:
+          - path: {{ $path }}
+            backend:
+              serviceName: {{ $serviceName }}-proxy
+              servicePort: {{ $servicePort }}
+    {{ else -}}
     {{- range $host := .Values.proxy.ingress.hosts }}
-    - host: {{ $host }}
+    - host: {{ $host | quote }}
       http:
         paths:
           - path: {{ $path }}
@@ -26,6 +32,7 @@ spec:
               serviceName: {{ $serviceName }}-proxy
               servicePort: {{ $servicePort }}
     {{- end -}}
+    {{- end -}}
   {{- if .Values.proxy.ingress.tls }}
   tls:
 {{ toYaml .Values.proxy.ingress.tls | indent 4 }}
diff --git a/ric-aux/helm/infrastructure/subcharts/kong/templates/migrations-post-upgrade.yaml b/ric-aux/helm/infrastructure/subcharts/kong/templates/migrations-post-upgrade.yaml
new file mode 100755 (executable)
index 0000000..29418d1
--- /dev/null
@@ -0,0 +1,49 @@
+{{- if (and (.Values.runMigrations) (not (eq .Values.env.database "off"))) }}
+# Why is this Job duplicated and not using only helm hooks?
+# See: https://github.com/helm/charts/pull/7362
+apiVersion: batch/v1
+kind: Job
+metadata:
+  name: {{ template "kong.fullname" . }}-post-upgrade-migrations
+  labels:
+    {{- include "kong.metaLabels" . | nindent 4 }}
+    app.kubernetes.io/component: post-upgrade-migrations
+  annotations:
+    helm.sh/hook: "post-upgrade"
+    helm.sh/hook-delete-policy: "before-hook-creation"
+spec:
+  template:
+    metadata:
+      name: {{ template "kong.name" . }}-post-upgrade-migrations
+      labels:
+        {{- include "kong.metaLabels" . | nindent 8 }}
+        app.kubernetes.io/component: post-upgrade-migrations
+    spec:
+      {{- if .Values.podSecurityPolicy.enabled }}
+      serviceAccountName: {{ template "kong.serviceAccountName" . }}
+      {{- end }}
+      {{- if .Values.image.pullSecrets }}
+      imagePullSecrets:
+      {{- range .Values.image.pullSecrets }}
+        - name: {{ . }}
+      {{- end }}
+      {{- end }}
+      initContainers:
+      {{- if (eq .Values.env.database "postgres") }}
+      {{- include "kong.wait-for-postgres" . | nindent 6 }}
+      {{- end }}
+      containers:
+      - name: {{ template "kong.name" . }}-post-upgrade-migrations
+        image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
+        imagePullPolicy: {{ .Values.image.pullPolicy }}
+        env:
+        {{- include "kong.final_env" . | nindent 8 }}
+        command: [ "/bin/sh", "-c", "kong migrations finish" ]
+        volumeMounts:
+        {{- include "kong.volumeMounts" . | nindent 8 }}
+      securityContext:
+      {{- include "kong.podsecuritycontext" . | nindent 8 }}
+      restartPolicy: OnFailure
+      volumes:
+      {{- include "kong.volumes" . | nindent 6 -}}
+{{- end }}
diff --git a/ric-aux/helm/infrastructure/subcharts/kong/templates/migrations-pre-upgrade.yaml b/ric-aux/helm/infrastructure/subcharts/kong/templates/migrations-pre-upgrade.yaml
new file mode 100755 (executable)
index 0000000..977ac48
--- /dev/null
@@ -0,0 +1,63 @@
+{{- if (and (.Values.runMigrations) (not (eq .Values.env.database "off"))) }}
+# Why is this Job duplicated and not using only helm hooks?
+# See: https://github.com/helm/charts/pull/7362
+apiVersion: batch/v1
+kind: Job
+metadata:
+  name: {{ template "kong.fullname" . }}-pre-upgrade-migrations
+  labels:
+    {{- include "kong.metaLabels" . | nindent 4 }}
+    app.kubernetes.io/component: pre-upgrade-migrations
+  annotations:
+    helm.sh/hook: "pre-upgrade"
+    helm.sh/hook-delete-policy: "before-hook-creation"
+spec:
+  template:
+    metadata:
+      name: {{ template "kong.name" . }}-pre-upgrade-migrations
+      labels:
+        {{- include "kong.metaLabels" . | nindent 8 }}
+        app.kubernetes.io/component: pre-upgrade-migrations
+    spec:
+      {{- if .Values.podSecurityPolicy.enabled }}
+      serviceAccountName: {{ template "kong.serviceAccountName" . }}
+      {{- end }}
+      {{- if .Values.image.pullSecrets }}
+      imagePullSecrets:
+      {{- range .Values.image.pullSecrets }}
+        - name: {{ . }}
+      {{- end }}
+      {{- end }}
+      initContainers:
+      {{- if (eq .Values.env.database "postgres") }}
+      {{- include "kong.wait-for-postgres" . | nindent 6 }}
+      {{- end }}
+      containers:
+      - name: {{ template "kong.name" . }}-upgrade-migrations
+        image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
+        imagePullPolicy: {{ .Values.image.pullPolicy }}
+        env:
+        {{- include "kong.final_env" . | nindent 8 }}
+        command: [ "/bin/sh", "-c", "kong migrations up" ]
+        volumeMounts:
+        {{- include "kong.volumeMounts" . | nindent 8 }}
+      securityContext:
+      {{- include "kong.podsecuritycontext" . | nindent 8 }}
+      restartPolicy: OnFailure
+      volumes:
+      {{- include "kong.volumes" . | nindent 6 -}}
+{{- end }}
+
+{{ if or .Values.podSecurityPolicy.enabled (and .Values.ingressController.enabled .Values.ingressController.serviceAccount.create) -}}
+---
+apiVersion: v1
+kind: ServiceAccount
+metadata:
+  name: {{ template "kong.serviceAccountName" . }}
+  namespace: {{ .Release.namespace }}
+  annotations:
+    "helm.sh/hook": pre-upgrade
+    "helm.sh/hook-delete-policy": before-hook-creation,hook-succeeded
+  labels:
+    {{- include "kong.metaLabels" . | nindent 4 }}
+{{- end -}}
diff --git a/ric-aux/helm/infrastructure/subcharts/kong/templates/migrations.yaml b/ric-aux/helm/infrastructure/subcharts/kong/templates/migrations.yaml
new file mode 100755 (executable)
index 0000000..7c87f8b
--- /dev/null
@@ -0,0 +1,44 @@
+{{- if (and (.Values.runMigrations) (not (eq .Values.env.database "off"))) }}
+apiVersion: batch/v1
+kind: Job
+metadata:
+  name: {{ template "kong.fullname" . }}-init-migrations
+  labels:
+    {{- include "kong.metaLabels" . | nindent 4 }}
+    app.kubernetes.io/component: init-migrations
+spec:
+  template:
+    metadata:
+      name: {{ template "kong.name" . }}-init-migrations
+      labels:
+        {{- include "kong.metaLabels" . | nindent 8 }}
+        app.kubernetes.io/component: init-migrations
+    spec:
+      {{- if .Values.podSecurityPolicy.enabled }}
+      serviceAccountName: {{ template "kong.serviceAccountName" . }}
+      {{- end }}
+      {{- if .Values.image.pullSecrets }}
+      imagePullSecrets:
+      {{- range .Values.image.pullSecrets }}
+        - name: {{ . }}
+      {{- end }}
+      {{- end }}
+      initContainers:
+      {{- if (eq .Values.env.database "postgres") }}
+      {{- include "kong.wait-for-postgres" . | nindent 6 }}
+      {{- end }}
+      containers:
+      - name: {{ template "kong.name" . }}-migrations
+        image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
+        imagePullPolicy: {{ .Values.image.pullPolicy }}
+        env:
+        {{- include "kong.final_env" . | nindent 8 }}
+        command: [ "/bin/sh", "-c", "kong migrations bootstrap" ]
+        volumeMounts:
+        {{- include "kong.volumeMounts" . | nindent 8 }}
+      securityContext:
+      {{- include "kong.podsecuritycontext" . | nindent 8 }}
+      restartPolicy: OnFailure
+      volumes:
+      {{- include "kong.volumes" . | nindent 6 -}}
+{{- end }}
@@ -2,9 +2,9 @@
 apiVersion: policy/v1beta1
 kind: PodDisruptionBudget
 metadata:
-  name: "{{ template "kong.fullname" . }}"
+  name: {{ template "kong.fullname" . }}
   labels:
-    app: "{{ template "kong.name" . }}"
+    {{- include "kong.metaLabels" . | nindent 4 }}
 spec:
   {{- if .Values.podDisruptionBudget.minAvailable }}
   minAvailable: {{ .Values.podDisruptionBudget.minAvailable }}
@@ -14,7 +14,5 @@ spec:
   {{- end  }}
   selector:
     matchLabels:
-      app: {{ template "kong.name" . }}
-      release: {{ .Release.Name }}
-      component: app
-{{- end }}
\ No newline at end of file
+      {{- include "kong.metaLabels" . | nindent 6 }}
+{{- end }}
diff --git a/ric-aux/helm/infrastructure/subcharts/kong/templates/psp.yaml b/ric-aux/helm/infrastructure/subcharts/kong/templates/psp.yaml
new file mode 100755 (executable)
index 0000000..a627152
--- /dev/null
@@ -0,0 +1,60 @@
+{{- if .Values.podSecurityPolicy.enabled }}
+apiVersion: policy/v1beta1
+kind: PodSecurityPolicy
+metadata:
+  name: {{ template "kong.serviceAccountName" . }}-psp
+  labels:
+    {{- include "kong.metaLabels" . | nindent 4 }}
+spec:
+  privileged: false
+  fsGroup:
+    rule: RunAsAny
+  runAsUser:
+    rule: RunAsAny
+  runAsGroup:
+    rule: RunAsAny
+  seLinux:
+    rule: RunAsAny
+  supplementalGroups:
+    rule: RunAsAny
+  volumes:
+    - 'configMap'
+    - 'secret'
+    - 'emptyDir'
+  allowPrivilegeEscalation: false
+  hostNetwork: false
+  hostIPC: false
+  hostPID: false
+---
+apiVersion: rbac.authorization.k8s.io/v1
+kind: ClusterRole
+metadata:
+  name: {{ template "kong.serviceAccountName" . }}-psp
+  labels:
+    {{- include "kong.metaLabels" . | nindent 4 }}
+rules:
+  - apiGroups:
+      - extensions
+    resources:
+      - podsecuritypolicies
+    verbs:
+      - use
+    resourceNames:
+      - {{ template "kong.serviceAccountName" . }}-psp
+---
+apiVersion: rbac.authorization.k8s.io/v1
+kind: ClusterRoleBinding
+metadata:
+  name: {{ template "kong.serviceAccountName" . }}-psp
+  namespace: {{ .Release.Namespace }}
+  labels:
+    {{- include "kong.metaLabels" . | nindent 4 }}
+subjects:
+  - kind: ServiceAccount
+    name: {{ template "kong.serviceAccountName" . }}
+    namespace: {{ .Release.Namespace }}
+roleRef:
+  kind: ClusterRole
+  name: {{ template "kong.serviceAccountName" . }}-psp
+  apiGroup: rbac.authorization.k8s.io
+{{- end }}
@@ -1,3 +1,4 @@
+{{- if .Values.admin.enabled -}}
 apiVersion: v1
 kind: Service
 metadata:
@@ -7,10 +8,7 @@ metadata:
       {{ $key }}: {{ $value | quote }}
     {{- end }}
   labels:
-    app: {{ template "kong.name" . }}
-    chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
-    release: "{{ .Release.Name }}"
-    heritage: "{{ .Release.Service }}"
+    {{- include "kong.metaLabels" . | nindent 4 }}
 spec:
   type: {{ .Values.admin.type }}
   {{- if eq .Values.admin.type "LoadBalancer" }}
@@ -33,6 +31,5 @@ spec:
   {{- end }}
     protocol: TCP
   selector:
-    app: {{ template "kong.name" . }}
-    release: {{ .Release.Name }}
-    component: app
+    {{- include "kong.selectorLabels" . | nindent 4 }}
+{{- end -}}
@@ -8,10 +8,7 @@ metadata:
       {{ $key }}: {{ $value | quote }}
     {{- end }}
   labels:
-    app: {{ template "kong.name" . }}
-    chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
-    release: "{{ .Release.Name }}"
-    heritage: "{{ .Release.Service }}"
+    {{- include "kong.metaLabels" . | nindent 4 }}
 spec:
   type: {{ .Values.manager.type }}
   {{- if eq .Values.manager.type "LoadBalancer" }}
@@ -48,10 +45,6 @@ spec:
   {{- end }}
     protocol: TCP
   {{- end }}
-
-
   selector:
-    app: {{ template "kong.name" . }}
-    release: {{ .Release.Name }}
-    component: app
+    {{- include "kong.selectorLabels" . | nindent 4 }}
 {{- end -}}
@@ -8,10 +8,7 @@ metadata:
       {{ $key }}: {{ $value | quote }}
     {{- end }}
   labels:
-    app: {{ template "kong.name" . }}
-    chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
-    release: "{{ .Release.Name }}"
-    heritage: "{{ .Release.Service }}"
+    {{- include "kong.metaLabels" . | nindent 4 }}
 spec:
   type: {{ .Values.portalapi.type }}
   {{- if eq .Values.portalapi.type "LoadBalancer" }}
@@ -48,10 +45,6 @@ spec:
   {{- end }}
     protocol: TCP
   {{- end }}
-
-
   selector:
-    app: {{ template "kong.name" . }}
-    release: {{ .Release.Name }}
-    component: app
+    {{- include "kong.selectorLabels" . | nindent 4 }}
 {{- end -}}
@@ -8,10 +8,7 @@ metadata:
       {{ $key }}: {{ $value | quote }}
     {{- end }}
   labels:
-    app: {{ template "kong.name" . }}
-    chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
-    release: "{{ .Release.Name }}"
-    heritage: "{{ .Release.Service }}"
+    {{- include "kong.metaLabels" . | nindent 4 }}
 spec:
   type: {{ .Values.portal.type }}
   {{- if eq .Values.portal.type "LoadBalancer" }}
@@ -48,10 +45,6 @@ spec:
   {{- end }}
     protocol: TCP
   {{- end }}
-
-
   selector:
-    app: {{ template "kong.name" . }}
-    release: {{ .Release.Name }}
-    component: app
+    {{- include "kong.selectorLabels" . | nindent 4 }}
 {{- end -}}
@@ -7,10 +7,7 @@ metadata:
       {{ $key }}: {{ $value | quote }}
     {{- end }}
   labels:
-    app: {{ template "kong.name" . }}
-    chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
-    release: "{{ .Release.Name }}"
-    heritage: "{{ .Release.Service }}"
+    {{- include "kong.metaLabels" . | nindent 4 }}
 spec:
   type: {{ .Values.proxy.type }}
   {{- if eq .Values.proxy.type "LoadBalancer" }}
@@ -41,7 +38,7 @@ spec:
   {{- if or .Values.proxy.tls.enabled }}
   - name: kong-proxy-tls
     port: {{ .Values.proxy.tls.servicePort }}
-    targetPort: {{ .Values.proxy.tls.containerPort }}
+    targetPort: {{ .Values.proxy.tls.overrideServiceTargetPort | default .Values.proxy.tls.containerPort }}
   {{- if (and (eq .Values.proxy.type "NodePort") (not (empty .Values.proxy.tls.nodePort))) }}
     nodePort: {{ .Values.proxy.tls.nodePort }}
   {{- end }}
@@ -50,8 +47,8 @@ spec:
   {{- if .Values.proxy.externalTrafficPolicy }}
   externalTrafficPolicy: {{ .Values.proxy.externalTrafficPolicy }}
   {{- end }}
-
+  {{- if .Values.proxy.clusterIP }}
+  clusterIP: {{ .Values.proxy.clusterIP }}
+  {{- end }}
   selector:
-    app: {{ template "kong.name" . }}
-    release: {{ .Release.Name }}
-    component: app
+    {{- include "kong.selectorLabels" . | nindent 4 }}
@@ -7,10 +7,10 @@ metadata:
   namespace: {{ .Values.serviceMonitor.namespace }}
   {{- end }}
   labels:
-    app: {{ template "kong.name" . }}
-    chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
-    heritage: {{ .Release.Service }}
-    release: {{ .Release.Name }}
+    {{- include "kong.metaLabels" . | nindent 4 }}
+  {{- if .Values.serviceMonitor.labels }}
+    {{ toYaml .Values.serviceMonitor.labels | nindent 4 }}
+  {{- end }}
 spec:
   endpoints:
   - targetPort: metrics
@@ -24,6 +24,5 @@ spec:
     - {{ .Release.Namespace }}
   selector:
     matchLabels:
-      app: {{ template "kong.name" . }}
-      release: {{ .Release.Name }}
+      {{- include "kong.metaLabels" . | nindent 6 }}
 {{- end }}
@@ -1,26 +1,41 @@
-################################################################################
-#   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 kong.
+# Default values for Kong's Helm Chart.
 # Declare variables to be passed into your templates.
+#
+# Sections:
+# - Kong parameters
+# - Ingress Controller parameters
+# - Postgres sub-chart parameters
+# - Miscellaneous parameters
+# - Kong Enterprise parameters
+
+# -----------------------------------------------------------------------------
+# Kong parameters
+# -----------------------------------------------------------------------------
 
+# Specify Kong configurations
+# Kong configurations guide https://docs.konghq.com/latest/configuration
+# Values here take precedence over values from other sections of values.yaml,
+# 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: "off"
+  nginx_worker_processes: "1"
+  proxy_access_log: /dev/stdout
+  admin_access_log: /dev/stdout
+  admin_gui_access_log: /dev/stdout
+  portal_api_access_log: /dev/stdout
+  proxy_error_log: /dev/stderr
+  admin_error_log: /dev/stderr
+  admin_gui_error_log: /dev/stderr
+  portal_api_error_log: /dev/stderr
+  prefix: /kong_prefix/
+
+# Specify Kong's Docker image and repository details here
 image:
   repository: kong
+  # repository: kong-docker-kong-enterprise-k8s.bintray.io/kong-enterprise-k8s
   # repository: kong-docker-kong-enterprise-edition-docker.bintray.io/kong-enterprise-edition
-  tag: 1.3
+  tag: 1.4
   pullPolicy: IfNotPresent
   ## Optionally specify an array of imagePullSecrets.
   ## Secrets must be manually created in the namespace.
@@ -30,12 +45,11 @@ image:
   # pullSecrets:
   #   - myRegistrKeySecretName
 
-waitImage:
-  repository: busybox
-  tag: latest
-
-# Specify Kong admin and proxy services configurations
+# Specify Kong admin service configuration
+# Note: It is recommended to not use the Admin API to configure Kong
+# when using Kong as an Ingress Controller.
 admin:
+  enabled: false
   # If you want to specify annotations for the admin service, uncomment the following
   # line, add additional or adjust as needed, and remove the curly braces after 'annotations:'.
   annotations: {}
@@ -50,19 +64,21 @@ admin:
   type: NodePort
   # Set a nodePort which is available
   # nodePort: 32444
-  # Kong admin ingress settings.
+  # Kong admin ingress settings. Useful if you want to expose the Admin
+  # API of Kong outside the k8s cluster.
   ingress:
     # Enable/disable exposure using ingress.
     enabled: false
     # TLS secret name.
     # tls: kong-admin.example.com-tls
-    # Array of ingress hosts.
-    hosts: []
+    # Ingress hostname
+    hostname:
     # Map of ingress annotations.
     annotations: {}
     # Ingress path.
     path: /
 
+# Specify Kong proxy service configuration
 proxy:
   # If you want to specify annotations for the proxy service, uncomment the following
   # line, add additional or adjust as needed, and remove the curly braces after 'annotations:'.
@@ -75,25 +91,36 @@ 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 target port for the TLS port in proxy service, useful when using TLS
+    # termination on an ELB.
+    # overrideServiceTargetPort: 8000
     # Set a nodePort which is available if service type is NodePort
-    nodePort: 32443
+    nodePort: 32443
 
   type: NodePort
 
   # Kong proxy ingress settings.
+  # Note: You need this only if you are using another Ingress Controller
+  # to expose Kong outside the k8s cluster.
   ingress:
     # Enable/disable exposure using ingress.
     enabled: false
-    # TLS secret name.
-    # tls: kong-proxy.example.com-tls
-    # Array of ingress hosts.
     hosts: []
+    # TLS section. Unlike other ingresses, this follows the format at
+    # https://kubernetes.io/docs/concepts/services-networking/ingress/#tls
+    # tls:
+    # - hosts:
+    #   - 1.example.com
+    #   secretName: example1-com-tls-secret
+    # - hosts:
+    #   - 2.example.net
+    #   secretName: example2-net-tls-secret
     # Map of ingress annotations.
     annotations: {}
     # Ingress path.
@@ -101,6 +128,281 @@ proxy:
 
   externalIPs: []
 
+# Custom Kong plugins can be loaded into Kong by mounting the plugin code
+# into the file-system of Kong container.
+# The plugin code should be present in ConfigMap or Secret inside the same
+# namespace as Kong is being installed.
+# The `name` property refers to the name of the ConfigMap or Secret
+# itself, while the pluginName refers to the name of the plugin as it appears
+# in Kong.
+plugins: {}
+  # configMaps:
+  # - pluginName: rewriter
+  #   name: kong-plugin-rewriter
+  # secrets:
+  # - pluginName: rewriter
+  #   name: kong-plugin-rewriter
+# Inject specified secrets as a volume in Kong Container at path /etc/secrets/{secret-name}/
+# This can be used to override default SSL certificates
+# Example configuration
+# secretVolumes:
+# - kong-proxy-tls
+# - kong-admin-tls
+secretVolumes: []
+
+# Set runMigrations to run Kong migrations
+runMigrations: true
+
+# Kong's configuration for DB-less mode
+# Note: Use this section only if you are deploying Kong in DB-less mode
+# and not as an Ingress Controller.
+dblessConfig:
+  # Either Kong's configuration is managed from an existing ConfigMap (with Key: kong.yml)
+  configMap: ""
+  # Or the configuration is passed in full-text below
+  config:
+    _format_version: "1.1"
+    services:
+      # Example configuration
+      # - name: example.com
+      #   url: http://example.com
+      #   routes:
+      #   - name: example
+      #     paths:
+      #     - "/example"
+
+# -----------------------------------------------------------------------------
+# Ingress Controller parameters
+# -----------------------------------------------------------------------------
+
+# Kong Ingress Controller's primary purpose is to satisfy Ingress resources
+# created in k8s.  It uses CRDs for more fine grained control over routing and
+# for Kong specific configuration.
+ingressController:
+  enabled: true
+  image:
+    repository: kong-docker-kubernetes-ingress-controller.bintray.io/kong-ingress-controller
+    tag: 0.7.0
+
+  # Specify Kong Ingress Controller configuration via environment variables
+  env: {}
+
+  admissionWebhook:
+    enabled: false
+    failurePolicy: Fail
+    port: 8080
+
+  ingressClass: kong
+
+  rbac:
+    # Specifies whether RBAC resources should be created
+    create: true
+
+  serviceAccount:
+    # Specifies whether a ServiceAccount should be created
+    create: true
+    # The name of the ServiceAccount to use.
+    # If not set and create is true, a name is generated using the fullname template
+    name:
+
+  installCRDs: true
+
+  # general properties
+  livenessProbe:
+    httpGet:
+      path: "/healthz"
+      port: 10254
+      scheme: HTTP
+    initialDelaySeconds: 5
+    timeoutSeconds: 5
+    periodSeconds: 10
+    successThreshold: 1
+    failureThreshold: 3
+  readinessProbe:
+    httpGet:
+      path: "/healthz"
+      port: 10254
+      scheme: HTTP
+    initialDelaySeconds: 5
+    timeoutSeconds: 5
+    periodSeconds: 10
+    successThreshold: 1
+    failureThreshold: 3
+  resources: {}
+
+# -----------------------------------------------------------------------------
+# Postgres sub-chart parameters
+# -----------------------------------------------------------------------------
+
+# Kong can run without a database or use either Postgres or Cassandra
+# as a backend datatstore for it's configuration.
+# By default, this chart installs Kong without a database.
+
+# If you would like to use a database, there are two options:
+# - (recommended) Deploy and maintain a database and pass the connection
+#   details to Kong via the `env` section.
+# - You can use the below `postgresql` sub-chart to deploy a database
+#   along-with Kong as part of a single Helm release.
+
+# PostgreSQL chart documentation:
+# https://github.com/helm/charts/blob/master/stable/postgresql/README.md
+
+postgresql:
+  enabled: false
+  # postgresqlUsername: kong
+  # postgresqlDatabase: kong
+  # service:
+  #   port: 5432
+
+# -----------------------------------------------------------------------------
+# Miscellaneous parameters
+# -----------------------------------------------------------------------------
+
+waitImage:
+  repository: busybox
+  tag: latest
+  pullPolicy: IfNotPresent
+
+# update strategy
+updateStrategy: {}
+  # type: RollingUpdate
+  # rollingUpdate:
+  #   maxSurge: "100%"
+  #   maxUnavailable: "0%"
+
+# If you want to specify resources, uncomment the following
+# lines, adjust them as necessary, and remove the curly braces after 'resources:'.
+resources: {}
+  # limits:
+  #  cpu: 100m
+  #  memory: 128Mi
+  # requests:
+  #  cpu: 100m
+  #  memory: 128Mi
+
+# readinessProbe for Kong pods
+# If using Kong Enterprise with RBAC, you must add a Kong-Admin-Token header
+readinessProbe:
+  httpGet:
+    path: "/status"
+    port: metrics
+    scheme: HTTP
+  initialDelaySeconds: 5
+  timeoutSeconds: 5
+  periodSeconds: 10
+  successThreshold: 1
+  failureThreshold: 3
+
+# livenessProbe for Kong pods
+livenessProbe:
+  httpGet:
+    path: "/status"
+    port: metrics
+    scheme: HTTP
+  initialDelaySeconds: 5
+  timeoutSeconds: 5
+  periodSeconds: 10
+  successThreshold: 1
+  failureThreshold: 3
+
+# Affinity for pod assignment
+# Ref: https://kubernetes.io/docs/concepts/configuration/assign-pod-node/#affinity-and-anti-affinity
+# affinity: {}
+
+# Tolerations for pod assignment
+# Ref: https://kubernetes.io/docs/concepts/configuration/taint-and-toleration/
+tolerations: []
+
+# Node labels for pod assignment
+# Ref: https://kubernetes.io/docs/user-guide/node-selection/
+nodeSelector: {}
+
+# Annotation to be added to Kong pods
+podAnnotations: {}
+
+# Kong pod count
+replicaCount: 1
+
+# Kong Pod Disruption Budget
+podDisruptionBudget:
+  enabled: false
+  maxUnavailable: "50%"
+
+podSecurityPolicy:
+  enabled: false
+
+# securityContext for Kong pods.
+securityContext:
+  runAsUser: 1000
+
+serviceMonitor:
+  # Specifies whether ServiceMonitor for Prometheus operator should be created
+  enabled: false
+  # interval: 10s
+  # Specifies namespace, where ServiceMonitor should be installed
+  # namespace: monitoring
+  # labels:
+  #   foo: bar
+
+# -----------------------------------------------------------------------------
+# Kong Enterprise parameters
+# -----------------------------------------------------------------------------
+
+# Toggle Kong Enterprise features on or off
+# RBAC and SMTP configuration have additional options that must all be set together
+# Other settings should be added to the "env" settings below
+enterprise:
+  enabled: false
+  # Kong Enterprise license secret name
+  # This secret must contain a single 'license' key, containing your base64-encoded license data
+  # The license secret is required for all Kong Enterprise deployments
+  license_secret: you-must-create-a-kong-license-secret
+  # Session configuration secret
+  # The session conf secret is required if using RBAC or the Portal
+  vitals:
+    enabled: true
+  portal:
+    enabled: false
+    # portal_auth here sets the default authentication mechanism for the Portal
+    # FIXME This can be changed per-workspace, but must currently default to
+    # basic-auth to work around limitations with session configuration
+    portal_auth: basic-auth
+    # If the Portal is enabled and any workspace's Portal uses authentication,
+    # this Secret must contain an portal_session_conf key
+    # The key value must be a secret configuration, following the example at
+    # https://docs.konghq.com/enterprise/latest/developer-portal/configuration/authentication/sessions
+    session_conf_secret: you-must-create-a-portal-session-conf-secret
+  rbac:
+    enabled: false
+    admin_gui_auth: basic-auth
+    # If RBAC is enabled, this Secret must contain an admin_gui_session_conf key
+    # The key value must be a secret configuration, following the example at
+    # https://docs.konghq.com/enterprise/latest/kong-manager/authentication/sessions
+    session_conf_secret: you-must-create-an-rbac-session-conf-secret
+    # If admin_gui_auth is not set to basic-auth, provide a secret name which
+    # has an admin_gui_auth_conf key containing the plugin config JSON
+    admin_gui_auth_conf_secret: you-must-create-an-admin-gui-auth-conf-secret
+  # For configuring emails and SMTP, please read through:
+  # https://docs.konghq.com/enterprise/latest/developer-portal/configuration/smtp
+  # https://docs.konghq.com/enterprise/latest/kong-manager/networking/email
+  smtp:
+    enabled: false
+    portal_emails_from: none@example.com
+    portal_emails_reply_to: none@example.com
+    admin_emails_from: none@example.com
+    admin_emails_reply_to: none@example.com
+    smtp_admin_emails: none@example.com
+    smtp_host: smtp.example.com
+    smtp_port: 587
+    smtp_starttls: true
+    auth:
+      # If your SMTP server does not require authentication, this section can
+      # be left as-is. If smtp_username is set to anything other than an empty
+      # string, you must create a Secret with an smtp_password key containing
+      # your SMTP password and specify its name here.
+      smtp_username: ''  # e.g. postmaster@example.com
+      smtp_password_secret: you-must-create-an-smtp-password
+
 manager:
   # If you want to specify annotations for the Manager service, uncomment the following
   # line, add additional or adjust as needed, and remove the curly braces after 'annotations:'.
@@ -130,8 +432,8 @@ manager:
     enabled: false
     # TLS secret name.
     # tls: kong-proxy.example.com-tls
-    # Array of ingress hosts.
-    hosts: []
+    # Ingress hostname
+    hostname:
     # Map of ingress annotations.
     annotations: {}
     # Ingress path.
@@ -168,8 +470,8 @@ portal:
     enabled: false
     # TLS secret name.
     # tls: kong-proxy.example.com-tls
-    # Array of ingress hosts.
-    hosts: []
+    # Ingress hostname
+    hostname:
     # Map of ingress annotations.
     annotations: {}
     # Ingress path.
@@ -206,239 +508,11 @@ portalapi:
     enabled: false
     # TLS secret name.
     # tls: kong-proxy.example.com-tls
-    # Array of ingress hosts.
-    hosts: []
+    # Ingress hostname
+    hostname:
     # Map of ingress annotations.
     annotations: {}
     # Ingress path.
     path: /
 
   externalIPs: []
-
-# Toggle Kong Enterprise features on or off
-# RBAC and SMTP configuration have additional options that must all be set together
-# Other settings should be added to the "env" settings below
-enterprise:
-  enabled: false
-  # Kong Enterprise license secret name
-  # This secret must contain a single 'license' key, containing your base64-encoded license data
-  # The license secret is required for all Kong Enterprise deployments
-  license_secret: you-must-create-a-kong-license-secret
-  # Session configuration secret
-  # The session conf secret is required if using RBAC or the Portal
-  vitals:
-    enabled: true
-  portal:
-    enabled: false
-    # portal_auth here sets the default authentication mechanism for the Portal
-    # FIXME This can be changed per-workspace, but must currently default to
-    # basic-auth to work around limitations with session configuration
-    portal_auth: basic-auth
-    # If the Portal is enabled and any workspace's Portal uses authentication,
-    # this Secret must contain an portal_session_conf key
-    # The key value must be a secret configuration, following the example at https://docs.konghq.com/enterprise/0.35-x/kong-manager/authentication/sessions/
-    session_conf_secret: you-must-create-a-portal-session-conf-secret
-  rbac:
-    enabled: false
-    admin_gui_auth: basic-auth
-    # If RBAC is enabled, this Secret must contain an admin_gui_session_conf key
-    # The key value must be a secret configuration, following the example at https://docs.konghq.com/enterprise/0.35-x/kong-manager/authentication/sessions/
-    session_conf_secret: you-must-create-an-rbac-session-conf-secret
-    # Set to the appropriate plugin config JSON if not using basic-auth
-    admin_gui_auth_conf: {}
-  smtp:
-    enabled: false
-    portal_emails_from: none@example.com
-    portal_emails_reply_to: none@example.com
-    admin_emails_from: none@example.com
-    admin_emails_reply_to: none@example.com
-    smtp_admin_emails: none@example.com
-    smtp_host: smtp.example.com
-    smtp_port: 587
-    smtp_starttls: true
-    auth:
-      # If your SMTP server does not require authentication, this section can
-      # be left as-is. If smtp_username is set to anything other than an empty
-      # string, you must create a Secret with an smtp_password key containing
-      # your SMTP password and specify its name here.
-      smtp_username: ''  # e.g. postmaster@example.com
-      smtp_password_secret: you-must-create-an-smtp-password
-
-# Set runMigrations to run Kong migrations
-runMigrations: true
-
-# update strategy
-updateStrategy: {}
-  # type: RollingUpdate
-  # rollingUpdate:
-  #   maxSurge: "100%"
-  #   maxUnavailable: "0%"
-
-# Specify Kong configurations
-# Kong configurations guide https://getkong.org/docs/latest/configuration/
-# Values here take precedence over values from other sections of values.yaml,
-# 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
-  proxy_access_log: /dev/stdout
-  admin_access_log: /dev/stdout
-  admin_gui_access_log: /dev/stdout
-  portal_api_access_log: /dev/stdout
-  proxy_error_log: /dev/stderr
-  admin_error_log: /dev/stderr
-  admin_gui_error_log: /dev/stderr
-  portal_api_error_log: /dev/stderr
-
-# If you want to specify resources, uncomment the following
-# lines, adjust them as necessary, and remove the curly braces after 'resources:'.
-resources: {}
-  # limits:
-  #  cpu: 100m
-  #  memory: 128Mi
-  # requests:
-  #  cpu: 100m
-  #  memory: 128Mi
-
-# readinessProbe for Kong pods
-# If using Kong Enterprise with RBAC, you must add a Kong-Admin-Token header
-readinessProbe:
-  httpGet:
-    path: "/status"
-    port: admin
-    scheme: HTTPS
-  initialDelaySeconds: 30
-  timeoutSeconds: 1
-  periodSeconds: 10
-  successThreshold: 1
-  failureThreshold: 5
-
-# livenessProbe for Kong pods
-# If using Kong Enterprise with RBAC, you must add a Kong-Admin-Token header
-livenessProbe:
-  httpGet:
-    path: "/status"
-    port: admin
-    scheme: HTTPS
-  initialDelaySeconds: 30
-  timeoutSeconds: 5
-  periodSeconds: 30
-  successThreshold: 1
-  failureThreshold: 5
-
-# Affinity for pod assignment
-# Ref: https://kubernetes.io/docs/concepts/configuration/assign-pod-node/#affinity-and-anti-affinity
-# affinity: {}
-
-# Tolerations for pod assignment
-# Ref: https://kubernetes.io/docs/concepts/configuration/taint-and-toleration/
-tolerations: []
-
-# Node labels for pod assignment
-# Ref: https://kubernetes.io/docs/user-guide/node-selection/
-nodeSelector: {}
-
-# Annotation to be added to Kong pods
-podAnnotations: {}
-
-# Kong pod count
-replicaCount: 1
-
-# Kong Pod Disruption Budget
-podDisruptionBudget:
-  enabled: false
-  maxUnavailable: "50%"
-
-# Kong has a choice of either Postgres or Cassandra as a backend datatstore.
-# This chart allows you to choose either of them with the `database.type`
-# parameter.  Postgres is chosen by default.
-
-# Additionally, this chart allows you to use your own database or spin up a new
-# instance by using the `postgres.enabled` or `cassandra.enabled` parameters.
-# Enabling both will create both databases in your cluster, but only one
-# will be used by Kong based on the `env.database` parameter.
-# Postgres is enabled by default.
-
-# Cassandra chart configs
-cassandra:
-  enabled: false
-
-# PostgreSQL chart configs
-postgresql:
-  enabled: true
-  postgresqlUsername: kong
-  postgresqlDatabase: kong
-  service:
-    port: 5432
-
-# Kong Ingress Controller's primary purpose is to satisfy Ingress resources
-# created in k8s.  It uses CRDs for more fine grained control over routing and
-# for Kong specific configuration.
-ingressController:
-  enabled: false
-  image:
-    repository: kong-docker-kubernetes-ingress-controller.bintray.io/kong-ingress-controller
-    tag: 0.6.0
-  replicaCount: 1
-  livenessProbe:
-    failureThreshold: 3
-    httpGet:
-      path: "/healthz"
-      port: 10254
-      scheme: HTTP
-    initialDelaySeconds: 30
-    periodSeconds: 10
-    successThreshold: 1
-    timeoutSeconds: 5
-  readinessProbe:
-    failureThreshold: 3
-    httpGet:
-      path: "/healthz"
-      port: 10254
-      scheme: HTTP
-      initialDelaySeconds: 30
-    periodSeconds: 10
-    successThreshold: 1
-    timeoutSeconds: 5
-
-  installCRDs: true
-
-  rbac:
-    # Specifies whether RBAC resources should be created
-    create: true
-
-  serviceAccount:
-    # Specifies whether a ServiceAccount should be created
-    create: true
-    # The name of the ServiceAccount to use.
-    # If not set and create is true, a name is generated using the fullname template
-    name:
-
-  ingressClass: kong
-
-  podDisruptionBudget:
-    enabled: false
-    maxUnavailable: "50%"
-
-# We pass the dbless (declarative) config over here.
-dblessConfig:
-  # Either Kong's configuration is managed from an existing ConfigMap (with Key: kong.yml)
-  configMap: ""
-  # Or the configuration is passed in full-text below
-  config:
-    _format_version: "1.1"
-    services:
-      # Example configuration
-      # - name: example.com
-      #   url: http://example.com
-      #   routes:
-      #   - name: example
-      #     paths:
-      #     - "/example"
-
-serviceMonitor:
-  # Specifies whether ServiceMonitor for Prometheus operator should be created
-  enabled: false
-  # interval: 10s
-  # Specifies namespace, where ServiceMonitor should be installed
-  # namespace: monitoring
similarity index 73%
rename from ric-infra/30-Kong/helm/kong/values.yaml
rename to ric-aux/helm/infrastructure/values.yaml
index 9bec10c..81f1807 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-release:
+      registry: "nexus3.o-ran-sc.org:10002"
+      credential:
+        user: "docker"
+        password: "docker"
+        email: "@"
+    oran-staging:
+      registry: "nexus3.o-ran-sc.org:10004"
+      credential:
+        user: "docker"
+        password: "docker"
+        email: "@"
+
+certificate-manager:
+  enabled: true
+      
 
 kong:
+  enabled: true
   ingressController:
     enabled: true
 
@@ -35,10 +58,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/_dbaasha.tpl b/ric-common/Common-Template/helm/ric-common/templates/_dbaasha.tpl
new file mode 100644 (file)
index 0000000..b948072
--- /dev/null
@@ -0,0 +1,60 @@
+################################################################################
+#   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.dbaasha" -}}
+  {{- printf "dbaasha" -}}
+{{- end -}}
+
+{{- define "common.fullname.dbaasha" -}}
+  {{- $name := ( include "common.name.dbaasha" . ) -}}
+  {{- $namespace := ( include "common.namespace.platform" . ) -}}
+  {{- printf "%s-%s" $namespace $name | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+
+{{- define "common.configmapname.dbaasha" -}}
+  {{- $name := ( include "common.fullname.dbaasha" . ) -}}
+  {{- printf "configmap-%s" $name | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+
+{{- define "common.statefulsetname.dbaasha" -}}
+  {{- $name := ( include "common.fullname.dbaasha" . ) -}}
+  {{- printf "statefulset-%s" $name | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+
+{{- define "common.containername.dbaasha.redis" -}}
+  {{- $name := ( include "common.fullname.dbaasha" . ) -}}
+  {{- printf "container-%s-redis" $name | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+
+{{- define "common.containername.dbaasha.sentinel" -}}
+  {{- $name := ( include "common.fullname.dbaasha" . ) -}}
+  {{- printf "container-%s-sentinel" $name | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+
+
+
+{{- define "common.serviceaccountname.dbaasha" -}}
+  {{- $name := ( include "common.fullname.dbaasha" . ) -}}
+  {{- printf "svcacct-%s" $name | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+
+{{- define "common.servicename.dbaasha.tcp" -}}
+  {{- $name := ( include "common.fullname.dbaasha" . ) -}}
+  {{- printf "service-%s-tcp" $name | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+
+{{- define "common.serviceport.dbaasha.redis" -}}6379{{- end -}}
+{{- define "common.serviceport.dbaasha.sentinel" -}}26379{{- 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..b6b82fd
--- /dev/null
+++ b/ric-dep
@@ -0,0 +1 @@
+Subproject commit b6b82fd34b2a09eb5c56db501f2dd1bc13290521
diff --git a/ric-infra/15-Chartmuseum/bin/install b/ric-infra/15-Chartmuseum/bin/install
deleted file mode 100755 (executable)
index 812b7dd..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 "* Chartmuseum 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/charts/kong/Chart.yaml b/ric-infra/30-Kong/helm/kong/charts/kong/Chart.yaml
deleted file mode 100755 (executable)
index 2e1cf0d..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.                                             #
-################################################################################
-
-apiVersion: v1
-appVersion: "1.3"
-description: The Cloud-Native Ingress and Service Mesh for APIs and Microservices
-engine: gotpl
-home: https://KongHQ.com/
-icon: https://s3.amazonaws.com/downloads.kong/universe/assets/icon-kong-inc-large.png
-maintainers:
-- email: shashi@konghq.com
-  name: shashiranjan84
-- email: harry@konghq.com
-  name: hbagdi
-name: kong
-sources:
-- https://github.com/Kong/kong
-version: 0.17.0
diff --git a/ric-infra/30-Kong/helm/kong/charts/kong/README.md b/ric-infra/30-Kong/helm/kong/charts/kong/README.md
deleted file mode 100755 (executable)
index be6bc15..0000000
+++ /dev/null
@@ -1,397 +0,0 @@
-## Kong
-
-[Kong](https://KongHQ.com/) is an open-source API Gateway and Microservices
-Management Layer, delivering high performance and reliability.
-
-## TL;DR;
-
-```bash
-$ helm install stable/kong
-```
-
-## Introduction
-
-This chart bootstraps all the components needed to run Kong on a [Kubernetes](http://kubernetes.io)
-cluster using the [Helm](https://helm.sh) package manager.
-
-## Prerequisites
-
-- Kubernetes 1.8+ with Beta APIs enabled.
-- PV provisioner support in the underlying infrastructure if persistence
-  is needed for Kong datastore.
-
-## Installing the Chart
-
-To install the chart with the release name `my-release`:
-
-```bash
-$ helm install --name my-release stable/kong
-```
-
-If using Kong Enterprise, several additional steps are necessary before
-installing the chart. At minimum, you must:
-* Create a [license secret](#license).
-* Set `enterprise.enabled: true` in values.yaml.
-* Update values.yaml to use a Kong Enterprise image. If needed, follow the
-instructions in values.yaml to add a registry pull secret.
-
-Reading through [the full list of Enterprise considerations](#kong-enterprise-specific-parameters)
-is recommended.
-
-> **Tip**: List all releases using `helm list`
-
-## Uninstalling the Chart
-
-To uninstall/delete the `my-release` deployment:
-
-```bash
-$ helm delete my-release
-```
-
-The command removes all the Kubernetes components associated with the
-chart and deletes the release.
-
-## Configuration
-
-### General Configuration Parameters
-
-The following table lists the configurable parameters of the Kong chart
-and their default values.
-
-| Parameter                          | Description                                                                           | Default             |
-| ---------------------------------- | ------------------------------------------------------------------------------------- | ------------------- |
-| image.repository                   | Kong image                                                                            | `kong`              |
-| image.tag                          | Kong image version                                                                    | `1.3`               |
-| image.pullPolicy                   | Image pull policy                                                                     | `IfNotPresent`      |
-| image.pullSecrets                  | Image pull secrets                                                                    | `null`              |
-| replicaCount                       | Kong instance count                                                                   | `1`                 |
-| admin.useTLS                       | Secure Admin traffic                                                                  | `true`              |
-| admin.servicePort                  | TCP port on which the Kong admin service is exposed                                   | `8444`              |
-| admin.containerPort                | TCP port on which Kong app listens for admin traffic                                  | `8444`              |
-| admin.nodePort                     | Node port when service type is `NodePort`                                             |                     |
-| admin.hostPort                     | Host port to use for admin traffic                                                    |                     |
-| admin.type                         | k8s service type, Options: NodePort, ClusterIP, LoadBalancer                          | `NodePort`          |
-| admin.loadBalancerIP               | Will reuse an existing ingress static IP for the admin service                        | `null`              |
-| admin.loadBalancerSourceRanges     | Limit admin access to CIDRs if set and service type is `LoadBalancer`                 | `[]`                |
-| admin.ingress.enabled              | Enable ingress resource creation (works with proxy.type=ClusterIP)                    | `false`             |
-| admin.ingress.tls                  | Name of secret resource, containing TLS secret                                        |                     |
-| admin.ingress.hosts                | List of ingress hosts.                                                                | `[]`                |
-| admin.ingress.path                 | Ingress path.                                                                         | `/`                 |
-| admin.ingress.annotations          | Ingress annotations. See documentation for your ingress controller for details        | `{}`                |
-| proxy.http.enabled                 | Enables http on the proxy                                                             | true                |
-| proxy.http.servicePort             | Service port to use for http                                                          | 80                  |
-| proxy.http.containerPort           | Container port to use for http                                                        | 8000                |
-| proxy.http.nodePort                | Node port to use for http                                                             | 32080               |
-| proxy.http.hostPort                | Host port to use for http                                                             |                     |
-| proxy.tls.enabled                  | Enables TLS on the proxy                                                              | true                |
-| proxy.tls.containerPort            | Container port to use for TLS                                                         | 8443                |
-| proxy.tls.servicePort              | Service port to use for TLS                                                           | 8443                |
-| proxy.tls.nodePort                 | Node port to use for TLS                                                              | 32443               |
-| proxy.tls.hostPort                 | Host port to use for TLS                                                              |                     |
-| proxy.type                         | k8s service type. Options: NodePort, ClusterIP, LoadBalancer                          | `NodePort`          |
-| proxy.loadBalancerSourceRanges     | Limit proxy access to CIDRs if set and service type is `LoadBalancer`                 | `[]`                |
-| proxy.loadBalancerIP               | To reuse an existing ingress static IP for the admin service                          |                     |
-| proxy.externalIPs                  | IPs for which nodes in the cluster will also accept traffic for the proxy             | `[]`                |
-| proxy.externalTrafficPolicy        | k8s service's externalTrafficPolicy. Options: Cluster, Local                          |                     |
-| proxy.ingress.enabled              | Enable ingress resource creation (works with proxy.type=ClusterIP)                    | `false`             |
-| proxy.ingress.tls                  | Name of secret resource, containing TLS secret                                        |                     |
-| proxy.ingress.hosts                | List of ingress hosts.                                                                | `[]`                |
-| proxy.ingress.path                 | Ingress path.                                                                         | `/`                 |
-| proxy.ingress.annotations          | Ingress annotations. See documentation for your ingress controller for details        | `{}`                |
-| updateStrategy                     | update strategy for deployment                                                        | `{}`                |
-| env                                | Additional [Kong configurations](https://getkong.org/docs/latest/configuration/)      |                     |
-| runMigrations                      | Run Kong migrations job                                                               | `true`              |
-| readinessProbe                     | Kong readiness probe                                                                  |                     |
-| livenessProbe                      | Kong liveness probe                                                                   |                     |
-| affinity                           | Node/pod affinities                                                                   |                     |
-| nodeSelector                       | Node labels for pod assignment                                                        | `{}`                |
-| podAnnotations                     | Annotations to add to each pod                                                        | `{}`                |
-| resources                          | Pod resource requests & limits                                                        | `{}`                |
-| tolerations                        | List of node taints to tolerate                                                       | `[]`                |
-| podDisruptionBudget.enabled        | Enable PodDisruptionBudget for Kong                                                   | `false`             |
-| podDisruptionBudget.maxUnavailable | Represents the minimum number of Pods that can be unavailable (integer or percentage) | `50%`               |
-| podDisruptionBudget.minAvailable   | Represents the number of Pods that must be available (integer or percentage)          |                     |
-| serviceMonitor.enabled             | Create ServiceMonitor for Prometheus Operator                                         | false               |
-| serviceMonitor.interval            | Scrapping interval                                                                    | 10s                 |
-| serviceMonitor.namespace           | Where to create ServiceMonitor                                                        |                     |
-
-### Admin/Proxy listener override
-
-If you specify `env.admin_listen` or `env.proxy_listen`, this chart will use
-the value provided by you as opposed to constructing a listen variable
-from fields like `proxy.http.containerPort` and `proxy.http.enabled`. This allows
-you to be more prescriptive when defining listen directives.
-
-**Note:** Overriding `env.proxy_listen` and `env.admin_listen` will potentially cause
-`admin.containerPort`, `proxy.http.containerPort` and `proxy.tls.containerPort` to become out of sync,
-and therefore must be updated accordingly.
-
-I.E. updatating to `env.proxy_listen: 0.0.0.0:4444, 0.0.0.0:4443 ssl` will need
-`proxy.http.containerPort: 4444` and `proxy.tls.containerPort: 4443` to be set in order
-for the service definition to work properly.
-
-### Kong-specific parameters
-
-Kong has a choice of either Postgres or Cassandra as a backend datatstore.
-This chart allows you to choose either of them with the `env.database`
-parameter.  Postgres is chosen by default.
-
-Additionally, this chart allows you to use your own database or spin up a new
-instance by using the `postgres.enabled` or `cassandra.enabled` parameters.
-Enabling both will create both databases in your cluster, but only one
-will be used by Kong based on the `env.database` parameter.
-Postgres is enabled by default.
-
-| Parameter                     | Description                                                             | Default               |
-| ------------------------------| ------------------------------------------------------------------------| ----------------------|
-| cassandra.enabled             | Spin up a new cassandra cluster for Kong                                | `false`               |
-| postgresql.enabled            | Spin up a new postgres instance for Kong                                | `true`                |
-| waitImage.repository          | Image used to wait for database to become ready                         | `busybox`             |
-| waitImage.tag                 | Tag for image used to wait for database to become ready                 | `latest`              |
-| env.database                  | Choose either `postgres`, `cassandra` or `"off"` (for dbless mode)      | `postgres`            |
-| env.pg_user                   | Postgres username                                                       | `kong`                |
-| env.pg_database               | Postgres database name                                                  | `kong`                |
-| env.pg_password               | Postgres database password (required if you are using your own database)| `kong`                |
-| env.pg_host                   | Postgres database host (required if you are using your own database)    | ``                    |
-| env.pg_port                   | Postgres database port                                                  | `5432`                |
-| env.cassandra_contact_points  | Cassandra contact points (required if you are using your own database)  | ``                    |
-| env.cassandra_port            | Cassandra query port                                                    | `9042`                |
-| env.cassandra_keyspace        | Cassandra keyspace                                                      | `kong`                |
-| env.cassandra_repl_factor     | Replication factor for the Kong keyspace                                | `2`                   |
-| dblessConfig.configMap        | Name of an existing ConfigMap containing the `kong.yml` file. This must have the key `kong.yml`.| `` |
-| dblessConfig.config           | Yaml configuration file for the dbless (declarative) configuration of Kong | see in `values.yaml`    |
-
-All `kong.env` parameters can also accept a mapping instead of a value to ensure the parameters can be set through configmaps and secrets.
-
-An example :
-
-```yaml
-kong:
-  env:
-     pg_user: kong
-     pg_password:
-       valueFrom:
-         secretKeyRef:
-            key: kong
-            name: postgres
-```
-
-
-For complete list of Kong configurations please check https://getkong.org/docs/latest/configuration/.
-
-Specify each parameter using the `--set key=value[,key=value]` argument to `helm install`. For example,
-
-```console
-$ helm install stable/kong --name my-release \
-  --set=image.tag=1.3,env.database=cassandra,cassandra.enabled=true
-```
-
-Alternatively, a YAML file that specifies the values for the above parameters
-can be provided while installing the chart. For example,
-
-```console
-$ helm install stable/kong --name my-release -f values.yaml
-```
-
-> **Tip**: You can use the default [values.yaml](values.yaml)
-
-### Kong Enterprise-specific parameters
-
-Kong Enterprise requires some additional configuration not needed when using
-Kong OSS. Some of the more important configuration is grouped in sections
-under the `.enterprise` key in values.yaml, though most enterprise-specific
-configuration can be placed under the `.env` key.
-
-To use Kong Enterprise, change your image to a Kong Enterprise image and set
-`.enterprise.enabled: true` in values.yaml to render Enterprise sections of the
-templates. Review the sections below for other settings you should consider
-configuring before installing the chart.
-
-#### Service location hints
-
-Kong Enterprise add two GUIs, Kong Manager and the Kong Developer Portal, that
-must know where other Kong services (namely the admin and files APIs) can be
-accessed in order to function properly. Kong's default behavior for attempting
-to locate these absent configuration is unlikely to work in common Kubernetes
-environments. Because of this, you should set each of `admin_gui_url`,
-`admin_api_uri`, `proxy_url`, `portal_api_url`, `portal_gui_host`, and
-`portal_gui_protocol` under the `.env` key in values.yaml to locations where
-each of their respective services can be accessed to ensure that Kong services
-can locate one another and properly set CORS headers. See the [Property Reference documentation](https://docs.konghq.com/enterprise/0.35-x/property-reference/)
-for more details on these settings.
-
-#### License
-
-All Kong Enterprise deployments require a license. If you do not have a copy
-of yours, please contact Kong Support. Once you have it, you will need to
-store it in a Secret. Save your secret in a file named `license` (no extension)
-and then create and inspect your secret:
-
-```
-$ kubectl create secret generic kong-enterprise-license --from-file=./license
-$ kubectl get secret kong-enterprise-license -o yaml
-apiVersion: v1
-data:
-  license: eyJsaWNlbnNlIjp7InNpZ25hdHVyZSI6IkhFWSBJIFNFRSBZT1UgUEVFS0lORyBJTlNJREUgTVkgQkFTRTY0IEVYQU1QTEUiLCJwYXlsb2FkIjp7ImN1c3RvbWVyIjoiV0VMTCBUT08gQkFEIiwibGljZW5zZV9jcmVhdGlvbl9kYXRlIjoiMjAxOC0wNi0wNSIsInByb2R1Y3Rfc3Vic2NyaXB0aW9uIjoiVEhFUkVTIE5PVEhJTkcgSEVSRSIsImFkbWluX3NlYXRzIjoiNSIsInN1cHBvcnRfcGxhbiI6IkZha2UiLCJsaWNlbnNlX2V4cGlyYXRpb25fZGF0ZSI6IjIwMjAtMjAtMjAiLCJsaWNlbnNlX2tleSI6IlRTT0kgWkhJViJ9LCJ2ZXJzaW9uIjoxfX0K
-kind: Secret
-metadata:
-  creationTimestamp: "2019-05-17T21:45:16Z"
-  name: kong-enterprise-license
-  namespace: default
-  resourceVersion: "48695485"
-  selfLink: /api/v1/namespaces/default/secrets/kong-enterprise-license
-  uid: 0f2e8903-78ed-11e9-b1a6-42010a8a02ec
-type: Opaque
-```
-Set the secret name in values.yaml, in the `.enterprise.license_secret` key.
-
-#### RBAC
-
-Note that you can create a default RBAC superuser when initially setting up an
-environment, by setting the `KONG_PASSWORD` environment variable on the initial
-migration Job's Pod. This will create a `kong_admin` admin whose token and
-basic-auth password match the value of `KONG_PASSWORD`
-
-Using RBAC within Kubernetes environments requires providing Kubernetes an RBAC
-user for its readiness and liveness checks. We recommend creating a user that
-has permission to read `/status` and nothing else. For example, with RBAC still
-disabled:
-
-```
-$ curl -sX POST http://admin.kong.example/rbac/users --data name=statuschecker --data user_token=REPLACE_WITH_SOME_TOKEN
-{"user_token_ident":"45239","user_token":"$2b$09$cL.xbvRQCzE35A0osl8VTej7u0BgJOIgpTVjxpwZ1U8.jNdMwyQRW","id":"fe8824dc-09a7-4b68-b5e6-541e4b9b4ced","name":"statuschecker","enabled":true,"comment":null,"created_at":1558131229}
-
-$ curl -sX POST http://admin.kong.example/rbac/roles --data name=read-status
-{"comment":null,"created_at":1558131353,"id":"e32507a5-e636-40b2-88c0-090042db7d79","name":"read-status","is_default":false}
-
-$ curl -sX POST http://admin.kong.example/rbac/roles/read-status/endpoints --data endpoint="/status" --data actions=read
-{"endpoint":"\/status","created_at":1558131423,"workspace":"default","actions":["read"],"negative":false,"role":{"id":"e32507a5-e636-40b2-88c0-090042db7d79"}}
-
-$ curl -sX POST http://admin.kong.example/rbac/users/statuschecker/roles --data roles=read-status
-{"roles":[{"created_at":1558131353,"id":"e32507a5-e636-40b2-88c0-090042db7d79","name":"read-status"}],"user":{"user_token_ident":"45239","user_token":"$2b$09$cL.xbvRQCzE35A0osl8VTej7u0BgJOIgpTVjxpwZ1U8.jNdMwyQRW","id":"fe8824dc-09a7-4b68-b5e6-541e4b9b4ced","name":"statuschecker","comment":null,"enabled":true,"created_at":1558131229}}
-```
-Probes will then need to include that user's token, e.g. for the readinessProbe:
-
-```
-readinessProbe:
-  httpGet:
-    path: "/status"
-    port: admin
-    scheme: HTTP
-    httpHeaders:
-      - name: Kong-Admin-Token
-        value: REPLACE_WITH_SOME_TOKEN
-    ...
-```
-
-Note that RBAC is **NOT** currently enabled on the admin API container for the
-controller Pod when the ingress controller is enabled. This admin API container
-is not exposed outside the Pod, so only the controller can interact with it. We
-intend to add RBAC to this container in the future after updating the controller
-to add support for storing its RBAC token in a Secret, as currently it would
-need to be stored in plaintext. RBAC is still enforced on the admin API of the
-main deployment when using the ingress controller, as that admin API *is*
-accessible outside the Pod.
-
-#### Sessions
-
-Login sessions for Kong Manager and the Developer Portal make use of [the Kong
-Sessions plugin](https://docs.konghq.com/enterprise/0.35-x/kong-manager/authentication/sessions/).
-Their configuration must be stored in Secrets, as it contains an HMAC key.
-If using either RBAC or the Portal, create a Secret with `admin_gui_session_conf`
-and `portal_session_conf` keys.
-
-```
-$ cat admin_gui_session_conf
-{"cookie_name":"admin_session","cookie_samesite":"off","secret":"admin-secret-CHANGEME","cookie_secure":true,"storage":"kong"}
-$ cat portal_session_conf
-{"cookie_name":"portal_session","cookie_samesite":"off","secret":"portal-secret-CHANGEME","cookie_secure":true,"storage":"kong"}
-$ kubectl create secret generic kong-session-config --from-file=admin_gui_session_conf --from-file=portal_session_conf
-secret/kong-session-config created
-```
-The exact plugin settings may vary in your environment. The `secret` should
-always be changed for both configurations.
-
-After creating your secret, set its name in values.yaml, in the
-`.enterprise.rbac.session_conf_secret` and
-`.enterprise.rbac.session_conf_secret` keys.
-
-#### Email/SMTP
-
-Email is used to send invitations for [Kong Admins](https://docs.konghq.com/enterprise/enterprise/0.35-x/kong-manager/networking/email/)
-and [Developers](https://docs.konghq.com/enterprise/enterprise/0.35-x/developer-portal/configuration/smtp/).
-
-Email invitations rely on setting a number of SMTP settings at once. For
-convenience, these are grouped under the `.enterprise.smtp` key in values.yaml.
-Setting `.enterprise.smtp.disabled: true` will set `KONG_SMTP_MOCK=on` and
-allow Admin/Developer invites to proceed without sending email. Note, however,
-that these have limited functionality without sending email.
-
-If your SMTP server requires authentication, you should the `username` and
-`smtp_password_secret` keys under `.enterprise.smtp.auth`.
-`smtp_password_secret` must be a Secret containing an `smtp_password` key whose
-value is your SMTP password.
-
-### DB-less Configuration
-
-
-When deploying Kong in DB-less mode (`env.database: "off"`) and without the Ingress
-Controller (`ingressController.enabled: false`), Kong needs a config to run. In
-this case, configuration can be provided using an exsiting ConfigMap
-(`dblessConfig.configMap`) or pushed directly into the values file under
-`dblessConfig.config`. See the example configuration in the default values.yaml
-for more details.
-
-### Kong Ingress Controller
-
-Kong Ingress Controller's primary purpose is to satisfy Ingress resources
-created in your Kubernetes cluster.
-It uses CRDs for more fine grained control over routing and
-for Kong specific configuration.
-To deploy the ingress controller together with
-kong run the following command:
-
-```bash
-# without a database
-helm install stable/kong --set ingressController.enabled=true \
-  --set postgresql.enabled=false --set env.database=off
-# with a database
-helm install stable/kong --set ingressController.enabled=true
-```
-
-If you like to use a static IP:
-
-```shell
-helm install stable/kong --set ingressController.enabled=true --set proxy.loadBalancerIP=[Your IP goes there] --set proxy.type=LoadBalancer --name kong --namespace kong
-```
-
-**Note**: Kong Ingress controller doesn't support custom SSL certificates
-on Admin port. We will be removing this limitation in the future.
-
-Kong ingress controller relies on several Custom Resource Definition objects to
-declare the the Kong configurations and synchronize the configuration with the
-Kong admin API. Each of this new objects  declared in Kubernetes have a
-one-to-one relation with a Kong resource.
-The custom resources are:
-
-- KongConsumer
-- KongCredential
-- KongPlugin
-- KongIngress
-
-You can can learn about kong ingress custom resource definitions [here](https://github.com/Kong/kubernetes-ingress-controller/blob/master/docs/custom-resources.md).
-
-
-| Parameter                          | Description                                                                           | Default                                                                      |
-| ---------------------------------- | ------------------------------------------------------------------------------------- | ---------------------------------------------------------------------------- |
-| enabled                            | Deploy the ingress controller, rbac and crd                                           | false                                                                        |
-| replicaCount                       | Number of desired ingress controllers                                                 | 1                                                                            |
-| image.repository                   | Docker image with the ingress controller                                              | kong-docker-kubernetes-ingress-controller.bintray.io/kong-ingress-controller |
-| image.tag                          | Version of the ingress controller                                                     | 0.2.0                                                                        |
-| readinessProbe                     | Kong ingress controllers readiness probe                                              |                                                                              |
-| livenessProbe                      | Kong ingress controllers liveness probe                                               |                                                                              |
-| ingressClass                       | The ingress-class value for controller                                                | nginx                                                                        |
-| podDisruptionBudget.enabled        | Enable PodDisruptionBudget for ingress controller                                     | `false`                                                                      |
-| podDisruptionBudget.maxUnavailable | Represents the minimum number of Pods that can be unavailable (integer or percentage) | `50%`                                                                        |
-| podDisruptionBudget.minAvailable   | Represents the number of Pods that must be available (integer or percentage)          |                                                                              |
-
diff --git a/ric-infra/30-Kong/helm/kong/charts/kong/charts/cassandra/.helmignore b/ric-infra/30-Kong/helm/kong/charts/kong/charts/cassandra/.helmignore
deleted file mode 100755 (executable)
index 5e03def..0000000
+++ /dev/null
@@ -1,17 +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
-# Common backup files
-*.swp
-*.bak
-*.tmp
-*~
-# Various IDEs
-.project
-.idea/
-*.tmproj
-OWNERS
diff --git a/ric-infra/30-Kong/helm/kong/charts/kong/charts/cassandra/Chart.yaml b/ric-infra/30-Kong/helm/kong/charts/kong/charts/cassandra/Chart.yaml
deleted file mode 100755 (executable)
index 44592bb..0000000
+++ /dev/null
@@ -1,17 +0,0 @@
-apiVersion: v1
-appVersion: 3.11.3
-description: Apache Cassandra is a free and open-source distributed database management
-  system designed to handle large amounts of data across many commodity servers, providing
-  high availability with no single point of failure.
-engine: gotpl
-home: http://cassandra.apache.org
-icon: https://upload.wikimedia.org/wikipedia/commons/thumb/5/5e/Cassandra_logo.svg/330px-Cassandra_logo.svg.png
-keywords:
-- cassandra
-- database
-- nosql
-maintainers:
-- email: goonohc@gmail.com
-  name: KongZ
-name: cassandra
-version: 0.10.5
diff --git a/ric-infra/30-Kong/helm/kong/charts/kong/charts/cassandra/README.md b/ric-infra/30-Kong/helm/kong/charts/kong/charts/cassandra/README.md
deleted file mode 100755 (executable)
index b3b1959..0000000
+++ /dev/null
@@ -1,190 +0,0 @@
-# Cassandra
-A Cassandra Chart for Kubernetes
-
-## Install Chart
-To install the Cassandra Chart into your Kubernetes cluster (This Chart requires persistent volume by default, you may need to create a storage class before install chart. To create storage class, see [Persist data](#persist_data) section)
-
-```bash
-helm install --namespace "cassandra" -n "cassandra" incubator/cassandra
-```
-
-After installation succeeds, you can get a status of Chart
-
-```bash
-helm status "cassandra"
-```
-
-If you want to delete your Chart, use this command
-```bash
-helm delete  --purge "cassandra"
-```
-
-## Persist data
-You need to create `StorageClass` before able to persist data in persistent volume.
-To create a `StorageClass` on Google Cloud, run the following
-
-```bash
-kubectl create -f sample/create-storage-gce.yaml
-```
-
-And set the following values in `values.yaml`
-
-```yaml
-persistence:
-  enabled: true
-```
-
-If you want to create a `StorageClass` on other platform, please see documentation here [https://kubernetes.io/docs/user-guide/persistent-volumes/](https://kubernetes.io/docs/user-guide/persistent-volumes/)
-
-When running a cluster without persistence, the termination of a pod will first initiate a decommissioning of that pod.
-Depending on the amount of data stored inside the cluster this may take a while. In order to complete a graceful
-termination, pods need to get more time for it. Set the following values in `values.yaml`:
-
-```yaml
-podSettings:
-  terminationGracePeriodSeconds: 1800
-```
-
-## Install Chart with specific cluster size
-By default, this Chart will create a cassandra with 3 nodes. If you want to change the cluster size during installation, you can use `--set config.cluster_size={value}` argument. Or edit `values.yaml`
-
-For example:
-Set cluster size to 5
-
-```bash
-helm install --namespace "cassandra" -n "cassandra" --set config.cluster_size=5 incubator/cassandra/
-```
-
-## Install Chart with specific resource size
-By default, this Chart will create a cassandra with CPU 2 vCPU and 4Gi of memory which is suitable for development environment.
-If you want to use this Chart for production, I would recommend to update the CPU to 4 vCPU and 16Gi. Also increase size of `max_heap_size` and `heap_new_size`.
-To update the settings, edit `values.yaml`
-
-## Install Chart with specific node
-Sometime you may need to deploy your cassandra to specific nodes to allocate resources. You can use node selector by edit `nodes.enabled=true` in `values.yaml`
-For example, you have 6 vms in node pools and you want to deploy cassandra to node which labeled as `cloud.google.com/gke-nodepool: pool-db`
-
-Set the following values in `values.yaml`
-
-```yaml
-nodes:
-  enabled: true
-  selector:
-    nodeSelector:
-      cloud.google.com/gke-nodepool: pool-db
-```
-
-## Configuration
-
-The following table lists the configurable parameters of the Cassandra chart and their default values.
-
-| Parameter                  | Description                                     | Default                                                    |
-| -----------------------    | ---------------------------------------------   | ---------------------------------------------------------- |
-| `image.repo`                         | `cassandra` image repository                    | `cassandra`                                                |
-| `image.tag`                          | `cassandra` image tag                           | `3.11.3`                                                   |
-| `image.pullPolicy`                   | Image pull policy                               | `Always` if `imageTag` is `latest`, else `IfNotPresent`    |
-| `image.pullSecrets`                  | Image pull secrets                              | `nil`                                                      |
-| `config.cluster_domain`              | The name of the cluster domain.                 | `cluster.local`                                            |
-| `config.cluster_name`                | The name of the cluster.                        | `cassandra`                                                |
-| `config.cluster_size`                | The number of nodes in the cluster.             | `3`                                                        |
-| `config.seed_size`                   | The number of seed nodes used to bootstrap new clients joining the cluster.                            | `2` |
-| `config.seeds`                       | The comma-separated list of seed nodes.         | Automatically generated according to `.Release.Name` and `config.seed_size` |
-| `config.num_tokens`                  | Initdb Arguments                                | `256`                                                      |
-| `config.dc_name`                     | Initdb Arguments                                | `DC1`                                                      |
-| `config.rack_name`                   | Initdb Arguments                                | `RAC1`                                                     |
-| `config.endpoint_snitch`             | Initdb Arguments                                | `SimpleSnitch`                                             |
-| `config.max_heap_size`               | Initdb Arguments                                | `2048M`                                                    |
-| `config.heap_new_size`               | Initdb Arguments                                | `512M`                                                     |
-| `config.ports.cql`                   | Initdb Arguments                                | `9042`                                                     |
-| `config.ports.thrift`                | Initdb Arguments                                | `9160`                                                     |
-| `config.ports.agent`                 | The port of the JVM Agent (if any)              | `nil`                                                      |
-| `config.start_rpc`                   | Initdb Arguments                                | `false`                                                    |
-| `configOverrides`                    | Overrides config files in /etc/cassandra dir    | `{}`                                                       |
-| `commandOverrides`                   | Overrides default docker command                | `[]`                                                       |
-| `argsOverrides`                      | Overrides default docker args                   | `[]`                                                       |
-| `env`                                | Custom env variables                            | `{}`                                                       |
-| `persistence.enabled`                | Use a PVC to persist data                       | `true`                                                     |
-| `persistence.storageClass`           | Storage class of backing PVC                    | `nil` (uses alpha storage class annotation)                |
-| `persistence.accessMode`             | Use volume as ReadOnly or ReadWrite             | `ReadWriteOnce`                                            |
-| `persistence.size`                   | Size of data volume                             | `10Gi`                                                     |
-| `resources`                          | CPU/Memory resource requests/limits             | Memory: `4Gi`, CPU: `2`                                    |
-| `service.type`                       | k8s service type exposing ports, e.g. `NodePort`| `ClusterIP`                                                |
-| `podManagementPolicy`                | podManagementPolicy of the StatefulSet          | `OrderedReady`                                             |
-| `podDisruptionBudget`                | Pod distruption budget                          | `{}`                                                       |
-| `podAnnotations`                     | pod annotations for the StatefulSet             | `{}`                                                       |
-| `updateStrategy.type`                | UpdateStrategy of the StatefulSet               | `OnDelete`                                                 |
-| `livenessProbe.initialDelaySeconds`  | Delay before liveness probe is initiated        | `90`                                                       |
-| `livenessProbe.periodSeconds`        | How often to perform the probe                  | `30`                                                       |
-| `livenessProbe.timeoutSeconds`       | When the probe times out                        | `5`                                                        |
-| `livenessProbe.successThreshold`     | Minimum consecutive successes for the probe to be considered successful after having failed.           | `1` |
-| `livenessProbe.failureThreshold`     | Minimum consecutive failures for the probe to be considered failed after having succeeded.             | `3` |
-| `readinessProbe.initialDelaySeconds` | Delay before readiness probe is initiated       | `90`                                                       |
-| `readinessProbe.periodSeconds`       | How often to perform the probe                  | `30`                                                       |
-| `readinessProbe.timeoutSeconds`      | When the probe times out                        | `5`                                                        |
-| `readinessProbe.successThreshold`    | Minimum consecutive successes for the probe to be considered successful after having failed.           | `1` |
-| `readinessProbe.failureThreshold`    | Minimum consecutive failures for the probe to be considered failed after having succeeded.             | `3` |
-| `rbac.create`                        | Specifies whether RBAC resources should be created                                                  | `true` |
-| `serviceAccount.create`              | Specifies whether a ServiceAccount should be created                                                | `true` |
-| `serviceAccount.name`                | The name of the ServiceAccount to use           |                                                            |
-| `backup.enabled`                     | Enable backup on chart installation             | `false`                                                    |
-| `backup.schedule`                    | Keyspaces to backup, each with cron time        |                                                            |
-| `backup.annotations`                 | Backup pod annotations                          | iam.amazonaws.com/role: `cain`                             |
-| `backup.image.repo`                  | Backup image repository                         | `nuvo/cain`                                                |
-| `backup.image.tag`                   | Backup image tag                                | `0.4.1`                                                    |
-| `backup.extraArgs`                   | Additional arguments for cain                   | `[]`                                                       |
-| `backup.env`                         | Backup environment variables                    | AWS_REGION: `us-east-1`                                    |
-| `backup.resources`                   | Backup CPU/Memory resource requests/limits      | Memory: `1Gi`, CPU: `1`                                    |
-| `backup.destination`                 | Destination to store backup artifacts           | `s3://bucket/cassandra`                                    |
-| `exporter.enabled`                   | Enable Cassandra exporter                       | `false`                                                    |
-| `exporter.image.repo`                | Exporter image repository                       | `criteord/cassandra_exporter`                              |
-| `exporter.image.tag`                 | Exporter image tag                              | `2.0.2`                                                    |
-| `exporter.port`                      | Exporter port                                   | `5556`                                                     |
-| `exporter.jvmOpts`                   | Exporter additional JVM options                 |                                                            |
-| `affinity`                           | Kubernetes node affinity                        | `{}`                                                       |
-| `tolerations`                        | Kubernetes node tolerations                     | `[]`                                                       |
-
-
-## Scale cassandra
-When you want to change the cluster size of your cassandra, you can use the helm upgrade command.
-
-```bash
-helm upgrade --set config.cluster_size=5 cassandra incubator/cassandra
-```
-
-## Get cassandra status
-You can get your cassandra cluster status by running the command
-
-```bash
-kubectl exec -it --namespace cassandra $(kubectl get pods --namespace cassandra -l app=cassandra-cassandra -o jsonpath='{.items[0].metadata.name}') nodetool status
-```
-
-Output
-```bash
-Datacenter: asia-east1
-======================
-Status=Up/Down
-|/ State=Normal/Leaving/Joining/Moving
---  Address    Load       Tokens       Owns (effective)  Host ID                               Rack
-UN  10.8.1.11  108.45 KiB  256          66.1%             410cc9da-8993-4dc2-9026-1dd381874c54  a
-UN  10.8.4.12  84.08 KiB  256          68.7%             96e159e1-ef94-406e-a0be-e58fbd32a830  c
-UN  10.8.3.6   103.07 KiB  256          65.2%             1a42b953-8728-4139-b070-b855b8fff326  b
-```
-
-## Benchmark
-You can use [cassandra-stress](https://docs.datastax.com/en/cassandra/3.0/cassandra/tools/toolsCStress.html) tool to run the benchmark on the cluster by the following command
-
-```bash
-kubectl exec -it --namespace cassandra $(kubectl get pods --namespace cassandra -l app=cassandra-cassandra -o jsonpath='{.items[0].metadata.name}') cassandra-stress
-```
-
-Example of `cassandra-stress` argument
- - Run both read and write with ration 9:1
- - Operator total 1 million keys with uniform distribution
- - Use QUORUM for read/write
- - Generate 50 threads
- - Generate result in graph
- - Use NetworkTopologyStrategy with replica factor 2
-
-```bash
-cassandra-stress mixed ratio\(write=1,read=9\) n=1000000 cl=QUORUM -pop dist=UNIFORM\(1..1000000\) -mode native cql3 -rate threads=50 -log file=~/mixed_autorate_r9w1_1M.log -graph file=test2.html title=test revision=test2 -schema "replication(strategy=NetworkTopologyStrategy, factor=2)"
-```
diff --git a/ric-infra/30-Kong/helm/kong/charts/kong/charts/cassandra/sample/create-storage-gce.yaml b/ric-infra/30-Kong/helm/kong/charts/kong/charts/cassandra/sample/create-storage-gce.yaml
deleted file mode 100755 (executable)
index 2467b95..0000000
+++ /dev/null
@@ -1,7 +0,0 @@
-kind: StorageClass
-apiVersion: storage.k8s.io/v1
-metadata:
-  name: generic
-provisioner: kubernetes.io/gce-pd
-parameters:
-  type: pd-ssd
diff --git a/ric-infra/30-Kong/helm/kong/charts/kong/charts/cassandra/templates/NOTES.txt b/ric-infra/30-Kong/helm/kong/charts/kong/charts/cassandra/templates/NOTES.txt
deleted file mode 100755 (executable)
index 9ecb004..0000000
+++ /dev/null
@@ -1,35 +0,0 @@
-Cassandra CQL can be accessed via port {{ .Values.config.ports.cql }} on the following DNS name from within your cluster:
-Cassandra Thrift can be accessed via port {{ .Values.config.ports.thrift }} on the following DNS name from within your cluster:
-
-If you want to connect to the remote instance with your local Cassandra CQL cli. To forward the API port to localhost:9042 run the following:
-- kubectl port-forward --namespace {{ .Release.Namespace }} $(kubectl get pods --namespace {{ .Release.Namespace }} -l app={{ template "cassandra.name" . }},release={{ .Release.Name }} -o jsonpath='{ .items[0].metadata.name }') 9042:{{ .Values.config.ports.cql }}
-
-If you want to connect to the Cassandra CQL run the following:
-{{- if contains "NodePort" .Values.service.type }}
-- export CQL_PORT=$(kubectl get --namespace {{ .Release.Namespace }} -o jsonpath="{.spec.ports[0].nodePort}" services {{ template "cassandra.fullname" . }})
-- export CQL_HOST=$(kubectl get nodes --namespace {{ .Release.Namespace }} -o jsonpath="{.items[0].status.addresses[0].address}")
-- cqlsh $CQL_HOST $CQL_PORT
-
-{{- else if contains "LoadBalancer" .Values.service.type }}
-  NOTE: It may take a few minutes for the LoadBalancer IP to be available.
-        Watch the status with: 'kubectl get svc --namespace {{ .Release.Namespace }} -w {{ template "cassandra.fullname" . }}'
-- export SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ template "cassandra.fullname" . }} -o jsonpath='{.status.loadBalancer.ingress[0].ip}')
-- echo cqlsh $SERVICE_IP
-{{- else if contains "ClusterIP" .Values.service.type }}
-- kubectl port-forward --namespace {{ .Release.Namespace }} $(kubectl get pods --namespace {{ .Release.Namespace }} -l "app={{ template "cassandra.name" . }},release={{ .Release.Name }}" -o jsonpath="{.items[0].metadata.name}") 9042:{{ .Values.config.ports.cql }}
-  echo cqlsh 127.0.0.1 9042
-{{- end }}
-
-You can also see the cluster status by run the following:
-- kubectl exec -it --namespace {{ .Release.Namespace }} $(kubectl get pods --namespace {{ .Release.Namespace }} -l app={{ template "cassandra.name" . }},release={{ .Release.Name }} -o jsonpath='{.items[0].metadata.name}') nodetool status
-
-To tail the logs for the Cassandra pod run the following:
-- kubectl logs -f --namespace {{ .Release.Namespace }} $(kubectl get pods --namespace {{ .Release.Namespace }} -l app={{ template "cassandra.name" . }},release={{ .Release.Name }} -o jsonpath='{ .items[0].metadata.name }')
-
-{{- if not .Values.persistence.enabled }}
-
-Note that the cluster is running with node-local storage instead of PersistentVolumes. In order to prevent data loss,
-pods will be decommissioned upon termination. Decommissioning may take some time, so you might also want to adjust the
-pod termination gace period, which is currently set to {{ .Values.podSettings.terminationGracePeriodSeconds }} seconds.
-
-{{- end}}
diff --git a/ric-infra/30-Kong/helm/kong/charts/kong/charts/cassandra/templates/_helpers.tpl b/ric-infra/30-Kong/helm/kong/charts/kong/charts/cassandra/templates/_helpers.tpl
deleted file mode 100755 (executable)
index b870420..0000000
+++ /dev/null
@@ -1,43 +0,0 @@
-{{/* vim: set filetype=mustache: */}}
-{{/*
-Expand the name of the chart.
-*/}}
-{{- define "cassandra.name" -}}
-{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" -}}
-{{- 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 "cassandra.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 "-" -}}
-{{- end -}}
-{{- end -}}
-{{- end -}}
-
-{{/*
-Create chart name and version as used by the chart label.
-*/}}
-{{- define "cassandra.chart" -}}
-{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" -}}
-{{- end -}}
-
-{{/*
-Create the name of the service account to use
-*/}}
-{{- define "cassandra.serviceAccountName" -}}
-{{- if .Values.serviceAccount.create -}}
-    {{ default (include "cassandra.fullname" .) .Values.serviceAccount.name }}
-{{- else -}}
-    {{ default "default" .Values.serviceAccount.name }}
-{{- end -}}
-{{- end -}}
diff --git a/ric-infra/30-Kong/helm/kong/charts/kong/charts/cassandra/templates/backup/cronjob.yaml b/ric-infra/30-Kong/helm/kong/charts/kong/charts/cassandra/templates/backup/cronjob.yaml
deleted file mode 100755 (executable)
index fdf6282..0000000
+++ /dev/null
@@ -1,73 +0,0 @@
-{{- if .Values.backup.enabled }}
-{{- $release := .Release }}
-{{- $values := .Values }}
-{{- $backup := $values.backup }}
-{{- range $index, $schedule := $backup.schedule }}
----
-apiVersion: batch/v1beta1
-kind: CronJob
-metadata:
-  name: {{ template "cassandra.fullname" $ }}-backup-{{ $schedule.keyspace | replace "_" "-" }}
-  labels:
-    app: {{ template "cassandra.name" $ }}-cain
-    chart: {{ template "cassandra.chart" $ }}
-    release: "{{ $release.Name }}"
-    heritage: "{{ $release.Service }}"
-spec:
-  schedule: {{ $schedule.cron | quote }}
-  concurrencyPolicy: Forbid
-  startingDeadlineSeconds: 120
-  jobTemplate:
-    spec:
-      template:
-        metadata:
-          annotations:
-            {{ toYaml $backup.annotations }}
-        spec:
-          restartPolicy: OnFailure
-          serviceAccountName: {{ template "cassandra.serviceAccountName" $ }}
-          containers:
-          - name: cassandra-backup
-            image: "{{ $backup.image.repos }}:{{ $backup.image.tag }}"
-            command: ["cain"]
-            args:
-            - backup
-            - --namespace
-            - {{ $release.Namespace }}
-            - --selector
-            - release={{ $release.Name }},app={{ template "cassandra.name" $ }}
-            - --keyspace
-            - {{ $schedule.keyspace }}
-            - --dst
-            - {{ $backup.destination }}
-            {{- with $backup.extraArgs }}
-{{ toYaml . | indent 12 }}
-          {{- end }}
-          {{- with $backup.env }}
-            env:
-{{ toYaml . | indent 12 }}
-          {{- end }}
-          {{- with $backup.resources }}
-            resources:
-{{ toYaml . | indent 14 }}
-          {{- end }}
-        affinity:
-          podAffinity:
-            preferredDuringSchedulingIgnoredDuringExecution:
-            - labelSelector:
-                matchExpressions:
-                - key: app
-                  operator: In
-                  values:
-                  - {{ template "cassandra.fullname" $ }}
-                - key: release
-                  operator: In
-                  values:
-                  - {{ $release.Name }}
-              topologyKey: "kubernetes.io/hostname"
-      {{- with $values.tolerations }}
-        tolerations:
-{{ toYaml . | indent 10 }}
-      {{- end }}
-{{- end }}
-{{- end }}
diff --git a/ric-infra/30-Kong/helm/kong/charts/kong/charts/cassandra/templates/backup/rbac.yaml b/ric-infra/30-Kong/helm/kong/charts/kong/charts/cassandra/templates/backup/rbac.yaml
deleted file mode 100755 (executable)
index 12b0f27..0000000
+++ /dev/null
@@ -1,50 +0,0 @@
-{{- if .Values.backup.enabled }}
-{{- if .Values.serviceAccount.create }}
-apiVersion: v1
-kind: ServiceAccount
-metadata:
-  name: {{ template "cassandra.serviceAccountName" . }}
-  labels:
-    app: {{ template "cassandra.name" . }}
-    chart: {{ template "cassandra.chart" . }}
-    release: "{{ .Release.Name }}"
-    heritage: "{{ .Release.Service }}"
----
-{{- end }}
-{{- if .Values.rbac.create }}
-apiVersion: rbac.authorization.k8s.io/v1
-kind: Role
-metadata:
-  name: {{ template "cassandra.fullname" . }}-backup
-  labels:
-    app: {{ template "cassandra.name" . }}
-    chart: {{ template "cassandra.chart" . }}
-    release: "{{ .Release.Name }}"
-    heritage: "{{ .Release.Service }}"
-rules:
-- apiGroups: [""]
-  resources: ["pods", "pods/log"]
-  verbs: ["get", "list"]
-- apiGroups: [""]
-  resources: ["pods/exec"]
-  verbs: ["create"]
----
-apiVersion: rbac.authorization.k8s.io/v1
-kind: RoleBinding
-metadata:
-  name: {{ template "cassandra.fullname" . }}-backup
-  labels:
-    app: {{ template "cassandra.name" . }}
-    chart: {{ template "cassandra.chart" . }}
-    release: "{{ .Release.Name }}"
-    heritage: "{{ .Release.Service }}"
-roleRef:
-  apiGroup: rbac.authorization.k8s.io
-  kind: Role
-  name: {{ template "cassandra.fullname" . }}-backup
-subjects:
-- kind: ServiceAccount
-  name: {{ template "cassandra.serviceAccountName" . }}
-  namespace: {{ .Release.Namespace }}
-{{- end }}
-{{- end }}
diff --git a/ric-infra/30-Kong/helm/kong/charts/kong/charts/cassandra/templates/configmap.yaml b/ric-infra/30-Kong/helm/kong/charts/kong/charts/cassandra/templates/configmap.yaml
deleted file mode 100755 (executable)
index 4e5ab76..0000000
+++ /dev/null
@@ -1,14 +0,0 @@
-{{- if .Values.configOverrides }}
-kind: ConfigMap
-apiVersion: v1
-metadata:
-  name: {{ template "cassandra.name" . }}
-  namespace: {{ .Release.Namespace }}
-  labels:
-    app: {{ template "cassandra.name" . }}
-    chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
-    release: {{ .Release.Name }}
-    heritage: {{ .Release.Service }}
-data:
-{{ toYaml .Values.configOverrides | indent 2 }}
-{{- end }}
diff --git a/ric-infra/30-Kong/helm/kong/charts/kong/charts/cassandra/templates/pdb.yaml b/ric-infra/30-Kong/helm/kong/charts/kong/charts/cassandra/templates/pdb.yaml
deleted file mode 100755 (executable)
index 2e539bd..0000000
+++ /dev/null
@@ -1,17 +0,0 @@
-{{- if .Values.podDisruptionBudget -}}
-apiVersion: policy/v1beta1
-kind: PodDisruptionBudget
-metadata:
-  labels:
-    app: {{ template "cassandra.name" . }}
-    chart: {{ .Chart.Name }}-{{ .Chart.Version }}
-    heritage: {{ .Release.Service }}
-    release: {{ .Release.Name }}
-  name: {{ template "cassandra.fullname" . }}
-spec:
-  selector:
-    matchLabels:
-      app: {{ template "cassandra.name" . }}
-      release: {{ .Release.Name }}
-{{ toYaml .Values.podDisruptionBudget | indent 2 }}
-{{- end -}}
diff --git a/ric-infra/30-Kong/helm/kong/charts/kong/charts/cassandra/templates/service.yaml b/ric-infra/30-Kong/helm/kong/charts/kong/charts/cassandra/templates/service.yaml
deleted file mode 100755 (executable)
index cf7f94b..0000000
+++ /dev/null
@@ -1,36 +0,0 @@
-apiVersion: v1
-kind: Service
-metadata:
-  name: {{ template "cassandra.fullname" . }}
-  labels:
-    app: {{ template "cassandra.name" . }}
-    chart: {{ template "cassandra.chart" . }}
-    release: {{ .Release.Name }}
-    heritage: {{ .Release.Service }}
-spec:
-  clusterIP: None
-  type: {{ .Values.service.type }}
-  ports:
-  - name: intra
-    port: 7000
-    targetPort: 7000
-  - name: tls
-    port: 7001
-    targetPort: 7001
-  - name: jmx
-    port: 7199
-    targetPort: 7199
-  - name: cql
-    port: {{ default 9042 .Values.config.ports.cql }}
-    targetPort: {{ default 9042 .Values.config.ports.cql }}
-  - name: thrift
-    port: {{ default 9160 .Values.config.ports.thrift }}
-    targetPort: {{ default 9160 .Values.config.ports.thrift }}
-  {{- if .Values.config.ports.agent }}
-  - name: agent
-    port: {{ .Values.config.ports.agent }}
-    targetPort: {{ .Values.config.ports.agent }}
-  {{- end }}
-  selector:
-    app: {{ template "cassandra.name" . }}
-    release: {{ .Release.Name }}
diff --git a/ric-infra/30-Kong/helm/kong/charts/kong/charts/cassandra/templates/statefulset.yaml b/ric-infra/30-Kong/helm/kong/charts/kong/charts/cassandra/templates/statefulset.yaml
deleted file mode 100755 (executable)
index c691597..0000000
+++ /dev/null
@@ -1,200 +0,0 @@
-apiVersion: apps/v1
-kind: StatefulSet
-metadata:
-  name: {{ template "cassandra.fullname" . }}
-  labels:
-    app: {{ template "cassandra.name" . }}
-    chart: {{ template "cassandra.chart" . }}
-    release: {{ .Release.Name }}
-    heritage: {{ .Release.Service }}
-spec:
-  selector:
-    matchLabels:
-      app: {{ template "cassandra.name" . }}
-      release: {{ .Release.Name }}
-  serviceName: {{ template "cassandra.fullname" . }}
-  replicas: {{ .Values.config.cluster_size }}
-  podManagementPolicy: {{ .Values.podManagementPolicy }}
-  updateStrategy:
-    type: {{ .Values.updateStrategy.type }}
-  template:
-    metadata:
-      labels:
-        app: {{ template "cassandra.name" . }}
-        release: {{ .Release.Name }}
-{{- if .Values.podLabels }}
-{{ toYaml .Values.podLabels | indent 8 }}
-{{- end }}
-{{- if .Values.podAnnotations }}
-      annotations:
-{{ toYaml .Values.podAnnotations | indent 8 }}
-{{- end }}
-    spec:
-      hostNetwork: {{ .Values.hostNetwork }}
-{{- if .Values.selector }}
-{{ toYaml .Values.selector | indent 6 }}
-{{- end }}
-      {{- if .Values.securityContext.enabled }}
-      securityContext:
-        fsGroup: {{ .Values.securityContext.fsGroup }}
-        runAsUser: {{ .Values.securityContext.runAsUser }}
-      {{- end }}
-{{- if .Values.affinity }}
-      affinity:
-{{ toYaml .Values.affinity | indent 8 }}
-{{- end }}
-{{- if .Values.tolerations }}
-      tolerations:
-{{ toYaml .Values.tolerations | indent 8 }}
-{{- end }}
-      containers:
-{{- if .Values.exporter.enabled }}
-      - name: cassandra-exporter
-        image: "{{ .Values.exporter.image.repo }}:{{ .Values.exporter.image.tag }}"
-        env:
-          - name: CASSANDRA_EXPORTER_CONFIG_listenPort
-            value: {{ .Values.exporter.port | quote }}
-          - name: JVM_OPTS
-            value: {{ .Values.exporter.jvmOpts | quote }}
-        ports:
-          - name: metrics
-            containerPort: {{ .Values.exporter.port }}
-            protocol: TCP
-          - name: jmx
-            containerPort: 5555
-        livenessProbe:
-          tcpSocket:
-            port: {{ .Values.exporter.port }}
-        readinessProbe:
-          httpGet:
-            path: /metrics
-            port: {{ .Values.exporter.port }}
-          initialDelaySeconds: 20
-          timeoutSeconds: 45
-{{- end }}
-      - name: {{ template "cassandra.fullname" . }}
-        image: "{{ .Values.image.repo }}:{{ .Values.image.tag }}"
-        imagePullPolicy: {{ .Values.image.pullPolicy | quote }}
-{{- if .Values.commandOverrides }}
-        command: {{ .Values.commandOverrides }}
-{{- end }}
-{{- if .Values.argsOverrides }}
-        args: {{ .Values.argsOverrides }}
-{{- end }}
-        resources:
-{{ toYaml .Values.resources | indent 10 }}
-        env:
-        {{- $seed_size := default 1 .Values.config.seed_size | int -}}
-        {{- $global := . }}
-        - name: CASSANDRA_SEEDS
-          {{- if .Values.hostNetwork }}
-          value: {{ required "You must fill \".Values.config.seeds\" with list of Cassandra seeds when hostNetwork is set to true" .Values.config.seeds | quote }}
-          {{- else }}
-          value: "{{- range $i, $e := until $seed_size }}{{ template "cassandra.fullname" $global }}-{{ $i }}.{{ template "cassandra.fullname" $global }}.{{ $global.Release.Namespace }}.svc.{{ $global.Values.config.cluster_domain }}{{- if (lt ( add1 $i ) $seed_size ) }},{{- end }}{{- end }}"
-          {{- end }}     
-        - name: MAX_HEAP_SIZE
-          value: {{ default "8192M" .Values.config.max_heap_size | quote }}
-        - name: HEAP_NEWSIZE
-          value: {{ default "200M" .Values.config.heap_new_size | quote }}
-        - name: CASSANDRA_ENDPOINT_SNITCH
-          value: {{ default "SimpleSnitch" .Values.config.endpoint_snitch | quote }}
-        - name: CASSANDRA_CLUSTER_NAME
-          value: {{ default "Cassandra" .Values.config.cluster_name | quote }}
-        - name: CASSANDRA_DC
-          value: {{ default "DC1" .Values.config.dc_name | quote }}
-        - name: CASSANDRA_RACK
-          value: {{ default "RAC1" .Values.config.rack_name | quote }}
-        - name: CASSANDRA_START_RPC
-          value: {{ default "false" .Values.config.start_rpc | quote }}
-        - name: POD_IP
-          valueFrom:
-            fieldRef:
-              fieldPath: status.podIP
-        {{- range $key, $value := .Values.env }}
-        - name: {{ $key | quote }}
-          value: {{ $value | quote }}
-        {{- end }}
-        livenessProbe:
-          exec:
-            command: [ "/bin/sh", "-c", "nodetool status" ]
-          initialDelaySeconds: {{ .Values.livenessProbe.initialDelaySeconds }}
-          periodSeconds: {{ .Values.livenessProbe.periodSeconds }}
-          timeoutSeconds: {{ .Values.livenessProbe.timeoutSeconds }}
-          successThreshold: {{ .Values.livenessProbe.successThreshold }}
-          failureThreshold: {{ .Values.livenessProbe.failureThreshold }}
-        readinessProbe:
-          exec:
-            command: [ "/bin/sh", "-c", "nodetool status | grep -E \"^UN\\s+${POD_IP}\"" ]
-          initialDelaySeconds: {{ .Values.readinessProbe.initialDelaySeconds }}
-          periodSeconds: {{ .Values.readinessProbe.periodSeconds }}
-          timeoutSeconds: {{ .Values.readinessProbe.timeoutSeconds }}
-          successThreshold: {{ .Values.readinessProbe.successThreshold }}
-          failureThreshold: {{ .Values.readinessProbe.failureThreshold }}
-        ports:
-        - name: intra
-          containerPort: 7000
-        - name: tls
-          containerPort: 7001
-        - name: jmx
-          containerPort: 7199
-        - name: cql
-          containerPort: {{ default 9042 .Values.config.ports.cql }}
-        - name: thrift
-          containerPort: {{ default 9160 .Values.config.ports.thrift }}
-        {{- if .Values.config.ports.agent }}
-        - name: agent
-          containerPort: {{ .Values.config.ports.agent }}
-        {{- end }}
-        volumeMounts:
-        - name: data
-          mountPath: /var/lib/cassandra
-{{- range $key, $value := .Values.configOverrides }}
-        - name: cassandra-config-{{ $key | replace "." "-" }}
-          mountPath: /etc/cassandra/{{ $key }}
-          subPath: {{ $key }}
-{{- end }}
-        {{- if not .Values.persistence.enabled }}
-        lifecycle:
-          preStop:
-            exec:
-              command: ["/bin/sh", "-c", "exec nodetool decommission"]
-        {{- end }}
-      terminationGracePeriodSeconds: {{ default 30 .Values.podSettings.terminationGracePeriodSeconds }}
-      {{- if .Values.image.pullSecrets }}
-      imagePullSecrets:
-        - name: {{ .Values.image.pullSecrets }}
-      {{- end }}
-{{- if or .Values.configOverrides (not .Values.persistence.enabled) }}
-      volumes:
-{{- end }}
-{{- range $key, $value := .Values.configOverrides }}
-      - configMap:
-          name: cassandra
-        name: cassandra-config-{{ $key | replace "." "-" }}
-{{- end }}
-{{- if not .Values.persistence.enabled }}
-      - name: data
-        emptyDir: {}
-{{- else }}
-  volumeClaimTemplates:
-  - metadata:
-      name: data
-      labels:
-        app: {{ template "cassandra.name" . }}
-        chart: {{ template "cassandra.chart" . }}
-        release: {{ .Release.Name }}
-        heritage: {{ .Release.Service }}
-    spec:
-      accessModes:
-        - {{ .Values.persistence.accessMode | quote }}
-      resources:
-        requests:
-          storage: {{ .Values.persistence.size | quote }}
-    {{- if .Values.persistence.storageClass }}
-    {{- if (eq "-" .Values.persistence.storageClass) }}
-      storageClassName: ""
-    {{- else }}
-      storageClassName: "{{ .Values.persistence.storageClass }}"
-    {{- end }}
-    {{- end }}
-{{- end }}
diff --git a/ric-infra/30-Kong/helm/kong/charts/kong/charts/cassandra/values.yaml b/ric-infra/30-Kong/helm/kong/charts/kong/charts/cassandra/values.yaml
deleted file mode 100755 (executable)
index 6bfae65..0000000
+++ /dev/null
@@ -1,209 +0,0 @@
-## Cassandra image version
-## ref: https://hub.docker.com/r/library/cassandra/
-image:
-  repo: cassandra
-  tag: 3.11.3
-  pullPolicy: IfNotPresent
-  ## Specify ImagePullSecrets for Pods
-  ## ref: https://kubernetes.io/docs/concepts/containers/images/#specifying-imagepullsecrets-on-a-pod
-  # pullSecrets: myregistrykey
-
-## Specify a service type
-## ref: http://kubernetes.io/docs/user-guide/services/
-service:
-  type: ClusterIP
-
-## Persist data to a persistent volume
-persistence:
-  enabled: true
-  ## cassandra data Persistent Volume Storage Class
-  ## If defined, storageClassName: <storageClass>
-  ## If set to "-", storageClassName: "", which disables dynamic provisioning
-  ## If undefined (the default) or set to null, no storageClassName spec is
-  ##   set, choosing the default provisioner.  (gp2 on AWS, standard on
-  ##   GKE, AWS & OpenStack)
-  ##
-  # storageClass: "-"
-  accessMode: ReadWriteOnce
-  size: 10Gi
-
-## Configure resource requests and limits
-## ref: http://kubernetes.io/docs/user-guide/compute-resources/
-## Minimum memory for development is 4GB and 2 CPU cores
-## Minimum memory for production is 8GB and 4 CPU cores
-## ref: http://docs.datastax.com/en/archived/cassandra/2.0/cassandra/architecture/architecturePlanningHardware_c.html
-resources: {}
-  # requests:
-  #   memory: 4Gi
-  #   cpu: 2
-  # limits:
-  #   memory: 4Gi
-  #   cpu: 2
-
-## Change cassandra configuration parameters below:
-## ref: http://docs.datastax.com/en/cassandra/3.0/cassandra/configuration/configCassandra_yaml.html
-## Recommended max heap size is 1/2 of system memory
-## Recommended heap new size is 1/4 of max heap size
-## ref: http://docs.datastax.com/en/cassandra/3.0/cassandra/operations/opsTuneJVM.html
-config:
-  cluster_domain: cluster.local
-  cluster_name: cassandra
-  cluster_size: 3
-  seed_size: 2
-  num_tokens: 256
-  # If you want Cassandra to use this datacenter and rack name,
-  # you need to set endpoint_snitch to GossipingPropertyFileSnitch.
-  # Otherwise, these values are ignored and datacenter1 and rack1
-  # are used.
-  dc_name: DC1
-  rack_name: RAC1
-  endpoint_snitch: SimpleSnitch
-  max_heap_size: 2048M
-  heap_new_size: 512M
-  start_rpc: false
-  ports:
-    cql: 9042
-    thrift: 9160
-    # If a JVM Agent is in place
-    # agent: 61621
-
-## Cassandra config files overrides
-configOverrides: {}
-
-## Cassandra docker command overrides
-commandOverrides: []
-
-## Cassandra docker args overrides
-argsOverrides: []
-
-## Custom env variables.
-## ref: https://hub.docker.com/_/cassandra/
-env: {}
-
-## Liveness and Readiness probe values.
-## ref: https://kubernetes.io/docs/tasks/configure-pod-container/configure-liveness-readiness-probes/
-livenessProbe:
-  initialDelaySeconds: 90
-  periodSeconds: 30
-  timeoutSeconds: 5
-  successThreshold: 1
-  failureThreshold: 3
-readinessProbe:
-  initialDelaySeconds: 90
-  periodSeconds: 30
-  timeoutSeconds: 5
-  successThreshold: 1
-  failureThreshold: 3
-
-## Configure node selector. Edit code below for adding selector to pods
-## ref: https://kubernetes.io/docs/user-guide/node-selection/
-# selector:
-  # nodeSelector:
-    # cloud.google.com/gke-nodepool: pool-db
-
-## Additional pod annotations
-## ref: https://kubernetes.io/docs/concepts/overview/working-with-objects/annotations/
-podAnnotations: {}
-
-## Additional pod labels
-## ref: https://kubernetes.io/docs/concepts/overview/working-with-objects/labels/
-podLabels: {}
-
-## Additional pod-level settings
-podSettings:
-  # Change this to give pods more time to properly leave the cluster when not using persistent storage.
-  terminationGracePeriodSeconds: 30
-
-## Pod distruption budget
-podDisruptionBudget: {}
-  # maxUnavailable: 1
-  # minAvailable: 2
-
-podManagementPolicy: OrderedReady
-updateStrategy:
-  type: OnDelete
-
-## Pod Security Context
-securityContext:
-  enabled: false
-  fsGroup: 999
-  runAsUser: 999
-
-## Affinity for pod assignment
-## Ref: https://kubernetes.io/docs/concepts/configuration/assign-pod-node/#affinity-and-anti-affinity
-affinity: {}
-
-## Node tolerations for pod assignment
-## Ref: https://kubernetes.io/docs/concepts/configuration/taint-and-toleration/
-tolerations: []
-
-rbac:
-  # Specifies whether RBAC resources should be created
-  create: true
-
-serviceAccount:
-  # Specifies whether a ServiceAccount should be created
-  create: true
-  # The name of the ServiceAccount to use.
-  # If not set and create is true, a name is generated using the fullname template
-  # name:
-
-# Use host network for Cassandra pods
-# You must pass seed list into config.seeds property if set to true
-hostNetwork: false
-
-## Backup cronjob configuration
-## Ref: https://github.com/nuvo/cain
-backup:
-  enabled: false
-
-  # Schedule to run jobs. Must be in cron time format
-  # Ref: https://crontab.guru/
-  schedule:
-  - keyspace: keyspace1
-    cron: "0 7 * * *"
-  - keyspace: keyspace2
-    cron: "30 7 * * *"
-
-  annotations:
-    # Example for authorization to AWS S3 using kube2iam
-    # Can also be done using environment variables
-    iam.amazonaws.com/role: cain
-
-  image:
-    repos: nuvo/cain
-    tag: 0.4.1
-
-  # Additional arguments for cain
-  # Ref: https://github.com/nuvo/cain#usage
-  extraArgs: []
-
-  # Add additional environment variables
-  env:
-  # Example environment variable required for AWS credentials chain
-  - name: AWS_REGION
-    value: us-east-1
-
-  resources:
-    requests:
-      memory: 1Gi
-      cpu: 1
-    limits:
-      memory: 1Gi
-      cpu: 1
-
-  # Destination to store the backup artifacts
-  # Supported cloud storage services: AWS S3, Minio S3, Azure Blob Storage
-  # Additional support can added. Visit this repository for details
-  # Ref: https://github.com/nuvo/skbn
-  destination: s3://bucket/cassandra
-
-## Cassandra exported configuration
-## ref: https://github.com/criteo/cassandra_exporter
-exporter:
-  enabled: false
-  image:
-    repo: criteord/cassandra_exporter
-    tag: 2.0.2
-  port: 5556
-  jvmOpts: ""
diff --git a/ric-infra/30-Kong/helm/kong/charts/kong/charts/postgresql/README.md b/ric-infra/30-Kong/helm/kong/charts/kong/charts/postgresql/README.md
deleted file mode 100755 (executable)
index 5bb0f07..0000000
+++ /dev/null
@@ -1,278 +0,0 @@
-# PostgreSQL
-
-[PostgreSQL](https://www.postgresql.org/) is an object-relational database management system (ORDBMS) with an emphasis on extensibility and on standards-compliance.
-
-## TL;DR;
-
-```console
-$ helm install stable/postgresql
-```
-
-## Introduction
-
-This chart bootstraps a [PostgreSQL](https://github.com/bitnami/bitnami-docker-postgresql) deployment on a [Kubernetes](http://kubernetes.io) cluster using the [Helm](https://helm.sh) package manager.
-
-Bitnami charts can be used with [Kubeapps](https://kubeapps.com/) for deployment and management of Helm Charts in clusters.
-
-## Prerequisites
-
-- Kubernetes 1.10+
-- PV provisioner support in the underlying infrastructure
-
-## Installing the Chart
-
-To install the chart with the release name `my-release`:
-
-```console
-$ helm install --name my-release stable/postgresql
-```
-
-The command deploys PostgreSQL on the Kubernetes cluster in the default configuration. The [configuration](#configuration) section lists the parameters that can be configured during installation.
-
-> **Tip**: List all releases using `helm list`
-
-## Uninstalling the Chart
-
-To uninstall/delete the `my-release` deployment:
-
-```console
-$ helm delete my-release
-```
-
-The command removes all the Kubernetes components associated with the chart and deletes the release.
-
-## Configuration
-
-The following tables lists the configurable parameters of the PostgreSQL chart and their default values.
-
-| Parameter                                     | Description                                                                                                            | Default                                                  |
-|-----------------------------------------------|------------------------------------------------------------------------------------------------------------------------|----------------------------------------------------------|
-| `global.imageRegistry`                        | Global Docker Image registry                                                                                           | `nil`                                                    |
-| `image.registry`                              | PostgreSQL Image registry                                                                                              | `docker.io`                                              |
-| `image.repository`                            | PostgreSQL Image name                                                                                                  | `bitnami/postgresql`                                     |
-| `image.tag`                                   | PostgreSQL Image tag                                                                                                   | `{VERSION}`                                              |
-| `image.pullPolicy`                            | PostgreSQL Image pull policy                                                                                           | `Always`                                                 |
-| `image.pullSecrets`                           | Specify Image pull secrets                                                                                             | `nil` (does not add image pull secrets to deployed pods) |
-| `image.debug`                                 | Specify if debug values should be set                                                                                  | `false`                                                  |
-| `volumePermissions.image.registry`            | Init container volume-permissions image registry                                                                       | `docker.io`                                              |
-| `volumePermissions.image.repository`          | Init container volume-permissions image name                                                                           | `bitnami/minideb`                                        |
-| `volumePermissions.image.tag`                 | Init container volume-permissions image tag                                                                            | `latest`                                                 |
-| `volumePermissions.image.pullPolicy`          | Init container volume-permissions image pull policy                                                                    | `Always`                                                 |
-| `volumePermissions.securityContext.runAsUser` | User ID for the init container                                                                                         | `0`                                                      |
-| `usePasswordFile`                             | Have the secrets mounted as a file instead of env vars                                                                 | `false`                                                  |
-| `replication.enabled`                         | Would you like to enable replication                                                                                   | `false`                                                  |
-| `replication.user`                            | Replication user                                                                                                       | `repl_user`                                              |
-| `replication.password`                        | Replication user password                                                                                              | `repl_password`                                          |
-| `replication.slaveReplicas`                   | Number of slaves replicas                                                                                              | `1`                                                      |
-| `replication.synchronousCommit`                   | Set synchronous commit mode. Allowed values: `on`, `remote_apply`, `remote_write`, `local` and `off`                                                                                              | `off`                                                      |
-| `replication.numSynchronousReplicas`                   | Number of replicas that will have synchronous replication. Note: Cannot be greater than `replication.slaveReplicas`.                                                                                              | `0`                                                      |
-| `replication.applicationName`                   | Cluster application name. Useful for advanced replication settings                                                                                              | `my_application`                                                      |
-| `existingSecret`                              | Name of existing secret to use for PostgreSQL passwords                                                                | `nil`                                                    |
-| `postgresqlUsername`                          | PostgreSQL admin user                                                                                                  | `postgres`                                               |
-| `postgresqlPassword`                          | PostgreSQL admin password                                                                                              | _random 10 character alphanumeric string_                |
-| `postgresqlDatabase`                          | PostgreSQL database                                                                                                    | `nil`                                                    |
-| `postgresqlConfiguration`                     | Runtime Config Parameters                                                                                              | `nil`                                                    |
-| `postgresqlExtendedConf`                      | Extended Runtime Config Parameters (appended to main or default configuration)                                         | `nil`                                                    |
-| `pgHbaConfiguration`                          | Content of pg\_hba.conf                                                                                                | `nil (do not create pg_hba.conf)`                        |
-| `configurationConfigMap`                      | ConfigMap with the PostgreSQL configuration files (Note: Overrides `postgresqlConfiguration` and `pgHbaConfiguration`) | `nil`                                                    |
-| `extendedConfConfigMap`                       | ConfigMap with the extended PostgreSQL configuration files                                                             | `nil`                                                    |
-| `initdbScripts`                               | List of initdb scripts                                                                                                 | `nil`                                                    |
-| `initdbScriptsConfigMap`                      | ConfigMap with the initdb scripts (Note: Overrides `initdbScripts`)                                                    | `nil`                                                    |
-| `service.type`                                | Kubernetes Service type                                                                                                | `ClusterIP`                                              |
-| `service.port`                                | PostgreSQL port                                                                                                        | `5432`                                                   |
-| `service.nodePort`                            | Kubernetes Service nodePort                                                                                            | `nil`                                                    |
-| `service.annotations`                         | Annotations for PostgreSQL service                                                                                     | {}                                                       |
-| `service.loadBalancerIP`                      | loadBalancerIP if service type is `LoadBalancer`                                                                       | `nil`                                                    |
-| `persistence.enabled`                         | Enable persistence using PVC                                                                                           | `true`                                                   |
-| `persistence.existingClaim`                   | Provide an existing `PersistentVolumeClaim`                                                                            | `nil`                                                    |
-| `persistence.mountPath`                       | Path to mount the volume at                                                                                            | `/bitnami/postgresql`                                    |
-| `persistence.storageClass`                    | PVC Storage Class for PostgreSQL volume                                                                                | `nil`                                                    |
-| `persistence.accessMode`                      | PVC Access Mode for PostgreSQL volume                                                                                  | `ReadWriteOnce`                                          |
-| `persistence.size`                            | PVC Storage Request for PostgreSQL volume                                                                              | `8Gi`                                                    |
-| `persistence.annotations`                     | Annotations for the PVC                                                                                                | `{}`                                                     |
-| `master.nodeSelector`                         | Node labels for pod assignment (postgresql master)                                                                     | `{}`                                                     |
-| `master.affinity`                             | Affinity labels for pod assignment (postgresql master)                                                                 | `{}`                                                     |
-| `master.tolerations`                          | Toleration labels for pod assignment (postgresql master)                                                               | `[]`                                                     |
-| `slave.nodeSelector`                          | Node labels for pod assignment (postgresql slave)                                                                      | `{}`                                                     |
-| `slave.affinity`                              | Affinity labels for pod assignment (postgresql slave)                                                                  | `{}`                                                     |
-| `slave.tolerations`                           | Toleration labels for pod assignment (postgresql slave)                                                                | `[]`                                                     |
-| `terminationGracePeriodSeconds`               | Seconds the pod needs to terminate gracefully                                                                          | `nil`                                                    |
-| `resources`                                   | CPU/Memory resource requests/limits                                                                                    | Memory: `256Mi`, CPU: `250m`                             |
-| `securityContext.enabled`                     | Enable security context                                                                                                | `true`                                                   |
-| `securityContext.fsGroup`                     | Group ID for the container                                                                                             | `1001`                                                   |
-| `securityContext.runAsUser`                   | User ID for the container                                                                                              | `1001`                                                   |
-| `livenessProbe.enabled`                       | Would you like a livessProbed to be enabled                                                                            | `true`                                                   |
-| `networkPolicy.enabled`                       | Enable NetworkPolicy                                                                                                   | `false`                                                  |
-| `networkPolicy.allowExternal`                 | Don't require client label for connections                                                                             | `true`                                                   |
-| `livenessProbe.initialDelaySeconds`           | Delay before liveness probe is initiated                                                                               | 30                                                       |
-| `livenessProbe.periodSeconds`                 | How often to perform the probe                                                                                         | 10                                                       |
-| `livenessProbe.timeoutSeconds`                | When the probe times out                                                                                               | 5                                                        |
-| `livenessProbe.failureThreshold`              | Minimum consecutive failures for the probe to be considered failed after having succeeded.                             | 6                                                        |
-| `livenessProbe.successThreshold`              | Minimum consecutive successes for the probe to be considered successful after having failed                            | 1                                                        |
-| `readinessProbe.enabled`                      | would you like a readinessProbe to be enabled                                                                          | `true`                                                   |
-| `readinessProbe.initialDelaySeconds`          | Delay before liveness probe is initiated                                                                               | 5                                                        |
-| `readinessProbe.periodSeconds`                | How often to perform the probe                                                                                         | 10                                                       |
-| `readinessProbe.timeoutSeconds`               | When the probe times out                                                                                               | 5                                                        |
-| `readinessProbe.failureThreshold`             | Minimum consecutive failures for the probe to be considered failed after having succeeded.                             | 6                                                        |
-| `readinessProbe.successThreshold`             | Minimum consecutive successes for the probe to be considered successful after having failed                            | 1                                                        |
-| `metrics.enabled`                             | Start a prometheus exporter                                                                                            | `false`                                                  |
-| `metrics.service.type`                        | Kubernetes Service type                                                                                                | `ClusterIP`                                              |
-| `service.clusterIP`                           | Static clusterIP or None for headless services                                                                         | `nil`                                                     |
-| `metrics.service.annotations`                 | Additional annotations for metrics exporter pod                                                                        | `{}`                                                     |
-| `metrics.service.loadBalancerIP`              | loadBalancerIP if redis metrics service type is `LoadBalancer`                                                         | `nil`                                                    |
-| `metrics.image.registry`                      | PostgreSQL Image registry                                                                                              | `docker.io`                                              |
-| `metrics.image.repository`                    | PostgreSQL Image name                                                                                                  | `wrouesnel/postgres_exporter`                            |
-| `metrics.image.tag`                           | PostgreSQL Image tag                                                                                                   | `{VERSION}`                                              |
-| `metrics.image.pullPolicy`                    | PostgreSQL Image pull policy                                                                                           | `IfNotPresent`                                           |
-| `metrics.image.pullSecrets`                   | Specify Image pull secrets                                                                                             | `nil` (does not add image pull secrets to deployed pods) |
-| `extraEnv`                                    | Any extra environment variables you would like to pass on to the pod                                                   | `{}`                                                     |
-| `updateStrategy`                              | Update strategy policy                                                                                                 | `{type: "onDelete"}`                                     |
-
-Specify each parameter using the `--set key=value[,key=value]` argument to `helm install`. For example,
-
-```console
-$ helm install --name my-release \
-  --set postgresqlPassword=secretpassword,postgresqlDatabase=my-database \
-    stable/postgresql
-```
-
-The above command sets the PostgreSQL `postgres` account password to `secretpassword`. Additionally it creates a database named `my-database`.
-
-Alternatively, a YAML file that specifies the values for the parameters can be provided while installing the chart. For example,
-
-```console
-$ helm install --name my-release -f values.yaml stable/postgresql
-```
-
-> **Tip**: You can use the default [values.yaml](values.yaml)
-
-### postgresql.conf / pg_hba.conf files as configMap
-
-This helm chart also supports to customize the whole configuration file.
-
-Add your custom file to "files/postgresql.conf" in your working directory. This file will be mounted as configMap to the containers and it will be used for configuring the PostgreSQL server.
-
-Alternatively, you can specify PostgreSQL configuration parameters using the `postgresqlConfiguration` parameter as a dict, using camelCase, e.g. {"sharedBuffers": "500MB"}.
-
-In addition to these options, you can also set an external ConfigMap with all the configuration files. This is done by setting the `configurationConfigMap` parameter. Note that this will override the two previous options.
-
-### Allow settings to be loaded from files other than the default `postgresql.conf`
-
-If you don't want to provide the whole PostgreSQL configuration file and only specify certain parameters, you can add your extended `.conf` files to "files/conf.d/" in your working directory.
-Those files will be mounted as configMap to the containers adding/overwriting the default configuration using the `include_dir` directive that allows settings to be loaded from files other than the default `postgresql.conf`.
-
-Alternatively, you can also set an external ConfigMap with all the extra configuration files. This is done by setting the `extendedConfConfigMap` parameter. Note that this will override the previous option.
-
-## Initialize a fresh instance
-
-The [Bitnami PostgreSQL](https://github.com/bitnami/bitnami-docker-postgresql) image allows you to use your custom scripts to initialize a fresh instance. In order to execute the scripts, they must be located inside the chart folder `files/docker-entrypoint-initdb.d` so they can be consumed as a ConfigMap.
-
-Alternatively, you can specify custom scripts using the `initdbScripts` parameter as dict.
-
-In addition to these options, you can also set an external ConfigMap with all the initialization scripts. This is done by setting the `initdbScriptsConfigMap` parameter. Note that this will override the two previous options.
-
-The allowed extensions are `.sh`, `.sql` and `.sql.gz`.
-
-## Production and horizontal scaling
-
-The following repo contains the recommended production settings for PostgreSQL server in an alternative [values file](values-production.yaml). Please read carefully the comments in the values-production.yaml file to set up your environment
-
-To horizontally scale this chart, first download the [values-production.yaml](values-production.yaml) file to your local folder, then:
-
-```console
-$ helm install --name my-release -f ./values-production.yaml stable/postgresql
-$ kubectl scale statefulset my-postgresql-slave --replicas=3
-```
-
-## Persistence
-
-The [Bitnami PostgreSQL](https://github.com/bitnami/bitnami-docker-postgresql) image stores the PostgreSQL data and configurations at the `/bitnami/postgresql` path of the container.
-
-Persistent Volume Claims are used to keep the data across deployments. This is known to work in GCE, AWS, and minikube.
-See the [Configuration](#configuration) section to configure the PVC or to disable persistence.
-
-## Metrics
-
-The chart optionally can start a metrics exporter for [prometheus](https://prometheus.io). The metrics endpoint (port 9187) is not exposed and it is expected that the metrics are collected from inside the k8s cluster using something similar as the described in the [example Prometheus scrape configuration](https://github.com/prometheus/prometheus/blob/master/documentation/examples/prometheus-kubernetes.yml).
-
-The exporter allows to create custom metrics from additional SQL queries. See the Chart's `values.yaml` for an example and consult the [exporters documentation](https://github.com/wrouesnel/postgres_exporter#adding-new-metrics-via-a-config-file) for more details.
-
-## NetworkPolicy
-
-To enable network policy for PostgreSQL, install [a networking plugin that implements the Kubernetes NetworkPolicy spec](https://kubernetes.io/docs/tasks/administer-cluster/declare-network-policy#before-you-begin), and set `networkPolicy.enabled` to `true`.
-
-For Kubernetes v1.5 & v1.6, you must also turn on NetworkPolicy by setting the DefaultDeny namespace annotation. Note: this will enforce policy for _all_ pods in the namespace:
-
-```console
-$ kubectl annotate namespace default "net.beta.kubernetes.io/network-policy={\"ingress\":{\"isolation\":\"DefaultDeny\"}}"
-```
-
-With NetworkPolicy enabled, traffic will be limited to just port 5432.
-
-For more precise policy, set `networkPolicy.allowExternal=false`. This will only allow pods with the generated client label to connect to PostgreSQL.
-This label will be displayed in the output of a successful install.
-
-## Upgrade
-
-### 3.0.0
-
-This releases make it possible to specify different nodeSelector, affinity and tolerations for master and slave pods.
-It also fixes an issue with `postgresql.master.fullname` helper template not obeying fullnameOverride.
-
-#### Breaking changes
-
-- `affinty` has been renamed to `master.affinity` and `slave.affinity`.
-- `tolerations` has been renamed to `master.tolerations` and `slave.tolerations`.
-- `nodeSelector` has been renamed to `master.nodeSelector` and `slave.nodeSelector`.
-
-### 2.0.0
-
-In order to upgrade from the `0.X.X` branch to `1.X.X`, you should follow the below steps:
-
- - Obtain the service name (`SERVICE_NAME`) and password (`OLD_PASSWORD`) of the existing postgresql chart. You can find the instructions to obtain the password in the NOTES.txt, the service name can be obtained by running
-
- ```console
-$ kubectl get svc
- ```
-
-- Install (not upgrade) the new version
-
-```console
-$ helm repo update
-$ helm install --name my-release stable/postgresql
-```
-
-- Connect to the new pod (you can obtain the name by running `kubectl get pods`):
-
-```console
-$ kubectl exec -it NAME bash
-```
-
-- Once logged in, create a dump file from the previous database using `pg_dump`, for that we should connect to the previous postgresql chart:
-
-```console
-$ pg_dump -h SERVICE_NAME -U postgres DATABASE_NAME > /tmp/backup.sql
-```
-
-After run above command you should be prompted for a password, this password is the previous chart password (`OLD_PASSWORD`).
-This operation could take some time depending on the database size.
-
-- Once you have the backup file, you can restore it with a command like the one below:
-
-```console
-$ psql -U postgres DATABASE_NAME < /tmp/backup.sql
-```
-
-In this case, you are accessing to the local postgresql, so the password should be the new one (you can find it in NOTES.txt).
-
-If you want to restore the database and the database schema does not exist, it is necessary to first follow the steps described below.
-
-```console
-$ psql -U postgres
-postgres=# drop database DATABASE_NAME;
-postgres=# create database DATABASE_NAME;
-postgres=# create user USER_NAME;
-postgres=# alter role USER_NAME with password 'BITNAMI_USER_PASSWORD';
-postgres=# grant all privileges on database DATABASE_NAME to USER_NAME;
-postgres=# alter database DATABASE_NAME owner to USER_NAME;
-```
diff --git a/ric-infra/30-Kong/helm/kong/charts/kong/charts/postgresql/templates/NOTES.txt b/ric-infra/30-Kong/helm/kong/charts/kong/charts/postgresql/templates/NOTES.txt
deleted file mode 100755 (executable)
index 41c2210..0000000
+++ /dev/null
@@ -1,60 +0,0 @@
-{{- if contains .Values.service.type "LoadBalancer" }}
-{{- if not .Values.postgresqlPassword }}
--------------------------------------------------------------------------------
- WARNING
-
-    By specifying "serviceType=LoadBalancer" and not specifying "postgresqlPassword"
-    you have most likely exposed the PostgreSQL service externally without any
-    authentication mechanism.
-
-    For security reasons, we strongly suggest that you switch to "ClusterIP" or
-    "NodePort". As an alternative, you can also specify a valid password on the
-    "postgresqlPassword" parameter.
-
--------------------------------------------------------------------------------
-{{- end }}
-{{- end }}
-
-** Please be patient while the chart is being deployed **
-
-PostgreSQL can be accessed via port 5432 on the following DNS name from within your cluster:
-
-    {{ template "postgresql.fullname" . }}.{{ .Release.Namespace }}.svc.cluster.local - Read/Write connection
-{{- if .Values.replication.enabled }}
-    {{ template "postgresql.fullname" . }}-read.{{ .Release.Namespace }}.svc.cluster.local - Read only connection
-{{- end }}
-To get the password for "{{ .Values.postgresqlUsername }}" run:
-
-    export POSTGRESQL_PASSWORD=$(kubectl get secret --namespace {{ .Release.Namespace }} {{ if .Values.existingSecret }}{{ .Values.existingSecret }}{{ else }}{{ template "postgresql.fullname" . }}{{ end }} -o jsonpath="{.data.postgresql-password}" | base64 --decode)
-
-To connect to your database run the following command:
-
-    kubectl run {{ template "postgresql.fullname" . }}-client --rm --tty -i --restart='Never' --namespace {{ .Release.Namespace }} --image bitnami/postgresql --env="PGPASSWORD=$POSTGRESQL_PASSWORD" {{- if and (.Values.networkPolicy.enabled) (not .Values.networkPolicy.allowExternal) }}
-   --labels="{{ template "postgresql.fullname" . }}-client=true" {{- end }} --command -- psql --host {{ template "postgresql.fullname" . }} -U {{ .Values.postgresqlUsername }}
-
-{{ if and (.Values.networkPolicy.enabled) (not .Values.networkPolicy.allowExternal) }}
-Note: Since NetworkPolicy is enabled, only pods with label {{ template "postgresql.fullname" . }}-client=true" will be able to connect to this PostgreSQL cluster.
-{{- end }}
-
-To connect to your database from outside the cluster execute the following commands:
-
-{{- if contains "NodePort" .Values.service.type }}
-
-    export NODE_IP=$(kubectl get nodes --namespace {{ .Release.Namespace }} -o jsonpath="{.items[0].status.addresses[0].address}")
-    export NODE_PORT=$(kubectl get --namespace {{ .Release.Namespace }} -o jsonpath="{.spec.ports[0].nodePort}" services {{ template "postgresql.fullname" . }})
-    {{ if .Values.postgresqlPassword }}PGPASSWORD="{{ .Values.postgresqlPassword}}" {{ end }}psql --host $NODE_IP --port $NODE_PORT -U {{ .Values.postgresqlUsername }}
-
-{{- else if contains "LoadBalancer" .Values.service.type }}
-
-  NOTE: It may take a few minutes for the LoadBalancer IP to be available.
-        Watch the status with: 'kubectl get svc --namespace {{ .Release.Namespace }} -w {{ template "postgresql.fullname" . }}'
-
-    export SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ template "postgresql.fullname" . }} --template "{{"{{ range (index .status.loadBalancer.ingress 0) }}{{.}}{{ end }}"}}")
-    {{ if .Values.postgresqlPassword }}PGPASSWORD="{{ .Values.postgresqlPassword}}" {{ end }}psql --host $SERVICE_IP --port {{ .Values.service.port }} -U {{ .Values.postgresqlUsername }}
-
-{{- else if contains "ClusterIP" .Values.service.type }}
-
-    kubectl port-forward --namespace {{ .Release.Namespace }} svc/{{ template "postgresql.fullname" . }} 5432:5432 &
-    {{ if .Values.postgresqlPassword }}PGPASSWORD="{{ .Values.postgresqlPassword}}" {{ end }}psql --host 127.0.0.1 -U {{ .Values.postgresqlUsername }}
-
-{{- end }}
diff --git a/ric-infra/30-Kong/helm/kong/charts/kong/charts/postgresql/templates/_helpers.tpl b/ric-infra/30-Kong/helm/kong/charts/kong/charts/postgresql/templates/_helpers.tpl
deleted file mode 100755 (executable)
index d179779..0000000
+++ /dev/null
@@ -1,152 +0,0 @@
-{{/* vim: set filetype=mustache: */}}
-{{/*
-Expand the name of the chart.
-*/}}
-{{- define "postgresql.name" -}}
-{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" -}}
-{{- 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).
-*/}}
-{{- define "postgresql.fullname" -}}
-{{- if .Values.fullnameOverride -}}
-{{- printf .Values.fullnameOverride | trunc 63 | trimSuffix "-" -}}
-{{- else -}}
-{{- $name := default .Chart.Name .Values.nameOverride -}}
-{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" -}}
-{{- end -}}
-{{- 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).
-*/}}
-{{- define "postgresql.master.fullname" -}}
-{{- $name := default .Chart.Name .Values.nameOverride -}}
-{{- $fullname := default (printf "%s-%s" .Release.Name $name) .Values.fullnameOverride -}}
-{{- if .Values.replication.enabled -}}
-{{- printf "%s-%s" $fullname "master" | trunc 63 | trimSuffix "-" -}}
-{{- else -}}
-{{- printf "%s" $fullname | trunc 63 | trimSuffix "-" -}}
-{{- end -}}
-{{- end -}}
-
-{{/*
-Return the appropriate apiVersion for networkpolicy.
-*/}}
-{{- define "postgresql.networkPolicy.apiVersion" -}}
-{{- if semverCompare ">=1.4-0, <1.7-0" .Capabilities.KubeVersion.GitVersion -}}
-"extensions/v1beta1"
-{{- else if semverCompare "^1.7-0" .Capabilities.KubeVersion.GitVersion -}}
-"networking.k8s.io/v1"
-{{- end -}}
-{{- end -}}
-
-{{/*
-Create chart name and version as used by the chart label.
-*/}}
-{{- define "postgresql.chart" -}}
-{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" -}}
-{{- end -}}
-
-{{/*
-Return the proper PostgreSQL image name
-*/}}
-{{- define "postgresql.image" -}}
-{{- $registryName := .Values.image.registry -}}
-{{- $repositoryName := .Values.image.repository -}}
-{{- $tag := .Values.image.tag | toString -}}
-{{/*
-Helm 2.11 supports the assignment of a value to a variable defined in a different scope,
-but Helm 2.9 and 2.10 doesn't support it, so we need to implement this if-else logic.
-Also, we can't use a single if because lazy evaluation is not an option
-*/}}
-{{- if .Values.global }}
-    {{- if .Values.global.imageRegistry }}
-        {{- printf "%s/%s:%s" .Values.global.imageRegistry $repositoryName $tag -}}
-    {{- else -}}
-        {{- printf "%s/%s:%s" $registryName $repositoryName $tag -}}
-    {{- end -}}
-{{- else -}}
-    {{- printf "%s/%s:%s" $registryName $repositoryName $tag -}}
-{{- end -}}
-{{- end -}}
-
-{{/*
-Return the proper image name to change the volume permissions
-*/}}
-{{- define "postgresql.volumePermissions.image" -}}
-{{- $registryName := .Values.volumePermissions.image.registry -}}
-{{- $repositoryName := .Values.volumePermissions.image.repository -}}
-{{- $tag := .Values.volumePermissions.image.tag | toString -}}
-{{/*
-Helm 2.11 supports the assignment of a value to a variable defined in a different scope,
-but Helm 2.9 and 2.10 doesn't support it, so we need to implement this if-else logic.
-Also, we can't use a single if because lazy evaluation is not an option
-*/}}
-{{- if .Values.global }}
-    {{- if .Values.global.imageRegistry }}
-        {{- printf "%s/%s:%s" .Values.global.imageRegistry $repositoryName $tag -}}
-    {{- else -}}
-        {{- printf "%s/%s:%s" $registryName $repositoryName $tag -}}
-    {{- end -}}
-{{- else -}}
-    {{- printf "%s/%s:%s" $registryName $repositoryName $tag -}}
-{{- end -}}
-{{- end -}}
-
-
-{{/*
-Return the proper PostgreSQL metrics image name
-*/}}
-{{- define "metrics.image" -}}
-{{- $registryName :=  default "docker.io" .Values.metrics.image.registry -}}
-{{- $tag := default "latest" .Values.metrics.image.tag | toString -}}
-{{- printf "%s/%s:%s" $registryName .Values.metrics.image.repository $tag -}}
-{{- end -}}
-
-{{/*
-Get the password secret.
-*/}}
-{{- define "postgresql.secretName" -}}
-{{- if .Values.existingSecret -}}
-{{- printf "%s" .Values.existingSecret -}}
-{{- else -}}
-{{- printf "%s" (include "postgresql.fullname" .) -}}
-{{- end -}}
-{{- end -}}
-
-{{/*
-Get the configuration ConfigMap name.
-*/}}
-{{- define "postgresql.configurationCM" -}}
-{{- if .Values.configurationConfigMap -}}
-{{- printf "%s" .Values.configurationConfigMap -}}
-{{- else -}}
-{{- printf "%s-configuration" (include "postgresql.fullname" .) -}}
-{{- end -}}
-{{- end -}}
-
-{{/*
-Get the extended configuration ConfigMap name.
-*/}}
-{{- define "postgresql.extendedConfigurationCM" -}}
-{{- if .Values.extendedConfConfigMap -}}
-{{- printf "%s" .Values.extendedConfConfigMap -}}
-{{- else -}}
-{{- printf "%s-extended-configuration" (include "postgresql.fullname" .) -}}
-{{- end -}}
-{{- end -}}
-
-{{/*
-Get the initialization scripts ConfigMap name.
-*/}}
-{{- define "postgresql.initdbScriptsCM" -}}
-{{- if .Values.initdbScriptsConfigMap -}}
-{{- printf "%s" .Values.initdbScriptsConfigMap -}}
-{{- else -}}
-{{- printf "%s-init-scripts" (include "postgresql.fullname" .) -}}
-{{- end -}}
-{{- end -}}
diff --git a/ric-infra/30-Kong/helm/kong/charts/kong/charts/postgresql/templates/networkpolicy.yaml b/ric-infra/30-Kong/helm/kong/charts/kong/charts/postgresql/templates/networkpolicy.yaml
deleted file mode 100755 (executable)
index 40496a7..0000000
+++ /dev/null
@@ -1,29 +0,0 @@
-{{- if .Values.networkPolicy.enabled }}
-kind: NetworkPolicy
-apiVersion: {{ template "postgresql.networkPolicy.apiVersion" . }}
-metadata:
-  name: {{ template "postgresql.fullname" . }}
-  labels:
-    app: {{ template "postgresql.name" . }}
-    chart: {{ template "postgresql.chart" . }}
-    release: {{ .Release.Name | quote }}
-    heritage: {{ .Release.Service | quote }}
-spec:
-  podSelector:
-    matchLabels:
-      app: {{ template "postgresql.name" . }}
-      release: {{ .Release.Name | quote }}
-  ingress:
-    # Allow inbound connections
-    - ports:
-      - port: 5432
-    {{- if not .Values.networkPolicy.allowExternal }}
-      from:
-      - podSelector:
-          matchLabels:
-            {{ template "postgresql.fullname" . }}-client: "true"
-    {{- end }}
-    # Allow prometheus scrapes
-    - ports:
-      - port: 9187
-{{- end }}
diff --git a/ric-infra/30-Kong/helm/kong/charts/kong/charts/postgresql/templates/secrets.yaml b/ric-infra/30-Kong/helm/kong/charts/kong/charts/postgresql/templates/secrets.yaml
deleted file mode 100755 (executable)
index acc1681..0000000
+++ /dev/null
@@ -1,25 +0,0 @@
-{{- if not .Values.existingSecret }}
-apiVersion: v1
-kind: Secret
-metadata:
-  name: {{ template "postgresql.fullname" . }}
-  labels:
-    app: {{ template "postgresql.name" . }}
-    chart: {{ template "postgresql.chart" . }}
-    release: {{ .Release.Name | quote }}
-    heritage: {{ .Release.Service | quote }}
-type: Opaque
-data:
-  {{- if .Values.postgresqlPassword }}
-  postgresql-password: {{ .Values.postgresqlPassword | b64enc | quote }}
-  {{- else }}
-  postgresql-password: {{ randAlphaNum 10 | b64enc | quote }}
-  {{- end }}
-  {{- if .Values.replication.enabled }}
-  {{- if .Values.replication.password }}
-  postgresql-replication-password: {{ .Values.replication.password | b64enc | quote }}
-  {{- else }}
-  postgresql-replication-password: {{ randAlphaNum 10 | b64enc | quote }}
-  {{- end }}
-  {{- end }}
-{{- end -}}
diff --git a/ric-infra/30-Kong/helm/kong/charts/kong/charts/postgresql/templates/statefulset-slaves.yaml b/ric-infra/30-Kong/helm/kong/charts/kong/charts/postgresql/templates/statefulset-slaves.yaml
deleted file mode 100755 (executable)
index 498b9c7..0000000
+++ /dev/null
@@ -1,211 +0,0 @@
-{{- if .Values.replication.enabled }}
-apiVersion: apps/v1
-kind: StatefulSet
-metadata:
-  name: "{{ template "postgresql.fullname" . }}-slave"
-  labels:
-    app: {{ template "postgresql.name" . }}
-    chart: {{ template "postgresql.chart" . }}
-    release: {{ .Release.Name | quote }}
-    heritage: {{ .Release.Service | quote }}
-spec:
-  serviceName: {{ template "postgresql.fullname" . }}-headless
-  replicas: {{ .Values.replication.slaveReplicas }}
-  selector:
-    matchLabels:
-      app: {{ template "postgresql.name" . }}
-      release: {{ .Release.Name | quote }}
-      role: slave
-  template:
-    metadata:
-      name: {{ template "postgresql.fullname" . }}
-      labels:
-        app: {{ template "postgresql.name" . }}
-        chart: {{ template "postgresql.chart" . }}
-        release: {{ .Release.Name | quote }}
-        heritage: {{ .Release.Service | quote }}
-        role: slave
-    spec:
-      {{- if .Values.securityContext.enabled }}
-      securityContext:
-        fsGroup: {{ .Values.securityContext.fsGroup }}
-        runAsUser: {{ .Values.securityContext.runAsUser }}
-      {{- end }}
-      {{- if .Values.image.pullSecrets }}
-      imagePullSecrets:
-      {{- range .Values.image.pullSecrets }}
-        - name: {{ . }}
-      {{- end}}
-      {{- end }}
-      {{- if .Values.slave.nodeSelector }}
-      nodeSelector:
-{{ toYaml .Values.slave.nodeSelector | indent 8 }}
-      {{- end }}
-      {{- if .Values.slave.affinity }}
-      affinity:
-{{ toYaml .Values.slave.affinity | indent 8 }}
-      {{- end }}
-      {{- if .Values.slave.tolerations }}
-      tolerations:
-{{ toYaml .Values.slave.tolerations | indent 8 }}
-      {{- end }}
-      {{- if .Values.terminationGracePeriodSeconds }}
-      terminationGracePeriodSeconds: {{ .Values.terminationGracePeriodSeconds }}
-      {{- end }}
-      {{- if and .Values.volumePermissions.enabled .Values.persistence.enabled }}
-      initContainers:
-      - name: init-chmod-data
-        image: {{ template "postgresql.volumePermissions.image" . }}
-        imagePullPolicy: "{{ .Values.volumePermissions.image.pullPolicy }}"
-        resources:
-{{ toYaml .Values.resources | indent 10 }}
-        command:
-          - sh
-          - -c
-          - |
-            chown -R {{ .Values.securityContext.runAsUser }}:{{ .Values.securityContext.fsGroup }} /bitnami
-            if [ -d /bitnami/postgresql/data ]; then
-              chmod  0700 /bitnami/postgresql/data;
-            fi
-        securityContext:
-          runAsUser: {{ .Values.volumePermissions.securityContext.runAsUser }}
-        volumeMounts:
-        - name: data
-          mountPath: /bitnami/postgresql
-      {{- end }}
-      containers:
-      - name: {{ template "postgresql.fullname" . }}
-        image: {{ template "postgresql.image" . }}
-        imagePullPolicy: "{{ .Values.image.pullPolicy }}"
-        resources:
-{{ toYaml .Values.resources | indent 10 }}
-        env:
-        {{- if .Values.image.debug}}
-        - name: BASH_DEBUG
-          value: "1"
-        - name: NAMI_DEBUG
-          value: "1"
-        {{- end }}
-        - name: POSTGRESQL_REPLICATION_MODE
-          value: "slave"
-        - name: POSTGRESQL_REPLICATION_USER
-          value: {{ .Values.replication.user | quote }}
-        {{- if .Values.usePasswordFile }}
-        - name: POSTGRESQL_REPLICATION_PASSWORD_FILE
-          value: "/opt/bitnami/postgresql/secrets/postgresql-replication-password"
-        {{- else }}
-        - name: POSTGRESQL_REPLICATION_PASSWORD
-          valueFrom:
-            secretKeyRef:
-              name: {{ template "postgresql.secretName" . }}
-              key: postgresql-replication-password
-        {{- end }}
-        - name: POSTGRESQL_CLUSTER_APP_NAME
-          value: {{ .Values.replication.applicationName }}
-        - name: POSTGRESQL_MASTER_HOST
-          value: {{ template "postgresql.fullname" . }}
-        - name: POSTGRESQL_MASTER_PORT_NUMBER
-          value: {{ .Values.service.port | quote }}
-        ports:
-        - name: postgresql
-          containerPort: {{ .Values.service.port }}
-        {{- if .Values.livenessProbe.enabled }}
-        livenessProbe:
-          exec:
-            command:
-            - sh
-            - -c
-           {{- if .Values.postgresqlDatabase }}
-            - exec pg_isready -U {{ .Values.postgresqlUsername | quote }} -d {{ .Values.postgresqlDatabase | quote }} -h localhost
-           {{- else }}
-            - exec pg_isready -U {{ .Values.postgresqlUsername | quote }} -h localhost
-           {{- end }}
-          initialDelaySeconds: {{ .Values.livenessProbe.initialDelaySeconds }}
-          periodSeconds: {{ .Values.livenessProbe.periodSeconds }}
-          timeoutSeconds: {{ .Values.livenessProbe.timeoutSeconds }}
-          successThreshold: {{ .Values.livenessProbe.successThreshold }}
-          failureThreshold: {{ .Values.livenessProbe.failureThreshold }}
-        {{- end }}
-        {{- if .Values.readinessProbe.enabled }}
-        readinessProbe:
-          exec:
-            command:
-            - sh
-            - -c
-           {{- if .Values.postgresqlDatabase }}
-            - exec pg_isready -U {{ .Values.postgresqlUsername | quote }} -d {{ .Values.postgresqlDatabase | quote }} -h localhost
-           {{- else }}
-            - exec pg_isready -U {{ .Values.postgresqlUsername | quote }} -h localhost
-           {{- end }}
-          initialDelaySeconds: {{ .Values.readinessProbe.initialDelaySeconds }}
-          periodSeconds: {{ .Values.readinessProbe.periodSeconds }}
-          timeoutSeconds: {{ .Values.readinessProbe.timeoutSeconds }}
-          successThreshold: {{ .Values.readinessProbe.successThreshold }}
-          failureThreshold: {{ .Values.readinessProbe.failureThreshold }}
-        {{- end }}
-        volumeMounts:
-        {{- if .Values.usePasswordFile }}
-        - name: postgresql-password
-          mountPath: /opt/bitnami/postgresql/secrets
-        {{ end }}
-        {{- if .Values.persistence.enabled }}
-        - name: data
-          mountPath: {{ .Values.persistence.mountPath }}
-        {{ end }}
-        {{- if or (.Files.Glob "files/conf.d/*.conf") .Values.extendedConfConfigMap }}
-        - name: postgresql-extended-config
-          mountPath: /bitnami/postgresql/conf/conf.d/
-        {{- end }}
-        {{- if or (.Files.Glob "files/postgresql.conf") (.Files.Glob "files/pg_hba.conf") .Values.postgresqlConfiguration .Values.pgHbaConfiguration .Values.configurationConfigMap }}
-        - name: postgresql-config
-          mountPath: /bitnami/postgresql/conf
-        {{- end }}
-      volumes:
-      {{- if .Values.usePasswordFile }}
-      - name: postgresql-password
-        secret:
-          secretName: {{ template "postgresql.secretName" . }}
-      {{ end }}
-      {{- if or (.Files.Glob "files/postgresql.conf") (.Files.Glob "files/pg_hba.conf") .Values.postgresqlConfiguration .Values.pgHbaConfiguration .Values.configurationConfigMap}}
-      - name: postgresql-config
-        configMap:
-          name: {{ template "postgresql.configurationCM" . }}
-      {{- end }}
-      {{- if or (.Files.Glob "files/conf.d/*.conf") .Values.extendedConfConfigMap }}
-      - name: postgresql-extended-config
-        configMap:
-          name: {{ template "postgresql.extendedConfigurationCM" . }}
-      {{- end }}
-      {{- if not .Values.persistence.enabled }}
-      - name: data
-        emptyDir: {}
-      {{- end }}
-  updateStrategy:
-    type: {{ .Values.updateStrategy.type }}
-{{- if .Values.persistence.enabled }}
-  volumeClaimTemplates:
-    - metadata:
-        name: data
-      {{- with .Values.persistence.annotations }}
-        annotations:
-        {{- range $key, $value := . }}
-          {{ $key }}: {{ $value }}
-        {{- end }}
-      {{- end }}
-      spec:
-        accessModes:
-        {{- range .Values.persistence.accessModes }}
-          - {{ . | quote }}
-        {{- end }}
-        resources:
-          requests:
-            storage: {{ .Values.persistence.size | quote }}
-      {{- if .Values.persistence.storageClass }}
-      {{- if (eq "-" .Values.persistence.storageClass) }}
-        storageClassName: ""
-      {{- else }}
-        storageClassName: "{{ .Values.persistence.storageClass }}"
-      {{- end }}
-      {{- end }}
-{{- end }}
-{{- end }}
diff --git a/ric-infra/30-Kong/helm/kong/charts/kong/charts/postgresql/templates/statefulset.yaml b/ric-infra/30-Kong/helm/kong/charts/kong/charts/postgresql/templates/statefulset.yaml
deleted file mode 100755 (executable)
index 8fee52d..0000000
+++ /dev/null
@@ -1,300 +0,0 @@
-apiVersion: apps/v1
-kind: StatefulSet
-metadata:
-  name: {{ template "postgresql.master.fullname" . }}
-  labels:
-    app: {{ template "postgresql.name" . }}
-    chart: {{ template "postgresql.chart" . }}
-    release: {{ .Release.Name | quote }}
-    heritage: {{ .Release.Service | quote }}
-spec:
-  serviceName: {{ template "postgresql.fullname" . }}-headless
-  replicas: 1
-  updateStrategy:
-    type: {{ .Values.updateStrategy.type }}
-  selector:
-    matchLabels:
-      app: {{ template "postgresql.name" . }}
-      release: {{ .Release.Name | quote }}
-      role: master
-  template:
-    metadata:
-      name: {{ template "postgresql.fullname" . }}
-      labels:
-        app: {{ template "postgresql.name" . }}
-        chart: {{ template "postgresql.chart" . }}
-        release: {{ .Release.Name | quote }}
-        heritage: {{ .Release.Service | quote }}
-        role: master
-    spec:
-      {{- if .Values.securityContext.enabled }}
-      securityContext:
-        fsGroup: {{ .Values.securityContext.fsGroup }}
-        runAsUser: {{ .Values.securityContext.runAsUser }}
-      {{- end }}
-      {{- if or .Values.image.pullSecrets .Values.metrics.image.pullSecrets }}
-      imagePullSecrets:
-      {{- range .Values.image.pullSecrets }}
-        - name: {{ . }}
-      {{- end}}
-      {{- range .Values.metrics.image.pullSecrets }}
-        - name: {{ . }}
-      {{- end}}
-      {{- end }}
-      {{- if .Values.master.nodeSelector }}
-      nodeSelector:
-{{ toYaml .Values.master.nodeSelector | indent 8 }}
-      {{- end }}
-      {{- if .Values.master.affinity }}
-      affinity:
-{{ toYaml .Values.master.affinity | indent 8 }}
-      {{- end }}
-      {{- if .Values.master.tolerations }}
-      tolerations:
-{{ toYaml .Values.master.tolerations | indent 8 }}
-      {{- end }}
-      {{- if .Values.terminationGracePeriodSeconds }}
-      terminationGracePeriodSeconds: {{ .Values.terminationGracePeriodSeconds }}
-      {{- end }}
-      {{- if and .Values.volumePermissions.enabled .Values.persistence.enabled }}
-      initContainers:
-      - name: init-chmod-data
-        image: {{ template "postgresql.volumePermissions.image" . }}
-        imagePullPolicy: "{{ .Values.volumePermissions.image.pullPolicy }}"
-        resources:
-{{ toYaml .Values.resources | indent 10 }}
-        command:
-          - sh
-          - -c
-          - |
-            chown -R {{ .Values.securityContext.runAsUser }}:{{ .Values.securityContext.fsGroup }} /bitnami
-            if [ -d /bitnami/postgresql/data ]; then
-              chmod  0700 /bitnami/postgresql/data;
-            fi
-        securityContext:
-          runAsUser: {{ .Values.volumePermissions.securityContext.runAsUser }}
-        volumeMounts:
-        - name: data
-          mountPath: /bitnami/postgresql
-      {{- end }}
-      containers:
-      - name: {{ template "postgresql.fullname" . }}
-        image: {{ template "postgresql.image" . }}
-        imagePullPolicy: "{{ .Values.image.pullPolicy }}"
-        resources:
-{{ toYaml .Values.resources | indent 10 }}
-        env:
-        {{- if .Values.image.debug}}
-        - name: BASH_DEBUG
-          value: "1"
-        - name: NAMI_DEBUG
-          value: "1"
-        {{- end }}
-        {{- if .Values.replication.enabled }}
-        - name: POSTGRESQL_REPLICATION_MODE
-          value: "master"
-        - name: POSTGRESQL_REPLICATION_USER
-          value: {{ .Values.replication.user | quote }}
-        {{- if .Values.usePasswordFile }}
-        - name: POSTGRESQL_REPLICATION_PASSWORD_FILE
-          value: "/opt/bitnami/postgresql/secrets/postgresql-replication-password"
-        {{- else }}
-        - name: POSTGRESQL_REPLICATION_PASSWORD
-          valueFrom:
-            secretKeyRef:
-              name: {{ template "postgresql.secretName" . }}
-              key: postgresql-replication-password
-        {{- end }}
-        {{- if not (eq .Values.replication.synchronousCommit "off")}}
-        - name: POSTGRESQL_SYNCHRONOUS_COMMIT_MODE
-          value: {{ .Values.replication.synchronousCommit | quote }}
-        - name: POSTGRESQL_NUM_SYNCHRONOUS_REPLICAS
-          value: {{ .Values.replication.numSynchronousReplicas | quote }}
-        {{- end }}
-        - name: POSTGRESQL_CLUSTER_APP_NAME
-          value: {{ .Values.replication.applicationName }}
-        {{- end }}
-        - name: POSTGRESQL_USERNAME
-          value: {{ .Values.postgresqlUsername | quote }}
-        {{- if .Values.usePasswordFile }}
-        - name: POSTGRESQL_PASSWORD_FILE
-          value: "/opt/bitnami/postgresql/secrets/postgresql-password"
-        {{- else }}
-        - name: POSTGRESQL_PASSWORD
-          valueFrom:
-            secretKeyRef:
-              name: {{ template "postgresql.secretName" . }}
-              key: postgresql-password
-        {{- end }}
-        {{- if .Values.postgresqlDatabase }}
-        - name: POSTGRESQL_DATABASE
-          value: {{ .Values.postgresqlDatabase | quote }}
-        {{- end }}
-{{- if .Values.extraEnv }}
-{{ toYaml .Values.extraEnv | indent 8 }}
-{{- end }}
-        ports:
-        - name: postgresql
-          containerPort: {{ .Values.service.port }}
-        {{- if .Values.livenessProbe.enabled }}
-        livenessProbe:
-          exec:
-            command:
-            - sh
-            - -c
-           {{- if .Values.postgresqlDatabase }}
-            - exec pg_isready -U {{ .Values.postgresqlUsername | quote }} -d {{ .Values.postgresqlDatabase | quote }} -h localhost
-           {{- else }}
-            - exec pg_isready -U {{ .Values.postgresqlUsername | quote }} -h localhost
-           {{- end }}
-          initialDelaySeconds: {{ .Values.livenessProbe.initialDelaySeconds }}
-          periodSeconds: {{ .Values.livenessProbe.periodSeconds }}
-          timeoutSeconds: {{ .Values.livenessProbe.timeoutSeconds }}
-          successThreshold: {{ .Values.livenessProbe.successThreshold }}
-          failureThreshold: {{ .Values.livenessProbe.failureThreshold }}
-        {{- end }}
-        {{- if .Values.readinessProbe.enabled }}
-        readinessProbe:
-          exec:
-            command:
-            - sh
-            - -c
-           {{- if .Values.postgresqlDatabase }}
-            - exec pg_isready -U {{ .Values.postgresqlUsername | quote }} -d {{ .Values.postgresqlDatabase | quote }} -h localhost
-           {{- else }}
-            - exec pg_isready -U {{ .Values.postgresqlUsername | quote }} -h localhost
-           {{- end }}
-          initialDelaySeconds: {{ .Values.readinessProbe.initialDelaySeconds }}
-          periodSeconds: {{ .Values.readinessProbe.periodSeconds }}
-          timeoutSeconds: {{ .Values.readinessProbe.timeoutSeconds }}
-          successThreshold: {{ .Values.readinessProbe.successThreshold }}
-          failureThreshold: {{ .Values.readinessProbe.failureThreshold }}
-        {{- end }}
-        volumeMounts:
-        {{- if or (.Files.Glob "files/docker-entrypoint-initdb.d/*.{sh,sql,sql.gz}") .Values.initdbScriptsConfigMap .Values.initdbScripts }}
-        - name: custom-init-scripts
-          mountPath: /docker-entrypoint-initdb.d
-        {{- end }}
-        {{- if or (.Files.Glob "files/conf.d/*.conf") .Values.postgresqlExtendedConf .Values.extendedConfConfigMap }}
-        - name: postgresql-extended-config
-          mountPath: /bitnami/postgresql/conf/conf.d/
-        {{- end }}
-        {{- if .Values.usePasswordFile }}
-        - name: postgresql-password
-          mountPath: /opt/bitnami/postgresql/secrets/
-        {{- end }}
-        {{- if .Values.persistence.enabled }}
-        - name: data
-          mountPath: {{ .Values.persistence.mountPath }}
-        {{- end }}
-        {{- if or (.Files.Glob "files/postgresql.conf") (.Files.Glob "files/pg_hba.conf") .Values.postgresqlConfiguration .Values.pgHbaConfiguration .Values.configurationConfigMap }}
-        - name: postgresql-config
-          mountPath: /bitnami/postgresql/conf
-        {{- end }}
-{{- if .Values.metrics.enabled }}
-      - name: metrics
-        image: {{ template "metrics.image" . }}
-        imagePullPolicy: {{ .Values.metrics.image.pullPolicy | quote }}
-        env:
-        {{- $database := required "In order to enable metrics you need to specify a database (.Values.postgresqlDatabase)" .Values.postgresqlDatabase }}
-        - name: DATA_SOURCE_URI
-          value: {{ printf "localhost:%d/%s?sslmode=disable" (int .Values.service.port) $database | quote }}
-        {{- if .Values.usePasswordFile }}
-        - name: DATA_SOURCE_PASS_FILE
-          value: "/opt/bitnami/postgresql/secrets/postgresql-password"
-        {{- else }}
-        - name: DATA_SOURCE_PASS
-          valueFrom:
-            secretKeyRef:
-              name: {{ template "postgresql.secretName" . }}
-              key: postgresql-password
-        {{- end }}
-        - name: DATA_SOURCE_USER
-          value: {{ .Values.postgresqlUsername }}
-        {{- if .Values.livenessProbe.enabled }}
-        livenessProbe:
-          httpGet:
-            path: /
-            port: metrics
-          initialDelaySeconds: {{ .Values.metrics.livenessProbe.initialDelaySeconds }}
-          periodSeconds: {{ .Values.metrics.livenessProbe.periodSeconds }}
-          timeoutSeconds: {{ .Values.metrics.livenessProbe.timeoutSeconds }}
-          successThreshold: {{ .Values.metrics.livenessProbe.successThreshold }}
-          failureThreshold: {{ .Values.metrics.livenessProbe.failureThreshold }}
-        {{- end }}
-        {{- if .Values.readinessProbe.enabled }}
-        readinessProbe:
-          httpGet:
-            path: /
-            port: metrics
-          initialDelaySeconds: {{ .Values.metrics.readinessProbe.initialDelaySeconds }}
-          periodSeconds: {{ .Values.metrics.readinessProbe.periodSeconds }}
-          timeoutSeconds: {{ .Values.metrics.readinessProbe.timeoutSeconds }}
-          successThreshold: {{ .Values.metrics.readinessProbe.successThreshold }}
-          failureThreshold: {{ .Values.metrics.readinessProbe.failureThreshold }}
-        {{- end }}
-        volumeMounts:
-        {{- if .Values.usePasswordFile }}
-        - name: postgresql-password
-          mountPath: /opt/bitnami/postgresql/secrets/
-        {{- end }}
-        ports:
-        - name: metrics
-          containerPort: 9187
-        resources:
-{{ toYaml .Values.metrics.resources | indent 10 }}
-{{- end }}
-      volumes:
-      {{- if or (.Files.Glob "files/postgresql.conf") (.Files.Glob "files/pg_hba.conf") .Values.postgresqlConfiguration .Values.pgHbaConfiguration .Values.configurationConfigMap}}
-      - name: postgresql-config
-        configMap:
-          name: {{ template "postgresql.configurationCM" . }}
-      {{- end }}
-      {{- if or (.Files.Glob "files/conf.d/*.conf") .Values.postgresqlExtendedConf .Values.extendedConfConfigMap }}
-      - name: postgresql-extended-config
-        configMap:
-          name: {{ template "postgresql.extendedConfigurationCM" . }}
-      {{- end }}
-      {{- if .Values.usePasswordFile }}
-      - name: postgresql-password
-        secret:
-          secretName: {{ template "postgresql.secretName" . }}
-      {{- end }}
-      {{- if  or (.Files.Glob "files/docker-entrypoint-initdb.d/*.{sh,sql,sql.gz}") .Values.initdbScriptsConfigMap .Values.initdbScripts }}
-      - name: custom-init-scripts
-        configMap:
-          name: {{ template "postgresql.initdbScriptsCM" . }}
-      {{- end }}
-{{- if and .Values.persistence.enabled .Values.persistence.existingClaim }}
-      - name: data
-        persistentVolumeClaim:
-          claimName: {{ .Values.persistence.existingClaim }}
-{{- else if not .Values.persistence.enabled }}
-      - name: data
-        emptyDir: {}
-{{- else if and .Values.persistence.enabled (not .Values.persistence.existingClaim) }}
-  volumeClaimTemplates:
-    - metadata:
-        name: data
-      {{- with .Values.persistence.annotations }}
-        annotations:
-        {{- range $key, $value := . }}
-          {{ $key }}: {{ $value }}
-        {{- end }}
-      {{- end }}
-      spec:
-        accessModes:
-        {{- range .Values.persistence.accessModes }}
-          - {{ . | quote }}
-        {{- end }}
-        resources:
-          requests:
-            storage: {{ .Values.persistence.size | quote }}
-      {{- if .Values.persistence.storageClass }}
-      {{- if (eq "-" .Values.persistence.storageClass) }}
-        storageClassName: ""
-      {{- else }}
-        storageClassName: "{{ .Values.persistence.storageClass }}"
-      {{- end }}
-      {{- end }}
-{{- end }}
diff --git a/ric-infra/30-Kong/helm/kong/charts/kong/ci/cassandra.yaml b/ric-infra/30-Kong/helm/kong/charts/kong/ci/cassandra.yaml
deleted file mode 100755 (executable)
index 4357ccd..0000000
+++ /dev/null
@@ -1,7 +0,0 @@
-env:
-  database: cassandra
-
-cassandra:
-  enabled: true
-postgres:
-  enabled: false
diff --git a/ric-infra/30-Kong/helm/kong/charts/kong/ci/dbless-no-kic-internal-declarative-config-values.yaml b/ric-infra/30-Kong/helm/kong/charts/kong/ci/dbless-no-kic-internal-declarative-config-values.yaml
deleted file mode 100755 (executable)
index 596b7c7..0000000
+++ /dev/null
@@ -1,39 +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.                                             #
-################################################################################
-
-# CI test for testing dbless deployment without ingress controllers
-ingressController:
-  enabled: false
-env:
-  database: "off"
-postgresql:
-  enabled: false
-dblessConfig:
-  # Or the configuration is passed in full-text below
-  config:
-    _format_version: "1.1"
-    services:
-      - name: test-svc
-        url: http://example.com
-        routes:
-        - name: test
-          paths:
-          - /test
-        plugins:
-        - name: request-termination
-          config:
-            status_code: 200
-            message: "dbless-config"
diff --git a/ric-infra/30-Kong/helm/kong/charts/kong/ci/dbless-no-kic-values.yaml b/ric-infra/30-Kong/helm/kong/charts/kong/ci/dbless-no-kic-values.yaml
deleted file mode 100755 (executable)
index 04eaee7..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.                                             #
-################################################################################
-
-# CI test for testing dbless deployment
-env:
-  database: "off"
-postgresql:
-  enabled: false
diff --git a/ric-infra/30-Kong/helm/kong/charts/kong/ci/dbless-values.yaml b/ric-infra/30-Kong/helm/kong/charts/kong/ci/dbless-values.yaml
deleted file mode 100755 (executable)
index f9fe62a..0000000
+++ /dev/null
@@ -1,29 +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.                                             #
-################################################################################
-
-# CI test for testing dbless deployment
-
-podDisruptionBudget:
-  enabled: true
-
-ingressController:
-  enabled: true
-  podDisruptionBudget:
-    enabled: true
-env:
-  database: "off"
-postgresql:
-  enabled: false
diff --git a/ric-infra/30-Kong/helm/kong/charts/kong/ci/default-values.yaml b/ric-infra/30-Kong/helm/kong/charts/kong/ci/default-values.yaml
deleted file mode 100755 (executable)
index b24106b..0000000
+++ /dev/null
@@ -1,444 +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 kong.
-# Declare variables to be passed into your templates.
-
-image:
-  repository: kong
-  # repository: kong-docker-kong-enterprise-edition-docker.bintray.io/kong-enterprise-edition
-  tag: 1.3
-  pullPolicy: IfNotPresent
-  ## Optionally specify an array of imagePullSecrets.
-  ## Secrets must be manually created in the namespace.
-  ## If using the official Kong Enterprise registry above, you MUST provide a secret.
-  ## ref: https://kubernetes.io/docs/tasks/configure-pod-container/pull-image-private-registry/
-  ##
-  # pullSecrets:
-  #   - myRegistrKeySecretName
-
-waitImage:
-  repository: busybox
-  tag: latest
-
-# Specify Kong admin and proxy services configurations
-admin:
-  # If you want to specify annotations for the admin service, uncomment the following
-  # line, add additional or adjust as needed, and remove the curly braces after 'annotations:'.
-  annotations: {}
-  #  service.beta.kubernetes.io/aws-load-balancer-proxy-protocol: "*"
-
-  # HTTPS traffic on the admin port
-  # if set to false also set readinessProbe and livenessProbe httpGet scheme's to 'HTTP'
-  useTLS: true
-  servicePort: 8444
-  containerPort: 8444
-  # Kong admin service type
-  type: NodePort
-  # Set a nodePort which is available
-  # nodePort: 32444
-  # Kong admin ingress settings.
-  ingress:
-    # Enable/disable exposure using ingress.
-    enabled: false
-    # TLS secret name.
-    # tls: kong-admin.example.com-tls
-    # Array of ingress hosts.
-    hosts: []
-    # Map of ingress annotations.
-    annotations: {}
-    # Ingress path.
-    path: /
-
-proxy:
-  # If you want to specify annotations for the proxy service, uncomment the following
-  # line, add additional or adjust as needed, and remove the curly braces after 'annotations:'.
-  annotations: {}
-  #  service.beta.kubernetes.io/aws-load-balancer-proxy-protocol: "*"
-
-  # HTTP plain-text traffic
-  http:
-    enabled: true
-    servicePort: 80
-    containerPort: 8000
-    # Set a nodePort which is available if service type is NodePort
-    # nodePort: 32080
-
-  tls:
-    enabled: true
-    servicePort: 443
-    containerPort: 8443
-    # Set a nodePort which is available if service type is NodePort
-    # nodePort: 32443
-
-  type: NodePort
-
-  # Kong proxy ingress settings.
-  ingress:
-    # Enable/disable exposure using ingress.
-    enabled: false
-    # TLS secret name.
-    # tls: kong-proxy.example.com-tls
-    # Array of ingress hosts.
-    hosts: []
-    # Map of ingress annotations.
-    annotations: {}
-    # Ingress path.
-    path: /
-
-  externalIPs: []
-
-manager:
-  # If you want to specify annotations for the Manager service, uncomment the following
-  # line, add additional or adjust as needed, and remove the curly braces after 'annotations:'.
-  annotations: {}
-  #  service.beta.kubernetes.io/aws-load-balancer-proxy-protocol: "*"
-
-  # HTTP plain-text traffic
-  http:
-    enabled: true
-    servicePort: 8002
-    containerPort: 8002
-    # Set a nodePort which is available if service type is NodePort
-    # nodePort: 32080
-
-  tls:
-    enabled: true
-    servicePort: 8445
-    containerPort: 8445
-    # Set a nodePort which is available if service type is NodePort
-    # nodePort: 32443
-
-  type: NodePort
-
-  # Kong proxy ingress settings.
-  ingress:
-    # Enable/disable exposure using ingress.
-    enabled: false
-    # TLS secret name.
-    # tls: kong-proxy.example.com-tls
-    # Array of ingress hosts.
-    hosts: []
-    # Map of ingress annotations.
-    annotations: {}
-    # Ingress path.
-    path: /
-
-  externalIPs: []
-
-portal:
-  # If you want to specify annotations for the Portal service, uncomment the following
-  # line, add additional or adjust as needed, and remove the curly braces after 'annotations:'.
-  annotations: {}
-  #  service.beta.kubernetes.io/aws-load-balancer-proxy-protocol: "*"
-
-  # HTTP plain-text traffic
-  http:
-    enabled: true
-    servicePort: 8003
-    containerPort: 8003
-    # Set a nodePort which is available if service type is NodePort
-    # nodePort: 32080
-
-  tls:
-    enabled: true
-    servicePort: 8446
-    containerPort: 8446
-    # Set a nodePort which is available if service type is NodePort
-    # nodePort: 32443
-
-  type: NodePort
-
-  # Kong proxy ingress settings.
-  ingress:
-    # Enable/disable exposure using ingress.
-    enabled: false
-    # TLS secret name.
-    # tls: kong-proxy.example.com-tls
-    # Array of ingress hosts.
-    hosts: []
-    # Map of ingress annotations.
-    annotations: {}
-    # Ingress path.
-    path: /
-
-  externalIPs: []
-
-portalapi:
-  # If you want to specify annotations for the Portal API service, uncomment the following
-  # line, add additional or adjust as needed, and remove the curly braces after 'annotations:'.
-  annotations: {}
-  #  service.beta.kubernetes.io/aws-load-balancer-proxy-protocol: "*"
-
-  # HTTP plain-text traffic
-  http:
-    enabled: true
-    servicePort: 8004
-    containerPort: 8004
-    # Set a nodePort which is available if service type is NodePort
-    # nodePort: 32080
-
-  tls:
-    enabled: true
-    servicePort: 8447
-    containerPort: 8447
-    # Set a nodePort which is available if service type is NodePort
-    # nodePort: 32443
-
-  type: NodePort
-
-  # Kong proxy ingress settings.
-  ingress:
-    # Enable/disable exposure using ingress.
-    enabled: false
-    # TLS secret name.
-    # tls: kong-proxy.example.com-tls
-    # Array of ingress hosts.
-    hosts: []
-    # Map of ingress annotations.
-    annotations: {}
-    # Ingress path.
-    path: /
-
-  externalIPs: []
-
-# Toggle Kong Enterprise features on or off
-# RBAC and SMTP configuration have additional options that must all be set together
-# Other settings should be added to the "env" settings below
-enterprise:
-  enabled: false
-  # Kong Enterprise license secret name
-  # This secret must contain a single 'license' key, containing your base64-encoded license data
-  # The license secret is required for all Kong Enterprise deployments
-  license_secret: you-must-create-a-kong-license-secret
-  # Session configuration secret
-  # The session conf secret is required if using RBAC or the Portal
-  vitals:
-    enabled: true
-  portal:
-    enabled: false
-    # portal_auth here sets the default authentication mechanism for the Portal
-    # FIXME This can be changed per-workspace, but must currently default to
-    # basic-auth to work around limitations with session configuration
-    portal_auth: basic-auth
-    # If the Portal is enabled and any workspace's Portal uses authentication,
-    # this Secret must contain an portal_session_conf key
-    # The key value must be a secret configuration, following the example at https://docs.konghq.com/enterprise/0.35-x/kong-manager/authentication/sessions/
-    session_conf_secret: you-must-create-a-portal-session-conf-secret
-  rbac:
-    enabled: false
-    admin_gui_auth: basic-auth
-    # If RBAC is enabled, this Secret must contain an admin_gui_session_conf key
-    # The key value must be a secret configuration, following the example at https://docs.konghq.com/enterprise/0.35-x/kong-manager/authentication/sessions/
-    session_conf_secret: you-must-create-an-rbac-session-conf-secret
-    # Set to the appropriate plugin config JSON if not using basic-auth
-    admin_gui_auth_conf: {}
-  smtp:
-    enabled: false
-    portal_emails_from: none@example.com
-    portal_emails_reply_to: none@example.com
-    admin_emails_from: none@example.com
-    admin_emails_reply_to: none@example.com
-    smtp_admin_emails: none@example.com
-    smtp_host: smtp.example.com
-    smtp_port: 587
-    smtp_starttls: true
-    auth:
-      # If your SMTP server does not require authentication, this section can
-      # be left as-is. If smtp_username is set to anything other than an empty
-      # string, you must create a Secret with an smtp_password key containing
-      # your SMTP password and specify its name here.
-      smtp_username: ''  # e.g. postmaster@example.com
-      smtp_password_secret: you-must-create-an-smtp-password
-
-# Set runMigrations to run Kong migrations
-runMigrations: true
-
-# update strategy
-updateStrategy: {}
-  # type: RollingUpdate
-  # rollingUpdate:
-  #   maxSurge: "100%"
-  #   maxUnavailable: "0%"
-
-# Specify Kong configurations
-# Kong configurations guide https://getkong.org/docs/latest/configuration/
-# Values here take precedence over values from other sections of values.yaml,
-# 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
-  proxy_access_log: /dev/stdout
-  admin_access_log: /dev/stdout
-  admin_gui_access_log: /dev/stdout
-  portal_api_access_log: /dev/stdout
-  proxy_error_log: /dev/stderr
-  admin_error_log: /dev/stderr
-  admin_gui_error_log: /dev/stderr
-  portal_api_error_log: /dev/stderr
-
-# If you want to specify resources, uncomment the following
-# lines, adjust them as necessary, and remove the curly braces after 'resources:'.
-resources: {}
-  # limits:
-  #  cpu: 100m
-  #  memory: 128Mi
-  # requests:
-  #  cpu: 100m
-  #  memory: 128Mi
-
-# readinessProbe for Kong pods
-# If using Kong Enterprise with RBAC, you must add a Kong-Admin-Token header
-readinessProbe:
-  httpGet:
-    path: "/status"
-    port: admin
-    scheme: HTTPS
-  initialDelaySeconds: 30
-  timeoutSeconds: 1
-  periodSeconds: 10
-  successThreshold: 1
-  failureThreshold: 5
-
-# livenessProbe for Kong pods
-# If using Kong Enterprise with RBAC, you must add a Kong-Admin-Token header
-livenessProbe:
-  httpGet:
-    path: "/status"
-    port: admin
-    scheme: HTTPS
-  initialDelaySeconds: 30
-  timeoutSeconds: 5
-  periodSeconds: 30
-  successThreshold: 1
-  failureThreshold: 5
-
-# Affinity for pod assignment
-# Ref: https://kubernetes.io/docs/concepts/configuration/assign-pod-node/#affinity-and-anti-affinity
-# affinity: {}
-
-# Tolerations for pod assignment
-# Ref: https://kubernetes.io/docs/concepts/configuration/taint-and-toleration/
-tolerations: []
-
-# Node labels for pod assignment
-# Ref: https://kubernetes.io/docs/user-guide/node-selection/
-nodeSelector: {}
-
-# Annotation to be added to Kong pods
-podAnnotations: {}
-
-# Kong pod count
-replicaCount: 1
-
-# Kong Pod Disruption Budget
-podDisruptionBudget:
-  enabled: false
-  maxUnavailable: "50%"
-
-# Kong has a choice of either Postgres or Cassandra as a backend datatstore.
-# This chart allows you to choose either of them with the `database.type`
-# parameter.  Postgres is chosen by default.
-
-# Additionally, this chart allows you to use your own database or spin up a new
-# instance by using the `postgres.enabled` or `cassandra.enabled` parameters.
-# Enabling both will create both databases in your cluster, but only one
-# will be used by Kong based on the `env.database` parameter.
-# Postgres is enabled by default.
-
-# Cassandra chart configs
-cassandra:
-  enabled: false
-
-# PostgreSQL chart configs
-postgresql:
-  enabled: true
-  postgresqlUsername: kong
-  postgresqlDatabase: kong
-  service:
-    port: 5432
-
-# Kong Ingress Controller's primary purpose is to satisfy Ingress resources
-# created in k8s.  It uses CRDs for more fine grained control over routing and
-# for Kong specific configuration.
-ingressController:
-  enabled: false
-  image:
-    repository: kong-docker-kubernetes-ingress-controller.bintray.io/kong-ingress-controller
-    tag: 0.5.0
-  replicaCount: 1
-  livenessProbe:
-    failureThreshold: 3
-    httpGet:
-      path: "/healthz"
-      port: 10254
-      scheme: HTTP
-    initialDelaySeconds: 30
-    periodSeconds: 10
-    successThreshold: 1
-    timeoutSeconds: 5
-  readinessProbe:
-    failureThreshold: 3
-    httpGet:
-      path: "/healthz"
-      port: 10254
-      scheme: HTTP
-      initialDelaySeconds: 30
-    periodSeconds: 10
-    successThreshold: 1
-    timeoutSeconds: 5
-
-  installCRDs: true
-
-  rbac:
-    # Specifies whether RBAC resources should be created
-    create: true
-
-  serviceAccount:
-    # Specifies whether a ServiceAccount should be created
-    create: true
-    # The name of the ServiceAccount to use.
-    # If not set and create is true, a name is generated using the fullname template
-    name:
-
-  ingressClass: kong
-
-  podDisruptionBudget:
-    enabled: false
-    maxUnavailable: "50%"
-
-# We pass the dbless (declarative) config over here.
-dblessConfig:
-  # Either Kong's configuration is managed from an existing ConfigMap (with Key: kong.yml)
-  configMap: ""
-  # Or the configuration is passed in full-text below
-  config:
-    _format_version: "1.1"
-    services:
-      # Example configuration
-      # - name: example.com
-      #   url: http://example.com
-      #   routes:
-      #   - name: example
-      #     paths:
-      #     - "/example"
-
-serviceMonitor:
-  # Specifies whether ServiceMonitor for Prometheus operator should be created
-  enabled: false
-  # interval: 10s
-  # Specifies namespace, where ServiceMonitor should be installed
-  # namespace: monitoring
diff --git a/ric-infra/30-Kong/helm/kong/charts/kong/ci/ingressController-values.yaml b/ric-infra/30-Kong/helm/kong/charts/kong/ci/ingressController-values.yaml
deleted file mode 100755 (executable)
index e36fed4..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-# CI test for Ingress controller basic installation
-ingressController:
-  enabled: true
diff --git a/ric-infra/30-Kong/helm/kong/charts/kong/ci/loadbalancer-values.yaml b/ric-infra/30-Kong/helm/kong/charts/kong/ci/loadbalancer-values.yaml
deleted file mode 100755 (executable)
index 7a24b87..0000000
+++ /dev/null
@@ -1,50 +0,0 @@
-# CI test for LoadBalancer admin/proxy types
-
-admin:
-  useTLS: true
-  type: LoadBalancer
-  loadBalancerSourceRanges:
-    - 192.168.1.1/32
-    - 10.10.10.10/32
-
-proxy:
-  useTLS: true
-  type: LoadBalancer
-  loadBalancerSourceRanges:
-    - 192.168.1.1/32
-    - 10.10.10.10/32
-
-updateStrategy:
-  type: "RollingUpdate"
-  rollingUpdate:
-    maxSurge: 1
-    maxUnavailable: 0
-
-readinessProbe:
-  httpGet:
-    path: "/status"
-    port: admin
-    scheme: HTTPS
-  initialDelaySeconds: 30
-  timeoutSeconds: 1
-  periodSeconds: 10
-  successThreshold: 1
-  failureThreshold: 5
-
-livenessProbe:
-  httpGet:
-    path: "/status"
-    port: admin
-    scheme: HTTPS
-  initialDelaySeconds: 30
-  timeoutSeconds: 5
-  periodSeconds: 30
-  successThreshold: 1
-  failureThreshold: 5
-
-postgresql:
-  enabled: true
-  postgresUser: kong
-  postgresDatabase: kong
-  service:
-    port: 5432
diff --git a/ric-infra/30-Kong/helm/kong/charts/kong/requirements.yaml b/ric-infra/30-Kong/helm/kong/charts/kong/requirements.yaml
deleted file mode 100755 (executable)
index ef0c8eb..0000000
+++ /dev/null
@@ -1,25 +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: postgresql
-  version: ~3.9.1
-  repository: https://kubernetes-charts.storage.googleapis.com/
-  condition: postgresql.enabled
-- name: cassandra
-  version: ~0.10.5
-  repository: https://kubernetes-charts-incubator.storage.googleapis.com/
-  condition: cassandra.enabled
diff --git a/ric-infra/30-Kong/helm/kong/charts/kong/templates/NOTES.txt b/ric-infra/30-Kong/helm/kong/charts/kong/templates/NOTES.txt
deleted file mode 100755 (executable)
index 7724fdc..0000000
+++ /dev/null
@@ -1,81 +0,0 @@
-1. Kong Admin can be accessed inside the cluster using:
-     DNS={{ template "kong.fullname" . }}-admin.{{ .Release.Namespace }}.svc.cluster.local
-     PORT={{ .Values.admin.servicePort }}
-
-To connect from outside the K8s cluster:
-   {{- if contains "LoadBalancer" .Values.admin.type }}
-     HOST=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ template "kong.fullname" . }}-admin -o jsonpath='{.status.loadBalancer.ingress.ip}')
-     PORT=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ template "kong.fullname" . }}-admin -o jsonpath='{.spec.ports[0].nodePort}')
-
-   {{- else if contains "NodePort" .Values.admin.type }}
-     HOST=$(kubectl get nodes --namespace {{ .Release.Namespace }} -o jsonpath='{.items[0].status.addresses[0].address}')
-     PORT=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ template "kong.fullname" . }}-admin -o jsonpath='{.spec.ports[0].nodePort}')
-
-   {{- else if .Values.admin.ingress.enabled  }}
-
-use one of the addresses listed below
-
-     {{- $path := .Values.admin.ingress.path -}}
-     {{- if .Values.admin.ingress.tls }}
-       {{- range .Values.admin.ingress.hosts }}
-         https://{{ . }}{{ $path }}
-       {{- end }}
-     {{- else }}
-       {{- range .Values.admin.ingress.hosts }}
-         http://{{ . }}{{ $path }}
-       {{- end }}
-     {{- end }}
-
-   {{- else if contains "ClusterIP" .Values.admin.type }}
-     HOST=127.0.0.1
-
-     # Execute the following commands to route the connection to Admin SSL port:
-     export POD_NAME=$(kubectl get pods --namespace {{ .Release.Namespace }} -l "release={{ .Release.Name }}, app={{ template "kong.name" . }}" -o jsonpath="{.items[0].metadata.name}")
-     kubectl port-forward --namespace {{ .Release.Namespace }} $POD_NAME {{ .Values.admin.servicePort }}:{{ .Values.admin.servicePort }}
-   {{- end }}
-
-
-2. Kong Proxy can be accessed inside the cluster using:
-     DNS={{ template "kong.fullname" . }}-proxy.{{ .Release.Namespace }}.svc.cluster.local
-     {{- if .Values.proxy.tls.enabled -}}
-        PORT={{ .Values.proxy.tls.servicePort }}
-     {{- else -}}
-        PORT={{ .Values.proxy.http.servicePort }}
-     {{- end -}}
-
-
-To connect from outside the K8s cluster:
-   {{- if contains "LoadBalancer" .Values.proxy.type }}
-     HOST=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ template "kong.fullname" . }}-proxy -o jsonpath='{.status.loadBalancer.ingress.ip}')
-     PORT=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ template "kong.fullname" . }}-proxy -o jsonpath='{.spec.ports[0].nodePort}')
-
-   {{- else if contains "NodePort" .Values.proxy.type }}
-     HOST=$(kubectl get nodes --namespace {{ .Release.Namespace }} -o jsonpath='{.items[0].status.addresses[0].address}')
-     PORT=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ template "kong.fullname" . }}-proxy -o jsonpath='{.spec.ports[0].nodePort}')
-
-   {{- else if .Values.proxy.ingress.enabled  }}
-
-use one of the addresses listed below
-
-     {{- $path := .Values.proxy.ingress.path -}}
-     {{- if .Values.proxy.ingress.tls }}
-       {{- range .Values.proxy.ingress.hosts }}
-         https://{{ . }}{{ $path }}
-       {{- end }}
-     {{- else }}
-       {{- range .Values.proxy.ingress.hosts }}
-         http://{{ . }}{{ $path }}
-       {{- end }}
-     {{- end }}
-
-   {{- else if contains "ClusterIP" .Values.proxy.type }}
-     HOST=127.0.0.1
-
-     # Execute the following commands to route the connection to proxy SSL port:
-     export POD_NAME=$(kubectl get pods --namespace {{ .Release.Namespace }} -l "release={{ .Release.Name }}, app={{ template "kong.name" . }}" -o jsonpath="{.items[0].metadata.name}")
-     {{- if .Values.proxy.tls.enabled -}}
-        kubectl port-forward --namespace {{ .Release.Namespace }} $POD_NAME {{ .Values.proxy.tls.servicePort }}:{{ .Values.proxy.tls.servicePort }}
-     {{- else -}}
-        kubectl port-forward --namespace {{ .Release.Namespace }} $POD_NAME {{ .Values.proxy.http.servicePort }}:{{ .Values.proxy.http.servicePort }}
-     {{- end -}}
-   {{- end }}
diff --git a/ric-infra/30-Kong/helm/kong/charts/kong/templates/_helpers.tpl b/ric-infra/30-Kong/helm/kong/charts/kong/templates/_helpers.tpl
deleted file mode 100755 (executable)
index 0a39678..0000000
+++ /dev/null
@@ -1,227 +0,0 @@
-{{/* vim: set filetype=mustache: */}}
-{{/*
-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).
-*/}}
-
-{{- define "kong.name" -}}
-{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" -}}
-{{- end -}}
-
-{{- define "kong.fullname" -}}
-{{- $name := default .Chart.Name .Values.nameOverride -}}
-{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" -}}
-{{- end -}}
-
-{{- define "kong.postgresql.fullname" -}}
-{{- $name := default "postgresql" .Values.postgresql.nameOverride -}}
-{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" -}}
-{{- end -}}
-
-{{- define "kong.cassandra.fullname" -}}
-{{- $name := default "cassandra" .Values.cassandra.nameOverride -}}
-{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" -}}
-{{- end -}}
-
-{{- define "kong.dblessConfig.fullname" -}}
-{{- $name := default "kong-custom-dbless-config" .Values.dblessConfig.nameOverride -}}
-{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" -}}
-{{- end -}}
-
-{{/*
-Create the name of the service account to use
-*/}}
-{{- define "kong.serviceAccountName" -}}
-{{- if .Values.ingressController.serviceAccount.create -}}
-    {{ default (include "kong.fullname" .) .Values.ingressController.serviceAccount.name }}
-{{- else -}}
-    {{ default "default" .Values.serviceAccount.name }}
-{{- end -}}
-{{- end -}}
-
-{{/*
-Create the KONG_PROXY_LISTEN value string
-*/}}
-{{- define "kong.kongProxyListenValue" -}}
-
-{{- if and .Values.proxy.http.enabled .Values.proxy.tls.enabled -}}
-   0.0.0.0:{{ .Values.proxy.http.containerPort }},0.0.0.0:{{ .Values.proxy.tls.containerPort }} ssl
-{{- else -}}
-{{- if .Values.proxy.http.enabled -}}
-   0.0.0.0:{{ .Values.proxy.http.containerPort }}
-{{- end -}}
-{{- if .Values.proxy.tls.enabled -}}
-   0.0.0.0:{{ .Values.proxy.tls.containerPort }} ssl
-{{- end -}}
-{{- end -}}
-
-{{- end }}
-
-{{/*
-Create the KONG_ADMIN_GUI_LISTEN value string
-*/}}
-{{- define "kong.kongManagerListenValue" -}}
-
-{{- if and .Values.manager.http.enabled .Values.manager.tls.enabled -}}
-   0.0.0.0:{{ .Values.manager.http.containerPort }},0.0.0.0:{{ .Values.manager.tls.containerPort }} ssl
-{{- else -}}
-{{- if .Values.manager.http.enabled -}}
-   0.0.0.0:{{ .Values.manager.http.containerPort }}
-{{- end -}}
-{{- if .Values.manager.tls.enabled -}}
-   0.0.0.0:{{ .Values.manager.tls.containerPort }} ssl
-{{- end -}}
-{{- end -}}
-
-{{- end }}
-
-{{/*
-Create the KONG_PORTAL_GUI_LISTEN value string
-*/}}
-{{- define "kong.kongPortalListenValue" -}}
-
-{{- if and .Values.portal.http.enabled .Values.portal.tls.enabled -}}
-   0.0.0.0:{{ .Values.portal.http.containerPort }},0.0.0.0:{{ .Values.portal.tls.containerPort }} ssl
-{{- else -}}
-{{- if .Values.portal.http.enabled -}}
-   0.0.0.0:{{ .Values.portal.http.containerPort }}
-{{- end -}}
-{{- if .Values.portal.tls.enabled -}}
-   0.0.0.0:{{ .Values.portal.tls.containerPort }} ssl
-{{- end -}}
-{{- end -}}
-
-{{- end }}
-
-{{/*
-Create the KONG_PORTAL_API_LISTEN value string
-*/}}
-{{- define "kong.kongPortalApiListenValue" -}}
-
-{{- if and .Values.portalapi.http.enabled .Values.portalapi.tls.enabled -}}
-   0.0.0.0:{{ .Values.portalapi.http.containerPort }},0.0.0.0:{{ .Values.portalapi.tls.containerPort }} ssl
-{{- else -}}
-{{- if .Values.portalapi.http.enabled -}}
-   0.0.0.0:{{ .Values.portalapi.http.containerPort }}
-{{- end -}}
-{{- if .Values.portalapi.tls.enabled -}}
-   0.0.0.0:{{ .Values.portalapi.tls.containerPort }} ssl
-{{- end -}}
-{{- end -}}
-
-{{- end }}
-
-{{/*
-Create the ingress servicePort value string
-*/}}
-
-{{- define "kong.ingress.servicePort" -}}
-{{- if .tls.enabled -}}
-   {{ .tls.servicePort }}
-{{- else -}}
-   {{ .http.servicePort }}
-{{- end -}}
-{{- end -}}
-
-
-{{- define "kong.env" -}}
-{{- range $key, $val := .Values.env }}
-- name: KONG_{{ $key | upper}}
-{{- $valueType := printf "%T" $val -}}
-{{ if eq $valueType "map[string]interface {}" }}
-{{ toYaml $val | indent 2 -}}
-{{- else }}
-  value: {{ $val | quote -}}
-{{- end -}}
-{{- end -}}
-{{- end -}}
-
-{{- define "kong.wait-for-db" -}}
-- name: wait-for-db
-  image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
-  imagePullPolicy: {{ .Values.image.pullPolicy }}
-  env:
-  {{- if .Values.enterprise.enabled }}
-  {{- include "kong.license" . | nindent 2 }}
-  {{- end }}
-  {{- if .Values.postgresql.enabled }}
-  - name: KONG_PG_HOST
-    value: {{ template "kong.postgresql.fullname" . }}
-  - name: KONG_PG_PORT
-    value: "{{ .Values.postgresql.service.port }}"
-  - name: KONG_PG_PASSWORD
-    valueFrom:
-      secretKeyRef:
-        name: {{ template "kong.postgresql.fullname" . }}
-        key: postgresql-password
-  {{- end }}
-  {{- if .Values.cassandra.enabled }}
-  - name: KONG_CASSANDRA_CONTACT_POINTS
-    value: {{ template "kong.cassandra.fullname" . }}
-  {{- end }}
-  {{- include "kong.env" .  | nindent 2 }}
-  command: [ "/bin/sh", "-c", "until kong start; do echo 'waiting for db'; sleep 1; done; kong stop" ]
-{{- end -}}
-
-{{- define "kong.controller-container" -}}
-- name: ingress-controller
-  args:
-  - /kong-ingress-controller
-  # Service from were we extract the IP address/es to use in Ingress status
-  - --publish-service={{ .Release.Namespace }}/{{ template "kong.fullname" . }}-proxy
-  # Set the ingress class
-  - --ingress-class={{ .Values.ingressController.ingressClass }}
-  - --election-id=kong-ingress-controller-leader-{{ .Values.ingressController.ingressClass }}
-  # the kong URL points to the kong admin api server
-  {{- if .Values.admin.useTLS }}
-  - --kong-url=https://localhost:{{ .Values.admin.containerPort }}
-  - --admin-tls-skip-verify # TODO make this configurable
-  {{- else }}
-  - --kong-url=http://localhost:{{ .Values.admin.containerPort }}
-  {{- end }}
-  env:
-  - name: POD_NAME
-    valueFrom:
-      fieldRef:
-        apiVersion: v1
-        fieldPath: metadata.name
-  - name: POD_NAMESPACE
-    valueFrom:
-      fieldRef:
-        apiVersion: v1
-        fieldPath: metadata.namespace
-  image: "{{ .Values.ingressController.image.repository }}:{{ .Values.ingressController.image.tag }}"
-  imagePullPolicy: {{ .Values.image.pullPolicy }}
-  livenessProbe:
-    failureThreshold: 3
-    httpGet:
-      path: /healthz
-      port: 10254
-      scheme: HTTP
-    initialDelaySeconds: 30
-    periodSeconds: 10
-    successThreshold: 1
-    timeoutSeconds: 1
-  readinessProbe:
-    failureThreshold: 3
-    httpGet:
-      path: /healthz
-      port: 10254
-      scheme: HTTP
-    periodSeconds: 10
-    successThreshold: 1
-    timeoutSeconds: 1
-  resources:
-{{ toYaml .Values.ingressController.resources | indent 10 }}
-{{- end -}}
-
-{{/*
-Retrieve Kong Enterprise license from a secret and make it available in env vars
-*/}}
-{{- define "kong.license" -}}
-- name: KONG_LICENSE_DATA
-  valueFrom:
-    secretKeyRef:
-      name: {{ .Values.enterprise.license_secret }}
-      key: license
-{{- end -}}
diff --git a/ric-infra/30-Kong/helm/kong/charts/kong/templates/controller-cluster-role.yaml b/ric-infra/30-Kong/helm/kong/charts/kong/templates/controller-cluster-role.yaml
deleted file mode 100755 (executable)
index a555c0a..0000000
+++ /dev/null
@@ -1,76 +0,0 @@
-{{- if and .Values.ingressController.rbac.create .Values.ingressController.enabled -}}
-apiVersion: rbac.authorization.k8s.io/v1beta1
-kind: ClusterRole
-metadata:
-  labels:
-    app: {{ template "kong.name" . }}
-    chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
-    release: "{{ .Release.Name }}"
-    heritage: "{{ .Release.Service }}"
-  name:  {{ template "kong.fullname" . }}
-rules:
-  - apiGroups:
-      - ""
-    resources:
-      - endpoints
-      - nodes
-      - pods
-      - secrets
-    verbs:
-      - list
-      - watch
-  - apiGroups:
-      - ""
-    resources:
-      - nodes
-    verbs:
-      - get
-  - apiGroups:
-      - ""
-    resources:
-      - services
-    verbs:
-      - get
-      - list
-      - watch
-  - apiGroups:
-      - "networking.k8s.io"
-    resources:
-      - ingresses
-    verbs:
-      - get
-      - list
-      - watch
-  - apiGroups:
-      - ""
-    resources:
-        - events
-    verbs:
-        - create
-        - patch
-  - apiGroups:
-      - "networking.k8s.io"
-    resources:
-      - ingresses/status
-    verbs:
-      - update
-  - apiGroups:
-      - "configuration.konghq.com"
-    resources:
-      - kongplugins
-      - kongcredentials
-      - kongconsumers
-      - kongingresses
-    verbs:
-      - get
-      - list
-      - watch
-  - apiGroups:
-      - "networking.k8s.io"
-    resources:
-      - ingresses
-    verbs:
-      - get
-      - list
-      - watch
-{{- end -}}
diff --git a/ric-infra/30-Kong/helm/kong/charts/kong/templates/controller-deployment.yaml b/ric-infra/30-Kong/helm/kong/charts/kong/templates/controller-deployment.yaml
deleted file mode 100755 (executable)
index 2bb7f08..0000000
+++ /dev/null
@@ -1,96 +0,0 @@
-{{- if (and (.Values.ingressController.enabled) (not (eq .Values.env.database "off"))) }}
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: "{{ template "kong.fullname" . }}-controller"
-  labels:
-    app: "{{ template "kong.name" . }}"
-    chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
-    release: "{{ .Release.Name }}"
-    heritage: "{{ .Release.Service }}"
-    component: "controller"
-spec:
-  replicas: {{ .Values.ingressController.replicaCount }}
-  selector:
-    matchLabels:
-      app: {{ template "kong.name" . }}
-      release: {{ .Release.Name }}
-      component: "controller"
-  template:
-    metadata:
-    {{- if .Values.podAnnotations }}
-      annotations:
-{{ toYaml .Values.podAnnotations | indent 8 }}
-    {{- end }}
-      labels:
-        app: {{ template "kong.name" . }}
-        release: {{ .Release.Name }}
-        component: "controller"
-    spec:
-      serviceAccountName: {{ template "kong.serviceAccountName" . }}
-      {{- if .Values.image.pullSecrets }}
-      imagePullSecrets:
-      {{- range .Values.image.pullSecrets }}
-        - name: {{ . }}
-      {{- end }}
-      {{- end }}
-      initContainers:
-      {{- include "kong.wait-for-db" . | nindent 6 }}
-      containers:
-      - name: admin-api
-        image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
-        imagePullPolicy: {{ .Values.image.pullPolicy }}
-        env:
-        - name: KONG_PROXY_LISTEN
-          value: 'off'
-        {{- if .Values.enterprise.enabled }}
-        {{- if .Values.enterprise.rbac.enabled }}
-        # TODO: uncomment this once we have a means of securely providing the
-        # controller its token using a secret.
-        #- name: KONG_ENFORCE_RBAC
-        #  value: "on"
-        {{- end }}
-        # the controller admin API should not receive requests to create admins or developers
-        # never enable SMTP on it as such
-        {{- if .Values.enterprise.smtp.enabled }}
-        - name: KONG_SMTP_MOCK
-          value: "on"
-        {{- else }}
-        - name: KONG_SMTP_MOCK
-          value: "on"
-        {{- end }}
-        {{- include "kong.license" . | nindent 8 }}
-        {{- end }}
-        {{- if .Values.admin.useTLS }}
-        - name: KONG_ADMIN_LISTEN
-          value: "0.0.0.0:{{ .Values.admin.containerPort }} ssl"
-        {{- else }}
-        - name: KONG_ADMIN_LISTEN
-          value: 0.0.0.0:{{ .Values.admin.containerPort }}
-        {{- end }}
-        {{- if .Values.postgresql.enabled }}
-        - name: KONG_PG_HOST
-          value: {{ template "kong.postgresql.fullname" . }}
-        - name: KONG_PG_PASSWORD
-          valueFrom:
-            secretKeyRef:
-              name: {{ template "kong.postgresql.fullname" . }}
-              key: postgresql-password
-        {{- end }}
-        {{- if .Values.cassandra.enabled }}
-        - name: KONG_CASSANDRA_CONTACT_POINTS
-          value: {{ template "kong.cassandra.fullname" . }}
-        {{- end }}
-        {{- include "kong.env" .  | indent 8 }}
-        ports:
-        - name: admin
-          containerPort: {{ .Values.admin.containerPort }}
-          protocol: TCP
-        readinessProbe:
-{{ toYaml .Values.readinessProbe | indent 10 }}
-        livenessProbe:
-{{ toYaml .Values.livenessProbe | indent 10 }}
-        resources:
-{{ toYaml .Values.resources | indent 10 }}
-      {{- include "kong.controller-container" . | nindent 6 }}
-{{- end -}}
diff --git a/ric-infra/30-Kong/helm/kong/charts/kong/templates/controller-pdb.yaml b/ric-infra/30-Kong/helm/kong/charts/kong/templates/controller-pdb.yaml
deleted file mode 100755 (executable)
index d032781..0000000
+++ /dev/null
@@ -1,20 +0,0 @@
-{{- if and .Values.ingressController.enabled .Values.ingressController.podDisruptionBudget.enabled }}
-apiVersion: policy/v1beta1
-kind: PodDisruptionBudget
-metadata:
-  name: "{{ template "kong.fullname" . }}-controller"
-  labels:
-    app: "{{ template "kong.name" . }}"
-spec:
-  {{- if .Values.ingressController.podDisruptionBudget.minAvailable }}
-  minAvailable: {{ .Values.ingressController.podDisruptionBudget.minAvailable }}
-  {{- end  }}
-  {{- if .Values.ingressController.podDisruptionBudget.maxUnavailable }}
-  maxUnavailable: {{ .Values.ingressController.podDisruptionBudget.maxUnavailable }}
-  {{- end  }}
-  selector:
-    matchLabels:
-      app: {{ template "kong.name" . }}
-      release: {{ .Release.Name }}
-      component: controller
-{{- end }}
\ No newline at end of file
diff --git a/ric-infra/30-Kong/helm/kong/charts/kong/templates/controller-rbac-cluster-role-binding.yaml b/ric-infra/30-Kong/helm/kong/charts/kong/templates/controller-rbac-cluster-role-binding.yaml
deleted file mode 100755 (executable)
index 2e4e752..0000000
+++ /dev/null
@@ -1,19 +0,0 @@
-{{- if and .Values.ingressController.rbac.create .Values.ingressController.enabled -}}
-apiVersion: rbac.authorization.k8s.io/v1beta1
-kind: ClusterRoleBinding
-metadata:
-  name:  {{ template "kong.fullname" . }}
-  labels:
-    app: {{ template "kong.name" . }}
-    chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
-    release: "{{ .Release.Name }}"
-    heritage: "{{ .Release.Service }}"
-roleRef:
-  apiGroup: rbac.authorization.k8s.io
-  kind: ClusterRole
-  name:  {{ template "kong.fullname" . }}
-subjects:
-  - kind: ServiceAccount
-    name: {{ template "kong.serviceAccountName" . }}
-    namespace: {{ .Release.Namespace }}
-{{- end -}}
diff --git a/ric-infra/30-Kong/helm/kong/charts/kong/templates/controller-rbac-role-binding.yaml b/ric-infra/30-Kong/helm/kong/charts/kong/templates/controller-rbac-role-binding.yaml
deleted file mode 100755 (executable)
index 6dad019..0000000
+++ /dev/null
@@ -1,20 +0,0 @@
-{{- if and .Values.ingressController.rbac.create .Values.ingressController.enabled -}}
-apiVersion: rbac.authorization.k8s.io/v1beta1
-kind: RoleBinding
-metadata:
-  name:  {{ template "kong.fullname" . }}
-  namespace: {{ .Release.Namespace }}
-  labels:
-    app: {{ template "kong.name" . }}
-    chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
-    release: "{{ .Release.Name }}"
-    heritage: "{{ .Release.Service }}"
-roleRef:
-  apiGroup: rbac.authorization.k8s.io
-  kind: Role
-  name: {{ template "kong.fullname" . }}
-subjects:
-  - kind: ServiceAccount
-    name: {{ template "kong.serviceAccountName" . }}
-    namespace: {{ .Release.Namespace }}
-{{- end -}}
diff --git a/ric-infra/30-Kong/helm/kong/charts/kong/templates/controller-rbac-role.yaml b/ric-infra/30-Kong/helm/kong/charts/kong/templates/controller-rbac-role.yaml
deleted file mode 100755 (executable)
index 90e0767..0000000
+++ /dev/null
@@ -1,47 +0,0 @@
-{{- if and .Values.ingressController.rbac.create .Values.ingressController.enabled -}}
-apiVersion: rbac.authorization.k8s.io/v1beta1
-kind: Role
-metadata:
-  name:  {{ template "kong.fullname" . }}
-  namespace: {{ .Release.namespace }}
-  labels:
-    app: {{ template "kong.name" . }}
-    chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
-    release: "{{ .Release.Name }}"
-    heritage: "{{ .Release.Service }}"
-rules:
-  - apiGroups:
-      - ""
-    resources:
-      - configmaps
-      - pods
-      - secrets
-      - namespaces
-    verbs:
-      - get
-  - apiGroups:
-      - ""
-    resources:
-      - configmaps
-    resourceNames:
-      # Defaults to "<election-id>-<ingress-class>"
-      # Here: "<kong-ingress-controller-leader-nginx>-<nginx>"
-      # This has to be adapted if you change either parameter
-      # when launching the nginx-ingress-controller.
-      - "kong-ingress-controller-leader-{{ .Values.ingressController.ingressClass }}-{{ .Values.ingressController.ingressClass }}"
-    verbs:
-      - get
-      - update
-  - apiGroups:
-      - ""
-    resources:
-      - configmaps
-    verbs:
-      - create
-  - apiGroups:
-      - ""
-    resources:
-      - endpoints
-    verbs:
-      - get
-{{- end -}}
diff --git a/ric-infra/30-Kong/helm/kong/charts/kong/templates/controller-service-account.yaml b/ric-infra/30-Kong/helm/kong/charts/kong/templates/controller-service-account.yaml
deleted file mode 100755 (executable)
index 050b860..0000000
+++ /dev/null
@@ -1,12 +0,0 @@
-{{- if and .Values.ingressController.enabled .Values.ingressController.serviceAccount.create -}}
-apiVersion: v1
-kind: ServiceAccount
-metadata:
-  name: {{ template "kong.serviceAccountName" . }}
-  namespace: {{ .Release.namespace }}
-  labels:
-    app: {{ template "kong.name" . }}
-    chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
-    release: "{{ .Release.Name }}"
-    heritage: "{{ .Release.Service }}"
-{{- end -}}
diff --git a/ric-infra/30-Kong/helm/kong/charts/kong/templates/crd-kongconsumer.yaml b/ric-infra/30-Kong/helm/kong/charts/kong/templates/crd-kongconsumer.yaml
deleted file mode 100755 (executable)
index a25eff5..0000000
+++ /dev/null
@@ -1,36 +0,0 @@
-{{- if and .Values.ingressController.enabled .Values.ingressController.installCRDs -}}
-apiVersion: apiextensions.k8s.io/v1beta1
-kind: CustomResourceDefinition
-metadata:
-  name: kongconsumers.configuration.konghq.com
-  labels:
-    app: {{ template "kong.name" . }}
-    chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
-    release: "{{ .Release.Name }}"
-    heritage: "{{ .Release.Service }}"
-spec:
-  group: configuration.konghq.com
-  version: v1
-  scope: Namespaced
-  names:
-    kind: KongConsumer
-    plural: kongconsumers
-    shortNames:
-    - kc
-  additionalPrinterColumns:
-  - name: Username
-    type: string
-    description: Username of a Kong Consumer
-    JSONPath: .username
-  - name: Age
-    type: date
-    description: Age
-    JSONPath: .metadata.creationTimestamp
-  validation:
-    openAPIV3Schema:
-      properties:
-        username:
-          type: string
-        custom_id:
-          type: string
-{{- end -}}
diff --git a/ric-infra/30-Kong/helm/kong/charts/kong/templates/crd-kongcredential.yaml b/ric-infra/30-Kong/helm/kong/charts/kong/templates/crd-kongcredential.yaml
deleted file mode 100755 (executable)
index d442157..0000000
+++ /dev/null
@@ -1,41 +0,0 @@
-{{- if and .Values.ingressController.enabled .Values.ingressController.installCRDs -}}
-apiVersion: apiextensions.k8s.io/v1beta1
-kind: CustomResourceDefinition
-metadata:
-  name: kongcredentials.configuration.konghq.com
-  labels:
-    app: {{ template "kong.name" . }}
-    chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
-    release: "{{ .Release.Name }}"
-    heritage: "{{ .Release.Service }}"
-spec:
-  group: configuration.konghq.com
-  version: v1
-  scope: Namespaced
-  names:
-    kind: KongCredential
-    plural: kongcredentials
-  additionalPrinterColumns:
-  - name: Credential-type
-    type: string
-    description: Type of credential
-    JSONPath: .type
-  - name: Age
-    type: date
-    description: Age
-    JSONPath: .metadata.creationTimestamp
-  - name: Consumer-Ref
-    type: string
-    description: Owner of the credential
-    JSONPath: .consumerRef
-  validation:
-    openAPIV3Schema:
-      required:
-      - consumerRef
-      - type
-      properties:
-        consumerRef:
-          type: string
-        type:
-          type: string
-{{- end -}}
diff --git a/ric-infra/30-Kong/helm/kong/charts/kong/templates/crd-kongplugins.yaml b/ric-infra/30-Kong/helm/kong/charts/kong/templates/crd-kongplugins.yaml
deleted file mode 100755 (executable)
index bdd9604..0000000
+++ /dev/null
@@ -1,50 +0,0 @@
-{{- if and .Values.ingressController.enabled .Values.ingressController.installCRDs -}}
-apiVersion: apiextensions.k8s.io/v1beta1
-kind: CustomResourceDefinition
-metadata:
-  name: kongplugins.configuration.konghq.com
-  labels:
-    app: {{ template "kong.name" . }}
-    chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
-    release: "{{ .Release.Name }}"
-    heritage: "{{ .Release.Service }}"
-spec:
-  group: configuration.konghq.com
-  version: v1
-  scope: Namespaced
-  names:
-    kind: KongPlugin
-    plural: kongplugins
-    shortNames:
-    - kp
-  additionalPrinterColumns:
-  - name: Plugin-Type
-    type: string
-    description: Name of the plugin
-    JSONPath: .plugin
-  - name: Age
-    type: date
-    description: Age
-    JSONPath: .metadata.creationTimestamp
-  - name: Disabled
-    type: boolean
-    description: Indicates if the plugin is disabled
-    JSONPath: .disabled
-    priority: 1
-  - name: Config
-    type: string
-    description: Configuration of the plugin
-    JSONPath: .config
-    priority: 1
-  validation:
-    openAPIV3Schema:
-      required:
-      - plugin
-      properties:
-        plugin:
-          type: string
-        disabled:
-          type: boolean
-        config:
-          type: object
-{{- end -}}
diff --git a/ric-infra/30-Kong/helm/kong/charts/kong/templates/deployment.yaml b/ric-infra/30-Kong/helm/kong/charts/kong/templates/deployment.yaml
deleted file mode 100755 (executable)
index 9bcbab0..0000000
+++ /dev/null
@@ -1,281 +0,0 @@
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: "{{ template "kong.fullname" . }}"
-  labels:
-    app: "{{ template "kong.name" . }}"
-    chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
-    release: "{{ .Release.Name }}"
-    heritage: "{{ .Release.Service }}"
-    component: app
-spec:
-  replicas: {{ .Values.replicaCount }}
-  selector:
-    matchLabels:
-      app: {{ template "kong.name" . }}
-      release: {{ .Release.Name }}
-      component: app
-  {{- if .Values.updateStrategy }}
-  strategy:
-{{ toYaml .Values.updateStrategy | indent 4 }}
-  {{- end }}
-
-  template:
-    metadata:
-      annotations:
-        {{- if (and (not .Values.ingressController.enabled) (eq .Values.env.database "off" )) }}
-        {{- if .Values.dblessConfig.config }}
-        checksum/dbless.config: {{ toYaml .Values.dblessConfig.config | sha256sum }}
-        {{- end }}
-        {{- end }}
-        {{- if .Values.podAnnotations }}
-{{ toYaml .Values.podAnnotations | indent 8 }}
-        {{- end }}
-      labels:
-        app: {{ template "kong.name" . }}
-        release: {{ .Release.Name }}
-        component: app
-    spec:
-      {{- if (and (.Values.ingressController.enabled) (eq .Values.env.database "off")) }}
-      serviceAccountName: {{ template "kong.serviceAccountName" . }}
-      {{ end }}
-      {{- if .Values.image.pullSecrets }}
-      imagePullSecrets:
-      {{- range .Values.image.pullSecrets }}
-        - name: {{ . }}
-      {{- end }}
-      {{- end }}
-      {{- if not (eq .Values.env.database "off") }}
-      initContainers:
-      {{- include "kong.wait-for-db" . | nindent 6 }}
-      {{ end }}
-      containers:
-      {{- if (and (.Values.ingressController.enabled) (eq .Values.env.database "off")) }}
-      {{- include "kong.controller-container" . | nindent 6 }}
-      {{ end }}
-      - name: {{ template "kong.name" . }}
-        image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
-        imagePullPolicy: {{ .Values.image.pullPolicy }}
-        env:
-        {{- if not .Values.env.admin_listen }}
-        {{- if .Values.admin.useTLS }}
-        - name: KONG_ADMIN_LISTEN
-          value: "0.0.0.0:{{ .Values.admin.containerPort }} ssl"
-        {{- else }}
-        - name: KONG_ADMIN_LISTEN
-          value: 0.0.0.0:{{ .Values.admin.containerPort }}
-        {{- end }}
-        {{- end }}
-        {{- if not .Values.env.proxy_listen }}
-        - name: KONG_PROXY_LISTEN
-          value: {{ template "kong.kongProxyListenValue" . }}
-        {{- end }}
-        {{- if and (not .Values.env.admin_gui_listen) (.Values.enterprise.enabled) }}
-        - name: KONG_ADMIN_GUI_LISTEN
-          value: {{ template "kong.kongManagerListenValue" . }}
-        {{- end }}
-        {{- if and (not .Values.env.portal_gui_listen) (.Values.enterprise.enabled) (.Values.enterprise.portal.enabled) }}
-        - name: KONG_PORTAL_GUI_LISTEN
-          value: {{ template "kong.kongPortalListenValue" . }}
-        {{- end }}
-        {{- if and (not .Values.env.portal_api_listen) (.Values.enterprise.enabled) (.Values.enterprise.portal.enabled) }}
-        - name: KONG_PORTAL_API_LISTEN
-          value: {{ template "kong.kongPortalApiListenValue" . }}
-        {{- end }}
-        - name: KONG_NGINX_DAEMON
-          value: "off"
-        {{- if .Values.enterprise.enabled }}
-        {{- if .Values.enterprise.vitals.enabled }}
-        - name: KONG_VITALS
-          value: "on"
-        {{- end }}
-        {{- if .Values.enterprise.portal.enabled }}
-        - name: KONG_PORTAL
-          value: "on"
-        {{- if .Values.enterprise.portal.portal_auth }}
-        - name: KONG_PORTAL_AUTH
-          value: {{ .Values.enterprise.portal.portal_auth }}
-        - name: KONG_PORTAL_SESSION_CONF
-          valueFrom:
-            secretKeyRef:
-              name: {{ .Values.enterprise.portal.session_conf_secret }}
-              key: portal_session_conf
-        {{- end }}
-        {{- end }}
-        {{- if .Values.enterprise.rbac.enabled }}
-        - name: KONG_ENFORCE_RBAC
-          value: "on"
-        - name: KONG_ADMIN_GUI_AUTH
-          value: {{ .Values.enterprise.rbac.admin_gui_auth | default "basic-auth" }}
-        - name: KONG_ADMIN_GUI_AUTH_CONF
-          value: '{{ toJson .Values.enterprise.rbac.admin_gui_auth_conf }}'
-        - name: KONG_ADMIN_GUI_SESSION_CONF
-          valueFrom:
-            secretKeyRef:
-              name: {{ .Values.enterprise.rbac.session_conf_secret }}
-              key: admin_gui_session_conf
-        {{- end }}
-        {{- if .Values.enterprise.smtp.enabled }}
-        - name: KONG_PORTAL_EMAILS_FROM
-          value: {{ .Values.enterprise.smtp.portal_emails_from }}
-        - name: KONG_PORTAL_EMAILS_REPLY_TO
-          value: {{ .Values.enterprise.smtp.portal_emails_reply_to }}
-        - name: KONG_ADMIN_EMAILS_FROM
-          value: {{ .Values.enterprise.smtp.admin_emails_from }}
-        - name: KONG_ADMIN_EMAILS_REPLY_TO
-          value: {{ .Values.enterprise.smtp.admin_emails_reply_to }}
-        - name: KONG_SMTP_HOST
-          value: {{ .Values.enterprise.smtp.smtp_host }}
-        - name: KONG_SMTP_PORT
-          value: {{ .Values.enterprise.smtp.smtp_port }}
-        - name: KONG_SMTP_STARTTLS
-          value: {{ .Values.enterprise.smtp.smtp_starttls }}
-        {{- if .Values.enterprise.smtp.auth.smtp_username }}
-        - name: KONG_SMTP_USERNAME
-          value: {{ .Values.enterprise.smtp.auth.smtp_username }}
-        - name: KONG_SMTP_PASSWORD
-          valueFrom:
-            secretKeyRef:
-              name: {{ .Values.enterprise.smtp.auth.smtp_password }}
-              key: smtp_password
-        {{- end }}
-        {{- else }}
-        - name: KONG_SMTP_MOCK
-          value: "on"
-        {{- end }}
-        {{- include "kong.license" . | nindent 8 }}
-        {{- end }}
-        - name: KONG_NGINX_HTTP_INCLUDE
-          value: /kong/servers.conf
-        {{- if .Values.postgresql.enabled }}
-        - name: KONG_PG_HOST
-          value: {{ template "kong.postgresql.fullname" . }}
-        - name: KONG_PG_PORT
-          value: "{{ .Values.postgresql.service.port }}"
-        - name: KONG_PG_PASSWORD
-          valueFrom:
-            secretKeyRef:
-              name: {{ template "kong.postgresql.fullname" . }}
-              key: postgresql-password
-        {{- end }}
-        {{- if .Values.cassandra.enabled }}
-        - name: KONG_CASSANDRA_CONTACT_POINTS
-          value: {{ template "kong.cassandra.fullname" . }}
-        {{- end }}
-        {{- if (and (not .Values.ingressController.enabled) (eq .Values.env.database "off")) }}
-        - name: KONG_DECLARATIVE_CONFIG
-          value: "/kong_dbless/kong.yml"
-        {{- end }}
-        {{- include "kong.env" .  | indent 8 }}
-        ports:
-        - name: admin
-          containerPort: {{ .Values.admin.containerPort }}
-          {{- if .Values.admin.hostPort }}
-          hostPort: {{ .Values.admin.hostPort }}
-          {{- end}}
-          protocol: TCP
-        {{- if .Values.proxy.http.enabled }}
-        - name: proxy
-          containerPort: {{ .Values.proxy.http.containerPort }}
-          {{- if .Values.proxy.http.hostPort }}
-          hostPort: {{ .Values.proxy.http.hostPort }}
-          {{- end}}
-          protocol: TCP
-        {{- end }}
-        {{- if .Values.proxy.tls.enabled }}
-        - name: proxy-tls
-          containerPort: {{ .Values.proxy.tls.containerPort }}
-          {{- if .Values.proxy.tls.hostPort }}
-          hostPort: {{ .Values.proxy.tls.hostPort }}
-          {{- end}}
-          protocol: TCP
-        {{- end }}
-        - name: metrics
-          containerPort: 9542
-          protocol: TCP
-        {{- if .Values.enterprise.enabled }}
-        {{- if .Values.manager.http.enabled }}
-        - name: manager
-          containerPort: {{ .Values.manager.http.containerPort }}
-          {{- if .Values.manager.http.hostPort }}
-          hostPort: {{ .Values.manager.http.hostPort }}
-          {{- end}}
-          protocol: TCP
-        {{- end }}
-        {{- if .Values.manager.tls.enabled }}
-        - name: manager-tls
-          containerPort: {{ .Values.manager.tls.containerPort }}
-          {{- if .Values.manager.tls.hostPort }}
-          hostPort: {{ .Values.manager.tls.hostPort }}
-          {{- end}}
-          protocol: TCP
-        {{- end }}
-        {{- if .Values.portal.http.enabled }}
-        - name: portal
-          containerPort: {{ .Values.portal.http.containerPort }}
-          {{- if .Values.portal.http.hostPort }}
-          hostPort: {{ .Values.portal.http.hostPort }}
-          {{- end}}
-          protocol: TCP
-        {{- end }}
-        {{- if .Values.portal.tls.enabled }}
-        - name: portal-tls
-          containerPort: {{ .Values.portal.tls.containerPort }}
-          {{- if .Values.portal.tls.hostPort }}
-          hostPort: {{ .Values.portal.tls.hostPort }}
-          {{- end}}
-          protocol: TCP
-        {{- end }}
-        {{- if .Values.portalapi.http.enabled }}
-        - name: portalapi
-          containerPort: {{ .Values.portalapi.http.containerPort }}
-          {{- if .Values.portalapi.http.hostPort }}
-          hostPort: {{ .Values.portalapi.http.hostPort }}
-          {{- end}}
-          protocol: TCP
-        {{- end }}
-        {{- if .Values.portalapi.tls.enabled }}
-        - name: portalapi-tls
-          containerPort: {{ .Values.portalapi.tls.containerPort }}
-          {{- if .Values.portalapi.tls.hostPort }}
-          hostPort: {{ .Values.portalapi.tls.hostPort }}
-          {{- end}}
-          protocol: TCP
-        {{- end }}
-        {{- end }}
-        volumeMounts:
-          - name: custom-nginx-template-volume
-            mountPath: /kong
-          {{- if (and (not .Values.ingressController.enabled) (eq .Values.env.database "off")) }}
-          - name: kong-custom-dbless-config-volume
-            mountPath: /kong_dbless/
-          {{- end }}
-        readinessProbe:
-{{ toYaml .Values.readinessProbe | indent 10 }}
-        livenessProbe:
-{{ toYaml .Values.livenessProbe | indent 10 }}
-        resources:
-{{ toYaml .Values.resources | indent 10 }}
-    {{- if .Values.affinity }}
-      affinity:
-{{ toYaml .Values.affinity | indent 8 }}
-    {{- end }}
-    {{- if .Values.nodeSelector }}
-      nodeSelector:
-{{ toYaml .Values.nodeSelector | indent 8 }}
-    {{- end }}
-      tolerations:
-{{ toYaml .Values.tolerations | indent 8 }}
-      volumes:
-        - name: custom-nginx-template-volume
-          configMap:
-            name: {{ template "kong.fullname" . }}-default-custom-server-blocks
-{{- if (and (not .Values.ingressController.enabled) (eq .Values.env.database "off")) }}
-        - name: kong-custom-dbless-config-volume
-          configMap:
-            {{- if .Values.dblessConfig.configMap }}
-            name: {{ .Values.dblessConfig.configMap }}
-            {{- else }}
-            name: {{ template "kong.dblessConfig.fullname" . }}
-            {{- end }}
-{{- end }}
diff --git a/ric-infra/30-Kong/helm/kong/charts/kong/templates/ingress-admin.yaml b/ric-infra/30-Kong/helm/kong/charts/kong/templates/ingress-admin.yaml
deleted file mode 100755 (executable)
index 3ca0587..0000000
+++ /dev/null
@@ -1,33 +0,0 @@
-{{- if .Values.admin.ingress.enabled -}}
-{{- $serviceName := include "kong.fullname" . -}}
-{{- $servicePort := .Values.admin.servicePort -}}
-{{- $path := .Values.admin.ingress.path -}}
-apiVersion: networking.k8s.io/v1beta1
-kind: Ingress
-metadata:
-  name: {{ template "kong.fullname" . }}-admin
-  labels:
-    app: {{ template "kong.name" . }}
-    chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
-    release: "{{ .Release.Name }}"
-    heritage: "{{ .Release.Service }}"
-  annotations:
-    {{- range $key, $value := .Values.admin.ingress.annotations }}
-      {{ $key }}: {{ $value | quote }}
-    {{- end }}
-spec:
-  rules:
-    {{- range $host := .Values.admin.ingress.hosts }}
-    - host: {{ $host }}
-      http:
-        paths:
-          - path: {{ $path }}
-            backend:
-              serviceName: {{ $serviceName }}-admin
-              servicePort: {{ $servicePort }}
-    {{- end -}}
-  {{- if .Values.admin.ingress.tls }}
-  tls:
-{{ toYaml .Values.admin.ingress.tls | indent 4 }}
-  {{- end -}}
-{{- end -}}
diff --git a/ric-infra/30-Kong/helm/kong/charts/kong/templates/ingress-manager.yaml b/ric-infra/30-Kong/helm/kong/charts/kong/templates/ingress-manager.yaml
deleted file mode 100755 (executable)
index 76c798d..0000000
+++ /dev/null
@@ -1,35 +0,0 @@
-{{- if .Values.enterprise.enabled }}
-{{- if .Values.manager.ingress.enabled -}}
-{{- $serviceName := include "kong.fullname" . -}}
-{{- $servicePort := include "kong.ingress.servicePort" .Values.manager -}}
-{{- $path := .Values.manager.ingress.path -}}
-apiVersion: networking.k8s.io/v1beta1
-kind: Ingress
-metadata:
-  name: {{ template "kong.fullname" . }}-manager
-  labels:
-    app: {{ template "kong.name" . }}
-    chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
-    release: "{{ .Release.Name }}"
-    heritage: "{{ .Release.Service }}"
-  annotations:
-    {{- range $key, $value := .Values.manager.ingress.annotations }}
-      {{ $key }}: {{ $value | quote }}
-    {{- end }}
-spec:
-  rules:
-    {{- range $host := .Values.manager.ingress.hosts }}
-    - host: {{ $host }}
-      http:
-        paths:
-          - path: {{ $path }}
-            backend:
-              serviceName: {{ $serviceName }}-manager
-              servicePort: {{ $servicePort }}
-    {{- end -}}
-  {{- if .Values.manager.ingress.tls }}
-  tls:
-{{ toYaml .Values.manager.ingress.tls | indent 4 }}
-  {{- end -}}
-{{- end -}}
-{{- end -}}
diff --git a/ric-infra/30-Kong/helm/kong/charts/kong/templates/ingress-portal-api.yaml b/ric-infra/30-Kong/helm/kong/charts/kong/templates/ingress-portal-api.yaml
deleted file mode 100755 (executable)
index e6fa104..0000000
+++ /dev/null
@@ -1,35 +0,0 @@
-{{- if .Values.enterprise.enabled }}
-{{- if .Values.portalapi.ingress.enabled -}}
-{{- $serviceName := include "kong.fullname" . -}}
-{{- $servicePort := include "kong.ingress.servicePort" .Values.portalapi -}}
-{{- $path := .Values.portalapi.ingress.path -}}
-apiVersion: networking.k8s.io/v1beta1
-kind: Ingress
-metadata:
-  name: {{ template "kong.fullname" . }}-portalapi
-  labels:
-    app: {{ template "kong.name" . }}
-    chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
-    release: "{{ .Release.Name }}"
-    heritage: "{{ .Release.Service }}"
-  annotations:
-    {{- range $key, $value := .Values.portalapi.ingress.annotations }}
-      {{ $key }}: {{ $value | quote }}
-    {{- end }}
-spec:
-  rules:
-    {{- range $host := .Values.portalapi.ingress.hosts }}
-    - host: {{ $host }}
-      http:
-        paths:
-          - path: {{ $path }}
-            backend:
-              serviceName: {{ $serviceName }}-portalapi
-              servicePort: {{ $servicePort }}
-    {{- end -}}
-  {{- if .Values.portalapi.ingress.tls }}
-  tls:
-{{ toYaml .Values.portalapi.ingress.tls | indent 4 }}
-  {{- end -}}
-{{- end -}}
-{{- end -}}
diff --git a/ric-infra/30-Kong/helm/kong/charts/kong/templates/ingress-portal.yaml b/ric-infra/30-Kong/helm/kong/charts/kong/templates/ingress-portal.yaml
deleted file mode 100755 (executable)
index da399b5..0000000
+++ /dev/null
@@ -1,35 +0,0 @@
-{{- if .Values.enterprise.enabled }}
-{{- if .Values.portal.ingress.enabled -}}
-{{- $serviceName := include "kong.fullname" . -}}
-{{- $servicePort := include "kong.ingress.servicePort" .Values.portal -}}
-{{- $path := .Values.portal.ingress.path -}}
-apiVersion: networking.k8s.io/v1beta1
-kind: Ingress
-metadata:
-  name: {{ template "kong.fullname" . }}-portal
-  labels:
-    app: {{ template "kong.name" . }}
-    chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
-    release: "{{ .Release.Name }}"
-    heritage: "{{ .Release.Service }}"
-  annotations:
-    {{- range $key, $value := .Values.portal.ingress.annotations }}
-      {{ $key }}: {{ $value | quote }}
-    {{- end }}
-spec:
-  rules:
-    {{- range $host := .Values.portal.ingress.hosts }}
-    - host: {{ $host }}
-      http:
-        paths:
-          - path: {{ $path }}
-            backend:
-              serviceName: {{ $serviceName }}-portal
-              servicePort: {{ $servicePort }}
-    {{- end -}}
-  {{- if .Values.portal.ingress.tls }}
-  tls:
-{{ toYaml .Values.portal.ingress.tls | indent 4 }}
-  {{- end -}}
-{{- end -}}
-{{- end -}}
diff --git a/ric-infra/30-Kong/helm/kong/charts/kong/templates/migrations-post-upgrade.yaml b/ric-infra/30-Kong/helm/kong/charts/kong/templates/migrations-post-upgrade.yaml
deleted file mode 100755 (executable)
index dcc9b77..0000000
+++ /dev/null
@@ -1,76 +0,0 @@
-{{- if (and (.Values.runMigrations) (not (eq .Values.env.database "off"))) }}
-# Why is this Job duplicated and not using only helm hooks?
-# See: https://github.com/helm/charts/pull/7362
-apiVersion: batch/v1
-kind: Job
-metadata:
-  name: {{ template "kong.fullname" . }}-post-upgrade-migrations
-  labels:
-    app: {{ template "kong.name" . }}
-    chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
-    release: "{{ .Release.Name }}"
-    heritage: "{{ .Release.Service }}"
-    component: post-upgrade-migrations
-  annotations:
-    helm.sh/hook: "post-upgrade"
-    helm.sh/hook-delete-policy: "before-hook-creation"
-spec:
-  template:
-    metadata:
-      name: {{ template "kong.name" . }}-post-upgrade-migrations
-      labels:
-        app: {{ template "kong.name" . }}
-        release: "{{ .Release.Name }}"
-        component: post-upgrade-migrations
-    spec:
-      {{- if .Values.image.pullSecrets }}
-      imagePullSecrets:
-      {{- range .Values.image.pullSecrets }}
-        - name: {{ . }}
-      {{- end }}
-      {{- end }}
-      {{- if .Values.postgresql.enabled }}
-      initContainers:
-      - name: wait-for-postgres
-        image: "{{ .Values.waitImage.repository }}:{{ .Values.waitImage.tag }}"
-        env:
-        - name: KONG_PG_HOST
-          value: {{ template "kong.postgresql.fullname" . }}
-        - name: KONG_PG_PORT
-          value: "{{ .Values.postgresql.service.port }}"
-        - name: KONG_PG_PASSWORD
-          valueFrom:
-            secretKeyRef:
-              name: {{ template "kong.postgresql.fullname" . }}
-              key: postgresql-password
-        command: [ "/bin/sh", "-c", "until nc -zv $KONG_PG_HOST $KONG_PG_PORT -w1; do echo 'waiting for db'; sleep 1; done" ]
-      {{- end }}
-      containers:
-      - name: {{ template "kong.name" . }}-post-upgrade-migrations
-        image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
-        imagePullPolicy: {{ .Values.image.pullPolicy }}
-        env:
-        - name: KONG_NGINX_DAEMON
-          value: "off"
-        {{- if .Values.enterprise.enabled }}
-        {{- include "kong.license" . | nindent 8 }}
-        {{- end }}
-        {{- if .Values.postgresql.enabled }}
-        - name: KONG_PG_HOST
-          value: {{ template "kong.postgresql.fullname" . }}
-        - name: KONG_PG_PORT
-          value: "{{ .Values.postgresql.service.port }}"
-        - name: KONG_PG_PASSWORD
-          valueFrom:
-            secretKeyRef:
-              name: {{ template "kong.postgresql.fullname" . }}
-              key: postgresql-password
-        {{- end }}
-        {{- if .Values.cassandra.enabled }}
-        - name: KONG_CASSANDRA_CONTACT_POINTS
-          value: {{ template "kong.cassandra.fullname" . }}
-        {{- end }}
-        {{- include "kong.env" .  | indent 8 }}
-        command: [ "/bin/sh", "-c", "kong migrations finish" ]
-      restartPolicy: OnFailure
-{{- end }}
diff --git a/ric-infra/30-Kong/helm/kong/charts/kong/templates/migrations-pre-upgrade.yaml b/ric-infra/30-Kong/helm/kong/charts/kong/templates/migrations-pre-upgrade.yaml
deleted file mode 100755 (executable)
index 1839871..0000000
+++ /dev/null
@@ -1,76 +0,0 @@
-{{- if (and (.Values.runMigrations) (not (eq .Values.env.database "off"))) }}
-# Why is this Job duplicated and not using only helm hooks?
-# See: https://github.com/helm/charts/pull/7362
-apiVersion: batch/v1
-kind: Job
-metadata:
-  name: {{ template "kong.fullname" . }}-pre-upgrade-migrations
-  labels:
-    app: {{ template "kong.name" . }}
-    chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
-    release: "{{ .Release.Name }}"
-    heritage: "{{ .Release.Service }}"
-    component: pre-upgrade-migrations
-  annotations:
-    helm.sh/hook: "pre-upgrade"
-    helm.sh/hook-delete-policy: "before-hook-creation"
-spec:
-  template:
-    metadata:
-      name: {{ template "kong.name" . }}-pre-upgrade-migrations
-      labels:
-        app: {{ template "kong.name" . }}
-        release: "{{ .Release.Name }}"
-        component: pre-upgrade-migrations
-    spec:
-      {{- if .Values.image.pullSecrets }}
-      imagePullSecrets:
-      {{- range .Values.image.pullSecrets }}
-        - name: {{ . }}
-      {{- end }}
-      {{- end }}
-      {{- if .Values.postgresql.enabled }}
-      initContainers:
-      - name: wait-for-postgres
-        image: "{{ .Values.waitImage.repository }}:{{ .Values.waitImage.tag }}"
-        env:
-        - name: KONG_PG_HOST
-          value: {{ template "kong.postgresql.fullname" . }}
-        - name: KONG_PG_PORT
-          value: "{{ .Values.postgresql.service.port }}"
-        - name: KONG_PG_PASSWORD
-          valueFrom:
-            secretKeyRef:
-              name: {{ template "kong.postgresql.fullname" . }}
-              key: postgresql-password
-        command: [ "/bin/sh", "-c", "until nc -zv $KONG_PG_HOST $KONG_PG_PORT -w1; do echo 'waiting for db'; sleep 1; done" ]
-      {{- end }}
-      containers:
-      - name: {{ template "kong.name" . }}-upgrade-migrations
-        image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
-        imagePullPolicy: {{ .Values.image.pullPolicy }}
-        env:
-        - name: KONG_NGINX_DAEMON
-          value: "off"
-        {{- if .Values.enterprise.enabled }}
-        {{- include "kong.license" . | nindent 8 }}
-        {{- end }}
-        {{- if .Values.postgresql.enabled }}
-        - name: KONG_PG_HOST
-          value: {{ template "kong.postgresql.fullname" . }}
-        - name: KONG_PG_PORT
-          value: "{{ .Values.postgresql.service.port }}"
-        - name: KONG_PG_PASSWORD
-          valueFrom:
-            secretKeyRef:
-              name: {{ template "kong.postgresql.fullname" . }}
-              key: postgresql-password
-        {{- end }}
-        {{- if .Values.cassandra.enabled }}
-        - name: KONG_CASSANDRA_CONTACT_POINTS
-          value: {{ template "kong.cassandra.fullname" . }}
-        {{- end }}
-        {{- include "kong.env" .  | indent 8 }}
-        command: [ "/bin/sh", "-c", "kong migrations up" ]
-      restartPolicy: OnFailure
-{{- end }}
diff --git a/ric-infra/30-Kong/helm/kong/charts/kong/templates/migrations.yaml b/ric-infra/30-Kong/helm/kong/charts/kong/templates/migrations.yaml
deleted file mode 100755 (executable)
index 76c9b29..0000000
+++ /dev/null
@@ -1,71 +0,0 @@
-{{- if (and (.Values.runMigrations) (not (eq .Values.env.database "off"))) }}
-apiVersion: batch/v1
-kind: Job
-metadata:
-  name: {{ template "kong.fullname" . }}-init-migrations
-  labels:
-    app: {{ template "kong.name" . }}
-    chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
-    release: "{{ .Release.Name }}"
-    heritage: "{{ .Release.Service }}"
-    component: init-migrations
-spec:
-  template:
-    metadata:
-      name: {{ template "kong.name" . }}-init-migrations
-      labels:
-        app: {{ template "kong.name" . }}
-        release: "{{ .Release.Name }}"
-        component: init-migrations
-    spec:
-      {{- if .Values.image.pullSecrets }}
-      imagePullSecrets:
-      {{- range .Values.image.pullSecrets }}
-        - name: {{ . }}
-      {{- end }}
-      {{- end }}
-      {{- if .Values.postgresql.enabled }}
-      initContainers:
-      - name: wait-for-postgres
-        image: "{{ .Values.waitImage.repository }}:{{ .Values.waitImage.tag }}"
-        env:
-        - name: KONG_PG_HOST
-          value: {{ template "kong.postgresql.fullname" . }}
-        - name: KONG_PG_PORT
-          value: "{{ .Values.postgresql.service.port }}"
-        - name: KONG_PG_PASSWORD
-          valueFrom:
-            secretKeyRef:
-              name: {{ template "kong.postgresql.fullname" . }}
-              key: postgresql-password
-        command: [ "/bin/sh", "-c", "until nc -zv $KONG_PG_HOST $KONG_PG_PORT -w1; do echo 'waiting for db'; sleep 1; done" ]
-      {{- end }}
-      containers:
-      - name: {{ template "kong.name" . }}-migrations
-        image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
-        imagePullPolicy: {{ .Values.image.pullPolicy }}
-        env:
-        - name: KONG_NGINX_DAEMON
-          value: "off"
-        {{- if .Values.enterprise.enabled }}
-        {{- include "kong.license" . | nindent 8 }}
-        {{- end }}
-        {{- if .Values.postgresql.enabled }}
-        - name: KONG_PG_HOST
-          value: {{ template "kong.postgresql.fullname" . }}
-        - name: KONG_PG_PORT
-          value: "{{ .Values.postgresql.service.port }}"
-        - name: KONG_PG_PASSWORD
-          valueFrom:
-            secretKeyRef:
-              name: {{ template "kong.postgresql.fullname" . }}
-              key: postgresql-password
-        {{- end }}
-        {{- if .Values.cassandra.enabled }}
-        - name: KONG_CASSANDRA_CONTACT_POINTS
-          value: {{ template "kong.cassandra.fullname" . }}
-        {{- end }}
-        {{- include "kong.env" .  | indent 8 }}
-        command: [ "/bin/sh", "-c", "kong migrations bootstrap" ]
-      restartPolicy: OnFailure
-{{- end }}
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-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/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-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