aboutsummaryrefslogtreecommitdiffstats
path: root/kubernetes
diff options
context:
space:
mode:
authorKrzysztof Opasiak <k.opasiak@samsung.com>2020-11-26 09:58:16 +0000
committerGerrit Code Review <gerrit@onap.org>2020-11-26 09:58:16 +0000
commitee07bc6c45cb623c8302d1374ca2a4648452a05b (patch)
treec4b26b809174af38d166a619a7b08c84c9fc965d /kubernetes
parentc95cb6667263e48daed36613565fb6466bce0553 (diff)
parent93ed075394f96106433fec580fabb6a066ed10dd (diff)
Merge "[POMBA] Uses new tpls for repos / images"
Diffstat (limited to 'kubernetes')
-rw-r--r--kubernetes/pomba/Makefile51
-rw-r--r--kubernetes/pomba/charts/pomba-aaictxbuilder/requirements.yaml18
-rw-r--r--kubernetes/pomba/charts/pomba-networkdiscovery/requirements.yaml18
-rw-r--r--kubernetes/pomba/charts/pomba-networkdiscoveryctxbuilder/requirements.yaml18
-rw-r--r--kubernetes/pomba/charts/pomba-sdcctxbuilder/requirements.yaml18
-rw-r--r--kubernetes/pomba/charts/pomba-sdncctxbuilder/requirements.yaml18
-rw-r--r--kubernetes/pomba/charts/pomba-servicedecomposition/requirements.yaml18
-rw-r--r--kubernetes/pomba/components/Makefile51
-rw-r--r--kubernetes/pomba/components/pomba-aaictxbuilder/Chart.yaml (renamed from kubernetes/pomba/charts/pomba-aaictxbuilder/Chart.yaml)0
-rw-r--r--kubernetes/pomba/components/pomba-aaictxbuilder/requirements.yaml (renamed from kubernetes/pomba/charts/pomba-validation-service/requirements.yaml)3
-rw-r--r--kubernetes/pomba/components/pomba-aaictxbuilder/resources/config/application.properties (renamed from kubernetes/pomba/charts/pomba-aaictxbuilder/resources/config/application.properties)0
-rw-r--r--kubernetes/pomba/components/pomba-aaictxbuilder/resources/config/logback.xml (renamed from kubernetes/pomba/charts/pomba-aaictxbuilder/resources/config/logback.xml)0
-rw-r--r--kubernetes/pomba/components/pomba-aaictxbuilder/templates/configmap.yaml (renamed from kubernetes/pomba/charts/pomba-aaictxbuilder/templates/configmap.yaml)0
-rw-r--r--kubernetes/pomba/components/pomba-aaictxbuilder/templates/deployment.yaml (renamed from kubernetes/pomba/charts/pomba-aaictxbuilder/templates/deployment.yaml)4
-rw-r--r--kubernetes/pomba/components/pomba-aaictxbuilder/templates/service.yaml (renamed from kubernetes/pomba/charts/pomba-aaictxbuilder/templates/service.yaml)0
-rw-r--r--kubernetes/pomba/components/pomba-aaictxbuilder/values.yaml (renamed from kubernetes/pomba/charts/pomba-aaictxbuilder/values.yaml)4
-rwxr-xr-xkubernetes/pomba/components/pomba-contextaggregator/.helmignore (renamed from kubernetes/pomba/charts/pomba-contextaggregator/.helmignore)0
-rw-r--r--kubernetes/pomba/components/pomba-contextaggregator/Chart.yaml (renamed from kubernetes/pomba/charts/pomba-contextaggregator/Chart.yaml)0
-rw-r--r--kubernetes/pomba/components/pomba-contextaggregator/requirements.yaml (renamed from kubernetes/pomba/charts/pomba-elasticsearch/requirements.yaml)5
-rwxr-xr-xkubernetes/pomba/components/pomba-contextaggregator/resources/config/application.properties (renamed from kubernetes/pomba/charts/pomba-contextaggregator/resources/config/application.properties)0
-rwxr-xr-xkubernetes/pomba/components/pomba-contextaggregator/resources/config/builders/aai.properties (renamed from kubernetes/pomba/charts/pomba-contextaggregator/resources/config/builders/aai.properties)0
-rw-r--r--kubernetes/pomba/components/pomba-contextaggregator/resources/config/builders/ndcb.properties (renamed from kubernetes/pomba/charts/pomba-contextaggregator/resources/config/builders/ndcb.properties)0
-rwxr-xr-xkubernetes/pomba/components/pomba-contextaggregator/resources/config/builders/sdc.properties (renamed from kubernetes/pomba/charts/pomba-contextaggregator/resources/config/builders/sdc.properties)0
-rw-r--r--kubernetes/pomba/components/pomba-contextaggregator/resources/config/builders/sdnc.properties (renamed from kubernetes/pomba/charts/pomba-contextaggregator/resources/config/builders/sdnc.properties)0
-rw-r--r--kubernetes/pomba/components/pomba-contextaggregator/resources/config/logback.xml (renamed from kubernetes/pomba/charts/pomba-contextaggregator/resources/config/logback.xml)0
-rwxr-xr-xkubernetes/pomba/components/pomba-contextaggregator/templates/configmap.yaml (renamed from kubernetes/pomba/charts/pomba-contextaggregator/templates/configmap.yaml)0
-rwxr-xr-xkubernetes/pomba/components/pomba-contextaggregator/templates/deployment.yaml (renamed from kubernetes/pomba/charts/pomba-contextaggregator/templates/deployment.yaml)6
-rw-r--r--kubernetes/pomba/components/pomba-contextaggregator/templates/service.yaml (renamed from kubernetes/pomba/charts/pomba-contextaggregator/templates/service.yaml)0
-rwxr-xr-xkubernetes/pomba/components/pomba-contextaggregator/values.yaml (renamed from kubernetes/pomba/charts/pomba-contextaggregator/values.yaml)2
-rw-r--r--kubernetes/pomba/components/pomba-data-router/.helmignore (renamed from kubernetes/pomba/charts/pomba-data-router/.helmignore)0
-rw-r--r--kubernetes/pomba/components/pomba-data-router/Chart.yaml (renamed from kubernetes/pomba/charts/pomba-data-router/Chart.yaml)0
-rw-r--r--kubernetes/pomba/components/pomba-data-router/requirements.yaml (renamed from kubernetes/pomba/charts/pomba-kibana/requirements.yaml)5
-rw-r--r--kubernetes/pomba/components/pomba-data-router/resources/config/auth/client-cert-onap.p12 (renamed from kubernetes/pomba/charts/pomba-data-router/resources/config/auth/client-cert-onap.p12)bin2556 -> 2556 bytes
-rw-r--r--kubernetes/pomba/components/pomba-data-router/resources/config/auth/data-router_policy.json (renamed from kubernetes/pomba/charts/pomba-data-router/resources/config/auth/data-router_policy.json)0
-rw-r--r--kubernetes/pomba/components/pomba-data-router/resources/config/auth/tomcat_keystore (renamed from kubernetes/pomba/charts/pomba-data-router/resources/config/auth/tomcat_keystore)bin2214 -> 2214 bytes
-rw-r--r--kubernetes/pomba/components/pomba-data-router/resources/config/data-router.properties (renamed from kubernetes/pomba/charts/pomba-data-router/resources/config/data-router.properties)0
-rw-r--r--kubernetes/pomba/components/pomba-data-router/resources/config/schemaIngest.properties (renamed from kubernetes/pomba/charts/pomba-data-router/resources/config/schemaIngest.properties)0
-rw-r--r--kubernetes/pomba/components/pomba-data-router/resources/dynamic/conf/audit-bean.xml (renamed from kubernetes/pomba/charts/pomba-data-router/resources/dynamic/conf/audit-bean.xml)0
-rw-r--r--kubernetes/pomba/components/pomba-data-router/resources/dynamic/conf/poa-validation-bean.xml (renamed from kubernetes/pomba/charts/pomba-data-router/resources/dynamic/conf/poa-validation-bean.xml)0
-rw-r--r--kubernetes/pomba/components/pomba-data-router/resources/dynamic/routes/audit.route (renamed from kubernetes/pomba/charts/pomba-data-router/resources/dynamic/routes/audit.route)0
-rw-r--r--kubernetes/pomba/components/pomba-data-router/resources/dynamic/routes/poaValidation.route (renamed from kubernetes/pomba/charts/pomba-data-router/resources/dynamic/routes/poaValidation.route)0
-rw-r--r--kubernetes/pomba/components/pomba-data-router/templates/configmap.yaml (renamed from kubernetes/pomba/charts/pomba-data-router/templates/configmap.yaml)0
-rw-r--r--kubernetes/pomba/components/pomba-data-router/templates/deployment.yaml (renamed from kubernetes/pomba/charts/pomba-data-router/templates/deployment.yaml)8
-rw-r--r--kubernetes/pomba/components/pomba-data-router/templates/ingress.yaml (renamed from kubernetes/pomba/charts/pomba-data-router/templates/ingress.yaml)0
-rw-r--r--kubernetes/pomba/components/pomba-data-router/templates/pv.yaml (renamed from kubernetes/pomba/charts/pomba-data-router/templates/pv.yaml)0
-rw-r--r--kubernetes/pomba/components/pomba-data-router/templates/pvc.yaml (renamed from kubernetes/pomba/charts/pomba-data-router/templates/pvc.yaml)0
-rw-r--r--kubernetes/pomba/components/pomba-data-router/templates/secret.yaml (renamed from kubernetes/pomba/charts/pomba-data-router/templates/secret.yaml)0
-rw-r--r--kubernetes/pomba/components/pomba-data-router/templates/service.yaml (renamed from kubernetes/pomba/charts/pomba-data-router/templates/service.yaml)0
-rw-r--r--kubernetes/pomba/components/pomba-data-router/values.yaml (renamed from kubernetes/pomba/charts/pomba-data-router/values.yaml)2
-rw-r--r--kubernetes/pomba/components/pomba-elasticsearch/Chart.yaml (renamed from kubernetes/pomba/charts/pomba-elasticsearch/Chart.yaml)0
-rw-r--r--[-rwxr-xr-x]kubernetes/pomba/components/pomba-elasticsearch/requirements.yaml (renamed from kubernetes/pomba/charts/pomba-contextaggregator/requirements.yaml)5
-rw-r--r--kubernetes/pomba/components/pomba-elasticsearch/resources/config/elasticsearch.yml (renamed from kubernetes/pomba/charts/pomba-elasticsearch/resources/config/elasticsearch.yml)0
-rw-r--r--kubernetes/pomba/components/pomba-elasticsearch/templates/configmap.yaml (renamed from kubernetes/pomba/charts/pomba-elasticsearch/templates/configmap.yaml)0
-rw-r--r--kubernetes/pomba/components/pomba-elasticsearch/templates/deployment.yaml (renamed from kubernetes/pomba/charts/pomba-elasticsearch/templates/deployment.yaml)4
-rw-r--r--kubernetes/pomba/components/pomba-elasticsearch/templates/pv-data.yaml (renamed from kubernetes/pomba/charts/pomba-elasticsearch/templates/pv-data.yaml)0
-rw-r--r--kubernetes/pomba/components/pomba-elasticsearch/templates/pv-logs.yaml (renamed from kubernetes/pomba/charts/pomba-elasticsearch/templates/pv-logs.yaml)0
-rw-r--r--kubernetes/pomba/components/pomba-elasticsearch/templates/pvc-data.yaml (renamed from kubernetes/pomba/charts/pomba-elasticsearch/templates/pvc-data.yaml)0
-rw-r--r--kubernetes/pomba/components/pomba-elasticsearch/templates/pvc-logs.yaml (renamed from kubernetes/pomba/charts/pomba-elasticsearch/templates/pvc-logs.yaml)0
-rw-r--r--kubernetes/pomba/components/pomba-elasticsearch/templates/service.yaml (renamed from kubernetes/pomba/charts/pomba-elasticsearch/templates/service.yaml)0
-rw-r--r--kubernetes/pomba/components/pomba-elasticsearch/values.yaml (renamed from kubernetes/pomba/charts/pomba-elasticsearch/values.yaml)5
-rw-r--r--kubernetes/pomba/components/pomba-kibana/Chart.yaml (renamed from kubernetes/pomba/charts/pomba-kibana/Chart.yaml)0
-rw-r--r--kubernetes/pomba/components/pomba-kibana/requirements.yaml21
-rw-r--r--kubernetes/pomba/components/pomba-kibana/resources/auth/pomba.crt.pem (renamed from kubernetes/pomba/charts/pomba-kibana/resources/auth/pomba.crt.pem)0
-rw-r--r--kubernetes/pomba/components/pomba-kibana/resources/auth/pomba.key.pem (renamed from kubernetes/pomba/charts/pomba-kibana/resources/auth/pomba.key.pem)0
-rw-r--r--kubernetes/pomba/components/pomba-kibana/resources/bin/kibana_start.sh (renamed from kubernetes/pomba/charts/pomba-kibana/resources/bin/kibana_start.sh)0
-rw-r--r--kubernetes/pomba/components/pomba-kibana/resources/config/default-mapping.json (renamed from kubernetes/pomba/charts/pomba-kibana/resources/config/default-mapping.json)0
-rw-r--r--kubernetes/pomba/components/pomba-kibana/resources/config/default.json (renamed from kubernetes/pomba/charts/pomba-kibana/resources/config/default.json)0
-rw-r--r--kubernetes/pomba/components/pomba-kibana/resources/config/kibana.yml (renamed from kubernetes/pomba/charts/pomba-kibana/resources/config/kibana.yml)0
-rw-r--r--kubernetes/pomba/components/pomba-kibana/templates/configmap.yaml (renamed from kubernetes/pomba/charts/pomba-kibana/templates/configmap.yaml)0
-rw-r--r--kubernetes/pomba/components/pomba-kibana/templates/deployment.yaml (renamed from kubernetes/pomba/charts/pomba-kibana/templates/deployment.yaml)8
-rw-r--r--kubernetes/pomba/components/pomba-kibana/templates/ingress.yaml (renamed from kubernetes/pomba/charts/pomba-kibana/templates/ingress.yaml)0
-rw-r--r--kubernetes/pomba/components/pomba-kibana/templates/service.yaml (renamed from kubernetes/pomba/charts/pomba-kibana/templates/service.yaml)0
-rw-r--r--kubernetes/pomba/components/pomba-kibana/values.yaml (renamed from kubernetes/pomba/charts/pomba-kibana/values.yaml)7
-rw-r--r--kubernetes/pomba/components/pomba-networkdiscovery/Chart.yaml (renamed from kubernetes/pomba/charts/pomba-networkdiscovery/Chart.yaml)0
-rw-r--r--kubernetes/pomba/components/pomba-networkdiscovery/requirements.yaml21
-rw-r--r--kubernetes/pomba/components/pomba-networkdiscovery/resources/config/application.properties (renamed from kubernetes/pomba/charts/pomba-networkdiscovery/resources/config/application.properties)0
-rw-r--r--kubernetes/pomba/components/pomba-networkdiscovery/resources/config/auth/client-cert-onap.p12 (renamed from kubernetes/pomba/charts/pomba-networkdiscovery/resources/config/auth/client-cert-onap.p12)bin2556 -> 2556 bytes
-rw-r--r--kubernetes/pomba/components/pomba-networkdiscovery/resources/config/auth/tomcat_keystore (renamed from kubernetes/pomba/charts/pomba-networkdiscovery/resources/config/auth/tomcat_keystore)bin2214 -> 2214 bytes
-rw-r--r--kubernetes/pomba/components/pomba-networkdiscovery/resources/config/logback.xml (renamed from kubernetes/pomba/charts/pomba-networkdiscovery/resources/config/logback.xml)0
-rw-r--r--kubernetes/pomba/components/pomba-networkdiscovery/templates/configmap.yaml (renamed from kubernetes/pomba/charts/pomba-networkdiscovery/templates/configmap.yaml)0
-rw-r--r--kubernetes/pomba/components/pomba-networkdiscovery/templates/deployment.yaml (renamed from kubernetes/pomba/charts/pomba-networkdiscovery/templates/deployment.yaml)4
-rw-r--r--kubernetes/pomba/components/pomba-networkdiscovery/templates/ingress.yaml (renamed from kubernetes/pomba/charts/pomba-networkdiscovery/templates/ingress.yaml)0
-rw-r--r--kubernetes/pomba/components/pomba-networkdiscovery/templates/secrets.yaml (renamed from kubernetes/pomba/charts/pomba-networkdiscovery/templates/secrets.yaml)0
-rw-r--r--kubernetes/pomba/components/pomba-networkdiscovery/templates/service.yaml (renamed from kubernetes/pomba/charts/pomba-networkdiscovery/templates/service.yaml)0
-rw-r--r--kubernetes/pomba/components/pomba-networkdiscovery/values.yaml (renamed from kubernetes/pomba/charts/pomba-networkdiscovery/values.yaml)6
-rw-r--r--kubernetes/pomba/components/pomba-networkdiscoveryctxbuilder/Chart.yaml (renamed from kubernetes/pomba/charts/pomba-networkdiscoveryctxbuilder/Chart.yaml)0
-rw-r--r--kubernetes/pomba/components/pomba-networkdiscoveryctxbuilder/requirements.yaml21
-rw-r--r--kubernetes/pomba/components/pomba-networkdiscoveryctxbuilder/resources/config/application.properties (renamed from kubernetes/pomba/charts/pomba-networkdiscoveryctxbuilder/resources/config/application.properties)0
-rw-r--r--kubernetes/pomba/components/pomba-networkdiscoveryctxbuilder/resources/config/logback.xml (renamed from kubernetes/pomba/charts/pomba-networkdiscoveryctxbuilder/resources/config/logback.xml)0
-rw-r--r--kubernetes/pomba/components/pomba-networkdiscoveryctxbuilder/templates/configmap.yaml (renamed from kubernetes/pomba/charts/pomba-networkdiscoveryctxbuilder/templates/configmap.yaml)0
-rw-r--r--kubernetes/pomba/components/pomba-networkdiscoveryctxbuilder/templates/deployment.yaml (renamed from kubernetes/pomba/charts/pomba-networkdiscoveryctxbuilder/templates/deployment.yaml)4
-rw-r--r--kubernetes/pomba/components/pomba-networkdiscoveryctxbuilder/templates/service.yaml (renamed from kubernetes/pomba/charts/pomba-networkdiscoveryctxbuilder/templates/service.yaml)0
-rw-r--r--kubernetes/pomba/components/pomba-networkdiscoveryctxbuilder/values.yaml (renamed from kubernetes/pomba/charts/pomba-networkdiscoveryctxbuilder/values.yaml)2
-rw-r--r--kubernetes/pomba/components/pomba-sdcctxbuilder/.helmignore (renamed from kubernetes/pomba/charts/pomba-sdcctxbuilder/.helmignore)0
-rw-r--r--kubernetes/pomba/components/pomba-sdcctxbuilder/Chart.yaml (renamed from kubernetes/pomba/charts/pomba-sdcctxbuilder/Chart.yaml)0
-rw-r--r--kubernetes/pomba/components/pomba-sdcctxbuilder/requirements.yaml21
-rw-r--r--kubernetes/pomba/components/pomba-sdcctxbuilder/resources/config/README.txt (renamed from kubernetes/pomba/charts/pomba-sdcctxbuilder/resources/config/README.txt)0
-rw-r--r--kubernetes/pomba/components/pomba-sdcctxbuilder/resources/config/application.properties (renamed from kubernetes/pomba/charts/pomba-sdcctxbuilder/resources/config/application.properties)0
-rw-r--r--kubernetes/pomba/components/pomba-sdcctxbuilder/resources/config/logback.xml (renamed from kubernetes/pomba/charts/pomba-sdcctxbuilder/resources/config/logback.xml)0
-rw-r--r--kubernetes/pomba/components/pomba-sdcctxbuilder/templates/configmap.yaml (renamed from kubernetes/pomba/charts/pomba-sdcctxbuilder/templates/configmap.yaml)0
-rw-r--r--kubernetes/pomba/components/pomba-sdcctxbuilder/templates/deployment.yaml (renamed from kubernetes/pomba/charts/pomba-sdcctxbuilder/templates/deployment.yaml)4
-rw-r--r--kubernetes/pomba/components/pomba-sdcctxbuilder/templates/service.yaml (renamed from kubernetes/pomba/charts/pomba-sdcctxbuilder/templates/service.yaml)0
-rw-r--r--kubernetes/pomba/components/pomba-sdcctxbuilder/values.yaml (renamed from kubernetes/pomba/charts/pomba-sdcctxbuilder/values.yaml)4
-rw-r--r--kubernetes/pomba/components/pomba-sdncctxbuilder/.helmignore (renamed from kubernetes/pomba/charts/pomba-sdncctxbuilder/.helmignore)0
-rw-r--r--kubernetes/pomba/components/pomba-sdncctxbuilder/Chart.yaml (renamed from kubernetes/pomba/charts/pomba-sdncctxbuilder/Chart.yaml)0
-rw-r--r--kubernetes/pomba/components/pomba-sdncctxbuilder/requirements.yaml21
-rw-r--r--kubernetes/pomba/components/pomba-sdncctxbuilder/resources/config/application.properties (renamed from kubernetes/pomba/charts/pomba-sdncctxbuilder/resources/config/application.properties)0
-rw-r--r--kubernetes/pomba/components/pomba-sdncctxbuilder/resources/config/logback.xml (renamed from kubernetes/pomba/charts/pomba-sdncctxbuilder/resources/config/logback.xml)0
-rw-r--r--kubernetes/pomba/components/pomba-sdncctxbuilder/templates/configmap.yaml (renamed from kubernetes/pomba/charts/pomba-sdncctxbuilder/templates/configmap.yaml)0
-rw-r--r--kubernetes/pomba/components/pomba-sdncctxbuilder/templates/deployment.yaml (renamed from kubernetes/pomba/charts/pomba-sdncctxbuilder/templates/deployment.yaml)4
-rw-r--r--kubernetes/pomba/components/pomba-sdncctxbuilder/templates/service.yaml (renamed from kubernetes/pomba/charts/pomba-sdncctxbuilder/templates/service.yaml)0
-rw-r--r--kubernetes/pomba/components/pomba-sdncctxbuilder/values.yaml (renamed from kubernetes/pomba/charts/pomba-sdncctxbuilder/values.yaml)2
-rw-r--r--kubernetes/pomba/components/pomba-search-data/.helmignore (renamed from kubernetes/pomba/charts/pomba-search-data/.helmignore)0
-rw-r--r--kubernetes/pomba/components/pomba-search-data/Chart.yaml (renamed from kubernetes/pomba/charts/pomba-search-data/Chart.yaml)0
-rw-r--r--kubernetes/pomba/components/pomba-search-data/requirements.yaml21
-rw-r--r--kubernetes/pomba/components/pomba-search-data/resources/config/analysis-config.json (renamed from kubernetes/pomba/charts/pomba-search-data/resources/config/analysis-config.json)0
-rw-r--r--kubernetes/pomba/components/pomba-search-data/resources/config/auth/search_policy.json (renamed from kubernetes/pomba/charts/pomba-search-data/resources/config/auth/search_policy.json)0
-rw-r--r--kubernetes/pomba/components/pomba-search-data/resources/config/auth/tomcat_keystore (renamed from kubernetes/pomba/charts/pomba-search-data/resources/config/auth/tomcat_keystore)bin2214 -> 2214 bytes
-rw-r--r--kubernetes/pomba/components/pomba-search-data/resources/config/dynamic-custom-template.json (renamed from kubernetes/pomba/charts/pomba-search-data/resources/config/dynamic-custom-template.json)0
-rw-r--r--kubernetes/pomba/components/pomba-search-data/resources/config/elastic-search.properties (renamed from kubernetes/pomba/charts/pomba-search-data/resources/config/elastic-search.properties)0
-rw-r--r--kubernetes/pomba/components/pomba-search-data/resources/config/es-payload-translation.json (renamed from kubernetes/pomba/charts/pomba-search-data/resources/config/es-payload-translation.json)0
-rw-r--r--kubernetes/pomba/components/pomba-search-data/resources/config/filter-config.json (renamed from kubernetes/pomba/charts/pomba-search-data/resources/config/filter-config.json)0
-rw-r--r--kubernetes/pomba/components/pomba-search-data/resources/config/log/logback.xml (renamed from kubernetes/pomba/charts/pomba-search-data/resources/config/log/logback.xml)0
-rw-r--r--kubernetes/pomba/components/pomba-search-data/templates/configmap.yaml (renamed from kubernetes/pomba/charts/pomba-search-data/templates/configmap.yaml)0
-rw-r--r--kubernetes/pomba/components/pomba-search-data/templates/deployment.yaml (renamed from kubernetes/pomba/charts/pomba-search-data/templates/deployment.yaml)6
-rw-r--r--kubernetes/pomba/components/pomba-search-data/templates/secret.yaml (renamed from kubernetes/pomba/charts/pomba-search-data/templates/secret.yaml)0
-rw-r--r--kubernetes/pomba/components/pomba-search-data/templates/service.yaml (renamed from kubernetes/pomba/charts/pomba-search-data/templates/service.yaml)0
-rw-r--r--kubernetes/pomba/components/pomba-search-data/values.yaml (renamed from kubernetes/pomba/charts/pomba-search-data/values.yaml)2
-rw-r--r--kubernetes/pomba/components/pomba-servicedecomposition/Chart.yaml (renamed from kubernetes/pomba/charts/pomba-servicedecomposition/Chart.yaml)0
-rw-r--r--kubernetes/pomba/components/pomba-servicedecomposition/requirements.yaml21
-rw-r--r--kubernetes/pomba/components/pomba-servicedecomposition/resources/config/application.properties (renamed from kubernetes/pomba/charts/pomba-servicedecomposition/resources/config/application.properties)0
-rw-r--r--kubernetes/pomba/components/pomba-servicedecomposition/resources/config/log/logback.xml (renamed from kubernetes/pomba/charts/pomba-servicedecomposition/resources/config/log/logback.xml)0
-rw-r--r--kubernetes/pomba/components/pomba-servicedecomposition/templates/configmap.yaml (renamed from kubernetes/pomba/charts/pomba-servicedecomposition/templates/configmap.yaml)0
-rw-r--r--kubernetes/pomba/components/pomba-servicedecomposition/templates/deployment.yaml (renamed from kubernetes/pomba/charts/pomba-servicedecomposition/templates/deployment.yaml)4
-rw-r--r--kubernetes/pomba/components/pomba-servicedecomposition/templates/service.yaml (renamed from kubernetes/pomba/charts/pomba-servicedecomposition/templates/service.yaml)0
-rw-r--r--kubernetes/pomba/components/pomba-servicedecomposition/values.yaml (renamed from kubernetes/pomba/charts/pomba-servicedecomposition/values.yaml)2
-rw-r--r--kubernetes/pomba/components/pomba-validation-service/Chart.yaml (renamed from kubernetes/pomba/charts/pomba-validation-service/Chart.yaml)0
-rw-r--r--kubernetes/pomba/components/pomba-validation-service/requirements.yaml21
-rw-r--r--kubernetes/pomba/components/pomba-validation-service/resources/appconfig/README.txt (renamed from kubernetes/pomba/charts/pomba-validation-service/resources/appconfig/README.txt)0
-rw-r--r--kubernetes/pomba/components/pomba-validation-service/resources/appconfig/aai-environment.properties (renamed from kubernetes/pomba/charts/pomba-validation-service/resources/appconfig/aai-environment.properties)0
-rw-r--r--kubernetes/pomba/components/pomba-validation-service/resources/appconfig/auth/client-cert-onap.p12 (renamed from kubernetes/pomba/charts/pomba-validation-service/resources/appconfig/auth/client-cert-onap.p12)bin2556 -> 2556 bytes
-rw-r--r--kubernetes/pomba/components/pomba-validation-service/resources/appconfig/auth/tomcat_keystore (renamed from kubernetes/pomba/charts/pomba-validation-service/resources/appconfig/auth/tomcat_keystore)bin2214 -> 2214 bytes
-rw-r--r--kubernetes/pomba/components/pomba-validation-service/resources/appconfig/auth_policy.json (renamed from kubernetes/pomba/charts/pomba-validation-service/resources/appconfig/auth_policy.json)0
-rw-r--r--kubernetes/pomba/components/pomba-validation-service/resources/appconfig/rule-data-dictionary.properties (renamed from kubernetes/pomba/charts/pomba-validation-service/resources/appconfig/rule-data-dictionary.properties)0
-rw-r--r--kubernetes/pomba/components/pomba-validation-service/resources/appconfig/rule-indexing.properties (renamed from kubernetes/pomba/charts/pomba-validation-service/resources/appconfig/rule-indexing.properties)0
-rw-r--r--kubernetes/pomba/components/pomba-validation-service/resources/appconfig/schemaIngest.properties (renamed from kubernetes/pomba/charts/pomba-validation-service/resources/appconfig/schemaIngest.properties)0
-rw-r--r--kubernetes/pomba/components/pomba-validation-service/resources/appconfig/topics/topic-poa-audit-result.properties (renamed from kubernetes/pomba/charts/pomba-validation-service/resources/appconfig/topics/topic-poa-audit-result.properties)0
-rw-r--r--kubernetes/pomba/components/pomba-validation-service/resources/appconfig/topics/topic-poa-rule-validation.properties (renamed from kubernetes/pomba/charts/pomba-validation-service/resources/appconfig/topics/topic-poa-rule-validation.properties)0
-rw-r--r--kubernetes/pomba/components/pomba-validation-service/resources/appconfig/validation-service-auth.properties (renamed from kubernetes/pomba/charts/pomba-validation-service/resources/appconfig/validation-service-auth.properties)0
-rw-r--r--kubernetes/pomba/components/pomba-validation-service/resources/appconfig/validation-service.properties (renamed from kubernetes/pomba/charts/pomba-validation-service/resources/appconfig/validation-service.properties)0
-rw-r--r--kubernetes/pomba/components/pomba-validation-service/resources/application.properties (renamed from kubernetes/pomba/charts/pomba-validation-service/resources/application.properties)0
-rw-r--r--kubernetes/pomba/components/pomba-validation-service/resources/bundleconfig/etc/rules/poa-event/default-rules.groovy (renamed from kubernetes/pomba/charts/pomba-validation-service/resources/bundleconfig/etc/rules/poa-event/default-rules.groovy)0
-rw-r--r--kubernetes/pomba/components/pomba-validation-service/templates/configmap.yaml (renamed from kubernetes/pomba/charts/pomba-validation-service/templates/configmap.yaml)0
-rw-r--r--kubernetes/pomba/components/pomba-validation-service/templates/deployment.yaml (renamed from kubernetes/pomba/charts/pomba-validation-service/templates/deployment.yaml)4
-rw-r--r--kubernetes/pomba/components/pomba-validation-service/templates/secrets.yaml (renamed from kubernetes/pomba/charts/pomba-validation-service/templates/secrets.yaml)0
-rw-r--r--kubernetes/pomba/components/pomba-validation-service/templates/service.yaml (renamed from kubernetes/pomba/charts/pomba-validation-service/templates/service.yaml)0
-rw-r--r--kubernetes/pomba/components/pomba-validation-service/values.yaml (renamed from kubernetes/pomba/charts/pomba-validation-service/values.yaml)5
-rw-r--r--kubernetes/pomba/requirements.yaml48
-rw-r--r--kubernetes/pomba/values.yaml5
159 files changed, 365 insertions, 187 deletions
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-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-sdcctxbuilder/requirements.yaml b/kubernetes/pomba/charts/pomba-sdcctxbuilder/requirements.yaml
deleted file mode 100644
index 6a61926e9e..0000000000
--- a/kubernetes/pomba/charts/pomba-sdcctxbuilder/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-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
index 92f1596141..92f1596141 100644
--- a/kubernetes/pomba/charts/pomba-aaictxbuilder/Chart.yaml
+++ b/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
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
index fb27d9ce80..fb27d9ce80 100644
--- a/kubernetes/pomba/charts/pomba-aaictxbuilder/resources/config/application.properties
+++ b/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
index 0a4b616453..0a4b616453 100644
--- a/kubernetes/pomba/charts/pomba-aaictxbuilder/resources/config/logback.xml
+++ b/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
index d0e26326ce..d0e26326ce 100644
--- a/kubernetes/pomba/charts/pomba-aaictxbuilder/templates/configmap.yaml
+++ b/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
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
index 2ebd6758a0..2ebd6758a0 100644
--- a/kubernetes/pomba/charts/pomba-aaictxbuilder/templates/service.yaml
+++ b/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
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
index f0c1319444..f0c1319444 100755
--- a/kubernetes/pomba/charts/pomba-contextaggregator/.helmignore
+++ b/kubernetes/pomba/components/pomba-contextaggregator/.helmignore
diff --git a/kubernetes/pomba/charts/pomba-contextaggregator/Chart.yaml b/kubernetes/pomba/components/pomba-contextaggregator/Chart.yaml
index 10dfcd743a..10dfcd743a 100644
--- a/kubernetes/pomba/charts/pomba-contextaggregator/Chart.yaml
+++ b/kubernetes/pomba/components/pomba-contextaggregator/Chart.yaml
diff --git a/kubernetes/pomba/charts/pomba-elasticsearch/requirements.yaml b/kubernetes/pomba/components/pomba-contextaggregator/requirements.yaml
index 6a61926e9e..fbe51550f0 100644
--- a/kubernetes/pomba/charts/pomba-elasticsearch/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
index cddeeb3128..cddeeb3128 100755
--- a/kubernetes/pomba/charts/pomba-contextaggregator/resources/config/application.properties
+++ b/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
index a7dfa1adb8..a7dfa1adb8 100755
--- a/kubernetes/pomba/charts/pomba-contextaggregator/resources/config/builders/aai.properties
+++ b/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
index c8daafc6e8..c8daafc6e8 100644
--- a/kubernetes/pomba/charts/pomba-contextaggregator/resources/config/builders/ndcb.properties
+++ b/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
index 7cf98b1ddd..7cf98b1ddd 100755
--- a/kubernetes/pomba/charts/pomba-contextaggregator/resources/config/builders/sdc.properties
+++ b/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
index 85c213e966..85c213e966 100644
--- a/kubernetes/pomba/charts/pomba-contextaggregator/resources/config/builders/sdnc.properties
+++ b/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
index 0a4b616453..0a4b616453 100644
--- a/kubernetes/pomba/charts/pomba-contextaggregator/resources/config/logback.xml
+++ b/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
index 0af3832c49..0af3832c49 100755
--- a/kubernetes/pomba/charts/pomba-contextaggregator/templates/configmap.yaml
+++ b/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
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
index 2ebd6758a0..2ebd6758a0 100644
--- a/kubernetes/pomba/charts/pomba-contextaggregator/templates/service.yaml
+++ b/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
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
index f0c1319444..f0c1319444 100644
--- a/kubernetes/pomba/charts/pomba-data-router/.helmignore
+++ b/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
index ce2fbacfa6..ce2fbacfa6 100644
--- a/kubernetes/pomba/charts/pomba-data-router/Chart.yaml
+++ b/kubernetes/pomba/components/pomba-data-router/Chart.yaml
diff --git a/kubernetes/pomba/charts/pomba-kibana/requirements.yaml b/kubernetes/pomba/components/pomba-data-router/requirements.yaml
index 6a61926e9e..fbe51550f0 100644
--- a/kubernetes/pomba/charts/pomba-kibana/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
index dbf4fcacec..dbf4fcacec 100644
--- 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
Binary files differ
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
index 18659a5d4d..18659a5d4d 100644
--- 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
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
index 9eec841aa2..9eec841aa2 100644
--- a/kubernetes/pomba/charts/pomba-data-router/resources/config/auth/tomcat_keystore
+++ b/kubernetes/pomba/components/pomba-data-router/resources/config/auth/tomcat_keystore
Binary files differ
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
index e69de29bb2..e69de29bb2 100644
--- a/kubernetes/pomba/charts/pomba-data-router/resources/config/data-router.properties
+++ b/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
index ca9c4e557f..ca9c4e557f 100644
--- a/kubernetes/pomba/charts/pomba-data-router/resources/config/schemaIngest.properties
+++ b/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
index 3f22a8b701..3f22a8b701 100644
--- 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
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
index c5c8d615e4..c5c8d615e4 100644
--- 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
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
index db631a84fe..db631a84fe 100644
--- a/kubernetes/pomba/charts/pomba-data-router/resources/dynamic/routes/audit.route
+++ b/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
index 655d436c9d..655d436c9d 100644
--- a/kubernetes/pomba/charts/pomba-data-router/resources/dynamic/routes/poaValidation.route
+++ b/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
index 97b9e8389a..97b9e8389a 100644
--- a/kubernetes/pomba/charts/pomba-data-router/templates/configmap.yaml
+++ b/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
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
index 8f87c68f1e..8f87c68f1e 100644
--- a/kubernetes/pomba/charts/pomba-data-router/templates/ingress.yaml
+++ b/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
index bab5f83d85..bab5f83d85 100644
--- a/kubernetes/pomba/charts/pomba-data-router/templates/pv.yaml
+++ b/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
index 64d5d3d46a..64d5d3d46a 100644
--- a/kubernetes/pomba/charts/pomba-data-router/templates/pvc.yaml
+++ b/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
index e655997a19..e655997a19 100644
--- a/kubernetes/pomba/charts/pomba-data-router/templates/secret.yaml
+++ b/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
index decee40960..decee40960 100644
--- a/kubernetes/pomba/charts/pomba-data-router/templates/service.yaml
+++ b/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
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
index 70efb7e2b4..70efb7e2b4 100644
--- a/kubernetes/pomba/charts/pomba-elasticsearch/Chart.yaml
+++ b/kubernetes/pomba/components/pomba-elasticsearch/Chart.yaml
diff --git a/kubernetes/pomba/charts/pomba-contextaggregator/requirements.yaml b/kubernetes/pomba/components/pomba-elasticsearch/requirements.yaml
index 6a61926e9e..fbe51550f0 100755..100644
--- a/kubernetes/pomba/charts/pomba-contextaggregator/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
index 2ffa686ba5..2ffa686ba5 100644
--- a/kubernetes/pomba/charts/pomba-elasticsearch/resources/config/elasticsearch.yml
+++ b/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
index 8ca06753fd..8ca06753fd 100644
--- a/kubernetes/pomba/charts/pomba-elasticsearch/templates/configmap.yaml
+++ b/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
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
index 18994300db..18994300db 100644
--- a/kubernetes/pomba/charts/pomba-elasticsearch/templates/pv-data.yaml
+++ b/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
index 705ea83984..705ea83984 100644
--- a/kubernetes/pomba/charts/pomba-elasticsearch/templates/pv-logs.yaml
+++ b/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
index 4004e00f7e..4004e00f7e 100644
--- a/kubernetes/pomba/charts/pomba-elasticsearch/templates/pvc-data.yaml
+++ b/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
index f5898c129f..f5898c129f 100644
--- a/kubernetes/pomba/charts/pomba-elasticsearch/templates/pvc-logs.yaml
+++ b/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
index 0a12afb609..0a12afb609 100644
--- a/kubernetes/pomba/charts/pomba-elasticsearch/templates/service.yaml
+++ b/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
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
index 111730ce49..111730ce49 100644
--- a/kubernetes/pomba/charts/pomba-kibana/Chart.yaml
+++ b/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
index 11125eaef7..11125eaef7 100644
--- a/kubernetes/pomba/charts/pomba-kibana/resources/auth/pomba.crt.pem
+++ b/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
index db46f0d462..db46f0d462 100644
--- a/kubernetes/pomba/charts/pomba-kibana/resources/auth/pomba.key.pem
+++ b/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
index 781a4b7f67..781a4b7f67 100644
--- a/kubernetes/pomba/charts/pomba-kibana/resources/bin/kibana_start.sh
+++ b/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
index 77afee7a03..77afee7a03 100644
--- a/kubernetes/pomba/charts/pomba-kibana/resources/config/default-mapping.json
+++ b/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
index d54dbfe686..d54dbfe686 100644
--- a/kubernetes/pomba/charts/pomba-kibana/resources/config/default.json
+++ b/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
index fdcdd02cc7..fdcdd02cc7 100644
--- a/kubernetes/pomba/charts/pomba-kibana/resources/config/kibana.yml
+++ b/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
index 8facf30c14..8facf30c14 100644
--- a/kubernetes/pomba/charts/pomba-kibana/templates/configmap.yaml
+++ b/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
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
index 8f87c68f1e..8f87c68f1e 100644
--- a/kubernetes/pomba/charts/pomba-kibana/templates/ingress.yaml
+++ b/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
index decd606f35..decd606f35 100644
--- a/kubernetes/pomba/charts/pomba-kibana/templates/service.yaml
+++ b/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
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
index 9f8d3651b8..9f8d3651b8 100644
--- a/kubernetes/pomba/charts/pomba-networkdiscovery/Chart.yaml
+++ b/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
index 19f9690f73..19f9690f73 100644
--- a/kubernetes/pomba/charts/pomba-networkdiscovery/resources/config/application.properties
+++ b/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
index dbf4fcacec..dbf4fcacec 100644
--- 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
Binary files differ
diff --git a/kubernetes/pomba/charts/pomba-networkdiscovery/resources/config/auth/tomcat_keystore b/kubernetes/pomba/components/pomba-networkdiscovery/resources/config/auth/tomcat_keystore
index 9eec841aa2..9eec841aa2 100644
--- a/kubernetes/pomba/charts/pomba-networkdiscovery/resources/config/auth/tomcat_keystore
+++ b/kubernetes/pomba/components/pomba-networkdiscovery/resources/config/auth/tomcat_keystore
Binary files differ
diff --git a/kubernetes/pomba/charts/pomba-networkdiscovery/resources/config/logback.xml b/kubernetes/pomba/components/pomba-networkdiscovery/resources/config/logback.xml
index 0a4b616453..0a4b616453 100644
--- a/kubernetes/pomba/charts/pomba-networkdiscovery/resources/config/logback.xml
+++ b/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
index 2e1a4387e2..2e1a4387e2 100644
--- a/kubernetes/pomba/charts/pomba-networkdiscovery/templates/configmap.yaml
+++ b/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
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
index 8f87c68f1e..8f87c68f1e 100644
--- a/kubernetes/pomba/charts/pomba-networkdiscovery/templates/ingress.yaml
+++ b/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
index 6d357c496d..6d357c496d 100644
--- a/kubernetes/pomba/charts/pomba-networkdiscovery/templates/secrets.yaml
+++ b/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
index a846fe3ec0..a846fe3ec0 100644
--- a/kubernetes/pomba/charts/pomba-networkdiscovery/templates/service.yaml
+++ b/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
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
index d7cdd91aa3..d7cdd91aa3 100644
--- a/kubernetes/pomba/charts/pomba-networkdiscoveryctxbuilder/Chart.yaml
+++ b/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
index 6b43aba20e..6b43aba20e 100644
--- a/kubernetes/pomba/charts/pomba-networkdiscoveryctxbuilder/resources/config/application.properties
+++ b/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
index 0a4b616453..0a4b616453 100644
--- a/kubernetes/pomba/charts/pomba-networkdiscoveryctxbuilder/resources/config/logback.xml
+++ b/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
index d0e26326ce..d0e26326ce 100644
--- a/kubernetes/pomba/charts/pomba-networkdiscoveryctxbuilder/templates/configmap.yaml
+++ b/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
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
index 2ebd6758a0..2ebd6758a0 100644
--- a/kubernetes/pomba/charts/pomba-networkdiscoveryctxbuilder/templates/service.yaml
+++ b/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
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
index f0c1319444..f0c1319444 100644
--- a/kubernetes/pomba/charts/pomba-sdcctxbuilder/.helmignore
+++ b/kubernetes/pomba/components/pomba-sdcctxbuilder/.helmignore
diff --git a/kubernetes/pomba/charts/pomba-sdcctxbuilder/Chart.yaml b/kubernetes/pomba/components/pomba-sdcctxbuilder/Chart.yaml
index c75c5a2c8f..c75c5a2c8f 100644
--- a/kubernetes/pomba/charts/pomba-sdcctxbuilder/Chart.yaml
+++ b/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
index 5cc01497f5..5cc01497f5 100644
--- a/kubernetes/pomba/charts/pomba-sdcctxbuilder/resources/config/README.txt
+++ b/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
index cfa618dad9..cfa618dad9 100644
--- a/kubernetes/pomba/charts/pomba-sdcctxbuilder/resources/config/application.properties
+++ b/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
index 0a4b616453..0a4b616453 100644
--- a/kubernetes/pomba/charts/pomba-sdcctxbuilder/resources/config/logback.xml
+++ b/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
index ab79c5c24f..ab79c5c24f 100644
--- a/kubernetes/pomba/charts/pomba-sdcctxbuilder/templates/configmap.yaml
+++ b/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
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
index 8647447dc1..8647447dc1 100644
--- a/kubernetes/pomba/charts/pomba-sdcctxbuilder/templates/service.yaml
+++ b/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
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
index f0c1319444..f0c1319444 100644
--- a/kubernetes/pomba/charts/pomba-sdncctxbuilder/.helmignore
+++ b/kubernetes/pomba/components/pomba-sdncctxbuilder/.helmignore
diff --git a/kubernetes/pomba/charts/pomba-sdncctxbuilder/Chart.yaml b/kubernetes/pomba/components/pomba-sdncctxbuilder/Chart.yaml
index edd2385f55..edd2385f55 100644
--- a/kubernetes/pomba/charts/pomba-sdncctxbuilder/Chart.yaml
+++ b/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
index f95fa85fc1..f95fa85fc1 100644
--- a/kubernetes/pomba/charts/pomba-sdncctxbuilder/resources/config/application.properties
+++ b/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
index 0a4b616453..0a4b616453 100644
--- a/kubernetes/pomba/charts/pomba-sdncctxbuilder/resources/config/logback.xml
+++ b/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
index d0e26326ce..d0e26326ce 100644
--- a/kubernetes/pomba/charts/pomba-sdncctxbuilder/templates/configmap.yaml
+++ b/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
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
index 2ebd6758a0..2ebd6758a0 100644
--- a/kubernetes/pomba/charts/pomba-sdncctxbuilder/templates/service.yaml
+++ b/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
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
index f0c1319444..f0c1319444 100644
--- a/kubernetes/pomba/charts/pomba-search-data/.helmignore
+++ b/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
index 5f3bc0ae79..5f3bc0ae79 100644
--- a/kubernetes/pomba/charts/pomba-search-data/Chart.yaml
+++ b/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
index 0927d98748..0927d98748 100644
--- a/kubernetes/pomba/charts/pomba-search-data/resources/config/analysis-config.json
+++ b/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
index 00a6de5f4a..00a6de5f4a 100644
--- 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
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
index 9eec841aa2..9eec841aa2 100644
--- a/kubernetes/pomba/charts/pomba-search-data/resources/config/auth/tomcat_keystore
+++ b/kubernetes/pomba/components/pomba-search-data/resources/config/auth/tomcat_keystore
Binary files differ
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
index 0bd8686f85..0bd8686f85 100644
--- 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
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
index a42eb427bb..a42eb427bb 100644
--- a/kubernetes/pomba/charts/pomba-search-data/resources/config/elastic-search.properties
+++ b/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
index 58ed8f6428..58ed8f6428 100644
--- 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
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
index 5f9120e889..5f9120e889 100644
--- a/kubernetes/pomba/charts/pomba-search-data/resources/config/filter-config.json
+++ b/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
index f84d1bbbb0..f84d1bbbb0 100644
--- a/kubernetes/pomba/charts/pomba-search-data/resources/config/log/logback.xml
+++ b/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
index 0715f0d51a..0715f0d51a 100644
--- a/kubernetes/pomba/charts/pomba-search-data/templates/configmap.yaml
+++ b/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
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
index 33b058fc8f..33b058fc8f 100644
--- a/kubernetes/pomba/charts/pomba-search-data/templates/secret.yaml
+++ b/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
index c786a5a894..c786a5a894 100644
--- a/kubernetes/pomba/charts/pomba-search-data/templates/service.yaml
+++ b/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
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
index d12b3f984d..d12b3f984d 100644
--- a/kubernetes/pomba/charts/pomba-servicedecomposition/Chart.yaml
+++ b/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
index d03f44a080..d03f44a080 100644
--- a/kubernetes/pomba/charts/pomba-servicedecomposition/resources/config/application.properties
+++ b/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
index 3b02684b68..3b02684b68 100644
--- a/kubernetes/pomba/charts/pomba-servicedecomposition/resources/config/log/logback.xml
+++ b/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
index e2cb33c791..e2cb33c791 100644
--- a/kubernetes/pomba/charts/pomba-servicedecomposition/templates/configmap.yaml
+++ b/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
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
index 2ebd6758a0..2ebd6758a0 100644
--- a/kubernetes/pomba/charts/pomba-servicedecomposition/templates/service.yaml
+++ b/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
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
index 525de440a9..525de440a9 100644
--- a/kubernetes/pomba/charts/pomba-validation-service/Chart.yaml
+++ b/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
index 5cc01497f5..5cc01497f5 100644
--- a/kubernetes/pomba/charts/pomba-validation-service/resources/appconfig/README.txt
+++ b/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
index cd5c62e96b..cd5c62e96b 100644
--- a/kubernetes/pomba/charts/pomba-validation-service/resources/appconfig/aai-environment.properties
+++ b/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
index dbf4fcacec..dbf4fcacec 100644
--- 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
Binary files differ
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
index 9eec841aa2..9eec841aa2 100644
--- a/kubernetes/pomba/charts/pomba-validation-service/resources/appconfig/auth/tomcat_keystore
+++ b/kubernetes/pomba/components/pomba-validation-service/resources/appconfig/auth/tomcat_keystore
Binary files differ
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
index ea5565a71e..ea5565a71e 100644
--- a/kubernetes/pomba/charts/pomba-validation-service/resources/appconfig/auth_policy.json
+++ b/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
index d93f030395..d93f030395 100644
--- 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
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
index 06f4626ab6..06f4626ab6 100644
--- a/kubernetes/pomba/charts/pomba-validation-service/resources/appconfig/rule-indexing.properties
+++ b/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
index a711881dc5..a711881dc5 100644
--- a/kubernetes/pomba/charts/pomba-validation-service/resources/appconfig/schemaIngest.properties
+++ b/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
index fe8e2684d5..fe8e2684d5 100644
--- 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
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
index 2dace57936..2dace57936 100644
--- 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
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
index 8bbd4233a6..8bbd4233a6 100644
--- 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
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
index 9b2e86213a..9b2e86213a 100644
--- a/kubernetes/pomba/charts/pomba-validation-service/resources/appconfig/validation-service.properties
+++ b/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
index 99879d4557..99879d4557 100644
--- a/kubernetes/pomba/charts/pomba-validation-service/resources/application.properties
+++ b/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
index 4a7f30452f..4a7f30452f 100644
--- 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
diff --git a/kubernetes/pomba/charts/pomba-validation-service/templates/configmap.yaml b/kubernetes/pomba/components/pomba-validation-service/templates/configmap.yaml
index 9a9951ab9f..9a9951ab9f 100644
--- a/kubernetes/pomba/charts/pomba-validation-service/templates/configmap.yaml
+++ b/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
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
index 63d3b10f9a..63d3b10f9a 100644
--- a/kubernetes/pomba/charts/pomba-validation-service/templates/secrets.yaml
+++ b/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
index 8647447dc1..8647447dc1 100644
--- a/kubernetes/pomba/charts/pomba-validation-service/templates/service.yaml
+++ b/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
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