From c95b7f7b07eb99f5bdd1a908a3f387488c54b997 Mon Sep 17 00:00:00 2001 From: Krzysztof Opasiak Date: Thu, 21 May 2020 23:53:02 +0200 Subject: [PATCH] [PORTAL] Move portal subcharts to components In order to allow to define dependencies per subchart let's move all of them to components and make sure that they can be build independently. Issue-ID: AAF-1134 Change-Id: Ia75ba66d9338dbacaea500c20f6a5b384d1685a1 Signed-off-by: Krzysztof Opasiak --- kubernetes/portal/Makefile | 50 ++++++++++++++++++++++ kubernetes/portal/components/Makefile | 50 ++++++++++++++++++++++ .../{charts => components}/portal-app/.helmignore | 0 .../{charts => components}/portal-app/Chart.yaml | 0 .../portal/components/portal-app/requirements.yaml | 18 ++++++++ .../properties/ONAPPORTAL/fusion.properties | 0 .../deliveries/properties/ONAPPORTAL/logback.xml | 0 .../properties/ONAPPORTAL/music.properties | 0 .../ONAPPORTAL/openid-connect.properties | 0 .../properties/ONAPPORTAL/portal.properties | 0 .../properties/ONAPPORTAL/system.properties | 0 .../portal-app/resources/server/server.xml | 2 +- .../portal-app/resources/server/web.xml | 0 .../portal-app/templates/NOTES.txt | 0 .../portal-app/templates/configmap.yaml | 0 .../portal-app/templates/deployment.yaml | 0 .../portal-app/templates/ingress.yaml | 0 .../portal-app/templates/secret.yaml | 0 .../portal-app/templates/service.yaml | 0 .../{charts => components}/portal-app/values.yaml | 2 + .../portal-cassandra/.helmignore | 0 .../portal-cassandra/Chart.yaml | 0 .../components/portal-cassandra/requirements.yaml | 18 ++++++++ .../docker-entrypoint-initdb.d/portal.cql | 0 .../docker-entrypoint-initdb.d/portal_single.cql | 0 .../docker-entrypoint-initdb.d/portalsdk.cql | 0 .../portal-cassandra/templates/NOTES.txt | 0 .../portal-cassandra/templates/configmap.yaml | 0 .../portal-cassandra/templates/deployment.yaml | 0 .../portal-cassandra/templates/pv.yaml | 0 .../portal-cassandra/templates/pvc.yaml | 0 .../portal-cassandra/templates/service.yaml | 0 .../portal-cassandra/values.yaml | 0 .../portal-mariadb/.helmignore | 0 .../portal-mariadb/Chart.yaml | 0 .../components/portal-mariadb/requirements.yaml | 18 ++++++++ .../resources/config/mariadb/docker-entrypoint.sh | 0 .../resources/config/mariadb/oom_updates.sql | 0 .../portal-mariadb/templates/NOTES.txt | 0 .../portal-mariadb/templates/configmap.yaml | 0 .../portal-mariadb/templates/deployment.yaml | 0 .../portal-mariadb/templates/job.yaml | 0 .../portal-mariadb/templates/pv.yaml | 0 .../portal-mariadb/templates/pvc.yaml | 0 .../portal-mariadb/templates/secrets.yaml | 0 .../portal-mariadb/templates/service.yaml | 0 .../portal-mariadb/values.yaml | 0 .../{charts => components}/portal-sdk/.helmignore | 0 .../{charts => components}/portal-sdk/Chart.yaml | 0 .../portal/components/portal-sdk/requirements.yaml | 18 ++++++++ .../properties/ONAPPORTALSDK/fusion.properties | 0 .../properties/ONAPPORTALSDK/logback.xml | 0 .../properties/ONAPPORTALSDK/music.properties | 0 .../properties/ONAPPORTALSDK/portal.properties | 0 .../properties/ONAPPORTALSDK/system.properties | 0 .../portal-sdk/resources/server/server.xml | 0 .../portal-sdk/templates/NOTES.txt | 0 .../portal-sdk/templates/configmap.yaml | 0 .../portal-sdk/templates/deployment.yaml | 0 .../portal-sdk/templates/ingress.yaml | 0 .../portal-sdk/templates/secrets.yaml | 0 .../portal-sdk/templates/service.yaml | 0 .../{charts => components}/portal-sdk/values.yaml | 2 + .../portal-widget/.helmignore | 0 .../portal-widget/Chart.yaml | 0 .../components/portal-widget/requirements.yaml | 18 ++++++++ .../properties/ONAPWIDGETMS/application.properties | 0 .../properties/ONAPWIDGETMS/application.yml | 0 .../portal-widget/templates/NOTES.txt | 0 .../portal-widget/templates/configmap.yaml | 0 .../portal-widget/templates/deployment.yaml | 0 .../portal-widget/templates/service.yaml | 0 .../portal-widget/values.yaml | 0 .../portal-zookeeper/.helmignore | 0 .../portal-zookeeper/Chart.yaml | 0 .../components/portal-zookeeper/requirements.yaml | 18 ++++++++ .../portal-zookeeper/templates/NOTES.txt | 0 .../portal-zookeeper/templates/deployment.yaml | 0 .../portal-zookeeper/templates/service.yaml | 0 .../portal-zookeeper/values.yaml | 0 kubernetes/portal/requirements.yaml | 18 ++++++++ 81 files changed, 231 insertions(+), 1 deletion(-) create mode 100644 kubernetes/portal/Makefile create mode 100644 kubernetes/portal/components/Makefile rename kubernetes/portal/{charts => components}/portal-app/.helmignore (100%) rename kubernetes/portal/{charts => components}/portal-app/Chart.yaml (100%) create mode 100644 kubernetes/portal/components/portal-app/requirements.yaml rename kubernetes/portal/{charts => components}/portal-app/resources/config/deliveries/properties/ONAPPORTAL/fusion.properties (100%) rename kubernetes/portal/{charts => components}/portal-app/resources/config/deliveries/properties/ONAPPORTAL/logback.xml (100%) rename kubernetes/portal/{charts => components}/portal-app/resources/config/deliveries/properties/ONAPPORTAL/music.properties (100%) rename kubernetes/portal/{charts => components}/portal-app/resources/config/deliveries/properties/ONAPPORTAL/openid-connect.properties (100%) rename kubernetes/portal/{charts => components}/portal-app/resources/config/deliveries/properties/ONAPPORTAL/portal.properties (100%) rename kubernetes/portal/{charts => components}/portal-app/resources/config/deliveries/properties/ONAPPORTAL/system.properties (100%) rename kubernetes/portal/{charts => components}/portal-app/resources/server/server.xml (99%) rename kubernetes/portal/{charts => components}/portal-app/resources/server/web.xml (100%) rename kubernetes/portal/{charts => components}/portal-app/templates/NOTES.txt (100%) rename kubernetes/portal/{charts => components}/portal-app/templates/configmap.yaml (100%) rename kubernetes/portal/{charts => components}/portal-app/templates/deployment.yaml (100%) rename kubernetes/portal/{charts => components}/portal-app/templates/ingress.yaml (100%) rename kubernetes/portal/{charts => components}/portal-app/templates/secret.yaml (100%) rename kubernetes/portal/{charts => components}/portal-app/templates/service.yaml (100%) rename kubernetes/portal/{charts => components}/portal-app/values.yaml (98%) rename kubernetes/portal/{charts => components}/portal-cassandra/.helmignore (100%) rename kubernetes/portal/{charts => components}/portal-cassandra/Chart.yaml (100%) create mode 100644 kubernetes/portal/components/portal-cassandra/requirements.yaml rename kubernetes/portal/{charts => components}/portal-cassandra/resources/config/cassandra/docker-entrypoint-initdb.d/portal.cql (100%) rename kubernetes/portal/{charts => components}/portal-cassandra/resources/config/cassandra/docker-entrypoint-initdb.d/portal_single.cql (100%) rename kubernetes/portal/{charts => components}/portal-cassandra/resources/config/cassandra/docker-entrypoint-initdb.d/portalsdk.cql (100%) rename kubernetes/portal/{charts => components}/portal-cassandra/templates/NOTES.txt (100%) rename kubernetes/portal/{charts => components}/portal-cassandra/templates/configmap.yaml (100%) rename kubernetes/portal/{charts => components}/portal-cassandra/templates/deployment.yaml (100%) rename kubernetes/portal/{charts => components}/portal-cassandra/templates/pv.yaml (100%) rename kubernetes/portal/{charts => components}/portal-cassandra/templates/pvc.yaml (100%) rename kubernetes/portal/{charts => components}/portal-cassandra/templates/service.yaml (100%) rename kubernetes/portal/{charts => components}/portal-cassandra/values.yaml (100%) rename kubernetes/portal/{charts => components}/portal-mariadb/.helmignore (100%) rename kubernetes/portal/{charts => components}/portal-mariadb/Chart.yaml (100%) create mode 100644 kubernetes/portal/components/portal-mariadb/requirements.yaml rename kubernetes/portal/{charts => components}/portal-mariadb/resources/config/mariadb/docker-entrypoint.sh (100%) rename kubernetes/portal/{charts => components}/portal-mariadb/resources/config/mariadb/oom_updates.sql (100%) rename kubernetes/portal/{charts => components}/portal-mariadb/templates/NOTES.txt (100%) rename kubernetes/portal/{charts => components}/portal-mariadb/templates/configmap.yaml (100%) rename kubernetes/portal/{charts => components}/portal-mariadb/templates/deployment.yaml (100%) rename kubernetes/portal/{charts => components}/portal-mariadb/templates/job.yaml (100%) rename kubernetes/portal/{charts => components}/portal-mariadb/templates/pv.yaml (100%) rename kubernetes/portal/{charts => components}/portal-mariadb/templates/pvc.yaml (100%) rename kubernetes/portal/{charts => components}/portal-mariadb/templates/secrets.yaml (100%) rename kubernetes/portal/{charts => components}/portal-mariadb/templates/service.yaml (100%) rename kubernetes/portal/{charts => components}/portal-mariadb/values.yaml (100%) rename kubernetes/portal/{charts => components}/portal-sdk/.helmignore (100%) rename kubernetes/portal/{charts => components}/portal-sdk/Chart.yaml (100%) create mode 100644 kubernetes/portal/components/portal-sdk/requirements.yaml rename kubernetes/portal/{charts => components}/portal-sdk/resources/config/deliveries/properties/ONAPPORTALSDK/fusion.properties (100%) rename kubernetes/portal/{charts => components}/portal-sdk/resources/config/deliveries/properties/ONAPPORTALSDK/logback.xml (100%) rename kubernetes/portal/{charts => components}/portal-sdk/resources/config/deliveries/properties/ONAPPORTALSDK/music.properties (100%) rename kubernetes/portal/{charts => components}/portal-sdk/resources/config/deliveries/properties/ONAPPORTALSDK/portal.properties (100%) rename kubernetes/portal/{charts => components}/portal-sdk/resources/config/deliveries/properties/ONAPPORTALSDK/system.properties (100%) rename kubernetes/portal/{charts => components}/portal-sdk/resources/server/server.xml (100%) rename kubernetes/portal/{charts => components}/portal-sdk/templates/NOTES.txt (100%) rename kubernetes/portal/{charts => components}/portal-sdk/templates/configmap.yaml (100%) rename kubernetes/portal/{charts => components}/portal-sdk/templates/deployment.yaml (100%) rename kubernetes/portal/{charts => components}/portal-sdk/templates/ingress.yaml (100%) rename kubernetes/portal/{charts => components}/portal-sdk/templates/secrets.yaml (100%) rename kubernetes/portal/{charts => components}/portal-sdk/templates/service.yaml (100%) rename kubernetes/portal/{charts => components}/portal-sdk/values.yaml (98%) rename kubernetes/portal/{charts => components}/portal-widget/.helmignore (100%) rename kubernetes/portal/{charts => components}/portal-widget/Chart.yaml (100%) create mode 100644 kubernetes/portal/components/portal-widget/requirements.yaml rename kubernetes/portal/{charts => components}/portal-widget/resources/config/deliveries/properties/ONAPWIDGETMS/application.properties (100%) rename kubernetes/portal/{charts => components}/portal-widget/resources/config/deliveries/properties/ONAPWIDGETMS/application.yml (100%) rename kubernetes/portal/{charts => components}/portal-widget/templates/NOTES.txt (100%) rename kubernetes/portal/{charts => components}/portal-widget/templates/configmap.yaml (100%) rename kubernetes/portal/{charts => components}/portal-widget/templates/deployment.yaml (100%) rename kubernetes/portal/{charts => components}/portal-widget/templates/service.yaml (100%) rename kubernetes/portal/{charts => components}/portal-widget/values.yaml (100%) rename kubernetes/portal/{charts => components}/portal-zookeeper/.helmignore (100%) rename kubernetes/portal/{charts => components}/portal-zookeeper/Chart.yaml (100%) create mode 100644 kubernetes/portal/components/portal-zookeeper/requirements.yaml rename kubernetes/portal/{charts => components}/portal-zookeeper/templates/NOTES.txt (100%) rename kubernetes/portal/{charts => components}/portal-zookeeper/templates/deployment.yaml (100%) rename kubernetes/portal/{charts => components}/portal-zookeeper/templates/service.yaml (100%) rename kubernetes/portal/{charts => components}/portal-zookeeper/values.yaml (100%) diff --git a/kubernetes/portal/Makefile b/kubernetes/portal/Makefile new file mode 100644 index 0000000000..8af301d7ae --- /dev/null +++ b/kubernetes/portal/Makefile @@ -0,0 +1,50 @@ +# Copyright © 2020 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. + +ROOT_DIR := $(shell dirname $(realpath $(lastword $(MAKEFILE_LIST)))) +OUTPUT_DIR := $(ROOT_DIR)/../dist +PACKAGE_DIR := $(OUTPUT_DIR)/packages +SECRET_DIR := $(OUTPUT_DIR)/secrets + +EXCLUDES := dist resources templates charts docker +HELM_CHARTS := $(filter-out $(EXCLUDES), $(sort $(patsubst %/.,%,$(wildcard */.)))) + +.PHONY: $(EXCLUDES) $(HELM_CHARTS) + +all: $(HELM_CHARTS) + +$(HELM_CHARTS): + @echo "\n[$@]" + @make package-$@ + +make-%: + @if [ -f $*/Makefile ]; then make -C $*; fi + +dep-%: make-% + @if [ -f $*/requirements.yaml ]; then helm dep up $*; fi + +lint-%: dep-% + @if [ -f $*/Chart.yaml ]; then helm lint $*; fi + +package-%: lint-% + @mkdir -p $(PACKAGE_DIR) + @if [ -f $*/Chart.yaml ]; then helm package -d $(PACKAGE_DIR) $*; fi + @helm repo index $(PACKAGE_DIR) + +clean: + @rm -f */requirements.lock + @rm -f *tgz */charts/*tgz + @rm -rf $(PACKAGE_DIR) +%: + @: diff --git a/kubernetes/portal/components/Makefile b/kubernetes/portal/components/Makefile new file mode 100644 index 0000000000..2fc0cbe4ab --- /dev/null +++ b/kubernetes/portal/components/Makefile @@ -0,0 +1,50 @@ +# Copyright © 2020 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. + +ROOT_DIR := $(shell dirname $(realpath $(lastword $(MAKEFILE_LIST)))) +OUTPUT_DIR := $(ROOT_DIR)/../../dist +PACKAGE_DIR := $(OUTPUT_DIR)/packages +SECRET_DIR := $(OUTPUT_DIR)/secrets + +EXCLUDES := +HELM_CHARTS := $(filter-out $(EXCLUDES), $(sort $(patsubst %/.,%,$(wildcard */.)))) + +.PHONY: $(EXCLUDES) $(HELM_CHARTS) + +all: $(HELM_CHARTS) + +$(HELM_CHARTS): + @echo "\n[$@]" + @make package-$@ + +make-%: + @if [ -f $*/Makefile ]; then make -C $*; fi + +dep-%: make-% + @if [ -f $*/requirements.yaml ]; then helm dep up $*; fi + +lint-%: dep-% + @if [ -f $*/Chart.yaml ]; then helm lint $*; fi + +package-%: lint-% + @mkdir -p $(PACKAGE_DIR) + @if [ -f $*/Chart.yaml ]; then helm package -d $(PACKAGE_DIR) $*; fi + @helm repo index $(PACKAGE_DIR) + +clean: + @rm -f */requirements.lock + @rm -f *tgz */charts/*tgz + @rm -rf $(PACKAGE_DIR) +%: + @: diff --git a/kubernetes/portal/charts/portal-app/.helmignore b/kubernetes/portal/components/portal-app/.helmignore similarity index 100% rename from kubernetes/portal/charts/portal-app/.helmignore rename to kubernetes/portal/components/portal-app/.helmignore diff --git a/kubernetes/portal/charts/portal-app/Chart.yaml b/kubernetes/portal/components/portal-app/Chart.yaml similarity index 100% rename from kubernetes/portal/charts/portal-app/Chart.yaml rename to kubernetes/portal/components/portal-app/Chart.yaml diff --git a/kubernetes/portal/components/portal-app/requirements.yaml b/kubernetes/portal/components/portal-app/requirements.yaml new file mode 100644 index 0000000000..c5d7864b9d --- /dev/null +++ b/kubernetes/portal/components/portal-app/requirements.yaml @@ -0,0 +1,18 @@ +# Copyright © 2020 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. + +dependencies: + - name: common + version: ~6.x-0 + repository: '@local' diff --git a/kubernetes/portal/charts/portal-app/resources/config/deliveries/properties/ONAPPORTAL/fusion.properties b/kubernetes/portal/components/portal-app/resources/config/deliveries/properties/ONAPPORTAL/fusion.properties similarity index 100% rename from kubernetes/portal/charts/portal-app/resources/config/deliveries/properties/ONAPPORTAL/fusion.properties rename to kubernetes/portal/components/portal-app/resources/config/deliveries/properties/ONAPPORTAL/fusion.properties diff --git a/kubernetes/portal/charts/portal-app/resources/config/deliveries/properties/ONAPPORTAL/logback.xml b/kubernetes/portal/components/portal-app/resources/config/deliveries/properties/ONAPPORTAL/logback.xml similarity index 100% rename from kubernetes/portal/charts/portal-app/resources/config/deliveries/properties/ONAPPORTAL/logback.xml rename to kubernetes/portal/components/portal-app/resources/config/deliveries/properties/ONAPPORTAL/logback.xml diff --git a/kubernetes/portal/charts/portal-app/resources/config/deliveries/properties/ONAPPORTAL/music.properties b/kubernetes/portal/components/portal-app/resources/config/deliveries/properties/ONAPPORTAL/music.properties similarity index 100% rename from kubernetes/portal/charts/portal-app/resources/config/deliveries/properties/ONAPPORTAL/music.properties rename to kubernetes/portal/components/portal-app/resources/config/deliveries/properties/ONAPPORTAL/music.properties diff --git a/kubernetes/portal/charts/portal-app/resources/config/deliveries/properties/ONAPPORTAL/openid-connect.properties b/kubernetes/portal/components/portal-app/resources/config/deliveries/properties/ONAPPORTAL/openid-connect.properties similarity index 100% rename from kubernetes/portal/charts/portal-app/resources/config/deliveries/properties/ONAPPORTAL/openid-connect.properties rename to kubernetes/portal/components/portal-app/resources/config/deliveries/properties/ONAPPORTAL/openid-connect.properties diff --git a/kubernetes/portal/charts/portal-app/resources/config/deliveries/properties/ONAPPORTAL/portal.properties b/kubernetes/portal/components/portal-app/resources/config/deliveries/properties/ONAPPORTAL/portal.properties similarity index 100% rename from kubernetes/portal/charts/portal-app/resources/config/deliveries/properties/ONAPPORTAL/portal.properties rename to kubernetes/portal/components/portal-app/resources/config/deliveries/properties/ONAPPORTAL/portal.properties diff --git a/kubernetes/portal/charts/portal-app/resources/config/deliveries/properties/ONAPPORTAL/system.properties b/kubernetes/portal/components/portal-app/resources/config/deliveries/properties/ONAPPORTAL/system.properties similarity index 100% rename from kubernetes/portal/charts/portal-app/resources/config/deliveries/properties/ONAPPORTAL/system.properties rename to kubernetes/portal/components/portal-app/resources/config/deliveries/properties/ONAPPORTAL/system.properties diff --git a/kubernetes/portal/charts/portal-app/resources/server/server.xml b/kubernetes/portal/components/portal-app/resources/server/server.xml similarity index 99% rename from kubernetes/portal/charts/portal-app/resources/server/server.xml rename to kubernetes/portal/components/portal-app/resources/server/server.xml index dec68376d2..420dbd3fa3 100644 --- a/kubernetes/portal/charts/portal-app/resources/server/server.xml +++ b/kubernetes/portal/components/portal-app/resources/server/server.xml @@ -154,4 +154,4 @@ - \ No newline at end of file + diff --git a/kubernetes/portal/charts/portal-app/resources/server/web.xml b/kubernetes/portal/components/portal-app/resources/server/web.xml similarity index 100% rename from kubernetes/portal/charts/portal-app/resources/server/web.xml rename to kubernetes/portal/components/portal-app/resources/server/web.xml diff --git a/kubernetes/portal/charts/portal-app/templates/NOTES.txt b/kubernetes/portal/components/portal-app/templates/NOTES.txt similarity index 100% rename from kubernetes/portal/charts/portal-app/templates/NOTES.txt rename to kubernetes/portal/components/portal-app/templates/NOTES.txt diff --git a/kubernetes/portal/charts/portal-app/templates/configmap.yaml b/kubernetes/portal/components/portal-app/templates/configmap.yaml similarity index 100% rename from kubernetes/portal/charts/portal-app/templates/configmap.yaml rename to kubernetes/portal/components/portal-app/templates/configmap.yaml diff --git a/kubernetes/portal/charts/portal-app/templates/deployment.yaml b/kubernetes/portal/components/portal-app/templates/deployment.yaml similarity index 100% rename from kubernetes/portal/charts/portal-app/templates/deployment.yaml rename to kubernetes/portal/components/portal-app/templates/deployment.yaml diff --git a/kubernetes/portal/charts/portal-app/templates/ingress.yaml b/kubernetes/portal/components/portal-app/templates/ingress.yaml similarity index 100% rename from kubernetes/portal/charts/portal-app/templates/ingress.yaml rename to kubernetes/portal/components/portal-app/templates/ingress.yaml diff --git a/kubernetes/portal/charts/portal-app/templates/secret.yaml b/kubernetes/portal/components/portal-app/templates/secret.yaml similarity index 100% rename from kubernetes/portal/charts/portal-app/templates/secret.yaml rename to kubernetes/portal/components/portal-app/templates/secret.yaml diff --git a/kubernetes/portal/charts/portal-app/templates/service.yaml b/kubernetes/portal/components/portal-app/templates/service.yaml similarity index 100% rename from kubernetes/portal/charts/portal-app/templates/service.yaml rename to kubernetes/portal/components/portal-app/templates/service.yaml diff --git a/kubernetes/portal/charts/portal-app/values.yaml b/kubernetes/portal/components/portal-app/values.yaml similarity index 98% rename from kubernetes/portal/charts/portal-app/values.yaml rename to kubernetes/portal/components/portal-app/values.yaml index 09a3880d54..259a4b7473 100644 --- a/kubernetes/portal/charts/portal-app/values.yaml +++ b/kubernetes/portal/components/portal-app/values.yaml @@ -17,6 +17,8 @@ # Global configuration defaults. ################################################################# global: + env: + tomcatDir: "/usr/local/tomcat" nodePortPrefix: 302 readinessRepository: oomk8s readinessImage: readiness-check:2.0.0 diff --git a/kubernetes/portal/charts/portal-cassandra/.helmignore b/kubernetes/portal/components/portal-cassandra/.helmignore similarity index 100% rename from kubernetes/portal/charts/portal-cassandra/.helmignore rename to kubernetes/portal/components/portal-cassandra/.helmignore diff --git a/kubernetes/portal/charts/portal-cassandra/Chart.yaml b/kubernetes/portal/components/portal-cassandra/Chart.yaml similarity index 100% rename from kubernetes/portal/charts/portal-cassandra/Chart.yaml rename to kubernetes/portal/components/portal-cassandra/Chart.yaml diff --git a/kubernetes/portal/components/portal-cassandra/requirements.yaml b/kubernetes/portal/components/portal-cassandra/requirements.yaml new file mode 100644 index 0000000000..c5d7864b9d --- /dev/null +++ b/kubernetes/portal/components/portal-cassandra/requirements.yaml @@ -0,0 +1,18 @@ +# Copyright © 2020 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. + +dependencies: + - name: common + version: ~6.x-0 + repository: '@local' diff --git a/kubernetes/portal/charts/portal-cassandra/resources/config/cassandra/docker-entrypoint-initdb.d/portal.cql b/kubernetes/portal/components/portal-cassandra/resources/config/cassandra/docker-entrypoint-initdb.d/portal.cql similarity index 100% rename from kubernetes/portal/charts/portal-cassandra/resources/config/cassandra/docker-entrypoint-initdb.d/portal.cql rename to kubernetes/portal/components/portal-cassandra/resources/config/cassandra/docker-entrypoint-initdb.d/portal.cql diff --git a/kubernetes/portal/charts/portal-cassandra/resources/config/cassandra/docker-entrypoint-initdb.d/portal_single.cql b/kubernetes/portal/components/portal-cassandra/resources/config/cassandra/docker-entrypoint-initdb.d/portal_single.cql similarity index 100% rename from kubernetes/portal/charts/portal-cassandra/resources/config/cassandra/docker-entrypoint-initdb.d/portal_single.cql rename to kubernetes/portal/components/portal-cassandra/resources/config/cassandra/docker-entrypoint-initdb.d/portal_single.cql diff --git a/kubernetes/portal/charts/portal-cassandra/resources/config/cassandra/docker-entrypoint-initdb.d/portalsdk.cql b/kubernetes/portal/components/portal-cassandra/resources/config/cassandra/docker-entrypoint-initdb.d/portalsdk.cql similarity index 100% rename from kubernetes/portal/charts/portal-cassandra/resources/config/cassandra/docker-entrypoint-initdb.d/portalsdk.cql rename to kubernetes/portal/components/portal-cassandra/resources/config/cassandra/docker-entrypoint-initdb.d/portalsdk.cql diff --git a/kubernetes/portal/charts/portal-cassandra/templates/NOTES.txt b/kubernetes/portal/components/portal-cassandra/templates/NOTES.txt similarity index 100% rename from kubernetes/portal/charts/portal-cassandra/templates/NOTES.txt rename to kubernetes/portal/components/portal-cassandra/templates/NOTES.txt diff --git a/kubernetes/portal/charts/portal-cassandra/templates/configmap.yaml b/kubernetes/portal/components/portal-cassandra/templates/configmap.yaml similarity index 100% rename from kubernetes/portal/charts/portal-cassandra/templates/configmap.yaml rename to kubernetes/portal/components/portal-cassandra/templates/configmap.yaml diff --git a/kubernetes/portal/charts/portal-cassandra/templates/deployment.yaml b/kubernetes/portal/components/portal-cassandra/templates/deployment.yaml similarity index 100% rename from kubernetes/portal/charts/portal-cassandra/templates/deployment.yaml rename to kubernetes/portal/components/portal-cassandra/templates/deployment.yaml diff --git a/kubernetes/portal/charts/portal-cassandra/templates/pv.yaml b/kubernetes/portal/components/portal-cassandra/templates/pv.yaml similarity index 100% rename from kubernetes/portal/charts/portal-cassandra/templates/pv.yaml rename to kubernetes/portal/components/portal-cassandra/templates/pv.yaml diff --git a/kubernetes/portal/charts/portal-cassandra/templates/pvc.yaml b/kubernetes/portal/components/portal-cassandra/templates/pvc.yaml similarity index 100% rename from kubernetes/portal/charts/portal-cassandra/templates/pvc.yaml rename to kubernetes/portal/components/portal-cassandra/templates/pvc.yaml diff --git a/kubernetes/portal/charts/portal-cassandra/templates/service.yaml b/kubernetes/portal/components/portal-cassandra/templates/service.yaml similarity index 100% rename from kubernetes/portal/charts/portal-cassandra/templates/service.yaml rename to kubernetes/portal/components/portal-cassandra/templates/service.yaml diff --git a/kubernetes/portal/charts/portal-cassandra/values.yaml b/kubernetes/portal/components/portal-cassandra/values.yaml similarity index 100% rename from kubernetes/portal/charts/portal-cassandra/values.yaml rename to kubernetes/portal/components/portal-cassandra/values.yaml diff --git a/kubernetes/portal/charts/portal-mariadb/.helmignore b/kubernetes/portal/components/portal-mariadb/.helmignore similarity index 100% rename from kubernetes/portal/charts/portal-mariadb/.helmignore rename to kubernetes/portal/components/portal-mariadb/.helmignore diff --git a/kubernetes/portal/charts/portal-mariadb/Chart.yaml b/kubernetes/portal/components/portal-mariadb/Chart.yaml similarity index 100% rename from kubernetes/portal/charts/portal-mariadb/Chart.yaml rename to kubernetes/portal/components/portal-mariadb/Chart.yaml diff --git a/kubernetes/portal/components/portal-mariadb/requirements.yaml b/kubernetes/portal/components/portal-mariadb/requirements.yaml new file mode 100644 index 0000000000..c5d7864b9d --- /dev/null +++ b/kubernetes/portal/components/portal-mariadb/requirements.yaml @@ -0,0 +1,18 @@ +# Copyright © 2020 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. + +dependencies: + - name: common + version: ~6.x-0 + repository: '@local' diff --git a/kubernetes/portal/charts/portal-mariadb/resources/config/mariadb/docker-entrypoint.sh b/kubernetes/portal/components/portal-mariadb/resources/config/mariadb/docker-entrypoint.sh similarity index 100% rename from kubernetes/portal/charts/portal-mariadb/resources/config/mariadb/docker-entrypoint.sh rename to kubernetes/portal/components/portal-mariadb/resources/config/mariadb/docker-entrypoint.sh diff --git a/kubernetes/portal/charts/portal-mariadb/resources/config/mariadb/oom_updates.sql b/kubernetes/portal/components/portal-mariadb/resources/config/mariadb/oom_updates.sql similarity index 100% rename from kubernetes/portal/charts/portal-mariadb/resources/config/mariadb/oom_updates.sql rename to kubernetes/portal/components/portal-mariadb/resources/config/mariadb/oom_updates.sql diff --git a/kubernetes/portal/charts/portal-mariadb/templates/NOTES.txt b/kubernetes/portal/components/portal-mariadb/templates/NOTES.txt similarity index 100% rename from kubernetes/portal/charts/portal-mariadb/templates/NOTES.txt rename to kubernetes/portal/components/portal-mariadb/templates/NOTES.txt diff --git a/kubernetes/portal/charts/portal-mariadb/templates/configmap.yaml b/kubernetes/portal/components/portal-mariadb/templates/configmap.yaml similarity index 100% rename from kubernetes/portal/charts/portal-mariadb/templates/configmap.yaml rename to kubernetes/portal/components/portal-mariadb/templates/configmap.yaml diff --git a/kubernetes/portal/charts/portal-mariadb/templates/deployment.yaml b/kubernetes/portal/components/portal-mariadb/templates/deployment.yaml similarity index 100% rename from kubernetes/portal/charts/portal-mariadb/templates/deployment.yaml rename to kubernetes/portal/components/portal-mariadb/templates/deployment.yaml diff --git a/kubernetes/portal/charts/portal-mariadb/templates/job.yaml b/kubernetes/portal/components/portal-mariadb/templates/job.yaml similarity index 100% rename from kubernetes/portal/charts/portal-mariadb/templates/job.yaml rename to kubernetes/portal/components/portal-mariadb/templates/job.yaml diff --git a/kubernetes/portal/charts/portal-mariadb/templates/pv.yaml b/kubernetes/portal/components/portal-mariadb/templates/pv.yaml similarity index 100% rename from kubernetes/portal/charts/portal-mariadb/templates/pv.yaml rename to kubernetes/portal/components/portal-mariadb/templates/pv.yaml diff --git a/kubernetes/portal/charts/portal-mariadb/templates/pvc.yaml b/kubernetes/portal/components/portal-mariadb/templates/pvc.yaml similarity index 100% rename from kubernetes/portal/charts/portal-mariadb/templates/pvc.yaml rename to kubernetes/portal/components/portal-mariadb/templates/pvc.yaml diff --git a/kubernetes/portal/charts/portal-mariadb/templates/secrets.yaml b/kubernetes/portal/components/portal-mariadb/templates/secrets.yaml similarity index 100% rename from kubernetes/portal/charts/portal-mariadb/templates/secrets.yaml rename to kubernetes/portal/components/portal-mariadb/templates/secrets.yaml diff --git a/kubernetes/portal/charts/portal-mariadb/templates/service.yaml b/kubernetes/portal/components/portal-mariadb/templates/service.yaml similarity index 100% rename from kubernetes/portal/charts/portal-mariadb/templates/service.yaml rename to kubernetes/portal/components/portal-mariadb/templates/service.yaml diff --git a/kubernetes/portal/charts/portal-mariadb/values.yaml b/kubernetes/portal/components/portal-mariadb/values.yaml similarity index 100% rename from kubernetes/portal/charts/portal-mariadb/values.yaml rename to kubernetes/portal/components/portal-mariadb/values.yaml diff --git a/kubernetes/portal/charts/portal-sdk/.helmignore b/kubernetes/portal/components/portal-sdk/.helmignore similarity index 100% rename from kubernetes/portal/charts/portal-sdk/.helmignore rename to kubernetes/portal/components/portal-sdk/.helmignore diff --git a/kubernetes/portal/charts/portal-sdk/Chart.yaml b/kubernetes/portal/components/portal-sdk/Chart.yaml similarity index 100% rename from kubernetes/portal/charts/portal-sdk/Chart.yaml rename to kubernetes/portal/components/portal-sdk/Chart.yaml diff --git a/kubernetes/portal/components/portal-sdk/requirements.yaml b/kubernetes/portal/components/portal-sdk/requirements.yaml new file mode 100644 index 0000000000..c5d7864b9d --- /dev/null +++ b/kubernetes/portal/components/portal-sdk/requirements.yaml @@ -0,0 +1,18 @@ +# Copyright © 2020 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. + +dependencies: + - name: common + version: ~6.x-0 + repository: '@local' diff --git a/kubernetes/portal/charts/portal-sdk/resources/config/deliveries/properties/ONAPPORTALSDK/fusion.properties b/kubernetes/portal/components/portal-sdk/resources/config/deliveries/properties/ONAPPORTALSDK/fusion.properties similarity index 100% rename from kubernetes/portal/charts/portal-sdk/resources/config/deliveries/properties/ONAPPORTALSDK/fusion.properties rename to kubernetes/portal/components/portal-sdk/resources/config/deliveries/properties/ONAPPORTALSDK/fusion.properties diff --git a/kubernetes/portal/charts/portal-sdk/resources/config/deliveries/properties/ONAPPORTALSDK/logback.xml b/kubernetes/portal/components/portal-sdk/resources/config/deliveries/properties/ONAPPORTALSDK/logback.xml similarity index 100% rename from kubernetes/portal/charts/portal-sdk/resources/config/deliveries/properties/ONAPPORTALSDK/logback.xml rename to kubernetes/portal/components/portal-sdk/resources/config/deliveries/properties/ONAPPORTALSDK/logback.xml diff --git a/kubernetes/portal/charts/portal-sdk/resources/config/deliveries/properties/ONAPPORTALSDK/music.properties b/kubernetes/portal/components/portal-sdk/resources/config/deliveries/properties/ONAPPORTALSDK/music.properties similarity index 100% rename from kubernetes/portal/charts/portal-sdk/resources/config/deliveries/properties/ONAPPORTALSDK/music.properties rename to kubernetes/portal/components/portal-sdk/resources/config/deliveries/properties/ONAPPORTALSDK/music.properties diff --git a/kubernetes/portal/charts/portal-sdk/resources/config/deliveries/properties/ONAPPORTALSDK/portal.properties b/kubernetes/portal/components/portal-sdk/resources/config/deliveries/properties/ONAPPORTALSDK/portal.properties similarity index 100% rename from kubernetes/portal/charts/portal-sdk/resources/config/deliveries/properties/ONAPPORTALSDK/portal.properties rename to kubernetes/portal/components/portal-sdk/resources/config/deliveries/properties/ONAPPORTALSDK/portal.properties diff --git a/kubernetes/portal/charts/portal-sdk/resources/config/deliveries/properties/ONAPPORTALSDK/system.properties b/kubernetes/portal/components/portal-sdk/resources/config/deliveries/properties/ONAPPORTALSDK/system.properties similarity index 100% rename from kubernetes/portal/charts/portal-sdk/resources/config/deliveries/properties/ONAPPORTALSDK/system.properties rename to kubernetes/portal/components/portal-sdk/resources/config/deliveries/properties/ONAPPORTALSDK/system.properties diff --git a/kubernetes/portal/charts/portal-sdk/resources/server/server.xml b/kubernetes/portal/components/portal-sdk/resources/server/server.xml similarity index 100% rename from kubernetes/portal/charts/portal-sdk/resources/server/server.xml rename to kubernetes/portal/components/portal-sdk/resources/server/server.xml diff --git a/kubernetes/portal/charts/portal-sdk/templates/NOTES.txt b/kubernetes/portal/components/portal-sdk/templates/NOTES.txt similarity index 100% rename from kubernetes/portal/charts/portal-sdk/templates/NOTES.txt rename to kubernetes/portal/components/portal-sdk/templates/NOTES.txt diff --git a/kubernetes/portal/charts/portal-sdk/templates/configmap.yaml b/kubernetes/portal/components/portal-sdk/templates/configmap.yaml similarity index 100% rename from kubernetes/portal/charts/portal-sdk/templates/configmap.yaml rename to kubernetes/portal/components/portal-sdk/templates/configmap.yaml diff --git a/kubernetes/portal/charts/portal-sdk/templates/deployment.yaml b/kubernetes/portal/components/portal-sdk/templates/deployment.yaml similarity index 100% rename from kubernetes/portal/charts/portal-sdk/templates/deployment.yaml rename to kubernetes/portal/components/portal-sdk/templates/deployment.yaml diff --git a/kubernetes/portal/charts/portal-sdk/templates/ingress.yaml b/kubernetes/portal/components/portal-sdk/templates/ingress.yaml similarity index 100% rename from kubernetes/portal/charts/portal-sdk/templates/ingress.yaml rename to kubernetes/portal/components/portal-sdk/templates/ingress.yaml diff --git a/kubernetes/portal/charts/portal-sdk/templates/secrets.yaml b/kubernetes/portal/components/portal-sdk/templates/secrets.yaml similarity index 100% rename from kubernetes/portal/charts/portal-sdk/templates/secrets.yaml rename to kubernetes/portal/components/portal-sdk/templates/secrets.yaml diff --git a/kubernetes/portal/charts/portal-sdk/templates/service.yaml b/kubernetes/portal/components/portal-sdk/templates/service.yaml similarity index 100% rename from kubernetes/portal/charts/portal-sdk/templates/service.yaml rename to kubernetes/portal/components/portal-sdk/templates/service.yaml diff --git a/kubernetes/portal/charts/portal-sdk/values.yaml b/kubernetes/portal/components/portal-sdk/values.yaml similarity index 98% rename from kubernetes/portal/charts/portal-sdk/values.yaml rename to kubernetes/portal/components/portal-sdk/values.yaml index 7f3aa70a2c..2363ec5691 100644 --- a/kubernetes/portal/charts/portal-sdk/values.yaml +++ b/kubernetes/portal/components/portal-sdk/values.yaml @@ -17,6 +17,8 @@ # Global configuration defaults. ################################################################# global: + env: + tomcatDir: "/usr/local/tomcat" nodePortPrefix: 302 readinessRepository: oomk8s readinessImage: readiness-check:2.0.0 diff --git a/kubernetes/portal/charts/portal-widget/.helmignore b/kubernetes/portal/components/portal-widget/.helmignore similarity index 100% rename from kubernetes/portal/charts/portal-widget/.helmignore rename to kubernetes/portal/components/portal-widget/.helmignore diff --git a/kubernetes/portal/charts/portal-widget/Chart.yaml b/kubernetes/portal/components/portal-widget/Chart.yaml similarity index 100% rename from kubernetes/portal/charts/portal-widget/Chart.yaml rename to kubernetes/portal/components/portal-widget/Chart.yaml diff --git a/kubernetes/portal/components/portal-widget/requirements.yaml b/kubernetes/portal/components/portal-widget/requirements.yaml new file mode 100644 index 0000000000..c5d7864b9d --- /dev/null +++ b/kubernetes/portal/components/portal-widget/requirements.yaml @@ -0,0 +1,18 @@ +# Copyright © 2020 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. + +dependencies: + - name: common + version: ~6.x-0 + repository: '@local' diff --git a/kubernetes/portal/charts/portal-widget/resources/config/deliveries/properties/ONAPWIDGETMS/application.properties b/kubernetes/portal/components/portal-widget/resources/config/deliveries/properties/ONAPWIDGETMS/application.properties similarity index 100% rename from kubernetes/portal/charts/portal-widget/resources/config/deliveries/properties/ONAPWIDGETMS/application.properties rename to kubernetes/portal/components/portal-widget/resources/config/deliveries/properties/ONAPWIDGETMS/application.properties diff --git a/kubernetes/portal/charts/portal-widget/resources/config/deliveries/properties/ONAPWIDGETMS/application.yml b/kubernetes/portal/components/portal-widget/resources/config/deliveries/properties/ONAPWIDGETMS/application.yml similarity index 100% rename from kubernetes/portal/charts/portal-widget/resources/config/deliveries/properties/ONAPWIDGETMS/application.yml rename to kubernetes/portal/components/portal-widget/resources/config/deliveries/properties/ONAPWIDGETMS/application.yml diff --git a/kubernetes/portal/charts/portal-widget/templates/NOTES.txt b/kubernetes/portal/components/portal-widget/templates/NOTES.txt similarity index 100% rename from kubernetes/portal/charts/portal-widget/templates/NOTES.txt rename to kubernetes/portal/components/portal-widget/templates/NOTES.txt diff --git a/kubernetes/portal/charts/portal-widget/templates/configmap.yaml b/kubernetes/portal/components/portal-widget/templates/configmap.yaml similarity index 100% rename from kubernetes/portal/charts/portal-widget/templates/configmap.yaml rename to kubernetes/portal/components/portal-widget/templates/configmap.yaml diff --git a/kubernetes/portal/charts/portal-widget/templates/deployment.yaml b/kubernetes/portal/components/portal-widget/templates/deployment.yaml similarity index 100% rename from kubernetes/portal/charts/portal-widget/templates/deployment.yaml rename to kubernetes/portal/components/portal-widget/templates/deployment.yaml diff --git a/kubernetes/portal/charts/portal-widget/templates/service.yaml b/kubernetes/portal/components/portal-widget/templates/service.yaml similarity index 100% rename from kubernetes/portal/charts/portal-widget/templates/service.yaml rename to kubernetes/portal/components/portal-widget/templates/service.yaml diff --git a/kubernetes/portal/charts/portal-widget/values.yaml b/kubernetes/portal/components/portal-widget/values.yaml similarity index 100% rename from kubernetes/portal/charts/portal-widget/values.yaml rename to kubernetes/portal/components/portal-widget/values.yaml diff --git a/kubernetes/portal/charts/portal-zookeeper/.helmignore b/kubernetes/portal/components/portal-zookeeper/.helmignore similarity index 100% rename from kubernetes/portal/charts/portal-zookeeper/.helmignore rename to kubernetes/portal/components/portal-zookeeper/.helmignore diff --git a/kubernetes/portal/charts/portal-zookeeper/Chart.yaml b/kubernetes/portal/components/portal-zookeeper/Chart.yaml similarity index 100% rename from kubernetes/portal/charts/portal-zookeeper/Chart.yaml rename to kubernetes/portal/components/portal-zookeeper/Chart.yaml diff --git a/kubernetes/portal/components/portal-zookeeper/requirements.yaml b/kubernetes/portal/components/portal-zookeeper/requirements.yaml new file mode 100644 index 0000000000..c5d7864b9d --- /dev/null +++ b/kubernetes/portal/components/portal-zookeeper/requirements.yaml @@ -0,0 +1,18 @@ +# Copyright © 2020 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. + +dependencies: + - name: common + version: ~6.x-0 + repository: '@local' diff --git a/kubernetes/portal/charts/portal-zookeeper/templates/NOTES.txt b/kubernetes/portal/components/portal-zookeeper/templates/NOTES.txt similarity index 100% rename from kubernetes/portal/charts/portal-zookeeper/templates/NOTES.txt rename to kubernetes/portal/components/portal-zookeeper/templates/NOTES.txt diff --git a/kubernetes/portal/charts/portal-zookeeper/templates/deployment.yaml b/kubernetes/portal/components/portal-zookeeper/templates/deployment.yaml similarity index 100% rename from kubernetes/portal/charts/portal-zookeeper/templates/deployment.yaml rename to kubernetes/portal/components/portal-zookeeper/templates/deployment.yaml diff --git a/kubernetes/portal/charts/portal-zookeeper/templates/service.yaml b/kubernetes/portal/components/portal-zookeeper/templates/service.yaml similarity index 100% rename from kubernetes/portal/charts/portal-zookeeper/templates/service.yaml rename to kubernetes/portal/components/portal-zookeeper/templates/service.yaml diff --git a/kubernetes/portal/charts/portal-zookeeper/values.yaml b/kubernetes/portal/components/portal-zookeeper/values.yaml similarity index 100% rename from kubernetes/portal/charts/portal-zookeeper/values.yaml rename to kubernetes/portal/components/portal-zookeeper/values.yaml diff --git a/kubernetes/portal/requirements.yaml b/kubernetes/portal/requirements.yaml index caff1e5dc4..f89bbd6a2b 100644 --- a/kubernetes/portal/requirements.yaml +++ b/kubernetes/portal/requirements.yaml @@ -17,3 +17,21 @@ dependencies: - name: common version: ~6.x-0 repository: '@local' + - name: portal-app + version: ~6.x-0 + repository: 'file://components/portal-app' + - name: portal-cassandra + version: ~6.x-0 + repository: 'file://components/portal-cassandra' + - name: portal-mariadb + version: ~6.x-0 + repository: 'file://components/portal-mariadb' + - name: portal-sdk + version: ~6.x-0 + repository: 'file://components/portal-sdk' + - name: portal-widget + version: ~6.x-0 + repository: 'file://components/portal-widget' + - name: portal-zookeeper + version: ~6.x-0 + repository: 'file://components/portal-zookeeper' -- 2.16.6