[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 <k.opasiak@samsung.com>

81 files changed, 231 insertions, 1 deletions

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
index daebc7da77..daebc7da77 100644
--- a/kubernetes/portal/charts/portal-app/.helmignore
+++ b/kubernetes/portal/components/portal-app/.helmignore
diff --git a/kubernetes/portal/charts/portal-app/Chart.yaml b/kubernetes/portal/components/portal-app/Chart.yaml
index 2815bf6c21..2815bf6c21 100644
--- a/kubernetes/portal/charts/portal-app/Chart.yaml
+++ b/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
index 148c080df5..148c080df5 100755
--- 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
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
index 99fe917de5..99fe917de5 100644
--- 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
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
index 6981fb05bc..6981fb05bc 100644
--- 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
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
index 1760d5bc71..1760d5bc71 100755
--- 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
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
index 06726702f0..06726702f0 100755
--- 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
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
index b5b4e48b97..b5b4e48b97 100755
--- 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
diff --git a/kubernetes/portal/charts/portal-app/resources/server/server.xml b/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 @@
       </Host>
     </Engine>
   </Service>
-</Server>
\ No newline at end of file
+</Server>
diff --git a/kubernetes/portal/charts/portal-app/resources/server/web.xml b/kubernetes/portal/components/portal-app/resources/server/web.xml
index 8f88e12666..8f88e12666 100644
--- a/kubernetes/portal/charts/portal-app/resources/server/web.xml
+++ b/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
index 9a67a4c9bb..9a67a4c9bb 100644
--- a/kubernetes/portal/charts/portal-app/templates/NOTES.txt
+++ b/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
index d514fe6411..d514fe6411 100644
--- a/kubernetes/portal/charts/portal-app/templates/configmap.yaml
+++ b/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
index af00b5ff89..af00b5ff89 100644
--- a/kubernetes/portal/charts/portal-app/templates/deployment.yaml
+++ b/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
index 8f87c68f1e..8f87c68f1e 100644
--- a/kubernetes/portal/charts/portal-app/templates/ingress.yaml
+++ b/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
index a4019efa2b..a4019efa2b 100644
--- a/kubernetes/portal/charts/portal-app/templates/secret.yaml
+++ b/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
index dd207ea0e6..dd207ea0e6 100644
--- a/kubernetes/portal/charts/portal-app/templates/service.yaml
+++ b/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
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
index daebc7da77..daebc7da77 100644
--- a/kubernetes/portal/charts/portal-cassandra/.helmignore
+++ b/kubernetes/portal/components/portal-cassandra/.helmignore
diff --git a/kubernetes/portal/charts/portal-cassandra/Chart.yaml b/kubernetes/portal/components/portal-cassandra/Chart.yaml
index 48d419910b..48d419910b 100644
--- a/kubernetes/portal/charts/portal-cassandra/Chart.yaml
+++ b/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
index 4fd368a5b8..4fd368a5b8 100644
--- 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
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
index 7827727ebc..7827727ebc 100644
--- 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
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
index 4f6148e3f1..4f6148e3f1 100644
--- 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
diff --git a/kubernetes/portal/charts/portal-cassandra/templates/NOTES.txt b/kubernetes/portal/components/portal-cassandra/templates/NOTES.txt
index ee7a285cc0..ee7a285cc0 100644
--- a/kubernetes/portal/charts/portal-cassandra/templates/NOTES.txt
+++ b/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
index 4ed457d453..4ed457d453 100644
--- a/kubernetes/portal/charts/portal-cassandra/templates/configmap.yaml
+++ b/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
index 073bed4974..073bed4974 100644
--- a/kubernetes/portal/charts/portal-cassandra/templates/deployment.yaml
+++ b/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
index e10b003570..e10b003570 100644
--- a/kubernetes/portal/charts/portal-cassandra/templates/pv.yaml
+++ b/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
index 1cadcc51d5..1cadcc51d5 100644
--- a/kubernetes/portal/charts/portal-cassandra/templates/pvc.yaml
+++ b/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
index 3e66ac8574..3e66ac8574 100644
--- a/kubernetes/portal/charts/portal-cassandra/templates/service.yaml
+++ b/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
index 65fcdbe84a..65fcdbe84a 100644
--- a/kubernetes/portal/charts/portal-cassandra/values.yaml
+++ b/kubernetes/portal/components/portal-cassandra/values.yaml
diff --git a/kubernetes/portal/charts/portal-mariadb/.helmignore b/kubernetes/portal/components/portal-mariadb/.helmignore
index daebc7da77..daebc7da77 100644
--- a/kubernetes/portal/charts/portal-mariadb/.helmignore
+++ b/kubernetes/portal/components/portal-mariadb/.helmignore
diff --git a/kubernetes/portal/charts/portal-mariadb/Chart.yaml b/kubernetes/portal/components/portal-mariadb/Chart.yaml
index 697acd791c..697acd791c 100644
--- a/kubernetes/portal/charts/portal-mariadb/Chart.yaml
+++ b/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
index 28fcee1551..28fcee1551 100644
--- a/kubernetes/portal/charts/portal-mariadb/resources/config/mariadb/docker-entrypoint.sh
+++ b/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
index 7502e9322a..7502e9322a 100644
--- a/kubernetes/portal/charts/portal-mariadb/resources/config/mariadb/oom_updates.sql
+++ b/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
index ee7a285cc0..ee7a285cc0 100644
--- a/kubernetes/portal/charts/portal-mariadb/templates/NOTES.txt
+++ b/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
index 1602af81f9..1602af81f9 100644
--- a/kubernetes/portal/charts/portal-mariadb/templates/configmap.yaml
+++ b/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
index 6a58911a6f..6a58911a6f 100644
--- a/kubernetes/portal/charts/portal-mariadb/templates/deployment.yaml
+++ b/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
index 812dc66a23..812dc66a23 100644
--- a/kubernetes/portal/charts/portal-mariadb/templates/job.yaml
+++ b/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
index e10b003570..e10b003570 100644
--- a/kubernetes/portal/charts/portal-mariadb/templates/pv.yaml
+++ b/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
index 1cadcc51d5..1cadcc51d5 100644
--- a/kubernetes/portal/charts/portal-mariadb/templates/pvc.yaml
+++ b/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
index ad1db77298..ad1db77298 100644
--- a/kubernetes/portal/charts/portal-mariadb/templates/secrets.yaml
+++ b/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
index aca4b063b8..aca4b063b8 100644
--- a/kubernetes/portal/charts/portal-mariadb/templates/service.yaml
+++ b/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
index 08157f7b92..08157f7b92 100644
--- a/kubernetes/portal/charts/portal-mariadb/values.yaml
+++ b/kubernetes/portal/components/portal-mariadb/values.yaml
diff --git a/kubernetes/portal/charts/portal-sdk/.helmignore b/kubernetes/portal/components/portal-sdk/.helmignore
index daebc7da77..daebc7da77 100644
--- a/kubernetes/portal/charts/portal-sdk/.helmignore
+++ b/kubernetes/portal/components/portal-sdk/.helmignore
diff --git a/kubernetes/portal/charts/portal-sdk/Chart.yaml b/kubernetes/portal/components/portal-sdk/Chart.yaml
index 766cc10f1b..766cc10f1b 100644
--- a/kubernetes/portal/charts/portal-sdk/Chart.yaml
+++ b/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
index 5c24429cdb..5c24429cdb 100644
--- 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
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
index 85e1eed648..85e1eed648 100644
--- 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
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
index 8881cc2f2d..8881cc2f2d 100644
--- 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
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
index 2ccace545a..2ccace545a 100755
--- 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
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
index 2a2ec59d5c..2a2ec59d5c 100755
--- 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
diff --git a/kubernetes/portal/charts/portal-sdk/resources/server/server.xml b/kubernetes/portal/components/portal-sdk/resources/server/server.xml
index dffcfbe419..dffcfbe419 100644
--- a/kubernetes/portal/charts/portal-sdk/resources/server/server.xml
+++ b/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
index 496dd8d1a5..496dd8d1a5 100644
--- a/kubernetes/portal/charts/portal-sdk/templates/NOTES.txt
+++ b/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
index 1dbdeedd5a..1dbdeedd5a 100644
--- a/kubernetes/portal/charts/portal-sdk/templates/configmap.yaml
+++ b/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
index b78ef34fa1..b78ef34fa1 100644
--- a/kubernetes/portal/charts/portal-sdk/templates/deployment.yaml
+++ b/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
index 8f87c68f1e..8f87c68f1e 100644
--- a/kubernetes/portal/charts/portal-sdk/templates/ingress.yaml
+++ b/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
index 61fc2f8037..61fc2f8037 100644
--- a/kubernetes/portal/charts/portal-sdk/templates/secrets.yaml
+++ b/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
index 36d00ccfe2..36d00ccfe2 100644
--- a/kubernetes/portal/charts/portal-sdk/templates/service.yaml
+++ b/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
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
index daebc7da77..daebc7da77 100644
--- a/kubernetes/portal/charts/portal-widget/.helmignore
+++ b/kubernetes/portal/components/portal-widget/.helmignore
diff --git a/kubernetes/portal/charts/portal-widget/Chart.yaml b/kubernetes/portal/components/portal-widget/Chart.yaml
index 25c2dfd201..25c2dfd201 100644
--- a/kubernetes/portal/charts/portal-widget/Chart.yaml
+++ b/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
index a53dd2e283..a53dd2e283 100644
--- 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
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
index 087c93f5ce..087c93f5ce 100644
--- 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
diff --git a/kubernetes/portal/charts/portal-widget/templates/NOTES.txt b/kubernetes/portal/components/portal-widget/templates/NOTES.txt
index 496dd8d1a5..496dd8d1a5 100644
--- a/kubernetes/portal/charts/portal-widget/templates/NOTES.txt
+++ b/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
index 4ac5f6d4ea..4ac5f6d4ea 100644
--- a/kubernetes/portal/charts/portal-widget/templates/configmap.yaml
+++ b/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
index 794d53a328..794d53a328 100644
--- a/kubernetes/portal/charts/portal-widget/templates/deployment.yaml
+++ b/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
index 58da55fdba..58da55fdba 100644
--- a/kubernetes/portal/charts/portal-widget/templates/service.yaml
+++ b/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
index 079847c7e7..079847c7e7 100644
--- a/kubernetes/portal/charts/portal-widget/values.yaml
+++ b/kubernetes/portal/components/portal-widget/values.yaml
diff --git a/kubernetes/portal/charts/portal-zookeeper/.helmignore b/kubernetes/portal/components/portal-zookeeper/.helmignore
index daebc7da77..daebc7da77 100644
--- a/kubernetes/portal/charts/portal-zookeeper/.helmignore
+++ b/kubernetes/portal/components/portal-zookeeper/.helmignore
diff --git a/kubernetes/portal/charts/portal-zookeeper/Chart.yaml b/kubernetes/portal/components/portal-zookeeper/Chart.yaml
index 8a81b5763f..8a81b5763f 100644
--- a/kubernetes/portal/charts/portal-zookeeper/Chart.yaml
+++ b/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
index ee7a285cc0..ee7a285cc0 100644
--- a/kubernetes/portal/charts/portal-zookeeper/templates/NOTES.txt
+++ b/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
index 58ddd91160..58ddd91160 100644
--- a/kubernetes/portal/charts/portal-zookeeper/templates/deployment.yaml
+++ b/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
index aca4b063b8..aca4b063b8 100644
--- a/kubernetes/portal/charts/portal-zookeeper/templates/service.yaml
+++ b/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
index 6037d246cf..6037d246cf 100644
--- a/kubernetes/portal/charts/portal-zookeeper/values.yaml
+++ b/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'