From 93ed075394f96106433fec580fabb6a066ed10dd Mon Sep 17 00:00:00 2001 From: Sylvain Desbureaux Date: Sat, 21 Nov 2020 21:22:18 +0100 Subject: [PATCH] [POMBA] Uses new tpls for repos / images This commit makes Pomba chart to use the new generator for repositories and images. As new templates doesn't work well with "sub charts", we move also subcharts to components folder. Issue-ID: OOM-2364 Signed-off-by: Sylvain Desbureaux Change-Id: Ib94d70d7eb0af5835774719851046ada0af96202 --- kubernetes/pomba/Makefile | 51 +++++++++++++++++++++ .../charts/pomba-aaictxbuilder/requirements.yaml | 18 -------- .../pomba/charts/pomba-kibana/requirements.yaml | 18 -------- .../pomba-networkdiscovery/requirements.yaml | 18 -------- .../requirements.yaml | 18 -------- .../charts/pomba-sdncctxbuilder/requirements.yaml | 18 -------- .../pomba-servicedecomposition/requirements.yaml | 18 -------- kubernetes/pomba/components/Makefile | 51 +++++++++++++++++++++ .../pomba-aaictxbuilder/Chart.yaml | 0 .../pomba-aaictxbuilder}/requirements.yaml | 3 ++ .../resources/config/application.properties | 0 .../resources/config/logback.xml | 0 .../pomba-aaictxbuilder/templates/configmap.yaml | 0 .../pomba-aaictxbuilder/templates/deployment.yaml | 4 +- .../pomba-aaictxbuilder/templates/service.yaml | 0 .../pomba-aaictxbuilder/values.yaml | 4 -- .../pomba-contextaggregator/.helmignore | 0 .../pomba-contextaggregator/Chart.yaml | 0 .../pomba-contextaggregator}/requirements.yaml | 5 +- .../resources/config/application.properties | 0 .../resources/config/builders/aai.properties | 0 .../resources/config/builders/ndcb.properties | 0 .../resources/config/builders/sdc.properties | 0 .../resources/config/builders/sdnc.properties | 0 .../resources/config/logback.xml | 0 .../templates/configmap.yaml | 0 .../templates/deployment.yaml | 6 +-- .../pomba-contextaggregator/templates/service.yaml | 0 .../pomba-contextaggregator/values.yaml | 2 - .../pomba-data-router/.helmignore | 0 .../pomba-data-router/Chart.yaml | 0 .../pomba-data-router}/requirements.yaml | 5 +- .../resources/config/auth/client-cert-onap.p12 | Bin .../resources/config/auth/data-router_policy.json | 0 .../resources/config/auth/tomcat_keystore | Bin .../resources/config/data-router.properties | 0 .../resources/config/schemaIngest.properties | 0 .../resources/dynamic/conf/audit-bean.xml | 0 .../resources/dynamic/conf/poa-validation-bean.xml | 0 .../resources/dynamic/routes/audit.route | 0 .../resources/dynamic/routes/poaValidation.route | 0 .../pomba-data-router/templates/configmap.yaml | 0 .../pomba-data-router/templates/deployment.yaml | 8 ++-- .../pomba-data-router/templates/ingress.yaml | 0 .../pomba-data-router/templates/pv.yaml | 0 .../pomba-data-router/templates/pvc.yaml | 0 .../pomba-data-router/templates/secret.yaml | 0 .../pomba-data-router/templates/service.yaml | 0 .../pomba-data-router/values.yaml | 2 - .../pomba-elasticsearch/Chart.yaml | 0 .../pomba-elasticsearch/requirements.yaml | 5 +- .../resources/config/elasticsearch.yml | 0 .../pomba-elasticsearch/templates/configmap.yaml | 0 .../pomba-elasticsearch/templates/deployment.yaml | 4 +- .../pomba-elasticsearch/templates/pv-data.yaml | 0 .../pomba-elasticsearch/templates/pv-logs.yaml | 0 .../pomba-elasticsearch/templates/pvc-data.yaml | 0 .../pomba-elasticsearch/templates/pvc-logs.yaml | 0 .../pomba-elasticsearch/templates/service.yaml | 0 .../pomba-elasticsearch/values.yaml | 5 -- .../{charts => components}/pomba-kibana/Chart.yaml | 0 .../components/pomba-kibana/requirements.yaml | 21 +++++++++ .../pomba-kibana/resources/auth/pomba.crt.pem | 0 .../pomba-kibana/resources/auth/pomba.key.pem | 0 .../pomba-kibana/resources/bin/kibana_start.sh | 0 .../resources/config/default-mapping.json | 0 .../pomba-kibana/resources/config/default.json | 0 .../pomba-kibana/resources/config/kibana.yml | 0 .../pomba-kibana/templates/configmap.yaml | 0 .../pomba-kibana/templates/deployment.yaml | 8 ++-- .../pomba-kibana/templates/ingress.yaml | 0 .../pomba-kibana/templates/service.yaml | 0 .../pomba-kibana/values.yaml | 7 --- .../pomba-networkdiscovery/Chart.yaml | 0 .../pomba-networkdiscovery/requirements.yaml | 21 +++++++++ .../resources/config/application.properties | 0 .../resources/config/auth/client-cert-onap.p12 | Bin .../resources/config/auth/tomcat_keystore | Bin .../resources/config/logback.xml | 0 .../templates/configmap.yaml | 0 .../templates/deployment.yaml | 4 +- .../pomba-networkdiscovery/templates/ingress.yaml | 0 .../pomba-networkdiscovery/templates/secrets.yaml | 0 .../pomba-networkdiscovery/templates/service.yaml | 0 .../pomba-networkdiscovery/values.yaml | 6 +-- .../pomba-networkdiscoveryctxbuilder/Chart.yaml | 0 .../requirements.yaml | 21 +++++++++ .../resources/config/application.properties | 0 .../resources/config/logback.xml | 0 .../templates/configmap.yaml | 0 .../templates/deployment.yaml | 4 +- .../templates/service.yaml | 0 .../pomba-networkdiscoveryctxbuilder/values.yaml | 2 - .../pomba-sdcctxbuilder/.helmignore | 0 .../pomba-sdcctxbuilder/Chart.yaml | 0 .../pomba-sdcctxbuilder/requirements.yaml | 21 +++++++++ .../resources/config/README.txt | 0 .../resources/config/application.properties | 0 .../resources/config/logback.xml | 0 .../pomba-sdcctxbuilder/templates/configmap.yaml | 0 .../pomba-sdcctxbuilder/templates/deployment.yaml | 4 +- .../pomba-sdcctxbuilder/templates/service.yaml | 0 .../pomba-sdcctxbuilder/values.yaml | 4 -- .../pomba-sdncctxbuilder/.helmignore | 0 .../pomba-sdncctxbuilder/Chart.yaml | 0 .../pomba-sdncctxbuilder/requirements.yaml | 21 +++++++++ .../resources/config/application.properties | 0 .../resources/config/logback.xml | 0 .../pomba-sdncctxbuilder/templates/configmap.yaml | 0 .../pomba-sdncctxbuilder/templates/deployment.yaml | 4 +- .../pomba-sdncctxbuilder/templates/service.yaml | 0 .../pomba-sdncctxbuilder/values.yaml | 2 - .../pomba-search-data/.helmignore | 0 .../pomba-search-data/Chart.yaml | 0 .../components/pomba-search-data/requirements.yaml | 21 +++++++++ .../resources/config/analysis-config.json | 0 .../resources/config/auth/search_policy.json | 0 .../resources/config/auth/tomcat_keystore | Bin .../resources/config/dynamic-custom-template.json | 0 .../resources/config/elastic-search.properties | 0 .../resources/config/es-payload-translation.json | 0 .../resources/config/filter-config.json | 0 .../resources/config/log/logback.xml | 0 .../pomba-search-data/templates/configmap.yaml | 0 .../pomba-search-data/templates/deployment.yaml | 6 +-- .../pomba-search-data/templates/secret.yaml | 0 .../pomba-search-data/templates/service.yaml | 0 .../pomba-search-data/values.yaml | 2 - .../pomba-servicedecomposition/Chart.yaml | 0 .../pomba-servicedecomposition/requirements.yaml | 21 +++++++++ .../resources/config/application.properties | 0 .../resources/config/log/logback.xml | 0 .../templates/configmap.yaml | 0 .../templates/deployment.yaml | 4 +- .../templates/service.yaml | 0 .../pomba-servicedecomposition/values.yaml | 2 - .../pomba-validation-service/Chart.yaml | 0 .../pomba-validation-service/requirements.yaml | 21 +++++++++ .../resources/appconfig/README.txt | 0 .../resources/appconfig/aai-environment.properties | 0 .../resources/appconfig/auth/client-cert-onap.p12 | Bin .../resources/appconfig/auth/tomcat_keystore | Bin .../resources/appconfig/auth_policy.json | 0 .../appconfig/rule-data-dictionary.properties | 0 .../resources/appconfig/rule-indexing.properties | 0 .../resources/appconfig/schemaIngest.properties | 0 .../topics/topic-poa-audit-result.properties | 0 .../topics/topic-poa-rule-validation.properties | 0 .../appconfig/validation-service-auth.properties | 0 .../appconfig/validation-service.properties | 0 .../resources/application.properties | 0 .../etc/rules/poa-event/default-rules.groovy | 0 .../templates/configmap.yaml | 0 .../templates/deployment.yaml | 4 +- .../templates/secrets.yaml | 0 .../templates/service.yaml | 0 .../pomba-validation-service/values.yaml | 5 -- kubernetes/pomba/requirements.yaml | 48 +++++++++++++++++++ kubernetes/pomba/values.yaml | 5 -- 159 files changed, 365 insertions(+), 187 deletions(-) create mode 100644 kubernetes/pomba/Makefile delete mode 100644 kubernetes/pomba/charts/pomba-aaictxbuilder/requirements.yaml delete mode 100644 kubernetes/pomba/charts/pomba-kibana/requirements.yaml delete mode 100644 kubernetes/pomba/charts/pomba-networkdiscovery/requirements.yaml delete mode 100644 kubernetes/pomba/charts/pomba-networkdiscoveryctxbuilder/requirements.yaml delete mode 100644 kubernetes/pomba/charts/pomba-sdncctxbuilder/requirements.yaml delete mode 100644 kubernetes/pomba/charts/pomba-servicedecomposition/requirements.yaml create mode 100644 kubernetes/pomba/components/Makefile rename kubernetes/pomba/{charts => components}/pomba-aaictxbuilder/Chart.yaml (100%) rename kubernetes/pomba/{charts/pomba-validation-service => components/pomba-aaictxbuilder}/requirements.yaml (89%) rename kubernetes/pomba/{charts => components}/pomba-aaictxbuilder/resources/config/application.properties (100%) rename kubernetes/pomba/{charts => components}/pomba-aaictxbuilder/resources/config/logback.xml (100%) rename kubernetes/pomba/{charts => components}/pomba-aaictxbuilder/templates/configmap.yaml (100%) rename kubernetes/pomba/{charts => components}/pomba-aaictxbuilder/templates/deployment.yaml (96%) rename kubernetes/pomba/{charts => components}/pomba-aaictxbuilder/templates/service.yaml (100%) rename kubernetes/pomba/{charts => components}/pomba-aaictxbuilder/values.yaml (96%) rename kubernetes/pomba/{charts => components}/pomba-contextaggregator/.helmignore (100%) rename kubernetes/pomba/{charts => components}/pomba-contextaggregator/Chart.yaml (100%) rename kubernetes/pomba/{charts/pomba-sdcctxbuilder => components/pomba-contextaggregator}/requirements.yaml (86%) rename kubernetes/pomba/{charts => components}/pomba-contextaggregator/resources/config/application.properties (100%) rename kubernetes/pomba/{charts => components}/pomba-contextaggregator/resources/config/builders/aai.properties (100%) rename kubernetes/pomba/{charts => components}/pomba-contextaggregator/resources/config/builders/ndcb.properties (100%) rename kubernetes/pomba/{charts => components}/pomba-contextaggregator/resources/config/builders/sdc.properties (100%) rename kubernetes/pomba/{charts => components}/pomba-contextaggregator/resources/config/builders/sdnc.properties (100%) rename kubernetes/pomba/{charts => components}/pomba-contextaggregator/resources/config/logback.xml (100%) rename kubernetes/pomba/{charts => components}/pomba-contextaggregator/templates/configmap.yaml (100%) rename kubernetes/pomba/{charts => components}/pomba-contextaggregator/templates/deployment.yaml (95%) rename kubernetes/pomba/{charts => components}/pomba-contextaggregator/templates/service.yaml (100%) rename kubernetes/pomba/{charts => components}/pomba-contextaggregator/values.yaml (97%) rename kubernetes/pomba/{charts => components}/pomba-data-router/.helmignore (100%) rename kubernetes/pomba/{charts => components}/pomba-data-router/Chart.yaml (100%) rename kubernetes/pomba/{charts/pomba-contextaggregator => components/pomba-data-router}/requirements.yaml (86%) mode change 100755 => 100644 rename kubernetes/pomba/{charts => components}/pomba-data-router/resources/config/auth/client-cert-onap.p12 (100%) rename kubernetes/pomba/{charts => components}/pomba-data-router/resources/config/auth/data-router_policy.json (100%) rename kubernetes/pomba/{charts => components}/pomba-data-router/resources/config/auth/tomcat_keystore (100%) rename kubernetes/pomba/{charts => components}/pomba-data-router/resources/config/data-router.properties (100%) rename kubernetes/pomba/{charts => components}/pomba-data-router/resources/config/schemaIngest.properties (100%) rename kubernetes/pomba/{charts => components}/pomba-data-router/resources/dynamic/conf/audit-bean.xml (100%) rename kubernetes/pomba/{charts => components}/pomba-data-router/resources/dynamic/conf/poa-validation-bean.xml (100%) rename kubernetes/pomba/{charts => components}/pomba-data-router/resources/dynamic/routes/audit.route (100%) rename kubernetes/pomba/{charts => components}/pomba-data-router/resources/dynamic/routes/poaValidation.route (100%) rename kubernetes/pomba/{charts => components}/pomba-data-router/templates/configmap.yaml (100%) rename kubernetes/pomba/{charts => components}/pomba-data-router/templates/deployment.yaml (94%) rename kubernetes/pomba/{charts => components}/pomba-data-router/templates/ingress.yaml (100%) rename kubernetes/pomba/{charts => components}/pomba-data-router/templates/pv.yaml (100%) rename kubernetes/pomba/{charts => components}/pomba-data-router/templates/pvc.yaml (100%) rename kubernetes/pomba/{charts => components}/pomba-data-router/templates/secret.yaml (100%) rename kubernetes/pomba/{charts => components}/pomba-data-router/templates/service.yaml (100%) rename kubernetes/pomba/{charts => components}/pomba-data-router/values.yaml (97%) rename kubernetes/pomba/{charts => components}/pomba-elasticsearch/Chart.yaml (100%) rename kubernetes/pomba/{charts => components}/pomba-elasticsearch/requirements.yaml (86%) rename kubernetes/pomba/{charts => components}/pomba-elasticsearch/resources/config/elasticsearch.yml (100%) rename kubernetes/pomba/{charts => components}/pomba-elasticsearch/templates/configmap.yaml (100%) rename kubernetes/pomba/{charts => components}/pomba-elasticsearch/templates/deployment.yaml (95%) rename kubernetes/pomba/{charts => components}/pomba-elasticsearch/templates/pv-data.yaml (100%) rename kubernetes/pomba/{charts => components}/pomba-elasticsearch/templates/pv-logs.yaml (100%) rename kubernetes/pomba/{charts => components}/pomba-elasticsearch/templates/pvc-data.yaml (100%) rename kubernetes/pomba/{charts => components}/pomba-elasticsearch/templates/pvc-logs.yaml (100%) rename kubernetes/pomba/{charts => components}/pomba-elasticsearch/templates/service.yaml (100%) rename kubernetes/pomba/{charts => components}/pomba-elasticsearch/values.yaml (95%) rename kubernetes/pomba/{charts => components}/pomba-kibana/Chart.yaml (100%) create mode 100644 kubernetes/pomba/components/pomba-kibana/requirements.yaml rename kubernetes/pomba/{charts => components}/pomba-kibana/resources/auth/pomba.crt.pem (100%) rename kubernetes/pomba/{charts => components}/pomba-kibana/resources/auth/pomba.key.pem (100%) rename kubernetes/pomba/{charts => components}/pomba-kibana/resources/bin/kibana_start.sh (100%) rename kubernetes/pomba/{charts => components}/pomba-kibana/resources/config/default-mapping.json (100%) rename kubernetes/pomba/{charts => components}/pomba-kibana/resources/config/default.json (100%) rename kubernetes/pomba/{charts => components}/pomba-kibana/resources/config/kibana.yml (100%) rename kubernetes/pomba/{charts => components}/pomba-kibana/templates/configmap.yaml (100%) rename kubernetes/pomba/{charts => components}/pomba-kibana/templates/deployment.yaml (94%) rename kubernetes/pomba/{charts => components}/pomba-kibana/templates/ingress.yaml (100%) rename kubernetes/pomba/{charts => components}/pomba-kibana/templates/service.yaml (100%) rename kubernetes/pomba/{charts => components}/pomba-kibana/values.yaml (93%) rename kubernetes/pomba/{charts => components}/pomba-networkdiscovery/Chart.yaml (100%) create mode 100644 kubernetes/pomba/components/pomba-networkdiscovery/requirements.yaml rename kubernetes/pomba/{charts => components}/pomba-networkdiscovery/resources/config/application.properties (100%) rename kubernetes/pomba/{charts => components}/pomba-networkdiscovery/resources/config/auth/client-cert-onap.p12 (100%) rename kubernetes/pomba/{charts => components}/pomba-networkdiscovery/resources/config/auth/tomcat_keystore (100%) rename kubernetes/pomba/{charts => components}/pomba-networkdiscovery/resources/config/logback.xml (100%) rename kubernetes/pomba/{charts => components}/pomba-networkdiscovery/templates/configmap.yaml (100%) rename kubernetes/pomba/{charts => components}/pomba-networkdiscovery/templates/deployment.yaml (96%) rename kubernetes/pomba/{charts => components}/pomba-networkdiscovery/templates/ingress.yaml (100%) rename kubernetes/pomba/{charts => components}/pomba-networkdiscovery/templates/secrets.yaml (100%) rename kubernetes/pomba/{charts => components}/pomba-networkdiscovery/templates/service.yaml (100%) rename kubernetes/pomba/{charts => components}/pomba-networkdiscovery/values.yaml (96%) rename kubernetes/pomba/{charts => components}/pomba-networkdiscoveryctxbuilder/Chart.yaml (100%) create mode 100644 kubernetes/pomba/components/pomba-networkdiscoveryctxbuilder/requirements.yaml rename kubernetes/pomba/{charts => components}/pomba-networkdiscoveryctxbuilder/resources/config/application.properties (100%) rename kubernetes/pomba/{charts => components}/pomba-networkdiscoveryctxbuilder/resources/config/logback.xml (100%) rename kubernetes/pomba/{charts => components}/pomba-networkdiscoveryctxbuilder/templates/configmap.yaml (100%) rename kubernetes/pomba/{charts => components}/pomba-networkdiscoveryctxbuilder/templates/deployment.yaml (96%) rename kubernetes/pomba/{charts => components}/pomba-networkdiscoveryctxbuilder/templates/service.yaml (100%) rename kubernetes/pomba/{charts => components}/pomba-networkdiscoveryctxbuilder/values.yaml (98%) rename kubernetes/pomba/{charts => components}/pomba-sdcctxbuilder/.helmignore (100%) rename kubernetes/pomba/{charts => components}/pomba-sdcctxbuilder/Chart.yaml (100%) create mode 100644 kubernetes/pomba/components/pomba-sdcctxbuilder/requirements.yaml rename kubernetes/pomba/{charts => components}/pomba-sdcctxbuilder/resources/config/README.txt (100%) rename kubernetes/pomba/{charts => components}/pomba-sdcctxbuilder/resources/config/application.properties (100%) rename kubernetes/pomba/{charts => components}/pomba-sdcctxbuilder/resources/config/logback.xml (100%) rename kubernetes/pomba/{charts => components}/pomba-sdcctxbuilder/templates/configmap.yaml (100%) rename kubernetes/pomba/{charts => components}/pomba-sdcctxbuilder/templates/deployment.yaml (96%) rename kubernetes/pomba/{charts => components}/pomba-sdcctxbuilder/templates/service.yaml (100%) rename kubernetes/pomba/{charts => components}/pomba-sdcctxbuilder/values.yaml (95%) rename kubernetes/pomba/{charts => components}/pomba-sdncctxbuilder/.helmignore (100%) rename kubernetes/pomba/{charts => components}/pomba-sdncctxbuilder/Chart.yaml (100%) create mode 100644 kubernetes/pomba/components/pomba-sdncctxbuilder/requirements.yaml rename kubernetes/pomba/{charts => components}/pomba-sdncctxbuilder/resources/config/application.properties (100%) rename kubernetes/pomba/{charts => components}/pomba-sdncctxbuilder/resources/config/logback.xml (100%) rename kubernetes/pomba/{charts => components}/pomba-sdncctxbuilder/templates/configmap.yaml (100%) rename kubernetes/pomba/{charts => components}/pomba-sdncctxbuilder/templates/deployment.yaml (96%) rename kubernetes/pomba/{charts => components}/pomba-sdncctxbuilder/templates/service.yaml (100%) rename kubernetes/pomba/{charts => components}/pomba-sdncctxbuilder/values.yaml (97%) rename kubernetes/pomba/{charts => components}/pomba-search-data/.helmignore (100%) rename kubernetes/pomba/{charts => components}/pomba-search-data/Chart.yaml (100%) create mode 100644 kubernetes/pomba/components/pomba-search-data/requirements.yaml rename kubernetes/pomba/{charts => components}/pomba-search-data/resources/config/analysis-config.json (100%) rename kubernetes/pomba/{charts => components}/pomba-search-data/resources/config/auth/search_policy.json (100%) rename kubernetes/pomba/{charts => components}/pomba-search-data/resources/config/auth/tomcat_keystore (100%) rename kubernetes/pomba/{charts => components}/pomba-search-data/resources/config/dynamic-custom-template.json (100%) rename kubernetes/pomba/{charts => components}/pomba-search-data/resources/config/elastic-search.properties (100%) rename kubernetes/pomba/{charts => components}/pomba-search-data/resources/config/es-payload-translation.json (100%) rename kubernetes/pomba/{charts => components}/pomba-search-data/resources/config/filter-config.json (100%) rename kubernetes/pomba/{charts => components}/pomba-search-data/resources/config/log/logback.xml (100%) rename kubernetes/pomba/{charts => components}/pomba-search-data/templates/configmap.yaml (100%) rename kubernetes/pomba/{charts => components}/pomba-search-data/templates/deployment.yaml (96%) rename kubernetes/pomba/{charts => components}/pomba-search-data/templates/secret.yaml (100%) rename kubernetes/pomba/{charts => components}/pomba-search-data/templates/service.yaml (100%) rename kubernetes/pomba/{charts => components}/pomba-search-data/values.yaml (94%) rename kubernetes/pomba/{charts => components}/pomba-servicedecomposition/Chart.yaml (100%) create mode 100644 kubernetes/pomba/components/pomba-servicedecomposition/requirements.yaml rename kubernetes/pomba/{charts => components}/pomba-servicedecomposition/resources/config/application.properties (100%) rename kubernetes/pomba/{charts => components}/pomba-servicedecomposition/resources/config/log/logback.xml (100%) rename kubernetes/pomba/{charts => components}/pomba-servicedecomposition/templates/configmap.yaml (100%) rename kubernetes/pomba/{charts => components}/pomba-servicedecomposition/templates/deployment.yaml (96%) rename kubernetes/pomba/{charts => components}/pomba-servicedecomposition/templates/service.yaml (100%) rename kubernetes/pomba/{charts => components}/pomba-servicedecomposition/values.yaml (97%) rename kubernetes/pomba/{charts => components}/pomba-validation-service/Chart.yaml (100%) create mode 100644 kubernetes/pomba/components/pomba-validation-service/requirements.yaml rename kubernetes/pomba/{charts => components}/pomba-validation-service/resources/appconfig/README.txt (100%) rename kubernetes/pomba/{charts => components}/pomba-validation-service/resources/appconfig/aai-environment.properties (100%) rename kubernetes/pomba/{charts => components}/pomba-validation-service/resources/appconfig/auth/client-cert-onap.p12 (100%) rename kubernetes/pomba/{charts => components}/pomba-validation-service/resources/appconfig/auth/tomcat_keystore (100%) rename kubernetes/pomba/{charts => components}/pomba-validation-service/resources/appconfig/auth_policy.json (100%) rename kubernetes/pomba/{charts => components}/pomba-validation-service/resources/appconfig/rule-data-dictionary.properties (100%) rename kubernetes/pomba/{charts => components}/pomba-validation-service/resources/appconfig/rule-indexing.properties (100%) rename kubernetes/pomba/{charts => components}/pomba-validation-service/resources/appconfig/schemaIngest.properties (100%) rename kubernetes/pomba/{charts => components}/pomba-validation-service/resources/appconfig/topics/topic-poa-audit-result.properties (100%) rename kubernetes/pomba/{charts => components}/pomba-validation-service/resources/appconfig/topics/topic-poa-rule-validation.properties (100%) rename kubernetes/pomba/{charts => components}/pomba-validation-service/resources/appconfig/validation-service-auth.properties (100%) rename kubernetes/pomba/{charts => components}/pomba-validation-service/resources/appconfig/validation-service.properties (100%) rename kubernetes/pomba/{charts => components}/pomba-validation-service/resources/application.properties (100%) rename kubernetes/pomba/{charts => components}/pomba-validation-service/resources/bundleconfig/etc/rules/poa-event/default-rules.groovy (100%) rename kubernetes/pomba/{charts => components}/pomba-validation-service/templates/configmap.yaml (100%) rename kubernetes/pomba/{charts => components}/pomba-validation-service/templates/deployment.yaml (97%) rename kubernetes/pomba/{charts => components}/pomba-validation-service/templates/secrets.yaml (100%) rename kubernetes/pomba/{charts => components}/pomba-validation-service/templates/service.yaml (100%) rename kubernetes/pomba/{charts => components}/pomba-validation-service/values.yaml (94%) diff --git a/kubernetes/pomba/Makefile b/kubernetes/pomba/Makefile new file mode 100644 index 0000000000..4c79718d02 --- /dev/null +++ b/kubernetes/pomba/Makefile @@ -0,0 +1,51 @@ +# 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_BIN := helm +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_BIN) dep up $*; fi + +lint-%: dep-% + @if [ -f $*/Chart.yaml ]; then $(HELM_BIN) lint $*; fi + +package-%: lint-% + @mkdir -p $(PACKAGE_DIR) + @if [ -f $*/Chart.yaml ]; then $(HELM_BIN) package -d $(PACKAGE_DIR) $*; fi + @$(HELM_BIN) repo index $(PACKAGE_DIR) + +clean: + @rm -f */requirements.lock + @rm -f *tgz */charts/*tgz + @rm -rf $(PACKAGE_DIR) +%: + @: diff --git a/kubernetes/pomba/charts/pomba-aaictxbuilder/requirements.yaml b/kubernetes/pomba/charts/pomba-aaictxbuilder/requirements.yaml deleted file mode 100644 index e4c7240290..0000000000 --- a/kubernetes/pomba/charts/pomba-aaictxbuilder/requirements.yaml +++ /dev/null @@ -1,18 +0,0 @@ -# Copyright © 2018 Amdocs -# -# 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/pomba/charts/pomba-kibana/requirements.yaml b/kubernetes/pomba/charts/pomba-kibana/requirements.yaml deleted file mode 100644 index 6a61926e9e..0000000000 --- a/kubernetes/pomba/charts/pomba-kibana/requirements.yaml +++ /dev/null @@ -1,18 +0,0 @@ -# Copyright © 2017 Amdocs, Bell Canada -# -# 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' \ No newline at end of file diff --git a/kubernetes/pomba/charts/pomba-networkdiscovery/requirements.yaml b/kubernetes/pomba/charts/pomba-networkdiscovery/requirements.yaml deleted file mode 100644 index e10a513d1a..0000000000 --- a/kubernetes/pomba/charts/pomba-networkdiscovery/requirements.yaml +++ /dev/null @@ -1,18 +0,0 @@ -# Copyright © 2018 Amdocs -# -# 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/pomba/charts/pomba-networkdiscoveryctxbuilder/requirements.yaml b/kubernetes/pomba/charts/pomba-networkdiscoveryctxbuilder/requirements.yaml deleted file mode 100644 index e4c7240290..0000000000 --- a/kubernetes/pomba/charts/pomba-networkdiscoveryctxbuilder/requirements.yaml +++ /dev/null @@ -1,18 +0,0 @@ -# Copyright © 2018 Amdocs -# -# 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/pomba/charts/pomba-sdncctxbuilder/requirements.yaml b/kubernetes/pomba/charts/pomba-sdncctxbuilder/requirements.yaml deleted file mode 100644 index e4c7240290..0000000000 --- a/kubernetes/pomba/charts/pomba-sdncctxbuilder/requirements.yaml +++ /dev/null @@ -1,18 +0,0 @@ -# Copyright © 2018 Amdocs -# -# 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/pomba/charts/pomba-servicedecomposition/requirements.yaml b/kubernetes/pomba/charts/pomba-servicedecomposition/requirements.yaml deleted file mode 100644 index 0b858a9edb..0000000000 --- a/kubernetes/pomba/charts/pomba-servicedecomposition/requirements.yaml +++ /dev/null @@ -1,18 +0,0 @@ -# Copyright � 2018 Amdocs -# -# 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/pomba/components/Makefile b/kubernetes/pomba/components/Makefile new file mode 100644 index 0000000000..bf267b7720 --- /dev/null +++ b/kubernetes/pomba/components/Makefile @@ -0,0 +1,51 @@ +# 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_BIN := helm +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_BIN) dep up $*; fi + +lint-%: dep-% + @if [ -f $*/Chart.yaml ]; then $(HELM_BIN) lint $*; fi + +package-%: lint-% + @mkdir -p $(PACKAGE_DIR) + @if [ -f $*/Chart.yaml ]; then $(HELM_BIN) package -d $(PACKAGE_DIR) $*; fi + @$(HELM_BIN) repo index $(PACKAGE_DIR) + +clean: + @rm -f */requirements.lock + @rm -f *tgz */charts/*tgz + @rm -rf $(PACKAGE_DIR) +%: + @: diff --git a/kubernetes/pomba/charts/pomba-aaictxbuilder/Chart.yaml b/kubernetes/pomba/components/pomba-aaictxbuilder/Chart.yaml similarity index 100% rename from kubernetes/pomba/charts/pomba-aaictxbuilder/Chart.yaml rename to kubernetes/pomba/components/pomba-aaictxbuilder/Chart.yaml diff --git a/kubernetes/pomba/charts/pomba-validation-service/requirements.yaml b/kubernetes/pomba/components/pomba-aaictxbuilder/requirements.yaml similarity index 89% rename from kubernetes/pomba/charts/pomba-validation-service/requirements.yaml rename to kubernetes/pomba/components/pomba-aaictxbuilder/requirements.yaml index f99477141f..fbe51550f0 100644 --- a/kubernetes/pomba/charts/pomba-validation-service/requirements.yaml +++ b/kubernetes/pomba/components/pomba-aaictxbuilder/requirements.yaml @@ -16,3 +16,6 @@ dependencies: - name: common version: ~6.x-0 repository: '@local' + - name: repositoryGenerator + version: ~6.x-0 + repository: '@local' diff --git a/kubernetes/pomba/charts/pomba-aaictxbuilder/resources/config/application.properties b/kubernetes/pomba/components/pomba-aaictxbuilder/resources/config/application.properties similarity index 100% rename from kubernetes/pomba/charts/pomba-aaictxbuilder/resources/config/application.properties rename to kubernetes/pomba/components/pomba-aaictxbuilder/resources/config/application.properties diff --git a/kubernetes/pomba/charts/pomba-aaictxbuilder/resources/config/logback.xml b/kubernetes/pomba/components/pomba-aaictxbuilder/resources/config/logback.xml similarity index 100% rename from kubernetes/pomba/charts/pomba-aaictxbuilder/resources/config/logback.xml rename to kubernetes/pomba/components/pomba-aaictxbuilder/resources/config/logback.xml diff --git a/kubernetes/pomba/charts/pomba-aaictxbuilder/templates/configmap.yaml b/kubernetes/pomba/components/pomba-aaictxbuilder/templates/configmap.yaml similarity index 100% rename from kubernetes/pomba/charts/pomba-aaictxbuilder/templates/configmap.yaml rename to kubernetes/pomba/components/pomba-aaictxbuilder/templates/configmap.yaml diff --git a/kubernetes/pomba/charts/pomba-aaictxbuilder/templates/deployment.yaml b/kubernetes/pomba/components/pomba-aaictxbuilder/templates/deployment.yaml similarity index 96% rename from kubernetes/pomba/charts/pomba-aaictxbuilder/templates/deployment.yaml rename to kubernetes/pomba/components/pomba-aaictxbuilder/templates/deployment.yaml index cd699de29e..d657215315 100644 --- a/kubernetes/pomba/charts/pomba-aaictxbuilder/templates/deployment.yaml +++ b/kubernetes/pomba/components/pomba-aaictxbuilder/templates/deployment.yaml @@ -34,7 +34,7 @@ spec: spec: containers: - name: {{ include "common.name" . }} - image: "{{ include "common.repository" . }}/{{ .Values.image }}" + image: {{ include "repositoryGenerator.repository" . }}/{{ .Values.image }} imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }} ports: - containerPort: {{ .Values.service.internalPort }} @@ -85,7 +85,7 @@ spec: # Filebeat sidecar container - name: {{ include "common.name" . }}-filebeat-onap - image: "{{ .Values.global.loggingRepository }}/{{ .Values.global.loggingImage }}" + image: {{ include "repositoryGenerator.image.logging" . }} imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }} volumeMounts: - name: {{ include "common.fullname" . }}-filebeat-conf diff --git a/kubernetes/pomba/charts/pomba-aaictxbuilder/templates/service.yaml b/kubernetes/pomba/components/pomba-aaictxbuilder/templates/service.yaml similarity index 100% rename from kubernetes/pomba/charts/pomba-aaictxbuilder/templates/service.yaml rename to kubernetes/pomba/components/pomba-aaictxbuilder/templates/service.yaml diff --git a/kubernetes/pomba/charts/pomba-aaictxbuilder/values.yaml b/kubernetes/pomba/components/pomba-aaictxbuilder/values.yaml similarity index 96% rename from kubernetes/pomba/charts/pomba-aaictxbuilder/values.yaml rename to kubernetes/pomba/components/pomba-aaictxbuilder/values.yaml index b43b86fe98..89cfd4d8d9 100644 --- a/kubernetes/pomba/charts/pomba-aaictxbuilder/values.yaml +++ b/kubernetes/pomba/components/pomba-aaictxbuilder/values.yaml @@ -17,9 +17,6 @@ ################################################################# global: nodePortPrefix: 302 - readinessImage: onap/oom/readiness:3.0.1 - loggingRepository: docker.elastic.co - loggingImage: beats/filebeat:5.5.0 ################################################################# # Secrets metaconfig @@ -48,7 +45,6 @@ secrets: # Application configuration defaults. ################################################################# # application image -repository: nexus3.onap.org:10001 image: onap/pomba-aai-context-builder:1.5.1 pullPolicy: Always diff --git a/kubernetes/pomba/charts/pomba-contextaggregator/.helmignore b/kubernetes/pomba/components/pomba-contextaggregator/.helmignore similarity index 100% rename from kubernetes/pomba/charts/pomba-contextaggregator/.helmignore rename to kubernetes/pomba/components/pomba-contextaggregator/.helmignore diff --git a/kubernetes/pomba/charts/pomba-contextaggregator/Chart.yaml b/kubernetes/pomba/components/pomba-contextaggregator/Chart.yaml similarity index 100% rename from kubernetes/pomba/charts/pomba-contextaggregator/Chart.yaml rename to kubernetes/pomba/components/pomba-contextaggregator/Chart.yaml diff --git a/kubernetes/pomba/charts/pomba-sdcctxbuilder/requirements.yaml b/kubernetes/pomba/components/pomba-contextaggregator/requirements.yaml similarity index 86% rename from kubernetes/pomba/charts/pomba-sdcctxbuilder/requirements.yaml rename to kubernetes/pomba/components/pomba-contextaggregator/requirements.yaml index 6a61926e9e..fbe51550f0 100644 --- a/kubernetes/pomba/charts/pomba-sdcctxbuilder/requirements.yaml +++ b/kubernetes/pomba/components/pomba-contextaggregator/requirements.yaml @@ -15,4 +15,7 @@ dependencies: - name: common version: ~6.x-0 - repository: '@local' \ No newline at end of file + repository: '@local' + - name: repositoryGenerator + version: ~6.x-0 + repository: '@local' diff --git a/kubernetes/pomba/charts/pomba-contextaggregator/resources/config/application.properties b/kubernetes/pomba/components/pomba-contextaggregator/resources/config/application.properties similarity index 100% rename from kubernetes/pomba/charts/pomba-contextaggregator/resources/config/application.properties rename to kubernetes/pomba/components/pomba-contextaggregator/resources/config/application.properties diff --git a/kubernetes/pomba/charts/pomba-contextaggregator/resources/config/builders/aai.properties b/kubernetes/pomba/components/pomba-contextaggregator/resources/config/builders/aai.properties similarity index 100% rename from kubernetes/pomba/charts/pomba-contextaggregator/resources/config/builders/aai.properties rename to kubernetes/pomba/components/pomba-contextaggregator/resources/config/builders/aai.properties diff --git a/kubernetes/pomba/charts/pomba-contextaggregator/resources/config/builders/ndcb.properties b/kubernetes/pomba/components/pomba-contextaggregator/resources/config/builders/ndcb.properties similarity index 100% rename from kubernetes/pomba/charts/pomba-contextaggregator/resources/config/builders/ndcb.properties rename to kubernetes/pomba/components/pomba-contextaggregator/resources/config/builders/ndcb.properties diff --git a/kubernetes/pomba/charts/pomba-contextaggregator/resources/config/builders/sdc.properties b/kubernetes/pomba/components/pomba-contextaggregator/resources/config/builders/sdc.properties similarity index 100% rename from kubernetes/pomba/charts/pomba-contextaggregator/resources/config/builders/sdc.properties rename to kubernetes/pomba/components/pomba-contextaggregator/resources/config/builders/sdc.properties diff --git a/kubernetes/pomba/charts/pomba-contextaggregator/resources/config/builders/sdnc.properties b/kubernetes/pomba/components/pomba-contextaggregator/resources/config/builders/sdnc.properties similarity index 100% rename from kubernetes/pomba/charts/pomba-contextaggregator/resources/config/builders/sdnc.properties rename to kubernetes/pomba/components/pomba-contextaggregator/resources/config/builders/sdnc.properties diff --git a/kubernetes/pomba/charts/pomba-contextaggregator/resources/config/logback.xml b/kubernetes/pomba/components/pomba-contextaggregator/resources/config/logback.xml similarity index 100% rename from kubernetes/pomba/charts/pomba-contextaggregator/resources/config/logback.xml rename to kubernetes/pomba/components/pomba-contextaggregator/resources/config/logback.xml diff --git a/kubernetes/pomba/charts/pomba-contextaggregator/templates/configmap.yaml b/kubernetes/pomba/components/pomba-contextaggregator/templates/configmap.yaml similarity index 100% rename from kubernetes/pomba/charts/pomba-contextaggregator/templates/configmap.yaml rename to kubernetes/pomba/components/pomba-contextaggregator/templates/configmap.yaml diff --git a/kubernetes/pomba/charts/pomba-contextaggregator/templates/deployment.yaml b/kubernetes/pomba/components/pomba-contextaggregator/templates/deployment.yaml similarity index 95% rename from kubernetes/pomba/charts/pomba-contextaggregator/templates/deployment.yaml rename to kubernetes/pomba/components/pomba-contextaggregator/templates/deployment.yaml index 20e3c7b8db..a8cab88b6a 100755 --- a/kubernetes/pomba/charts/pomba-contextaggregator/templates/deployment.yaml +++ b/kubernetes/pomba/components/pomba-contextaggregator/templates/deployment.yaml @@ -44,12 +44,12 @@ spec: fieldRef: apiVersion: v1 fieldPath: metadata.namespace - image: "{{ include "common.repository" . }}/{{ .Values.global.readinessImage }}" + image: {{ include "repositoryGenerator.image.readiness" . }} imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }} name: {{ include "common.name" . }}-readiness containers: - name: {{ include "common.name" . }} - image: "{{ include "common.repository" . }}/{{ .Values.image }}" + image: {{ include "repositoryGenerator.repository" . }}/{{ .Values.image }} imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }} ports: - containerPort: {{ .Values.service.internalPort }} @@ -103,7 +103,7 @@ spec: # Filebeat sidecar container - name: {{ include "common.name" . }}-filebeat-onap - image: "{{ .Values.global.loggingRepository }}/{{ .Values.global.loggingImage }}" + image: {{ include "repositoryGenerator.image.logging" . }} imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }} volumeMounts: - name: {{ include "common.fullname" . }}-filebeat-conf diff --git a/kubernetes/pomba/charts/pomba-contextaggregator/templates/service.yaml b/kubernetes/pomba/components/pomba-contextaggregator/templates/service.yaml similarity index 100% rename from kubernetes/pomba/charts/pomba-contextaggregator/templates/service.yaml rename to kubernetes/pomba/components/pomba-contextaggregator/templates/service.yaml diff --git a/kubernetes/pomba/charts/pomba-contextaggregator/values.yaml b/kubernetes/pomba/components/pomba-contextaggregator/values.yaml similarity index 97% rename from kubernetes/pomba/charts/pomba-contextaggregator/values.yaml rename to kubernetes/pomba/components/pomba-contextaggregator/values.yaml index 44f84d3548..6745f00b41 100755 --- a/kubernetes/pomba/charts/pomba-contextaggregator/values.yaml +++ b/kubernetes/pomba/components/pomba-contextaggregator/values.yaml @@ -17,8 +17,6 @@ ################################################################# global: nodePortPrefix: 302 - repository: nexus3.onap.org:10001 - readinessImage: onap/oom/readiness:3.0.1 ################################################################# # Application configuration defaults. diff --git a/kubernetes/pomba/charts/pomba-data-router/.helmignore b/kubernetes/pomba/components/pomba-data-router/.helmignore similarity index 100% rename from kubernetes/pomba/charts/pomba-data-router/.helmignore rename to kubernetes/pomba/components/pomba-data-router/.helmignore diff --git a/kubernetes/pomba/charts/pomba-data-router/Chart.yaml b/kubernetes/pomba/components/pomba-data-router/Chart.yaml similarity index 100% rename from kubernetes/pomba/charts/pomba-data-router/Chart.yaml rename to kubernetes/pomba/components/pomba-data-router/Chart.yaml diff --git a/kubernetes/pomba/charts/pomba-contextaggregator/requirements.yaml b/kubernetes/pomba/components/pomba-data-router/requirements.yaml old mode 100755 new mode 100644 similarity index 86% rename from kubernetes/pomba/charts/pomba-contextaggregator/requirements.yaml rename to kubernetes/pomba/components/pomba-data-router/requirements.yaml index 6a61926e9e..fbe51550f0 --- a/kubernetes/pomba/charts/pomba-contextaggregator/requirements.yaml +++ b/kubernetes/pomba/components/pomba-data-router/requirements.yaml @@ -15,4 +15,7 @@ dependencies: - name: common version: ~6.x-0 - repository: '@local' \ No newline at end of file + repository: '@local' + - name: repositoryGenerator + version: ~6.x-0 + repository: '@local' diff --git a/kubernetes/pomba/charts/pomba-data-router/resources/config/auth/client-cert-onap.p12 b/kubernetes/pomba/components/pomba-data-router/resources/config/auth/client-cert-onap.p12 similarity index 100% rename from kubernetes/pomba/charts/pomba-data-router/resources/config/auth/client-cert-onap.p12 rename to kubernetes/pomba/components/pomba-data-router/resources/config/auth/client-cert-onap.p12 diff --git a/kubernetes/pomba/charts/pomba-data-router/resources/config/auth/data-router_policy.json b/kubernetes/pomba/components/pomba-data-router/resources/config/auth/data-router_policy.json similarity index 100% rename from kubernetes/pomba/charts/pomba-data-router/resources/config/auth/data-router_policy.json rename to kubernetes/pomba/components/pomba-data-router/resources/config/auth/data-router_policy.json diff --git a/kubernetes/pomba/charts/pomba-data-router/resources/config/auth/tomcat_keystore b/kubernetes/pomba/components/pomba-data-router/resources/config/auth/tomcat_keystore similarity index 100% rename from kubernetes/pomba/charts/pomba-data-router/resources/config/auth/tomcat_keystore rename to kubernetes/pomba/components/pomba-data-router/resources/config/auth/tomcat_keystore diff --git a/kubernetes/pomba/charts/pomba-data-router/resources/config/data-router.properties b/kubernetes/pomba/components/pomba-data-router/resources/config/data-router.properties similarity index 100% rename from kubernetes/pomba/charts/pomba-data-router/resources/config/data-router.properties rename to kubernetes/pomba/components/pomba-data-router/resources/config/data-router.properties diff --git a/kubernetes/pomba/charts/pomba-data-router/resources/config/schemaIngest.properties b/kubernetes/pomba/components/pomba-data-router/resources/config/schemaIngest.properties similarity index 100% rename from kubernetes/pomba/charts/pomba-data-router/resources/config/schemaIngest.properties rename to kubernetes/pomba/components/pomba-data-router/resources/config/schemaIngest.properties diff --git a/kubernetes/pomba/charts/pomba-data-router/resources/dynamic/conf/audit-bean.xml b/kubernetes/pomba/components/pomba-data-router/resources/dynamic/conf/audit-bean.xml similarity index 100% rename from kubernetes/pomba/charts/pomba-data-router/resources/dynamic/conf/audit-bean.xml rename to kubernetes/pomba/components/pomba-data-router/resources/dynamic/conf/audit-bean.xml diff --git a/kubernetes/pomba/charts/pomba-data-router/resources/dynamic/conf/poa-validation-bean.xml b/kubernetes/pomba/components/pomba-data-router/resources/dynamic/conf/poa-validation-bean.xml similarity index 100% rename from kubernetes/pomba/charts/pomba-data-router/resources/dynamic/conf/poa-validation-bean.xml rename to kubernetes/pomba/components/pomba-data-router/resources/dynamic/conf/poa-validation-bean.xml diff --git a/kubernetes/pomba/charts/pomba-data-router/resources/dynamic/routes/audit.route b/kubernetes/pomba/components/pomba-data-router/resources/dynamic/routes/audit.route similarity index 100% rename from kubernetes/pomba/charts/pomba-data-router/resources/dynamic/routes/audit.route rename to kubernetes/pomba/components/pomba-data-router/resources/dynamic/routes/audit.route diff --git a/kubernetes/pomba/charts/pomba-data-router/resources/dynamic/routes/poaValidation.route b/kubernetes/pomba/components/pomba-data-router/resources/dynamic/routes/poaValidation.route similarity index 100% rename from kubernetes/pomba/charts/pomba-data-router/resources/dynamic/routes/poaValidation.route rename to kubernetes/pomba/components/pomba-data-router/resources/dynamic/routes/poaValidation.route diff --git a/kubernetes/pomba/charts/pomba-data-router/templates/configmap.yaml b/kubernetes/pomba/components/pomba-data-router/templates/configmap.yaml similarity index 100% rename from kubernetes/pomba/charts/pomba-data-router/templates/configmap.yaml rename to kubernetes/pomba/components/pomba-data-router/templates/configmap.yaml diff --git a/kubernetes/pomba/charts/pomba-data-router/templates/deployment.yaml b/kubernetes/pomba/components/pomba-data-router/templates/deployment.yaml similarity index 94% rename from kubernetes/pomba/charts/pomba-data-router/templates/deployment.yaml rename to kubernetes/pomba/components/pomba-data-router/templates/deployment.yaml index 8ce5dd5c87..7b080ea6c7 100644 --- a/kubernetes/pomba/charts/pomba-data-router/templates/deployment.yaml +++ b/kubernetes/pomba/components/pomba-data-router/templates/deployment.yaml @@ -48,7 +48,7 @@ spec: fieldRef: apiVersion: v1 fieldPath: metadata.namespace - image: "{{ include "common.repository" . }}/{{ .Values.global.readinessImage }}" + image: {{ include "repositoryGenerator.image.readiness" . }} imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }} name: {{ include "common.name" . }}-readiness - command: @@ -66,7 +66,7 @@ spec: fieldPath: metadata.namespace securityContext: privileged: true - image: {{ .Values.global.dockerhubRepository | default .Values.dockerhubRepository }}/{{ .Values.global.busyboxImage | default .Values.busyboxImage }} + image: {{ include "repositoryGenerator.image.busybox" . }} imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }} name: init-sysctl volumeMounts: @@ -74,7 +74,7 @@ spec: mountPath: /logroot/ containers: - name: {{ include "common.name" . }} - image: "{{ include "common.repository" . }}/{{ .Values.image }}" + image: {{ include "repositoryGenerator.repository" . }}/{{ .Values.image }} imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }} env: - name: SERVICE_BEANS @@ -132,7 +132,7 @@ spec: # Filebeat sidecar container - name: {{ include "common.name" . }}-filebeat-onap - image: "{{ .Values.global.loggingRepository }}/{{ .Values.global.loggingImage }}" + image: {{ include "repositoryGenerator.image.logging" . }} imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }} volumeMounts: - name: {{ include "common.fullname" . }}-filebeat-conf diff --git a/kubernetes/pomba/charts/pomba-data-router/templates/ingress.yaml b/kubernetes/pomba/components/pomba-data-router/templates/ingress.yaml similarity index 100% rename from kubernetes/pomba/charts/pomba-data-router/templates/ingress.yaml rename to kubernetes/pomba/components/pomba-data-router/templates/ingress.yaml diff --git a/kubernetes/pomba/charts/pomba-data-router/templates/pv.yaml b/kubernetes/pomba/components/pomba-data-router/templates/pv.yaml similarity index 100% rename from kubernetes/pomba/charts/pomba-data-router/templates/pv.yaml rename to kubernetes/pomba/components/pomba-data-router/templates/pv.yaml diff --git a/kubernetes/pomba/charts/pomba-data-router/templates/pvc.yaml b/kubernetes/pomba/components/pomba-data-router/templates/pvc.yaml similarity index 100% rename from kubernetes/pomba/charts/pomba-data-router/templates/pvc.yaml rename to kubernetes/pomba/components/pomba-data-router/templates/pvc.yaml diff --git a/kubernetes/pomba/charts/pomba-data-router/templates/secret.yaml b/kubernetes/pomba/components/pomba-data-router/templates/secret.yaml similarity index 100% rename from kubernetes/pomba/charts/pomba-data-router/templates/secret.yaml rename to kubernetes/pomba/components/pomba-data-router/templates/secret.yaml diff --git a/kubernetes/pomba/charts/pomba-data-router/templates/service.yaml b/kubernetes/pomba/components/pomba-data-router/templates/service.yaml similarity index 100% rename from kubernetes/pomba/charts/pomba-data-router/templates/service.yaml rename to kubernetes/pomba/components/pomba-data-router/templates/service.yaml diff --git a/kubernetes/pomba/charts/pomba-data-router/values.yaml b/kubernetes/pomba/components/pomba-data-router/values.yaml similarity index 97% rename from kubernetes/pomba/charts/pomba-data-router/values.yaml rename to kubernetes/pomba/components/pomba-data-router/values.yaml index fe15bd1b07..aed767c9e2 100644 --- a/kubernetes/pomba/charts/pomba-data-router/values.yaml +++ b/kubernetes/pomba/components/pomba-data-router/values.yaml @@ -22,10 +22,8 @@ global: nodePortPrefix: 302 persistence: {} - readinessImage: onap/oom/readiness:3.0.1 # application image -repository: nexus3.onap.org:10001 image: onap/data-router:1.3.3 pullPolicy: Always restartPolicy: Always diff --git a/kubernetes/pomba/charts/pomba-elasticsearch/Chart.yaml b/kubernetes/pomba/components/pomba-elasticsearch/Chart.yaml similarity index 100% rename from kubernetes/pomba/charts/pomba-elasticsearch/Chart.yaml rename to kubernetes/pomba/components/pomba-elasticsearch/Chart.yaml diff --git a/kubernetes/pomba/charts/pomba-elasticsearch/requirements.yaml b/kubernetes/pomba/components/pomba-elasticsearch/requirements.yaml similarity index 86% rename from kubernetes/pomba/charts/pomba-elasticsearch/requirements.yaml rename to kubernetes/pomba/components/pomba-elasticsearch/requirements.yaml index 6a61926e9e..fbe51550f0 100644 --- a/kubernetes/pomba/charts/pomba-elasticsearch/requirements.yaml +++ b/kubernetes/pomba/components/pomba-elasticsearch/requirements.yaml @@ -15,4 +15,7 @@ dependencies: - name: common version: ~6.x-0 - repository: '@local' \ No newline at end of file + repository: '@local' + - name: repositoryGenerator + version: ~6.x-0 + repository: '@local' diff --git a/kubernetes/pomba/charts/pomba-elasticsearch/resources/config/elasticsearch.yml b/kubernetes/pomba/components/pomba-elasticsearch/resources/config/elasticsearch.yml similarity index 100% rename from kubernetes/pomba/charts/pomba-elasticsearch/resources/config/elasticsearch.yml rename to kubernetes/pomba/components/pomba-elasticsearch/resources/config/elasticsearch.yml diff --git a/kubernetes/pomba/charts/pomba-elasticsearch/templates/configmap.yaml b/kubernetes/pomba/components/pomba-elasticsearch/templates/configmap.yaml similarity index 100% rename from kubernetes/pomba/charts/pomba-elasticsearch/templates/configmap.yaml rename to kubernetes/pomba/components/pomba-elasticsearch/templates/configmap.yaml diff --git a/kubernetes/pomba/charts/pomba-elasticsearch/templates/deployment.yaml b/kubernetes/pomba/components/pomba-elasticsearch/templates/deployment.yaml similarity index 95% rename from kubernetes/pomba/charts/pomba-elasticsearch/templates/deployment.yaml rename to kubernetes/pomba/components/pomba-elasticsearch/templates/deployment.yaml index 2540d4130f..578a5cd723 100644 --- a/kubernetes/pomba/charts/pomba-elasticsearch/templates/deployment.yaml +++ b/kubernetes/pomba/components/pomba-elasticsearch/templates/deployment.yaml @@ -50,7 +50,7 @@ spec: fieldPath: metadata.namespace securityContext: privileged: true - image: {{ .Values.global.busyboxRepository | default .Values.busyboxRepository }}/{{ .Values.busyboxImage }} + image: {{ include "repositoryGenerator.image.busybox" . }} imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }} name: init-sysctl volumeMounts: @@ -58,7 +58,7 @@ spec: mountPath: /logroot/ containers: - name: {{ include "common.name" . }} - image: "{{ .Values.global.loggingRepository | default .Values.loggingRepository }}/{{ .Values.image }}" + image: {{ include "repositoryGenerator.elasticRepository" . }}/{{ .Values.image }} imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }} ports: - containerPort: {{ .Values.service.internalPort }} diff --git a/kubernetes/pomba/charts/pomba-elasticsearch/templates/pv-data.yaml b/kubernetes/pomba/components/pomba-elasticsearch/templates/pv-data.yaml similarity index 100% rename from kubernetes/pomba/charts/pomba-elasticsearch/templates/pv-data.yaml rename to kubernetes/pomba/components/pomba-elasticsearch/templates/pv-data.yaml diff --git a/kubernetes/pomba/charts/pomba-elasticsearch/templates/pv-logs.yaml b/kubernetes/pomba/components/pomba-elasticsearch/templates/pv-logs.yaml similarity index 100% rename from kubernetes/pomba/charts/pomba-elasticsearch/templates/pv-logs.yaml rename to kubernetes/pomba/components/pomba-elasticsearch/templates/pv-logs.yaml diff --git a/kubernetes/pomba/charts/pomba-elasticsearch/templates/pvc-data.yaml b/kubernetes/pomba/components/pomba-elasticsearch/templates/pvc-data.yaml similarity index 100% rename from kubernetes/pomba/charts/pomba-elasticsearch/templates/pvc-data.yaml rename to kubernetes/pomba/components/pomba-elasticsearch/templates/pvc-data.yaml diff --git a/kubernetes/pomba/charts/pomba-elasticsearch/templates/pvc-logs.yaml b/kubernetes/pomba/components/pomba-elasticsearch/templates/pvc-logs.yaml similarity index 100% rename from kubernetes/pomba/charts/pomba-elasticsearch/templates/pvc-logs.yaml rename to kubernetes/pomba/components/pomba-elasticsearch/templates/pvc-logs.yaml diff --git a/kubernetes/pomba/charts/pomba-elasticsearch/templates/service.yaml b/kubernetes/pomba/components/pomba-elasticsearch/templates/service.yaml similarity index 100% rename from kubernetes/pomba/charts/pomba-elasticsearch/templates/service.yaml rename to kubernetes/pomba/components/pomba-elasticsearch/templates/service.yaml diff --git a/kubernetes/pomba/charts/pomba-elasticsearch/values.yaml b/kubernetes/pomba/components/pomba-elasticsearch/values.yaml similarity index 95% rename from kubernetes/pomba/charts/pomba-elasticsearch/values.yaml rename to kubernetes/pomba/components/pomba-elasticsearch/values.yaml index f99a79935d..04b9434e02 100644 --- a/kubernetes/pomba/charts/pomba-elasticsearch/values.yaml +++ b/kubernetes/pomba/components/pomba-elasticsearch/values.yaml @@ -23,12 +23,7 @@ global: # Application configuration defaults. ################################################################# -# BusyBox image -busyboxRepository: docker.io -busyboxImage: library/busybox:latest - # application image -loggingRepository: docker.elastic.co image: elasticsearch/elasticsearch:6.6.2 pullPolicy: Always diff --git a/kubernetes/pomba/charts/pomba-kibana/Chart.yaml b/kubernetes/pomba/components/pomba-kibana/Chart.yaml similarity index 100% rename from kubernetes/pomba/charts/pomba-kibana/Chart.yaml rename to kubernetes/pomba/components/pomba-kibana/Chart.yaml diff --git a/kubernetes/pomba/components/pomba-kibana/requirements.yaml b/kubernetes/pomba/components/pomba-kibana/requirements.yaml new file mode 100644 index 0000000000..fbe51550f0 --- /dev/null +++ b/kubernetes/pomba/components/pomba-kibana/requirements.yaml @@ -0,0 +1,21 @@ +# Copyright © 2017 Amdocs, Bell Canada +# +# 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' + - name: repositoryGenerator + version: ~6.x-0 + repository: '@local' diff --git a/kubernetes/pomba/charts/pomba-kibana/resources/auth/pomba.crt.pem b/kubernetes/pomba/components/pomba-kibana/resources/auth/pomba.crt.pem similarity index 100% rename from kubernetes/pomba/charts/pomba-kibana/resources/auth/pomba.crt.pem rename to kubernetes/pomba/components/pomba-kibana/resources/auth/pomba.crt.pem diff --git a/kubernetes/pomba/charts/pomba-kibana/resources/auth/pomba.key.pem b/kubernetes/pomba/components/pomba-kibana/resources/auth/pomba.key.pem similarity index 100% rename from kubernetes/pomba/charts/pomba-kibana/resources/auth/pomba.key.pem rename to kubernetes/pomba/components/pomba-kibana/resources/auth/pomba.key.pem diff --git a/kubernetes/pomba/charts/pomba-kibana/resources/bin/kibana_start.sh b/kubernetes/pomba/components/pomba-kibana/resources/bin/kibana_start.sh similarity index 100% rename from kubernetes/pomba/charts/pomba-kibana/resources/bin/kibana_start.sh rename to kubernetes/pomba/components/pomba-kibana/resources/bin/kibana_start.sh diff --git a/kubernetes/pomba/charts/pomba-kibana/resources/config/default-mapping.json b/kubernetes/pomba/components/pomba-kibana/resources/config/default-mapping.json similarity index 100% rename from kubernetes/pomba/charts/pomba-kibana/resources/config/default-mapping.json rename to kubernetes/pomba/components/pomba-kibana/resources/config/default-mapping.json diff --git a/kubernetes/pomba/charts/pomba-kibana/resources/config/default.json b/kubernetes/pomba/components/pomba-kibana/resources/config/default.json similarity index 100% rename from kubernetes/pomba/charts/pomba-kibana/resources/config/default.json rename to kubernetes/pomba/components/pomba-kibana/resources/config/default.json diff --git a/kubernetes/pomba/charts/pomba-kibana/resources/config/kibana.yml b/kubernetes/pomba/components/pomba-kibana/resources/config/kibana.yml similarity index 100% rename from kubernetes/pomba/charts/pomba-kibana/resources/config/kibana.yml rename to kubernetes/pomba/components/pomba-kibana/resources/config/kibana.yml diff --git a/kubernetes/pomba/charts/pomba-kibana/templates/configmap.yaml b/kubernetes/pomba/components/pomba-kibana/templates/configmap.yaml similarity index 100% rename from kubernetes/pomba/charts/pomba-kibana/templates/configmap.yaml rename to kubernetes/pomba/components/pomba-kibana/templates/configmap.yaml diff --git a/kubernetes/pomba/charts/pomba-kibana/templates/deployment.yaml b/kubernetes/pomba/components/pomba-kibana/templates/deployment.yaml similarity index 94% rename from kubernetes/pomba/charts/pomba-kibana/templates/deployment.yaml rename to kubernetes/pomba/components/pomba-kibana/templates/deployment.yaml index 105fc96af5..7258784f09 100644 --- a/kubernetes/pomba/charts/pomba-kibana/templates/deployment.yaml +++ b/kubernetes/pomba/components/pomba-kibana/templates/deployment.yaml @@ -44,7 +44,7 @@ spec: fieldRef: apiVersion: v1 fieldPath: metadata.namespace - image: "{{ include "common.repository" . }}/{{ .Values.global.readinessImage }}" + image: {{ include "repositoryGenerator.image.readiness" . }} imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }} name: {{ include "common.name" . }}-readiness - args: @@ -57,7 +57,7 @@ spec: fieldRef: apiVersion: v1 fieldPath: metadata.namespace - image: "{{ .Values.configRepository }}/{{ .Values.configImage }}" + image: {{ include "repositoryGenerator.dockerHubRepository" . }}/{{ .Values.configImage }} imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }} name: {{ include "common.name" . }}-config-map volumeMounts: @@ -74,7 +74,7 @@ spec: fieldRef: apiVersion: v1 fieldPath: metadata.namespace - image: "{{ .Values.configRepository }}/{{ .Values.configImage }}" + image: {{ include "repositoryGenerator.dockerHubRepository" . }}/{{ .Values.configImage }} imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }} name: {{ include "common.name" . }}-config volumeMounts: @@ -83,7 +83,7 @@ spec: subPath: default.json containers: - name: {{ include "common.name" . }} - image: "{{ .Values.global.loggingRepository | default .Values.loggingRepository }}/{{ .Values.image }}" + image: {{ include "repositoryGenerator.elasticRepository" . }}/{{ .Values.image }} imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }} command: ["/bin/bash"] args: ["-c", "/opt/app/bin/kibana_start.sh"] diff --git a/kubernetes/pomba/charts/pomba-kibana/templates/ingress.yaml b/kubernetes/pomba/components/pomba-kibana/templates/ingress.yaml similarity index 100% rename from kubernetes/pomba/charts/pomba-kibana/templates/ingress.yaml rename to kubernetes/pomba/components/pomba-kibana/templates/ingress.yaml diff --git a/kubernetes/pomba/charts/pomba-kibana/templates/service.yaml b/kubernetes/pomba/components/pomba-kibana/templates/service.yaml similarity index 100% rename from kubernetes/pomba/charts/pomba-kibana/templates/service.yaml rename to kubernetes/pomba/components/pomba-kibana/templates/service.yaml diff --git a/kubernetes/pomba/charts/pomba-kibana/values.yaml b/kubernetes/pomba/components/pomba-kibana/values.yaml similarity index 93% rename from kubernetes/pomba/charts/pomba-kibana/values.yaml rename to kubernetes/pomba/components/pomba-kibana/values.yaml index e952e3c226..deed02fd18 100644 --- a/kubernetes/pomba/charts/pomba-kibana/values.yaml +++ b/kubernetes/pomba/components/pomba-kibana/values.yaml @@ -17,22 +17,15 @@ ################################################################# global: nodePortPrefix: 302 - readinessImage: onap/oom/readiness:3.0.1 persistence: {} ################################################################# # Application configuration defaults. ################################################################# # Configuration image -configRepository: docker.io configImage: taskrabbit/elasticsearch-dump -# BusyBox image -busyboxRepository: docker.io -busyboxImage: library/busybox:latest - # application image -loggingRepository: docker.elastic.co image: kibana/kibana:6.6.2 pullPolicy: Always diff --git a/kubernetes/pomba/charts/pomba-networkdiscovery/Chart.yaml b/kubernetes/pomba/components/pomba-networkdiscovery/Chart.yaml similarity index 100% rename from kubernetes/pomba/charts/pomba-networkdiscovery/Chart.yaml rename to kubernetes/pomba/components/pomba-networkdiscovery/Chart.yaml diff --git a/kubernetes/pomba/components/pomba-networkdiscovery/requirements.yaml b/kubernetes/pomba/components/pomba-networkdiscovery/requirements.yaml new file mode 100644 index 0000000000..fbe51550f0 --- /dev/null +++ b/kubernetes/pomba/components/pomba-networkdiscovery/requirements.yaml @@ -0,0 +1,21 @@ +# Copyright © 2017 Amdocs, Bell Canada +# +# 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' + - name: repositoryGenerator + version: ~6.x-0 + repository: '@local' diff --git a/kubernetes/pomba/charts/pomba-networkdiscovery/resources/config/application.properties b/kubernetes/pomba/components/pomba-networkdiscovery/resources/config/application.properties similarity index 100% rename from kubernetes/pomba/charts/pomba-networkdiscovery/resources/config/application.properties rename to kubernetes/pomba/components/pomba-networkdiscovery/resources/config/application.properties diff --git a/kubernetes/pomba/charts/pomba-networkdiscovery/resources/config/auth/client-cert-onap.p12 b/kubernetes/pomba/components/pomba-networkdiscovery/resources/config/auth/client-cert-onap.p12 similarity index 100% rename from kubernetes/pomba/charts/pomba-networkdiscovery/resources/config/auth/client-cert-onap.p12 rename to kubernetes/pomba/components/pomba-networkdiscovery/resources/config/auth/client-cert-onap.p12 diff --git a/kubernetes/pomba/charts/pomba-networkdiscovery/resources/config/auth/tomcat_keystore b/kubernetes/pomba/components/pomba-networkdiscovery/resources/config/auth/tomcat_keystore similarity index 100% rename from kubernetes/pomba/charts/pomba-networkdiscovery/resources/config/auth/tomcat_keystore rename to kubernetes/pomba/components/pomba-networkdiscovery/resources/config/auth/tomcat_keystore diff --git a/kubernetes/pomba/charts/pomba-networkdiscovery/resources/config/logback.xml b/kubernetes/pomba/components/pomba-networkdiscovery/resources/config/logback.xml similarity index 100% rename from kubernetes/pomba/charts/pomba-networkdiscovery/resources/config/logback.xml rename to kubernetes/pomba/components/pomba-networkdiscovery/resources/config/logback.xml diff --git a/kubernetes/pomba/charts/pomba-networkdiscovery/templates/configmap.yaml b/kubernetes/pomba/components/pomba-networkdiscovery/templates/configmap.yaml similarity index 100% rename from kubernetes/pomba/charts/pomba-networkdiscovery/templates/configmap.yaml rename to kubernetes/pomba/components/pomba-networkdiscovery/templates/configmap.yaml diff --git a/kubernetes/pomba/charts/pomba-networkdiscovery/templates/deployment.yaml b/kubernetes/pomba/components/pomba-networkdiscovery/templates/deployment.yaml similarity index 96% rename from kubernetes/pomba/charts/pomba-networkdiscovery/templates/deployment.yaml rename to kubernetes/pomba/components/pomba-networkdiscovery/templates/deployment.yaml index df98805504..be6c7c423a 100644 --- a/kubernetes/pomba/charts/pomba-networkdiscovery/templates/deployment.yaml +++ b/kubernetes/pomba/components/pomba-networkdiscovery/templates/deployment.yaml @@ -34,7 +34,7 @@ spec: spec: containers: - name: {{ include "common.name" . }} - image: "{{ include "common.repository" . }}/{{ .Values.image }}" + image: {{ include "repositoryGenerator.repository" . }}/{{ .Values.image }} imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }} ports: - containerPort: {{ .Values.service.internalPort }} @@ -92,7 +92,7 @@ spec: # Filebeat sidecar container - name: {{ include "common.name" . }}-filebeat-onap - image: "{{ .Values.global.loggingRepository }}/{{ .Values.global.loggingImage }}" + image: {{ include "repositoryGenerator.image.logging" . }} imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }} volumeMounts: - name: {{ include "common.fullname" . }}-filebeat-conf diff --git a/kubernetes/pomba/charts/pomba-networkdiscovery/templates/ingress.yaml b/kubernetes/pomba/components/pomba-networkdiscovery/templates/ingress.yaml similarity index 100% rename from kubernetes/pomba/charts/pomba-networkdiscovery/templates/ingress.yaml rename to kubernetes/pomba/components/pomba-networkdiscovery/templates/ingress.yaml diff --git a/kubernetes/pomba/charts/pomba-networkdiscovery/templates/secrets.yaml b/kubernetes/pomba/components/pomba-networkdiscovery/templates/secrets.yaml similarity index 100% rename from kubernetes/pomba/charts/pomba-networkdiscovery/templates/secrets.yaml rename to kubernetes/pomba/components/pomba-networkdiscovery/templates/secrets.yaml diff --git a/kubernetes/pomba/charts/pomba-networkdiscovery/templates/service.yaml b/kubernetes/pomba/components/pomba-networkdiscovery/templates/service.yaml similarity index 100% rename from kubernetes/pomba/charts/pomba-networkdiscovery/templates/service.yaml rename to kubernetes/pomba/components/pomba-networkdiscovery/templates/service.yaml diff --git a/kubernetes/pomba/charts/pomba-networkdiscovery/values.yaml b/kubernetes/pomba/components/pomba-networkdiscovery/values.yaml similarity index 96% rename from kubernetes/pomba/charts/pomba-networkdiscovery/values.yaml rename to kubernetes/pomba/components/pomba-networkdiscovery/values.yaml index ae613c6034..50c837d27d 100644 --- a/kubernetes/pomba/charts/pomba-networkdiscovery/values.yaml +++ b/kubernetes/pomba/components/pomba-networkdiscovery/values.yaml @@ -17,13 +17,11 @@ ################################################################# global: nodePortPrefix: 302 - repository: nexus3.onap.org:10001 ################################################################# # Application configuration defaults. ################################################################# # application image -repository: nexus3.onap.org:10001 image: onap/network-discovery:1.5.1 pullPolicy: Always @@ -86,7 +84,7 @@ service: #Services may use any combination of ports depending on the 'type' of #service being defined. type: NodePort - name: pomba-networkdiscovery + name: pomba-networkdiscovery externalPort: 9531 internalPort: 8443 nodePort: 99 @@ -100,7 +98,7 @@ ingress: port: 8443 config: ssl: "redirect" - + # Resource Limit flavor -By Default using small flavor: small # Segregation for Different environment (Small and Large) diff --git a/kubernetes/pomba/charts/pomba-networkdiscoveryctxbuilder/Chart.yaml b/kubernetes/pomba/components/pomba-networkdiscoveryctxbuilder/Chart.yaml similarity index 100% rename from kubernetes/pomba/charts/pomba-networkdiscoveryctxbuilder/Chart.yaml rename to kubernetes/pomba/components/pomba-networkdiscoveryctxbuilder/Chart.yaml diff --git a/kubernetes/pomba/components/pomba-networkdiscoveryctxbuilder/requirements.yaml b/kubernetes/pomba/components/pomba-networkdiscoveryctxbuilder/requirements.yaml new file mode 100644 index 0000000000..fbe51550f0 --- /dev/null +++ b/kubernetes/pomba/components/pomba-networkdiscoveryctxbuilder/requirements.yaml @@ -0,0 +1,21 @@ +# Copyright © 2017 Amdocs, Bell Canada +# +# 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' + - name: repositoryGenerator + version: ~6.x-0 + repository: '@local' diff --git a/kubernetes/pomba/charts/pomba-networkdiscoveryctxbuilder/resources/config/application.properties b/kubernetes/pomba/components/pomba-networkdiscoveryctxbuilder/resources/config/application.properties similarity index 100% rename from kubernetes/pomba/charts/pomba-networkdiscoveryctxbuilder/resources/config/application.properties rename to kubernetes/pomba/components/pomba-networkdiscoveryctxbuilder/resources/config/application.properties diff --git a/kubernetes/pomba/charts/pomba-networkdiscoveryctxbuilder/resources/config/logback.xml b/kubernetes/pomba/components/pomba-networkdiscoveryctxbuilder/resources/config/logback.xml similarity index 100% rename from kubernetes/pomba/charts/pomba-networkdiscoveryctxbuilder/resources/config/logback.xml rename to kubernetes/pomba/components/pomba-networkdiscoveryctxbuilder/resources/config/logback.xml diff --git a/kubernetes/pomba/charts/pomba-networkdiscoveryctxbuilder/templates/configmap.yaml b/kubernetes/pomba/components/pomba-networkdiscoveryctxbuilder/templates/configmap.yaml similarity index 100% rename from kubernetes/pomba/charts/pomba-networkdiscoveryctxbuilder/templates/configmap.yaml rename to kubernetes/pomba/components/pomba-networkdiscoveryctxbuilder/templates/configmap.yaml diff --git a/kubernetes/pomba/charts/pomba-networkdiscoveryctxbuilder/templates/deployment.yaml b/kubernetes/pomba/components/pomba-networkdiscoveryctxbuilder/templates/deployment.yaml similarity index 96% rename from kubernetes/pomba/charts/pomba-networkdiscoveryctxbuilder/templates/deployment.yaml rename to kubernetes/pomba/components/pomba-networkdiscoveryctxbuilder/templates/deployment.yaml index 121c97dee7..32f35b695e 100644 --- a/kubernetes/pomba/charts/pomba-networkdiscoveryctxbuilder/templates/deployment.yaml +++ b/kubernetes/pomba/components/pomba-networkdiscoveryctxbuilder/templates/deployment.yaml @@ -34,7 +34,7 @@ spec: spec: containers: - name: {{ include "common.name" . }} - image: "{{ include "common.repository" . }}/{{ .Values.image }}" + image: {{ include "repositoryGenerator.repository" . }}/{{ .Values.image }} imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }} ports: - containerPort: {{ .Values.service.internalPort }} @@ -84,7 +84,7 @@ spec: # Filebeat sidecar container - name: {{ include "common.name" . }}-filebeat-onap - image: "{{ .Values.global.loggingRepository }}/{{ .Values.global.loggingImage }}" + image: {{ include "repositoryGenerator.image.logging" . }} imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }} volumeMounts: - name: {{ include "common.fullname" . }}-filebeat-conf diff --git a/kubernetes/pomba/charts/pomba-networkdiscoveryctxbuilder/templates/service.yaml b/kubernetes/pomba/components/pomba-networkdiscoveryctxbuilder/templates/service.yaml similarity index 100% rename from kubernetes/pomba/charts/pomba-networkdiscoveryctxbuilder/templates/service.yaml rename to kubernetes/pomba/components/pomba-networkdiscoveryctxbuilder/templates/service.yaml diff --git a/kubernetes/pomba/charts/pomba-networkdiscoveryctxbuilder/values.yaml b/kubernetes/pomba/components/pomba-networkdiscoveryctxbuilder/values.yaml similarity index 98% rename from kubernetes/pomba/charts/pomba-networkdiscoveryctxbuilder/values.yaml rename to kubernetes/pomba/components/pomba-networkdiscoveryctxbuilder/values.yaml index de7d661f5b..3fa4b8b25e 100644 --- a/kubernetes/pomba/charts/pomba-networkdiscoveryctxbuilder/values.yaml +++ b/kubernetes/pomba/components/pomba-networkdiscoveryctxbuilder/values.yaml @@ -17,13 +17,11 @@ ################################################################# global: nodePortPrefix: 302 - repository: nexus3.onap.org:10001 ################################################################# # Application configuration defaults. ################################################################# # application image -repository: nexus3.onap.org:10001 image: onap/pomba-network-discovery-context-builder:1.5.1 pullPolicy: Always diff --git a/kubernetes/pomba/charts/pomba-sdcctxbuilder/.helmignore b/kubernetes/pomba/components/pomba-sdcctxbuilder/.helmignore similarity index 100% rename from kubernetes/pomba/charts/pomba-sdcctxbuilder/.helmignore rename to kubernetes/pomba/components/pomba-sdcctxbuilder/.helmignore diff --git a/kubernetes/pomba/charts/pomba-sdcctxbuilder/Chart.yaml b/kubernetes/pomba/components/pomba-sdcctxbuilder/Chart.yaml similarity index 100% rename from kubernetes/pomba/charts/pomba-sdcctxbuilder/Chart.yaml rename to kubernetes/pomba/components/pomba-sdcctxbuilder/Chart.yaml diff --git a/kubernetes/pomba/components/pomba-sdcctxbuilder/requirements.yaml b/kubernetes/pomba/components/pomba-sdcctxbuilder/requirements.yaml new file mode 100644 index 0000000000..fbe51550f0 --- /dev/null +++ b/kubernetes/pomba/components/pomba-sdcctxbuilder/requirements.yaml @@ -0,0 +1,21 @@ +# Copyright © 2017 Amdocs, Bell Canada +# +# 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' + - name: repositoryGenerator + version: ~6.x-0 + repository: '@local' diff --git a/kubernetes/pomba/charts/pomba-sdcctxbuilder/resources/config/README.txt b/kubernetes/pomba/components/pomba-sdcctxbuilder/resources/config/README.txt similarity index 100% rename from kubernetes/pomba/charts/pomba-sdcctxbuilder/resources/config/README.txt rename to kubernetes/pomba/components/pomba-sdcctxbuilder/resources/config/README.txt diff --git a/kubernetes/pomba/charts/pomba-sdcctxbuilder/resources/config/application.properties b/kubernetes/pomba/components/pomba-sdcctxbuilder/resources/config/application.properties similarity index 100% rename from kubernetes/pomba/charts/pomba-sdcctxbuilder/resources/config/application.properties rename to kubernetes/pomba/components/pomba-sdcctxbuilder/resources/config/application.properties diff --git a/kubernetes/pomba/charts/pomba-sdcctxbuilder/resources/config/logback.xml b/kubernetes/pomba/components/pomba-sdcctxbuilder/resources/config/logback.xml similarity index 100% rename from kubernetes/pomba/charts/pomba-sdcctxbuilder/resources/config/logback.xml rename to kubernetes/pomba/components/pomba-sdcctxbuilder/resources/config/logback.xml diff --git a/kubernetes/pomba/charts/pomba-sdcctxbuilder/templates/configmap.yaml b/kubernetes/pomba/components/pomba-sdcctxbuilder/templates/configmap.yaml similarity index 100% rename from kubernetes/pomba/charts/pomba-sdcctxbuilder/templates/configmap.yaml rename to kubernetes/pomba/components/pomba-sdcctxbuilder/templates/configmap.yaml diff --git a/kubernetes/pomba/charts/pomba-sdcctxbuilder/templates/deployment.yaml b/kubernetes/pomba/components/pomba-sdcctxbuilder/templates/deployment.yaml similarity index 96% rename from kubernetes/pomba/charts/pomba-sdcctxbuilder/templates/deployment.yaml rename to kubernetes/pomba/components/pomba-sdcctxbuilder/templates/deployment.yaml index cce0a74127..67be143cd9 100644 --- a/kubernetes/pomba/charts/pomba-sdcctxbuilder/templates/deployment.yaml +++ b/kubernetes/pomba/components/pomba-sdcctxbuilder/templates/deployment.yaml @@ -34,7 +34,7 @@ spec: spec: containers: - name: {{ include "common.name" . }} - image: "{{ include "common.repository" . }}/{{ .Values.image }}" + image: {{ include "repositoryGenerator.repository" . }}/{{ .Values.image }} imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }} ports: - containerPort: {{ .Values.service.internalPort }} @@ -83,7 +83,7 @@ spec: # Filebeat sidecar container - name: {{ include "common.name" . }}-filebeat-onap - image: "{{ .Values.global.loggingRepository }}/{{ .Values.global.loggingImage }}" + image: {{ include "repositoryGenerator.image.logging" . }} imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }} volumeMounts: - name: {{ include "common.fullname" . }}-filebeat-conf diff --git a/kubernetes/pomba/charts/pomba-sdcctxbuilder/templates/service.yaml b/kubernetes/pomba/components/pomba-sdcctxbuilder/templates/service.yaml similarity index 100% rename from kubernetes/pomba/charts/pomba-sdcctxbuilder/templates/service.yaml rename to kubernetes/pomba/components/pomba-sdcctxbuilder/templates/service.yaml diff --git a/kubernetes/pomba/charts/pomba-sdcctxbuilder/values.yaml b/kubernetes/pomba/components/pomba-sdcctxbuilder/values.yaml similarity index 95% rename from kubernetes/pomba/charts/pomba-sdcctxbuilder/values.yaml rename to kubernetes/pomba/components/pomba-sdcctxbuilder/values.yaml index 6042c21804..b9502d88c9 100644 --- a/kubernetes/pomba/charts/pomba-sdcctxbuilder/values.yaml +++ b/kubernetes/pomba/components/pomba-sdcctxbuilder/values.yaml @@ -17,15 +17,11 @@ ################################################################# global: nodePortPrefix: 302 - repository: nexus3.onap.org:10001 -# loggingRepository: docker.elastic.co -# loggingImage: beats/filebeat:5.5.0 ################################################################# # Application configuration defaults. ################################################################# # application image -repository: nexus3.onap.org:10001 image: onap/pomba-sdc-context-builder:1.5.1 pullPolicy: Always diff --git a/kubernetes/pomba/charts/pomba-sdncctxbuilder/.helmignore b/kubernetes/pomba/components/pomba-sdncctxbuilder/.helmignore similarity index 100% rename from kubernetes/pomba/charts/pomba-sdncctxbuilder/.helmignore rename to kubernetes/pomba/components/pomba-sdncctxbuilder/.helmignore diff --git a/kubernetes/pomba/charts/pomba-sdncctxbuilder/Chart.yaml b/kubernetes/pomba/components/pomba-sdncctxbuilder/Chart.yaml similarity index 100% rename from kubernetes/pomba/charts/pomba-sdncctxbuilder/Chart.yaml rename to kubernetes/pomba/components/pomba-sdncctxbuilder/Chart.yaml diff --git a/kubernetes/pomba/components/pomba-sdncctxbuilder/requirements.yaml b/kubernetes/pomba/components/pomba-sdncctxbuilder/requirements.yaml new file mode 100644 index 0000000000..fbe51550f0 --- /dev/null +++ b/kubernetes/pomba/components/pomba-sdncctxbuilder/requirements.yaml @@ -0,0 +1,21 @@ +# Copyright © 2017 Amdocs, Bell Canada +# +# 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' + - name: repositoryGenerator + version: ~6.x-0 + repository: '@local' diff --git a/kubernetes/pomba/charts/pomba-sdncctxbuilder/resources/config/application.properties b/kubernetes/pomba/components/pomba-sdncctxbuilder/resources/config/application.properties similarity index 100% rename from kubernetes/pomba/charts/pomba-sdncctxbuilder/resources/config/application.properties rename to kubernetes/pomba/components/pomba-sdncctxbuilder/resources/config/application.properties diff --git a/kubernetes/pomba/charts/pomba-sdncctxbuilder/resources/config/logback.xml b/kubernetes/pomba/components/pomba-sdncctxbuilder/resources/config/logback.xml similarity index 100% rename from kubernetes/pomba/charts/pomba-sdncctxbuilder/resources/config/logback.xml rename to kubernetes/pomba/components/pomba-sdncctxbuilder/resources/config/logback.xml diff --git a/kubernetes/pomba/charts/pomba-sdncctxbuilder/templates/configmap.yaml b/kubernetes/pomba/components/pomba-sdncctxbuilder/templates/configmap.yaml similarity index 100% rename from kubernetes/pomba/charts/pomba-sdncctxbuilder/templates/configmap.yaml rename to kubernetes/pomba/components/pomba-sdncctxbuilder/templates/configmap.yaml diff --git a/kubernetes/pomba/charts/pomba-sdncctxbuilder/templates/deployment.yaml b/kubernetes/pomba/components/pomba-sdncctxbuilder/templates/deployment.yaml similarity index 96% rename from kubernetes/pomba/charts/pomba-sdncctxbuilder/templates/deployment.yaml rename to kubernetes/pomba/components/pomba-sdncctxbuilder/templates/deployment.yaml index 6b32632613..0bb855b6ce 100644 --- a/kubernetes/pomba/charts/pomba-sdncctxbuilder/templates/deployment.yaml +++ b/kubernetes/pomba/components/pomba-sdncctxbuilder/templates/deployment.yaml @@ -34,7 +34,7 @@ spec: spec: containers: - name: {{ include "common.name" . }} - image: "{{ include "common.repository" . }}/{{ .Values.image }}" + image: {{ include "repositoryGenerator.repository" . }}/{{ .Values.image }} imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }} ports: - containerPort: {{ .Values.service.internalPort }} @@ -83,7 +83,7 @@ spec: # Filebeat sidecar container - name: {{ include "common.name" . }}-filebeat-onap - image: "{{ .Values.global.loggingRepository }}/{{ .Values.global.loggingImage }}" + image: {{ include "repositoryGenerator.image.logging" . }} imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }} volumeMounts: - name: {{ include "common.fullname" . }}-filebeat-conf diff --git a/kubernetes/pomba/charts/pomba-sdncctxbuilder/templates/service.yaml b/kubernetes/pomba/components/pomba-sdncctxbuilder/templates/service.yaml similarity index 100% rename from kubernetes/pomba/charts/pomba-sdncctxbuilder/templates/service.yaml rename to kubernetes/pomba/components/pomba-sdncctxbuilder/templates/service.yaml diff --git a/kubernetes/pomba/charts/pomba-sdncctxbuilder/values.yaml b/kubernetes/pomba/components/pomba-sdncctxbuilder/values.yaml similarity index 97% rename from kubernetes/pomba/charts/pomba-sdncctxbuilder/values.yaml rename to kubernetes/pomba/components/pomba-sdncctxbuilder/values.yaml index 2b12660123..0c8814c6a3 100644 --- a/kubernetes/pomba/charts/pomba-sdncctxbuilder/values.yaml +++ b/kubernetes/pomba/components/pomba-sdncctxbuilder/values.yaml @@ -17,13 +17,11 @@ ################################################################# global: nodePortPrefix: 302 - repository: nexus3.onap.org:10001 ################################################################# # Application configuration defaults. ################################################################# # application image -repository: nexus3.onap.org:10001 image: onap/pomba-sdnc-context-builder:1.5.1 pullPolicy: Always diff --git a/kubernetes/pomba/charts/pomba-search-data/.helmignore b/kubernetes/pomba/components/pomba-search-data/.helmignore similarity index 100% rename from kubernetes/pomba/charts/pomba-search-data/.helmignore rename to kubernetes/pomba/components/pomba-search-data/.helmignore diff --git a/kubernetes/pomba/charts/pomba-search-data/Chart.yaml b/kubernetes/pomba/components/pomba-search-data/Chart.yaml similarity index 100% rename from kubernetes/pomba/charts/pomba-search-data/Chart.yaml rename to kubernetes/pomba/components/pomba-search-data/Chart.yaml diff --git a/kubernetes/pomba/components/pomba-search-data/requirements.yaml b/kubernetes/pomba/components/pomba-search-data/requirements.yaml new file mode 100644 index 0000000000..fbe51550f0 --- /dev/null +++ b/kubernetes/pomba/components/pomba-search-data/requirements.yaml @@ -0,0 +1,21 @@ +# Copyright © 2017 Amdocs, Bell Canada +# +# 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' + - name: repositoryGenerator + version: ~6.x-0 + repository: '@local' diff --git a/kubernetes/pomba/charts/pomba-search-data/resources/config/analysis-config.json b/kubernetes/pomba/components/pomba-search-data/resources/config/analysis-config.json similarity index 100% rename from kubernetes/pomba/charts/pomba-search-data/resources/config/analysis-config.json rename to kubernetes/pomba/components/pomba-search-data/resources/config/analysis-config.json diff --git a/kubernetes/pomba/charts/pomba-search-data/resources/config/auth/search_policy.json b/kubernetes/pomba/components/pomba-search-data/resources/config/auth/search_policy.json similarity index 100% rename from kubernetes/pomba/charts/pomba-search-data/resources/config/auth/search_policy.json rename to kubernetes/pomba/components/pomba-search-data/resources/config/auth/search_policy.json diff --git a/kubernetes/pomba/charts/pomba-search-data/resources/config/auth/tomcat_keystore b/kubernetes/pomba/components/pomba-search-data/resources/config/auth/tomcat_keystore similarity index 100% rename from kubernetes/pomba/charts/pomba-search-data/resources/config/auth/tomcat_keystore rename to kubernetes/pomba/components/pomba-search-data/resources/config/auth/tomcat_keystore diff --git a/kubernetes/pomba/charts/pomba-search-data/resources/config/dynamic-custom-template.json b/kubernetes/pomba/components/pomba-search-data/resources/config/dynamic-custom-template.json similarity index 100% rename from kubernetes/pomba/charts/pomba-search-data/resources/config/dynamic-custom-template.json rename to kubernetes/pomba/components/pomba-search-data/resources/config/dynamic-custom-template.json diff --git a/kubernetes/pomba/charts/pomba-search-data/resources/config/elastic-search.properties b/kubernetes/pomba/components/pomba-search-data/resources/config/elastic-search.properties similarity index 100% rename from kubernetes/pomba/charts/pomba-search-data/resources/config/elastic-search.properties rename to kubernetes/pomba/components/pomba-search-data/resources/config/elastic-search.properties diff --git a/kubernetes/pomba/charts/pomba-search-data/resources/config/es-payload-translation.json b/kubernetes/pomba/components/pomba-search-data/resources/config/es-payload-translation.json similarity index 100% rename from kubernetes/pomba/charts/pomba-search-data/resources/config/es-payload-translation.json rename to kubernetes/pomba/components/pomba-search-data/resources/config/es-payload-translation.json diff --git a/kubernetes/pomba/charts/pomba-search-data/resources/config/filter-config.json b/kubernetes/pomba/components/pomba-search-data/resources/config/filter-config.json similarity index 100% rename from kubernetes/pomba/charts/pomba-search-data/resources/config/filter-config.json rename to kubernetes/pomba/components/pomba-search-data/resources/config/filter-config.json diff --git a/kubernetes/pomba/charts/pomba-search-data/resources/config/log/logback.xml b/kubernetes/pomba/components/pomba-search-data/resources/config/log/logback.xml similarity index 100% rename from kubernetes/pomba/charts/pomba-search-data/resources/config/log/logback.xml rename to kubernetes/pomba/components/pomba-search-data/resources/config/log/logback.xml diff --git a/kubernetes/pomba/charts/pomba-search-data/templates/configmap.yaml b/kubernetes/pomba/components/pomba-search-data/templates/configmap.yaml similarity index 100% rename from kubernetes/pomba/charts/pomba-search-data/templates/configmap.yaml rename to kubernetes/pomba/components/pomba-search-data/templates/configmap.yaml diff --git a/kubernetes/pomba/charts/pomba-search-data/templates/deployment.yaml b/kubernetes/pomba/components/pomba-search-data/templates/deployment.yaml similarity index 96% rename from kubernetes/pomba/charts/pomba-search-data/templates/deployment.yaml rename to kubernetes/pomba/components/pomba-search-data/templates/deployment.yaml index 462d4e68d6..08fc3e9148 100644 --- a/kubernetes/pomba/charts/pomba-search-data/templates/deployment.yaml +++ b/kubernetes/pomba/components/pomba-search-data/templates/deployment.yaml @@ -48,12 +48,12 @@ spec: fieldRef: apiVersion: v1 fieldPath: metadata.namespace - image: "{{ include "common.repository" . }}/{{ .Values.global.readinessImage }}" + image: {{ include "repositoryGenerator.image.readiness" . }} imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }} name: {{ include "common.name" . }}-readiness containers: - name: {{ include "common.name" . }} - image: "{{ include "common.repository" . }}/{{ .Values.image }}" + image: {{ include "repositoryGenerator.repository" . }}/{{ .Values.image }} imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }} env: - name: CONFIG_HOME @@ -121,7 +121,7 @@ spec: # side car containers - name: filebeat-onap - image: "{{ .Values.global.loggingRepository }}/{{ .Values.global.loggingImage }}" + image: {{ include "repositoryGenerator.image.logging" . }} imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }} volumeMounts: - mountPath: /usr/share/filebeat/filebeat.yml diff --git a/kubernetes/pomba/charts/pomba-search-data/templates/secret.yaml b/kubernetes/pomba/components/pomba-search-data/templates/secret.yaml similarity index 100% rename from kubernetes/pomba/charts/pomba-search-data/templates/secret.yaml rename to kubernetes/pomba/components/pomba-search-data/templates/secret.yaml diff --git a/kubernetes/pomba/charts/pomba-search-data/templates/service.yaml b/kubernetes/pomba/components/pomba-search-data/templates/service.yaml similarity index 100% rename from kubernetes/pomba/charts/pomba-search-data/templates/service.yaml rename to kubernetes/pomba/components/pomba-search-data/templates/service.yaml diff --git a/kubernetes/pomba/charts/pomba-search-data/values.yaml b/kubernetes/pomba/components/pomba-search-data/values.yaml similarity index 94% rename from kubernetes/pomba/charts/pomba-search-data/values.yaml rename to kubernetes/pomba/components/pomba-search-data/values.yaml index f2c90632c2..a950750f85 100644 --- a/kubernetes/pomba/charts/pomba-search-data/values.yaml +++ b/kubernetes/pomba/components/pomba-search-data/values.yaml @@ -3,11 +3,9 @@ # Declare variables to be passed into your templates. global: # global defaults nodePortPrefix: 302 - readinessImage: onap/oom/readiness:3.0.1 # application image -repository: nexus3.onap.org:10001 image: onap/search-data-service:1.3.1 pullPolicy: Always restartPolicy: Always diff --git a/kubernetes/pomba/charts/pomba-servicedecomposition/Chart.yaml b/kubernetes/pomba/components/pomba-servicedecomposition/Chart.yaml similarity index 100% rename from kubernetes/pomba/charts/pomba-servicedecomposition/Chart.yaml rename to kubernetes/pomba/components/pomba-servicedecomposition/Chart.yaml diff --git a/kubernetes/pomba/components/pomba-servicedecomposition/requirements.yaml b/kubernetes/pomba/components/pomba-servicedecomposition/requirements.yaml new file mode 100644 index 0000000000..fbe51550f0 --- /dev/null +++ b/kubernetes/pomba/components/pomba-servicedecomposition/requirements.yaml @@ -0,0 +1,21 @@ +# Copyright © 2017 Amdocs, Bell Canada +# +# 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' + - name: repositoryGenerator + version: ~6.x-0 + repository: '@local' diff --git a/kubernetes/pomba/charts/pomba-servicedecomposition/resources/config/application.properties b/kubernetes/pomba/components/pomba-servicedecomposition/resources/config/application.properties similarity index 100% rename from kubernetes/pomba/charts/pomba-servicedecomposition/resources/config/application.properties rename to kubernetes/pomba/components/pomba-servicedecomposition/resources/config/application.properties diff --git a/kubernetes/pomba/charts/pomba-servicedecomposition/resources/config/log/logback.xml b/kubernetes/pomba/components/pomba-servicedecomposition/resources/config/log/logback.xml similarity index 100% rename from kubernetes/pomba/charts/pomba-servicedecomposition/resources/config/log/logback.xml rename to kubernetes/pomba/components/pomba-servicedecomposition/resources/config/log/logback.xml diff --git a/kubernetes/pomba/charts/pomba-servicedecomposition/templates/configmap.yaml b/kubernetes/pomba/components/pomba-servicedecomposition/templates/configmap.yaml similarity index 100% rename from kubernetes/pomba/charts/pomba-servicedecomposition/templates/configmap.yaml rename to kubernetes/pomba/components/pomba-servicedecomposition/templates/configmap.yaml diff --git a/kubernetes/pomba/charts/pomba-servicedecomposition/templates/deployment.yaml b/kubernetes/pomba/components/pomba-servicedecomposition/templates/deployment.yaml similarity index 96% rename from kubernetes/pomba/charts/pomba-servicedecomposition/templates/deployment.yaml rename to kubernetes/pomba/components/pomba-servicedecomposition/templates/deployment.yaml index d7f1b5adc3..d30e921e12 100644 --- a/kubernetes/pomba/charts/pomba-servicedecomposition/templates/deployment.yaml +++ b/kubernetes/pomba/components/pomba-servicedecomposition/templates/deployment.yaml @@ -34,7 +34,7 @@ spec: spec: containers: - name: {{ include "common.name" . }} - image: "{{ include "common.repository" . }}/{{ .Values.image }}" + image: {{ include "repositoryGenerator.repository" . }}/{{ .Values.image }} imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }} ports: - containerPort: {{ .Values.service.internalPort }} @@ -80,7 +80,7 @@ spec: # Filebeat sidecar container - name: {{ include "common.name" . }}-filebeat-onap - image: "{{ .Values.global.loggingRepository }}/{{ .Values.global.loggingImage }}" + image: {{ include "repositoryGenerator.image.logging" . }} imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }} volumeMounts: - name: {{ include "common.fullname" . }}-filebeat-conf diff --git a/kubernetes/pomba/charts/pomba-servicedecomposition/templates/service.yaml b/kubernetes/pomba/components/pomba-servicedecomposition/templates/service.yaml similarity index 100% rename from kubernetes/pomba/charts/pomba-servicedecomposition/templates/service.yaml rename to kubernetes/pomba/components/pomba-servicedecomposition/templates/service.yaml diff --git a/kubernetes/pomba/charts/pomba-servicedecomposition/values.yaml b/kubernetes/pomba/components/pomba-servicedecomposition/values.yaml similarity index 97% rename from kubernetes/pomba/charts/pomba-servicedecomposition/values.yaml rename to kubernetes/pomba/components/pomba-servicedecomposition/values.yaml index ac8a379724..a0e849890a 100644 --- a/kubernetes/pomba/charts/pomba-servicedecomposition/values.yaml +++ b/kubernetes/pomba/components/pomba-servicedecomposition/values.yaml @@ -17,13 +17,11 @@ ################################################################# global: nodePortPrefix: 302 - repository: nexus3.onap.org:10001 ################################################################# # Application configuration defaults. ################################################################# # application image -repository: nexus3.onap.org:10001 image: onap/service-decomposition:1.5.1 pullPolicy: Always diff --git a/kubernetes/pomba/charts/pomba-validation-service/Chart.yaml b/kubernetes/pomba/components/pomba-validation-service/Chart.yaml similarity index 100% rename from kubernetes/pomba/charts/pomba-validation-service/Chart.yaml rename to kubernetes/pomba/components/pomba-validation-service/Chart.yaml diff --git a/kubernetes/pomba/components/pomba-validation-service/requirements.yaml b/kubernetes/pomba/components/pomba-validation-service/requirements.yaml new file mode 100644 index 0000000000..fbe51550f0 --- /dev/null +++ b/kubernetes/pomba/components/pomba-validation-service/requirements.yaml @@ -0,0 +1,21 @@ +# Copyright © 2017 Amdocs, Bell Canada +# +# 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' + - name: repositoryGenerator + version: ~6.x-0 + repository: '@local' diff --git a/kubernetes/pomba/charts/pomba-validation-service/resources/appconfig/README.txt b/kubernetes/pomba/components/pomba-validation-service/resources/appconfig/README.txt similarity index 100% rename from kubernetes/pomba/charts/pomba-validation-service/resources/appconfig/README.txt rename to kubernetes/pomba/components/pomba-validation-service/resources/appconfig/README.txt diff --git a/kubernetes/pomba/charts/pomba-validation-service/resources/appconfig/aai-environment.properties b/kubernetes/pomba/components/pomba-validation-service/resources/appconfig/aai-environment.properties similarity index 100% rename from kubernetes/pomba/charts/pomba-validation-service/resources/appconfig/aai-environment.properties rename to kubernetes/pomba/components/pomba-validation-service/resources/appconfig/aai-environment.properties diff --git a/kubernetes/pomba/charts/pomba-validation-service/resources/appconfig/auth/client-cert-onap.p12 b/kubernetes/pomba/components/pomba-validation-service/resources/appconfig/auth/client-cert-onap.p12 similarity index 100% rename from kubernetes/pomba/charts/pomba-validation-service/resources/appconfig/auth/client-cert-onap.p12 rename to kubernetes/pomba/components/pomba-validation-service/resources/appconfig/auth/client-cert-onap.p12 diff --git a/kubernetes/pomba/charts/pomba-validation-service/resources/appconfig/auth/tomcat_keystore b/kubernetes/pomba/components/pomba-validation-service/resources/appconfig/auth/tomcat_keystore similarity index 100% rename from kubernetes/pomba/charts/pomba-validation-service/resources/appconfig/auth/tomcat_keystore rename to kubernetes/pomba/components/pomba-validation-service/resources/appconfig/auth/tomcat_keystore diff --git a/kubernetes/pomba/charts/pomba-validation-service/resources/appconfig/auth_policy.json b/kubernetes/pomba/components/pomba-validation-service/resources/appconfig/auth_policy.json similarity index 100% rename from kubernetes/pomba/charts/pomba-validation-service/resources/appconfig/auth_policy.json rename to kubernetes/pomba/components/pomba-validation-service/resources/appconfig/auth_policy.json diff --git a/kubernetes/pomba/charts/pomba-validation-service/resources/appconfig/rule-data-dictionary.properties b/kubernetes/pomba/components/pomba-validation-service/resources/appconfig/rule-data-dictionary.properties similarity index 100% rename from kubernetes/pomba/charts/pomba-validation-service/resources/appconfig/rule-data-dictionary.properties rename to kubernetes/pomba/components/pomba-validation-service/resources/appconfig/rule-data-dictionary.properties diff --git a/kubernetes/pomba/charts/pomba-validation-service/resources/appconfig/rule-indexing.properties b/kubernetes/pomba/components/pomba-validation-service/resources/appconfig/rule-indexing.properties similarity index 100% rename from kubernetes/pomba/charts/pomba-validation-service/resources/appconfig/rule-indexing.properties rename to kubernetes/pomba/components/pomba-validation-service/resources/appconfig/rule-indexing.properties diff --git a/kubernetes/pomba/charts/pomba-validation-service/resources/appconfig/schemaIngest.properties b/kubernetes/pomba/components/pomba-validation-service/resources/appconfig/schemaIngest.properties similarity index 100% rename from kubernetes/pomba/charts/pomba-validation-service/resources/appconfig/schemaIngest.properties rename to kubernetes/pomba/components/pomba-validation-service/resources/appconfig/schemaIngest.properties diff --git a/kubernetes/pomba/charts/pomba-validation-service/resources/appconfig/topics/topic-poa-audit-result.properties b/kubernetes/pomba/components/pomba-validation-service/resources/appconfig/topics/topic-poa-audit-result.properties similarity index 100% rename from kubernetes/pomba/charts/pomba-validation-service/resources/appconfig/topics/topic-poa-audit-result.properties rename to kubernetes/pomba/components/pomba-validation-service/resources/appconfig/topics/topic-poa-audit-result.properties diff --git a/kubernetes/pomba/charts/pomba-validation-service/resources/appconfig/topics/topic-poa-rule-validation.properties b/kubernetes/pomba/components/pomba-validation-service/resources/appconfig/topics/topic-poa-rule-validation.properties similarity index 100% rename from kubernetes/pomba/charts/pomba-validation-service/resources/appconfig/topics/topic-poa-rule-validation.properties rename to kubernetes/pomba/components/pomba-validation-service/resources/appconfig/topics/topic-poa-rule-validation.properties diff --git a/kubernetes/pomba/charts/pomba-validation-service/resources/appconfig/validation-service-auth.properties b/kubernetes/pomba/components/pomba-validation-service/resources/appconfig/validation-service-auth.properties similarity index 100% rename from kubernetes/pomba/charts/pomba-validation-service/resources/appconfig/validation-service-auth.properties rename to kubernetes/pomba/components/pomba-validation-service/resources/appconfig/validation-service-auth.properties diff --git a/kubernetes/pomba/charts/pomba-validation-service/resources/appconfig/validation-service.properties b/kubernetes/pomba/components/pomba-validation-service/resources/appconfig/validation-service.properties similarity index 100% rename from kubernetes/pomba/charts/pomba-validation-service/resources/appconfig/validation-service.properties rename to kubernetes/pomba/components/pomba-validation-service/resources/appconfig/validation-service.properties diff --git a/kubernetes/pomba/charts/pomba-validation-service/resources/application.properties b/kubernetes/pomba/components/pomba-validation-service/resources/application.properties similarity index 100% rename from kubernetes/pomba/charts/pomba-validation-service/resources/application.properties rename to kubernetes/pomba/components/pomba-validation-service/resources/application.properties diff --git a/kubernetes/pomba/charts/pomba-validation-service/resources/bundleconfig/etc/rules/poa-event/default-rules.groovy b/kubernetes/pomba/components/pomba-validation-service/resources/bundleconfig/etc/rules/poa-event/default-rules.groovy similarity index 100% rename from kubernetes/pomba/charts/pomba-validation-service/resources/bundleconfig/etc/rules/poa-event/default-rules.groovy rename to kubernetes/pomba/components/pomba-validation-service/resources/bundleconfig/etc/rules/poa-event/default-rules.groovy diff --git a/kubernetes/pomba/charts/pomba-validation-service/templates/configmap.yaml b/kubernetes/pomba/components/pomba-validation-service/templates/configmap.yaml similarity index 100% rename from kubernetes/pomba/charts/pomba-validation-service/templates/configmap.yaml rename to kubernetes/pomba/components/pomba-validation-service/templates/configmap.yaml diff --git a/kubernetes/pomba/charts/pomba-validation-service/templates/deployment.yaml b/kubernetes/pomba/components/pomba-validation-service/templates/deployment.yaml similarity index 97% rename from kubernetes/pomba/charts/pomba-validation-service/templates/deployment.yaml rename to kubernetes/pomba/components/pomba-validation-service/templates/deployment.yaml index 8c3cb66fd0..1590f4e001 100644 --- a/kubernetes/pomba/charts/pomba-validation-service/templates/deployment.yaml +++ b/kubernetes/pomba/components/pomba-validation-service/templates/deployment.yaml @@ -34,7 +34,7 @@ spec: spec: containers: - name: {{ include "common.name" . }} - image: "{{ include "common.repository" . }}/{{ .Values.image }}" + image: {{ include "repositoryGenerator.repository" . }}/{{ .Values.image }} imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }} ports: - containerPort: {{ .Values.service.internalPort }} @@ -89,7 +89,7 @@ spec: # Filebeat sidecar container - name: {{ include "common.name" . }}-filebeat-onap - image: "{{ .Values.global.loggingRepository }}/{{ .Values.global.loggingImage }}" + image: {{ include "repositoryGenerator.image.logging" . }} imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }} volumeMounts: - name: {{ include "common.fullname" . }}-filebeat-conf diff --git a/kubernetes/pomba/charts/pomba-validation-service/templates/secrets.yaml b/kubernetes/pomba/components/pomba-validation-service/templates/secrets.yaml similarity index 100% rename from kubernetes/pomba/charts/pomba-validation-service/templates/secrets.yaml rename to kubernetes/pomba/components/pomba-validation-service/templates/secrets.yaml diff --git a/kubernetes/pomba/charts/pomba-validation-service/templates/service.yaml b/kubernetes/pomba/components/pomba-validation-service/templates/service.yaml similarity index 100% rename from kubernetes/pomba/charts/pomba-validation-service/templates/service.yaml rename to kubernetes/pomba/components/pomba-validation-service/templates/service.yaml diff --git a/kubernetes/pomba/charts/pomba-validation-service/values.yaml b/kubernetes/pomba/components/pomba-validation-service/values.yaml similarity index 94% rename from kubernetes/pomba/charts/pomba-validation-service/values.yaml rename to kubernetes/pomba/components/pomba-validation-service/values.yaml index 244265cb07..0626b0312e 100644 --- a/kubernetes/pomba/charts/pomba-validation-service/values.yaml +++ b/kubernetes/pomba/components/pomba-validation-service/values.yaml @@ -17,16 +17,11 @@ ################################################################# global: nodePortPrefix: 302 - repository: nexus3.onap.org:10001 -# loggingRepository: docker.elastic.co -# loggingImage: beats/filebeat:5.5.0 ################################################################# # Application configuration defaults. ################################################################# # application image -#repository: nexus3.onap.org:10001 -repository: nexus3.onap.org:10001 image: onap/validation:1.3.1 #pullPolicy: Always pullPolicy: IfNotPresent diff --git a/kubernetes/pomba/requirements.yaml b/kubernetes/pomba/requirements.yaml index 9bf26c8d61..69d5a458ad 100644 --- a/kubernetes/pomba/requirements.yaml +++ b/kubernetes/pomba/requirements.yaml @@ -19,3 +19,51 @@ dependencies: # a part of this chart's package and will not # be published independently to a repo (at this point) repository: '@local' + - name: pomba-aaictxbuilder + version: ~6.x-0 + repository: 'file://components/pomba-aaictxbuilder' + condition: pomba-aaictxbuilder.enabled + - name: pomba-contextaggregator + version: ~6.x-0 + repository: 'file://components/pomba-contextaggregator' + condition: pomba-contextaggregator.enabled + - name: pomba-data-router + version: ~6.x-0 + repository: 'file://components/pomba-data-router' + condition: pomba-data-router.enabled + - name: pomba-elasticsearch + version: ~6.x-0 + repository: 'file://components/pomba-elasticsearch' + condition: pomba-elasticsearch.enabled + - name: pomba-kibana + version: ~6.x-0 + repository: 'file://components/pomba-kibana' + condition: pomba-kibana.enabled + - name: pomba-networkdiscovery + version: ~6.x-0 + repository: 'file://components/pomba-networkdiscovery' + condition: pomba-networkdiscovery.enabled + - name: pomba-networkdiscoveryctxbuilder + version: ~6.x-0 + repository: 'file://components/pomba-networkdiscoveryctxbuilder' + condition: pomba-networkdiscoveryctxbuilder.enabled + - name: pomba-sdcctxbuilder + version: ~6.x-0 + repository: 'file://components/pomba-sdcctxbuilder' + condition: pomba-sdcctxbuilder.enabled + - name: pomba-sdncctxbuilder + version: ~6.x-0 + repository: 'file://components/pomba-sdncctxbuilder' + condition: pomba-sdncctxbuilder.enabled + - name: pomba-search-data + version: ~6.x-0 + repository: 'file://components/pomba-search-data' + condition: pomba-search-data.enabled + - name: pomba-servicedecomposition + version: ~6.x-0 + repository: 'file://components/pomba-servicedecomposition' + condition: pomba-servicedecomposition.enabled + - name: pomba-validation-service + version: ~6.x-0 + repository: 'file://components/pomba-validation-service' + condition: pomba-validation-service.enabled \ No newline at end of file diff --git a/kubernetes/pomba/values.yaml b/kubernetes/pomba/values.yaml index 3818074804..28025ebc5b 100644 --- a/kubernetes/pomba/values.yaml +++ b/kubernetes/pomba/values.yaml @@ -17,11 +17,6 @@ ################################################################# global: nodePortPrefix: 302 - readinessImage: onap/oom/readiness:3.0.1 - loggingRepository: docker.elastic.co - loggingImage: beats/filebeat:5.5.0 - repository: nexus3.onap.org:10001 - dockerhubRepository: docker.io networkdiscoveryCtxBuilderHost: pomba-networkdiscoveryctxbuilder # application configuration -- 2.16.6