Merge "[POMBA] Uses new tpls for repos / images"
authorKrzysztof Opasiak <k.opasiak@samsung.com>
Thu, 26 Nov 2020 09:58:16 +0000 (09:58 +0000)
committerGerrit Code Review <gerrit@onap.org>
Thu, 26 Nov 2020 09:58:16 +0000 (09:58 +0000)
159 files changed:
kubernetes/pomba/Makefile [new file with mode: 0644]
kubernetes/pomba/charts/pomba-aaictxbuilder/requirements.yaml [deleted file]
kubernetes/pomba/charts/pomba-kibana/requirements.yaml [deleted file]
kubernetes/pomba/charts/pomba-networkdiscovery/requirements.yaml [deleted file]
kubernetes/pomba/charts/pomba-networkdiscoveryctxbuilder/requirements.yaml [deleted file]
kubernetes/pomba/charts/pomba-sdncctxbuilder/requirements.yaml [deleted file]
kubernetes/pomba/charts/pomba-servicedecomposition/requirements.yaml [deleted file]
kubernetes/pomba/components/Makefile [new file with mode: 0644]
kubernetes/pomba/components/pomba-aaictxbuilder/Chart.yaml [moved from kubernetes/pomba/charts/pomba-aaictxbuilder/Chart.yaml with 100% similarity]
kubernetes/pomba/components/pomba-aaictxbuilder/requirements.yaml [moved from kubernetes/pomba/charts/pomba-validation-service/requirements.yaml with 89% similarity]
kubernetes/pomba/components/pomba-aaictxbuilder/resources/config/application.properties [moved from kubernetes/pomba/charts/pomba-aaictxbuilder/resources/config/application.properties with 100% similarity]
kubernetes/pomba/components/pomba-aaictxbuilder/resources/config/logback.xml [moved from kubernetes/pomba/charts/pomba-aaictxbuilder/resources/config/logback.xml with 100% similarity]
kubernetes/pomba/components/pomba-aaictxbuilder/templates/configmap.yaml [moved from kubernetes/pomba/charts/pomba-aaictxbuilder/templates/configmap.yaml with 100% similarity]
kubernetes/pomba/components/pomba-aaictxbuilder/templates/deployment.yaml [moved from kubernetes/pomba/charts/pomba-aaictxbuilder/templates/deployment.yaml with 96% similarity]
kubernetes/pomba/components/pomba-aaictxbuilder/templates/service.yaml [moved from kubernetes/pomba/charts/pomba-aaictxbuilder/templates/service.yaml with 100% similarity]
kubernetes/pomba/components/pomba-aaictxbuilder/values.yaml [moved from kubernetes/pomba/charts/pomba-aaictxbuilder/values.yaml with 96% similarity]
kubernetes/pomba/components/pomba-contextaggregator/.helmignore [moved from kubernetes/pomba/charts/pomba-contextaggregator/.helmignore with 100% similarity]
kubernetes/pomba/components/pomba-contextaggregator/Chart.yaml [moved from kubernetes/pomba/charts/pomba-contextaggregator/Chart.yaml with 100% similarity]
kubernetes/pomba/components/pomba-contextaggregator/requirements.yaml [moved from kubernetes/pomba/charts/pomba-sdcctxbuilder/requirements.yaml with 86% similarity]
kubernetes/pomba/components/pomba-contextaggregator/resources/config/application.properties [moved from kubernetes/pomba/charts/pomba-contextaggregator/resources/config/application.properties with 100% similarity]
kubernetes/pomba/components/pomba-contextaggregator/resources/config/builders/aai.properties [moved from kubernetes/pomba/charts/pomba-contextaggregator/resources/config/builders/aai.properties with 100% similarity]
kubernetes/pomba/components/pomba-contextaggregator/resources/config/builders/ndcb.properties [moved from kubernetes/pomba/charts/pomba-contextaggregator/resources/config/builders/ndcb.properties with 100% similarity]
kubernetes/pomba/components/pomba-contextaggregator/resources/config/builders/sdc.properties [moved from kubernetes/pomba/charts/pomba-contextaggregator/resources/config/builders/sdc.properties with 100% similarity]
kubernetes/pomba/components/pomba-contextaggregator/resources/config/builders/sdnc.properties [moved from kubernetes/pomba/charts/pomba-contextaggregator/resources/config/builders/sdnc.properties with 100% similarity]
kubernetes/pomba/components/pomba-contextaggregator/resources/config/logback.xml [moved from kubernetes/pomba/charts/pomba-contextaggregator/resources/config/logback.xml with 100% similarity]
kubernetes/pomba/components/pomba-contextaggregator/templates/configmap.yaml [moved from kubernetes/pomba/charts/pomba-contextaggregator/templates/configmap.yaml with 100% similarity]
kubernetes/pomba/components/pomba-contextaggregator/templates/deployment.yaml [moved from kubernetes/pomba/charts/pomba-contextaggregator/templates/deployment.yaml with 95% similarity]
kubernetes/pomba/components/pomba-contextaggregator/templates/service.yaml [moved from kubernetes/pomba/charts/pomba-contextaggregator/templates/service.yaml with 100% similarity]
kubernetes/pomba/components/pomba-contextaggregator/values.yaml [moved from kubernetes/pomba/charts/pomba-contextaggregator/values.yaml with 97% similarity]
kubernetes/pomba/components/pomba-data-router/.helmignore [moved from kubernetes/pomba/charts/pomba-data-router/.helmignore with 100% similarity]
kubernetes/pomba/components/pomba-data-router/Chart.yaml [moved from kubernetes/pomba/charts/pomba-data-router/Chart.yaml with 100% similarity]
kubernetes/pomba/components/pomba-data-router/requirements.yaml [moved from kubernetes/pomba/charts/pomba-contextaggregator/requirements.yaml with 86% similarity, mode: 0644]
kubernetes/pomba/components/pomba-data-router/resources/config/auth/client-cert-onap.p12 [moved from kubernetes/pomba/charts/pomba-data-router/resources/config/auth/client-cert-onap.p12 with 100% similarity]
kubernetes/pomba/components/pomba-data-router/resources/config/auth/data-router_policy.json [moved from kubernetes/pomba/charts/pomba-data-router/resources/config/auth/data-router_policy.json with 100% similarity]
kubernetes/pomba/components/pomba-data-router/resources/config/auth/tomcat_keystore [moved from kubernetes/pomba/charts/pomba-data-router/resources/config/auth/tomcat_keystore with 100% similarity]
kubernetes/pomba/components/pomba-data-router/resources/config/data-router.properties [moved from kubernetes/pomba/charts/pomba-data-router/resources/config/data-router.properties with 100% similarity]
kubernetes/pomba/components/pomba-data-router/resources/config/schemaIngest.properties [moved from kubernetes/pomba/charts/pomba-data-router/resources/config/schemaIngest.properties with 100% similarity]
kubernetes/pomba/components/pomba-data-router/resources/dynamic/conf/audit-bean.xml [moved from kubernetes/pomba/charts/pomba-data-router/resources/dynamic/conf/audit-bean.xml with 100% similarity]
kubernetes/pomba/components/pomba-data-router/resources/dynamic/conf/poa-validation-bean.xml [moved from kubernetes/pomba/charts/pomba-data-router/resources/dynamic/conf/poa-validation-bean.xml with 100% similarity]
kubernetes/pomba/components/pomba-data-router/resources/dynamic/routes/audit.route [moved from kubernetes/pomba/charts/pomba-data-router/resources/dynamic/routes/audit.route with 100% similarity]
kubernetes/pomba/components/pomba-data-router/resources/dynamic/routes/poaValidation.route [moved from kubernetes/pomba/charts/pomba-data-router/resources/dynamic/routes/poaValidation.route with 100% similarity]
kubernetes/pomba/components/pomba-data-router/templates/configmap.yaml [moved from kubernetes/pomba/charts/pomba-data-router/templates/configmap.yaml with 100% similarity]
kubernetes/pomba/components/pomba-data-router/templates/deployment.yaml [moved from kubernetes/pomba/charts/pomba-data-router/templates/deployment.yaml with 94% similarity]
kubernetes/pomba/components/pomba-data-router/templates/ingress.yaml [moved from kubernetes/pomba/charts/pomba-data-router/templates/ingress.yaml with 100% similarity]
kubernetes/pomba/components/pomba-data-router/templates/pv.yaml [moved from kubernetes/pomba/charts/pomba-data-router/templates/pv.yaml with 100% similarity]
kubernetes/pomba/components/pomba-data-router/templates/pvc.yaml [moved from kubernetes/pomba/charts/pomba-data-router/templates/pvc.yaml with 100% similarity]
kubernetes/pomba/components/pomba-data-router/templates/secret.yaml [moved from kubernetes/pomba/charts/pomba-data-router/templates/secret.yaml with 100% similarity]
kubernetes/pomba/components/pomba-data-router/templates/service.yaml [moved from kubernetes/pomba/charts/pomba-data-router/templates/service.yaml with 100% similarity]
kubernetes/pomba/components/pomba-data-router/values.yaml [moved from kubernetes/pomba/charts/pomba-data-router/values.yaml with 97% similarity]
kubernetes/pomba/components/pomba-elasticsearch/Chart.yaml [moved from kubernetes/pomba/charts/pomba-elasticsearch/Chart.yaml with 100% similarity]
kubernetes/pomba/components/pomba-elasticsearch/requirements.yaml [moved from kubernetes/pomba/charts/pomba-elasticsearch/requirements.yaml with 86% similarity]
kubernetes/pomba/components/pomba-elasticsearch/resources/config/elasticsearch.yml [moved from kubernetes/pomba/charts/pomba-elasticsearch/resources/config/elasticsearch.yml with 100% similarity]
kubernetes/pomba/components/pomba-elasticsearch/templates/configmap.yaml [moved from kubernetes/pomba/charts/pomba-elasticsearch/templates/configmap.yaml with 100% similarity]
kubernetes/pomba/components/pomba-elasticsearch/templates/deployment.yaml [moved from kubernetes/pomba/charts/pomba-elasticsearch/templates/deployment.yaml with 95% similarity]
kubernetes/pomba/components/pomba-elasticsearch/templates/pv-data.yaml [moved from kubernetes/pomba/charts/pomba-elasticsearch/templates/pv-data.yaml with 100% similarity]
kubernetes/pomba/components/pomba-elasticsearch/templates/pv-logs.yaml [moved from kubernetes/pomba/charts/pomba-elasticsearch/templates/pv-logs.yaml with 100% similarity]
kubernetes/pomba/components/pomba-elasticsearch/templates/pvc-data.yaml [moved from kubernetes/pomba/charts/pomba-elasticsearch/templates/pvc-data.yaml with 100% similarity]
kubernetes/pomba/components/pomba-elasticsearch/templates/pvc-logs.yaml [moved from kubernetes/pomba/charts/pomba-elasticsearch/templates/pvc-logs.yaml with 100% similarity]
kubernetes/pomba/components/pomba-elasticsearch/templates/service.yaml [moved from kubernetes/pomba/charts/pomba-elasticsearch/templates/service.yaml with 100% similarity]
kubernetes/pomba/components/pomba-elasticsearch/values.yaml [moved from kubernetes/pomba/charts/pomba-elasticsearch/values.yaml with 95% similarity]
kubernetes/pomba/components/pomba-kibana/Chart.yaml [moved from kubernetes/pomba/charts/pomba-kibana/Chart.yaml with 100% similarity]
kubernetes/pomba/components/pomba-kibana/requirements.yaml [new file with mode: 0644]
kubernetes/pomba/components/pomba-kibana/resources/auth/pomba.crt.pem [moved from kubernetes/pomba/charts/pomba-kibana/resources/auth/pomba.crt.pem with 100% similarity]
kubernetes/pomba/components/pomba-kibana/resources/auth/pomba.key.pem [moved from kubernetes/pomba/charts/pomba-kibana/resources/auth/pomba.key.pem with 100% similarity]
kubernetes/pomba/components/pomba-kibana/resources/bin/kibana_start.sh [moved from kubernetes/pomba/charts/pomba-kibana/resources/bin/kibana_start.sh with 100% similarity]
kubernetes/pomba/components/pomba-kibana/resources/config/default-mapping.json [moved from kubernetes/pomba/charts/pomba-kibana/resources/config/default-mapping.json with 100% similarity]
kubernetes/pomba/components/pomba-kibana/resources/config/default.json [moved from kubernetes/pomba/charts/pomba-kibana/resources/config/default.json with 100% similarity]
kubernetes/pomba/components/pomba-kibana/resources/config/kibana.yml [moved from kubernetes/pomba/charts/pomba-kibana/resources/config/kibana.yml with 100% similarity]
kubernetes/pomba/components/pomba-kibana/templates/configmap.yaml [moved from kubernetes/pomba/charts/pomba-kibana/templates/configmap.yaml with 100% similarity]
kubernetes/pomba/components/pomba-kibana/templates/deployment.yaml [moved from kubernetes/pomba/charts/pomba-kibana/templates/deployment.yaml with 94% similarity]
kubernetes/pomba/components/pomba-kibana/templates/ingress.yaml [moved from kubernetes/pomba/charts/pomba-kibana/templates/ingress.yaml with 100% similarity]
kubernetes/pomba/components/pomba-kibana/templates/service.yaml [moved from kubernetes/pomba/charts/pomba-kibana/templates/service.yaml with 100% similarity]
kubernetes/pomba/components/pomba-kibana/values.yaml [moved from kubernetes/pomba/charts/pomba-kibana/values.yaml with 93% similarity]
kubernetes/pomba/components/pomba-networkdiscovery/Chart.yaml [moved from kubernetes/pomba/charts/pomba-networkdiscovery/Chart.yaml with 100% similarity]
kubernetes/pomba/components/pomba-networkdiscovery/requirements.yaml [new file with mode: 0644]
kubernetes/pomba/components/pomba-networkdiscovery/resources/config/application.properties [moved from kubernetes/pomba/charts/pomba-networkdiscovery/resources/config/application.properties with 100% similarity]
kubernetes/pomba/components/pomba-networkdiscovery/resources/config/auth/client-cert-onap.p12 [moved from kubernetes/pomba/charts/pomba-networkdiscovery/resources/config/auth/client-cert-onap.p12 with 100% similarity]
kubernetes/pomba/components/pomba-networkdiscovery/resources/config/auth/tomcat_keystore [moved from kubernetes/pomba/charts/pomba-networkdiscovery/resources/config/auth/tomcat_keystore with 100% similarity]
kubernetes/pomba/components/pomba-networkdiscovery/resources/config/logback.xml [moved from kubernetes/pomba/charts/pomba-networkdiscovery/resources/config/logback.xml with 100% similarity]
kubernetes/pomba/components/pomba-networkdiscovery/templates/configmap.yaml [moved from kubernetes/pomba/charts/pomba-networkdiscovery/templates/configmap.yaml with 100% similarity]
kubernetes/pomba/components/pomba-networkdiscovery/templates/deployment.yaml [moved from kubernetes/pomba/charts/pomba-networkdiscovery/templates/deployment.yaml with 96% similarity]
kubernetes/pomba/components/pomba-networkdiscovery/templates/ingress.yaml [moved from kubernetes/pomba/charts/pomba-networkdiscovery/templates/ingress.yaml with 100% similarity]
kubernetes/pomba/components/pomba-networkdiscovery/templates/secrets.yaml [moved from kubernetes/pomba/charts/pomba-networkdiscovery/templates/secrets.yaml with 100% similarity]
kubernetes/pomba/components/pomba-networkdiscovery/templates/service.yaml [moved from kubernetes/pomba/charts/pomba-networkdiscovery/templates/service.yaml with 100% similarity]
kubernetes/pomba/components/pomba-networkdiscovery/values.yaml [moved from kubernetes/pomba/charts/pomba-networkdiscovery/values.yaml with 96% similarity]
kubernetes/pomba/components/pomba-networkdiscoveryctxbuilder/Chart.yaml [moved from kubernetes/pomba/charts/pomba-networkdiscoveryctxbuilder/Chart.yaml with 100% similarity]
kubernetes/pomba/components/pomba-networkdiscoveryctxbuilder/requirements.yaml [new file with mode: 0644]
kubernetes/pomba/components/pomba-networkdiscoveryctxbuilder/resources/config/application.properties [moved from kubernetes/pomba/charts/pomba-networkdiscoveryctxbuilder/resources/config/application.properties with 100% similarity]
kubernetes/pomba/components/pomba-networkdiscoveryctxbuilder/resources/config/logback.xml [moved from kubernetes/pomba/charts/pomba-networkdiscoveryctxbuilder/resources/config/logback.xml with 100% similarity]
kubernetes/pomba/components/pomba-networkdiscoveryctxbuilder/templates/configmap.yaml [moved from kubernetes/pomba/charts/pomba-networkdiscoveryctxbuilder/templates/configmap.yaml with 100% similarity]
kubernetes/pomba/components/pomba-networkdiscoveryctxbuilder/templates/deployment.yaml [moved from kubernetes/pomba/charts/pomba-networkdiscoveryctxbuilder/templates/deployment.yaml with 96% similarity]
kubernetes/pomba/components/pomba-networkdiscoveryctxbuilder/templates/service.yaml [moved from kubernetes/pomba/charts/pomba-networkdiscoveryctxbuilder/templates/service.yaml with 100% similarity]
kubernetes/pomba/components/pomba-networkdiscoveryctxbuilder/values.yaml [moved from kubernetes/pomba/charts/pomba-networkdiscoveryctxbuilder/values.yaml with 98% similarity]
kubernetes/pomba/components/pomba-sdcctxbuilder/.helmignore [moved from kubernetes/pomba/charts/pomba-sdcctxbuilder/.helmignore with 100% similarity]
kubernetes/pomba/components/pomba-sdcctxbuilder/Chart.yaml [moved from kubernetes/pomba/charts/pomba-sdcctxbuilder/Chart.yaml with 100% similarity]
kubernetes/pomba/components/pomba-sdcctxbuilder/requirements.yaml [new file with mode: 0644]
kubernetes/pomba/components/pomba-sdcctxbuilder/resources/config/README.txt [moved from kubernetes/pomba/charts/pomba-sdcctxbuilder/resources/config/README.txt with 100% similarity]
kubernetes/pomba/components/pomba-sdcctxbuilder/resources/config/application.properties [moved from kubernetes/pomba/charts/pomba-sdcctxbuilder/resources/config/application.properties with 100% similarity]
kubernetes/pomba/components/pomba-sdcctxbuilder/resources/config/logback.xml [moved from kubernetes/pomba/charts/pomba-sdcctxbuilder/resources/config/logback.xml with 100% similarity]
kubernetes/pomba/components/pomba-sdcctxbuilder/templates/configmap.yaml [moved from kubernetes/pomba/charts/pomba-sdcctxbuilder/templates/configmap.yaml with 100% similarity]
kubernetes/pomba/components/pomba-sdcctxbuilder/templates/deployment.yaml [moved from kubernetes/pomba/charts/pomba-sdcctxbuilder/templates/deployment.yaml with 96% similarity]
kubernetes/pomba/components/pomba-sdcctxbuilder/templates/service.yaml [moved from kubernetes/pomba/charts/pomba-sdcctxbuilder/templates/service.yaml with 100% similarity]
kubernetes/pomba/components/pomba-sdcctxbuilder/values.yaml [moved from kubernetes/pomba/charts/pomba-sdcctxbuilder/values.yaml with 95% similarity]
kubernetes/pomba/components/pomba-sdncctxbuilder/.helmignore [moved from kubernetes/pomba/charts/pomba-sdncctxbuilder/.helmignore with 100% similarity]
kubernetes/pomba/components/pomba-sdncctxbuilder/Chart.yaml [moved from kubernetes/pomba/charts/pomba-sdncctxbuilder/Chart.yaml with 100% similarity]
kubernetes/pomba/components/pomba-sdncctxbuilder/requirements.yaml [new file with mode: 0644]
kubernetes/pomba/components/pomba-sdncctxbuilder/resources/config/application.properties [moved from kubernetes/pomba/charts/pomba-sdncctxbuilder/resources/config/application.properties with 100% similarity]
kubernetes/pomba/components/pomba-sdncctxbuilder/resources/config/logback.xml [moved from kubernetes/pomba/charts/pomba-sdncctxbuilder/resources/config/logback.xml with 100% similarity]
kubernetes/pomba/components/pomba-sdncctxbuilder/templates/configmap.yaml [moved from kubernetes/pomba/charts/pomba-sdncctxbuilder/templates/configmap.yaml with 100% similarity]
kubernetes/pomba/components/pomba-sdncctxbuilder/templates/deployment.yaml [moved from kubernetes/pomba/charts/pomba-sdncctxbuilder/templates/deployment.yaml with 96% similarity]
kubernetes/pomba/components/pomba-sdncctxbuilder/templates/service.yaml [moved from kubernetes/pomba/charts/pomba-sdncctxbuilder/templates/service.yaml with 100% similarity]
kubernetes/pomba/components/pomba-sdncctxbuilder/values.yaml [moved from kubernetes/pomba/charts/pomba-sdncctxbuilder/values.yaml with 97% similarity]
kubernetes/pomba/components/pomba-search-data/.helmignore [moved from kubernetes/pomba/charts/pomba-search-data/.helmignore with 100% similarity]
kubernetes/pomba/components/pomba-search-data/Chart.yaml [moved from kubernetes/pomba/charts/pomba-search-data/Chart.yaml with 100% similarity]
kubernetes/pomba/components/pomba-search-data/requirements.yaml [new file with mode: 0644]
kubernetes/pomba/components/pomba-search-data/resources/config/analysis-config.json [moved from kubernetes/pomba/charts/pomba-search-data/resources/config/analysis-config.json with 100% similarity]
kubernetes/pomba/components/pomba-search-data/resources/config/auth/search_policy.json [moved from kubernetes/pomba/charts/pomba-search-data/resources/config/auth/search_policy.json with 100% similarity]
kubernetes/pomba/components/pomba-search-data/resources/config/auth/tomcat_keystore [moved from kubernetes/pomba/charts/pomba-search-data/resources/config/auth/tomcat_keystore with 100% similarity]
kubernetes/pomba/components/pomba-search-data/resources/config/dynamic-custom-template.json [moved from kubernetes/pomba/charts/pomba-search-data/resources/config/dynamic-custom-template.json with 100% similarity]
kubernetes/pomba/components/pomba-search-data/resources/config/elastic-search.properties [moved from kubernetes/pomba/charts/pomba-search-data/resources/config/elastic-search.properties with 100% similarity]
kubernetes/pomba/components/pomba-search-data/resources/config/es-payload-translation.json [moved from kubernetes/pomba/charts/pomba-search-data/resources/config/es-payload-translation.json with 100% similarity]
kubernetes/pomba/components/pomba-search-data/resources/config/filter-config.json [moved from kubernetes/pomba/charts/pomba-search-data/resources/config/filter-config.json with 100% similarity]
kubernetes/pomba/components/pomba-search-data/resources/config/log/logback.xml [moved from kubernetes/pomba/charts/pomba-search-data/resources/config/log/logback.xml with 100% similarity]
kubernetes/pomba/components/pomba-search-data/templates/configmap.yaml [moved from kubernetes/pomba/charts/pomba-search-data/templates/configmap.yaml with 100% similarity]
kubernetes/pomba/components/pomba-search-data/templates/deployment.yaml [moved from kubernetes/pomba/charts/pomba-search-data/templates/deployment.yaml with 96% similarity]
kubernetes/pomba/components/pomba-search-data/templates/secret.yaml [moved from kubernetes/pomba/charts/pomba-search-data/templates/secret.yaml with 100% similarity]
kubernetes/pomba/components/pomba-search-data/templates/service.yaml [moved from kubernetes/pomba/charts/pomba-search-data/templates/service.yaml with 100% similarity]
kubernetes/pomba/components/pomba-search-data/values.yaml [moved from kubernetes/pomba/charts/pomba-search-data/values.yaml with 94% similarity]
kubernetes/pomba/components/pomba-servicedecomposition/Chart.yaml [moved from kubernetes/pomba/charts/pomba-servicedecomposition/Chart.yaml with 100% similarity]
kubernetes/pomba/components/pomba-servicedecomposition/requirements.yaml [new file with mode: 0644]
kubernetes/pomba/components/pomba-servicedecomposition/resources/config/application.properties [moved from kubernetes/pomba/charts/pomba-servicedecomposition/resources/config/application.properties with 100% similarity]
kubernetes/pomba/components/pomba-servicedecomposition/resources/config/log/logback.xml [moved from kubernetes/pomba/charts/pomba-servicedecomposition/resources/config/log/logback.xml with 100% similarity]
kubernetes/pomba/components/pomba-servicedecomposition/templates/configmap.yaml [moved from kubernetes/pomba/charts/pomba-servicedecomposition/templates/configmap.yaml with 100% similarity]
kubernetes/pomba/components/pomba-servicedecomposition/templates/deployment.yaml [moved from kubernetes/pomba/charts/pomba-servicedecomposition/templates/deployment.yaml with 96% similarity]
kubernetes/pomba/components/pomba-servicedecomposition/templates/service.yaml [moved from kubernetes/pomba/charts/pomba-servicedecomposition/templates/service.yaml with 100% similarity]
kubernetes/pomba/components/pomba-servicedecomposition/values.yaml [moved from kubernetes/pomba/charts/pomba-servicedecomposition/values.yaml with 97% similarity]
kubernetes/pomba/components/pomba-validation-service/Chart.yaml [moved from kubernetes/pomba/charts/pomba-validation-service/Chart.yaml with 100% similarity]
kubernetes/pomba/components/pomba-validation-service/requirements.yaml [new file with mode: 0644]
kubernetes/pomba/components/pomba-validation-service/resources/appconfig/README.txt [moved from kubernetes/pomba/charts/pomba-validation-service/resources/appconfig/README.txt with 100% similarity]
kubernetes/pomba/components/pomba-validation-service/resources/appconfig/aai-environment.properties [moved from kubernetes/pomba/charts/pomba-validation-service/resources/appconfig/aai-environment.properties with 100% similarity]
kubernetes/pomba/components/pomba-validation-service/resources/appconfig/auth/client-cert-onap.p12 [moved from kubernetes/pomba/charts/pomba-validation-service/resources/appconfig/auth/client-cert-onap.p12 with 100% similarity]
kubernetes/pomba/components/pomba-validation-service/resources/appconfig/auth/tomcat_keystore [moved from kubernetes/pomba/charts/pomba-validation-service/resources/appconfig/auth/tomcat_keystore with 100% similarity]
kubernetes/pomba/components/pomba-validation-service/resources/appconfig/auth_policy.json [moved from kubernetes/pomba/charts/pomba-validation-service/resources/appconfig/auth_policy.json with 100% similarity]
kubernetes/pomba/components/pomba-validation-service/resources/appconfig/rule-data-dictionary.properties [moved from kubernetes/pomba/charts/pomba-validation-service/resources/appconfig/rule-data-dictionary.properties with 100% similarity]
kubernetes/pomba/components/pomba-validation-service/resources/appconfig/rule-indexing.properties [moved from kubernetes/pomba/charts/pomba-validation-service/resources/appconfig/rule-indexing.properties with 100% similarity]
kubernetes/pomba/components/pomba-validation-service/resources/appconfig/schemaIngest.properties [moved from kubernetes/pomba/charts/pomba-validation-service/resources/appconfig/schemaIngest.properties with 100% similarity]
kubernetes/pomba/components/pomba-validation-service/resources/appconfig/topics/topic-poa-audit-result.properties [moved from kubernetes/pomba/charts/pomba-validation-service/resources/appconfig/topics/topic-poa-audit-result.properties with 100% similarity]
kubernetes/pomba/components/pomba-validation-service/resources/appconfig/topics/topic-poa-rule-validation.properties [moved from kubernetes/pomba/charts/pomba-validation-service/resources/appconfig/topics/topic-poa-rule-validation.properties with 100% similarity]
kubernetes/pomba/components/pomba-validation-service/resources/appconfig/validation-service-auth.properties [moved from kubernetes/pomba/charts/pomba-validation-service/resources/appconfig/validation-service-auth.properties with 100% similarity]
kubernetes/pomba/components/pomba-validation-service/resources/appconfig/validation-service.properties [moved from kubernetes/pomba/charts/pomba-validation-service/resources/appconfig/validation-service.properties with 100% similarity]
kubernetes/pomba/components/pomba-validation-service/resources/application.properties [moved from kubernetes/pomba/charts/pomba-validation-service/resources/application.properties with 100% similarity]
kubernetes/pomba/components/pomba-validation-service/resources/bundleconfig/etc/rules/poa-event/default-rules.groovy [moved from kubernetes/pomba/charts/pomba-validation-service/resources/bundleconfig/etc/rules/poa-event/default-rules.groovy with 100% similarity]
kubernetes/pomba/components/pomba-validation-service/templates/configmap.yaml [moved from kubernetes/pomba/charts/pomba-validation-service/templates/configmap.yaml with 100% similarity]
kubernetes/pomba/components/pomba-validation-service/templates/deployment.yaml [moved from kubernetes/pomba/charts/pomba-validation-service/templates/deployment.yaml with 97% similarity]
kubernetes/pomba/components/pomba-validation-service/templates/secrets.yaml [moved from kubernetes/pomba/charts/pomba-validation-service/templates/secrets.yaml with 100% similarity]
kubernetes/pomba/components/pomba-validation-service/templates/service.yaml [moved from kubernetes/pomba/charts/pomba-validation-service/templates/service.yaml with 100% similarity]
kubernetes/pomba/components/pomba-validation-service/values.yaml [moved from kubernetes/pomba/charts/pomba-validation-service/values.yaml with 94% similarity]
kubernetes/pomba/requirements.yaml
kubernetes/pomba/values.yaml

diff --git a/kubernetes/pomba/Makefile b/kubernetes/pomba/Makefile
new file mode 100644 (file)
index 0000000..4c79718
--- /dev/null
@@ -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 (file)
index e4c7240..0000000
+++ /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 (file)
index 6a61926..0000000
+++ /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 (file)
index e10a513..0000000
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright © 2018 Amdocs\r
-#\r
-# Licensed under the Apache License, Version 2.0 (the "License");\r
-# you may not use this file except in compliance with the License.\r
-# You may obtain a copy of the License at\r
-#\r
-#       http://www.apache.org/licenses/LICENSE-2.0\r
-#\r
-# Unless required by applicable law or agreed to in writing, software\r
-# distributed under the License is distributed on an "AS IS" BASIS,\r
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\r
-# See the License for the specific language governing permissions and\r
-# limitations under the License.\r
-\r
-dependencies:\r
-  - name: common\r
-    version: ~6.x-0\r
-    repository: '@local'\r
diff --git a/kubernetes/pomba/charts/pomba-networkdiscoveryctxbuilder/requirements.yaml b/kubernetes/pomba/charts/pomba-networkdiscoveryctxbuilder/requirements.yaml
deleted file mode 100644 (file)
index e4c7240..0000000
+++ /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 (file)
index e4c7240..0000000
+++ /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 (file)
index 0b858a9..0000000
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright � 2018 Amdocs\r
-#\r
-# Licensed under the Apache License, Version 2.0 (the "License");\r
-# you may not use this file except in compliance with the License.\r
-# You may obtain a copy of the License at\r
-#\r
-#       http://www.apache.org/licenses/LICENSE-2.0\r
-#\r
-# Unless required by applicable law or agreed to in writing, software\r
-# distributed under the License is distributed on an "AS IS" BASIS,\r
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\r
-# See the License for the specific language governing permissions and\r
-# limitations under the License.\r
-\r
-dependencies:\r
-  - name: common\r
-    version: ~6.x-0\r
-    repository: '@local'\r
diff --git a/kubernetes/pomba/components/Makefile b/kubernetes/pomba/components/Makefile
new file mode 100644 (file)
index 0000000..bf267b7
--- /dev/null
@@ -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)
+%:
+       @:
@@ -16,3 +16,6 @@ dependencies:
   - name: common
     version: ~6.x-0
     repository: '@local'
+  - name: repositoryGenerator
+    version: ~6.x-0
+    repository: '@local'
@@ -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
@@ -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
 
@@ -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'
@@ -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
@@ -17,8 +17,6 @@
 #################################################################
 global:
   nodePortPrefix: 302
-  repository: nexus3.onap.org:10001
-  readinessImage: onap/oom/readiness:3.0.1
 
 #################################################################
 # Application configuration defaults.
old mode 100755 (executable)
new mode 100644 (file)
similarity index 86%
rename from kubernetes/pomba/charts/pomba-contextaggregator/requirements.yaml
rename to kubernetes/pomba/components/pomba-data-router/requirements.yaml
index 6a61926..fbe5155
@@ -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'
@@ -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
 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
@@ -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'
@@ -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 }}
@@ -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/components/pomba-kibana/requirements.yaml b/kubernetes/pomba/components/pomba-kibana/requirements.yaml
new file mode 100644 (file)
index 0000000..fbe5155
--- /dev/null
@@ -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'
@@ -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"]
 #################################################################
 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/components/pomba-networkdiscovery/requirements.yaml b/kubernetes/pomba/components/pomba-networkdiscovery/requirements.yaml
new file mode 100644 (file)
index 0000000..fbe5155
--- /dev/null
@@ -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'
@@ -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
 #################################################################
 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/components/pomba-networkdiscoveryctxbuilder/requirements.yaml b/kubernetes/pomba/components/pomba-networkdiscoveryctxbuilder/requirements.yaml
new file mode 100644 (file)
index 0000000..fbe5155
--- /dev/null
@@ -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'
@@ -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
 #################################################################
 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/components/pomba-sdcctxbuilder/requirements.yaml b/kubernetes/pomba/components/pomba-sdcctxbuilder/requirements.yaml
new file mode 100644 (file)
index 0000000..fbe5155
--- /dev/null
@@ -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'
@@ -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
 #################################################################
 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/components/pomba-sdncctxbuilder/requirements.yaml b/kubernetes/pomba/components/pomba-sdncctxbuilder/requirements.yaml
new file mode 100644 (file)
index 0000000..fbe5155
--- /dev/null
@@ -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'
@@ -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
 #################################################################
 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/components/pomba-search-data/requirements.yaml b/kubernetes/pomba/components/pomba-search-data/requirements.yaml
new file mode 100644 (file)
index 0000000..fbe5155
--- /dev/null
@@ -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'
@@ -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
@@ -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/components/pomba-servicedecomposition/requirements.yaml b/kubernetes/pomba/components/pomba-servicedecomposition/requirements.yaml
new file mode 100644 (file)
index 0000000..fbe5155
--- /dev/null
@@ -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'
@@ -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
 #################################################################
 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/components/pomba-validation-service/requirements.yaml b/kubernetes/pomba/components/pomba-validation-service/requirements.yaml
new file mode 100644 (file)
index 0000000..fbe5155
--- /dev/null
@@ -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'
@@ -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
 #################################################################
 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
index 9bf26c8..69d5a45 100644 (file)
@@ -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
index 3818074..28025eb 100644 (file)
 #################################################################
 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