From: wrider Date: Fri, 23 Aug 2019 05:09:40 +0000 (-0400) Subject: Move Kong to infra deployment X-Git-Tag: 0.0.2~27^2 X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=commitdiff_plain;h=ef05762e72bf0af584301bf58b2035f7ac4e3842;p=it%2Fdep.git Move Kong to infra deployment If we keep Kong in ricplt and ricxapp spaces, when we deploy both groups on the same k8s cluster, we will have two Kongs and they overlap because both by default monitors all NSs. In new version of Docker, one will actually "kill" the other, leaving the ingresses for the dead Kong without ingress controller. Moving to ric-infra we will only run it once and one Kong is deployed. Also modified common template's ingress controller port number def. Now there is only one port defined. Change-Id: I337107fb7772afc0ed9d495ae791b4b1e7f3a7b3 Signed-off-by: wrider --- diff --git a/ric-aux/80-Auxiliary-Functions/bin/install b/ric-aux/80-Auxiliary-Functions/bin/install index aaa1bd48..eae092cf 100755 --- a/ric-aux/80-Auxiliary-Functions/bin/install +++ b/ric-aux/80-Auxiliary-Functions/bin/install @@ -59,7 +59,7 @@ else COMMON_OVERRIDE=$RIC_COMMON_OVERRIDE fi -RICAUX_COMPONENTS="dashboard ves message-router kong" +RICAUX_COMPONENTS="dashboard ves message-router" echo "Deploying RIC AUX components [$RICAUX_COMPONENTS]" echo "Helm Release Name: $RELEASE_NAME" diff --git a/ric-aux/80-Auxiliary-Functions/bin/uninstall b/ric-aux/80-Auxiliary-Functions/bin/uninstall index a606d5f7..c86e42b3 100755 --- a/ric-aux/80-Auxiliary-Functions/bin/uninstall +++ b/ric-aux/80-Auxiliary-Functions/bin/uninstall @@ -30,7 +30,7 @@ else RELEASE_NAME=$RICAUX_RELEASE_NAME fi -RICAUX_COMPONENTS="dashboard message-router ves kong" +RICAUX_COMPONENTS="dashboard message-router ves" echo "Undeploying RIC AUX components [$RICAUX_COMPONENTS]" echo "Helm Release Name: $RELEASE_NAME" diff --git a/ric-aux/85-Ext-Services/helm/extsvcaux/templates/services-helm.yaml b/ric-aux/85-Ext-Services/helm/extsvcaux/templates/services-helm.yaml index e1a24b45..cd1fa902 100644 --- a/ric-aux/85-Ext-Services/helm/extsvcaux/templates/services-helm.yaml +++ b/ric-aux/85-Ext-Services/helm/extsvcaux/templates/services-helm.yaml @@ -39,7 +39,7 @@ subsets: - addresses: - ip: "{{ .Values.extsvcaux.auxip }}" ports: - - port: {{ include "common.ingresshttpport.aux" . }} + - port: {{ include "common.ingresshttpport" . }} name: {{ include "common.ingressurl.helm" . }}-http-ingress-port - - port: {{ include "common.ingresshttpsport.aux" . }} + - port: {{ include "common.ingresshttpsport" . }} name: {{ include "common.ingressurl.helm" . }}-https-ingress-port diff --git a/ric-aux/85-Ext-Services/helm/extsvcaux/templates/services-ric.yaml b/ric-aux/85-Ext-Services/helm/extsvcaux/templates/services-ric.yaml index 243853f1..7047cd7c 100644 --- a/ric-aux/85-Ext-Services/helm/extsvcaux/templates/services-ric.yaml +++ b/ric-aux/85-Ext-Services/helm/extsvcaux/templates/services-ric.yaml @@ -39,7 +39,7 @@ subsets: - addresses: - ip: "{{ .Values.extsvcaux.ricip }}" ports: - - port: {{ include "common.ingresshttpport.ric" . }} + - port: {{ include "common.ingresshttpport" . }} name: {{ include "common.ingressurl.ric" . }}-http-ingress-port - - port: {{ include "common.ingresshttpsport.ric" . }} + - port: {{ include "common.ingresshttpsport" . }} name: {{ include "common.ingressurl.ric" . }}-https-ingress-port diff --git a/ric-common/Common-Template/helm/ric-common/templates/_ingresscontroller.tpl b/ric-common/Common-Template/helm/ric-common/templates/_ingresscontroller.tpl index 2106fa4d..96858a92 100644 --- a/ric-common/Common-Template/helm/ric-common/templates/_ingresscontroller.tpl +++ b/ric-common/Common-Template/helm/ric-common/templates/_ingresscontroller.tpl @@ -80,20 +80,11 @@ ## 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.ric" -}} - {{- printf "31080" -}} -{{- end -}} - -{{- define "common.ingresshttpsport.ric" -}} - {{- printf "31443" -}} -{{- end -}} - - -{{- define "common.ingresshttpport.aux" -}} +{{- define "common.ingresshttpport" -}} {{- printf "32080" -}} {{- end -}} -{{- define "common.ingresshttpsport.aux" -}} +{{- define "common.ingresshttpsport" -}} {{- printf "32443" -}} {{- end -}} diff --git a/ric-aux/80-Auxiliary-Functions/helm/kong/.helmignore b/ric-infra/25-tiller/helm/.helmignore similarity index 100% rename from ric-aux/80-Auxiliary-Functions/helm/kong/.helmignore rename to ric-infra/25-tiller/helm/.helmignore diff --git a/ric-platform/50-RIC-Platform/helm/kong/.helmignore b/ric-infra/25-tiller/helm/kong/.helmignore similarity index 100% rename from ric-platform/50-RIC-Platform/helm/kong/.helmignore rename to ric-infra/25-tiller/helm/kong/.helmignore diff --git a/ric-aux/80-Auxiliary-Functions/helm/kong/Chart.yaml b/ric-infra/25-tiller/helm/kong/Chart.yaml similarity index 100% rename from ric-aux/80-Auxiliary-Functions/helm/kong/Chart.yaml rename to ric-infra/25-tiller/helm/kong/Chart.yaml diff --git a/ric-aux/80-Auxiliary-Functions/helm/kong/charts/kong/.helmignore b/ric-infra/25-tiller/helm/kong/charts/kong/.helmignore similarity index 100% rename from ric-aux/80-Auxiliary-Functions/helm/kong/charts/kong/.helmignore rename to ric-infra/25-tiller/helm/kong/charts/kong/.helmignore diff --git a/ric-aux/80-Auxiliary-Functions/helm/kong/charts/kong/Chart.yaml b/ric-infra/25-tiller/helm/kong/charts/kong/Chart.yaml similarity index 100% rename from ric-aux/80-Auxiliary-Functions/helm/kong/charts/kong/Chart.yaml rename to ric-infra/25-tiller/helm/kong/charts/kong/Chart.yaml diff --git a/ric-aux/80-Auxiliary-Functions/helm/kong/charts/kong/README.md b/ric-infra/25-tiller/helm/kong/charts/kong/README.md similarity index 100% rename from ric-aux/80-Auxiliary-Functions/helm/kong/charts/kong/README.md rename to ric-infra/25-tiller/helm/kong/charts/kong/README.md diff --git a/ric-aux/80-Auxiliary-Functions/helm/kong/charts/kong/charts/cassandra/.helmignore b/ric-infra/25-tiller/helm/kong/charts/kong/charts/cassandra/.helmignore similarity index 100% rename from ric-aux/80-Auxiliary-Functions/helm/kong/charts/kong/charts/cassandra/.helmignore rename to ric-infra/25-tiller/helm/kong/charts/kong/charts/cassandra/.helmignore diff --git a/ric-aux/80-Auxiliary-Functions/helm/kong/charts/kong/charts/cassandra/Chart.yaml b/ric-infra/25-tiller/helm/kong/charts/kong/charts/cassandra/Chart.yaml similarity index 100% rename from ric-aux/80-Auxiliary-Functions/helm/kong/charts/kong/charts/cassandra/Chart.yaml rename to ric-infra/25-tiller/helm/kong/charts/kong/charts/cassandra/Chart.yaml diff --git a/ric-aux/80-Auxiliary-Functions/helm/kong/charts/kong/charts/cassandra/README.md b/ric-infra/25-tiller/helm/kong/charts/kong/charts/cassandra/README.md similarity index 100% rename from ric-aux/80-Auxiliary-Functions/helm/kong/charts/kong/charts/cassandra/README.md rename to ric-infra/25-tiller/helm/kong/charts/kong/charts/cassandra/README.md diff --git a/ric-aux/80-Auxiliary-Functions/helm/kong/charts/kong/charts/cassandra/sample/create-storage-gce.yaml b/ric-infra/25-tiller/helm/kong/charts/kong/charts/cassandra/sample/create-storage-gce.yaml similarity index 100% rename from ric-aux/80-Auxiliary-Functions/helm/kong/charts/kong/charts/cassandra/sample/create-storage-gce.yaml rename to ric-infra/25-tiller/helm/kong/charts/kong/charts/cassandra/sample/create-storage-gce.yaml diff --git a/ric-aux/80-Auxiliary-Functions/helm/kong/charts/kong/charts/cassandra/templates/NOTES.txt b/ric-infra/25-tiller/helm/kong/charts/kong/charts/cassandra/templates/NOTES.txt similarity index 100% rename from ric-aux/80-Auxiliary-Functions/helm/kong/charts/kong/charts/cassandra/templates/NOTES.txt rename to ric-infra/25-tiller/helm/kong/charts/kong/charts/cassandra/templates/NOTES.txt diff --git a/ric-aux/80-Auxiliary-Functions/helm/kong/charts/kong/charts/cassandra/templates/_helpers.tpl b/ric-infra/25-tiller/helm/kong/charts/kong/charts/cassandra/templates/_helpers.tpl similarity index 100% rename from ric-aux/80-Auxiliary-Functions/helm/kong/charts/kong/charts/cassandra/templates/_helpers.tpl rename to ric-infra/25-tiller/helm/kong/charts/kong/charts/cassandra/templates/_helpers.tpl diff --git a/ric-aux/80-Auxiliary-Functions/helm/kong/charts/kong/charts/cassandra/templates/backup/cronjob.yaml b/ric-infra/25-tiller/helm/kong/charts/kong/charts/cassandra/templates/backup/cronjob.yaml similarity index 100% rename from ric-aux/80-Auxiliary-Functions/helm/kong/charts/kong/charts/cassandra/templates/backup/cronjob.yaml rename to ric-infra/25-tiller/helm/kong/charts/kong/charts/cassandra/templates/backup/cronjob.yaml diff --git a/ric-aux/80-Auxiliary-Functions/helm/kong/charts/kong/charts/cassandra/templates/backup/rbac.yaml b/ric-infra/25-tiller/helm/kong/charts/kong/charts/cassandra/templates/backup/rbac.yaml similarity index 100% rename from ric-aux/80-Auxiliary-Functions/helm/kong/charts/kong/charts/cassandra/templates/backup/rbac.yaml rename to ric-infra/25-tiller/helm/kong/charts/kong/charts/cassandra/templates/backup/rbac.yaml diff --git a/ric-aux/80-Auxiliary-Functions/helm/kong/charts/kong/charts/cassandra/templates/configmap.yaml b/ric-infra/25-tiller/helm/kong/charts/kong/charts/cassandra/templates/configmap.yaml similarity index 100% rename from ric-aux/80-Auxiliary-Functions/helm/kong/charts/kong/charts/cassandra/templates/configmap.yaml rename to ric-infra/25-tiller/helm/kong/charts/kong/charts/cassandra/templates/configmap.yaml diff --git a/ric-aux/80-Auxiliary-Functions/helm/kong/charts/kong/charts/cassandra/templates/pdb.yaml b/ric-infra/25-tiller/helm/kong/charts/kong/charts/cassandra/templates/pdb.yaml similarity index 100% rename from ric-aux/80-Auxiliary-Functions/helm/kong/charts/kong/charts/cassandra/templates/pdb.yaml rename to ric-infra/25-tiller/helm/kong/charts/kong/charts/cassandra/templates/pdb.yaml diff --git a/ric-aux/80-Auxiliary-Functions/helm/kong/charts/kong/charts/cassandra/templates/service.yaml b/ric-infra/25-tiller/helm/kong/charts/kong/charts/cassandra/templates/service.yaml similarity index 100% rename from ric-aux/80-Auxiliary-Functions/helm/kong/charts/kong/charts/cassandra/templates/service.yaml rename to ric-infra/25-tiller/helm/kong/charts/kong/charts/cassandra/templates/service.yaml diff --git a/ric-aux/80-Auxiliary-Functions/helm/kong/charts/kong/charts/cassandra/templates/statefulset.yaml b/ric-infra/25-tiller/helm/kong/charts/kong/charts/cassandra/templates/statefulset.yaml similarity index 100% rename from ric-aux/80-Auxiliary-Functions/helm/kong/charts/kong/charts/cassandra/templates/statefulset.yaml rename to ric-infra/25-tiller/helm/kong/charts/kong/charts/cassandra/templates/statefulset.yaml diff --git a/ric-aux/80-Auxiliary-Functions/helm/kong/charts/kong/charts/cassandra/values.yaml b/ric-infra/25-tiller/helm/kong/charts/kong/charts/cassandra/values.yaml similarity index 100% rename from ric-aux/80-Auxiliary-Functions/helm/kong/charts/kong/charts/cassandra/values.yaml rename to ric-infra/25-tiller/helm/kong/charts/kong/charts/cassandra/values.yaml diff --git a/ric-aux/80-Auxiliary-Functions/helm/kong/charts/kong/charts/postgresql/.helmignore b/ric-infra/25-tiller/helm/kong/charts/kong/charts/postgresql/.helmignore similarity index 100% rename from ric-aux/80-Auxiliary-Functions/helm/kong/charts/kong/charts/postgresql/.helmignore rename to ric-infra/25-tiller/helm/kong/charts/kong/charts/postgresql/.helmignore diff --git a/ric-aux/80-Auxiliary-Functions/helm/kong/charts/kong/charts/postgresql/Chart.yaml b/ric-infra/25-tiller/helm/kong/charts/kong/charts/postgresql/Chart.yaml similarity index 100% rename from ric-aux/80-Auxiliary-Functions/helm/kong/charts/kong/charts/postgresql/Chart.yaml rename to ric-infra/25-tiller/helm/kong/charts/kong/charts/postgresql/Chart.yaml diff --git a/ric-aux/80-Auxiliary-Functions/helm/kong/charts/kong/charts/postgresql/README.md b/ric-infra/25-tiller/helm/kong/charts/kong/charts/postgresql/README.md similarity index 100% rename from ric-aux/80-Auxiliary-Functions/helm/kong/charts/kong/charts/postgresql/README.md rename to ric-infra/25-tiller/helm/kong/charts/kong/charts/postgresql/README.md diff --git a/ric-aux/80-Auxiliary-Functions/helm/kong/charts/kong/charts/postgresql/files/README.md b/ric-infra/25-tiller/helm/kong/charts/kong/charts/postgresql/files/README.md similarity index 100% rename from ric-aux/80-Auxiliary-Functions/helm/kong/charts/kong/charts/postgresql/files/README.md rename to ric-infra/25-tiller/helm/kong/charts/kong/charts/postgresql/files/README.md diff --git a/ric-aux/80-Auxiliary-Functions/helm/kong/charts/kong/charts/postgresql/files/conf.d/README.md b/ric-infra/25-tiller/helm/kong/charts/kong/charts/postgresql/files/conf.d/README.md similarity index 100% rename from ric-aux/80-Auxiliary-Functions/helm/kong/charts/kong/charts/postgresql/files/conf.d/README.md rename to ric-infra/25-tiller/helm/kong/charts/kong/charts/postgresql/files/conf.d/README.md diff --git a/ric-aux/80-Auxiliary-Functions/helm/kong/charts/kong/charts/postgresql/files/docker-entrypoint-initdb.d/README.md b/ric-infra/25-tiller/helm/kong/charts/kong/charts/postgresql/files/docker-entrypoint-initdb.d/README.md similarity index 100% rename from ric-aux/80-Auxiliary-Functions/helm/kong/charts/kong/charts/postgresql/files/docker-entrypoint-initdb.d/README.md rename to ric-infra/25-tiller/helm/kong/charts/kong/charts/postgresql/files/docker-entrypoint-initdb.d/README.md diff --git a/ric-aux/80-Auxiliary-Functions/helm/kong/charts/kong/charts/postgresql/templates/NOTES.txt b/ric-infra/25-tiller/helm/kong/charts/kong/charts/postgresql/templates/NOTES.txt similarity index 100% rename from ric-aux/80-Auxiliary-Functions/helm/kong/charts/kong/charts/postgresql/templates/NOTES.txt rename to ric-infra/25-tiller/helm/kong/charts/kong/charts/postgresql/templates/NOTES.txt diff --git a/ric-aux/80-Auxiliary-Functions/helm/kong/charts/kong/charts/postgresql/templates/_helpers.tpl b/ric-infra/25-tiller/helm/kong/charts/kong/charts/postgresql/templates/_helpers.tpl similarity index 100% rename from ric-aux/80-Auxiliary-Functions/helm/kong/charts/kong/charts/postgresql/templates/_helpers.tpl rename to ric-infra/25-tiller/helm/kong/charts/kong/charts/postgresql/templates/_helpers.tpl diff --git a/ric-aux/80-Auxiliary-Functions/helm/kong/charts/kong/charts/postgresql/templates/configmap.yaml b/ric-infra/25-tiller/helm/kong/charts/kong/charts/postgresql/templates/configmap.yaml similarity index 100% rename from ric-aux/80-Auxiliary-Functions/helm/kong/charts/kong/charts/postgresql/templates/configmap.yaml rename to ric-infra/25-tiller/helm/kong/charts/kong/charts/postgresql/templates/configmap.yaml diff --git a/ric-aux/80-Auxiliary-Functions/helm/kong/charts/kong/charts/postgresql/templates/extended-config-configmap.yaml b/ric-infra/25-tiller/helm/kong/charts/kong/charts/postgresql/templates/extended-config-configmap.yaml similarity index 100% rename from ric-aux/80-Auxiliary-Functions/helm/kong/charts/kong/charts/postgresql/templates/extended-config-configmap.yaml rename to ric-infra/25-tiller/helm/kong/charts/kong/charts/postgresql/templates/extended-config-configmap.yaml diff --git a/ric-aux/80-Auxiliary-Functions/helm/kong/charts/kong/charts/postgresql/templates/initialization-configmap.yaml b/ric-infra/25-tiller/helm/kong/charts/kong/charts/postgresql/templates/initialization-configmap.yaml similarity index 100% rename from ric-aux/80-Auxiliary-Functions/helm/kong/charts/kong/charts/postgresql/templates/initialization-configmap.yaml rename to ric-infra/25-tiller/helm/kong/charts/kong/charts/postgresql/templates/initialization-configmap.yaml diff --git a/ric-aux/80-Auxiliary-Functions/helm/kong/charts/kong/charts/postgresql/templates/metrics-svc.yaml b/ric-infra/25-tiller/helm/kong/charts/kong/charts/postgresql/templates/metrics-svc.yaml similarity index 100% rename from ric-aux/80-Auxiliary-Functions/helm/kong/charts/kong/charts/postgresql/templates/metrics-svc.yaml rename to ric-infra/25-tiller/helm/kong/charts/kong/charts/postgresql/templates/metrics-svc.yaml diff --git a/ric-aux/80-Auxiliary-Functions/helm/kong/charts/kong/charts/postgresql/templates/networkpolicy.yaml b/ric-infra/25-tiller/helm/kong/charts/kong/charts/postgresql/templates/networkpolicy.yaml similarity index 100% rename from ric-aux/80-Auxiliary-Functions/helm/kong/charts/kong/charts/postgresql/templates/networkpolicy.yaml rename to ric-infra/25-tiller/helm/kong/charts/kong/charts/postgresql/templates/networkpolicy.yaml diff --git a/ric-aux/80-Auxiliary-Functions/helm/kong/charts/kong/charts/postgresql/templates/secrets.yaml b/ric-infra/25-tiller/helm/kong/charts/kong/charts/postgresql/templates/secrets.yaml similarity index 100% rename from ric-aux/80-Auxiliary-Functions/helm/kong/charts/kong/charts/postgresql/templates/secrets.yaml rename to ric-infra/25-tiller/helm/kong/charts/kong/charts/postgresql/templates/secrets.yaml diff --git a/ric-aux/80-Auxiliary-Functions/helm/kong/charts/kong/charts/postgresql/templates/statefulset-slaves.yaml b/ric-infra/25-tiller/helm/kong/charts/kong/charts/postgresql/templates/statefulset-slaves.yaml similarity index 100% rename from ric-aux/80-Auxiliary-Functions/helm/kong/charts/kong/charts/postgresql/templates/statefulset-slaves.yaml rename to ric-infra/25-tiller/helm/kong/charts/kong/charts/postgresql/templates/statefulset-slaves.yaml diff --git a/ric-aux/80-Auxiliary-Functions/helm/kong/charts/kong/charts/postgresql/templates/statefulset.yaml b/ric-infra/25-tiller/helm/kong/charts/kong/charts/postgresql/templates/statefulset.yaml similarity index 100% rename from ric-aux/80-Auxiliary-Functions/helm/kong/charts/kong/charts/postgresql/templates/statefulset.yaml rename to ric-infra/25-tiller/helm/kong/charts/kong/charts/postgresql/templates/statefulset.yaml diff --git a/ric-aux/80-Auxiliary-Functions/helm/kong/charts/kong/charts/postgresql/templates/svc-headless.yaml b/ric-infra/25-tiller/helm/kong/charts/kong/charts/postgresql/templates/svc-headless.yaml similarity index 100% rename from ric-aux/80-Auxiliary-Functions/helm/kong/charts/kong/charts/postgresql/templates/svc-headless.yaml rename to ric-infra/25-tiller/helm/kong/charts/kong/charts/postgresql/templates/svc-headless.yaml diff --git a/ric-aux/80-Auxiliary-Functions/helm/kong/charts/kong/charts/postgresql/templates/svc-read.yaml b/ric-infra/25-tiller/helm/kong/charts/kong/charts/postgresql/templates/svc-read.yaml similarity index 100% rename from ric-aux/80-Auxiliary-Functions/helm/kong/charts/kong/charts/postgresql/templates/svc-read.yaml rename to ric-infra/25-tiller/helm/kong/charts/kong/charts/postgresql/templates/svc-read.yaml diff --git a/ric-aux/80-Auxiliary-Functions/helm/kong/charts/kong/charts/postgresql/templates/svc.yaml b/ric-infra/25-tiller/helm/kong/charts/kong/charts/postgresql/templates/svc.yaml similarity index 100% rename from ric-aux/80-Auxiliary-Functions/helm/kong/charts/kong/charts/postgresql/templates/svc.yaml rename to ric-infra/25-tiller/helm/kong/charts/kong/charts/postgresql/templates/svc.yaml diff --git a/ric-aux/80-Auxiliary-Functions/helm/kong/charts/kong/charts/postgresql/values-production.yaml b/ric-infra/25-tiller/helm/kong/charts/kong/charts/postgresql/values-production.yaml similarity index 100% rename from ric-aux/80-Auxiliary-Functions/helm/kong/charts/kong/charts/postgresql/values-production.yaml rename to ric-infra/25-tiller/helm/kong/charts/kong/charts/postgresql/values-production.yaml diff --git a/ric-aux/80-Auxiliary-Functions/helm/kong/charts/kong/charts/postgresql/values.yaml b/ric-infra/25-tiller/helm/kong/charts/kong/charts/postgresql/values.yaml similarity index 100% rename from ric-aux/80-Auxiliary-Functions/helm/kong/charts/kong/charts/postgresql/values.yaml rename to ric-infra/25-tiller/helm/kong/charts/kong/charts/postgresql/values.yaml diff --git a/ric-aux/80-Auxiliary-Functions/helm/kong/charts/kong/ci/cassandra.yaml b/ric-infra/25-tiller/helm/kong/charts/kong/ci/cassandra.yaml similarity index 100% rename from ric-aux/80-Auxiliary-Functions/helm/kong/charts/kong/ci/cassandra.yaml rename to ric-infra/25-tiller/helm/kong/charts/kong/ci/cassandra.yaml diff --git a/ric-aux/80-Auxiliary-Functions/helm/kong/charts/kong/ci/dbless.yaml b/ric-infra/25-tiller/helm/kong/charts/kong/ci/dbless.yaml similarity index 100% rename from ric-aux/80-Auxiliary-Functions/helm/kong/charts/kong/ci/dbless.yaml rename to ric-infra/25-tiller/helm/kong/charts/kong/ci/dbless.yaml diff --git a/ric-aux/80-Auxiliary-Functions/helm/kong/charts/kong/ci/default-values.yaml b/ric-infra/25-tiller/helm/kong/charts/kong/ci/default-values.yaml similarity index 100% rename from ric-aux/80-Auxiliary-Functions/helm/kong/charts/kong/ci/default-values.yaml rename to ric-infra/25-tiller/helm/kong/charts/kong/ci/default-values.yaml diff --git a/ric-aux/80-Auxiliary-Functions/helm/kong/charts/kong/ci/ingressController-values.yaml b/ric-infra/25-tiller/helm/kong/charts/kong/ci/ingressController-values.yaml similarity index 100% rename from ric-aux/80-Auxiliary-Functions/helm/kong/charts/kong/ci/ingressController-values.yaml rename to ric-infra/25-tiller/helm/kong/charts/kong/ci/ingressController-values.yaml diff --git a/ric-aux/80-Auxiliary-Functions/helm/kong/charts/kong/ci/loadbalancer-values.yaml b/ric-infra/25-tiller/helm/kong/charts/kong/ci/loadbalancer-values.yaml similarity index 100% rename from ric-aux/80-Auxiliary-Functions/helm/kong/charts/kong/ci/loadbalancer-values.yaml rename to ric-infra/25-tiller/helm/kong/charts/kong/ci/loadbalancer-values.yaml diff --git a/ric-aux/80-Auxiliary-Functions/helm/kong/charts/kong/requirements.yaml b/ric-infra/25-tiller/helm/kong/charts/kong/requirements.yaml similarity index 100% rename from ric-aux/80-Auxiliary-Functions/helm/kong/charts/kong/requirements.yaml rename to ric-infra/25-tiller/helm/kong/charts/kong/requirements.yaml diff --git a/ric-aux/80-Auxiliary-Functions/helm/kong/charts/kong/templates/NOTES.txt b/ric-infra/25-tiller/helm/kong/charts/kong/templates/NOTES.txt similarity index 100% rename from ric-aux/80-Auxiliary-Functions/helm/kong/charts/kong/templates/NOTES.txt rename to ric-infra/25-tiller/helm/kong/charts/kong/templates/NOTES.txt diff --git a/ric-aux/80-Auxiliary-Functions/helm/kong/charts/kong/templates/_helpers.tpl b/ric-infra/25-tiller/helm/kong/charts/kong/templates/_helpers.tpl similarity index 100% rename from ric-aux/80-Auxiliary-Functions/helm/kong/charts/kong/templates/_helpers.tpl rename to ric-infra/25-tiller/helm/kong/charts/kong/templates/_helpers.tpl diff --git a/ric-aux/80-Auxiliary-Functions/helm/kong/charts/kong/templates/controller-cluster-role.yaml b/ric-infra/25-tiller/helm/kong/charts/kong/templates/controller-cluster-role.yaml similarity index 100% rename from ric-aux/80-Auxiliary-Functions/helm/kong/charts/kong/templates/controller-cluster-role.yaml rename to ric-infra/25-tiller/helm/kong/charts/kong/templates/controller-cluster-role.yaml diff --git a/ric-aux/80-Auxiliary-Functions/helm/kong/charts/kong/templates/controller-deployment.yaml b/ric-infra/25-tiller/helm/kong/charts/kong/templates/controller-deployment.yaml similarity index 100% rename from ric-aux/80-Auxiliary-Functions/helm/kong/charts/kong/templates/controller-deployment.yaml rename to ric-infra/25-tiller/helm/kong/charts/kong/templates/controller-deployment.yaml diff --git a/ric-aux/80-Auxiliary-Functions/helm/kong/charts/kong/templates/controller-rbac-cluster-role-binding.yaml b/ric-infra/25-tiller/helm/kong/charts/kong/templates/controller-rbac-cluster-role-binding.yaml similarity index 100% rename from ric-aux/80-Auxiliary-Functions/helm/kong/charts/kong/templates/controller-rbac-cluster-role-binding.yaml rename to ric-infra/25-tiller/helm/kong/charts/kong/templates/controller-rbac-cluster-role-binding.yaml diff --git a/ric-aux/80-Auxiliary-Functions/helm/kong/charts/kong/templates/controller-rbac-role-binding.yaml b/ric-infra/25-tiller/helm/kong/charts/kong/templates/controller-rbac-role-binding.yaml similarity index 100% rename from ric-aux/80-Auxiliary-Functions/helm/kong/charts/kong/templates/controller-rbac-role-binding.yaml rename to ric-infra/25-tiller/helm/kong/charts/kong/templates/controller-rbac-role-binding.yaml diff --git a/ric-aux/80-Auxiliary-Functions/helm/kong/charts/kong/templates/controller-rbac-role.yaml b/ric-infra/25-tiller/helm/kong/charts/kong/templates/controller-rbac-role.yaml similarity index 100% rename from ric-aux/80-Auxiliary-Functions/helm/kong/charts/kong/templates/controller-rbac-role.yaml rename to ric-infra/25-tiller/helm/kong/charts/kong/templates/controller-rbac-role.yaml diff --git a/ric-aux/80-Auxiliary-Functions/helm/kong/charts/kong/templates/controller-service-account.yaml b/ric-infra/25-tiller/helm/kong/charts/kong/templates/controller-service-account.yaml similarity index 100% rename from ric-aux/80-Auxiliary-Functions/helm/kong/charts/kong/templates/controller-service-account.yaml rename to ric-infra/25-tiller/helm/kong/charts/kong/templates/controller-service-account.yaml diff --git a/ric-aux/80-Auxiliary-Functions/helm/kong/charts/kong/templates/crd-kongconsumer.yaml b/ric-infra/25-tiller/helm/kong/charts/kong/templates/crd-kongconsumer.yaml similarity index 100% rename from ric-aux/80-Auxiliary-Functions/helm/kong/charts/kong/templates/crd-kongconsumer.yaml rename to ric-infra/25-tiller/helm/kong/charts/kong/templates/crd-kongconsumer.yaml diff --git a/ric-aux/80-Auxiliary-Functions/helm/kong/charts/kong/templates/crd-kongcredential.yaml b/ric-infra/25-tiller/helm/kong/charts/kong/templates/crd-kongcredential.yaml similarity index 100% rename from ric-aux/80-Auxiliary-Functions/helm/kong/charts/kong/templates/crd-kongcredential.yaml rename to ric-infra/25-tiller/helm/kong/charts/kong/templates/crd-kongcredential.yaml diff --git a/ric-aux/80-Auxiliary-Functions/helm/kong/charts/kong/templates/crd-kongingress.yaml b/ric-infra/25-tiller/helm/kong/charts/kong/templates/crd-kongingress.yaml similarity index 100% rename from ric-aux/80-Auxiliary-Functions/helm/kong/charts/kong/templates/crd-kongingress.yaml rename to ric-infra/25-tiller/helm/kong/charts/kong/templates/crd-kongingress.yaml diff --git a/ric-aux/80-Auxiliary-Functions/helm/kong/charts/kong/templates/crd-kongplugins.yaml b/ric-infra/25-tiller/helm/kong/charts/kong/templates/crd-kongplugins.yaml similarity index 100% rename from ric-aux/80-Auxiliary-Functions/helm/kong/charts/kong/templates/crd-kongplugins.yaml rename to ric-infra/25-tiller/helm/kong/charts/kong/templates/crd-kongplugins.yaml diff --git a/ric-aux/80-Auxiliary-Functions/helm/kong/charts/kong/templates/deployment.yaml b/ric-infra/25-tiller/helm/kong/charts/kong/templates/deployment.yaml similarity index 100% rename from ric-aux/80-Auxiliary-Functions/helm/kong/charts/kong/templates/deployment.yaml rename to ric-infra/25-tiller/helm/kong/charts/kong/templates/deployment.yaml diff --git a/ric-aux/80-Auxiliary-Functions/helm/kong/charts/kong/templates/ingress-admin.yaml b/ric-infra/25-tiller/helm/kong/charts/kong/templates/ingress-admin.yaml similarity index 100% rename from ric-aux/80-Auxiliary-Functions/helm/kong/charts/kong/templates/ingress-admin.yaml rename to ric-infra/25-tiller/helm/kong/charts/kong/templates/ingress-admin.yaml diff --git a/ric-aux/80-Auxiliary-Functions/helm/kong/charts/kong/templates/ingress-manager.yaml b/ric-infra/25-tiller/helm/kong/charts/kong/templates/ingress-manager.yaml similarity index 100% rename from ric-aux/80-Auxiliary-Functions/helm/kong/charts/kong/templates/ingress-manager.yaml rename to ric-infra/25-tiller/helm/kong/charts/kong/templates/ingress-manager.yaml diff --git a/ric-aux/80-Auxiliary-Functions/helm/kong/charts/kong/templates/ingress-portal-api.yaml b/ric-infra/25-tiller/helm/kong/charts/kong/templates/ingress-portal-api.yaml similarity index 100% rename from ric-aux/80-Auxiliary-Functions/helm/kong/charts/kong/templates/ingress-portal-api.yaml rename to ric-infra/25-tiller/helm/kong/charts/kong/templates/ingress-portal-api.yaml diff --git a/ric-aux/80-Auxiliary-Functions/helm/kong/charts/kong/templates/ingress-portal.yaml b/ric-infra/25-tiller/helm/kong/charts/kong/templates/ingress-portal.yaml similarity index 100% rename from ric-aux/80-Auxiliary-Functions/helm/kong/charts/kong/templates/ingress-portal.yaml rename to ric-infra/25-tiller/helm/kong/charts/kong/templates/ingress-portal.yaml diff --git a/ric-aux/80-Auxiliary-Functions/helm/kong/charts/kong/templates/ingress-proxy.yaml b/ric-infra/25-tiller/helm/kong/charts/kong/templates/ingress-proxy.yaml similarity index 100% rename from ric-aux/80-Auxiliary-Functions/helm/kong/charts/kong/templates/ingress-proxy.yaml rename to ric-infra/25-tiller/helm/kong/charts/kong/templates/ingress-proxy.yaml diff --git a/ric-aux/80-Auxiliary-Functions/helm/kong/charts/kong/templates/migrations-post-upgrade.yaml b/ric-infra/25-tiller/helm/kong/charts/kong/templates/migrations-post-upgrade.yaml similarity index 100% rename from ric-aux/80-Auxiliary-Functions/helm/kong/charts/kong/templates/migrations-post-upgrade.yaml rename to ric-infra/25-tiller/helm/kong/charts/kong/templates/migrations-post-upgrade.yaml diff --git a/ric-aux/80-Auxiliary-Functions/helm/kong/charts/kong/templates/migrations-pre-upgrade.yaml b/ric-infra/25-tiller/helm/kong/charts/kong/templates/migrations-pre-upgrade.yaml similarity index 100% rename from ric-aux/80-Auxiliary-Functions/helm/kong/charts/kong/templates/migrations-pre-upgrade.yaml rename to ric-infra/25-tiller/helm/kong/charts/kong/templates/migrations-pre-upgrade.yaml diff --git a/ric-aux/80-Auxiliary-Functions/helm/kong/charts/kong/templates/migrations.yaml b/ric-infra/25-tiller/helm/kong/charts/kong/templates/migrations.yaml similarity index 100% rename from ric-aux/80-Auxiliary-Functions/helm/kong/charts/kong/templates/migrations.yaml rename to ric-infra/25-tiller/helm/kong/charts/kong/templates/migrations.yaml diff --git a/ric-aux/80-Auxiliary-Functions/helm/kong/charts/kong/templates/service-kong-admin.yaml b/ric-infra/25-tiller/helm/kong/charts/kong/templates/service-kong-admin.yaml similarity index 100% rename from ric-aux/80-Auxiliary-Functions/helm/kong/charts/kong/templates/service-kong-admin.yaml rename to ric-infra/25-tiller/helm/kong/charts/kong/templates/service-kong-admin.yaml diff --git a/ric-aux/80-Auxiliary-Functions/helm/kong/charts/kong/templates/service-kong-manager.yaml b/ric-infra/25-tiller/helm/kong/charts/kong/templates/service-kong-manager.yaml similarity index 100% rename from ric-aux/80-Auxiliary-Functions/helm/kong/charts/kong/templates/service-kong-manager.yaml rename to ric-infra/25-tiller/helm/kong/charts/kong/templates/service-kong-manager.yaml diff --git a/ric-aux/80-Auxiliary-Functions/helm/kong/charts/kong/templates/service-kong-portal-api.yaml b/ric-infra/25-tiller/helm/kong/charts/kong/templates/service-kong-portal-api.yaml similarity index 100% rename from ric-aux/80-Auxiliary-Functions/helm/kong/charts/kong/templates/service-kong-portal-api.yaml rename to ric-infra/25-tiller/helm/kong/charts/kong/templates/service-kong-portal-api.yaml diff --git a/ric-aux/80-Auxiliary-Functions/helm/kong/charts/kong/templates/service-kong-portal.yaml b/ric-infra/25-tiller/helm/kong/charts/kong/templates/service-kong-portal.yaml similarity index 100% rename from ric-aux/80-Auxiliary-Functions/helm/kong/charts/kong/templates/service-kong-portal.yaml rename to ric-infra/25-tiller/helm/kong/charts/kong/templates/service-kong-portal.yaml diff --git a/ric-aux/80-Auxiliary-Functions/helm/kong/charts/kong/templates/service-kong-proxy.yaml b/ric-infra/25-tiller/helm/kong/charts/kong/templates/service-kong-proxy.yaml similarity index 100% rename from ric-aux/80-Auxiliary-Functions/helm/kong/charts/kong/templates/service-kong-proxy.yaml rename to ric-infra/25-tiller/helm/kong/charts/kong/templates/service-kong-proxy.yaml diff --git a/ric-aux/80-Auxiliary-Functions/helm/kong/charts/kong/values.yaml b/ric-infra/25-tiller/helm/kong/charts/kong/values.yaml similarity index 100% rename from ric-aux/80-Auxiliary-Functions/helm/kong/charts/kong/values.yaml rename to ric-infra/25-tiller/helm/kong/charts/kong/values.yaml diff --git a/ric-aux/80-Auxiliary-Functions/helm/kong/requirements.yaml b/ric-infra/25-tiller/helm/kong/requirements.yaml similarity index 100% rename from ric-aux/80-Auxiliary-Functions/helm/kong/requirements.yaml rename to ric-infra/25-tiller/helm/kong/requirements.yaml diff --git a/ric-aux/80-Auxiliary-Functions/helm/kong/values.yaml b/ric-infra/25-tiller/helm/kong/values.yaml similarity index 100% rename from ric-aux/80-Auxiliary-Functions/helm/kong/values.yaml rename to ric-infra/25-tiller/helm/kong/values.yaml diff --git a/ric-infra/30-Kong/bin/install b/ric-infra/30-Kong/bin/install new file mode 100755 index 00000000..db2ccdaa --- /dev/null +++ b/ric-infra/30-Kong/bin/install @@ -0,0 +1,85 @@ +#!/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. # +################################################################################ + + +OVERRIDEYAML=$1 + + +DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null && pwd )" + +source $DIR/../etc/kong.conf + +if [ -z "$RICINFRA_RELEASE_NAME" ];then + RELEASE_NAME=$helm_release_name +else + RELEASE_NAME=$RICINFRA_RELEASE_NAME +fi +# Namespace configuration +if [ -z "$RICPLT_NAMESPACE" ];then + PLT_NAMESPACE=$plt_namespace +else + PLT_NAMESPACE=$RICPLT_NAMESPACE +fi +if [ -z "$RICXAPP_NAMESPACE" ];then + XAPP_NAMESPACE=$xapp_namespace +else + XAPP_NAMESPACE=$RICXAPP_NAMESPACE +fi +if [ -z "$RICAUX_NAMESPACE" ];then + AUX_NAMESPACE=$aux_namespace +else + AUX_NAMESPACE=$RICAUX_NAMESPACE +fi +if [ -z "$RICINFRA_NAMESPACE" ];then + INFRA_NAMESPACE=$infra_namespace +else + INFRA_NAMESPACE=$RICINFRA_NAMESPACE +fi + +if [ -z "$RIC_COMMON_OVERRIDE" ];then + COMMON_OVERRIDE="--set global.namespace.platform=$PLT_NAMESPACE --set global.namespace.xapp=$XAPP_NAMESPACE --set global.namespace.aux=$AUX_NAMESPACE --set global.namespace.infra=$INFRA_NAMESPACE" +else + COMMON_OVERRIDE=$RIC_COMMON_OVERRIDE +fi + + + + +RICINFRA_COMPONENTS="kong" + +echo "Deploying RIC infra components [$RICINFRA_COMPONENTS]" +echo "Helm Release Name: $RELEASE_NAME" + + +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 $RICINFRA_COMPONENTS; do + + mkdir -p $DIR/../helm/$component/charts/ + + cp /tmp/ric-common-$COMMON_CHART_VERSION.tgz $DIR/../helm/$component/charts/ + + if [ -z $OVERRIDEYAML ]; then + helm install --debug --namespace "${INFRA_NAMESPACE}" --name "${RELEASE_NAME}-$component" $COMMON_OVERRIDE $DIR/../helm/$component + else + helm install -f $OVERRIDEYAML --namespace "${INFRA_NAMESPACE}" --name "${RELEASE_NAME}-$component" $COMMON_OVERRIDE $DIR/../helm/$component + fi +done diff --git a/ric-infra/30-Kong/bin/uninstall b/ric-infra/30-Kong/bin/uninstall new file mode 100755 index 00000000..01c97e06 --- /dev/null +++ b/ric-infra/30-Kong/bin/uninstall @@ -0,0 +1,49 @@ +#!/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. # +################################################################################ + + + + +DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null && pwd )" + + +source $DIR/../etc/kong.conf + +if [ -z "$RICINFRA_RELEASE_NAME" ];then + RELEASE_NAME=$helm_release_name +else + RELEASE_NAME=$RICINFRA_RELEASE_NAME +fi + +if [ -z "$RICINFRA_NAMESPACE" ];then + INFRA_NAMESPACE=$infra_namespace +else + INFRA_NAMESPACE=$RICINFRA_NAMESPACE +fi + +RICINFRA_COMPONENTS="kong" + +echo "Undeploying RIC infra components [$RICINFRA_COMPONENTS]" +echo "Helm Release Name: $RELEASE_NAME" + + +for component in $RICINFRA_COMPONENTS; do + helm delete --purge "${RELEASE_NAME}-${component}" +done + + diff --git a/ric-infra/30-Kong/etc/kong.conf b/ric-infra/30-Kong/etc/kong.conf new file mode 100644 index 00000000..92008b59 --- /dev/null +++ b/ric-infra/30-Kong/etc/kong.conf @@ -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. # +################################################################################ + + +# 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-infra/30-Kong/helm/.helmignore b/ric-infra/30-Kong/helm/.helmignore new file mode 100644 index 00000000..50af0317 --- /dev/null +++ b/ric-infra/30-Kong/helm/.helmignore @@ -0,0 +1,22 @@ +# 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 new file mode 100644 index 00000000..50af0317 --- /dev/null +++ b/ric-infra/30-Kong/helm/kong/.helmignore @@ -0,0 +1,22 @@ +# 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/kong/Chart.yaml b/ric-infra/30-Kong/helm/kong/Chart.yaml similarity index 100% rename from ric-platform/50-RIC-Platform/helm/kong/Chart.yaml rename to ric-infra/30-Kong/helm/kong/Chart.yaml diff --git a/ric-platform/50-RIC-Platform/helm/kong/charts/kong/.helmignore b/ric-infra/30-Kong/helm/kong/charts/kong/.helmignore similarity index 100% rename from ric-platform/50-RIC-Platform/helm/kong/charts/kong/.helmignore rename to ric-infra/30-Kong/helm/kong/charts/kong/.helmignore diff --git a/ric-platform/50-RIC-Platform/helm/kong/charts/kong/Chart.yaml b/ric-infra/30-Kong/helm/kong/charts/kong/Chart.yaml similarity index 100% rename from ric-platform/50-RIC-Platform/helm/kong/charts/kong/Chart.yaml rename to ric-infra/30-Kong/helm/kong/charts/kong/Chart.yaml diff --git a/ric-platform/50-RIC-Platform/helm/kong/charts/kong/README.md b/ric-infra/30-Kong/helm/kong/charts/kong/README.md similarity index 100% rename from ric-platform/50-RIC-Platform/helm/kong/charts/kong/README.md rename to ric-infra/30-Kong/helm/kong/charts/kong/README.md diff --git a/ric-platform/50-RIC-Platform/helm/kong/charts/kong/charts/cassandra/.helmignore b/ric-infra/30-Kong/helm/kong/charts/kong/charts/cassandra/.helmignore similarity index 100% rename from ric-platform/50-RIC-Platform/helm/kong/charts/kong/charts/cassandra/.helmignore rename to ric-infra/30-Kong/helm/kong/charts/kong/charts/cassandra/.helmignore diff --git a/ric-platform/50-RIC-Platform/helm/kong/charts/kong/charts/cassandra/Chart.yaml b/ric-infra/30-Kong/helm/kong/charts/kong/charts/cassandra/Chart.yaml similarity index 100% rename from ric-platform/50-RIC-Platform/helm/kong/charts/kong/charts/cassandra/Chart.yaml rename to ric-infra/30-Kong/helm/kong/charts/kong/charts/cassandra/Chart.yaml diff --git a/ric-platform/50-RIC-Platform/helm/kong/charts/kong/charts/cassandra/README.md b/ric-infra/30-Kong/helm/kong/charts/kong/charts/cassandra/README.md similarity index 100% rename from ric-platform/50-RIC-Platform/helm/kong/charts/kong/charts/cassandra/README.md rename to ric-infra/30-Kong/helm/kong/charts/kong/charts/cassandra/README.md diff --git a/ric-platform/50-RIC-Platform/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 similarity index 100% rename from ric-platform/50-RIC-Platform/helm/kong/charts/kong/charts/cassandra/sample/create-storage-gce.yaml rename to ric-infra/30-Kong/helm/kong/charts/kong/charts/cassandra/sample/create-storage-gce.yaml diff --git a/ric-platform/50-RIC-Platform/helm/kong/charts/kong/charts/cassandra/templates/NOTES.txt b/ric-infra/30-Kong/helm/kong/charts/kong/charts/cassandra/templates/NOTES.txt similarity index 100% rename from ric-platform/50-RIC-Platform/helm/kong/charts/kong/charts/cassandra/templates/NOTES.txt rename to ric-infra/30-Kong/helm/kong/charts/kong/charts/cassandra/templates/NOTES.txt diff --git a/ric-platform/50-RIC-Platform/helm/kong/charts/kong/charts/cassandra/templates/_helpers.tpl b/ric-infra/30-Kong/helm/kong/charts/kong/charts/cassandra/templates/_helpers.tpl similarity index 100% rename from ric-platform/50-RIC-Platform/helm/kong/charts/kong/charts/cassandra/templates/_helpers.tpl rename to ric-infra/30-Kong/helm/kong/charts/kong/charts/cassandra/templates/_helpers.tpl diff --git a/ric-platform/50-RIC-Platform/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 similarity index 100% rename from ric-platform/50-RIC-Platform/helm/kong/charts/kong/charts/cassandra/templates/backup/cronjob.yaml rename to ric-infra/30-Kong/helm/kong/charts/kong/charts/cassandra/templates/backup/cronjob.yaml diff --git a/ric-platform/50-RIC-Platform/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 similarity index 100% rename from ric-platform/50-RIC-Platform/helm/kong/charts/kong/charts/cassandra/templates/backup/rbac.yaml rename to ric-infra/30-Kong/helm/kong/charts/kong/charts/cassandra/templates/backup/rbac.yaml diff --git a/ric-platform/50-RIC-Platform/helm/kong/charts/kong/charts/cassandra/templates/configmap.yaml b/ric-infra/30-Kong/helm/kong/charts/kong/charts/cassandra/templates/configmap.yaml similarity index 100% rename from ric-platform/50-RIC-Platform/helm/kong/charts/kong/charts/cassandra/templates/configmap.yaml rename to ric-infra/30-Kong/helm/kong/charts/kong/charts/cassandra/templates/configmap.yaml diff --git a/ric-platform/50-RIC-Platform/helm/kong/charts/kong/charts/cassandra/templates/pdb.yaml b/ric-infra/30-Kong/helm/kong/charts/kong/charts/cassandra/templates/pdb.yaml similarity index 100% rename from ric-platform/50-RIC-Platform/helm/kong/charts/kong/charts/cassandra/templates/pdb.yaml rename to ric-infra/30-Kong/helm/kong/charts/kong/charts/cassandra/templates/pdb.yaml diff --git a/ric-platform/50-RIC-Platform/helm/kong/charts/kong/charts/cassandra/templates/service.yaml b/ric-infra/30-Kong/helm/kong/charts/kong/charts/cassandra/templates/service.yaml similarity index 100% rename from ric-platform/50-RIC-Platform/helm/kong/charts/kong/charts/cassandra/templates/service.yaml rename to ric-infra/30-Kong/helm/kong/charts/kong/charts/cassandra/templates/service.yaml diff --git a/ric-platform/50-RIC-Platform/helm/kong/charts/kong/charts/cassandra/templates/statefulset.yaml b/ric-infra/30-Kong/helm/kong/charts/kong/charts/cassandra/templates/statefulset.yaml similarity index 100% rename from ric-platform/50-RIC-Platform/helm/kong/charts/kong/charts/cassandra/templates/statefulset.yaml rename to ric-infra/30-Kong/helm/kong/charts/kong/charts/cassandra/templates/statefulset.yaml diff --git a/ric-platform/50-RIC-Platform/helm/kong/charts/kong/charts/cassandra/values.yaml b/ric-infra/30-Kong/helm/kong/charts/kong/charts/cassandra/values.yaml similarity index 100% rename from ric-platform/50-RIC-Platform/helm/kong/charts/kong/charts/cassandra/values.yaml rename to ric-infra/30-Kong/helm/kong/charts/kong/charts/cassandra/values.yaml diff --git a/ric-platform/50-RIC-Platform/helm/kong/charts/kong/charts/postgresql/.helmignore b/ric-infra/30-Kong/helm/kong/charts/kong/charts/postgresql/.helmignore similarity index 100% rename from ric-platform/50-RIC-Platform/helm/kong/charts/kong/charts/postgresql/.helmignore rename to ric-infra/30-Kong/helm/kong/charts/kong/charts/postgresql/.helmignore diff --git a/ric-platform/50-RIC-Platform/helm/kong/charts/kong/charts/postgresql/Chart.yaml b/ric-infra/30-Kong/helm/kong/charts/kong/charts/postgresql/Chart.yaml similarity index 100% rename from ric-platform/50-RIC-Platform/helm/kong/charts/kong/charts/postgresql/Chart.yaml rename to ric-infra/30-Kong/helm/kong/charts/kong/charts/postgresql/Chart.yaml diff --git a/ric-platform/50-RIC-Platform/helm/kong/charts/kong/charts/postgresql/README.md b/ric-infra/30-Kong/helm/kong/charts/kong/charts/postgresql/README.md similarity index 100% rename from ric-platform/50-RIC-Platform/helm/kong/charts/kong/charts/postgresql/README.md rename to ric-infra/30-Kong/helm/kong/charts/kong/charts/postgresql/README.md diff --git a/ric-platform/50-RIC-Platform/helm/kong/charts/kong/charts/postgresql/files/README.md b/ric-infra/30-Kong/helm/kong/charts/kong/charts/postgresql/files/README.md similarity index 100% rename from ric-platform/50-RIC-Platform/helm/kong/charts/kong/charts/postgresql/files/README.md rename to ric-infra/30-Kong/helm/kong/charts/kong/charts/postgresql/files/README.md diff --git a/ric-platform/50-RIC-Platform/helm/kong/charts/kong/charts/postgresql/files/conf.d/README.md b/ric-infra/30-Kong/helm/kong/charts/kong/charts/postgresql/files/conf.d/README.md similarity index 100% rename from ric-platform/50-RIC-Platform/helm/kong/charts/kong/charts/postgresql/files/conf.d/README.md rename to ric-infra/30-Kong/helm/kong/charts/kong/charts/postgresql/files/conf.d/README.md diff --git a/ric-platform/50-RIC-Platform/helm/kong/charts/kong/charts/postgresql/files/docker-entrypoint-initdb.d/README.md b/ric-infra/30-Kong/helm/kong/charts/kong/charts/postgresql/files/docker-entrypoint-initdb.d/README.md similarity index 100% rename from ric-platform/50-RIC-Platform/helm/kong/charts/kong/charts/postgresql/files/docker-entrypoint-initdb.d/README.md rename to ric-infra/30-Kong/helm/kong/charts/kong/charts/postgresql/files/docker-entrypoint-initdb.d/README.md diff --git a/ric-platform/50-RIC-Platform/helm/kong/charts/kong/charts/postgresql/templates/NOTES.txt b/ric-infra/30-Kong/helm/kong/charts/kong/charts/postgresql/templates/NOTES.txt similarity index 100% rename from ric-platform/50-RIC-Platform/helm/kong/charts/kong/charts/postgresql/templates/NOTES.txt rename to ric-infra/30-Kong/helm/kong/charts/kong/charts/postgresql/templates/NOTES.txt diff --git a/ric-platform/50-RIC-Platform/helm/kong/charts/kong/charts/postgresql/templates/_helpers.tpl b/ric-infra/30-Kong/helm/kong/charts/kong/charts/postgresql/templates/_helpers.tpl similarity index 100% rename from ric-platform/50-RIC-Platform/helm/kong/charts/kong/charts/postgresql/templates/_helpers.tpl rename to ric-infra/30-Kong/helm/kong/charts/kong/charts/postgresql/templates/_helpers.tpl diff --git a/ric-platform/50-RIC-Platform/helm/kong/charts/kong/charts/postgresql/templates/configmap.yaml b/ric-infra/30-Kong/helm/kong/charts/kong/charts/postgresql/templates/configmap.yaml similarity index 100% rename from ric-platform/50-RIC-Platform/helm/kong/charts/kong/charts/postgresql/templates/configmap.yaml rename to ric-infra/30-Kong/helm/kong/charts/kong/charts/postgresql/templates/configmap.yaml diff --git a/ric-platform/50-RIC-Platform/helm/kong/charts/kong/charts/postgresql/templates/extended-config-configmap.yaml b/ric-infra/30-Kong/helm/kong/charts/kong/charts/postgresql/templates/extended-config-configmap.yaml similarity index 100% rename from ric-platform/50-RIC-Platform/helm/kong/charts/kong/charts/postgresql/templates/extended-config-configmap.yaml rename to ric-infra/30-Kong/helm/kong/charts/kong/charts/postgresql/templates/extended-config-configmap.yaml diff --git a/ric-platform/50-RIC-Platform/helm/kong/charts/kong/charts/postgresql/templates/initialization-configmap.yaml b/ric-infra/30-Kong/helm/kong/charts/kong/charts/postgresql/templates/initialization-configmap.yaml similarity index 100% rename from ric-platform/50-RIC-Platform/helm/kong/charts/kong/charts/postgresql/templates/initialization-configmap.yaml rename to ric-infra/30-Kong/helm/kong/charts/kong/charts/postgresql/templates/initialization-configmap.yaml diff --git a/ric-platform/50-RIC-Platform/helm/kong/charts/kong/charts/postgresql/templates/metrics-svc.yaml b/ric-infra/30-Kong/helm/kong/charts/kong/charts/postgresql/templates/metrics-svc.yaml similarity index 100% rename from ric-platform/50-RIC-Platform/helm/kong/charts/kong/charts/postgresql/templates/metrics-svc.yaml rename to ric-infra/30-Kong/helm/kong/charts/kong/charts/postgresql/templates/metrics-svc.yaml diff --git a/ric-platform/50-RIC-Platform/helm/kong/charts/kong/charts/postgresql/templates/networkpolicy.yaml b/ric-infra/30-Kong/helm/kong/charts/kong/charts/postgresql/templates/networkpolicy.yaml similarity index 100% rename from ric-platform/50-RIC-Platform/helm/kong/charts/kong/charts/postgresql/templates/networkpolicy.yaml rename to ric-infra/30-Kong/helm/kong/charts/kong/charts/postgresql/templates/networkpolicy.yaml diff --git a/ric-platform/50-RIC-Platform/helm/kong/charts/kong/charts/postgresql/templates/secrets.yaml b/ric-infra/30-Kong/helm/kong/charts/kong/charts/postgresql/templates/secrets.yaml similarity index 100% rename from ric-platform/50-RIC-Platform/helm/kong/charts/kong/charts/postgresql/templates/secrets.yaml rename to ric-infra/30-Kong/helm/kong/charts/kong/charts/postgresql/templates/secrets.yaml diff --git a/ric-platform/50-RIC-Platform/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 similarity index 100% rename from ric-platform/50-RIC-Platform/helm/kong/charts/kong/charts/postgresql/templates/statefulset-slaves.yaml rename to ric-infra/30-Kong/helm/kong/charts/kong/charts/postgresql/templates/statefulset-slaves.yaml diff --git a/ric-platform/50-RIC-Platform/helm/kong/charts/kong/charts/postgresql/templates/statefulset.yaml b/ric-infra/30-Kong/helm/kong/charts/kong/charts/postgresql/templates/statefulset.yaml similarity index 100% rename from ric-platform/50-RIC-Platform/helm/kong/charts/kong/charts/postgresql/templates/statefulset.yaml rename to ric-infra/30-Kong/helm/kong/charts/kong/charts/postgresql/templates/statefulset.yaml diff --git a/ric-platform/50-RIC-Platform/helm/kong/charts/kong/charts/postgresql/templates/svc-headless.yaml b/ric-infra/30-Kong/helm/kong/charts/kong/charts/postgresql/templates/svc-headless.yaml similarity index 100% rename from ric-platform/50-RIC-Platform/helm/kong/charts/kong/charts/postgresql/templates/svc-headless.yaml rename to ric-infra/30-Kong/helm/kong/charts/kong/charts/postgresql/templates/svc-headless.yaml diff --git a/ric-platform/50-RIC-Platform/helm/kong/charts/kong/charts/postgresql/templates/svc-read.yaml b/ric-infra/30-Kong/helm/kong/charts/kong/charts/postgresql/templates/svc-read.yaml similarity index 100% rename from ric-platform/50-RIC-Platform/helm/kong/charts/kong/charts/postgresql/templates/svc-read.yaml rename to ric-infra/30-Kong/helm/kong/charts/kong/charts/postgresql/templates/svc-read.yaml diff --git a/ric-platform/50-RIC-Platform/helm/kong/charts/kong/charts/postgresql/templates/svc.yaml b/ric-infra/30-Kong/helm/kong/charts/kong/charts/postgresql/templates/svc.yaml similarity index 100% rename from ric-platform/50-RIC-Platform/helm/kong/charts/kong/charts/postgresql/templates/svc.yaml rename to ric-infra/30-Kong/helm/kong/charts/kong/charts/postgresql/templates/svc.yaml diff --git a/ric-platform/50-RIC-Platform/helm/kong/charts/kong/charts/postgresql/values-production.yaml b/ric-infra/30-Kong/helm/kong/charts/kong/charts/postgresql/values-production.yaml similarity index 100% rename from ric-platform/50-RIC-Platform/helm/kong/charts/kong/charts/postgresql/values-production.yaml rename to ric-infra/30-Kong/helm/kong/charts/kong/charts/postgresql/values-production.yaml diff --git a/ric-platform/50-RIC-Platform/helm/kong/charts/kong/charts/postgresql/values.yaml b/ric-infra/30-Kong/helm/kong/charts/kong/charts/postgresql/values.yaml similarity index 100% rename from ric-platform/50-RIC-Platform/helm/kong/charts/kong/charts/postgresql/values.yaml rename to ric-infra/30-Kong/helm/kong/charts/kong/charts/postgresql/values.yaml diff --git a/ric-platform/50-RIC-Platform/helm/kong/charts/kong/ci/cassandra.yaml b/ric-infra/30-Kong/helm/kong/charts/kong/ci/cassandra.yaml similarity index 100% rename from ric-platform/50-RIC-Platform/helm/kong/charts/kong/ci/cassandra.yaml rename to ric-infra/30-Kong/helm/kong/charts/kong/ci/cassandra.yaml diff --git a/ric-platform/50-RIC-Platform/helm/kong/charts/kong/ci/dbless.yaml b/ric-infra/30-Kong/helm/kong/charts/kong/ci/dbless.yaml similarity index 100% rename from ric-platform/50-RIC-Platform/helm/kong/charts/kong/ci/dbless.yaml rename to ric-infra/30-Kong/helm/kong/charts/kong/ci/dbless.yaml diff --git a/ric-platform/50-RIC-Platform/helm/kong/charts/kong/ci/default-values.yaml b/ric-infra/30-Kong/helm/kong/charts/kong/ci/default-values.yaml similarity index 100% rename from ric-platform/50-RIC-Platform/helm/kong/charts/kong/ci/default-values.yaml rename to ric-infra/30-Kong/helm/kong/charts/kong/ci/default-values.yaml diff --git a/ric-platform/50-RIC-Platform/helm/kong/charts/kong/ci/ingressController-values.yaml b/ric-infra/30-Kong/helm/kong/charts/kong/ci/ingressController-values.yaml similarity index 100% rename from ric-platform/50-RIC-Platform/helm/kong/charts/kong/ci/ingressController-values.yaml rename to ric-infra/30-Kong/helm/kong/charts/kong/ci/ingressController-values.yaml diff --git a/ric-platform/50-RIC-Platform/helm/kong/charts/kong/ci/loadbalancer-values.yaml b/ric-infra/30-Kong/helm/kong/charts/kong/ci/loadbalancer-values.yaml similarity index 100% rename from ric-platform/50-RIC-Platform/helm/kong/charts/kong/ci/loadbalancer-values.yaml rename to ric-infra/30-Kong/helm/kong/charts/kong/ci/loadbalancer-values.yaml diff --git a/ric-platform/50-RIC-Platform/helm/kong/charts/kong/requirements.yaml b/ric-infra/30-Kong/helm/kong/charts/kong/requirements.yaml similarity index 100% rename from ric-platform/50-RIC-Platform/helm/kong/charts/kong/requirements.yaml rename to ric-infra/30-Kong/helm/kong/charts/kong/requirements.yaml diff --git a/ric-platform/50-RIC-Platform/helm/kong/charts/kong/templates/NOTES.txt b/ric-infra/30-Kong/helm/kong/charts/kong/templates/NOTES.txt similarity index 100% rename from ric-platform/50-RIC-Platform/helm/kong/charts/kong/templates/NOTES.txt rename to ric-infra/30-Kong/helm/kong/charts/kong/templates/NOTES.txt diff --git a/ric-platform/50-RIC-Platform/helm/kong/charts/kong/templates/_helpers.tpl b/ric-infra/30-Kong/helm/kong/charts/kong/templates/_helpers.tpl similarity index 100% rename from ric-platform/50-RIC-Platform/helm/kong/charts/kong/templates/_helpers.tpl rename to ric-infra/30-Kong/helm/kong/charts/kong/templates/_helpers.tpl diff --git a/ric-platform/50-RIC-Platform/helm/kong/charts/kong/templates/controller-cluster-role.yaml b/ric-infra/30-Kong/helm/kong/charts/kong/templates/controller-cluster-role.yaml similarity index 100% rename from ric-platform/50-RIC-Platform/helm/kong/charts/kong/templates/controller-cluster-role.yaml rename to ric-infra/30-Kong/helm/kong/charts/kong/templates/controller-cluster-role.yaml diff --git a/ric-platform/50-RIC-Platform/helm/kong/charts/kong/templates/controller-deployment.yaml b/ric-infra/30-Kong/helm/kong/charts/kong/templates/controller-deployment.yaml similarity index 100% rename from ric-platform/50-RIC-Platform/helm/kong/charts/kong/templates/controller-deployment.yaml rename to ric-infra/30-Kong/helm/kong/charts/kong/templates/controller-deployment.yaml diff --git a/ric-platform/50-RIC-Platform/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 similarity index 100% rename from ric-platform/50-RIC-Platform/helm/kong/charts/kong/templates/controller-rbac-cluster-role-binding.yaml rename to ric-infra/30-Kong/helm/kong/charts/kong/templates/controller-rbac-cluster-role-binding.yaml diff --git a/ric-platform/50-RIC-Platform/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 similarity index 100% rename from ric-platform/50-RIC-Platform/helm/kong/charts/kong/templates/controller-rbac-role-binding.yaml rename to ric-infra/30-Kong/helm/kong/charts/kong/templates/controller-rbac-role-binding.yaml diff --git a/ric-platform/50-RIC-Platform/helm/kong/charts/kong/templates/controller-rbac-role.yaml b/ric-infra/30-Kong/helm/kong/charts/kong/templates/controller-rbac-role.yaml similarity index 100% rename from ric-platform/50-RIC-Platform/helm/kong/charts/kong/templates/controller-rbac-role.yaml rename to ric-infra/30-Kong/helm/kong/charts/kong/templates/controller-rbac-role.yaml diff --git a/ric-platform/50-RIC-Platform/helm/kong/charts/kong/templates/controller-service-account.yaml b/ric-infra/30-Kong/helm/kong/charts/kong/templates/controller-service-account.yaml similarity index 100% rename from ric-platform/50-RIC-Platform/helm/kong/charts/kong/templates/controller-service-account.yaml rename to ric-infra/30-Kong/helm/kong/charts/kong/templates/controller-service-account.yaml diff --git a/ric-platform/50-RIC-Platform/helm/kong/charts/kong/templates/crd-kongconsumer.yaml b/ric-infra/30-Kong/helm/kong/charts/kong/templates/crd-kongconsumer.yaml similarity index 100% rename from ric-platform/50-RIC-Platform/helm/kong/charts/kong/templates/crd-kongconsumer.yaml rename to ric-infra/30-Kong/helm/kong/charts/kong/templates/crd-kongconsumer.yaml diff --git a/ric-platform/50-RIC-Platform/helm/kong/charts/kong/templates/crd-kongcredential.yaml b/ric-infra/30-Kong/helm/kong/charts/kong/templates/crd-kongcredential.yaml similarity index 100% rename from ric-platform/50-RIC-Platform/helm/kong/charts/kong/templates/crd-kongcredential.yaml rename to ric-infra/30-Kong/helm/kong/charts/kong/templates/crd-kongcredential.yaml diff --git a/ric-platform/50-RIC-Platform/helm/kong/charts/kong/templates/crd-kongingress.yaml b/ric-infra/30-Kong/helm/kong/charts/kong/templates/crd-kongingress.yaml similarity index 100% rename from ric-platform/50-RIC-Platform/helm/kong/charts/kong/templates/crd-kongingress.yaml rename to ric-infra/30-Kong/helm/kong/charts/kong/templates/crd-kongingress.yaml diff --git a/ric-platform/50-RIC-Platform/helm/kong/charts/kong/templates/crd-kongplugins.yaml b/ric-infra/30-Kong/helm/kong/charts/kong/templates/crd-kongplugins.yaml similarity index 100% rename from ric-platform/50-RIC-Platform/helm/kong/charts/kong/templates/crd-kongplugins.yaml rename to ric-infra/30-Kong/helm/kong/charts/kong/templates/crd-kongplugins.yaml diff --git a/ric-platform/50-RIC-Platform/helm/kong/charts/kong/templates/deployment.yaml b/ric-infra/30-Kong/helm/kong/charts/kong/templates/deployment.yaml similarity index 100% rename from ric-platform/50-RIC-Platform/helm/kong/charts/kong/templates/deployment.yaml rename to ric-infra/30-Kong/helm/kong/charts/kong/templates/deployment.yaml diff --git a/ric-platform/50-RIC-Platform/helm/kong/charts/kong/templates/ingress-admin.yaml b/ric-infra/30-Kong/helm/kong/charts/kong/templates/ingress-admin.yaml similarity index 100% rename from ric-platform/50-RIC-Platform/helm/kong/charts/kong/templates/ingress-admin.yaml rename to ric-infra/30-Kong/helm/kong/charts/kong/templates/ingress-admin.yaml diff --git a/ric-platform/50-RIC-Platform/helm/kong/charts/kong/templates/ingress-manager.yaml b/ric-infra/30-Kong/helm/kong/charts/kong/templates/ingress-manager.yaml similarity index 100% rename from ric-platform/50-RIC-Platform/helm/kong/charts/kong/templates/ingress-manager.yaml rename to ric-infra/30-Kong/helm/kong/charts/kong/templates/ingress-manager.yaml diff --git a/ric-platform/50-RIC-Platform/helm/kong/charts/kong/templates/ingress-portal-api.yaml b/ric-infra/30-Kong/helm/kong/charts/kong/templates/ingress-portal-api.yaml similarity index 100% rename from ric-platform/50-RIC-Platform/helm/kong/charts/kong/templates/ingress-portal-api.yaml rename to ric-infra/30-Kong/helm/kong/charts/kong/templates/ingress-portal-api.yaml diff --git a/ric-platform/50-RIC-Platform/helm/kong/charts/kong/templates/ingress-portal.yaml b/ric-infra/30-Kong/helm/kong/charts/kong/templates/ingress-portal.yaml similarity index 100% rename from ric-platform/50-RIC-Platform/helm/kong/charts/kong/templates/ingress-portal.yaml rename to ric-infra/30-Kong/helm/kong/charts/kong/templates/ingress-portal.yaml diff --git a/ric-platform/50-RIC-Platform/helm/kong/charts/kong/templates/ingress-proxy.yaml b/ric-infra/30-Kong/helm/kong/charts/kong/templates/ingress-proxy.yaml similarity index 100% rename from ric-platform/50-RIC-Platform/helm/kong/charts/kong/templates/ingress-proxy.yaml rename to ric-infra/30-Kong/helm/kong/charts/kong/templates/ingress-proxy.yaml diff --git a/ric-platform/50-RIC-Platform/helm/kong/charts/kong/templates/migrations-post-upgrade.yaml b/ric-infra/30-Kong/helm/kong/charts/kong/templates/migrations-post-upgrade.yaml similarity index 100% rename from ric-platform/50-RIC-Platform/helm/kong/charts/kong/templates/migrations-post-upgrade.yaml rename to ric-infra/30-Kong/helm/kong/charts/kong/templates/migrations-post-upgrade.yaml diff --git a/ric-platform/50-RIC-Platform/helm/kong/charts/kong/templates/migrations-pre-upgrade.yaml b/ric-infra/30-Kong/helm/kong/charts/kong/templates/migrations-pre-upgrade.yaml similarity index 100% rename from ric-platform/50-RIC-Platform/helm/kong/charts/kong/templates/migrations-pre-upgrade.yaml rename to ric-infra/30-Kong/helm/kong/charts/kong/templates/migrations-pre-upgrade.yaml diff --git a/ric-platform/50-RIC-Platform/helm/kong/charts/kong/templates/migrations.yaml b/ric-infra/30-Kong/helm/kong/charts/kong/templates/migrations.yaml similarity index 100% rename from ric-platform/50-RIC-Platform/helm/kong/charts/kong/templates/migrations.yaml rename to ric-infra/30-Kong/helm/kong/charts/kong/templates/migrations.yaml diff --git a/ric-platform/50-RIC-Platform/helm/kong/charts/kong/templates/service-kong-admin.yaml b/ric-infra/30-Kong/helm/kong/charts/kong/templates/service-kong-admin.yaml similarity index 100% rename from ric-platform/50-RIC-Platform/helm/kong/charts/kong/templates/service-kong-admin.yaml rename to ric-infra/30-Kong/helm/kong/charts/kong/templates/service-kong-admin.yaml diff --git a/ric-platform/50-RIC-Platform/helm/kong/charts/kong/templates/service-kong-manager.yaml b/ric-infra/30-Kong/helm/kong/charts/kong/templates/service-kong-manager.yaml similarity index 100% rename from ric-platform/50-RIC-Platform/helm/kong/charts/kong/templates/service-kong-manager.yaml rename to ric-infra/30-Kong/helm/kong/charts/kong/templates/service-kong-manager.yaml diff --git a/ric-platform/50-RIC-Platform/helm/kong/charts/kong/templates/service-kong-portal-api.yaml b/ric-infra/30-Kong/helm/kong/charts/kong/templates/service-kong-portal-api.yaml similarity index 100% rename from ric-platform/50-RIC-Platform/helm/kong/charts/kong/templates/service-kong-portal-api.yaml rename to ric-infra/30-Kong/helm/kong/charts/kong/templates/service-kong-portal-api.yaml diff --git a/ric-platform/50-RIC-Platform/helm/kong/charts/kong/templates/service-kong-portal.yaml b/ric-infra/30-Kong/helm/kong/charts/kong/templates/service-kong-portal.yaml similarity index 100% rename from ric-platform/50-RIC-Platform/helm/kong/charts/kong/templates/service-kong-portal.yaml rename to ric-infra/30-Kong/helm/kong/charts/kong/templates/service-kong-portal.yaml diff --git a/ric-platform/50-RIC-Platform/helm/kong/charts/kong/templates/service-kong-proxy.yaml b/ric-infra/30-Kong/helm/kong/charts/kong/templates/service-kong-proxy.yaml similarity index 100% rename from ric-platform/50-RIC-Platform/helm/kong/charts/kong/templates/service-kong-proxy.yaml rename to ric-infra/30-Kong/helm/kong/charts/kong/templates/service-kong-proxy.yaml diff --git a/ric-platform/50-RIC-Platform/helm/kong/charts/kong/values.yaml b/ric-infra/30-Kong/helm/kong/charts/kong/values.yaml similarity index 100% rename from ric-platform/50-RIC-Platform/helm/kong/charts/kong/values.yaml rename to ric-infra/30-Kong/helm/kong/charts/kong/values.yaml diff --git a/ric-platform/50-RIC-Platform/helm/kong/requirements.yaml b/ric-infra/30-Kong/helm/kong/requirements.yaml similarity index 100% rename from ric-platform/50-RIC-Platform/helm/kong/requirements.yaml rename to ric-infra/30-Kong/helm/kong/requirements.yaml diff --git a/ric-platform/50-RIC-Platform/helm/kong/values.yaml b/ric-infra/30-Kong/helm/kong/values.yaml similarity index 92% rename from ric-platform/50-RIC-Platform/helm/kong/values.yaml rename to ric-infra/30-Kong/helm/kong/values.yaml index 25469ebb..2cab0bc5 100644 --- a/ric-platform/50-RIC-Platform/helm/kong/values.yaml +++ b/ric-infra/30-Kong/helm/kong/values.yaml @@ -14,9 +14,9 @@ kong: proxy: http: - nodePort: 31080 + nodePort: 32080 tls: - nodePort: 31443 + 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 diff --git a/ric-platform/50-RIC-Platform/bin/install b/ric-platform/50-RIC-Platform/bin/install index 4632ec00..ddfeaafb 100755 --- a/ric-platform/50-RIC-Platform/bin/install +++ b/ric-platform/50-RIC-Platform/bin/install @@ -60,7 +60,7 @@ else fi -RICPLT_COMPONENTS="appmgr rtmgr dbaas e2mgr e2term a1mediator submgr kong" +RICPLT_COMPONENTS="appmgr rtmgr dbaas e2mgr e2term a1mediator submgr" echo "Deploying RIC Platform components [$RICPLT_COMPONENTS]" echo "Helm Release Name: $RELEASE_NAME" diff --git a/ric-platform/50-RIC-Platform/bin/uninstall b/ric-platform/50-RIC-Platform/bin/uninstall index 38f48f52..9baaf5e7 100755 --- a/ric-platform/50-RIC-Platform/bin/uninstall +++ b/ric-platform/50-RIC-Platform/bin/uninstall @@ -30,7 +30,7 @@ else RELEASE_NAME=$RICPLT_RELEASE_NAME fi -RICPLT_COMPONENTS="appmgr rtmgr dbaas e2mgr e2term a1mediator submgr kong" +RICPLT_COMPONENTS="appmgr rtmgr dbaas e2mgr e2term a1mediator submgr" echo "Undeploying RIC Platform components [$RICPLT_COMPONENTS]" 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 index 0605a749..59873224 100644 --- a/ric-platform/55-Ext-Services/helm/extsvcplt/templates/services-aux.yaml +++ b/ric-platform/55-Ext-Services/helm/extsvcplt/templates/services-aux.yaml @@ -43,8 +43,8 @@ subsets: - addresses: - ip: "{{ $.Values.extsvcplt.auxip }}" ports: - - port: {{ include "common.ingresshttpport.aux" $ }} + - port: {{ include "common.ingresshttpport" $ }} name: {{ include "common.ingressurl.aux" $ }}-http-ingress-port - - port: {{ include "common.ingresshttpsport.aux" $ }} + - port: {{ include "common.ingresshttpsport" $ }} name: {{ include "common.ingressurl.aux" $ }}-https-ingress-port {{- end -}} diff --git a/ric-platform/55-Ext-Services/helm/extsvcplt/templates/services-helm.yaml b/ric-platform/55-Ext-Services/helm/extsvcplt/templates/services-helm.yaml index 99a44c12..dd6f3e4a 100644 --- a/ric-platform/55-Ext-Services/helm/extsvcplt/templates/services-helm.yaml +++ b/ric-platform/55-Ext-Services/helm/extsvcplt/templates/services-helm.yaml @@ -44,9 +44,9 @@ subsets: - addresses: - ip: "{{ $.Values.extsvcplt.auxip }}" ports: - - port: {{ include "common.ingresshttpport.aux" $ }} + - port: {{ include "common.ingresshttpport" $ }} name: {{ include "common.ingressurl.helm" $ }}-http-ingress-port - - port: {{ include "common.ingresshttpsport.aux" $ }} + - port: {{ include "common.ingresshttpsport" $ }} name: {{ include "common.ingressurl.helm" $ }}-https-ingress-port {{- end -}}