Merge "[PORTAL] Move portal subcharts to components"
diff --git a/kubernetes/portal/Makefile b/kubernetes/portal/Makefile
new file mode 100644
index 0000000..8af301d
--- /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 0000000..2fc0cbe
--- /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 0000000..c5d7864
--- /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 dec6837..420dbd3 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
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 b0d2f5d..cfab8e6 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 0000000..c5d7864
--- /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 0000000..c5d7864
--- /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 0000000..c5d7864
--- /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 7f3aa70..2363ec5 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 0000000..c5d7864
--- /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 0000000..c5d7864
--- /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 caff1e5..f89bbd6 100644
--- a/kubernetes/portal/requirements.yaml
+++ b/kubernetes/portal/requirements.yaml
@@ -17,3 +17,21 @@
- 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'