From: Sylvain Desbureaux Date: Tue, 26 May 2020 06:51:23 +0000 (+0000) Subject: Merge "[POLICY] frankfurt RC2 images" X-Git-Tag: 7.0.0~415 X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=7bd12809f5e701fa5a040bbe2ebcaac1fc3e0184;hp=080016d9a7f2e9466025d9c5930ad2f377f222a9;p=oom.git Merge "[POLICY] frankfurt RC2 images" --- diff --git a/kubernetes/appc/charts/appc-cdt/values.yaml b/kubernetes/appc/charts/appc-cdt/values.yaml index bd99bcac15..e8508204bc 100644 --- a/kubernetes/appc/charts/appc-cdt/values.yaml +++ b/kubernetes/appc/charts/appc-cdt/values.yaml @@ -26,7 +26,7 @@ flavor: small # application image repository: nexus3.onap.org:10001 -image: onap/appc-cdt-image:1.7.1 +image: onap/appc-cdt-image:1.7.2 pullPolicy: Always # application configuration diff --git a/kubernetes/appc/values.yaml b/kubernetes/appc/values.yaml index 45a9b4cfa1..1386a06493 100644 --- a/kubernetes/appc/values.yaml +++ b/kubernetes/appc/values.yaml @@ -57,7 +57,7 @@ secrets: flavor: small # application image repository: nexus3.onap.org:10001 -image: onap/appc-image:1.7.1 +image: onap/appc-image:1.7.2 pullPolicy: Always # flag to enable debugging - application support required diff --git a/kubernetes/common/postgres/templates/_deployment.tpl b/kubernetes/common/postgres/templates/_deployment.tpl index e3ac66933f..b1aae5f50d 100644 --- a/kubernetes/common/postgres/templates/_deployment.tpl +++ b/kubernetes/common/postgres/templates/_deployment.tpl @@ -44,19 +44,26 @@ spec: - sh args: - -c - - "cd /config-input && for PFILE in `ls -1 .`; do envsubst <${PFILE} >/config/${PFILE}; done" + - | + function prepare_password { + echo -n $1 | sed -e "s/'/''/g" + } + export PG_PRIMARY_PASSWORD=`prepare_password $PG_PRIMARY_PASSWORD_INPUT`; + export PG_PASSWORD=`prepare_password $PG_PASSWORD_INPUT`; + export PG_ROOT_PASSWORD=`prepare_password $PG_ROOT_PASSWORD_INPUT`; + cd /config-input && for PFILE in `ls -1 .`; do envsubst <${PFILE} >/config/${PFILE}; done env: - name: PG_PRIMARY_USER value: primaryuser - - name: PG_PRIMARY_PASSWORD + - name: PG_PRIMARY_PASSWORD_INPUT {{- include "common.secret.envFromSecretFast" (dict "global" $dot "uid" (include "common.postgres.secret.primaryPasswordUID" .) "key" "password") | indent 10 }} - name: PG_USER {{- include "common.secret.envFromSecretFast" (dict "global" $dot "uid" (include "common.postgres.secret.userCredentialsUID" .) "key" "login") | indent 10 }} - - name: PG_PASSWORD + - name: PG_PASSWORD_INPUT {{- include "common.secret.envFromSecretFast" (dict "global" $dot "uid" (include "common.postgres.secret.userCredentialsUID" .) "key" "password") | indent 10 }} - name: PG_DATABASE value: "{{ $dot.Values.config.pgDatabase }}" - - name: PG_ROOT_PASSWORD + - name: PG_ROOT_PASSWORD_INPUT {{- include "common.secret.envFromSecretFast" (dict "global" $dot "uid" (include "common.postgres.secret.rootPassUID" .) "key" "password") | indent 10 }} volumeMounts: - mountPath: /config-input/setup.sql diff --git a/kubernetes/msb/charts/msb-eag/templates/deployment.yaml b/kubernetes/msb/charts/msb-eag/templates/deployment.yaml index fd16a0ce6b..95f0e34599 100644 --- a/kubernetes/msb/charts/msb-eag/templates/deployment.yaml +++ b/kubernetes/msb/charts/msb-eag/templates/deployment.yaml @@ -81,6 +81,14 @@ spec: - mountPath: /etc/localtime name: localtime readOnly: true + - name: {{ include "common.fullname" . }}-cert + mountPath: /usr/local/openresty/nginx/ssl/cert/cert.crt + readOnly: true + subPath: "cert.crt" + - name: {{ include "common.fullname" . }}-cert + mountPath: /usr/local/openresty/nginx/html/cert/ca.crt + readOnly: true + subPath: "ca.crt" - mountPath: /usr/local/apiroute-works/logs name: {{ include "common.fullname" . }}-logs resources: @@ -109,6 +117,9 @@ spec: name: {{ include "common.fullname" . }}-log-conf subPath: logback.xml volumes: + - name: {{ include "common.fullname" . }}-cert + secret: + secretName: {{ include "common.release" . }}-msb-https-cert - name: {{ include "common.fullname" . }}-log-conf configMap: name: {{ include "common.fullname" . }}-log diff --git a/kubernetes/msb/charts/msb-iag/templates/deployment.yaml b/kubernetes/msb/charts/msb-iag/templates/deployment.yaml index 8975a32c7f..f95f1059a6 100644 --- a/kubernetes/msb/charts/msb-iag/templates/deployment.yaml +++ b/kubernetes/msb/charts/msb-iag/templates/deployment.yaml @@ -81,6 +81,14 @@ spec: - mountPath: /etc/localtime name: localtime readOnly: true + - name: {{ include "common.fullname" . }}-cert + mountPath: /usr/local/openresty/nginx/ssl/cert/cert.crt + readOnly: true + subPath: "cert.crt" + - name: {{ include "common.fullname" . }}-cert + mountPath: /usr/local/openresty/nginx/html/cert/ca.crt + readOnly: true + subPath: "ca.crt" - mountPath: /usr/local/apiroute-works/logs name: {{ include "common.fullname" . }}-logs resources: @@ -109,6 +117,9 @@ spec: name: {{ include "common.fullname" . }}-log-conf subPath: logback.xml volumes: + - name: {{ include "common.fullname" . }}-cert + secret: + secretName: {{ include "common.release" . }}-msb-https-cert - name: {{ include "common.fullname" . }}-log-conf configMap: name: {{ include "common.fullname" . }}-log diff --git a/kubernetes/msb/resources/config/certificates/cert.crt b/kubernetes/msb/resources/config/certificates/cert.crt index 7d1314f59e..e718c8d166 100644 --- a/kubernetes/msb/resources/config/certificates/cert.crt +++ b/kubernetes/msb/resources/config/certificates/cert.crt @@ -1,22 +1,23 @@ -----BEGIN CERTIFICATE----- -MIIDqjCCApKgAwIBAgIJAOQWcdss4Qu5MA0GCSqGSIb3DQEBCwUAMIGKMQswCQYD +MIID0TCCArmgAwIBAgIJAOQWcdss4QvKMA0GCSqGSIb3DQEBCwUAMIGKMQswCQYD VQQGEwJDTjERMA8GA1UECAwIc2ljaHVhbmcxEDAOBgNVBAcMB2NoZW5nZHUxDDAK BgNVBAoMA3p0ZTEOMAwGA1UECwwFemVuYXAxODA2BgNVBAMML1pURSBPcGVuUGFs -ZXR0ZSBSb290IENlcnRpZmljYXRlIEF1dGhvcml0eSAyMDE3MB4XDTIwMDQyMjAy -NTc1MFoXDTIyMDQyMjAyNTc1MFowYDELMAkGA1UEBhMCQ04xEDAOBgNVBAgMB1Np -Y2h1YW4xEDAOBgNVBAcMB0NoZW5nZHUxDTALBgNVBAoMBE9OQVAxDDAKBgNVBAsM -A01TQjEQMA4GA1UEAwwHbXNiLWlhZzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCC -AQoCggEBAMa1YlTIL8APcmASbxrD7Q9BhWL9Hwi+FKO4HsIrSiJj/A/FLVe3kV2a -xA7b5wdv44P0qQnh3pc0djlnZ47Fgli3lhEZ33+j5vrXHCjEFKiZZVeO+y/p+OcZ -VMNiL+MPJNTNgMkPoaljs/U6fn6fFyAgMMIqqigxHJaNvz7IH+UpqbWWzZo7+JqC -lBi8t5ZIDk18/3cPQWXIne+3MoYULdEayAS8/4wYoJANH1knmSG+J07f9uCXniiz -4zFFngMGHm4kuKXJCAl5E6S5fPzsLKqtwbbn9kJNyWoNFDuc7zW5dPfqPVckHHQ8 -Dx0q2111UgrzrBZMW1RKmcwB+1YXip8CAwEAAaM8MDowCQYDVR0TBAIwADALBgNV -HQ8EBAMCBeAwIAYDVR0RBBkwF4IVKi5zaW1wbGVkZW1vLm9uYXAub3JnMA0GCSqG -SIb3DQEBCwUAA4IBAQCXSECDNzsg2MhVIVvviqxhpZWZ3sa7KxXlyd9iSmBzkneS -+XiyUC575ZM3lmh1Kme35bWgz5R/w76XLSMBPxIX6uZ4HVNQqwSPv63Nk9+ON3IN -iCn6ehHKJgT0rpx/aB3sIcE1hEtIWLGaaKVEb3DOuDbkbBT9eJbIgHKkT80PKynK -l35dQRMiGBQiD8cBUxTOJaj7QohZ/aUWArZCOl0uvddkrs/IOCMY3BDQ0WZ7RYp3 -LwpgZVPzkVRaSLSq3TS07Re+nZcaht69T6mdMY5V0gW20O4J2nWMaldSmlNqcddb -Nl5Xn0lRMW651ZzxEkcaXNtR78yLYi2JXtyQBgVA +ZXR0ZSBSb290IENlcnRpZmljYXRlIEF1dGhvcml0eSAyMDE3MB4XDTIwMDUxMzAy +MjIyN1oXDTIyMDUxMzAyMjIyN1owgYwxCzAJBgNVBAYTAkNOMRAwDgYDVQQIDAdT +aWNodWFuMRAwDgYDVQQHDAdDaGVuZ2R1MQ0wCwYDVQQKDARPTkFQMQwwCgYDVQQL +DANNU0IxEDAOBgNVBAMMB21zYi1pYWcxKjAoBgkqhkiG9w0BCQEWG29uYXAtZGlz +Y3Vzc0BsaXN0cy5vbmFwLm9yZzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC +ggEBAMa1YlTIL8APcmASbxrD7Q9BhWL9Hwi+FKO4HsIrSiJj/A/FLVe3kV2axA7b +5wdv44P0qQnh3pc0djlnZ47Fgli3lhEZ33+j5vrXHCjEFKiZZVeO+y/p+OcZVMNi +L+MPJNTNgMkPoaljs/U6fn6fFyAgMMIqqigxHJaNvz7IH+UpqbWWzZo7+JqClBi8 +t5ZIDk18/3cPQWXIne+3MoYULdEayAS8/4wYoJANH1knmSG+J07f9uCXniiz4zFF +ngMGHm4kuKXJCAl5E6S5fPzsLKqtwbbn9kJNyWoNFDuc7zW5dPfqPVckHHQ8Dx0q +2111UgrzrBZMW1RKmcwB+1YXip8CAwEAAaM2MDQwMgYDVR0RBCswKYIHbXNiLWlh +Z4IHbXNiLWVhZ4IVKi5zaW1wbGVkZW1vLm9uYXAub3JnMA0GCSqGSIb3DQEBCwUA +A4IBAQC9KKJ5x+EBHfdODbMIAufYinlbNRQ4xdG7tlRk0cRXnZoWi6yObQXmZuHV +56M2ZIylKNab2Z0VBluQqoLJvByAHQJO1r+qsAMG/LXBRC1x3y5344vtEPbikpMs +GHtxHomAu/JtSAlSL1Wvj7co3OUgVH/yNbccysVtqxxrfPrBhLfH/yDrFehmQ00T +P8mmJG3qeOUII0pgUjBkGL52+YMN0qy0SgryBx86fR9Y1bQLdWNfsM1CUXE2q9xs +FmU5Ry1pemTo68THSJs4wOnjLZ4kWTseTcEmQ6X2lfah8Ch0ffd3tttguNXnT1Xc +axgwv2Cypja3bPbq9t8kfJhbDrYO -----END CERTIFICATE----- diff --git a/kubernetes/msb/templates/secrets.yaml b/kubernetes/msb/templates/secrets.yaml new file mode 100644 index 0000000000..7dcec5a303 --- /dev/null +++ b/kubernetes/msb/templates/secrets.yaml @@ -0,0 +1,26 @@ +{{/* +# 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. +*/}} +apiVersion: v1 +kind: Secret +metadata: + name: {{ include "common.release" . }}-msb-https-cert + labels: {{ include "common.labels" . | nindent 4 }} + app: {{ include "common.name" . }} + chart: {{ include "common.chart" . }} + release: {{ include "common.release" . }} +type: Opaque +data: +{{ tpl (.Files.Glob "resources/config/certificates/*").AsSecrets . | indent 2 }} 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 b0d2f5d1cf..cfab8e6183 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' diff --git a/kubernetes/so/charts/so-bpmn-infra/resources/config/overrides/override.yaml b/kubernetes/so/charts/so-bpmn-infra/resources/config/overrides/override.yaml index 8c21a99ac1..e57ea34f43 100755 --- a/kubernetes/so/charts/so-bpmn-infra/resources/config/overrides/override.yaml +++ b/kubernetes/so/charts/so-bpmn-infra/resources/config/overrides/override.yaml @@ -45,7 +45,7 @@ pnf: consumerId: consumerId topicListenerDelayInSeconds: 5 bpelURL: http://so-bpmn-infra.{{ include "common.namespace" . }}:8081 -msb-ip: msb-iag.{{ include "common.namespace" . }} +msb-ip: msb-iag msb-port: 80 mso: rainyDay: diff --git a/kubernetes/so/charts/so-openstack-adapter/resources/config/overrides/override.yaml b/kubernetes/so/charts/so-openstack-adapter/resources/config/overrides/override.yaml index 3ecf3f50b3..dde3b3ee63 100755 --- a/kubernetes/so/charts/so-openstack-adapter/resources/config/overrides/override.yaml +++ b/kubernetes/so/charts/so-openstack-adapter/resources/config/overrides/override.yaml @@ -102,7 +102,7 @@ mso: auth: {{ include "helpers.profileProperty" (dict "condition" .Values.global.security.aaf.enabled "value1" .Values.global.aaf.auth.encrypted "value2" .Values.mso.db.auth )}} auth: {{ include "helpers.profileProperty" (dict "condition" .Values.global.security.aaf.enabled "value1" .Values.aaf.auth.encrypted "value2" .Values.mso.auth )}} logPath: ./logs/openstack - msb-ip: msb-iag.{{ include "common.namespace" . }} + msb-ip: msb-iag msb-port: 443 msb-scheme: https workflow: diff --git a/kubernetes/so/charts/so-vfc-adapter/resources/config/overrides/override.yaml b/kubernetes/so/charts/so-vfc-adapter/resources/config/overrides/override.yaml index ea61f502f2..dec34485bc 100755 --- a/kubernetes/so/charts/so-vfc-adapter/resources/config/overrides/override.yaml +++ b/kubernetes/so/charts/so-vfc-adapter/resources/config/overrides/override.yaml @@ -39,7 +39,7 @@ mso: logPath: ./logs/vfc config: cadi: {{ include "cadi.keys" . | nindent 8}} - msb-ip: msb-iag.{{ include "common.namespace" . }} + msb-ip: msb-iag msb-port: 80 adapters: requestDb: diff --git a/kubernetes/so/charts/so-vnfm-adapter/resources/config/overrides/override.yaml b/kubernetes/so/charts/so-vnfm-adapter/resources/config/overrides/override.yaml index 10846cf7fa..1166eab0c4 100755 --- a/kubernetes/so/charts/so-vnfm-adapter/resources/config/overrides/override.yaml +++ b/kubernetes/so/charts/so-vnfm-adapter/resources/config/overrides/override.yaml @@ -42,7 +42,7 @@ mso: logPath: ./logs/vnfm-adapter config: cadi: {{ include "cadi.keys" . | nindent 8}} - msb-ip: msb-iag.{{ include "common.namespace" . }} + msb-ip: msb-iag msb-port: 80 sdc: username: {{ include "helpers.profileProperty" (dict "condition" .Values.global.security.aaf.enabled "value1" .Values.aaf.auth.username "value2" .Values.sdc.username )}} @@ -54,7 +54,7 @@ vnfmadapter: etsi-catalog-manager: vnfpkgm: {{- if .Values.global.msbEnabled }} - endpoint: https://msb-iag.{{ include "common.namespace" . }}:443/api/vnfpkgm/v1 + endpoint: https://msb-iag:443/api/vnfpkgm/v1 http: client: ssl: