summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--kubernetes/aaf/Chart.yaml2
-rw-r--r--kubernetes/aaf/charts/aaf-cm/Chart.yaml2
-rw-r--r--kubernetes/aaf/charts/aaf-cm/templates/deployment.yaml2
-rw-r--r--kubernetes/aaf/charts/aaf-cm/values.yaml2
-rw-r--r--kubernetes/aaf/charts/aaf-cs/Chart.yaml2
-rw-r--r--kubernetes/aaf/charts/aaf-cs/templates/deployment.yaml6
-rw-r--r--kubernetes/aaf/charts/aaf-cs/values.yaml2
-rw-r--r--kubernetes/aaf/charts/aaf-fs/Chart.yaml2
-rw-r--r--kubernetes/aaf/charts/aaf-fs/templates/deployment.yaml2
-rw-r--r--kubernetes/aaf/charts/aaf-fs/values.yaml2
-rw-r--r--kubernetes/aaf/charts/aaf-gui/Chart.yaml2
-rw-r--r--kubernetes/aaf/charts/aaf-gui/templates/deployment.yaml2
-rw-r--r--kubernetes/aaf/charts/aaf-hello/Chart.yaml2
-rw-r--r--kubernetes/aaf/charts/aaf-hello/templates/deployment.yaml2
-rw-r--r--kubernetes/aaf/charts/aaf-hello/values.yaml2
-rw-r--r--kubernetes/aaf/charts/aaf-locate/Chart.yaml2
-rw-r--r--kubernetes/aaf/charts/aaf-locate/templates/deployment.yaml2
-rw-r--r--kubernetes/aaf/charts/aaf-locate/values.yaml2
-rw-r--r--kubernetes/aaf/charts/aaf-oauth/Chart.yaml2
-rw-r--r--kubernetes/aaf/charts/aaf-oauth/templates/deployment.yaml2
-rw-r--r--kubernetes/aaf/charts/aaf-oauth/values.yaml2
-rw-r--r--kubernetes/aaf/charts/aaf-service/Chart.yaml2
-rw-r--r--kubernetes/aaf/charts/aaf-service/templates/deployment.yaml2
-rw-r--r--kubernetes/aaf/charts/aaf-sms/Chart.yaml2
-rw-r--r--kubernetes/aaf/charts/aaf-sms/charts/aaf-sms-quorumclient/Chart.yaml2
-rw-r--r--kubernetes/aaf/charts/aaf-sms/charts/aaf-sms-quorumclient/templates/statefulset.yaml2
-rw-r--r--kubernetes/aaf/charts/aaf-sms/charts/aaf-sms-vault/Chart.yaml2
-rw-r--r--kubernetes/aaf/charts/aaf-sms/templates/deployment.yaml2
-rw-r--r--kubernetes/aaf/requirements.yaml2
-rw-r--r--kubernetes/aaf/templates/job.yaml6
-rw-r--r--kubernetes/aaf/values.yaml4
-rw-r--r--kubernetes/aai/Chart.yaml2
-rw-r--r--kubernetes/aai/charts/aai-babel/Chart.yaml2
-rw-r--r--kubernetes/aai/charts/aai-babel/requirements.yaml2
-rw-r--r--kubernetes/aai/charts/aai-babel/templates/deployment.yaml2
-rw-r--r--kubernetes/aai/charts/aai-babel/values.yaml1
-rw-r--r--kubernetes/aai/charts/aai-cassandra/Chart.yaml2
-rw-r--r--kubernetes/aai/charts/aai-cassandra/templates/statefulset.yaml2
-rw-r--r--kubernetes/aai/charts/aai-cassandra/values.yaml2
-rw-r--r--kubernetes/aai/charts/aai-champ/Chart.yaml2
-rw-r--r--kubernetes/aai/charts/aai-champ/requirements.yaml2
-rw-r--r--kubernetes/aai/charts/aai-champ/templates/deployment.yaml2
-rw-r--r--kubernetes/aai/charts/aai-champ/values.yaml1
-rw-r--r--kubernetes/aai/charts/aai-data-router/Chart.yaml2
-rw-r--r--kubernetes/aai/charts/aai-data-router/templates/deployment.yaml2
-rw-r--r--kubernetes/aai/charts/aai-data-router/values.yaml18
-rw-r--r--kubernetes/aai/charts/aai-elasticsearch/Chart.yaml2
-rw-r--r--kubernetes/aai/charts/aai-elasticsearch/templates/deployment.yaml2
-rw-r--r--kubernetes/aai/charts/aai-elasticsearch/values.yaml18
-rw-r--r--kubernetes/aai/charts/aai-gizmo/Chart.yaml2
-rw-r--r--kubernetes/aai/charts/aai-gizmo/templates/deployment.yaml2
-rw-r--r--kubernetes/aai/charts/aai-gizmo/values.yaml1
-rw-r--r--kubernetes/aai/charts/aai-graphadmin/Chart.yaml2
-rw-r--r--kubernetes/aai/charts/aai-graphadmin/templates/deployment.yaml2
-rw-r--r--kubernetes/aai/charts/aai-graphadmin/templates/job.yaml2
-rw-r--r--kubernetes/aai/charts/aai-graphadmin/values.yaml22
-rw-r--r--kubernetes/aai/charts/aai-modelloader/Chart.yaml2
-rw-r--r--kubernetes/aai/charts/aai-modelloader/templates/deployment.yaml2
-rw-r--r--kubernetes/aai/charts/aai-modelloader/values.yaml19
-rw-r--r--kubernetes/aai/charts/aai-resources/Chart.yaml2
-rw-r--r--kubernetes/aai/charts/aai-resources/templates/deployment.yaml2
-rw-r--r--kubernetes/aai/charts/aai-resources/values.yaml5
-rw-r--r--kubernetes/aai/charts/aai-search-data/Chart.yaml2
-rw-r--r--kubernetes/aai/charts/aai-search-data/templates/deployment.yaml2
-rw-r--r--kubernetes/aai/charts/aai-search-data/values.yaml18
-rw-r--r--kubernetes/aai/charts/aai-sparky-be/Chart.yaml2
-rw-r--r--kubernetes/aai/charts/aai-sparky-be/templates/deployment.yaml2
-rw-r--r--kubernetes/aai/charts/aai-sparky-be/values.yaml20
-rw-r--r--kubernetes/aai/charts/aai-spike/Chart.yaml2
-rw-r--r--kubernetes/aai/charts/aai-spike/requirements.yaml2
-rw-r--r--kubernetes/aai/charts/aai-spike/templates/deployment.yaml2
-rw-r--r--kubernetes/aai/charts/aai-spike/values.yaml1
-rw-r--r--kubernetes/aai/charts/aai-traversal/Chart.yaml2
-rw-r--r--kubernetes/aai/charts/aai-traversal/templates/deployment.yaml2
-rw-r--r--kubernetes/aai/charts/aai-traversal/values.yaml20
-rw-r--r--kubernetes/aai/requirements.yaml2
-rw-r--r--kubernetes/aai/templates/deployment.yaml2
-rw-r--r--kubernetes/aai/values.yaml11
-rw-r--r--kubernetes/appc/Chart.yaml2
-rw-r--r--kubernetes/appc/charts/appc-ansible-server/Chart.yaml2
-rw-r--r--kubernetes/appc/charts/appc-ansible-server/requirements.yaml2
-rw-r--r--kubernetes/appc/charts/appc-ansible-server/templates/deployment.yaml2
-rw-r--r--kubernetes/appc/charts/appc-ansible-server/values.yaml1
-rw-r--r--kubernetes/appc/charts/appc-cdt/Chart.yaml2
-rw-r--r--kubernetes/appc/charts/appc-cdt/requirements.yaml2
-rw-r--r--kubernetes/appc/charts/appc-cdt/templates/deployment.yaml2
-rw-r--r--kubernetes/appc/charts/appc-cdt/values.yaml13
-rw-r--r--kubernetes/appc/requirements.yaml6
-rw-r--r--kubernetes/appc/templates/statefulset.yaml2
-rw-r--r--kubernetes/appc/values.yaml13
-rw-r--r--kubernetes/clamp/Chart.yaml2
-rw-r--r--kubernetes/clamp/charts/clamp-dash-es/Chart.yaml2
-rw-r--r--kubernetes/clamp/charts/clamp-dash-es/requirements.yaml2
-rw-r--r--kubernetes/clamp/charts/clamp-dash-es/templates/deployment.yaml2
-rw-r--r--kubernetes/clamp/charts/clamp-dash-kibana/Chart.yaml2
-rw-r--r--kubernetes/clamp/charts/clamp-dash-kibana/requirements.yaml2
-rw-r--r--kubernetes/clamp/charts/clamp-dash-kibana/templates/deployment.yaml2
-rw-r--r--kubernetes/clamp/charts/clamp-dash-kibana/values.yaml2
-rw-r--r--kubernetes/clamp/charts/clamp-dash-logstash/Chart.yaml2
-rw-r--r--kubernetes/clamp/charts/clamp-dash-logstash/requirements.yaml2
-rw-r--r--kubernetes/clamp/charts/clamp-dash-logstash/templates/deployment.yaml2
-rw-r--r--kubernetes/clamp/charts/mariadb/Chart.yaml2
-rw-r--r--kubernetes/clamp/charts/mariadb/templates/deployment.yaml2
-rw-r--r--kubernetes/clamp/charts/mariadb/values.yaml2
-rw-r--r--kubernetes/clamp/requirements.yaml2
-rw-r--r--kubernetes/clamp/templates/deployment.yaml2
-rw-r--r--kubernetes/clamp/values.yaml2
-rw-r--r--kubernetes/cli/Chart.yaml2
-rw-r--r--kubernetes/cli/requirements.yaml2
-rw-r--r--kubernetes/cli/templates/deployment.yaml2
-rw-r--r--kubernetes/cli/values.yaml13
-rw-r--r--kubernetes/common/common/Chart.yaml2
-rw-r--r--kubernetes/common/common/templates/_resources.tpl59
-rw-r--r--kubernetes/common/common/values.yaml26
-rw-r--r--kubernetes/common/controller-blueprints/requirements.yaml4
-rw-r--r--kubernetes/common/controller-blueprints/templates/deployment.yaml2
-rw-r--r--kubernetes/common/dgbuilder/Chart.yaml2
-rw-r--r--kubernetes/common/dgbuilder/requirements.yaml2
-rw-r--r--kubernetes/common/dgbuilder/templates/deployment.yaml2
-rw-r--r--kubernetes/common/mariadb-galera/Chart.yaml2
-rw-r--r--kubernetes/common/mariadb-galera/requirements.yaml2
-rw-r--r--kubernetes/common/mariadb-galera/templates/statefulset.yaml2
-rw-r--r--kubernetes/common/mongo/Chart.yaml2
-rw-r--r--kubernetes/common/mongo/requirements.yaml2
-rw-r--r--kubernetes/common/mongo/templates/statefulset.yaml2
-rw-r--r--kubernetes/common/mysql/Chart.yaml2
-rw-r--r--kubernetes/common/mysql/requirements.yaml2
-rw-r--r--kubernetes/common/mysql/templates/statefulset.yaml2
-rw-r--r--kubernetes/common/mysql/values.yaml6
-rw-r--r--kubernetes/common/network-name-gen/Chart.yaml18
-rw-r--r--kubernetes/common/network-name-gen/requirements.yaml21
-rw-r--r--kubernetes/common/network-name-gen/templates/deployment.yaml92
-rw-r--r--kubernetes/common/network-name-gen/templates/secrets.yaml27
-rw-r--r--kubernetes/common/network-name-gen/templates/service.yaml39
-rw-r--r--kubernetes/common/network-name-gen/values.yaml102
-rw-r--r--kubernetes/common/pgpool/Chart.yaml2
-rw-r--r--kubernetes/common/pgpool/requirements.yaml2
-rw-r--r--kubernetes/common/postgres/Chart.yaml2
-rw-r--r--kubernetes/common/postgres/requirements.yaml2
-rw-r--r--kubernetes/common/postgres/templates/statefulset.yaml2
-rw-r--r--kubernetes/common/postgres/values.yaml6
-rw-r--r--kubernetes/consul/Chart.yaml2
-rw-r--r--kubernetes/consul/charts/consul-server/Chart.yaml2
-rw-r--r--kubernetes/consul/charts/consul-server/requirements.yaml2
-rw-r--r--kubernetes/consul/requirements.yaml2
-rwxr-xr-xkubernetes/contrib/Chart.yaml2
-rwxr-xr-xkubernetes/contrib/charts/netbox/Chart.yaml2
-rwxr-xr-xkubernetes/contrib/charts/netbox/charts/netbox-app/Chart.yaml2
-rwxr-xr-xkubernetes/contrib/charts/netbox/charts/netbox-app/templates/deployment.yaml2
-rwxr-xr-xkubernetes/contrib/charts/netbox/charts/netbox-nginx/Chart.yaml2
-rwxr-xr-xkubernetes/contrib/charts/netbox/charts/netbox-nginx/templates/deployment.yaml2
-rwxr-xr-xkubernetes/contrib/charts/netbox/charts/netbox-postgres/Chart.yaml2
-rwxr-xr-xkubernetes/contrib/charts/netbox/charts/netbox-postgres/templates/deployment.yaml2
-rwxr-xr-xkubernetes/contrib/charts/netbox/requirements.yaml2
-rw-r--r--kubernetes/contrib/requirements.yaml2
-rw-r--r--kubernetes/dcaegen2/Chart.yaml2
-rw-r--r--kubernetes/dcaegen2/charts/dcae-bootstrap/Chart.yaml2
-rw-r--r--kubernetes/dcaegen2/charts/dcae-bootstrap/requirements.yaml4
-rw-r--r--kubernetes/dcaegen2/charts/dcae-cloudify-manager/Chart.yaml2
-rw-r--r--kubernetes/dcaegen2/charts/dcae-cloudify-manager/requirements.yaml2
-rw-r--r--kubernetes/dcaegen2/charts/dcae-healthcheck/Chart.yaml2
-rw-r--r--kubernetes/dcaegen2/charts/dcae-healthcheck/requirements.yaml2
-rw-r--r--kubernetes/dcaegen2/charts/dcae-healthcheck/values.yaml4
-rw-r--r--kubernetes/dcaegen2/charts/dcae-redis/Chart.yaml2
-rw-r--r--kubernetes/dcaegen2/charts/dcae-redis/requirements.yaml2
-rw-r--r--kubernetes/dcaegen2/charts/dcae-redis/templates/statefulset.yaml2
-rw-r--r--kubernetes/dcaegen2/requirements.yaml2
-rw-r--r--kubernetes/dmaap/Chart.yaml2
-rw-r--r--kubernetes/dmaap/charts/dmaap-bus-controller/Chart.yaml2
-rw-r--r--kubernetes/dmaap/charts/dmaap-bus-controller/requirements.yaml4
-rw-r--r--kubernetes/dmaap/charts/dmaap-bus-controller/templates/deployment.yaml2
-rw-r--r--kubernetes/dmaap/charts/dmaap-data-router/charts/dmaap-dr-db/templates/deployment.yaml2
-rw-r--r--kubernetes/dmaap/charts/dmaap-data-router/charts/dmaap-dr-db/values.yaml4
-rw-r--r--kubernetes/dmaap/charts/dmaap-data-router/charts/dmaap-dr-node/templates/deployment.yaml2
-rw-r--r--kubernetes/dmaap/charts/dmaap-data-router/charts/dmaap-dr-prov/templates/deployment.yaml2
-rw-r--r--kubernetes/dmaap/charts/dmaap-data-router/requirements.yaml2
-rw-r--r--kubernetes/dmaap/charts/message-router/Chart.yaml2
-rw-r--r--kubernetes/dmaap/charts/message-router/charts/message-router-kafka/Chart.yaml2
-rw-r--r--kubernetes/dmaap/charts/message-router/charts/message-router-zookeeper/Chart.yaml2
-rw-r--r--kubernetes/dmaap/charts/message-router/requirements.yaml2
-rw-r--r--kubernetes/dmaap/requirements.yaml2
-rw-r--r--kubernetes/esr/Chart.yaml2
-rw-r--r--kubernetes/esr/charts/esr-gui/Chart.yaml2
-rw-r--r--kubernetes/esr/charts/esr-gui/templates/deployment.yaml2
-rw-r--r--kubernetes/esr/charts/esr-server/Chart.yaml2
-rw-r--r--kubernetes/esr/charts/esr-server/requirements.yaml2
-rw-r--r--kubernetes/esr/charts/esr-server/templates/deployment.yaml2
-rw-r--r--kubernetes/esr/requirements.yaml2
-rw-r--r--kubernetes/helm/starters/onap-app/Chart.yaml2
-rw-r--r--kubernetes/helm/starters/onap-app/requirements.yaml2
-rw-r--r--kubernetes/helm/starters/onap-app/templates/deployment.yaml2
-rw-r--r--kubernetes/log/charts/log-elasticsearch/requirements.yaml2
-rw-r--r--kubernetes/log/charts/log-elasticsearch/templates/deployment.yaml2
-rw-r--r--kubernetes/log/charts/log-elasticsearch/values.yaml5
-rw-r--r--kubernetes/log/charts/log-kibana/requirements.yaml2
-rw-r--r--kubernetes/log/charts/log-kibana/templates/deployment.yaml2
-rw-r--r--kubernetes/log/charts/log-kibana/values.yaml5
-rw-r--r--kubernetes/log/charts/log-logstash/requirements.yaml2
-rw-r--r--kubernetes/log/charts/log-logstash/templates/deployment.yaml2
-rw-r--r--kubernetes/log/charts/log-logstash/values.yaml5
-rw-r--r--kubernetes/log/requirements.yaml2
-rw-r--r--kubernetes/msb/Chart.yaml2
-rw-r--r--kubernetes/msb/charts/kube2msb/Chart.yaml2
-rw-r--r--kubernetes/msb/charts/kube2msb/requirements.yaml2
-rw-r--r--kubernetes/msb/charts/kube2msb/templates/deployment.yaml2
-rw-r--r--kubernetes/msb/charts/msb-consul/Chart.yaml2
-rw-r--r--kubernetes/msb/charts/msb-consul/requirements.yaml2
-rw-r--r--kubernetes/msb/charts/msb-consul/templates/deployment.yaml2
-rw-r--r--kubernetes/msb/charts/msb-discovery/Chart.yaml2
-rw-r--r--kubernetes/msb/charts/msb-discovery/requirements.yaml2
-rw-r--r--kubernetes/msb/charts/msb-discovery/templates/deployment.yaml2
-rw-r--r--kubernetes/msb/charts/msb-eag/Chart.yaml2
-rw-r--r--kubernetes/msb/charts/msb-eag/requirements.yaml2
-rw-r--r--kubernetes/msb/charts/msb-eag/templates/deployment.yaml2
-rw-r--r--kubernetes/msb/charts/msb-iag/Chart.yaml2
-rw-r--r--kubernetes/msb/charts/msb-iag/requirements.yaml2
-rw-r--r--kubernetes/msb/charts/msb-iag/templates/deployment.yaml2
-rw-r--r--kubernetes/msb/requirements.yaml2
-rw-r--r--kubernetes/multicloud/Chart.yaml2
-rw-r--r--kubernetes/multicloud/charts/multicloud-ocata/Chart.yaml2
-rw-r--r--kubernetes/multicloud/charts/multicloud-ocata/templates/deployment.yaml2
-rw-r--r--kubernetes/multicloud/charts/multicloud-ocata/values.yaml1
-rw-r--r--kubernetes/multicloud/charts/multicloud-vio/Chart.yaml2
-rw-r--r--kubernetes/multicloud/charts/multicloud-vio/templates/deployment.yaml2
-rw-r--r--kubernetes/multicloud/charts/multicloud-vio/values.yaml3
-rw-r--r--kubernetes/multicloud/charts/multicloud-windriver/Chart.yaml2
-rw-r--r--kubernetes/multicloud/charts/multicloud-windriver/templates/deployment.yaml2
-rw-r--r--kubernetes/multicloud/charts/multicloud-windriver/values.yaml1
-rw-r--r--kubernetes/multicloud/requirements.yaml2
-rw-r--r--kubernetes/multicloud/templates/deployment.yaml2
-rw-r--r--kubernetes/multicloud/values.yaml1
-rw-r--r--kubernetes/nbi/Chart.yaml2
-rw-r--r--kubernetes/nbi/charts/mariadb/Chart.yaml2
-rw-r--r--kubernetes/nbi/charts/mariadb/requirements.yaml2
-rw-r--r--kubernetes/nbi/charts/mariadb/templates/deployment.yaml2
-rw-r--r--kubernetes/nbi/charts/mariadb/values.yaml2
-rw-r--r--kubernetes/nbi/requirements.yaml4
-rw-r--r--kubernetes/nbi/templates/deployment.yaml2
-rw-r--r--kubernetes/nbi/values.yaml3
-rw-r--r--kubernetes/onap/Chart.yaml4
-rw-r--r--kubernetes/onap/requirements.yaml54
-rw-r--r--kubernetes/onap/resources/environments/disable-allcharts.yaml2
-rw-r--r--kubernetes/onap/values.yaml3
-rwxr-xr-xkubernetes/oof/Chart.yaml2
-rwxr-xr-xkubernetes/oof/charts/oof-has/Chart.yaml2
-rwxr-xr-xkubernetes/oof/charts/oof-has/charts/oof-has-api/Chart.yaml2
-rwxr-xr-xkubernetes/oof/charts/oof-has/charts/oof-has-api/templates/deployment.yaml2
-rwxr-xr-xkubernetes/oof/charts/oof-has/charts/oof-has-api/values.yaml1
-rw-r--r--kubernetes/oof/charts/oof-has/charts/oof-has-cassandra/Chart.yaml2
-rw-r--r--kubernetes/oof/charts/oof-has/charts/oof-has-cassandra/templates/deployment.yaml2
-rw-r--r--kubernetes/oof/charts/oof-has/charts/oof-has-cassandra/values.yaml1
-rwxr-xr-xkubernetes/oof/charts/oof-has/charts/oof-has-controller/Chart.yaml2
-rwxr-xr-xkubernetes/oof/charts/oof-has/charts/oof-has-controller/templates/deployment.yaml2
-rwxr-xr-xkubernetes/oof/charts/oof-has/charts/oof-has-controller/values.yaml1
-rwxr-xr-xkubernetes/oof/charts/oof-has/charts/oof-has-data/Chart.yaml2
-rwxr-xr-xkubernetes/oof/charts/oof-has/charts/oof-has-data/templates/deployment.yaml2
-rwxr-xr-xkubernetes/oof/charts/oof-has/charts/oof-has-data/values.yaml1
-rw-r--r--kubernetes/oof/charts/oof-has/charts/oof-has-music/requirements.yaml2
-rw-r--r--kubernetes/oof/charts/oof-has/charts/oof-has-music/templates/deployment.yaml2
-rw-r--r--kubernetes/oof/charts/oof-has/charts/oof-has-music/values.yaml1
-rwxr-xr-xkubernetes/oof/charts/oof-has/charts/oof-has-reservation/Chart.yaml2
-rwxr-xr-xkubernetes/oof/charts/oof-has/charts/oof-has-reservation/templates/deployment.yaml2
-rwxr-xr-xkubernetes/oof/charts/oof-has/charts/oof-has-reservation/values.yaml1
-rwxr-xr-xkubernetes/oof/charts/oof-has/charts/oof-has-solver/Chart.yaml2
-rwxr-xr-xkubernetes/oof/charts/oof-has/charts/oof-has-solver/templates/deployment.yaml2
-rwxr-xr-xkubernetes/oof/charts/oof-has/charts/oof-has-solver/values.yaml1
-rw-r--r--kubernetes/oof/charts/oof-has/charts/oof-has-zookeeper/Chart.yaml2
-rw-r--r--kubernetes/oof/charts/oof-has/charts/oof-has-zookeeper/templates/deployment.yaml2
-rw-r--r--kubernetes/oof/charts/oof-has/charts/oof-has-zookeeper/values.yaml1
-rwxr-xr-xkubernetes/oof/charts/oof-has/requirements.yaml2
-rwxr-xr-xkubernetes/oof/charts/oof-has/resources/config/conductor.conf2
-rwxr-xr-xkubernetes/oof/requirements.yaml2
-rw-r--r--kubernetes/oof/templates/deployment.yaml2
-rw-r--r--kubernetes/oof/values.yaml1
-rw-r--r--kubernetes/policy/Chart.yaml2
-rw-r--r--kubernetes/policy/charts/brmsgw/Chart.yaml2
-rw-r--r--kubernetes/policy/charts/brmsgw/requirements.yaml2
-rw-r--r--kubernetes/policy/charts/brmsgw/templates/deployment.yaml2
-rw-r--r--kubernetes/policy/charts/brmsgw/values.yaml3
-rw-r--r--kubernetes/policy/charts/drools/Chart.yaml2
-rw-r--r--kubernetes/policy/charts/drools/charts/nexus/Chart.yaml2
-rw-r--r--kubernetes/policy/charts/drools/charts/nexus/requirements.yaml2
-rw-r--r--kubernetes/policy/charts/drools/charts/nexus/templates/deployment.yaml2
-rw-r--r--kubernetes/policy/charts/drools/charts/nexus/values.yaml3
-rw-r--r--kubernetes/policy/charts/drools/requirements.yaml2
-rwxr-xr-xkubernetes/policy/charts/drools/resources/config/drools/settings.xml8
-rw-r--r--kubernetes/policy/charts/drools/templates/statefulset.yaml2
-rw-r--r--kubernetes/policy/charts/drools/values.yaml3
-rw-r--r--kubernetes/policy/charts/mariadb/Chart.yaml2
-rw-r--r--kubernetes/policy/charts/mariadb/requirements.yaml2
-rw-r--r--kubernetes/policy/charts/mariadb/templates/deployment.yaml2
-rw-r--r--kubernetes/policy/charts/mariadb/values.yaml3
-rw-r--r--kubernetes/policy/charts/pdp/Chart.yaml2
-rw-r--r--kubernetes/policy/charts/pdp/requirements.yaml2
-rw-r--r--kubernetes/policy/charts/pdp/templates/statefulset.yaml2
-rw-r--r--kubernetes/policy/charts/pdp/values.yaml3
-rw-r--r--kubernetes/policy/charts/policy-apex-pdp/Chart.yaml2
-rw-r--r--kubernetes/policy/charts/policy-apex-pdp/requirements.yaml2
-rw-r--r--kubernetes/policy/charts/policy-apex-pdp/templates/statefulset.yaml2
-rw-r--r--kubernetes/policy/charts/policy-apex-pdp/values.yaml3
-rw-r--r--kubernetes/policy/charts/policy-common/Chart.yaml2
-rw-r--r--kubernetes/policy/charts/policy-common/requirements.yaml2
-rw-r--r--kubernetes/policy/charts/policy-common/resources/config/pe/base.conf3
-rw-r--r--kubernetes/policy/charts/policy-distribution/Chart.yaml2
-rw-r--r--kubernetes/policy/charts/policy-distribution/requirements.yaml2
-rw-r--r--kubernetes/policy/charts/policy-distribution/templates/deployment.yaml2
-rw-r--r--kubernetes/policy/requirements.yaml2
-rw-r--r--kubernetes/policy/templates/deployment.yaml2
-rw-r--r--kubernetes/policy/values.yaml5
-rw-r--r--kubernetes/pomba/Chart.yaml2
-rw-r--r--kubernetes/pomba/charts/pomba-aaictxbuilder/Chart.yaml2
-rw-r--r--kubernetes/pomba/charts/pomba-aaictxbuilder/requirements.yaml2
-rw-r--r--kubernetes/pomba/charts/pomba-aaictxbuilder/templates/deployment.yaml2
-rw-r--r--kubernetes/pomba/charts/pomba-contextaggregator/Chart.yaml2
-rwxr-xr-xkubernetes/pomba/charts/pomba-contextaggregator/requirements.yaml2
-rwxr-xr-xkubernetes/pomba/charts/pomba-contextaggregator/resources/config/builders/ndcb.properties (renamed from kubernetes/pomba/charts/pomba-contextaggregator/resources/config/builders/networkdiscovery.properties)0
-rwxr-xr-xkubernetes/pomba/charts/pomba-contextaggregator/resources/config/builders/sdnc.properties28
-rwxr-xr-xkubernetes/pomba/charts/pomba-contextaggregator/templates/deployment.yaml2
-rwxr-xr-xkubernetes/pomba/charts/pomba-contextaggregator/values.yaml8
-rw-r--r--kubernetes/pomba/charts/pomba-data-router/Chart.yaml2
-rw-r--r--kubernetes/pomba/charts/pomba-elasticsearch/Chart.yaml2
-rw-r--r--kubernetes/pomba/charts/pomba-elasticsearch/requirements.yaml2
-rw-r--r--kubernetes/pomba/charts/pomba-elasticsearch/templates/deployment.yaml2
-rw-r--r--kubernetes/pomba/charts/pomba-kibana/Chart.yaml2
-rw-r--r--kubernetes/pomba/charts/pomba-kibana/requirements.yaml2
-rw-r--r--kubernetes/pomba/charts/pomba-kibana/templates/deployment.yaml2
-rw-r--r--kubernetes/pomba/charts/pomba-networkdiscovery/Chart.yaml2
-rw-r--r--kubernetes/pomba/charts/pomba-networkdiscovery/requirements.yaml2
-rw-r--r--kubernetes/pomba/charts/pomba-networkdiscovery/templates/deployment.yaml2
-rw-r--r--kubernetes/pomba/charts/pomba-networkdiscovery/values.yaml192
-rw-r--r--kubernetes/pomba/charts/pomba-networkdiscoveryctxbuilder/Chart.yaml2
-rw-r--r--kubernetes/pomba/charts/pomba-networkdiscoveryctxbuilder/requirements.yaml2
-rw-r--r--kubernetes/pomba/charts/pomba-networkdiscoveryctxbuilder/templates/deployment.yaml2
-rw-r--r--kubernetes/pomba/charts/pomba-sdcctxbuilder/Chart.yaml2
-rw-r--r--kubernetes/pomba/charts/pomba-sdcctxbuilder/requirements.yaml2
-rw-r--r--kubernetes/pomba/charts/pomba-sdcctxbuilder/templates/deployment.yaml2
-rw-r--r--kubernetes/pomba/charts/pomba-search-data/Chart.yaml2
-rw-r--r--kubernetes/pomba/charts/pomba-search-data/templates/deployment.yaml2
-rw-r--r--kubernetes/pomba/charts/pomba-servicedecomposition/Chart.yaml2
-rw-r--r--kubernetes/pomba/charts/pomba-servicedecomposition/requirements.yaml2
-rw-r--r--kubernetes/pomba/charts/pomba-servicedecomposition/templates/deployment.yaml2
-rw-r--r--kubernetes/pomba/charts/pomba-servicedecomposition/values.yaml192
-rw-r--r--kubernetes/pomba/charts/pomba-validation-service/Chart.yaml2
-rw-r--r--kubernetes/pomba/charts/pomba-validation-service/requirements.yaml2
-rw-r--r--kubernetes/pomba/charts/pomba-validation-service/templates/deployment.yaml2
-rw-r--r--kubernetes/pomba/requirements.yaml2
-rw-r--r--kubernetes/portal/Chart.yaml2
-rw-r--r--kubernetes/portal/charts/portal-app/Chart.yaml2
-rw-r--r--kubernetes/portal/charts/portal-app/templates/deployment.yaml2
-rw-r--r--kubernetes/portal/charts/portal-app/values.yaml3
-rw-r--r--kubernetes/portal/charts/portal-cassandra/Chart.yaml2
-rw-r--r--kubernetes/portal/charts/portal-cassandra/templates/deployment.yaml2
-rw-r--r--kubernetes/portal/charts/portal-cassandra/values.yaml5
-rw-r--r--kubernetes/portal/charts/portal-mariadb/Chart.yaml2
-rw-r--r--kubernetes/portal/charts/portal-mariadb/templates/deployment.yaml2
-rw-r--r--kubernetes/portal/charts/portal-mariadb/values.yaml3
-rw-r--r--kubernetes/portal/charts/portal-sdk/Chart.yaml2
-rw-r--r--kubernetes/portal/charts/portal-sdk/templates/deployment.yaml2
-rw-r--r--kubernetes/portal/charts/portal-sdk/values.yaml3
-rw-r--r--kubernetes/portal/charts/portal-widget/Chart.yaml2
-rw-r--r--kubernetes/portal/charts/portal-widget/templates/deployment.yaml2
-rw-r--r--kubernetes/portal/charts/portal-widget/values.yaml3
-rw-r--r--kubernetes/portal/charts/portal-zookeeper/Chart.yaml2
-rw-r--r--kubernetes/portal/charts/portal-zookeeper/templates/deployment.yaml2
-rw-r--r--kubernetes/portal/charts/portal-zookeeper/values.yaml3
-rw-r--r--kubernetes/portal/requirements.yaml2
-rw-r--r--kubernetes/robot/Chart.yaml2
-rw-r--r--kubernetes/robot/requirements.yaml2
-rw-r--r--kubernetes/robot/resources/config/eteshare/config/vm_properties.py12
-rw-r--r--kubernetes/robot/templates/deployment.yaml2
-rwxr-xr-xkubernetes/robot/values.yaml3
-rw-r--r--kubernetes/sdc/Chart.yaml2
-rw-r--r--kubernetes/sdc/charts/sdc-be/Chart.yaml2
-rw-r--r--kubernetes/sdc/charts/sdc-be/templates/deployment.yaml2
-rw-r--r--kubernetes/sdc/charts/sdc-be/values.yaml1
-rw-r--r--kubernetes/sdc/charts/sdc-cs/Chart.yaml2
-rw-r--r--kubernetes/sdc/charts/sdc-cs/templates/deployment.yaml2
-rw-r--r--kubernetes/sdc/charts/sdc-cs/values.yaml1
-rw-r--r--kubernetes/sdc/charts/sdc-es/Chart.yaml2
-rw-r--r--kubernetes/sdc/charts/sdc-es/templates/deployment.yaml2
-rw-r--r--kubernetes/sdc/charts/sdc-es/values.yaml1
-rw-r--r--kubernetes/sdc/charts/sdc-fe/Chart.yaml2
-rw-r--r--kubernetes/sdc/charts/sdc-fe/templates/deployment.yaml2
-rw-r--r--kubernetes/sdc/charts/sdc-fe/values.yaml1
-rw-r--r--kubernetes/sdc/charts/sdc-kb/Chart.yaml2
-rw-r--r--kubernetes/sdc/charts/sdc-kb/templates/deployment.yaml2
-rw-r--r--kubernetes/sdc/charts/sdc-kb/values.yaml1
-rw-r--r--kubernetes/sdc/charts/sdc-onboarding-be/Chart.yaml2
-rw-r--r--kubernetes/sdc/charts/sdc-onboarding-be/templates/deployment.yaml2
-rw-r--r--kubernetes/sdc/charts/sdc-onboarding-be/values.yaml1
-rw-r--r--kubernetes/sdc/charts/sdc-wfd-be/Chart.yaml2
-rw-r--r--kubernetes/sdc/charts/sdc-wfd-fe/Chart.yaml2
-rw-r--r--kubernetes/sdc/charts/sdc-wfd-fe/templates/deployment.yaml2
-rw-r--r--kubernetes/sdc/requirements.yaml2
-rw-r--r--kubernetes/sdnc/Chart.yaml2
-rw-r--r--kubernetes/sdnc/charts/dmaap-listener/Chart.yaml2
-rw-r--r--kubernetes/sdnc/charts/dmaap-listener/requirements.yaml2
-rw-r--r--kubernetes/sdnc/charts/dmaap-listener/templates/deployment.yaml2
-rw-r--r--kubernetes/sdnc/charts/dmaap-listener/values.yaml3
-rw-r--r--kubernetes/sdnc/charts/sdnc-ansible-server/Chart.yaml2
-rw-r--r--kubernetes/sdnc/charts/sdnc-ansible-server/requirements.yaml2
-rw-r--r--kubernetes/sdnc/charts/sdnc-ansible-server/templates/deployment.yaml2
-rw-r--r--kubernetes/sdnc/charts/sdnc-ansible-server/values.yaml1
-rw-r--r--kubernetes/sdnc/charts/sdnc-portal/Chart.yaml2
-rw-r--r--kubernetes/sdnc/charts/sdnc-portal/requirements.yaml2
-rw-r--r--kubernetes/sdnc/charts/sdnc-portal/templates/deployment.yaml2
-rw-r--r--kubernetes/sdnc/charts/sdnc-portal/values.yaml1
-rw-r--r--kubernetes/sdnc/charts/ueb-listener/Chart.yaml2
-rw-r--r--kubernetes/sdnc/charts/ueb-listener/requirements.yaml2
-rw-r--r--kubernetes/sdnc/charts/ueb-listener/templates/deployment.yaml2
-rw-r--r--kubernetes/sdnc/charts/ueb-listener/values.yaml1
-rw-r--r--kubernetes/sdnc/requirements.yaml11
-rwxr-xr-xkubernetes/sdnc/resources/config/conf/aaiclient.properties4
-rw-r--r--kubernetes/sdnc/sdnc-prom/Chart.yaml2
-rw-r--r--kubernetes/sdnc/sdnc-prom/requirements.yaml2
-rw-r--r--kubernetes/sdnc/sdnc-prom/templates/deployment.yaml2
-rw-r--r--kubernetes/sdnc/templates/statefulset.yaml2
-rw-r--r--kubernetes/sdnc/values.yaml1
-rw-r--r--kubernetes/sniro-emulator/Chart.yaml2
-rw-r--r--kubernetes/sniro-emulator/requirements.yaml2
-rw-r--r--kubernetes/sniro-emulator/templates/deployment.yaml2
-rwxr-xr-xkubernetes/so/Chart.yaml2
-rwxr-xr-xkubernetes/so/charts/so-bpmn-infra/Chart.yaml2
-rwxr-xr-xkubernetes/so/charts/so-bpmn-infra/templates/deployment.yaml2
-rwxr-xr-xkubernetes/so/charts/so-bpmn-infra/values.yaml1
-rwxr-xr-xkubernetes/so/charts/so-catalog-db-adapter/Chart.yaml2
-rwxr-xr-xkubernetes/so/charts/so-catalog-db-adapter/templates/deployment.yaml2
-rwxr-xr-xkubernetes/so/charts/so-catalog-db-adapter/values.yaml123
-rwxr-xr-xkubernetes/so/charts/so-db-secrets/Chart.yaml2
-rwxr-xr-xkubernetes/so/charts/so-mariadb/Chart.yaml2
-rwxr-xr-xkubernetes/so/charts/so-mariadb/templates/deployment.yaml2
-rwxr-xr-xkubernetes/so/charts/so-mariadb/values.yaml1
-rwxr-xr-xkubernetes/so/charts/so-openstack-adapter/Chart.yaml2
-rwxr-xr-xkubernetes/so/charts/so-openstack-adapter/templates/deployment.yaml2
-rwxr-xr-xkubernetes/so/charts/so-openstack-adapter/values.yaml1
-rwxr-xr-xkubernetes/so/charts/so-request-db-adapter/Chart.yaml2
-rwxr-xr-xkubernetes/so/charts/so-request-db-adapter/templates/deployment.yaml2
-rwxr-xr-xkubernetes/so/charts/so-request-db-adapter/values.yaml121
-rwxr-xr-xkubernetes/so/charts/so-sdc-controller/Chart.yaml2
-rwxr-xr-xkubernetes/so/charts/so-sdc-controller/templates/deployment.yaml2
-rwxr-xr-xkubernetes/so/charts/so-sdc-controller/values.yaml1
-rwxr-xr-xkubernetes/so/charts/so-sdnc-adapter/Chart.yaml2
-rwxr-xr-xkubernetes/so/charts/so-sdnc-adapter/templates/deployment.yaml2
-rwxr-xr-xkubernetes/so/charts/so-sdnc-adapter/values.yaml1
-rwxr-xr-xkubernetes/so/charts/so-vfc-adapter/Chart.yaml2
-rwxr-xr-xkubernetes/so/charts/so-vfc-adapter/templates/deployment.yaml2
-rwxr-xr-xkubernetes/so/charts/so-vfc-adapter/values.yaml1
-rwxr-xr-xkubernetes/so/requirements.yaml2
-rwxr-xr-xkubernetes/so/templates/deployment.yaml2
-rwxr-xr-xkubernetes/so/values.yaml1
-rw-r--r--kubernetes/uui/Chart.yaml2
-rw-r--r--kubernetes/uui/charts/uui-server/Chart.yaml2
-rw-r--r--kubernetes/uui/charts/uui-server/templates/deployment.yaml2
-rw-r--r--kubernetes/uui/charts/uui-server/values.yaml1
-rw-r--r--kubernetes/uui/requirements.yaml2
-rw-r--r--kubernetes/uui/templates/deployment.yaml2
-rw-r--r--kubernetes/uui/values.yaml1
-rw-r--r--kubernetes/vfc/Chart.yaml2
-rw-r--r--kubernetes/vfc/charts/vfc-catalog/Chart.yaml2
-rw-r--r--kubernetes/vfc/charts/vfc-catalog/templates/deployment.yaml2
-rw-r--r--kubernetes/vfc/charts/vfc-db/Chart.yaml2
-rw-r--r--kubernetes/vfc/charts/vfc-db/templates/deployment.yaml2
-rw-r--r--kubernetes/vfc/charts/vfc-ems-driver/Chart.yaml2
-rw-r--r--kubernetes/vfc/charts/vfc-ems-driver/templates/deployment.yaml2
-rw-r--r--kubernetes/vfc/charts/vfc-generic-vnfm-driver/Chart.yaml2
-rw-r--r--kubernetes/vfc/charts/vfc-generic-vnfm-driver/templates/deployment.yaml2
-rw-r--r--kubernetes/vfc/charts/vfc-huawei-vnfm-driver/Chart.yaml2
-rw-r--r--kubernetes/vfc/charts/vfc-huawei-vnfm-driver/templates/deployment.yaml2
-rw-r--r--kubernetes/vfc/charts/vfc-juju-vnfm-driver/Chart.yaml2
-rw-r--r--kubernetes/vfc/charts/vfc-juju-vnfm-driver/templates/deployment.yaml2
-rw-r--r--kubernetes/vfc/charts/vfc-multivim-proxy/Chart.yaml2
-rw-r--r--kubernetes/vfc/charts/vfc-multivim-proxy/templates/deployment.yaml2
-rw-r--r--kubernetes/vfc/charts/vfc-nokia-v2vnfm-driver/Chart.yaml2
-rw-r--r--kubernetes/vfc/charts/vfc-nokia-v2vnfm-driver/templates/deployment.yaml2
-rw-r--r--kubernetes/vfc/charts/vfc-nokia-vnfm-driver/Chart.yaml2
-rw-r--r--kubernetes/vfc/charts/vfc-nokia-vnfm-driver/templates/deployment.yaml2
-rw-r--r--kubernetes/vfc/charts/vfc-nslcm/Chart.yaml2
-rw-r--r--kubernetes/vfc/charts/vfc-nslcm/templates/deployment.yaml2
-rw-r--r--kubernetes/vfc/charts/vfc-resmgr/Chart.yaml2
-rw-r--r--kubernetes/vfc/charts/vfc-resmgr/templates/deployment.yaml2
-rw-r--r--kubernetes/vfc/charts/vfc-vnflcm/Chart.yaml2
-rw-r--r--kubernetes/vfc/charts/vfc-vnflcm/templates/deployment.yaml2
-rw-r--r--kubernetes/vfc/charts/vfc-vnfmgr/Chart.yaml2
-rw-r--r--kubernetes/vfc/charts/vfc-vnfmgr/templates/deployment.yaml2
-rw-r--r--kubernetes/vfc/charts/vfc-vnfres/Chart.yaml2
-rw-r--r--kubernetes/vfc/charts/vfc-vnfres/templates/deployment.yaml2
-rw-r--r--kubernetes/vfc/charts/vfc-workflow-engine/Chart.yaml2
-rw-r--r--kubernetes/vfc/charts/vfc-workflow-engine/templates/deployment.yaml2
-rw-r--r--kubernetes/vfc/charts/vfc-workflow/Chart.yaml2
-rw-r--r--kubernetes/vfc/charts/vfc-workflow/templates/deployment.yaml2
-rw-r--r--kubernetes/vfc/charts/vfc-zte-sdnc-driver/Chart.yaml2
-rw-r--r--kubernetes/vfc/charts/vfc-zte-sdnc-driver/templates/deployment.yaml2
-rw-r--r--kubernetes/vfc/charts/vfc-zte-vnfm-driver/Chart.yaml2
-rw-r--r--kubernetes/vfc/charts/vfc-zte-vnfm-driver/templates/deployment.yaml2
-rw-r--r--kubernetes/vfc/requirements.yaml2
-rw-r--r--kubernetes/vid/Chart.yaml2
-rw-r--r--kubernetes/vid/charts/vid-mariadb-galera/templates/statefulset.yaml2
-rw-r--r--kubernetes/vid/charts/vid-mariadb-galera/values.yaml5
-rw-r--r--kubernetes/vid/requirements.yaml2
-rw-r--r--kubernetes/vid/templates/deployment.yaml2
-rw-r--r--kubernetes/vid/values.yaml5
-rw-r--r--kubernetes/vnfsdk/Chart.yaml2
-rw-r--r--kubernetes/vnfsdk/requirements.yaml4
-rw-r--r--kubernetes/vnfsdk/templates/deployment.yaml2
-rw-r--r--kubernetes/vnfsdk/values.yaml3
505 files changed, 1275 insertions, 1039 deletions
diff --git a/kubernetes/aaf/Chart.yaml b/kubernetes/aaf/Chart.yaml
index 449fbe4e1f..6de2f28767 100644
--- a/kubernetes/aaf/Chart.yaml
+++ b/kubernetes/aaf/Chart.yaml
@@ -16,4 +16,4 @@
apiVersion: v1
description: ONAP Application Authorization Framework
name: aaf
-version: 2.0.0
+version: 3.0.0
diff --git a/kubernetes/aaf/charts/aaf-cm/Chart.yaml b/kubernetes/aaf/charts/aaf-cm/Chart.yaml
index 828142f70b..68c5ca2d70 100644
--- a/kubernetes/aaf/charts/aaf-cm/Chart.yaml
+++ b/kubernetes/aaf/charts/aaf-cm/Chart.yaml
@@ -16,4 +16,4 @@
apiVersion: v1
description: ONAP AAF Certificate Manager
name: aaf-cm
-version: 2.0.0
+version: 3.0.0
diff --git a/kubernetes/aaf/charts/aaf-cm/templates/deployment.yaml b/kubernetes/aaf/charts/aaf-cm/templates/deployment.yaml
index 50c617e543..11b0811af3 100644
--- a/kubernetes/aaf/charts/aaf-cm/templates/deployment.yaml
+++ b/kubernetes/aaf/charts/aaf-cm/templates/deployment.yaml
@@ -90,7 +90,7 @@ spec:
initialDelaySeconds: {{ .Values.readiness.initialDelaySeconds }}
periodSeconds: {{ .Values.readiness.periodSeconds }}
resources:
-{{ toYaml .Values.resources | indent 12 }}
+{{ include "common.resources" . | indent 12 }}
{{- if .Values.nodeSelector }}
nodeSelector:
{{ toYaml .Values.nodeSelector | indent 10 }}
diff --git a/kubernetes/aaf/charts/aaf-cm/values.yaml b/kubernetes/aaf/charts/aaf-cm/values.yaml
index 0f521823ef..1cd5cb4a26 100644
--- a/kubernetes/aaf/charts/aaf-cm/values.yaml
+++ b/kubernetes/aaf/charts/aaf-cm/values.yaml
@@ -19,7 +19,7 @@ global:
nodePortPrefix: 302
readinessRepository: oomk8s
readinessImage: readiness-check:2.0.0
-
+
#################################################################
# Application configuration defaults.
#################################################################
diff --git a/kubernetes/aaf/charts/aaf-cs/Chart.yaml b/kubernetes/aaf/charts/aaf-cs/Chart.yaml
index 92ea707aaa..e3197f28e6 100644
--- a/kubernetes/aaf/charts/aaf-cs/Chart.yaml
+++ b/kubernetes/aaf/charts/aaf-cs/Chart.yaml
@@ -15,4 +15,4 @@
apiVersion: v1
description: ONAP AAF cassandra
name: aaf-cs
-version: 2.0.0
+version: 3.0.0
diff --git a/kubernetes/aaf/charts/aaf-cs/templates/deployment.yaml b/kubernetes/aaf/charts/aaf-cs/templates/deployment.yaml
index 893c5acbde..cfece7093b 100644
--- a/kubernetes/aaf/charts/aaf-cs/templates/deployment.yaml
+++ b/kubernetes/aaf/charts/aaf-cs/templates/deployment.yaml
@@ -64,7 +64,7 @@ spec:
lifecycle:
postStart:
exec:
- command:
+ command:
- /bin/sh
- -c
- >
@@ -74,8 +74,8 @@ spec:
cqlsh -u root -p root -f init.cql ;
cqlsh -u root -p root -f osaaf.cql ;
cqlsh -u root -p root -f temp_identity.cql
- resources:
-{{ toYaml .Values.resources | indent 12 }}
+ resources:
+{{ include "common.resources" . | indent 12 }}
{{- if .Values.nodeSelector }}
nodeSelector:
{{ toYaml .Values.nodeSelector | indent 10 }}
diff --git a/kubernetes/aaf/charts/aaf-cs/values.yaml b/kubernetes/aaf/charts/aaf-cs/values.yaml
index 2131e851ad..83eaf15e38 100644
--- a/kubernetes/aaf/charts/aaf-cs/values.yaml
+++ b/kubernetes/aaf/charts/aaf-cs/values.yaml
@@ -60,7 +60,7 @@ service:
internalPort: 7000
#port
externalPort: 7000
-
+
internalPort2: 7001
externalPort2: 7001
internalPort3: 9042
diff --git a/kubernetes/aaf/charts/aaf-fs/Chart.yaml b/kubernetes/aaf/charts/aaf-fs/Chart.yaml
index 6b0fdcb6fd..eada78b8e3 100644
--- a/kubernetes/aaf/charts/aaf-fs/Chart.yaml
+++ b/kubernetes/aaf/charts/aaf-fs/Chart.yaml
@@ -15,4 +15,4 @@
apiVersion: v1
description: ONAP AAF File Server
name: aaf-fs
-version: 2.0.0 \ No newline at end of file
+version: 3.0.0 \ No newline at end of file
diff --git a/kubernetes/aaf/charts/aaf-fs/templates/deployment.yaml b/kubernetes/aaf/charts/aaf-fs/templates/deployment.yaml
index b100bc4338..d269dc6536 100644
--- a/kubernetes/aaf/charts/aaf-fs/templates/deployment.yaml
+++ b/kubernetes/aaf/charts/aaf-fs/templates/deployment.yaml
@@ -90,7 +90,7 @@ spec:
initialDelaySeconds: {{ .Values.readiness.initialDelaySeconds }}
periodSeconds: {{ .Values.readiness.periodSeconds }}
resources:
-{{ toYaml .Values.resources | indent 12 }}
+{{ include "common.resources" . | indent 12 }}
{{- if .Values.nodeSelector }}
nodeSelector:
{{ toYaml .Values.nodeSelector | indent 10 }}
diff --git a/kubernetes/aaf/charts/aaf-fs/values.yaml b/kubernetes/aaf/charts/aaf-fs/values.yaml
index 74fdc68878..f484883f71 100644
--- a/kubernetes/aaf/charts/aaf-fs/values.yaml
+++ b/kubernetes/aaf/charts/aaf-fs/values.yaml
@@ -19,7 +19,7 @@ global:
nodePortPrefix: 302
readinessRepository: oomk8s
readinessImage: readiness-check:2.0.0
-
+
#################################################################
# Application configuration defaults.
#################################################################
diff --git a/kubernetes/aaf/charts/aaf-gui/Chart.yaml b/kubernetes/aaf/charts/aaf-gui/Chart.yaml
index d0aea0b0e0..26d4a91422 100644
--- a/kubernetes/aaf/charts/aaf-gui/Chart.yaml
+++ b/kubernetes/aaf/charts/aaf-gui/Chart.yaml
@@ -15,4 +15,4 @@
apiVersion: v1
description: ONAP AAF GUI
name: aaf-gui
-version: 2.0.0 \ No newline at end of file
+version: 3.0.0 \ No newline at end of file
diff --git a/kubernetes/aaf/charts/aaf-gui/templates/deployment.yaml b/kubernetes/aaf/charts/aaf-gui/templates/deployment.yaml
index 1aa632b620..b24a008fac 100644
--- a/kubernetes/aaf/charts/aaf-gui/templates/deployment.yaml
+++ b/kubernetes/aaf/charts/aaf-gui/templates/deployment.yaml
@@ -90,7 +90,7 @@ spec:
initialDelaySeconds: {{ .Values.readiness.initialDelaySeconds }}
periodSeconds: {{ .Values.readiness.periodSeconds }}
resources:
-{{ toYaml .Values.resources | indent 12 }}
+{{ include "common.resources" . | indent 12 }}
{{- if .Values.nodeSelector }}
nodeSelector:
{{ toYaml .Values.nodeSelector | indent 10 }}
diff --git a/kubernetes/aaf/charts/aaf-hello/Chart.yaml b/kubernetes/aaf/charts/aaf-hello/Chart.yaml
index c4029ba80f..734cf140ca 100644
--- a/kubernetes/aaf/charts/aaf-hello/Chart.yaml
+++ b/kubernetes/aaf/charts/aaf-hello/Chart.yaml
@@ -15,4 +15,4 @@
apiVersion: v1
description: ONAP AAF Hello
name: aaf-hello
-version: 2.0.0 \ No newline at end of file
+version: 3.0.0 \ No newline at end of file
diff --git a/kubernetes/aaf/charts/aaf-hello/templates/deployment.yaml b/kubernetes/aaf/charts/aaf-hello/templates/deployment.yaml
index c9c82231b5..c76c0849ab 100644
--- a/kubernetes/aaf/charts/aaf-hello/templates/deployment.yaml
+++ b/kubernetes/aaf/charts/aaf-hello/templates/deployment.yaml
@@ -90,7 +90,7 @@ spec:
initialDelaySeconds: {{ .Values.readiness.initialDelaySeconds }}
periodSeconds: {{ .Values.readiness.periodSeconds }}
resources:
-{{ toYaml .Values.resources | indent 12 }}
+{{ include "common.resources" . | indent 12 }}
{{- if .Values.nodeSelector }}
nodeSelector:
{{ toYaml .Values.nodeSelector | indent 10 }}
diff --git a/kubernetes/aaf/charts/aaf-hello/values.yaml b/kubernetes/aaf/charts/aaf-hello/values.yaml
index 5a41bb33ef..27f59d1802 100644
--- a/kubernetes/aaf/charts/aaf-hello/values.yaml
+++ b/kubernetes/aaf/charts/aaf-hello/values.yaml
@@ -19,7 +19,7 @@ global:
nodePortPrefix: 302
readinessRepository: oomk8s
readinessImage: readiness-check:2.0.0
-
+
#################################################################
# Application configuration defaults.
#################################################################
diff --git a/kubernetes/aaf/charts/aaf-locate/Chart.yaml b/kubernetes/aaf/charts/aaf-locate/Chart.yaml
index db50ec392a..0f4bfd91ac 100644
--- a/kubernetes/aaf/charts/aaf-locate/Chart.yaml
+++ b/kubernetes/aaf/charts/aaf-locate/Chart.yaml
@@ -15,4 +15,4 @@
apiVersion: v1
description: ONAP AAF Locate
name: aaf-locate
-version: 2.0.0 \ No newline at end of file
+version: 3.0.0 \ No newline at end of file
diff --git a/kubernetes/aaf/charts/aaf-locate/templates/deployment.yaml b/kubernetes/aaf/charts/aaf-locate/templates/deployment.yaml
index 2adb92decd..6e69f2c7ef 100644
--- a/kubernetes/aaf/charts/aaf-locate/templates/deployment.yaml
+++ b/kubernetes/aaf/charts/aaf-locate/templates/deployment.yaml
@@ -88,7 +88,7 @@ spec:
initialDelaySeconds: {{ .Values.readiness.initialDelaySeconds }}
periodSeconds: {{ .Values.readiness.periodSeconds }}
resources:
-{{ toYaml .Values.resources | indent 12 }}
+{{ include "common.resources" . | indent 12 }}
{{- if .Values.nodeSelector }}
nodeSelector:
{{ toYaml .Values.nodeSelector | indent 10 }}
diff --git a/kubernetes/aaf/charts/aaf-locate/values.yaml b/kubernetes/aaf/charts/aaf-locate/values.yaml
index f31a2ca58c..86d67fc431 100644
--- a/kubernetes/aaf/charts/aaf-locate/values.yaml
+++ b/kubernetes/aaf/charts/aaf-locate/values.yaml
@@ -19,7 +19,7 @@ global:
nodePortPrefix: 302
readinessRepository: oomk8s
readinessImage: readiness-check:2.0.0
-
+
# If mountPath is over NFS (e.g. /dockerdata-nfs is NFS mounted between the nodes), uncomment following lines.
# persistence:
# mountPath: /dockerdata
diff --git a/kubernetes/aaf/charts/aaf-oauth/Chart.yaml b/kubernetes/aaf/charts/aaf-oauth/Chart.yaml
index bcb135b1e0..a5878812a5 100644
--- a/kubernetes/aaf/charts/aaf-oauth/Chart.yaml
+++ b/kubernetes/aaf/charts/aaf-oauth/Chart.yaml
@@ -15,4 +15,4 @@
apiVersion: v1
description: ONAP AAF OAuth
name: aaf-oauth
-version: 2.0.0 \ No newline at end of file
+version: 3.0.0 \ No newline at end of file
diff --git a/kubernetes/aaf/charts/aaf-oauth/templates/deployment.yaml b/kubernetes/aaf/charts/aaf-oauth/templates/deployment.yaml
index f2361858fe..fd4ae21708 100644
--- a/kubernetes/aaf/charts/aaf-oauth/templates/deployment.yaml
+++ b/kubernetes/aaf/charts/aaf-oauth/templates/deployment.yaml
@@ -90,7 +90,7 @@ spec:
initialDelaySeconds: {{ .Values.readiness.initialDelaySeconds }}
periodSeconds: {{ .Values.readiness.periodSeconds }}
resources:
-{{ toYaml .Values.resources | indent 12 }}
+{{ include "common.resources" . | indent 12 }}
{{- if .Values.nodeSelector }}
nodeSelector:
{{ toYaml .Values.nodeSelector | indent 10 }}
diff --git a/kubernetes/aaf/charts/aaf-oauth/values.yaml b/kubernetes/aaf/charts/aaf-oauth/values.yaml
index 6ac90e19ef..c349814f16 100644
--- a/kubernetes/aaf/charts/aaf-oauth/values.yaml
+++ b/kubernetes/aaf/charts/aaf-oauth/values.yaml
@@ -19,7 +19,7 @@ global:
nodePortPrefix: 302
readinessRepository: oomk8s
readinessImage: readiness-check:2.0.0
-
+
#################################################################
# Application configuration defaults.
#################################################################
diff --git a/kubernetes/aaf/charts/aaf-service/Chart.yaml b/kubernetes/aaf/charts/aaf-service/Chart.yaml
index 3461f1add1..42a33948f8 100644
--- a/kubernetes/aaf/charts/aaf-service/Chart.yaml
+++ b/kubernetes/aaf/charts/aaf-service/Chart.yaml
@@ -15,4 +15,4 @@
apiVersion: v1
description: ONAP AAF Service
name: aaf-service
-version: 2.0.0
+version: 3.0.0
diff --git a/kubernetes/aaf/charts/aaf-service/templates/deployment.yaml b/kubernetes/aaf/charts/aaf-service/templates/deployment.yaml
index cff8fb2e03..a07d06fd0a 100644
--- a/kubernetes/aaf/charts/aaf-service/templates/deployment.yaml
+++ b/kubernetes/aaf/charts/aaf-service/templates/deployment.yaml
@@ -90,7 +90,7 @@ spec:
initialDelaySeconds: {{ .Values.readiness.initialDelaySeconds }}
periodSeconds: {{ .Values.readiness.periodSeconds }}
resources:
-{{ toYaml .Values.resources | indent 12 }}
+{{ include "common.resources" . | indent 12 }}
{{- if .Values.nodeSelector }}
nodeSelector:
{{ toYaml .Values.nodeSelector | indent 10 }}
diff --git a/kubernetes/aaf/charts/aaf-sms/Chart.yaml b/kubernetes/aaf/charts/aaf-sms/Chart.yaml
index 71418759fb..ad633c591d 100644
--- a/kubernetes/aaf/charts/aaf-sms/Chart.yaml
+++ b/kubernetes/aaf/charts/aaf-sms/Chart.yaml
@@ -15,4 +15,4 @@
apiVersion: v1
description: ONAP Secret Management Service
name: aaf-sms
-version: 2.0.0
+version: 3.0.0
diff --git a/kubernetes/aaf/charts/aaf-sms/charts/aaf-sms-quorumclient/Chart.yaml b/kubernetes/aaf/charts/aaf-sms/charts/aaf-sms-quorumclient/Chart.yaml
index 4e279e7ced..d8f957e295 100644
--- a/kubernetes/aaf/charts/aaf-sms/charts/aaf-sms-quorumclient/Chart.yaml
+++ b/kubernetes/aaf/charts/aaf-sms/charts/aaf-sms-quorumclient/Chart.yaml
@@ -15,4 +15,4 @@
apiVersion: v1
description: ONAP Secret Management Service Quorum Client
name: aaf-sms-quorumclient
-version: 2.0.0
+version: 3.0.0
diff --git a/kubernetes/aaf/charts/aaf-sms/charts/aaf-sms-quorumclient/templates/statefulset.yaml b/kubernetes/aaf/charts/aaf-sms/charts/aaf-sms-quorumclient/templates/statefulset.yaml
index 281229f95c..5eb7b330ba 100644
--- a/kubernetes/aaf/charts/aaf-sms/charts/aaf-sms-quorumclient/templates/statefulset.yaml
+++ b/kubernetes/aaf/charts/aaf-sms/charts/aaf-sms-quorumclient/templates/statefulset.yaml
@@ -47,7 +47,7 @@ spec:
- mountPath: /quorumclient/auth
name: {{ include "common.fullname" . }}-auth
resources:
-{{ toYaml .Values.resources | indent 12 }}
+{{ include "common.resources" . | indent 12 }}
{{- if .Values.nodeSelector }}
nodeSelector:
{{ toYaml .Values.nodeSelector | indent 10 }}
diff --git a/kubernetes/aaf/charts/aaf-sms/charts/aaf-sms-vault/Chart.yaml b/kubernetes/aaf/charts/aaf-sms/charts/aaf-sms-vault/Chart.yaml
index 3f0b93ea0e..44a5a6b37a 100644
--- a/kubernetes/aaf/charts/aaf-sms/charts/aaf-sms-vault/Chart.yaml
+++ b/kubernetes/aaf/charts/aaf-sms/charts/aaf-sms-vault/Chart.yaml
@@ -16,4 +16,4 @@ apiVersion: v1
description: Chart to launch Vault as SMS backend
name: aaf-sms-vault
appVersion: 0.9.5
-version: 2.0.0
+version: 3.0.0
diff --git a/kubernetes/aaf/charts/aaf-sms/templates/deployment.yaml b/kubernetes/aaf/charts/aaf-sms/templates/deployment.yaml
index 58fe72f497..189cc0d57d 100644
--- a/kubernetes/aaf/charts/aaf-sms/templates/deployment.yaml
+++ b/kubernetes/aaf/charts/aaf-sms/templates/deployment.yaml
@@ -81,7 +81,7 @@ spec:
- mountPath: /sms/auth
name: {{ include "common.fullname" . }}-auth
resources:
-{{ toYaml .Values.resources | indent 12 }}
+{{ include "common.resources" . | indent 12 }}
{{- if .Values.nodeSelector }}
nodeSelector:
{{ toYaml .Values.nodeSelector | indent 10 }}
diff --git a/kubernetes/aaf/requirements.yaml b/kubernetes/aaf/requirements.yaml
index 1e8f788318..896eaf4baa 100644
--- a/kubernetes/aaf/requirements.yaml
+++ b/kubernetes/aaf/requirements.yaml
@@ -14,5 +14,5 @@
dependencies:
- name: common
- version: ~2.0.0
+ version: ~3.0.0
repository: '@local' \ No newline at end of file
diff --git a/kubernetes/aaf/templates/job.yaml b/kubernetes/aaf/templates/job.yaml
index 85c09402a2..719b6dc2c2 100644
--- a/kubernetes/aaf/templates/job.yaml
+++ b/kubernetes/aaf/templates/job.yaml
@@ -56,7 +56,7 @@ spec:
- mountPath: /data
name: aaf-persistent-data
- mountPath: /data1/etc
- name: aaf-etc
+ name: aaf-etc
- mountPath: /data1/data
name: aaf-data
- mountPath: /data1/public/iframe_denied_test.html
@@ -102,8 +102,8 @@ spec:
name: aaf-backup
- mountPath: /share
name: aaf-public
- resources:
-{{ toYaml .Values.resources | indent 12 }}
+ resources:
+{{ include "common.resources" . | indent 12 }}
{{- if .Values.nodeSelector }}
nodeSelector:
{{ toYaml .Values.nodeSelector | indent 10 }}
diff --git a/kubernetes/aaf/values.yaml b/kubernetes/aaf/values.yaml
index 19250d8f69..c8f048438b 100644
--- a/kubernetes/aaf/values.yaml
+++ b/kubernetes/aaf/values.yaml
@@ -21,13 +21,13 @@ global:
readinessImage: readiness-check:2.0.0
ubuntuInitRepository: registry.hub.docker.com
ubuntuInitImage: oomk8s/ubuntu-init:2.0.0
- persistence:
+ persistence:
enabled: true
#################################################################
# Application configuration defaults.
#################################################################
-config:
+config:
serviceServiceName: aaf-service
locateServiceName: aaf-locate
cmServiceName: aaf-cm
diff --git a/kubernetes/aai/Chart.yaml b/kubernetes/aai/Chart.yaml
index 549a3c7d9c..48cc33b148 100644
--- a/kubernetes/aai/Chart.yaml
+++ b/kubernetes/aai/Chart.yaml
@@ -16,4 +16,4 @@
apiVersion: v1
description: ONAP Active and Available Inventory
name: aai
-version: 2.0.0
+version: 3.0.0
diff --git a/kubernetes/aai/charts/aai-babel/Chart.yaml b/kubernetes/aai/charts/aai-babel/Chart.yaml
index d17b44a27f..d0311c189b 100644
--- a/kubernetes/aai/charts/aai-babel/Chart.yaml
+++ b/kubernetes/aai/charts/aai-babel/Chart.yaml
@@ -16,4 +16,4 @@
apiVersion: v1
description: Babel microservice
name: aai-babel
-version: 2.0.0
+version: 3.0.0
diff --git a/kubernetes/aai/charts/aai-babel/requirements.yaml b/kubernetes/aai/charts/aai-babel/requirements.yaml
index 645b7bd92b..6566196ceb 100644
--- a/kubernetes/aai/charts/aai-babel/requirements.yaml
+++ b/kubernetes/aai/charts/aai-babel/requirements.yaml
@@ -15,7 +15,7 @@
dependencies:
- name: common
- version: ~2.0.0
+ version: ~3.0.0
# local reference to common chart, as it is
# a part of this chart's package and will not
# be published independently to a repo (at this point)
diff --git a/kubernetes/aai/charts/aai-babel/templates/deployment.yaml b/kubernetes/aai/charts/aai-babel/templates/deployment.yaml
index 2f8f60f708..c2aa6e428e 100644
--- a/kubernetes/aai/charts/aai-babel/templates/deployment.yaml
+++ b/kubernetes/aai/charts/aai-babel/templates/deployment.yaml
@@ -85,7 +85,7 @@ spec:
name: {{ include "common.fullname" . }}-config
subPath: logback.xml
resources:
-{{ toYaml (pluck .Values.flavor .Values.resources| first) | indent 12 }}
+{{ include "common.resources" . | indent 12 }}
{{- if .Values.nodeSelector }}
nodeSelector:
{{ toYaml .Values.nodeSelector | indent 10 }}
diff --git a/kubernetes/aai/charts/aai-babel/values.yaml b/kubernetes/aai/charts/aai-babel/values.yaml
index 01b4dfc759..59c336660c 100644
--- a/kubernetes/aai/charts/aai-babel/values.yaml
+++ b/kubernetes/aai/charts/aai-babel/values.yaml
@@ -78,3 +78,4 @@ resources:
requests:
cpu: 4
memory: 8Gi
+ unlimited: {}
diff --git a/kubernetes/aai/charts/aai-cassandra/Chart.yaml b/kubernetes/aai/charts/aai-cassandra/Chart.yaml
index f36474c1d3..1de4ecf177 100644
--- a/kubernetes/aai/charts/aai-cassandra/Chart.yaml
+++ b/kubernetes/aai/charts/aai-cassandra/Chart.yaml
@@ -16,4 +16,4 @@
apiVersion: v1
description: ONAP AAI Cassandra
name: aai-cassandra
-version: 2.0.0
+version: 3.0.0
diff --git a/kubernetes/aai/charts/aai-cassandra/templates/statefulset.yaml b/kubernetes/aai/charts/aai-cassandra/templates/statefulset.yaml
index 4c4b979cd3..891526bc21 100644
--- a/kubernetes/aai/charts/aai-cassandra/templates/statefulset.yaml
+++ b/kubernetes/aai/charts/aai-cassandra/templates/statefulset.yaml
@@ -92,7 +92,7 @@ spec:
- name: cassandra-data
mountPath: /var/lib/cassandra
resources:
-{{ toYaml .Values.resources | indent 10 }}
+{{ include "common.resources" . | indent 10 }}
{{- if .Values.nodeSelector }}
nodeSelector:
{{ toYaml .Values.nodeSelector | indent 8 }}
diff --git a/kubernetes/aai/charts/aai-cassandra/values.yaml b/kubernetes/aai/charts/aai-cassandra/values.yaml
index 22055d6e90..1e1d2c1c2f 100644
--- a/kubernetes/aai/charts/aai-cassandra/values.yaml
+++ b/kubernetes/aai/charts/aai-cassandra/values.yaml
@@ -100,7 +100,7 @@ persistence:
storageType: local
storageClass: ""
-
+
resources: {}
# We usually recommend not to specify default resources and to leave this as a conscious
# choice for the user. This also increases chances charts run on environments with little
diff --git a/kubernetes/aai/charts/aai-champ/Chart.yaml b/kubernetes/aai/charts/aai-champ/Chart.yaml
index 73d66bff4f..5276f75fc7 100644
--- a/kubernetes/aai/charts/aai-champ/Chart.yaml
+++ b/kubernetes/aai/charts/aai-champ/Chart.yaml
@@ -16,4 +16,4 @@
apiVersion: v1
description: ONAP AAI Champ microservice
name: aai-champ
-version: 2.0.0
+version: 3.0.0
diff --git a/kubernetes/aai/charts/aai-champ/requirements.yaml b/kubernetes/aai/charts/aai-champ/requirements.yaml
index 645b7bd92b..6566196ceb 100644
--- a/kubernetes/aai/charts/aai-champ/requirements.yaml
+++ b/kubernetes/aai/charts/aai-champ/requirements.yaml
@@ -15,7 +15,7 @@
dependencies:
- name: common
- version: ~2.0.0
+ version: ~3.0.0
# local reference to common chart, as it is
# a part of this chart's package and will not
# be published independently to a repo (at this point)
diff --git a/kubernetes/aai/charts/aai-champ/templates/deployment.yaml b/kubernetes/aai/charts/aai-champ/templates/deployment.yaml
index 4987e4a05d..0c125b126f 100644
--- a/kubernetes/aai/charts/aai-champ/templates/deployment.yaml
+++ b/kubernetes/aai/charts/aai-champ/templates/deployment.yaml
@@ -86,7 +86,7 @@ spec:
- mountPath: /var/log/onap
name: {{ include "common.fullname" . }}-logs
resources:
-{{ toYaml (pluck .Values.flavor .Values.resources| first) | indent 12 }}
+{{ include "common.resources" . | indent 12 }}
{{- if .Values.nodeSelector }}
nodeSelector:
{{ toYaml .Values.nodeSelector | indent 10 }}
diff --git a/kubernetes/aai/charts/aai-champ/values.yaml b/kubernetes/aai/charts/aai-champ/values.yaml
index 75ecffb473..9e1c9bd23b 100644
--- a/kubernetes/aai/charts/aai-champ/values.yaml
+++ b/kubernetes/aai/charts/aai-champ/values.yaml
@@ -77,6 +77,7 @@ resources:
requests:
cpu: 4
memory: 8Gi
+ unlimited: {}
# XML beans configuration
event:
diff --git a/kubernetes/aai/charts/aai-data-router/Chart.yaml b/kubernetes/aai/charts/aai-data-router/Chart.yaml
index 1e5b950683..da4de97ffd 100644
--- a/kubernetes/aai/charts/aai-data-router/Chart.yaml
+++ b/kubernetes/aai/charts/aai-data-router/Chart.yaml
@@ -15,4 +15,4 @@
apiVersion: v1
description: ONAP AAI Data-Router
name: aai-data-router
-version: 2.0.0
+version: 3.0.0
diff --git a/kubernetes/aai/charts/aai-data-router/templates/deployment.yaml b/kubernetes/aai/charts/aai-data-router/templates/deployment.yaml
index 585cc4ff3d..8ab2d3383a 100644
--- a/kubernetes/aai/charts/aai-data-router/templates/deployment.yaml
+++ b/kubernetes/aai/charts/aai-data-router/templates/deployment.yaml
@@ -111,7 +111,7 @@ spec:
initialDelaySeconds: {{ .Values.readiness.initialDelaySeconds }}
periodSeconds: {{ .Values.readiness.periodSeconds }}
resources:
-{{ toYaml (pluck .Values.flavor .Values.resources| first) | indent 12 }}
+{{ include "common.resources" . | indent 12 }}
volumes:
- name: localtime
hostPath:
diff --git a/kubernetes/aai/charts/aai-data-router/values.yaml b/kubernetes/aai/charts/aai-data-router/values.yaml
index 06c64c30d7..ba4258257a 100644
--- a/kubernetes/aai/charts/aai-data-router/values.yaml
+++ b/kubernetes/aai/charts/aai-data-router/values.yaml
@@ -82,23 +82,6 @@ persistence:
mountPath: /dockerdata-nfs
mountSubPath: aai/data-router/logs
- # We usually recommend not to specify default resources and to leave this as a conscious
- # choice for the user. This also increases chances charts run on environments with little
- # resources, such as Minikube. If you do want to specify resources, uncomment the following
- # lines, adjust them as necessary, and remove the curly braces after 'resources:'.
- #
- # Example:
- # Configure resource requests and limits
- # ref: http://kubernetes.io/docs/user-guide/compute-resources/
- # Minimum memory for development is 2 CPU cores and 4GB memory
- # Minimum memory for production is 4 CPU cores and 8GB memory
-#resources:
-# limits:
-# cpu: 2
-# memory: 4Gi
-# requests:
-# cpu: 2
-# memory: 4Gi
resources:
small:
limits:
@@ -114,3 +97,4 @@ resources:
requests:
cpu: 4
memory: 8Gi
+ unlimited: {} \ No newline at end of file
diff --git a/kubernetes/aai/charts/aai-elasticsearch/Chart.yaml b/kubernetes/aai/charts/aai-elasticsearch/Chart.yaml
index b354ce450c..9b832249c1 100644
--- a/kubernetes/aai/charts/aai-elasticsearch/Chart.yaml
+++ b/kubernetes/aai/charts/aai-elasticsearch/Chart.yaml
@@ -15,4 +15,4 @@
apiVersion: v1
description: ONAP AAI elasticsearch
name: aai-elasticsearch
-version: 2.0.0
+version: 3.0.0
diff --git a/kubernetes/aai/charts/aai-elasticsearch/templates/deployment.yaml b/kubernetes/aai/charts/aai-elasticsearch/templates/deployment.yaml
index e1f3b39542..a6c93b8ea0 100644
--- a/kubernetes/aai/charts/aai-elasticsearch/templates/deployment.yaml
+++ b/kubernetes/aai/charts/aai-elasticsearch/templates/deployment.yaml
@@ -87,7 +87,7 @@ spec:
- name: elasticsearch-data
mountPath: /usr/share/elasticsearch/data
resources:
-{{ toYaml (pluck .Values.flavor .Values.resources| first) | indent 12 }}
+{{ include "common.resources" . | indent 12 }}
{{- if .Values.nodeSelector }}
nodeSelector:
{{ toYaml .Values.nodeSelector | indent 8 }}
diff --git a/kubernetes/aai/charts/aai-elasticsearch/values.yaml b/kubernetes/aai/charts/aai-elasticsearch/values.yaml
index c6afbb5ee4..a800c4e7d5 100644
--- a/kubernetes/aai/charts/aai-elasticsearch/values.yaml
+++ b/kubernetes/aai/charts/aai-elasticsearch/values.yaml
@@ -80,23 +80,6 @@ persistence:
mountPath: /dockerdata-nfs
mountSubPath: aai/elasticsearch/data
- # We usually recommend not to specify default resources and to leave this as a conscious
- # choice for the user. This also increases chances charts run on environments with little
- # resources, such as Minikube. If you do want to specify resources, uncomment the following
- # lines, adjust them as necessary, and remove the curly braces after 'resources:'.
- #
- # Example:
- # Configure resource requests and limits
- # ref: http://kubernetes.io/docs/user-guide/compute-resources/
- # Minimum memory for development is 2 CPU cores and 4GB memory
- # Minimum memory for production is 4 CPU cores and 8GB memory
-#resources:
-# limits:
-# cpu: 2
-# memory: 4Gi
-# requests:
-# cpu: 2
-# memory: 4Gi
resources:
small:
limits:
@@ -112,3 +95,4 @@ resources:
requests:
cpu: 4
memory: 8Gi
+ unlimited: {}
diff --git a/kubernetes/aai/charts/aai-gizmo/Chart.yaml b/kubernetes/aai/charts/aai-gizmo/Chart.yaml
index b619c7009c..19ba3f63b6 100644
--- a/kubernetes/aai/charts/aai-gizmo/Chart.yaml
+++ b/kubernetes/aai/charts/aai-gizmo/Chart.yaml
@@ -16,4 +16,4 @@
apiVersion: v1
description: Gizmo service
name: aai-gizmo
-version: 2.0.0
+version: 3.0.0
diff --git a/kubernetes/aai/charts/aai-gizmo/templates/deployment.yaml b/kubernetes/aai/charts/aai-gizmo/templates/deployment.yaml
index d36ae2f874..278a8f5ffa 100644
--- a/kubernetes/aai/charts/aai-gizmo/templates/deployment.yaml
+++ b/kubernetes/aai/charts/aai-gizmo/templates/deployment.yaml
@@ -89,7 +89,7 @@ spec:
name: {{ include "common.fullname" . }}-logback-config
subPath: logback.xml
resources:
-{{ toYaml (pluck .Values.flavor .Values.resources| first) | indent 12 }}
+{{ include "common.resources" . | indent 12 }}
{{- if .Values.nodeSelector }}
nodeSelector:
{{ toYaml .Values.nodeSelector | indent 10 }}
diff --git a/kubernetes/aai/charts/aai-gizmo/values.yaml b/kubernetes/aai/charts/aai-gizmo/values.yaml
index d34ff2b612..6ad25c5246 100644
--- a/kubernetes/aai/charts/aai-gizmo/values.yaml
+++ b/kubernetes/aai/charts/aai-gizmo/values.yaml
@@ -74,3 +74,4 @@ resources:
requests:
cpu: 4
memory: 8Gi
+ unlimited: {}
diff --git a/kubernetes/aai/charts/aai-graphadmin/Chart.yaml b/kubernetes/aai/charts/aai-graphadmin/Chart.yaml
index 0b4de7c749..a052da8046 100644
--- a/kubernetes/aai/charts/aai-graphadmin/Chart.yaml
+++ b/kubernetes/aai/charts/aai-graphadmin/Chart.yaml
@@ -20,4 +20,4 @@
apiVersion: v1
description: ONAP AAI GraphAdmin
name: aai-graphadmin
-version: 2.0.0
+version: 3.0.0
diff --git a/kubernetes/aai/charts/aai-graphadmin/templates/deployment.yaml b/kubernetes/aai/charts/aai-graphadmin/templates/deployment.yaml
index 69aeb326e2..5b23fa6064 100644
--- a/kubernetes/aai/charts/aai-graphadmin/templates/deployment.yaml
+++ b/kubernetes/aai/charts/aai-graphadmin/templates/deployment.yaml
@@ -123,7 +123,7 @@ spec:
initialDelaySeconds: {{ .Values.readiness.initialDelaySeconds }}
periodSeconds: {{ .Values.readiness.periodSeconds }}
resources:
-{{ toYaml (pluck .Values.flavor .Values.resources| first) | indent 12 }}
+{{ include "common.resources" . | indent 12 }}
{{- if .Values.nodeSelector }}
nodeSelector:
{{ toYaml .Values.nodeSelector | indent 8 }}
diff --git a/kubernetes/aai/charts/aai-graphadmin/templates/job.yaml b/kubernetes/aai/charts/aai-graphadmin/templates/job.yaml
index 0a8ed5c038..fb2ee005d4 100644
--- a/kubernetes/aai/charts/aai-graphadmin/templates/job.yaml
+++ b/kubernetes/aai/charts/aai-graphadmin/templates/job.yaml
@@ -111,7 +111,7 @@ spec:
subPath: {{ . }}
{{ end }}
resources:
-{{ toYaml .Values.resources | indent 10 }}
+{{ include "common.resources" . | indent 10 }}
{{- if .Values.nodeSelector }}
nodeSelector:
{{ toYaml .Values.nodeSelector | indent 8 }}
diff --git a/kubernetes/aai/charts/aai-graphadmin/values.yaml b/kubernetes/aai/charts/aai-graphadmin/values.yaml
index 3b7bd60ba7..b7af3d0bd7 100644
--- a/kubernetes/aai/charts/aai-graphadmin/values.yaml
+++ b/kubernetes/aai/charts/aai-graphadmin/values.yaml
@@ -44,10 +44,10 @@ config:
limit: 180000
# Default maximum records to fix for the data grooming and dupeTool
- maxFix:
+ maxFix:
dataGrooming: 150
dupeTool: 25
-
+
# Default number of sleep minutes for dataGrooming and dupeTool
sleepMinutes:
dataGrooming: 7
@@ -107,23 +107,6 @@ service:
ingress:
enabled: false
- # We usually recommend not to specify default resources and to leave this as a conscious
- # choice for the user. This also increases chances charts run on environments with little
- # resources, such as Minikube. If you do want to specify resources, uncomment the following
- # lines, adjust them as necessary, and remove the curly braces after 'resources:'.
- #
- # Example:
- # Configure resource requests and limits
- # ref: http://kubernetes.io/docs/user-guide/compute-resources/
- # Minimum memory for development is 2 CPU cores and 4GB memory
- # Minimum memory for production is 4 CPU cores and 8GB memory
-#resources:
-# limits:
-# cpu: 2
-# memory: 4Gi
-# requests:
-# cpu: 2
-# memory: 4Gi
resources:
small:
limits:
@@ -139,3 +122,4 @@ resources:
requests:
cpu: 4
memory: 8Gi
+ unlimited: {}
diff --git a/kubernetes/aai/charts/aai-modelloader/Chart.yaml b/kubernetes/aai/charts/aai-modelloader/Chart.yaml
index 507624c4bc..e2b0027337 100644
--- a/kubernetes/aai/charts/aai-modelloader/Chart.yaml
+++ b/kubernetes/aai/charts/aai-modelloader/Chart.yaml
@@ -15,4 +15,4 @@
apiVersion: v1
description: ONAP AAI modelloader
name: aai-modelloader
-version: 2.0.0
+version: 3.0.0
diff --git a/kubernetes/aai/charts/aai-modelloader/templates/deployment.yaml b/kubernetes/aai/charts/aai-modelloader/templates/deployment.yaml
index cee081859b..3a81168caf 100644
--- a/kubernetes/aai/charts/aai-modelloader/templates/deployment.yaml
+++ b/kubernetes/aai/charts/aai-modelloader/templates/deployment.yaml
@@ -60,7 +60,7 @@ spec:
- containerPort: {{ .Values.service.internalPort }}
- containerPort: {{ .Values.service.internalPort2 }}
resources:
-{{ toYaml (pluck .Values.flavor .Values.resources| first) | indent 12 }}
+{{ include "common.resources" . | indent 12 }}
# side car containers
- name: filebeat-onap
diff --git a/kubernetes/aai/charts/aai-modelloader/values.yaml b/kubernetes/aai/charts/aai-modelloader/values.yaml
index e406443a6d..1617fc08a7 100644
--- a/kubernetes/aai/charts/aai-modelloader/values.yaml
+++ b/kubernetes/aai/charts/aai-modelloader/values.yaml
@@ -61,23 +61,7 @@ service:
ingress:
enabled: false
- # We usually recommend not to specify default resources and to leave this as a conscious
- # choice for the user. This also increases chances charts run on environments with little
- # resources, such as Minikube. If you do want to specify resources, uncomment the following
- # lines, adjust them as necessary, and remove the curly braces after 'resources:'.
- #
- # Example:
- # Configure resource requests and limits
- # ref: http://kubernetes.io/docs/user-guide/compute-resources/
- # Minimum memory for development is 2 CPU cores and 4GB memory
- # Minimum memory for production is 4 CPU cores and 8GB memory
-#resources:
-# limits:
-# cpu: 2
-# memory: 4Gi
-# requests:
-# cpu: 2
-# memory: 4Gi
+
resources:
small:
limits:
@@ -93,3 +77,4 @@ resources:
requests:
cpu: 4
memory: 8Gi
+ unlimited: {}
diff --git a/kubernetes/aai/charts/aai-resources/Chart.yaml b/kubernetes/aai/charts/aai-resources/Chart.yaml
index bbb845da97..2954c7f077 100644
--- a/kubernetes/aai/charts/aai-resources/Chart.yaml
+++ b/kubernetes/aai/charts/aai-resources/Chart.yaml
@@ -16,4 +16,4 @@
apiVersion: v1
description: ONAP AAI resources
name: aai-resources
-version: 2.0.0
+version: 3.0.0
diff --git a/kubernetes/aai/charts/aai-resources/templates/deployment.yaml b/kubernetes/aai/charts/aai-resources/templates/deployment.yaml
index 065e1307dd..04549dfb94 100644
--- a/kubernetes/aai/charts/aai-resources/templates/deployment.yaml
+++ b/kubernetes/aai/charts/aai-resources/templates/deployment.yaml
@@ -520,7 +520,7 @@ spec:
initialDelaySeconds: {{ .Values.readiness.initialDelaySeconds }}
periodSeconds: {{ .Values.readiness.periodSeconds }}
resources:
-{{ toYaml (pluck .Values.flavor .Values.resources| first) | indent 12 }}
+{{ include "common.resources" . | indent 12 }}
{{- if .Values.nodeSelector }}
nodeSelector:
{{ toYaml .Values.nodeSelector | indent 8 }}
diff --git a/kubernetes/aai/charts/aai-resources/values.yaml b/kubernetes/aai/charts/aai-resources/values.yaml
index e9a0063f6a..8e50ba0421 100644
--- a/kubernetes/aai/charts/aai-resources/values.yaml
+++ b/kubernetes/aai/charts/aai-resources/values.yaml
@@ -35,10 +35,10 @@ config:
# Specifies crud related operation timeouts and overrides
crud:
timeout:
- # Specifies if the timeout for REST GET calls should be enabled
+ # Specifies if the timeout for REST GET calls should be enabled
enabled: true
# Specifies the timeout values for application specific
- # Its a pipe seperated list where each element before comma represents
+ # Its a pipe seperated list where each element before comma represents
# the X-FromAppId and the comma after specifies the timeout limit in ms
# If the timeout limit is -1 then it means for these apps no timeout
appspecific: JUNITTESTAPP1,1|JUNITTESTAPP2,-1|DCAE-CCS,-1|DCAES,-1|AAIRctFeed,-1|NewvceCreator,-1|IANewvceCreator,-1|AAI-CSIOVALS,-1
@@ -111,3 +111,4 @@ resources:
requests:
cpu: 4
memory: 8Gi
+ unlimited: {}
diff --git a/kubernetes/aai/charts/aai-search-data/Chart.yaml b/kubernetes/aai/charts/aai-search-data/Chart.yaml
index fcb79f1ce9..f0f24db189 100644
--- a/kubernetes/aai/charts/aai-search-data/Chart.yaml
+++ b/kubernetes/aai/charts/aai-search-data/Chart.yaml
@@ -15,4 +15,4 @@
apiVersion: v1
description: ONAP AAI search-data
name: aai-search-data
-version: 2.0.0
+version: 3.0.0
diff --git a/kubernetes/aai/charts/aai-search-data/templates/deployment.yaml b/kubernetes/aai/charts/aai-search-data/templates/deployment.yaml
index e486143e96..e68a205319 100644
--- a/kubernetes/aai/charts/aai-search-data/templates/deployment.yaml
+++ b/kubernetes/aai/charts/aai-search-data/templates/deployment.yaml
@@ -93,7 +93,7 @@ spec:
initialDelaySeconds: {{ .Values.readiness.initialDelaySeconds }}
periodSeconds: {{ .Values.readiness.periodSeconds }}
resources:
-{{ toYaml (pluck .Values.flavor .Values.resources| first) | indent 12 }}
+{{ include "common.resources" . | indent 12 }}
{{- if .Values.nodeSelector }}
nodeSelector:
{{ toYaml .Values.nodeSelector | indent 8 }}
diff --git a/kubernetes/aai/charts/aai-search-data/values.yaml b/kubernetes/aai/charts/aai-search-data/values.yaml
index bfde398e91..b58350cac4 100644
--- a/kubernetes/aai/charts/aai-search-data/values.yaml
+++ b/kubernetes/aai/charts/aai-search-data/values.yaml
@@ -61,23 +61,6 @@ service:
ingress:
enabled: false
- # We usually recommend not to specify default resources and to leave this as a conscious
- # choice for the user. This also increases chances charts run on environments with little
- # resources, such as Minikube. If you do want to specify resources, uncomment the following
- # lines, adjust them as necessary, and remove the curly braces after 'resources:'.
- #
- # Example:
- # Configure resource requests and limits
- # ref: http://kubernetes.io/docs/user-guide/compute-resources/
- # Minimum memory for development is 2 CPU cores and 4GB memory
- # Minimum memory for production is 4 CPU cores and 8GB memory
-#resources:
-# limits:
-# cpu: 2
-# memory: 4Gi
-# requests:
-# cpu: 2
-# memory: 4Gi
resources:
small:
limits:
@@ -93,3 +76,4 @@ resources:
requests:
cpu: 4
memory: 8Gi
+ unlimited: {}
diff --git a/kubernetes/aai/charts/aai-sparky-be/Chart.yaml b/kubernetes/aai/charts/aai-sparky-be/Chart.yaml
index 844ba8bbb3..5ba96af086 100644
--- a/kubernetes/aai/charts/aai-sparky-be/Chart.yaml
+++ b/kubernetes/aai/charts/aai-sparky-be/Chart.yaml
@@ -15,4 +15,4 @@
apiVersion: v1
description: ONAP AAI sparky-be
name: aai-sparky-be
-version: 2.0.0
+version: 3.0.0
diff --git a/kubernetes/aai/charts/aai-sparky-be/templates/deployment.yaml b/kubernetes/aai/charts/aai-sparky-be/templates/deployment.yaml
index a6414ddb76..3ecbd80340 100644
--- a/kubernetes/aai/charts/aai-sparky-be/templates/deployment.yaml
+++ b/kubernetes/aai/charts/aai-sparky-be/templates/deployment.yaml
@@ -117,7 +117,7 @@ spec:
initialDelaySeconds: {{ .Values.readiness.initialDelaySeconds }}
periodSeconds: {{ .Values.readiness.periodSeconds }}
resources:
-{{ toYaml (pluck .Values.flavor .Values.resources| first) | indent 12 }}
+{{ include "common.resources" . | indent 12 }}
{{- if .Values.nodeSelector }}
nodeSelector:
{{ toYaml .Values.nodeSelector | indent 8 }}
diff --git a/kubernetes/aai/charts/aai-sparky-be/values.yaml b/kubernetes/aai/charts/aai-sparky-be/values.yaml
index 47b5a1d79a..a323d2987a 100644
--- a/kubernetes/aai/charts/aai-sparky-be/values.yaml
+++ b/kubernetes/aai/charts/aai-sparky-be/values.yaml
@@ -82,23 +82,8 @@ service:
ingress:
enabled: false
- # We usually recommend not to specify default resources and to leave this as a conscious
- # choice for the user. This also increases chances charts run on environments with little
- # resources, such as Minikube. If you do want to specify resources, uncomment the following
- # lines, adjust them as necessary, and remove the curly braces after 'resources:'.
- #
- # Example:
- # Configure resource requests and limits
- # ref: http://kubernetes.io/docs/user-guide/compute-resources/
- # Minimum memory for development is 2 CPU cores and 4GB memory
- # Minimum memory for production is 4 CPU cores and 8GB memory
-#resources:
-# limits:
-# cpu: 2
-# memory: 4Gi
-# requests:
-# cpu: 2
-# memory: 4Gi
+# Configure resource requests and limits
+# ref: http://kubernetes.io/docs/user-guide/compute-resources/
resources:
small:
limits:
@@ -114,3 +99,4 @@ resources:
requests:
cpu: 4
memory: 8Gi
+ unlimited: {}
diff --git a/kubernetes/aai/charts/aai-spike/Chart.yaml b/kubernetes/aai/charts/aai-spike/Chart.yaml
index b9fd7b0fe0..4f43b242eb 100644
--- a/kubernetes/aai/charts/aai-spike/Chart.yaml
+++ b/kubernetes/aai/charts/aai-spike/Chart.yaml
@@ -15,4 +15,4 @@
apiVersion: v1
description: ONAP AAI Spike microservice
name: aai-spike
-version: 2.0.0 \ No newline at end of file
+version: 3.0.0 \ No newline at end of file
diff --git a/kubernetes/aai/charts/aai-spike/requirements.yaml b/kubernetes/aai/charts/aai-spike/requirements.yaml
index 9552dfd9e0..ebeaffff74 100644
--- a/kubernetes/aai/charts/aai-spike/requirements.yaml
+++ b/kubernetes/aai/charts/aai-spike/requirements.yaml
@@ -14,7 +14,7 @@
dependencies:
- name: common
- version: ~2.0.0
+ version: ~3.0.0
# local reference to common chart, as it is
# a part of this chart's package and will not
# be published independently to a repo (at this point)
diff --git a/kubernetes/aai/charts/aai-spike/templates/deployment.yaml b/kubernetes/aai/charts/aai-spike/templates/deployment.yaml
index a6801e1b14..38c5ac8a83 100644
--- a/kubernetes/aai/charts/aai-spike/templates/deployment.yaml
+++ b/kubernetes/aai/charts/aai-spike/templates/deployment.yaml
@@ -103,7 +103,7 @@ spec:
- mountPath: /var/log/onap
name: {{ include "common.fullname" . }}-logs
resources:
-{{ toYaml (pluck .Values.flavor .Values.resources| first) | indent 12 }}
+{{ include "common.resources" . | indent 12 }}
{{- if .Values.nodeSelector }}
nodeSelector:
{{ toYaml .Values.nodeSelector | indent 10 }}
diff --git a/kubernetes/aai/charts/aai-spike/values.yaml b/kubernetes/aai/charts/aai-spike/values.yaml
index 4fc3a0bdd4..af59f9a5ec 100644
--- a/kubernetes/aai/charts/aai-spike/values.yaml
+++ b/kubernetes/aai/charts/aai-spike/values.yaml
@@ -75,6 +75,7 @@ resources:
requests:
cpu: 4
memory: 8Gi
+ unlimited: {}
# XML bean configuration
event:
diff --git a/kubernetes/aai/charts/aai-traversal/Chart.yaml b/kubernetes/aai/charts/aai-traversal/Chart.yaml
index 15f69167e1..f7e6a12bed 100644
--- a/kubernetes/aai/charts/aai-traversal/Chart.yaml
+++ b/kubernetes/aai/charts/aai-traversal/Chart.yaml
@@ -15,4 +15,4 @@
apiVersion: v1
description: ONAP AAI traversal
name: aai-traversal
-version: 2.0.0
+version: 3.0.0
diff --git a/kubernetes/aai/charts/aai-traversal/templates/deployment.yaml b/kubernetes/aai/charts/aai-traversal/templates/deployment.yaml
index fb07427fd1..68bd0185f6 100644
--- a/kubernetes/aai/charts/aai-traversal/templates/deployment.yaml
+++ b/kubernetes/aai/charts/aai-traversal/templates/deployment.yaml
@@ -352,7 +352,7 @@ spec:
initialDelaySeconds: {{ .Values.readiness.initialDelaySeconds }}
periodSeconds: {{ .Values.readiness.periodSeconds }}
resources:
-{{ toYaml (pluck .Values.flavor .Values.resources| first) | indent 12 }}
+{{ include "common.resources" . | indent 12 }}
{{- if .Values.nodeSelector }}
nodeSelector:
{{ toYaml .Values.nodeSelector | indent 8 }}
diff --git a/kubernetes/aai/charts/aai-traversal/values.yaml b/kubernetes/aai/charts/aai-traversal/values.yaml
index 83bd1a9fad..4e651259b3 100644
--- a/kubernetes/aai/charts/aai-traversal/values.yaml
+++ b/kubernetes/aai/charts/aai-traversal/values.yaml
@@ -75,23 +75,8 @@ service:
ingress:
enabled: false
- # We usually recommend not to specify default resources and to leave this as a conscious
- # choice for the user. This also increases chances charts run on environments with little
- # resources, such as Minikube. If you do want to specify resources, uncomment the following
- # lines, adjust them as necessary, and remove the curly braces after 'resources:'.
- #
- # Example:
- # Configure resource requests and limits
- # ref: http://kubernetes.io/docs/user-guide/compute-resources/
- # Minimum memory for development is 2 CPU cores and 4GB memory
- # Minimum memory for production is 4 CPU cores and 8GB memory
-#resources:
-# limits:
-# cpu: 2
-# memory: 4Gi
-# requests:
-# cpu: 2
-# memory: 4Gi
+# Configure resource requests and limits
+# ref: http://kubernetes.io/docs/user-guide/compute-resources/
resources:
small:
limits:
@@ -107,3 +92,4 @@ resources:
requests:
cpu: 4
memory: 8Gi
+ unlimited: {}
diff --git a/kubernetes/aai/requirements.yaml b/kubernetes/aai/requirements.yaml
index 222e7f218c..8ac927b65e 100644
--- a/kubernetes/aai/requirements.yaml
+++ b/kubernetes/aai/requirements.yaml
@@ -14,7 +14,7 @@
dependencies:
- name: common
- version: ~2.0.0
+ version: ~3.0.0
# local reference to common chart, as it is
# a part of this chart's package and will not
# be published independently to a repo (at this point)
diff --git a/kubernetes/aai/templates/deployment.yaml b/kubernetes/aai/templates/deployment.yaml
index 17ba83b8d7..d32db1794c 100644
--- a/kubernetes/aai/templates/deployment.yaml
+++ b/kubernetes/aai/templates/deployment.yaml
@@ -80,7 +80,7 @@ spec:
initialDelaySeconds: {{ .Values.readiness.initialDelaySeconds }}
periodSeconds: {{ .Values.readiness.periodSeconds }}
resources:
-{{ toYaml (pluck .Values.flavor .Values.resources| first) | indent 12 }}
+{{ include "common.resources" . | indent 12 }}
{{- if .Values.nodeSelector }}
nodeSelector:
{{ toYaml .Values.nodeSelector | indent 10 }}
diff --git a/kubernetes/aai/values.yaml b/kubernetes/aai/values.yaml
index 2345b3f795..bf1602e330 100644
--- a/kubernetes/aai/values.yaml
+++ b/kubernetes/aai/values.yaml
@@ -242,16 +242,6 @@ service:
ingress:
enabled: false
- # We usually recommend not to specify default resources and to leave this as a conscious
- # choice for the user. This also increases chances charts run on environments with little
- # resources, such as Minikube. If you do want to specify resources, uncomment the following
- # lines, adjust them as necessary, and remove the curly braces after 'resources:'.
- #
- # Example:
- # Configure resource requests and limits
- # ref: http://kubernetes.io/docs/user-guide/compute-resources/
- # Minimum memory for development is 2 CPU cores and 4GB memory
- # Minimum memory for production is 4 CPU cores and 8GB memory
resources:
small:
limits:
@@ -267,3 +257,4 @@ resources:
requests:
cpu: 2
memory: 2Gi
+ unlimited: {} \ No newline at end of file
diff --git a/kubernetes/appc/Chart.yaml b/kubernetes/appc/Chart.yaml
index 42fdbd6df1..dd79ae039e 100644
--- a/kubernetes/appc/Chart.yaml
+++ b/kubernetes/appc/Chart.yaml
@@ -16,4 +16,4 @@
apiVersion: v1
description: Application Controller
name: appc
-version: 2.0.0
+version: 3.0.0
diff --git a/kubernetes/appc/charts/appc-ansible-server/Chart.yaml b/kubernetes/appc/charts/appc-ansible-server/Chart.yaml
index f332ba4506..d2760b3a05 100644
--- a/kubernetes/appc/charts/appc-ansible-server/Chart.yaml
+++ b/kubernetes/appc/charts/appc-ansible-server/Chart.yaml
@@ -15,4 +15,4 @@
apiVersion: v1
description: ONAP APPC Ansible Server
name: appc-ansible-server
-version: 2.0.0
+version: 3.0.0
diff --git a/kubernetes/appc/charts/appc-ansible-server/requirements.yaml b/kubernetes/appc/charts/appc-ansible-server/requirements.yaml
index ee69d6a5dc..9e5715e966 100644
--- a/kubernetes/appc/charts/appc-ansible-server/requirements.yaml
+++ b/kubernetes/appc/charts/appc-ansible-server/requirements.yaml
@@ -14,5 +14,5 @@
dependencies:
- name: common
- version: ~2.0.0
+ version: ~3.0.0
repository: '@local'
diff --git a/kubernetes/appc/charts/appc-ansible-server/templates/deployment.yaml b/kubernetes/appc/charts/appc-ansible-server/templates/deployment.yaml
index b7ef21f023..b7dfcf7c7a 100644
--- a/kubernetes/appc/charts/appc-ansible-server/templates/deployment.yaml
+++ b/kubernetes/appc/charts/appc-ansible-server/templates/deployment.yaml
@@ -76,7 +76,7 @@ spec:
subPath: RestServer_config
resources:
{{- if .Values.nodeSelector }}
-{{ toYaml (pluck .Values.flavor .Values.resources| first) | indent 12 }}
+{{ include "common.resources" . | indent 12 }}
nodeSelector:
{{ toYaml .Values.nodeSelector | indent 10 }}
{{- end -}}
diff --git a/kubernetes/appc/charts/appc-ansible-server/values.yaml b/kubernetes/appc/charts/appc-ansible-server/values.yaml
index 0d4a460128..d971192eb8 100644
--- a/kubernetes/appc/charts/appc-ansible-server/values.yaml
+++ b/kubernetes/appc/charts/appc-ansible-server/values.yaml
@@ -85,5 +85,6 @@ resources:
requests:
cpu: 1
memory: 1Gi
+ unlimited: {}
diff --git a/kubernetes/appc/charts/appc-cdt/Chart.yaml b/kubernetes/appc/charts/appc-cdt/Chart.yaml
index 228a522219..4d981a8c8b 100644
--- a/kubernetes/appc/charts/appc-cdt/Chart.yaml
+++ b/kubernetes/appc/charts/appc-cdt/Chart.yaml
@@ -15,4 +15,4 @@
apiVersion: v1
description: ONAP APPC Self Service Controller Design Tool
name: appc-cdt
-version: 2.0.0
+version: 3.0.0
diff --git a/kubernetes/appc/charts/appc-cdt/requirements.yaml b/kubernetes/appc/charts/appc-cdt/requirements.yaml
index a72a96a6e3..220dc4619b 100644
--- a/kubernetes/appc/charts/appc-cdt/requirements.yaml
+++ b/kubernetes/appc/charts/appc-cdt/requirements.yaml
@@ -14,5 +14,5 @@
dependencies:
- name: common
- version: ~2.0.0
+ version: ~3.0.0
repository: '@local'
diff --git a/kubernetes/appc/charts/appc-cdt/templates/deployment.yaml b/kubernetes/appc/charts/appc-cdt/templates/deployment.yaml
index 1288183c7f..2192662d6a 100644
--- a/kubernetes/appc/charts/appc-cdt/templates/deployment.yaml
+++ b/kubernetes/appc/charts/appc-cdt/templates/deployment.yaml
@@ -65,7 +65,7 @@ spec:
name: localtime
readOnly: true
resources:
-{{ toYaml (pluck .Values.flavor .Values.resources| first) | indent 12 }}
+{{ include "common.resources" . | indent 12 }}
{{- if .Values.nodeSelector }}
nodeSelector:
{{ toYaml .Values.nodeSelector | indent 10 }}
diff --git a/kubernetes/appc/charts/appc-cdt/values.yaml b/kubernetes/appc/charts/appc-cdt/values.yaml
index 125241de6d..881887014f 100644
--- a/kubernetes/appc/charts/appc-cdt/values.yaml
+++ b/kubernetes/appc/charts/appc-cdt/values.yaml
@@ -61,16 +61,8 @@ service:
ingress:
enabled: false
- # We usually recommend not to specify default resources and to leave this as a conscious
- # choice for the user. This also increases chances charts run on environments with little
- # resources, such as Minikube. If you do want to specify resources, uncomment the following
- # lines, adjust them as necessary, and remove the curly braces after 'resources:'.
- #
- # Example:
- # Configure resource requests and limits
- # ref: http://kubernetes.io/docs/user-guide/compute-resources/
- # Minimum memory for development is 2 CPU cores and 4GB memory
- # Minimum memory for production is 4 CPU cores and 8GB memory
+# Configure resource requests and limits
+# ref: http://kubernetes.io/docs/user-guide/compute-resources/
resources:
small:
limits:
@@ -86,3 +78,4 @@ resources:
requests:
cpu: 1
memory: 1Gi
+ unlimited: {}
diff --git a/kubernetes/appc/requirements.yaml b/kubernetes/appc/requirements.yaml
index 67e33ba6eb..cc912b538c 100644
--- a/kubernetes/appc/requirements.yaml
+++ b/kubernetes/appc/requirements.yaml
@@ -14,11 +14,11 @@
dependencies:
- name: common
- version: ~2.0.0
+ version: ~3.0.0
repository: '@local'
- name: mariadb-galera
- version: ~2.0.0
+ version: ~3.0.0
repository: '@local'
- name: dgbuilder
- version: ~2.0.0
+ version: ~3.0.0
repository: '@local'
diff --git a/kubernetes/appc/templates/statefulset.yaml b/kubernetes/appc/templates/statefulset.yaml
index 9453bd9677..8ecda882de 100644
--- a/kubernetes/appc/templates/statefulset.yaml
+++ b/kubernetes/appc/templates/statefulset.yaml
@@ -145,7 +145,7 @@ spec:
name: log-config
subPath: org.ops4j.pax.logging.cfg
resources:
-{{ toYaml (pluck .Values.flavor .Values.resources| first) | indent 12 }}
+{{ include "common.resources" . | indent 12 }}
{{- if .Values.nodeSelector }}
nodeSelector:
{{ toYaml .Values.nodeSelector | indent 10 }}
diff --git a/kubernetes/appc/values.yaml b/kubernetes/appc/values.yaml
index 8661bf5717..d6a2ddf03a 100644
--- a/kubernetes/appc/values.yaml
+++ b/kubernetes/appc/values.yaml
@@ -156,16 +156,8 @@ persistence:
ingress:
enabled: false
- # We usually recommend not to specify default resources and to leave this as a conscious
- # choice for the user. This also increases chances charts run on environments with little
- # resources, such as Minikube. If you do want to specify resources, uncomment the following
- # lines, adjust them as necessary, and remove the curly braces after 'resources:'.
- #
- # Example:
- # Configure resource requests and limits
- # ref: http://kubernetes.io/docs/user-guide/compute-resources/
- # Minimum memory for development is 2 CPU cores and 4GB memory
- # Minimum memory for production is 4 CPU cores and 8GB memory
+# Configure resource requests and limits
+# ref: http://kubernetes.io/docs/user-guide/compute-resources/
resources:
small:
limits:
@@ -181,3 +173,4 @@ resources:
requests:
cpu: 2
memory: 4Gi
+ unlimited: {}
diff --git a/kubernetes/clamp/Chart.yaml b/kubernetes/clamp/Chart.yaml
index 01731fd4c9..226dc5c29a 100644
--- a/kubernetes/clamp/Chart.yaml
+++ b/kubernetes/clamp/Chart.yaml
@@ -16,4 +16,4 @@
apiVersion: v1
description: ONAP Clamp
name: clamp
-version: 2.0.0
+version: 3.0.0
diff --git a/kubernetes/clamp/charts/clamp-dash-es/Chart.yaml b/kubernetes/clamp/charts/clamp-dash-es/Chart.yaml
index 97abbbe973..dda3835bda 100644
--- a/kubernetes/clamp/charts/clamp-dash-es/Chart.yaml
+++ b/kubernetes/clamp/charts/clamp-dash-es/Chart.yaml
@@ -16,4 +16,4 @@
apiVersion: v1
description: ONAP Clamp Dashboard Elasticsearch
name: clamp-dash-es
-version: 2.0.0
+version: 3.0.0
diff --git a/kubernetes/clamp/charts/clamp-dash-es/requirements.yaml b/kubernetes/clamp/charts/clamp-dash-es/requirements.yaml
index 204a77562f..897df32ce0 100644
--- a/kubernetes/clamp/charts/clamp-dash-es/requirements.yaml
+++ b/kubernetes/clamp/charts/clamp-dash-es/requirements.yaml
@@ -15,5 +15,5 @@
dependencies:
- name: common
- version: ~2.0.0
+ version: ~3.0.0
repository: '@local'
diff --git a/kubernetes/clamp/charts/clamp-dash-es/templates/deployment.yaml b/kubernetes/clamp/charts/clamp-dash-es/templates/deployment.yaml
index e933a36738..d1504e0c04 100644
--- a/kubernetes/clamp/charts/clamp-dash-es/templates/deployment.yaml
+++ b/kubernetes/clamp/charts/clamp-dash-es/templates/deployment.yaml
@@ -90,7 +90,7 @@ spec:
- mountPath: /usr/share/elasticsearch/data/
name: {{ include "common.fullname" . }}-data
resources:
-{{ toYaml .Values.resources | indent 12 }}
+{{ include "common.resources" . | indent 12 }}
{{- if .Values.nodeSelector }}
nodeSelector:
{{ toYaml .Values.nodeSelector | indent 10 }}
diff --git a/kubernetes/clamp/charts/clamp-dash-kibana/Chart.yaml b/kubernetes/clamp/charts/clamp-dash-kibana/Chart.yaml
index 3cb6f4f605..a950743cb3 100644
--- a/kubernetes/clamp/charts/clamp-dash-kibana/Chart.yaml
+++ b/kubernetes/clamp/charts/clamp-dash-kibana/Chart.yaml
@@ -16,4 +16,4 @@
apiVersion: v1
description: ONAP Clamp Dashboard Kibana
name: clamp-dash-kibana
-version: 2.0.0
+version: 3.0.0
diff --git a/kubernetes/clamp/charts/clamp-dash-kibana/requirements.yaml b/kubernetes/clamp/charts/clamp-dash-kibana/requirements.yaml
index 204a77562f..897df32ce0 100644
--- a/kubernetes/clamp/charts/clamp-dash-kibana/requirements.yaml
+++ b/kubernetes/clamp/charts/clamp-dash-kibana/requirements.yaml
@@ -15,5 +15,5 @@
dependencies:
- name: common
- version: ~2.0.0
+ version: ~3.0.0
repository: '@local'
diff --git a/kubernetes/clamp/charts/clamp-dash-kibana/templates/deployment.yaml b/kubernetes/clamp/charts/clamp-dash-kibana/templates/deployment.yaml
index b58be0f374..cd8e1026e7 100644
--- a/kubernetes/clamp/charts/clamp-dash-kibana/templates/deployment.yaml
+++ b/kubernetes/clamp/charts/clamp-dash-kibana/templates/deployment.yaml
@@ -93,7 +93,7 @@ spec:
name: {{ include "common.fullname" . }}
subPath: kibana.yml
resources:
-{{ toYaml .Values.resources | indent 12 }}
+{{ include "common.resources" . | indent 12 }}
{{- if .Values.nodeSelector }}
nodeSelector:
{{ toYaml .Values.nodeSelector | indent 10 }}
diff --git a/kubernetes/clamp/charts/clamp-dash-kibana/values.yaml b/kubernetes/clamp/charts/clamp-dash-kibana/values.yaml
index cac222e024..1c32d39b98 100644
--- a/kubernetes/clamp/charts/clamp-dash-kibana/values.yaml
+++ b/kubernetes/clamp/charts/clamp-dash-kibana/values.yaml
@@ -95,7 +95,7 @@ ingress:
resources:
limits:
cpu: 1
- memory: 2Gi
+ memory: 2Gi
requests:
cpu: 10m
memory: 750Mi
diff --git a/kubernetes/clamp/charts/clamp-dash-logstash/Chart.yaml b/kubernetes/clamp/charts/clamp-dash-logstash/Chart.yaml
index f8956ed29b..d557d559d3 100644
--- a/kubernetes/clamp/charts/clamp-dash-logstash/Chart.yaml
+++ b/kubernetes/clamp/charts/clamp-dash-logstash/Chart.yaml
@@ -16,4 +16,4 @@
apiVersion: v1
description: ONAP Clamp Dashboard Logstash
name: clamp-dash-logstash
-version: 2.0.0
+version: 3.0.0
diff --git a/kubernetes/clamp/charts/clamp-dash-logstash/requirements.yaml b/kubernetes/clamp/charts/clamp-dash-logstash/requirements.yaml
index 204a77562f..897df32ce0 100644
--- a/kubernetes/clamp/charts/clamp-dash-logstash/requirements.yaml
+++ b/kubernetes/clamp/charts/clamp-dash-logstash/requirements.yaml
@@ -15,5 +15,5 @@
dependencies:
- name: common
- version: ~2.0.0
+ version: ~3.0.0
repository: '@local'
diff --git a/kubernetes/clamp/charts/clamp-dash-logstash/templates/deployment.yaml b/kubernetes/clamp/charts/clamp-dash-logstash/templates/deployment.yaml
index 5ce7145ddc..433e7ab24f 100644
--- a/kubernetes/clamp/charts/clamp-dash-logstash/templates/deployment.yaml
+++ b/kubernetes/clamp/charts/clamp-dash-logstash/templates/deployment.yaml
@@ -93,7 +93,7 @@ spec:
name: {{ include "common.fullname" . }}
subPath: pipeline.conf
resources:
-{{ toYaml .Values.resources | indent 12 }}
+{{ include "common.resources" . | indent 12 }}
{{- if .Values.nodeSelector }}
nodeSelector:
{{ toYaml .Values.nodeSelector | indent 10 }}
diff --git a/kubernetes/clamp/charts/mariadb/Chart.yaml b/kubernetes/clamp/charts/mariadb/Chart.yaml
index 78d07eedcd..9f1c8adc68 100644
--- a/kubernetes/clamp/charts/mariadb/Chart.yaml
+++ b/kubernetes/clamp/charts/mariadb/Chart.yaml
@@ -16,4 +16,4 @@
apiVersion: v1
description: MariaDB Service
name: mariadb
-version: 2.0.0
+version: 3.0.0
diff --git a/kubernetes/clamp/charts/mariadb/templates/deployment.yaml b/kubernetes/clamp/charts/mariadb/templates/deployment.yaml
index 06c7cb7201..47d37bd401 100644
--- a/kubernetes/clamp/charts/mariadb/templates/deployment.yaml
+++ b/kubernetes/clamp/charts/mariadb/templates/deployment.yaml
@@ -73,7 +73,7 @@ spec:
- mountPath: /var/lib/mysql
name: clamp-mariadb-data
resources:
-{{ toYaml .Values.resources | indent 12 }}
+{{ include "common.resources" . | indent 12 }}
{{- if .Values.nodeSelector }}
nodeSelector:
{{ toYaml .Values.nodeSelector | indent 10 }}
diff --git a/kubernetes/clamp/charts/mariadb/values.yaml b/kubernetes/clamp/charts/mariadb/values.yaml
index 3b09d9a99d..a419f11b3a 100644
--- a/kubernetes/clamp/charts/mariadb/values.yaml
+++ b/kubernetes/clamp/charts/mariadb/values.yaml
@@ -46,7 +46,7 @@ liveness:
# necessary to disable liveness probe when setting breakpoints
# in debugger so K8s doesn't restart unresponsive container
enabled: true
-
+
readiness:
initialDelaySeconds: 10
periodSeconds: 10
diff --git a/kubernetes/clamp/requirements.yaml b/kubernetes/clamp/requirements.yaml
index c414a0149a..e57547871c 100644
--- a/kubernetes/clamp/requirements.yaml
+++ b/kubernetes/clamp/requirements.yaml
@@ -15,7 +15,7 @@
dependencies:
- name: common
- version: ~2.0.0
+ version: ~3.0.0
# local reference to common chart, as it is
# a part of this chart's package and will not
# be published independently to a repo (at this point)
diff --git a/kubernetes/clamp/templates/deployment.yaml b/kubernetes/clamp/templates/deployment.yaml
index 4dc12c3aaf..4e6d1d13a3 100644
--- a/kubernetes/clamp/templates/deployment.yaml
+++ b/kubernetes/clamp/templates/deployment.yaml
@@ -97,7 +97,7 @@ spec:
name: {{ template "common.fullname" . }}
key: spring_application_json
resources:
-{{ toYaml .Values.resources | indent 12 }}
+{{ include "common.resources" . | indent 12 }}
{{- if .Values.nodeSelector }}
nodeSelector:
{{ toYaml .Values.nodeSelector | indent 10 }}
diff --git a/kubernetes/clamp/values.yaml b/kubernetes/clamp/values.yaml
index 9c6fa5175f..4dd47a046f 100644
--- a/kubernetes/clamp/values.yaml
+++ b/kubernetes/clamp/values.yaml
@@ -99,7 +99,7 @@ service:
# as of 20180904 port 58 is reserved for clamp from log/logdemonode
# see https://wiki.onap.org/display/DW/OOM+NodePort+List
nodePort2: 58
-
+
ingress:
enabled: false
diff --git a/kubernetes/cli/Chart.yaml b/kubernetes/cli/Chart.yaml
index 0eb4ce6c97..74df6ed3e5 100644
--- a/kubernetes/cli/Chart.yaml
+++ b/kubernetes/cli/Chart.yaml
@@ -15,4 +15,4 @@
apiVersion: v1
description: ONAP Command Line Interface
name: cli
-version: 2.0.0
+version: 3.0.0
diff --git a/kubernetes/cli/requirements.yaml b/kubernetes/cli/requirements.yaml
index f639633537..f3e793cfbb 100644
--- a/kubernetes/cli/requirements.yaml
+++ b/kubernetes/cli/requirements.yaml
@@ -14,7 +14,7 @@
dependencies:
- name: common
- version: ~2.0.0
+ version: ~3.0.0
# local reference to common chart, as it is
# a part of this chart's package and will not
# be published independently to a repo (at this point)
diff --git a/kubernetes/cli/templates/deployment.yaml b/kubernetes/cli/templates/deployment.yaml
index 94d475bcb5..5836b665a7 100644
--- a/kubernetes/cli/templates/deployment.yaml
+++ b/kubernetes/cli/templates/deployment.yaml
@@ -55,7 +55,7 @@ spec:
- name: OPEN_CLI_MODE
value: "{{ .Values.config.climode }}"
resources:
-{{ toYaml (pluck .Values.flavor .Values.resources| first) | indent 12 }}
+{{ include "common.resources" . | indent 12 }}
{{- if .Values.nodeSelector }}
nodeSelector:
{{ toYaml .Values.nodeSelector | indent 10 }}
diff --git a/kubernetes/cli/values.yaml b/kubernetes/cli/values.yaml
index 134981ca21..1c511a335b 100644
--- a/kubernetes/cli/values.yaml
+++ b/kubernetes/cli/values.yaml
@@ -64,16 +64,8 @@ service:
ingress:
enabled: false
- # We usually recommend not to specify default resources and to leave this as a conscious
- # choice for the user. This also increases chances charts run on environments with little
- # resources, such as Minikube. If you do want to specify resources, uncomment the following
- # lines, adjust them as necessary, and remove the curly braces after 'resources:'.
- #
- # Example:
- # Configure resource requests and limits
- # ref: http://kubernetes.io/docs/user-guide/compute-resources/
- # Minimum memory for development is 2 CPU cores and 4GB memory
- # Minimum memory for production is 4 CPU cores and 8GB memory
+# Configure resource requests and limits
+# ref: http://kubernetes.io/docs/user-guide/compute-resources/
resources:
small:
limits:
@@ -89,3 +81,4 @@ resources:
requests:
cpu: 2
memory: 4Gi
+ unlimited: {} \ No newline at end of file
diff --git a/kubernetes/common/common/Chart.yaml b/kubernetes/common/common/Chart.yaml
index 7d58e53dfd..fbaaa77d7f 100644
--- a/kubernetes/common/common/Chart.yaml
+++ b/kubernetes/common/common/Chart.yaml
@@ -15,4 +15,4 @@
apiVersion: v1
description: Common templates for inclusion in other charts
name: common
-version: 2.0.0
+version: 3.0.0
diff --git a/kubernetes/common/common/templates/_resources.tpl b/kubernetes/common/common/templates/_resources.tpl
new file mode 100644
index 0000000000..fae77435a3
--- /dev/null
+++ b/kubernetes/common/common/templates/_resources.tpl
@@ -0,0 +1,59 @@
+{{- /*
+# Copyright © 2018 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.
+*/ -}}
+
+{{- /*
+ Resolve the name of the common resource limit/request flavor.
+ The value for .Values.flavor is used by default,
+ unless either override mechanism is used.
+
+ - .Values.global.flavor : override default flavor for all charts
+ - .Values.flavorOverride : override global and default flavor on a per chart basis
+*/ -}}
+{{- define "common.flavor" -}}
+ {{if .Values.flavorOverride }}
+ {{- printf "%s" .Values.flavorOverride -}}
+ {{else}}
+ {{- default .Values.flavor .Values.global.flavor -}}
+ {{end}}
+{{- end -}}
+
+{{- /*
+ Resolve the resource limit/request flavor using the desired flavor value.
+
+ - .Values.resources : YAML definition of resource limits. The flavor key
+ is computed based on the common.flavor template and
+ is used as the selected resource limit through the pluck
+ e.g: resources:
+ small:
+ limits:
+ cpu: 200m
+ memory: 4Gi
+ requests:
+ cpu: 100m
+ memory: 1Gi
+ large:
+ limits:
+ cpu: 400m
+ memory: 8Gi
+ requests:
+ cpu: 200m
+ memory: 2Gi
+ unlimited: {}
+*/ -}}
+{{- define "common.resources" -}}
+{{- $flavor := include "common.flavor" . -}}
+{{- toYaml (pluck $flavor .Values.resources | first) | indent 12 -}}
+{{- end -}}
diff --git a/kubernetes/common/common/values.yaml b/kubernetes/common/common/values.yaml
index f7098ee80f..852f15c810 100644
--- a/kubernetes/common/common/values.yaml
+++ b/kubernetes/common/common/values.yaml
@@ -16,29 +16,3 @@
# Global configuration default values that can be inherited by
# all subcharts.
#################################################################
-global:
- # Change to an unused port prefix range to prevent port conflicts
- # with other instances running within the same k8s cluster
- nodePortPrefix: 302
-
- # image repositories
- repository: nexus3.onap.org:10001
-
- # readiness check
- readinessRepository: oomk8s
- readinessImage: readiness-check:2.0.0
-
- # logging agent
- loggingRepository: docker.elastic.co
- loggingImage: beats/filebeat:5.5.0
-
- # image pull policy
- pullPolicy: Always
-
- # default mount path root directory referenced
- # by persistent volumes and log files
- persistence:
- mountPath: /dockerdata-nfs
-
- # flag to enable debugging - application support required
- debugEnabled: true
diff --git a/kubernetes/common/controller-blueprints/requirements.yaml b/kubernetes/common/controller-blueprints/requirements.yaml
index b9ecec7a02..8daa93e63b 100644
--- a/kubernetes/common/controller-blueprints/requirements.yaml
+++ b/kubernetes/common/controller-blueprints/requirements.yaml
@@ -14,8 +14,8 @@
dependencies:
- name: mariadb-galera
- version: ~2.0.0
+ version: ~3.0.0
repository: file://../mariadb-galera/
- name: common
- version: ~2.0.0
+ version: ~3.0.0
repository: '@local' \ No newline at end of file
diff --git a/kubernetes/common/controller-blueprints/templates/deployment.yaml b/kubernetes/common/controller-blueprints/templates/deployment.yaml
index 18fb16561a..15ed32fbd2 100644
--- a/kubernetes/common/controller-blueprints/templates/deployment.yaml
+++ b/kubernetes/common/controller-blueprints/templates/deployment.yaml
@@ -108,7 +108,7 @@ spec:
name: {{ include "common.fullname" . }}-config
subPath: logback.xml
resources:
-{{ toYaml .Values.resources | indent 12 }}
+{{ include "common.resources" . | indent 12 }}
{{- if .Values.nodeSelector }}
nodeSelector:
{{ toYaml .Values.nodeSelector | indent 10 }}
diff --git a/kubernetes/common/dgbuilder/Chart.yaml b/kubernetes/common/dgbuilder/Chart.yaml
index daba2b94d7..55c61c543b 100644
--- a/kubernetes/common/dgbuilder/Chart.yaml
+++ b/kubernetes/common/dgbuilder/Chart.yaml
@@ -15,4 +15,4 @@
apiVersion: v1
description: D.G. Builder application
name: dgbuilder
-version: 2.0.0 \ No newline at end of file
+version: 3.0.0 \ No newline at end of file
diff --git a/kubernetes/common/dgbuilder/requirements.yaml b/kubernetes/common/dgbuilder/requirements.yaml
index e4f42cc33d..a0fc24965f 100644
--- a/kubernetes/common/dgbuilder/requirements.yaml
+++ b/kubernetes/common/dgbuilder/requirements.yaml
@@ -14,5 +14,5 @@
dependencies:
- name: common
- version: ~2.0.0
+ version: ~3.0.0
repository: '@local' \ No newline at end of file
diff --git a/kubernetes/common/dgbuilder/templates/deployment.yaml b/kubernetes/common/dgbuilder/templates/deployment.yaml
index a191761e75..353c2314ac 100644
--- a/kubernetes/common/dgbuilder/templates/deployment.yaml
+++ b/kubernetes/common/dgbuilder/templates/deployment.yaml
@@ -86,7 +86,7 @@ spec:
mountPath: /opt/onap/ccsdk/dgbuilder/releases/sdnc1.0/customSettings.js
subPath: customSettings.js
resources:
-{{ toYaml .Values.resources | indent 12 }}
+{{ include "common.resources" . | indent 12 }}
{{- if .Values.nodeSelector }}
nodeSelector:
{{ toYaml .Values.nodeSelector | indent 10 }}
diff --git a/kubernetes/common/mariadb-galera/Chart.yaml b/kubernetes/common/mariadb-galera/Chart.yaml
index 47f9e7e31d..1121a88345 100644
--- a/kubernetes/common/mariadb-galera/Chart.yaml
+++ b/kubernetes/common/mariadb-galera/Chart.yaml
@@ -15,7 +15,7 @@
apiVersion: v1
description: Chart for MariaDB Galera cluster
name: mariadb-galera
-version: 2.0.0
+version: 3.0.0
keywords:
- mariadb
- mysql
diff --git a/kubernetes/common/mariadb-galera/requirements.yaml b/kubernetes/common/mariadb-galera/requirements.yaml
index 4e8080afe4..c6e7a39b0c 100644
--- a/kubernetes/common/mariadb-galera/requirements.yaml
+++ b/kubernetes/common/mariadb-galera/requirements.yaml
@@ -14,5 +14,5 @@
dependencies:
- name: common
- version: ~2.0.0
+ version: ~3.0.0
repository: 'file://../common' \ No newline at end of file
diff --git a/kubernetes/common/mariadb-galera/templates/statefulset.yaml b/kubernetes/common/mariadb-galera/templates/statefulset.yaml
index 8b2aafbd49..d3bad4f5b6 100644
--- a/kubernetes/common/mariadb-galera/templates/statefulset.yaml
+++ b/kubernetes/common/mariadb-galera/templates/statefulset.yaml
@@ -95,7 +95,7 @@ spec:
timeoutSeconds: {{ .Values.liveness.timeoutSeconds }}
{{- end }}
resources:
-{{ toYaml .Values.resources | indent 12 }}
+{{ include "common.resources" . | indent 12 }}
volumeMounts:
{{- if .Values.externalConfig }}
- mountPath: /etc/config
diff --git a/kubernetes/common/mongo/Chart.yaml b/kubernetes/common/mongo/Chart.yaml
index 6f46f15fc0..be35133db3 100644
--- a/kubernetes/common/mongo/Chart.yaml
+++ b/kubernetes/common/mongo/Chart.yaml
@@ -15,4 +15,4 @@
apiVersion: v1
description: MongoDB Server
name: mongo
-version: 2.0.0
+version: 3.0.0
diff --git a/kubernetes/common/mongo/requirements.yaml b/kubernetes/common/mongo/requirements.yaml
index ce82a2f838..9f23fac6f8 100644
--- a/kubernetes/common/mongo/requirements.yaml
+++ b/kubernetes/common/mongo/requirements.yaml
@@ -14,5 +14,5 @@
dependencies:
- name: common
- version: ~2.0.0
+ version: ~3.0.0
repository: '@local'
diff --git a/kubernetes/common/mongo/templates/statefulset.yaml b/kubernetes/common/mongo/templates/statefulset.yaml
index 8b33f611b9..c79739f5f1 100644
--- a/kubernetes/common/mongo/templates/statefulset.yaml
+++ b/kubernetes/common/mongo/templates/statefulset.yaml
@@ -82,7 +82,7 @@ spec:
- mountPath: /var/lib/mongo
name: {{ include "common.fullname" . }}-data
resources:
-{{ toYaml .Values.resources | indent 12 }}
+{{ include "common.resources" . | indent 12 }}
{{- if .Values.nodeSelector }}
nodeSelector:
{{ toYaml .Values.nodeSelector | indent 10 }}
diff --git a/kubernetes/common/mysql/Chart.yaml b/kubernetes/common/mysql/Chart.yaml
index b2e7d4aa93..b110dc9c70 100644
--- a/kubernetes/common/mysql/Chart.yaml
+++ b/kubernetes/common/mysql/Chart.yaml
@@ -15,4 +15,4 @@
apiVersion: v1
description: MySQL Server
name: mysql
-version: 2.0.0
+version: 3.0.0
diff --git a/kubernetes/common/mysql/requirements.yaml b/kubernetes/common/mysql/requirements.yaml
index ce82a2f838..9f23fac6f8 100644
--- a/kubernetes/common/mysql/requirements.yaml
+++ b/kubernetes/common/mysql/requirements.yaml
@@ -14,5 +14,5 @@
dependencies:
- name: common
- version: ~2.0.0
+ version: ~3.0.0
repository: '@local'
diff --git a/kubernetes/common/mysql/templates/statefulset.yaml b/kubernetes/common/mysql/templates/statefulset.yaml
index 0f340f00b5..1744940868 100644
--- a/kubernetes/common/mysql/templates/statefulset.yaml
+++ b/kubernetes/common/mysql/templates/statefulset.yaml
@@ -147,7 +147,7 @@ spec:
- mountPath: /etc/mysql/conf.d
name: conf
resources:
-{{ toYaml .Values.resources | indent 12 }}
+{{ include "common.resources" . | indent 12 }}
{{- if .Values.nodeSelector }}
nodeSelector:
{{ toYaml .Values.nodeSelector | indent 10 }}
diff --git a/kubernetes/common/mysql/values.yaml b/kubernetes/common/mysql/values.yaml
index 6805aa5e6c..9fd67fcabc 100644
--- a/kubernetes/common/mysql/values.yaml
+++ b/kubernetes/common/mysql/values.yaml
@@ -59,7 +59,7 @@ readiness:
## Persist data to a persitent volume
persistence:
enabled: true
-
+
## A manually managed Persistent Volume and Claim
## Requires persistence.enabled: true
## If defined, PVC must be created manually before volume will be bound
@@ -103,8 +103,8 @@ resources: {}
# Example:
# Configure resource requests and limits
# ref: http://kubernetes.io/docs/user-guide/compute-resources/
- # Minimum memory for development is 2 CPU cores and 4GB memory
- # Minimum memory for production is 4 CPU cores and 8GB memory
+ # Minimum memory for development is 2 CPU cores and 4GB memory
+ # Minimum memory for production is 4 CPU cores and 8GB memory
#resources:
# limits:
# cpu: 2
diff --git a/kubernetes/common/network-name-gen/Chart.yaml b/kubernetes/common/network-name-gen/Chart.yaml
new file mode 100644
index 0000000000..e1b9c5531f
--- /dev/null
+++ b/kubernetes/common/network-name-gen/Chart.yaml
@@ -0,0 +1,18 @@
+# Copyright (C) 2018 AT&T Intellectual Property. All rights reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+apiVersion: v1
+description: Name Generation Micro Service
+name: network-name-gen
+version: 3.0.0
diff --git a/kubernetes/common/network-name-gen/requirements.yaml b/kubernetes/common/network-name-gen/requirements.yaml
new file mode 100644
index 0000000000..52a2c51844
--- /dev/null
+++ b/kubernetes/common/network-name-gen/requirements.yaml
@@ -0,0 +1,21 @@
+# Copyright (C) 2018 AT&T Intellectual Property. All rights reserved.
+#
+# 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: ~3.0.0
+ repository: '@local'
+ - name: mariadb-galera
+ version: ~3.0.0
+ repository: file://../mariadb-galera/
diff --git a/kubernetes/common/network-name-gen/templates/deployment.yaml b/kubernetes/common/network-name-gen/templates/deployment.yaml
new file mode 100644
index 0000000000..743c8be02e
--- /dev/null
+++ b/kubernetes/common/network-name-gen/templates/deployment.yaml
@@ -0,0 +1,92 @@
+# Copyright (C) 2018 AT&T Intellectual Property.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+apiVersion: extensions/v1beta1
+kind: Deployment
+metadata:
+ name: {{ include "common.fullname" . }}
+ namespace: {{ include "common.namespace" . }}
+ labels:
+ app: {{ include "common.name" . }}
+ chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
+ release: {{ .Release.Name }}
+ heritage: {{ .Release.Service }}
+spec:
+ replicas: {{ .Values.replicaCount }}
+ template:
+ metadata:
+ labels:
+ app: {{ include "common.name" . }}
+ release: {{ .Release.Name }}
+ spec:
+ initContainers:
+ - command:
+ - /root/ready.py
+ args:
+ - --container-name
+ - {{ index .Values "mariadb-galera" "nameOverride" }}
+ env:
+ - name: NAMESPACE
+ valueFrom:
+ fieldRef:
+ apiVersion: v1
+ fieldPath: metadata.namespace
+ image: "{{ .Values.global.readinessRepository }}/{{ .Values.global.readinessImage }}"
+ imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
+ name: {{ include "common.name" . }}-readiness
+ containers:
+ - name: {{ include "common.name" . }}
+ image: "{{ include "common.repository" . }}/{{ .Values.image }}"
+ imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
+ env:
+ - name: SPRING_PROFILE
+ value: "{{ .Values.config.springProfile }}"
+ - name: NENG_DB_USER
+ value: {{ index .Values "mariadb-galera" "config" "userName" }}
+ - name: NENG_DB_PASS
+ valueFrom:
+ secretKeyRef:
+ name: {{ template "common.fullname" . }}
+ key: db-root-password
+ - name: NENG_DB_URL
+ value: {{ .Values.config.dbUrl }}
+ - name: POL_CLIENT_AUTH
+ value: "{{ .Values.config.polClientAuth }}"
+ - name: POL_BASIC_AUTH
+ value: "{{ .Values.config.polBasicAuth }}"
+ - name: POL_URL
+ value: "{{ .Values.config.polUrl }}"
+ - name: POL_ENV
+ value: "{{ .Values.config.polEnv }}"
+ - name: POL_REQ_ID
+ value: "{{ .Values.config.polReqId }}"
+ - name: AAI_CERT_PASS
+ value: "{{ .Values.config.aaiCertPass }}"
+ - name: AAI_CERT_PATH
+ value: "{{ .Values.config.aaiCertPath }}"
+ - name: AAI_URI
+ value: "{{ .Values.config.aaiUri }}"
+ resources:
+{{ include "common.resources" . | indent 12 }}
+ {{- if .Values.nodeSelector }}
+ nodeSelector:
+{{ toYaml .Values.nodeSelector | indent 10 }}
+ {{- end -}}
+ {{- if .Values.affinity }}
+ affinity:
+{{ toYaml .Values.affinity | indent 10 }}
+ {{- end }}
+
+ imagePullSecrets:
+ - name: "{{ include "common.namespace" . }}-docker-registry-key"
diff --git a/kubernetes/common/network-name-gen/templates/secrets.yaml b/kubernetes/common/network-name-gen/templates/secrets.yaml
new file mode 100644
index 0000000000..b50ad4eb26
--- /dev/null
+++ b/kubernetes/common/network-name-gen/templates/secrets.yaml
@@ -0,0 +1,27 @@
+# Copyright (c) 2018 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.
+
+apiVersion: v1
+kind: Secret
+metadata:
+ name: {{ include "common.fullname" . }}
+ namespace: {{ include "common.namespace" . }}
+ labels:
+ app: {{ include "common.fullname" . }}
+ chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
+ release: {{ .Release.Name }}
+ heritage: {{ .Release.Service }}
+type: Opaque
+data:
+ db-root-password: {{ index .Values "mariadb-galera" "config" "mariadbRootPassword" | b64enc | quote }}
diff --git a/kubernetes/common/network-name-gen/templates/service.yaml b/kubernetes/common/network-name-gen/templates/service.yaml
new file mode 100644
index 0000000000..0321be9f28
--- /dev/null
+++ b/kubernetes/common/network-name-gen/templates/service.yaml
@@ -0,0 +1,39 @@
+# Copyright (C) 2018 AT&T Intellectual Property.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+apiVersion: v1
+kind: Service
+metadata:
+ name: {{ include "common.servicename" . }}
+ namespace: {{ include "common.namespace" . }}
+ labels:
+ app: {{ include "common.name" . }}
+ chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
+ release: {{ .Release.Name }}
+ heritage: {{ .Release.Service }}
+spec:
+ type: {{ .Values.service.type }}
+ ports:
+ {{if eq .Values.service.type "NodePort" -}}
+ - port: {{ .Values.service.externalPort }}
+ targetPort: {{ .Values.service.internalPort }}
+ nodePort: {{ .Values.global.nodePortPrefix | default .Values.nodePortPrefix }}{{ .Values.service.nodePort }}
+ name: {{ .Values.service.portName }}
+ {{- else -}}
+ - port: {{ .Values.service.externalPort }}
+ targetPort: {{ .Values.service.internalPort }}
+ name: {{ .Values.service.portName }}
+ {{- end}}
+ selector:
+ app: {{ include "common.name" . }}
+ release: {{ .Release.Name }}
diff --git a/kubernetes/common/network-name-gen/values.yaml b/kubernetes/common/network-name-gen/values.yaml
new file mode 100644
index 0000000000..b40ac91cbc
--- /dev/null
+++ b/kubernetes/common/network-name-gen/values.yaml
@@ -0,0 +1,102 @@
+# Copyright (C) 2018 AT&T Intellectual Property.
+#
+# 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.
+#
+# Global configuration default values that can be inherited by
+# all subcharts.
+#################################################################
+global:
+
+ # Change to an unused port prefix range to prevent port conflicts
+ # with other instances running within the same k8s cluster
+ nodePortPrefix: 302
+
+ # image repositories
+ repository: nexus3.onap.org:10001
+
+
+ # readiness check
+ readinessRepository: oomk8s
+ readinessImage: readiness-check:2.0.0
+
+ # image pull policy
+ pullPolicy: IfNotPresent
+
+# sub-chart config
+mariadb-galera:
+ config:
+ userName: nenguser
+ userPassword: nenguser123
+ mariadbRootPassword: nenguser123
+ mysqlDatabase: nengdb
+ nameOverride: nengdb
+ service:
+ name: nengdb
+ portName: nengdbport
+ replicaCount: 1
+ persistence:
+ enabled: true
+ mountSubPath: network-name-gen/data
+
+
+#################################################################
+# Application configuration defaults.
+#################################################################
+# application image
+repository: nexus3.onap.org:10001
+image: onap/ccsdk-apps-ms-neng:latest
+pullPolicy: IfNotPresent
+
+# application configuration
+config:
+ dbUrl: jdbc:mysql://nengdb:3306/nengdb
+ springProfile: live
+ polClientAuth: TBD
+ polBasicAuth: TBD
+ polUrl: TBD
+ polEnv: TEST
+ polReqId: xx
+ aaiCertPass: TBD
+ aaiCertPath: TBD
+ aaiUri: TBD
+
+# default number of instances
+replicaCount: 1
+
+nodeSelector: {}
+
+affinity: {}
+
+# probe configuration parameters
+liveness:
+ initialDelaySeconds: 10
+ periodSeconds: 10
+ # necessary to disable liveness probe when setting breakpoints
+ # in debugger so K8s doesn't restart unresponsive container
+ enabled: false
+
+readiness:
+ initialDelaySeconds: 10
+ periodSeconds: 10
+
+service:
+ type: ClusterIP
+ name: neng-serv
+ portName: neng-serv-port
+ internalPort: 8080
+ externalPort: 8080
+
+ingress:
+ enabled: false
+
+resources: {}
diff --git a/kubernetes/common/pgpool/Chart.yaml b/kubernetes/common/pgpool/Chart.yaml
index d4f7c50f3a..b57e72a6ee 100644
--- a/kubernetes/common/pgpool/Chart.yaml
+++ b/kubernetes/common/pgpool/Chart.yaml
@@ -15,4 +15,4 @@
apiVersion: v1
description: ONAP Postgres Server
name: pgpool
-version: 2.0.0
+version: 3.0.0
diff --git a/kubernetes/common/pgpool/requirements.yaml b/kubernetes/common/pgpool/requirements.yaml
index e597fca563..9f44c6df28 100644
--- a/kubernetes/common/pgpool/requirements.yaml
+++ b/kubernetes/common/pgpool/requirements.yaml
@@ -14,5 +14,5 @@
dependencies:
- name: common
- version: ~2.0.0
+ version: ~3.0.0
repository: '@local'
diff --git a/kubernetes/common/postgres/Chart.yaml b/kubernetes/common/postgres/Chart.yaml
index 1d00b8526b..f9be4c2ceb 100644
--- a/kubernetes/common/postgres/Chart.yaml
+++ b/kubernetes/common/postgres/Chart.yaml
@@ -15,4 +15,4 @@
apiVersion: v1
description: ONAP Postgres Server
name: postgres
-version: 2.0.0
+version: 3.0.0
diff --git a/kubernetes/common/postgres/requirements.yaml b/kubernetes/common/postgres/requirements.yaml
index e597fca563..9f44c6df28 100644
--- a/kubernetes/common/postgres/requirements.yaml
+++ b/kubernetes/common/postgres/requirements.yaml
@@ -14,5 +14,5 @@
dependencies:
- name: common
- version: ~2.0.0
+ version: ~3.0.0
repository: '@local'
diff --git a/kubernetes/common/postgres/templates/statefulset.yaml b/kubernetes/common/postgres/templates/statefulset.yaml
index 57bfdbf700..3c7ae65e4a 100644
--- a/kubernetes/common/postgres/templates/statefulset.yaml
+++ b/kubernetes/common/postgres/templates/statefulset.yaml
@@ -116,7 +116,7 @@ spec:
name: {{ include "common.fullname" . }}-backup
readOnly: true
resources:
-{{ toYaml .Values.resources | indent 12 }}
+{{ include "common.resources" . | indent 12 }}
{{- if .Values.nodeSelector }}
nodeSelector:
{{ toYaml .Values.nodeSelector | indent 10 }}
diff --git a/kubernetes/common/postgres/values.yaml b/kubernetes/common/postgres/values.yaml
index 28ee64baba..8dd5d0aaac 100644
--- a/kubernetes/common/postgres/values.yaml
+++ b/kubernetes/common/postgres/values.yaml
@@ -55,10 +55,10 @@ pgpool:
credentials:
pgusername: testuser
pgpassword: password
- service:
- name: pgpool
+ service:
+ name: pgpool
+
-
# default number of instances
replicaCount: 2
diff --git a/kubernetes/consul/Chart.yaml b/kubernetes/consul/Chart.yaml
index ad3c548987..10134f1842 100644
--- a/kubernetes/consul/Chart.yaml
+++ b/kubernetes/consul/Chart.yaml
@@ -16,4 +16,4 @@
apiVersion: v1
description: ONAP Consul Agent
name: consul
-version: 2.0.0
+version: 3.0.0
diff --git a/kubernetes/consul/charts/consul-server/Chart.yaml b/kubernetes/consul/charts/consul-server/Chart.yaml
index 55ed6c16f5..f9fb82155e 100644
--- a/kubernetes/consul/charts/consul-server/Chart.yaml
+++ b/kubernetes/consul/charts/consul-server/Chart.yaml
@@ -16,4 +16,4 @@
apiVersion: v1
description: ONAP Consul Server
name: consul-server
-version: 2.0.0
+version: 3.0.0
diff --git a/kubernetes/consul/charts/consul-server/requirements.yaml b/kubernetes/consul/charts/consul-server/requirements.yaml
index c414a0149a..e57547871c 100644
--- a/kubernetes/consul/charts/consul-server/requirements.yaml
+++ b/kubernetes/consul/charts/consul-server/requirements.yaml
@@ -15,7 +15,7 @@
dependencies:
- name: common
- version: ~2.0.0
+ version: ~3.0.0
# local reference to common chart, as it is
# a part of this chart's package and will not
# be published independently to a repo (at this point)
diff --git a/kubernetes/consul/requirements.yaml b/kubernetes/consul/requirements.yaml
index c414a0149a..e57547871c 100644
--- a/kubernetes/consul/requirements.yaml
+++ b/kubernetes/consul/requirements.yaml
@@ -15,7 +15,7 @@
dependencies:
- name: common
- version: ~2.0.0
+ version: ~3.0.0
# local reference to common chart, as it is
# a part of this chart's package and will not
# be published independently to a repo (at this point)
diff --git a/kubernetes/contrib/Chart.yaml b/kubernetes/contrib/Chart.yaml
index f0732044d6..ce70d19f8c 100755
--- a/kubernetes/contrib/Chart.yaml
+++ b/kubernetes/contrib/Chart.yaml
@@ -15,4 +15,4 @@
apiVersion: v1
description: ONAP optional tools
name: contrib
-version: 2.0.0
+version: 3.0.0
diff --git a/kubernetes/contrib/charts/netbox/Chart.yaml b/kubernetes/contrib/charts/netbox/Chart.yaml
index 12e390a819..2a7e9fb3df 100755
--- a/kubernetes/contrib/charts/netbox/Chart.yaml
+++ b/kubernetes/contrib/charts/netbox/Chart.yaml
@@ -15,4 +15,4 @@
apiVersion: v1
description: Netbox IPAM
name: netbox
-version: 2.0.0
+version: 3.0.0
diff --git a/kubernetes/contrib/charts/netbox/charts/netbox-app/Chart.yaml b/kubernetes/contrib/charts/netbox/charts/netbox-app/Chart.yaml
index 8cbc9a415c..3ac79e490f 100755
--- a/kubernetes/contrib/charts/netbox/charts/netbox-app/Chart.yaml
+++ b/kubernetes/contrib/charts/netbox/charts/netbox-app/Chart.yaml
@@ -15,4 +15,4 @@
apiVersion: v1
description: Netbox - Application (WSGI + Gunicorn)
name: netbox-app
-version: 2.0.0
+version: 3.0.0
diff --git a/kubernetes/contrib/charts/netbox/charts/netbox-app/templates/deployment.yaml b/kubernetes/contrib/charts/netbox/charts/netbox-app/templates/deployment.yaml
index 3d4932b6cd..5215ca811d 100755
--- a/kubernetes/contrib/charts/netbox/charts/netbox-app/templates/deployment.yaml
+++ b/kubernetes/contrib/charts/netbox/charts/netbox-app/templates/deployment.yaml
@@ -128,7 +128,7 @@ spec:
- name: {{ include "common.fullname" . }}
mountPath: /opt/netbox/netbox/static
resources:
-{{ toYaml .Values.resources | indent 12 }}
+{{ include "common.resources" . | indent 12 }}
{{- if .Values.nodeSelector }}
nodeSelector:
{{ toYaml .Values.nodeSelector | indent 10 }}
diff --git a/kubernetes/contrib/charts/netbox/charts/netbox-nginx/Chart.yaml b/kubernetes/contrib/charts/netbox/charts/netbox-nginx/Chart.yaml
index fc2ab2c7be..ae22705dab 100755
--- a/kubernetes/contrib/charts/netbox/charts/netbox-nginx/Chart.yaml
+++ b/kubernetes/contrib/charts/netbox/charts/netbox-nginx/Chart.yaml
@@ -15,4 +15,4 @@
apiVersion: v1
description: Netbox - Nginx web server
name: netbox-nginx
-version: 2.0.0
+version: 3.0.0
diff --git a/kubernetes/contrib/charts/netbox/charts/netbox-nginx/templates/deployment.yaml b/kubernetes/contrib/charts/netbox/charts/netbox-nginx/templates/deployment.yaml
index 73ac78b0b1..a3f07cac8b 100755
--- a/kubernetes/contrib/charts/netbox/charts/netbox-nginx/templates/deployment.yaml
+++ b/kubernetes/contrib/charts/netbox/charts/netbox-nginx/templates/deployment.yaml
@@ -49,7 +49,7 @@ spec:
- name: {{ include "common.fullname" . }}-config
mountPath: /etc/netbox-nginx
resources:
-{{ toYaml .Values.resources | indent 12 }}
+{{ include "common.resources" . | indent 12 }}
{{- if .Values.nodeSelector }}
nodeSelector:
{{ toYaml .Values.nodeSelector | indent 10 }}
diff --git a/kubernetes/contrib/charts/netbox/charts/netbox-postgres/Chart.yaml b/kubernetes/contrib/charts/netbox/charts/netbox-postgres/Chart.yaml
index 287fd52515..6e5125c61e 100755
--- a/kubernetes/contrib/charts/netbox/charts/netbox-postgres/Chart.yaml
+++ b/kubernetes/contrib/charts/netbox/charts/netbox-postgres/Chart.yaml
@@ -15,4 +15,4 @@
apiVersion: v1
description: Netbox Posgres database
name: netbox-postgres
-version: 2.0.0
+version: 3.0.0
diff --git a/kubernetes/contrib/charts/netbox/charts/netbox-postgres/templates/deployment.yaml b/kubernetes/contrib/charts/netbox/charts/netbox-postgres/templates/deployment.yaml
index 2bebd11181..803163b91e 100755
--- a/kubernetes/contrib/charts/netbox/charts/netbox-postgres/templates/deployment.yaml
+++ b/kubernetes/contrib/charts/netbox/charts/netbox-postgres/templates/deployment.yaml
@@ -52,7 +52,7 @@ spec:
- name: {{ include "common.fullname" . }}-data
mountPath: /var/lib/postgresql/data
resources:
-{{ toYaml .Values.resources | indent 12 }}
+{{ include "common.resources" . | indent 12 }}
{{- if .Values.nodeSelector }}
nodeSelector:
{{ toYaml .Values.nodeSelector | indent 10 }}
diff --git a/kubernetes/contrib/charts/netbox/requirements.yaml b/kubernetes/contrib/charts/netbox/requirements.yaml
index 97971aabf2..f315681d6a 100755
--- a/kubernetes/contrib/charts/netbox/requirements.yaml
+++ b/kubernetes/contrib/charts/netbox/requirements.yaml
@@ -14,5 +14,5 @@
dependencies:
- name: common
- version: ~2.0.0
+ version: ~3.0.0
repository: '@local' \ No newline at end of file
diff --git a/kubernetes/contrib/requirements.yaml b/kubernetes/contrib/requirements.yaml
index 97971aabf2..f315681d6a 100644
--- a/kubernetes/contrib/requirements.yaml
+++ b/kubernetes/contrib/requirements.yaml
@@ -14,5 +14,5 @@
dependencies:
- name: common
- version: ~2.0.0
+ version: ~3.0.0
repository: '@local' \ No newline at end of file
diff --git a/kubernetes/dcaegen2/Chart.yaml b/kubernetes/dcaegen2/Chart.yaml
index 24916d0b77..3f62f3c3d1 100644
--- a/kubernetes/dcaegen2/Chart.yaml
+++ b/kubernetes/dcaegen2/Chart.yaml
@@ -15,4 +15,4 @@
apiVersion: v1
description: ONAP DCAE Gen2
name: dcaegen2
-version: 2.0.0
+version: 3.0.0
diff --git a/kubernetes/dcaegen2/charts/dcae-bootstrap/Chart.yaml b/kubernetes/dcaegen2/charts/dcae-bootstrap/Chart.yaml
index 6e0d821ce7..fca0302881 100644
--- a/kubernetes/dcaegen2/charts/dcae-bootstrap/Chart.yaml
+++ b/kubernetes/dcaegen2/charts/dcae-bootstrap/Chart.yaml
@@ -19,4 +19,4 @@
apiVersion: v1
description: ONAP DCAE Bootstrap
name: dcae-bootstrap
-version: 2.0.0
+version: 3.0.0
diff --git a/kubernetes/dcaegen2/charts/dcae-bootstrap/requirements.yaml b/kubernetes/dcaegen2/charts/dcae-bootstrap/requirements.yaml
index 0f54eb27db..caf790483f 100644
--- a/kubernetes/dcaegen2/charts/dcae-bootstrap/requirements.yaml
+++ b/kubernetes/dcaegen2/charts/dcae-bootstrap/requirements.yaml
@@ -18,8 +18,8 @@
dependencies:
- name: common
- version: ~2.0.0
+ version: ~3.0.0
repository: '@local'
- name: postgres
- version: ~2.0.0
+ version: ~3.0.0
repository: '@local'
diff --git a/kubernetes/dcaegen2/charts/dcae-cloudify-manager/Chart.yaml b/kubernetes/dcaegen2/charts/dcae-cloudify-manager/Chart.yaml
index f5f5936815..93e4feeb58 100644
--- a/kubernetes/dcaegen2/charts/dcae-cloudify-manager/Chart.yaml
+++ b/kubernetes/dcaegen2/charts/dcae-cloudify-manager/Chart.yaml
@@ -19,4 +19,4 @@
apiVersion: v1
description: ONAP DCAE Cloudify Manager
name: dcae-cloudify-manager
-version: 2.0.0
+version: 3.0.0
diff --git a/kubernetes/dcaegen2/charts/dcae-cloudify-manager/requirements.yaml b/kubernetes/dcaegen2/charts/dcae-cloudify-manager/requirements.yaml
index 204a77562f..897df32ce0 100644
--- a/kubernetes/dcaegen2/charts/dcae-cloudify-manager/requirements.yaml
+++ b/kubernetes/dcaegen2/charts/dcae-cloudify-manager/requirements.yaml
@@ -15,5 +15,5 @@
dependencies:
- name: common
- version: ~2.0.0
+ version: ~3.0.0
repository: '@local'
diff --git a/kubernetes/dcaegen2/charts/dcae-healthcheck/Chart.yaml b/kubernetes/dcaegen2/charts/dcae-healthcheck/Chart.yaml
index 9d8f33931c..78385402b7 100644
--- a/kubernetes/dcaegen2/charts/dcae-healthcheck/Chart.yaml
+++ b/kubernetes/dcaegen2/charts/dcae-healthcheck/Chart.yaml
@@ -19,4 +19,4 @@
apiVersion: v1
description: ONAP DCAE Health Check
name: dcae-healthcheck
-version: 2.0.0
+version: 3.0.0
diff --git a/kubernetes/dcaegen2/charts/dcae-healthcheck/requirements.yaml b/kubernetes/dcaegen2/charts/dcae-healthcheck/requirements.yaml
index 75d6448df6..8943620f13 100644
--- a/kubernetes/dcaegen2/charts/dcae-healthcheck/requirements.yaml
+++ b/kubernetes/dcaegen2/charts/dcae-healthcheck/requirements.yaml
@@ -18,5 +18,5 @@
dependencies:
- name: common
- version: ~2.0.0
+ version: ~3.0.0
repository: '@local'
diff --git a/kubernetes/dcaegen2/charts/dcae-healthcheck/values.yaml b/kubernetes/dcaegen2/charts/dcae-healthcheck/values.yaml
index ff6b2541dd..fd3305c785 100644
--- a/kubernetes/dcaegen2/charts/dcae-healthcheck/values.yaml
+++ b/kubernetes/dcaegen2/charts/dcae-healthcheck/values.yaml
@@ -25,13 +25,13 @@ global:
readinessImage: readiness-check:2.0.0
loggingRepository: docker.elastic.co
loggingImage: beats/filebeat:5.5.0
-
+
service:
name: dcae-healthcheck
internalPort: 80
externalPort: 80
type: ClusterIP
-
+
# probe configuration parameters
liveness:
initialDelaySeconds: 10
diff --git a/kubernetes/dcaegen2/charts/dcae-redis/Chart.yaml b/kubernetes/dcaegen2/charts/dcae-redis/Chart.yaml
index a200ebc976..1b0325d60c 100644
--- a/kubernetes/dcaegen2/charts/dcae-redis/Chart.yaml
+++ b/kubernetes/dcaegen2/charts/dcae-redis/Chart.yaml
@@ -16,4 +16,4 @@
apiVersion: v1
description: ONAP DCAE Redis
name: dcae-redis
-version: 2.0.0
+version: 3.0.0
diff --git a/kubernetes/dcaegen2/charts/dcae-redis/requirements.yaml b/kubernetes/dcaegen2/charts/dcae-redis/requirements.yaml
index 7244af3970..2aa12fdd12 100644
--- a/kubernetes/dcaegen2/charts/dcae-redis/requirements.yaml
+++ b/kubernetes/dcaegen2/charts/dcae-redis/requirements.yaml
@@ -14,5 +14,5 @@
dependencies:
- name: common
- version: ~2.0.0
+ version: ~3.0.0
repository: '@local'
diff --git a/kubernetes/dcaegen2/charts/dcae-redis/templates/statefulset.yaml b/kubernetes/dcaegen2/charts/dcae-redis/templates/statefulset.yaml
index f72e540f1e..3e20e37dd4 100644
--- a/kubernetes/dcaegen2/charts/dcae-redis/templates/statefulset.yaml
+++ b/kubernetes/dcaegen2/charts/dcae-redis/templates/statefulset.yaml
@@ -77,7 +77,7 @@ spec:
- mountPath: /opt/scripts
name: {{ include "common.fullname" . }}-scripts
resources:
-{{ toYaml .Values.resources | indent 12 }}
+{{ include "common.resources" . | indent 12 }}
{{- if .Values.nodeSelector }}
nodeSelector:
{{ toYaml .Values.nodeSelector | indent 10 }}
diff --git a/kubernetes/dcaegen2/requirements.yaml b/kubernetes/dcaegen2/requirements.yaml
index a72a96a6e3..220dc4619b 100644
--- a/kubernetes/dcaegen2/requirements.yaml
+++ b/kubernetes/dcaegen2/requirements.yaml
@@ -14,5 +14,5 @@
dependencies:
- name: common
- version: ~2.0.0
+ version: ~3.0.0
repository: '@local'
diff --git a/kubernetes/dmaap/Chart.yaml b/kubernetes/dmaap/Chart.yaml
index b5c7d24e1a..2f8bb0ebaf 100644
--- a/kubernetes/dmaap/Chart.yaml
+++ b/kubernetes/dmaap/Chart.yaml
@@ -16,4 +16,4 @@
apiVersion: v1
description: ONAP DMaaP components
name: dmaap
-version: 2.0.0
+version: 3.0.0
diff --git a/kubernetes/dmaap/charts/dmaap-bus-controller/Chart.yaml b/kubernetes/dmaap/charts/dmaap-bus-controller/Chart.yaml
index fceec170bb..275cc8cc07 100644
--- a/kubernetes/dmaap/charts/dmaap-bus-controller/Chart.yaml
+++ b/kubernetes/dmaap/charts/dmaap-bus-controller/Chart.yaml
@@ -16,4 +16,4 @@
apiVersion: v1
description: a Helm chart to deploy ONAP DMaaP Bus Controller (aka dmaap-prov) in Kubernetes
name: dmaap-bus-controller
-version: 2.0.0
+version: 3.0.0
diff --git a/kubernetes/dmaap/charts/dmaap-bus-controller/requirements.yaml b/kubernetes/dmaap/charts/dmaap-bus-controller/requirements.yaml
index b67ac02eca..fa6e0afd01 100644
--- a/kubernetes/dmaap/charts/dmaap-bus-controller/requirements.yaml
+++ b/kubernetes/dmaap/charts/dmaap-bus-controller/requirements.yaml
@@ -14,8 +14,8 @@
dependencies:
- name: common
- version: ~2.0.0
+ version: ~3.0.0
repository: '@local'
- name: postgres
- version: ~2.0.0
+ version: ~3.0.0
repository: '@local'
diff --git a/kubernetes/dmaap/charts/dmaap-bus-controller/templates/deployment.yaml b/kubernetes/dmaap/charts/dmaap-bus-controller/templates/deployment.yaml
index ae90a9f2eb..778005db45 100644
--- a/kubernetes/dmaap/charts/dmaap-bus-controller/templates/deployment.yaml
+++ b/kubernetes/dmaap/charts/dmaap-bus-controller/templates/deployment.yaml
@@ -87,7 +87,7 @@ spec:
- name: {{ include "common.name" . }}-feeds
mountPath: /opt/app/config/feeds/
resources:
-{{ toYaml .Values.resources | indent 12 }}
+{{ include "common.resources" . | indent 12 }}
{{- if .Values.nodeSelector }}
nodeSelector:
{{ toYaml .Values.nodeSelector | indent 10 }}
diff --git a/kubernetes/dmaap/charts/dmaap-data-router/charts/dmaap-dr-db/templates/deployment.yaml b/kubernetes/dmaap/charts/dmaap-data-router/charts/dmaap-dr-db/templates/deployment.yaml
index 6b19804ebb..bf544916ef 100644
--- a/kubernetes/dmaap/charts/dmaap-data-router/charts/dmaap-dr-db/templates/deployment.yaml
+++ b/kubernetes/dmaap/charts/dmaap-data-router/charts/dmaap-dr-db/templates/deployment.yaml
@@ -77,7 +77,7 @@ spec:
- mountPath: /var/lib/mysql
name: mariadb-data
resources:
-{{ toYaml .Values.resources | indent 12 }}
+{{ include "common.resources" . | indent 12 }}
{{- if .Values.nodeSelector }}
nodeSelector:
{{ toYaml .Values.nodeSelector | indent 10 }}
diff --git a/kubernetes/dmaap/charts/dmaap-data-router/charts/dmaap-dr-db/values.yaml b/kubernetes/dmaap/charts/dmaap-data-router/charts/dmaap-dr-db/values.yaml
index cf61c49c44..26a37d5fa8 100644
--- a/kubernetes/dmaap/charts/dmaap-data-router/charts/dmaap-dr-db/values.yaml
+++ b/kubernetes/dmaap/charts/dmaap-data-router/charts/dmaap-dr-db/values.yaml
@@ -68,8 +68,8 @@ resources: {}
# Example:
# Configure resource requests and limits
# ref: http://kubernetes.io/docs/user-guide/compute-resources/
- # Minimum memory for development is 2 CPU cores and 4GB memory
- # Minimum memory for production is 4 CPU cores and 8GB memory
+ # Minimum memory for development is 2 CPU cores and 4GB memory
+ # Minimum memory for production is 4 CPU cores and 8GB memory
#resources:
# limits:
# cpu: 2
diff --git a/kubernetes/dmaap/charts/dmaap-data-router/charts/dmaap-dr-node/templates/deployment.yaml b/kubernetes/dmaap/charts/dmaap-data-router/charts/dmaap-dr-node/templates/deployment.yaml
index 2aae2d0ba8..84887587ae 100644
--- a/kubernetes/dmaap/charts/dmaap-data-router/charts/dmaap-dr-node/templates/deployment.yaml
+++ b/kubernetes/dmaap/charts/dmaap-data-router/charts/dmaap-dr-node/templates/deployment.yaml
@@ -83,7 +83,7 @@ spec:
command:
- /opt/app/datartr/etc/createFeed.sh
resources:
-{{ toYaml .Values.resources | indent 12 }}
+{{ include "common.resources" . | indent 12 }}
{{- if .Values.nodeSelector }}
nodeSelector:
{{ toYaml .Values.nodeSelector | indent 10 }}
diff --git a/kubernetes/dmaap/charts/dmaap-data-router/charts/dmaap-dr-prov/templates/deployment.yaml b/kubernetes/dmaap/charts/dmaap-data-router/charts/dmaap-dr-prov/templates/deployment.yaml
index d956581a25..7fd60ea501 100644
--- a/kubernetes/dmaap/charts/dmaap-data-router/charts/dmaap-dr-prov/templates/deployment.yaml
+++ b/kubernetes/dmaap/charts/dmaap-data-router/charts/dmaap-dr-prov/templates/deployment.yaml
@@ -72,7 +72,7 @@ spec:
subPath: provserver.properties
name: prov-props
resources:
-{{ toYaml .Values.resources | indent 12 }}
+{{ include "common.resources" . | indent 12 }}
{{- if .Values.nodeSelector }}
nodeSelector:
{{ toYaml .Values.nodeSelector | indent 10 }}
diff --git a/kubernetes/dmaap/charts/dmaap-data-router/requirements.yaml b/kubernetes/dmaap/charts/dmaap-data-router/requirements.yaml
index 480e9e34f0..5da3738b55 100644
--- a/kubernetes/dmaap/charts/dmaap-data-router/requirements.yaml
+++ b/kubernetes/dmaap/charts/dmaap-data-router/requirements.yaml
@@ -14,6 +14,6 @@
dependencies:
- name: common
- version: ~2.0.0
+ version: ~3.0.0
repository: '@local'
diff --git a/kubernetes/dmaap/charts/message-router/Chart.yaml b/kubernetes/dmaap/charts/message-router/Chart.yaml
index d66df284ae..11d8c8feb7 100644
--- a/kubernetes/dmaap/charts/message-router/Chart.yaml
+++ b/kubernetes/dmaap/charts/message-router/Chart.yaml
@@ -16,4 +16,4 @@
apiVersion: v1
description: ONAP Message Router
name: message-router
-version: 2.0.0
+version: 3.0.0
diff --git a/kubernetes/dmaap/charts/message-router/charts/message-router-kafka/Chart.yaml b/kubernetes/dmaap/charts/message-router/charts/message-router-kafka/Chart.yaml
index 7ea383dfb2..547d84604e 100644
--- a/kubernetes/dmaap/charts/message-router/charts/message-router-kafka/Chart.yaml
+++ b/kubernetes/dmaap/charts/message-router/charts/message-router-kafka/Chart.yaml
@@ -16,5 +16,5 @@
apiVersion: v1
description: ONAP Message Router Kafka Service
name: message-router-kafka
-version: 2.0.0
+version: 3.0.0
diff --git a/kubernetes/dmaap/charts/message-router/charts/message-router-zookeeper/Chart.yaml b/kubernetes/dmaap/charts/message-router/charts/message-router-zookeeper/Chart.yaml
index f5eea9b97f..138c18c523 100644
--- a/kubernetes/dmaap/charts/message-router/charts/message-router-zookeeper/Chart.yaml
+++ b/kubernetes/dmaap/charts/message-router/charts/message-router-zookeeper/Chart.yaml
@@ -16,5 +16,5 @@
apiVersion: v1
description: ONAP Dmaap Message Router Zookeeper Service
name: message-router-zookeeper
-version: 2.0.0
+version: 3.0.0
diff --git a/kubernetes/dmaap/charts/message-router/requirements.yaml b/kubernetes/dmaap/charts/message-router/requirements.yaml
index 964a0e6df9..96141ba881 100644
--- a/kubernetes/dmaap/charts/message-router/requirements.yaml
+++ b/kubernetes/dmaap/charts/message-router/requirements.yaml
@@ -15,7 +15,7 @@
dependencies:
- name: common
- version: ~2.0.0
+ version: ~3.0.0
# local reference to common chart, as it is
# a part of this chart's package and will not
# be published independently to a repo (at this point)
diff --git a/kubernetes/dmaap/requirements.yaml b/kubernetes/dmaap/requirements.yaml
index 6a05810d38..ea2fba4bb5 100644
--- a/kubernetes/dmaap/requirements.yaml
+++ b/kubernetes/dmaap/requirements.yaml
@@ -15,5 +15,5 @@
dependencies:
- name: common
- version: ~2.0.0
+ version: ~3.0.0
repository: '@local'
diff --git a/kubernetes/esr/Chart.yaml b/kubernetes/esr/Chart.yaml
index 096ef78921..05e13965af 100644
--- a/kubernetes/esr/Chart.yaml
+++ b/kubernetes/esr/Chart.yaml
@@ -16,4 +16,4 @@
apiVersion: v1
description: ONAP External System Register
name: esr
-version: 2.0.0
+version: 3.0.0
diff --git a/kubernetes/esr/charts/esr-gui/Chart.yaml b/kubernetes/esr/charts/esr-gui/Chart.yaml
index 0608dabee8..eb9f0ab598 100644
--- a/kubernetes/esr/charts/esr-gui/Chart.yaml
+++ b/kubernetes/esr/charts/esr-gui/Chart.yaml
@@ -16,4 +16,4 @@
apiVersion: v1
description: ONAP External System Register GUI
name: esr-gui
-version: 2.0.0
+version: 3.0.0
diff --git a/kubernetes/esr/charts/esr-gui/templates/deployment.yaml b/kubernetes/esr/charts/esr-gui/templates/deployment.yaml
index b44b4d2c03..225f1f48c3 100644
--- a/kubernetes/esr/charts/esr-gui/templates/deployment.yaml
+++ b/kubernetes/esr/charts/esr-gui/templates/deployment.yaml
@@ -55,7 +55,7 @@ spec:
- name: MSB_ADDR
value: {{ tpl .Values.msbaddr . }}
resources:
-{{ toYaml .Values.resources | indent 12 }}
+{{ include "common.resources" . | indent 12 }}
{{- if .Values.nodeSelector }}
nodeSelector:
{{ toYaml .Values.nodeSelector | indent 10 }}
diff --git a/kubernetes/esr/charts/esr-server/Chart.yaml b/kubernetes/esr/charts/esr-server/Chart.yaml
index 455e341ff9..5f772f8366 100644
--- a/kubernetes/esr/charts/esr-server/Chart.yaml
+++ b/kubernetes/esr/charts/esr-server/Chart.yaml
@@ -15,4 +15,4 @@
apiVersion: v1
description: ONAP External System Register GUI
name: esr-server
-version: 2.0.0
+version: 3.0.0
diff --git a/kubernetes/esr/charts/esr-server/requirements.yaml b/kubernetes/esr/charts/esr-server/requirements.yaml
index 03da823ee4..8a6ec399e1 100644
--- a/kubernetes/esr/charts/esr-server/requirements.yaml
+++ b/kubernetes/esr/charts/esr-server/requirements.yaml
@@ -14,7 +14,7 @@
dependencies:
- name: common
- version: ~2.0.0
+ version: ~3.0.0
# local reference to common chart, as it is
# a part of this chart's package and will not
# be published independently to a repo (at this point)
diff --git a/kubernetes/esr/charts/esr-server/templates/deployment.yaml b/kubernetes/esr/charts/esr-server/templates/deployment.yaml
index 486d67b0f5..896d8855e3 100644
--- a/kubernetes/esr/charts/esr-server/templates/deployment.yaml
+++ b/kubernetes/esr/charts/esr-server/templates/deployment.yaml
@@ -61,7 +61,7 @@ spec:
- mountPath: /home/esr/works/logs
name: {{ include "common.fullname" . }}-logs
resources:
-{{ toYaml .Values.resources | indent 12 }}
+{{ include "common.resources" . | indent 12 }}
{{- if .Values.nodeSelector }}
nodeSelector:
{{ toYaml .Values.nodeSelector | indent 10 }}
diff --git a/kubernetes/esr/requirements.yaml b/kubernetes/esr/requirements.yaml
index c414a0149a..e57547871c 100644
--- a/kubernetes/esr/requirements.yaml
+++ b/kubernetes/esr/requirements.yaml
@@ -15,7 +15,7 @@
dependencies:
- name: common
- version: ~2.0.0
+ version: ~3.0.0
# local reference to common chart, as it is
# a part of this chart's package and will not
# be published independently to a repo (at this point)
diff --git a/kubernetes/helm/starters/onap-app/Chart.yaml b/kubernetes/helm/starters/onap-app/Chart.yaml
index 15a15066fe..b7628cba81 100644
--- a/kubernetes/helm/starters/onap-app/Chart.yaml
+++ b/kubernetes/helm/starters/onap-app/Chart.yaml
@@ -15,4 +15,4 @@
apiVersion: v1
description: <Short application description - this is visible via 'helm search'>
name: <onap-app>
-version: 2.0.0 \ No newline at end of file
+version: 3.0.0 \ No newline at end of file
diff --git a/kubernetes/helm/starters/onap-app/requirements.yaml b/kubernetes/helm/starters/onap-app/requirements.yaml
index 1e8f788318..896eaf4baa 100644
--- a/kubernetes/helm/starters/onap-app/requirements.yaml
+++ b/kubernetes/helm/starters/onap-app/requirements.yaml
@@ -14,5 +14,5 @@
dependencies:
- name: common
- version: ~2.0.0
+ version: ~3.0.0
repository: '@local' \ No newline at end of file
diff --git a/kubernetes/helm/starters/onap-app/templates/deployment.yaml b/kubernetes/helm/starters/onap-app/templates/deployment.yaml
index a78795486b..1518c5f1e8 100644
--- a/kubernetes/helm/starters/onap-app/templates/deployment.yaml
+++ b/kubernetes/helm/starters/onap-app/templates/deployment.yaml
@@ -79,7 +79,7 @@ spec:
# name: {{ include "common.name" . }}-config
# subPath: application.properties
resources:
-{{ toYaml .Values.resources | indent 12 }}
+{{ include "common.resources" . | indent 12 }}
{{- if .Values.nodeSelector }}
nodeSelector:
{{ toYaml .Values.nodeSelector | indent 10 }}
diff --git a/kubernetes/log/charts/log-elasticsearch/requirements.yaml b/kubernetes/log/charts/log-elasticsearch/requirements.yaml
index 204a77562f..897df32ce0 100644
--- a/kubernetes/log/charts/log-elasticsearch/requirements.yaml
+++ b/kubernetes/log/charts/log-elasticsearch/requirements.yaml
@@ -15,5 +15,5 @@
dependencies:
- name: common
- version: ~2.0.0
+ version: ~3.0.0
repository: '@local'
diff --git a/kubernetes/log/charts/log-elasticsearch/templates/deployment.yaml b/kubernetes/log/charts/log-elasticsearch/templates/deployment.yaml
index 5ff01b8274..fcbe643dc7 100644
--- a/kubernetes/log/charts/log-elasticsearch/templates/deployment.yaml
+++ b/kubernetes/log/charts/log-elasticsearch/templates/deployment.yaml
@@ -60,7 +60,7 @@ spec:
image: "{{ .Values.global.loggingRepository | default .Values.loggingRepository }}/{{ .Values.image }}"
imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
resources:
-{{ toYaml (pluck .Values.flavor .Values.resources| first) | indent 12 }}
+{{ include "common.resources" . | indent 12 }}
ports:
- containerPort: {{ .Values.service.internalPort }}
name: {{ .Values.service.name }}
diff --git a/kubernetes/log/charts/log-elasticsearch/values.yaml b/kubernetes/log/charts/log-elasticsearch/values.yaml
index 3a621f9be8..9c3525aec8 100644
--- a/kubernetes/log/charts/log-elasticsearch/values.yaml
+++ b/kubernetes/log/charts/log-elasticsearch/values.yaml
@@ -95,7 +95,7 @@ service:
ingress:
enabled: false
-# Resource Limit flavor -By Default using small
+# Resource Limit flavor -By Default using small
flavor: small
# Segregation for Different environment (Small and Large)
resources:
@@ -112,4 +112,5 @@ resources:
memory: 8Gi
requests:
cpu: 1
- memory: 4Gi \ No newline at end of file
+ memory: 4Gi
+ unlimited: {} \ No newline at end of file
diff --git a/kubernetes/log/charts/log-kibana/requirements.yaml b/kubernetes/log/charts/log-kibana/requirements.yaml
index 204a77562f..897df32ce0 100644
--- a/kubernetes/log/charts/log-kibana/requirements.yaml
+++ b/kubernetes/log/charts/log-kibana/requirements.yaml
@@ -15,5 +15,5 @@
dependencies:
- name: common
- version: ~2.0.0
+ version: ~3.0.0
repository: '@local'
diff --git a/kubernetes/log/charts/log-kibana/templates/deployment.yaml b/kubernetes/log/charts/log-kibana/templates/deployment.yaml
index a39dfe6668..ac52f62fde 100644
--- a/kubernetes/log/charts/log-kibana/templates/deployment.yaml
+++ b/kubernetes/log/charts/log-kibana/templates/deployment.yaml
@@ -51,7 +51,7 @@ spec:
image: "{{ .Values.global.loggingRepository | default .Values.loggingRepository }}/{{ .Values.image }}"
imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
resources:
-{{ toYaml (pluck .Values.flavor .Values.resources| first) | indent 12 }}
+{{ include "common.resources" . | indent 12 }}
ports:
- containerPort: {{ .Values.service.internalPort }}
name: {{ .Values.service.name }}
diff --git a/kubernetes/log/charts/log-kibana/values.yaml b/kubernetes/log/charts/log-kibana/values.yaml
index 81d0241f4f..8a56151c38 100644
--- a/kubernetes/log/charts/log-kibana/values.yaml
+++ b/kubernetes/log/charts/log-kibana/values.yaml
@@ -76,7 +76,7 @@ service:
ingress:
enabled: false
-# Resource Limit flavor -By Default using small
+# Resource Limit flavor -By Default using small
flavor: small
# Segregation for Different environment (Small and Large)
resources:
@@ -93,4 +93,5 @@ resources:
memory: 8Gi
requests:
cpu: 2
- memory: 4Gi \ No newline at end of file
+ memory: 4Gi
+ unlimited: {} \ No newline at end of file
diff --git a/kubernetes/log/charts/log-logstash/requirements.yaml b/kubernetes/log/charts/log-logstash/requirements.yaml
index 204a77562f..897df32ce0 100644
--- a/kubernetes/log/charts/log-logstash/requirements.yaml
+++ b/kubernetes/log/charts/log-logstash/requirements.yaml
@@ -15,5 +15,5 @@
dependencies:
- name: common
- version: ~2.0.0
+ version: ~3.0.0
repository: '@local'
diff --git a/kubernetes/log/charts/log-logstash/templates/deployment.yaml b/kubernetes/log/charts/log-logstash/templates/deployment.yaml
index 7d0fc6e57d..86b1a8c264 100644
--- a/kubernetes/log/charts/log-logstash/templates/deployment.yaml
+++ b/kubernetes/log/charts/log-logstash/templates/deployment.yaml
@@ -50,7 +50,7 @@ spec:
image: "{{ .Values.global.loggingRepository| default .Values.loggingRepository }}/{{ .Values.image }}"
imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
resources:
-{{ toYaml (pluck .Values.flavor .Values.resources| first) | indent 12 }}
+{{ include "common.resources" . | indent 12 }}
ports:
- containerPort: {{ .Values.service.internalPort }}
name: {{ .Values.service.name }}
diff --git a/kubernetes/log/charts/log-logstash/values.yaml b/kubernetes/log/charts/log-logstash/values.yaml
index ce227d99b7..7779ffe490 100644
--- a/kubernetes/log/charts/log-logstash/values.yaml
+++ b/kubernetes/log/charts/log-logstash/values.yaml
@@ -73,7 +73,7 @@ service:
ingress:
enabled: false
-# Resource Limit flavor -By Default using small
+# Resource Limit flavor -By Default using small
flavor: small
# Segregation for Different environment (Small and Large)
resources:
@@ -90,4 +90,5 @@ resources:
memory: 4Gi
requests:
cpu: 2
- memory: 4Gi \ No newline at end of file
+ memory: 4Gi
+ unlimited: {} \ No newline at end of file
diff --git a/kubernetes/log/requirements.yaml b/kubernetes/log/requirements.yaml
index a72a96a6e3..220dc4619b 100644
--- a/kubernetes/log/requirements.yaml
+++ b/kubernetes/log/requirements.yaml
@@ -14,5 +14,5 @@
dependencies:
- name: common
- version: ~2.0.0
+ version: ~3.0.0
repository: '@local'
diff --git a/kubernetes/msb/Chart.yaml b/kubernetes/msb/Chart.yaml
index 035a332096..69b2040150 100644
--- a/kubernetes/msb/Chart.yaml
+++ b/kubernetes/msb/Chart.yaml
@@ -16,4 +16,4 @@
apiVersion: v1
description: ONAP MicroServices Bus
name: msb
-version: 2.0.0
+version: 3.0.0
diff --git a/kubernetes/msb/charts/kube2msb/Chart.yaml b/kubernetes/msb/charts/kube2msb/Chart.yaml
index 649201dbea..9e73ac66d2 100644
--- a/kubernetes/msb/charts/kube2msb/Chart.yaml
+++ b/kubernetes/msb/charts/kube2msb/Chart.yaml
@@ -14,4 +14,4 @@
apiVersion: v1
description: ONAP MicroServices Bus Kube2MSB Registrator
name: kube2msb
-version: 2.0.0
+version: 3.0.0
diff --git a/kubernetes/msb/charts/kube2msb/requirements.yaml b/kubernetes/msb/charts/kube2msb/requirements.yaml
index 50d2829e2a..ec2438e7c5 100644
--- a/kubernetes/msb/charts/kube2msb/requirements.yaml
+++ b/kubernetes/msb/charts/kube2msb/requirements.yaml
@@ -13,5 +13,5 @@
# limitations under the License.
dependencies:
- name: common
- version: ~2.0.0
+ version: ~3.0.0
repository: '@local'
diff --git a/kubernetes/msb/charts/kube2msb/templates/deployment.yaml b/kubernetes/msb/charts/kube2msb/templates/deployment.yaml
index 7f55dcc4b2..455eae003a 100644
--- a/kubernetes/msb/charts/kube2msb/templates/deployment.yaml
+++ b/kubernetes/msb/charts/kube2msb/templates/deployment.yaml
@@ -61,7 +61,7 @@ spec:
name: localtime
readOnly: true
resources:
-{{ toYaml .Values.resources | indent 12 }}
+{{ include "common.resources" . | indent 12 }}
{{- if .Values.nodeSelector }}
nodeSelector:
{{ toYaml .Values.nodeSelector | indent 10 }}
diff --git a/kubernetes/msb/charts/msb-consul/Chart.yaml b/kubernetes/msb/charts/msb-consul/Chart.yaml
index 7c9103aa87..234d08f588 100644
--- a/kubernetes/msb/charts/msb-consul/Chart.yaml
+++ b/kubernetes/msb/charts/msb-consul/Chart.yaml
@@ -14,4 +14,4 @@
apiVersion: v1
description: ONAP MicroServices Bus Consul
name: msb-consul
-version: 2.0.0
+version: 3.0.0
diff --git a/kubernetes/msb/charts/msb-consul/requirements.yaml b/kubernetes/msb/charts/msb-consul/requirements.yaml
index 50d2829e2a..ec2438e7c5 100644
--- a/kubernetes/msb/charts/msb-consul/requirements.yaml
+++ b/kubernetes/msb/charts/msb-consul/requirements.yaml
@@ -13,5 +13,5 @@
# limitations under the License.
dependencies:
- name: common
- version: ~2.0.0
+ version: ~3.0.0
repository: '@local'
diff --git a/kubernetes/msb/charts/msb-consul/templates/deployment.yaml b/kubernetes/msb/charts/msb-consul/templates/deployment.yaml
index 86e401ec99..5b8ceae191 100644
--- a/kubernetes/msb/charts/msb-consul/templates/deployment.yaml
+++ b/kubernetes/msb/charts/msb-consul/templates/deployment.yaml
@@ -58,7 +58,7 @@ spec:
name: localtime
readOnly: true
resources:
-{{ toYaml .Values.resources | indent 12 }}
+{{ include "common.resources" . | indent 12 }}
{{- if .Values.nodeSelector }}
nodeSelector:
{{ toYaml .Values.nodeSelector | indent 10 }}
diff --git a/kubernetes/msb/charts/msb-discovery/Chart.yaml b/kubernetes/msb/charts/msb-discovery/Chart.yaml
index f5a85b993d..52bdb8621b 100644
--- a/kubernetes/msb/charts/msb-discovery/Chart.yaml
+++ b/kubernetes/msb/charts/msb-discovery/Chart.yaml
@@ -14,4 +14,4 @@
apiVersion: v1
description: ONAP MicroServices Bus Discovery
name: msb-discovery
-version: 2.0.0
+version: 3.0.0
diff --git a/kubernetes/msb/charts/msb-discovery/requirements.yaml b/kubernetes/msb/charts/msb-discovery/requirements.yaml
index 50d2829e2a..ec2438e7c5 100644
--- a/kubernetes/msb/charts/msb-discovery/requirements.yaml
+++ b/kubernetes/msb/charts/msb-discovery/requirements.yaml
@@ -13,5 +13,5 @@
# limitations under the License.
dependencies:
- name: common
- version: ~2.0.0
+ version: ~3.0.0
repository: '@local'
diff --git a/kubernetes/msb/charts/msb-discovery/templates/deployment.yaml b/kubernetes/msb/charts/msb-discovery/templates/deployment.yaml
index 4c349ef4b9..eb99c945b8 100644
--- a/kubernetes/msb/charts/msb-discovery/templates/deployment.yaml
+++ b/kubernetes/msb/charts/msb-discovery/templates/deployment.yaml
@@ -77,7 +77,7 @@ spec:
- mountPath: /usr/local/discover-works/logs
name: {{ include "common.fullname" . }}-logs
resources:
-{{ toYaml .Values.resources | indent 12 }}
+{{ include "common.resources" . | indent 12 }}
{{- if .Values.nodeSelector }}
nodeSelector:
{{ toYaml .Values.nodeSelector | indent 10 }}
diff --git a/kubernetes/msb/charts/msb-eag/Chart.yaml b/kubernetes/msb/charts/msb-eag/Chart.yaml
index a4cc1ffba6..b0b2876ba4 100644
--- a/kubernetes/msb/charts/msb-eag/Chart.yaml
+++ b/kubernetes/msb/charts/msb-eag/Chart.yaml
@@ -14,4 +14,4 @@
apiVersion: v1
description: ONAP MicroServices Bus Internal API Gateway
name: msb-eag
-version: 2.0.0
+version: 3.0.0
diff --git a/kubernetes/msb/charts/msb-eag/requirements.yaml b/kubernetes/msb/charts/msb-eag/requirements.yaml
index 50d2829e2a..ec2438e7c5 100644
--- a/kubernetes/msb/charts/msb-eag/requirements.yaml
+++ b/kubernetes/msb/charts/msb-eag/requirements.yaml
@@ -13,5 +13,5 @@
# limitations under the License.
dependencies:
- name: common
- version: ~2.0.0
+ version: ~3.0.0
repository: '@local'
diff --git a/kubernetes/msb/charts/msb-eag/templates/deployment.yaml b/kubernetes/msb/charts/msb-eag/templates/deployment.yaml
index 423cb99e00..6cfcef2fec 100644
--- a/kubernetes/msb/charts/msb-eag/templates/deployment.yaml
+++ b/kubernetes/msb/charts/msb-eag/templates/deployment.yaml
@@ -84,7 +84,7 @@ spec:
- mountPath: /usr/local/apiroute-works/logs
name: {{ include "common.fullname" . }}-logs
resources:
-{{ toYaml .Values.resources | indent 12 }}
+{{ include "common.resources" . | indent 12 }}
{{- if .Values.nodeSelector }}
nodeSelector:
{{ toYaml .Values.nodeSelector | indent 10 }}
diff --git a/kubernetes/msb/charts/msb-iag/Chart.yaml b/kubernetes/msb/charts/msb-iag/Chart.yaml
index c4fc919df3..3b928abe0c 100644
--- a/kubernetes/msb/charts/msb-iag/Chart.yaml
+++ b/kubernetes/msb/charts/msb-iag/Chart.yaml
@@ -14,4 +14,4 @@
apiVersion: v1
description: ONAP MicroServices Bus Internal API Gateway
name: msb-iag
-version: 2.0.0
+version: 3.0.0
diff --git a/kubernetes/msb/charts/msb-iag/requirements.yaml b/kubernetes/msb/charts/msb-iag/requirements.yaml
index 50d2829e2a..ec2438e7c5 100644
--- a/kubernetes/msb/charts/msb-iag/requirements.yaml
+++ b/kubernetes/msb/charts/msb-iag/requirements.yaml
@@ -13,5 +13,5 @@
# limitations under the License.
dependencies:
- name: common
- version: ~2.0.0
+ version: ~3.0.0
repository: '@local'
diff --git a/kubernetes/msb/charts/msb-iag/templates/deployment.yaml b/kubernetes/msb/charts/msb-iag/templates/deployment.yaml
index 5b9b6b7a87..21d5d0009b 100644
--- a/kubernetes/msb/charts/msb-iag/templates/deployment.yaml
+++ b/kubernetes/msb/charts/msb-iag/templates/deployment.yaml
@@ -84,7 +84,7 @@ spec:
- mountPath: /usr/local/apiroute-works/logs
name: {{ include "common.fullname" . }}-logs
resources:
-{{ toYaml .Values.resources | indent 12 }}
+{{ include "common.resources" . | indent 12 }}
{{- if .Values.nodeSelector }}
nodeSelector:
{{ toYaml .Values.nodeSelector | indent 10 }}
diff --git a/kubernetes/msb/requirements.yaml b/kubernetes/msb/requirements.yaml
index 50d2829e2a..ec2438e7c5 100644
--- a/kubernetes/msb/requirements.yaml
+++ b/kubernetes/msb/requirements.yaml
@@ -13,5 +13,5 @@
# limitations under the License.
dependencies:
- name: common
- version: ~2.0.0
+ version: ~3.0.0
repository: '@local'
diff --git a/kubernetes/multicloud/Chart.yaml b/kubernetes/multicloud/Chart.yaml
index 17e61a325e..9145a5a495 100644
--- a/kubernetes/multicloud/Chart.yaml
+++ b/kubernetes/multicloud/Chart.yaml
@@ -16,4 +16,4 @@
apiVersion: v1
description: ONAP multicloud broker
name: multicloud
-version: 2.0.0
+version: 3.0.0
diff --git a/kubernetes/multicloud/charts/multicloud-ocata/Chart.yaml b/kubernetes/multicloud/charts/multicloud-ocata/Chart.yaml
index 3a326f767a..abdb131632 100644
--- a/kubernetes/multicloud/charts/multicloud-ocata/Chart.yaml
+++ b/kubernetes/multicloud/charts/multicloud-ocata/Chart.yaml
@@ -16,4 +16,4 @@
apiVersion: v1
description: ONAP multicloud OpenStack Ocata Plugin
name: multicloud-ocata
-version: 2.0.0
+version: 3.0.0
diff --git a/kubernetes/multicloud/charts/multicloud-ocata/templates/deployment.yaml b/kubernetes/multicloud/charts/multicloud-ocata/templates/deployment.yaml
index 1c91e8af3f..c2d966a599 100644
--- a/kubernetes/multicloud/charts/multicloud-ocata/templates/deployment.yaml
+++ b/kubernetes/multicloud/charts/multicloud-ocata/templates/deployment.yaml
@@ -63,7 +63,7 @@ spec:
name: ocata-logconfig
subPath: log.yml
resources:
-{{ toYaml (pluck .Values.flavor .Values.resources| first) | indent 12 }}
+{{ include "common.resources" . | indent 12 }}
image: "{{ include "common.repository" . }}/{{ .Values.image }}"
imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
ports:
diff --git a/kubernetes/multicloud/charts/multicloud-ocata/values.yaml b/kubernetes/multicloud/charts/multicloud-ocata/values.yaml
index e6486a29e2..699b908c43 100644
--- a/kubernetes/multicloud/charts/multicloud-ocata/values.yaml
+++ b/kubernetes/multicloud/charts/multicloud-ocata/values.yaml
@@ -84,3 +84,4 @@ resources:
requests:
cpu: 20m
memory: 2Gi
+ unlimited: {} \ No newline at end of file
diff --git a/kubernetes/multicloud/charts/multicloud-vio/Chart.yaml b/kubernetes/multicloud/charts/multicloud-vio/Chart.yaml
index 4174fd53e2..f3f9db414c 100644
--- a/kubernetes/multicloud/charts/multicloud-vio/Chart.yaml
+++ b/kubernetes/multicloud/charts/multicloud-vio/Chart.yaml
@@ -16,4 +16,4 @@
apiVersion: v1
description: ONAP multicloud VIO plugin
name: multicloud-vio
-version: 2.0.0
+version: 3.0.0
diff --git a/kubernetes/multicloud/charts/multicloud-vio/templates/deployment.yaml b/kubernetes/multicloud/charts/multicloud-vio/templates/deployment.yaml
index b555d463c3..1a737d67f6 100644
--- a/kubernetes/multicloud/charts/multicloud-vio/templates/deployment.yaml
+++ b/kubernetes/multicloud/charts/multicloud-vio/templates/deployment.yaml
@@ -63,7 +63,7 @@ spec:
name: vio-logconfig
subPath: log.yml
resources:
-{{ toYaml (pluck .Values.flavor .Values.resources| first) | indent 12 }}
+{{ include "common.resources" . | indent 12 }}
image: "{{ include "common.repository" . }}/{{ .Values.image }}"
imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
ports:
diff --git a/kubernetes/multicloud/charts/multicloud-vio/values.yaml b/kubernetes/multicloud/charts/multicloud-vio/values.yaml
index bc207ef610..810646dc13 100644
--- a/kubernetes/multicloud/charts/multicloud-vio/values.yaml
+++ b/kubernetes/multicloud/charts/multicloud-vio/values.yaml
@@ -28,7 +28,7 @@ image: onap/multicloud/vio:1.1.2
pullPolicy: Always
#Istio sidecar injection policy
-istioSidecar: true
+istioSidecar: true
# application configuration
config:
@@ -84,3 +84,4 @@ resources:
requests:
cpu: 20m
memory: 2Gi
+ unlimited: {} \ No newline at end of file
diff --git a/kubernetes/multicloud/charts/multicloud-windriver/Chart.yaml b/kubernetes/multicloud/charts/multicloud-windriver/Chart.yaml
index 0e58b7dce0..2dc23d0ea0 100644
--- a/kubernetes/multicloud/charts/multicloud-windriver/Chart.yaml
+++ b/kubernetes/multicloud/charts/multicloud-windriver/Chart.yaml
@@ -16,4 +16,4 @@
apiVersion: v1
description: ONAP multicloud OpenStack WindRiver Plugin
name: multicloud-windriver
-version: 2.0.0
+version: 3.0.0
diff --git a/kubernetes/multicloud/charts/multicloud-windriver/templates/deployment.yaml b/kubernetes/multicloud/charts/multicloud-windriver/templates/deployment.yaml
index 3dfe72c607..99b1ea9557 100644
--- a/kubernetes/multicloud/charts/multicloud-windriver/templates/deployment.yaml
+++ b/kubernetes/multicloud/charts/multicloud-windriver/templates/deployment.yaml
@@ -63,7 +63,7 @@ spec:
name: windriver-logconfig
subPath: log.yml
resources:
-{{ toYaml (pluck .Values.flavor .Values.resources| first) | indent 12 }}
+{{ include "common.resources" . | indent 12 }}
image: "{{ include "common.repository" . }}/{{ .Values.image }}"
imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
ports:
diff --git a/kubernetes/multicloud/charts/multicloud-windriver/values.yaml b/kubernetes/multicloud/charts/multicloud-windriver/values.yaml
index 91d2d2e67f..4ebf84399f 100644
--- a/kubernetes/multicloud/charts/multicloud-windriver/values.yaml
+++ b/kubernetes/multicloud/charts/multicloud-windriver/values.yaml
@@ -84,3 +84,4 @@ resources:
requests:
cpu: 20m
memory: 2Gi
+ unlimited: {} \ No newline at end of file
diff --git a/kubernetes/multicloud/requirements.yaml b/kubernetes/multicloud/requirements.yaml
index 204a77562f..897df32ce0 100644
--- a/kubernetes/multicloud/requirements.yaml
+++ b/kubernetes/multicloud/requirements.yaml
@@ -15,5 +15,5 @@
dependencies:
- name: common
- version: ~2.0.0
+ version: ~3.0.0
repository: '@local'
diff --git a/kubernetes/multicloud/templates/deployment.yaml b/kubernetes/multicloud/templates/deployment.yaml
index 5c524fb936..c3e6e5142e 100644
--- a/kubernetes/multicloud/templates/deployment.yaml
+++ b/kubernetes/multicloud/templates/deployment.yaml
@@ -54,7 +54,7 @@ spec:
- name: AAI_PASSWORD
value: "{{ .Values.config.aai.password }}"
resources:
-{{ toYaml (pluck .Values.flavor .Values.resources| first) | indent 12 }}
+{{ include "common.resources" . | indent 12 }}
image: "{{ include "common.repository" . }}/{{ .Values.image }}"
imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
name: {{ include "common.name" . }}
diff --git a/kubernetes/multicloud/values.yaml b/kubernetes/multicloud/values.yaml
index f7a3db3d61..3f1da7eb0c 100644
--- a/kubernetes/multicloud/values.yaml
+++ b/kubernetes/multicloud/values.yaml
@@ -88,3 +88,4 @@ resources:
requests:
cpu: 20m
memory: 2Gi
+ unlimited: {} \ No newline at end of file
diff --git a/kubernetes/nbi/Chart.yaml b/kubernetes/nbi/Chart.yaml
index 754939c717..0fffb98e36 100644
--- a/kubernetes/nbi/Chart.yaml
+++ b/kubernetes/nbi/Chart.yaml
@@ -16,4 +16,4 @@
apiVersion: v1
description: ONAP Northbound Interface
name: nbi
-version: 2.0.0
+version: 3.0.0
diff --git a/kubernetes/nbi/charts/mariadb/Chart.yaml b/kubernetes/nbi/charts/mariadb/Chart.yaml
index 69933cd4c2..10bbe080c2 100644
--- a/kubernetes/nbi/charts/mariadb/Chart.yaml
+++ b/kubernetes/nbi/charts/mariadb/Chart.yaml
@@ -15,4 +15,4 @@
apiVersion: v1
description: ONAP NBI MariaDB Service
name: mariadb
-version: 2.0.0
+version: 3.0.0
diff --git a/kubernetes/nbi/charts/mariadb/requirements.yaml b/kubernetes/nbi/charts/mariadb/requirements.yaml
index 7a4e4ebda6..f8074990af 100644
--- a/kubernetes/nbi/charts/mariadb/requirements.yaml
+++ b/kubernetes/nbi/charts/mariadb/requirements.yaml
@@ -15,7 +15,7 @@
dependencies:
- name: common
- version: ~2.0.0
+ version: ~3.0.0
# local reference to common chart, as it is
# a part of this chart's package and will not
# be published independently to a repo (at this point)
diff --git a/kubernetes/nbi/charts/mariadb/templates/deployment.yaml b/kubernetes/nbi/charts/mariadb/templates/deployment.yaml
index fee00bafba..b432d0e431 100644
--- a/kubernetes/nbi/charts/mariadb/templates/deployment.yaml
+++ b/kubernetes/nbi/charts/mariadb/templates/deployment.yaml
@@ -75,7 +75,7 @@ spec:
- mountPath: /var/lib/mysql
name: mariadb-data
resources:
-{{ toYaml (pluck .Values.flavor .Values.resources| first) | indent 12 }}
+{{ include "common.resources" . | indent 12 }}
{{- if .Values.nodeSelector }}
nodeSelector:
{{ toYaml .Values.nodeSelector | indent 10 }}
diff --git a/kubernetes/nbi/charts/mariadb/values.yaml b/kubernetes/nbi/charts/mariadb/values.yaml
index 525c6a1a46..dd93b924ae 100644
--- a/kubernetes/nbi/charts/mariadb/values.yaml
+++ b/kubernetes/nbi/charts/mariadb/values.yaml
@@ -92,4 +92,4 @@ resources:
requests:
cpu: 2
memory: 4Gi
-
+ unlimited: {}
diff --git a/kubernetes/nbi/requirements.yaml b/kubernetes/nbi/requirements.yaml
index e74329725d..1ec9012c65 100644
--- a/kubernetes/nbi/requirements.yaml
+++ b/kubernetes/nbi/requirements.yaml
@@ -15,12 +15,12 @@
dependencies:
- name: common
- version: ~2.0.0
+ version: ~3.0.0
# local reference to common chart, as it is
# a part of this chart's package and will not
# be published independently to a repo (at this point)
repository: '@local'
- name: mongo
- version: ~2.0.0
+ version: ~3.0.0
repository: '@local'
diff --git a/kubernetes/nbi/templates/deployment.yaml b/kubernetes/nbi/templates/deployment.yaml
index a7be329238..de260e3df8 100644
--- a/kubernetes/nbi/templates/deployment.yaml
+++ b/kubernetes/nbi/templates/deployment.yaml
@@ -105,7 +105,7 @@ spec:
name: localtime
readOnly: true
resources:
-{{ toYaml (pluck .Values.flavor .Values.resources| first) | indent 12 }}
+{{ include "common.resources" . | indent 12 }}
{{- if .Values.nodeSelector }}
nodeSelector:
{{ toYaml .Values.nodeSelector | indent 10 }}
diff --git a/kubernetes/nbi/values.yaml b/kubernetes/nbi/values.yaml
index 9f9c0fa476..703398d71e 100644
--- a/kubernetes/nbi/values.yaml
+++ b/kubernetes/nbi/values.yaml
@@ -120,4 +120,5 @@ resources:
memory: 4Gi
requests:
cpu: 200m
- memory: 2Gi \ No newline at end of file
+ memory: 2Gi
+ unlimited: {} \ No newline at end of file
diff --git a/kubernetes/onap/Chart.yaml b/kubernetes/onap/Chart.yaml
index bdc201dab8..1396f8546b 100644
--- a/kubernetes/onap/Chart.yaml
+++ b/kubernetes/onap/Chart.yaml
@@ -14,8 +14,8 @@
apiVersion: v1
name: onap
-version: 2.0.0
-appVersion: beijing
+version: 3.0.0
+appVersion: Casablanca
description: Open Network Automation Platform (ONAP)
home: https://www.onap.org/
sources:
diff --git a/kubernetes/onap/requirements.yaml b/kubernetes/onap/requirements.yaml
index b6e450a65e..9a8588f268 100644
--- a/kubernetes/onap/requirements.yaml
+++ b/kubernetes/onap/requirements.yaml
@@ -18,46 +18,46 @@
# > helm repo add local http://127.0.0.1:8879
dependencies:
- name: aaf
- version: ~2.0.0
+ version: ~3.0.0
repository: '@local'
condition: aaf.enabled
- name: aai
- version: ~2.0.0
+ version: ~3.0.0
repository: '@local'
condition: aai.enabled
- name: appc
- version: ~2.0.0
+ version: ~3.0.0
repository: '@local'
condition: appc.enabled
- name: clamp
- version: ~2.0.0
+ version: ~3.0.0
repository: '@local'
condition: clamp.enabled
- name: cli
- version: ~2.0.0
+ version: ~3.0.0
repository: '@local'
condition: cli.enabled
- name: common
- version: ~2.0.0
+ version: ~3.0.0
repository: '@local'
- name: consul
- version: ~2.0.0
+ version: ~3.0.0
repository: '@local'
condition: consul.enabled
- name: contrib
- version: ~2.0.0
+ version: ~3.0.0
repository: '@local'
condition: contrib.enabled
- name: dcaegen2
- version: ~2.0.0
+ version: ~3.0.0
repository: '@local'
condition: dcaegen2.enabled
- name: dmaap
- version: ~2.0.0
+ version: ~3.0.0
repository: '@local'
condition: dmaap.enabled
- name: esr
- version: ~2.0.0
+ version: ~3.0.0
repository: '@local'
condition: esr.enabled
- name: log
@@ -65,66 +65,66 @@ dependencies:
repository: '@local'
condition: log.enabled
- name: sniro-emulator
- version: ~2.0.0
+ version: ~3.0.0
repository: '@local'
condition: sniro-emulator.enabled
- name: msb
- version: ~2.0.0
+ version: ~3.0.0
repository: '@local'
condition: msb.enabled
- name: multicloud
- version: ~2.0.0
+ version: ~3.0.0
repository: '@local'
condition: multicloud.enabled
- name: nbi
- version: ~2.0.0
+ version: ~3.0.0
repository: '@local'
condition: nbi.enabled
- name: policy
- version: ~2.0.0
+ version: ~3.0.0
repository: '@local'
condition: policy.enabled
- name: pomba
- version: ~2.0.0
+ version: ~3.0.0
repository: '@local'
condition: pomba.enabled
- name: portal
- version: ~2.0.0
+ version: ~3.0.0
repository: '@local'
condition: portal.enabled
- name: oof
- version: ~2.0.0
+ version: ~3.0.0
repository: '@local'
condition: oof.enabled
- name: robot
- version: ~2.0.0
+ version: ~3.0.0
repository: '@local'
condition: robot.enabled
- name: sdc
- version: ~2.0.0
+ version: ~3.0.0
repository: '@local'
condition: sdc.enabled
- name: sdnc
- version: ~2.0.0
+ version: ~3.0.0
repository: '@local'
condition: sdnc.enabled
- name: so
- version: ~2.0.0
+ version: ~3.0.0
repository: '@local'
condition: so.enabled
- name: uui
- version: ~2.0.0
+ version: ~3.0.0
repository: '@local'
condition: uui.enabled
- name: vfc
- version: ~2.0.0
+ version: ~3.0.0
repository: '@local'
condition: vfc.enabled
- name: vid
- version: ~2.0.0
+ version: ~3.0.0
repository: '@local'
condition: vid.enabled
- name: vnfsdk
- version: ~2.0.0
+ version: ~3.0.0
repository: '@local'
condition: vnfsdk.enabled
diff --git a/kubernetes/onap/resources/environments/disable-allcharts.yaml b/kubernetes/onap/resources/environments/disable-allcharts.yaml
index 1f98d90ec6..1cf1ab1b37 100644
--- a/kubernetes/onap/resources/environments/disable-allcharts.yaml
+++ b/kubernetes/onap/resources/environments/disable-allcharts.yaml
@@ -33,8 +33,6 @@ appc:
enabled: false
clamp:
enabled: false
-contrib:
- enabled: false
cli:
enabled: false
consul:
diff --git a/kubernetes/onap/values.yaml b/kubernetes/onap/values.yaml
index 9b56c7ba11..3ce3bcc12d 100644
--- a/kubernetes/onap/values.yaml
+++ b/kubernetes/onap/values.yaml
@@ -50,6 +50,9 @@ global:
# flag to enable debugging - application support required
debugEnabled: false
+ # override default resource limit flavor for all charts
+ flavor: unlimited
+
# Repository for creation of nexus3.onap.org secret
repository: nexus3.onap.org:10001
diff --git a/kubernetes/oof/Chart.yaml b/kubernetes/oof/Chart.yaml
index 8d43df7a50..5fb5b6fad0 100755
--- a/kubernetes/oof/Chart.yaml
+++ b/kubernetes/oof/Chart.yaml
@@ -16,4 +16,4 @@
apiVersion: v1
description: ONAP Optimization Framework
name: oof
-version: 2.0.0
+version: 3.0.0
diff --git a/kubernetes/oof/charts/oof-has/Chart.yaml b/kubernetes/oof/charts/oof-has/Chart.yaml
index a3997d95d2..89b14a2a5f 100755
--- a/kubernetes/oof/charts/oof-has/Chart.yaml
+++ b/kubernetes/oof/charts/oof-has/Chart.yaml
@@ -16,4 +16,4 @@
apiVersion: v1
description: ONAP Homing and Allocation Service
name: oof-has
-version: 2.0.0
+version: 3.0.0
diff --git a/kubernetes/oof/charts/oof-has/charts/oof-has-api/Chart.yaml b/kubernetes/oof/charts/oof-has/charts/oof-has-api/Chart.yaml
index 08e67c9e92..0ba7fbd1aa 100755
--- a/kubernetes/oof/charts/oof-has/charts/oof-has-api/Chart.yaml
+++ b/kubernetes/oof/charts/oof-has/charts/oof-has-api/Chart.yaml
@@ -16,4 +16,4 @@
apiVersion: v1
description: ONAP Homing and Allocation Servicei - API
name: oof-has-api
-version: 2.0.0
+version: 3.0.0
diff --git a/kubernetes/oof/charts/oof-has/charts/oof-has-api/templates/deployment.yaml b/kubernetes/oof/charts/oof-has/charts/oof-has-api/templates/deployment.yaml
index 690bb74973..12bbeefb12 100755
--- a/kubernetes/oof/charts/oof-has/charts/oof-has-api/templates/deployment.yaml
+++ b/kubernetes/oof/charts/oof-has/charts/oof-has-api/templates/deployment.yaml
@@ -85,7 +85,7 @@ spec:
name: {{ .Values.global.commonConfigPrefix }}-config
subPath: log.conf
resources:
-{{ toYaml (pluck .Values.flavor .Values.resources| first) | indent 12 }}
+{{ include "common.resources" . | indent 12 }}
{{- if .Values.nodeSelector }}
nodeSelector:
{{ toYaml .Values.nodeSelector | indent 10 }}
diff --git a/kubernetes/oof/charts/oof-has/charts/oof-has-api/values.yaml b/kubernetes/oof/charts/oof-has/charts/oof-has-api/values.yaml
index ea83587cc4..c1f18ef048 100755
--- a/kubernetes/oof/charts/oof-has/charts/oof-has-api/values.yaml
+++ b/kubernetes/oof/charts/oof-has/charts/oof-has-api/values.yaml
@@ -42,6 +42,7 @@ resources:
requests:
memory: 2Gi
cpu: 1000m
+ unlimited: {}
# probe configuration parameters
liveness:
initialDelaySeconds: 10
diff --git a/kubernetes/oof/charts/oof-has/charts/oof-has-cassandra/Chart.yaml b/kubernetes/oof/charts/oof-has/charts/oof-has-cassandra/Chart.yaml
index e454d631df..5c12786a97 100644
--- a/kubernetes/oof/charts/oof-has/charts/oof-has-cassandra/Chart.yaml
+++ b/kubernetes/oof/charts/oof-has/charts/oof-has-cassandra/Chart.yaml
@@ -16,4 +16,4 @@
apiVersion: v1
description: OOF-HAS Cassandra
name: oof-has-cassandra
-version: 2.0.0
+version: 3.0.0
diff --git a/kubernetes/oof/charts/oof-has/charts/oof-has-cassandra/templates/deployment.yaml b/kubernetes/oof/charts/oof-has/charts/oof-has-cassandra/templates/deployment.yaml
index f16b09f956..aed92e5768 100644
--- a/kubernetes/oof/charts/oof-has/charts/oof-has-cassandra/templates/deployment.yaml
+++ b/kubernetes/oof/charts/oof-has/charts/oof-has-cassandra/templates/deployment.yaml
@@ -78,7 +78,7 @@ spec:
- name: {{ include "common.fullname" . }}-data
mountPath: /var/lib/cassandra/data
resources:
-{{ toYaml (pluck .Values.flavor .Values.resources| first) | indent 12 }}
+{{ include "common.resources" . | indent 12 }}
{{- if .Values.nodeSelector }}
nodeSelector:
{{ toYaml .Values.nodeSelector | indent 10 }}
diff --git a/kubernetes/oof/charts/oof-has/charts/oof-has-cassandra/values.yaml b/kubernetes/oof/charts/oof-has/charts/oof-has-cassandra/values.yaml
index 1268badaf4..38d2d18eb2 100644
--- a/kubernetes/oof/charts/oof-has/charts/oof-has-cassandra/values.yaml
+++ b/kubernetes/oof/charts/oof-has/charts/oof-has-cassandra/values.yaml
@@ -56,6 +56,7 @@ resources:
requests:
memory: 16Gi
cpu: 8000m
+ unlimited: {}
# probe configuration parameters
liveness:
initialDelaySeconds: 10
diff --git a/kubernetes/oof/charts/oof-has/charts/oof-has-controller/Chart.yaml b/kubernetes/oof/charts/oof-has/charts/oof-has-controller/Chart.yaml
index 7d76ae7e4e..13126b461d 100755
--- a/kubernetes/oof/charts/oof-has/charts/oof-has-controller/Chart.yaml
+++ b/kubernetes/oof/charts/oof-has/charts/oof-has-controller/Chart.yaml
@@ -16,4 +16,4 @@
apiVersion: v1
description: ONAP Homing and Allocation Sservice - Controller
name: oof-has-controller
-version: 2.0.0
+version: 3.0.0
diff --git a/kubernetes/oof/charts/oof-has/charts/oof-has-controller/templates/deployment.yaml b/kubernetes/oof/charts/oof-has/charts/oof-has-controller/templates/deployment.yaml
index 3a321297c3..00f26255f7 100755
--- a/kubernetes/oof/charts/oof-has/charts/oof-has-controller/templates/deployment.yaml
+++ b/kubernetes/oof/charts/oof-has/charts/oof-has-controller/templates/deployment.yaml
@@ -88,7 +88,7 @@ spec:
name: {{ .Values.global.commonConfigPrefix }}-config
subPath: healthy.sh
resources:
-{{ toYaml (pluck .Values.flavor .Values.resources| first) | indent 12 }}
+{{ include "common.resources" . | indent 12 }}
{{- if .Values.nodeSelector }}
nodeSelector:
{{ toYaml .Values.nodeSelector | indent 10 }}
diff --git a/kubernetes/oof/charts/oof-has/charts/oof-has-controller/values.yaml b/kubernetes/oof/charts/oof-has/charts/oof-has-controller/values.yaml
index 659128d851..0090742852 100755
--- a/kubernetes/oof/charts/oof-has/charts/oof-has-controller/values.yaml
+++ b/kubernetes/oof/charts/oof-has/charts/oof-has-controller/values.yaml
@@ -35,6 +35,7 @@ resources:
requests:
memory: 2Gi
cpu: 1000m
+ unlimited: {}
# probe configuration parameters
liveness:
initialDelaySeconds: 10
diff --git a/kubernetes/oof/charts/oof-has/charts/oof-has-data/Chart.yaml b/kubernetes/oof/charts/oof-has/charts/oof-has-data/Chart.yaml
index fd8e92a309..018f3a0a02 100755
--- a/kubernetes/oof/charts/oof-has/charts/oof-has-data/Chart.yaml
+++ b/kubernetes/oof/charts/oof-has/charts/oof-has-data/Chart.yaml
@@ -16,4 +16,4 @@
apiVersion: v1
description: ONAP Homing and Allocation Service - Data Component
name: oof-has-data
-version: 2.0.0
+version: 3.0.0
diff --git a/kubernetes/oof/charts/oof-has/charts/oof-has-data/templates/deployment.yaml b/kubernetes/oof/charts/oof-has/charts/oof-has-data/templates/deployment.yaml
index d5f619ebdc..3f64923a0e 100755
--- a/kubernetes/oof/charts/oof-has/charts/oof-has-data/templates/deployment.yaml
+++ b/kubernetes/oof/charts/oof-has/charts/oof-has-data/templates/deployment.yaml
@@ -97,7 +97,7 @@ spec:
name: {{ .Values.global.commonConfigPrefix }}-config
subPath: AAF_RootCA.cer
resources:
-{{ toYaml (pluck .Values.flavor .Values.resources| first) | indent 12 }}
+{{ include "common.resources" . | indent 12 }}
{{- if .Values.nodeSelector }}
nodeSelector:
{{ toYaml .Values.nodeSelector | indent 10 }}
diff --git a/kubernetes/oof/charts/oof-has/charts/oof-has-data/values.yaml b/kubernetes/oof/charts/oof-has/charts/oof-has-data/values.yaml
index 659128d851..0090742852 100755
--- a/kubernetes/oof/charts/oof-has/charts/oof-has-data/values.yaml
+++ b/kubernetes/oof/charts/oof-has/charts/oof-has-data/values.yaml
@@ -35,6 +35,7 @@ resources:
requests:
memory: 2Gi
cpu: 1000m
+ unlimited: {}
# probe configuration parameters
liveness:
initialDelaySeconds: 10
diff --git a/kubernetes/oof/charts/oof-has/charts/oof-has-music/requirements.yaml b/kubernetes/oof/charts/oof-has/charts/oof-has-music/requirements.yaml
index 49076a8418..14f1f9a82d 100644
--- a/kubernetes/oof/charts/oof-has/charts/oof-has-music/requirements.yaml
+++ b/kubernetes/oof/charts/oof-has/charts/oof-has-music/requirements.yaml
@@ -15,5 +15,5 @@
dependencies:
- name: common
- version: ~2.0.0
+ version: ~3.0.0
repository: '@local'
diff --git a/kubernetes/oof/charts/oof-has/charts/oof-has-music/templates/deployment.yaml b/kubernetes/oof/charts/oof-has/charts/oof-has-music/templates/deployment.yaml
index 78833406b1..9dc160f2fa 100644
--- a/kubernetes/oof/charts/oof-has/charts/oof-has-music/templates/deployment.yaml
+++ b/kubernetes/oof/charts/oof-has/charts/oof-has-music/templates/deployment.yaml
@@ -47,7 +47,7 @@ spec:
image: "{{ include "common.repository" . }}/{{ .Values.image }}" #"
imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
resources:
-{{ toYaml (pluck .Values.flavor .Values.resources| first) | indent 12 }}
+{{ include "common.resources" . | indent 12 }}
ports:
- containerPort: {{ .Values.service.internalPort }}
# disable liveness probe when breakpoints set in debugger
diff --git a/kubernetes/oof/charts/oof-has/charts/oof-has-music/values.yaml b/kubernetes/oof/charts/oof-has/charts/oof-has-music/values.yaml
index dda1c0f1cc..f848162ce6 100644
--- a/kubernetes/oof/charts/oof-has/charts/oof-has-music/values.yaml
+++ b/kubernetes/oof/charts/oof-has/charts/oof-has-music/values.yaml
@@ -66,6 +66,7 @@ resources:
requests:
memory: 2Gi
cpu: 1000m
+ unlimited: {}
# probe configuration parameters
liveness:
initialDelaySeconds: 10
diff --git a/kubernetes/oof/charts/oof-has/charts/oof-has-reservation/Chart.yaml b/kubernetes/oof/charts/oof-has/charts/oof-has-reservation/Chart.yaml
index 3c3f98d1d2..3ec9a3d597 100755
--- a/kubernetes/oof/charts/oof-has/charts/oof-has-reservation/Chart.yaml
+++ b/kubernetes/oof/charts/oof-has/charts/oof-has-reservation/Chart.yaml
@@ -16,4 +16,4 @@
apiVersion: v1
description: ONAP Homing and Allocation Sevice - Reservation Component
name: oof-has-reservation
-version: 2.0.0
+version: 3.0.0
diff --git a/kubernetes/oof/charts/oof-has/charts/oof-has-reservation/templates/deployment.yaml b/kubernetes/oof/charts/oof-has/charts/oof-has-reservation/templates/deployment.yaml
index d90943c72b..a967bb50e1 100755
--- a/kubernetes/oof/charts/oof-has/charts/oof-has-reservation/templates/deployment.yaml
+++ b/kubernetes/oof/charts/oof-has/charts/oof-has-reservation/templates/deployment.yaml
@@ -88,7 +88,7 @@ spec:
name: {{ .Values.global.commonConfigPrefix }}-config
subPath: healthy.sh
resources:
-{{ toYaml (pluck .Values.flavor .Values.resources| first) | indent 12 }}
+{{ include "common.resources" . | indent 12 }}
{{- if .Values.nodeSelector }}
nodeSelector:
{{ toYaml .Values.nodeSelector | indent 10 }}
diff --git a/kubernetes/oof/charts/oof-has/charts/oof-has-reservation/values.yaml b/kubernetes/oof/charts/oof-has/charts/oof-has-reservation/values.yaml
index 659128d851..0090742852 100755
--- a/kubernetes/oof/charts/oof-has/charts/oof-has-reservation/values.yaml
+++ b/kubernetes/oof/charts/oof-has/charts/oof-has-reservation/values.yaml
@@ -35,6 +35,7 @@ resources:
requests:
memory: 2Gi
cpu: 1000m
+ unlimited: {}
# probe configuration parameters
liveness:
initialDelaySeconds: 10
diff --git a/kubernetes/oof/charts/oof-has/charts/oof-has-solver/Chart.yaml b/kubernetes/oof/charts/oof-has/charts/oof-has-solver/Chart.yaml
index 89e7842ba3..8c96f7f46a 100755
--- a/kubernetes/oof/charts/oof-has/charts/oof-has-solver/Chart.yaml
+++ b/kubernetes/oof/charts/oof-has/charts/oof-has-solver/Chart.yaml
@@ -16,4 +16,4 @@
apiVersion: v1
description: ONAP Homing and Allocation Service - Solver Component
name: oof-has-solver
-version: 2.0.0
+version: 3.0.0
diff --git a/kubernetes/oof/charts/oof-has/charts/oof-has-solver/templates/deployment.yaml b/kubernetes/oof/charts/oof-has/charts/oof-has-solver/templates/deployment.yaml
index ad1e1c57b5..26ed7c75e3 100755
--- a/kubernetes/oof/charts/oof-has/charts/oof-has-solver/templates/deployment.yaml
+++ b/kubernetes/oof/charts/oof-has/charts/oof-has-solver/templates/deployment.yaml
@@ -88,7 +88,7 @@ spec:
name: {{ .Values.global.commonConfigPrefix }}-config
subPath: healthy.sh
resources:
-{{ toYaml (pluck .Values.flavor .Values.resources| first) | indent 12 }}
+{{ include "common.resources" . | indent 12 }}
{{- if .Values.nodeSelector }}
nodeSelector:
{{ toYaml .Values.nodeSelector | indent 10 }}
diff --git a/kubernetes/oof/charts/oof-has/charts/oof-has-solver/values.yaml b/kubernetes/oof/charts/oof-has/charts/oof-has-solver/values.yaml
index 659128d851..0090742852 100755
--- a/kubernetes/oof/charts/oof-has/charts/oof-has-solver/values.yaml
+++ b/kubernetes/oof/charts/oof-has/charts/oof-has-solver/values.yaml
@@ -35,6 +35,7 @@ resources:
requests:
memory: 2Gi
cpu: 1000m
+ unlimited: {}
# probe configuration parameters
liveness:
initialDelaySeconds: 10
diff --git a/kubernetes/oof/charts/oof-has/charts/oof-has-zookeeper/Chart.yaml b/kubernetes/oof/charts/oof-has/charts/oof-has-zookeeper/Chart.yaml
index 066d758384..ad3b82726c 100644
--- a/kubernetes/oof/charts/oof-has/charts/oof-has-zookeeper/Chart.yaml
+++ b/kubernetes/oof/charts/oof-has/charts/oof-has-zookeeper/Chart.yaml
@@ -16,4 +16,4 @@
apiVersion: v1
description: ONAP OOF Zookeeper
name: oof-has-zookeeper
-version: 2.0.0
+version: 3.0.0
diff --git a/kubernetes/oof/charts/oof-has/charts/oof-has-zookeeper/templates/deployment.yaml b/kubernetes/oof/charts/oof-has/charts/oof-has-zookeeper/templates/deployment.yaml
index 43f068066b..888bfd0555 100644
--- a/kubernetes/oof/charts/oof-has/charts/oof-has-zookeeper/templates/deployment.yaml
+++ b/kubernetes/oof/charts/oof-has/charts/oof-has-zookeeper/templates/deployment.yaml
@@ -54,7 +54,7 @@ spec:
name: localtime
readOnly: true
resources:
-{{ toYaml (pluck .Values.flavor .Values.resources| first) | indent 12 }}
+{{ include "common.resources" . | indent 12 }}
{{- if .Values.nodeSelector }}
nodeSelector:
{{ toYaml .Values.nodeSelector | indent 10 }}
diff --git a/kubernetes/oof/charts/oof-has/charts/oof-has-zookeeper/values.yaml b/kubernetes/oof/charts/oof-has/charts/oof-has-zookeeper/values.yaml
index e61eda0de0..64e0550da2 100644
--- a/kubernetes/oof/charts/oof-has/charts/oof-has-zookeeper/values.yaml
+++ b/kubernetes/oof/charts/oof-has/charts/oof-has-zookeeper/values.yaml
@@ -48,6 +48,7 @@ resources:
requests:
memory: 2Gi
cpu: 1000m
+ unlimited: {}
# probe configuration parameters
liveness:
initialDelaySeconds: 10
diff --git a/kubernetes/oof/charts/oof-has/requirements.yaml b/kubernetes/oof/charts/oof-has/requirements.yaml
index 49076a8418..14f1f9a82d 100755
--- a/kubernetes/oof/charts/oof-has/requirements.yaml
+++ b/kubernetes/oof/charts/oof-has/requirements.yaml
@@ -15,5 +15,5 @@
dependencies:
- name: common
- version: ~2.0.0
+ version: ~3.0.0
repository: '@local'
diff --git a/kubernetes/oof/charts/oof-has/resources/config/conductor.conf b/kubernetes/oof/charts/oof-has/resources/config/conductor.conf
index 17d5f2866f..00a65ce30d 100755
--- a/kubernetes/oof/charts/oof-has/resources/config/conductor.conf
+++ b/kubernetes/oof/charts/oof-has/resources/config/conductor.conf
@@ -153,7 +153,7 @@ complex_cache_refresh_interval = 60
server_url = https://{{.Values.config.aai.serviceName}}.{{ include "common.namespace" . }}:{{.Values.config.aai.port}}/aai
# The version of A&AI in v# format. (string value)
-server_url_version = v13
+server_url_version = v14
# SSL/TLS certificate file in pem format. This certificate must be registered
# with the A&AI endpoint. (string value)
diff --git a/kubernetes/oof/requirements.yaml b/kubernetes/oof/requirements.yaml
index 49076a8418..14f1f9a82d 100755
--- a/kubernetes/oof/requirements.yaml
+++ b/kubernetes/oof/requirements.yaml
@@ -15,5 +15,5 @@
dependencies:
- name: common
- version: ~2.0.0
+ version: ~3.0.0
repository: '@local'
diff --git a/kubernetes/oof/templates/deployment.yaml b/kubernetes/oof/templates/deployment.yaml
index 3341505847..ed64166b59 100644
--- a/kubernetes/oof/templates/deployment.yaml
+++ b/kubernetes/oof/templates/deployment.yaml
@@ -77,7 +77,7 @@ spec:
name: {{ include "common.fullname" . }}-config
subPath: osdf_config.yaml
resources:
-{{ toYaml (pluck .Values.flavor .Values.resources| first) | indent 12 }}
+{{ include "common.resources" . | indent 12 }}
{{- if .Values.nodeSelector }}
nodeSelector:
{{ toYaml .Values.nodeSelector | indent 10 }}
diff --git a/kubernetes/oof/values.yaml b/kubernetes/oof/values.yaml
index 5aa462f491..c249f26569 100644
--- a/kubernetes/oof/values.yaml
+++ b/kubernetes/oof/values.yaml
@@ -93,6 +93,7 @@ resources:
requests:
memory: 2Gi
cpu: 1000m
+ unlimited: {}
# probe configuration parameters
liveness:
initialDelaySeconds: 10
diff --git a/kubernetes/policy/Chart.yaml b/kubernetes/policy/Chart.yaml
index 6d2f85152f..a987866644 100644
--- a/kubernetes/policy/Chart.yaml
+++ b/kubernetes/policy/Chart.yaml
@@ -16,4 +16,4 @@
apiVersion: v1
description: ONAP Policy Administration Point
name: policy
-version: 2.0.0
+version: 3.0.0
diff --git a/kubernetes/policy/charts/brmsgw/Chart.yaml b/kubernetes/policy/charts/brmsgw/Chart.yaml
index 4f160fed0a..22bd5c1981 100644
--- a/kubernetes/policy/charts/brmsgw/Chart.yaml
+++ b/kubernetes/policy/charts/brmsgw/Chart.yaml
@@ -16,4 +16,4 @@
apiVersion: v1
description: ONAP Policy BRMS GW
name: brmsgw
-version: 2.0.0
+version: 3.0.0
diff --git a/kubernetes/policy/charts/brmsgw/requirements.yaml b/kubernetes/policy/charts/brmsgw/requirements.yaml
index c414a0149a..e57547871c 100644
--- a/kubernetes/policy/charts/brmsgw/requirements.yaml
+++ b/kubernetes/policy/charts/brmsgw/requirements.yaml
@@ -15,7 +15,7 @@
dependencies:
- name: common
- version: ~2.0.0
+ version: ~3.0.0
# local reference to common chart, as it is
# a part of this chart's package and will not
# be published independently to a repo (at this point)
diff --git a/kubernetes/policy/charts/brmsgw/templates/deployment.yaml b/kubernetes/policy/charts/brmsgw/templates/deployment.yaml
index 7b40dbe675..7535d541f7 100644
--- a/kubernetes/policy/charts/brmsgw/templates/deployment.yaml
+++ b/kubernetes/policy/charts/brmsgw/templates/deployment.yaml
@@ -85,7 +85,7 @@ spec:
name: pe-scripts
subPath: do-start.sh
resources:
-{{ toYaml (pluck .Values.flavor .Values.resources| first) | indent 12 }}
+{{ include "common.resources" . | indent 12 }}
{{- if .Values.nodeSelector }}
nodeSelector:
{{ toYaml .Values.nodeSelector | indent 10 }}
diff --git a/kubernetes/policy/charts/brmsgw/values.yaml b/kubernetes/policy/charts/brmsgw/values.yaml
index 4028356dd2..32059d637c 100644
--- a/kubernetes/policy/charts/brmsgw/values.yaml
+++ b/kubernetes/policy/charts/brmsgw/values.yaml
@@ -85,4 +85,5 @@ resources:
memory: 4Gi
requests:
cpu: 20m
- memory: 1Gi \ No newline at end of file
+ memory: 1Gi
+ unlimited: {} \ No newline at end of file
diff --git a/kubernetes/policy/charts/drools/Chart.yaml b/kubernetes/policy/charts/drools/Chart.yaml
index 5f2a686a8c..c676641241 100644
--- a/kubernetes/policy/charts/drools/Chart.yaml
+++ b/kubernetes/policy/charts/drools/Chart.yaml
@@ -16,4 +16,4 @@
apiVersion: v1
description: ONAP Drools Policy Engine
name: drools
-version: 2.0.0
+version: 3.0.0
diff --git a/kubernetes/policy/charts/drools/charts/nexus/Chart.yaml b/kubernetes/policy/charts/drools/charts/nexus/Chart.yaml
index 9bc6cea186..51713f0bcd 100644
--- a/kubernetes/policy/charts/drools/charts/nexus/Chart.yaml
+++ b/kubernetes/policy/charts/drools/charts/nexus/Chart.yaml
@@ -16,4 +16,4 @@
apiVersion: v1
description: ONAP Policy Nexus
name: nexus
-version: 2.0.0
+version: 3.0.0
diff --git a/kubernetes/policy/charts/drools/charts/nexus/requirements.yaml b/kubernetes/policy/charts/drools/charts/nexus/requirements.yaml
index c414a0149a..e57547871c 100644
--- a/kubernetes/policy/charts/drools/charts/nexus/requirements.yaml
+++ b/kubernetes/policy/charts/drools/charts/nexus/requirements.yaml
@@ -15,7 +15,7 @@
dependencies:
- name: common
- version: ~2.0.0
+ version: ~3.0.0
# local reference to common chart, as it is
# a part of this chart's package and will not
# be published independently to a repo (at this point)
diff --git a/kubernetes/policy/charts/drools/charts/nexus/templates/deployment.yaml b/kubernetes/policy/charts/drools/charts/nexus/templates/deployment.yaml
index d04f8f8e51..140e7f37df 100644
--- a/kubernetes/policy/charts/drools/charts/nexus/templates/deployment.yaml
+++ b/kubernetes/policy/charts/drools/charts/nexus/templates/deployment.yaml
@@ -65,7 +65,7 @@ spec:
- mountPath: /sonatype-work
name: nexus-data
resources:
-{{ toYaml (pluck .Values.flavor .Values.resources| first) | indent 12 }}
+{{ include "common.resources" . | indent 12 }}
{{- if .Values.nodeSelector }}
nodeSelector:
{{ toYaml .Values.nodeSelector | indent 10 }}
diff --git a/kubernetes/policy/charts/drools/charts/nexus/values.yaml b/kubernetes/policy/charts/drools/charts/nexus/values.yaml
index 91089aafdd..e837bafa7e 100644
--- a/kubernetes/policy/charts/drools/charts/nexus/values.yaml
+++ b/kubernetes/policy/charts/drools/charts/nexus/values.yaml
@@ -94,4 +94,5 @@ resources:
memory: 2Gi
requests:
cpu: 2m
- memory: 1Gi \ No newline at end of file
+ memory: 1Gi
+ unlimited: {} \ No newline at end of file
diff --git a/kubernetes/policy/charts/drools/requirements.yaml b/kubernetes/policy/charts/drools/requirements.yaml
index c414a0149a..e57547871c 100644
--- a/kubernetes/policy/charts/drools/requirements.yaml
+++ b/kubernetes/policy/charts/drools/requirements.yaml
@@ -15,7 +15,7 @@
dependencies:
- name: common
- version: ~2.0.0
+ version: ~3.0.0
# local reference to common chart, as it is
# a part of this chart's package and will not
# be published independently to a repo (at this point)
diff --git a/kubernetes/policy/charts/drools/resources/config/drools/settings.xml b/kubernetes/policy/charts/drools/resources/config/drools/settings.xml
index 8de7e11d8b..2057e94f24 100755
--- a/kubernetes/policy/charts/drools/resources/config/drools/settings.xml
+++ b/kubernetes/policy/charts/drools/resources/config/drools/settings.xml
@@ -23,16 +23,16 @@
<id>http-proxy</id>
<active>true</active>
<protocol>http</protocol>
- <host>fastweb.int.bell.ca</host>
- <port>80</port>
+ <host>your-proxy-host-or-ip</host>
+ <port>your-proxy-port</port>
<nonProxyHosts>localhost|127.0.0.1|*.svc.cluster.local|nexus</nonProxyHosts>
</proxy>
<proxy>
<id>https-proxy</id>
<active>true</active>
<protocol>https</protocol>
- <host>fastweb.int.bell.ca</host>
- <port>80</port>
+ <host>your-proxy-host-or-ip</host>
+ <port>your-proxy-port</port>
<nonProxyHosts>localhost|127.0.0.1|*.svc.cluster.local|nexus</nonProxyHosts>
</proxy>
</proxies>
diff --git a/kubernetes/policy/charts/drools/templates/statefulset.yaml b/kubernetes/policy/charts/drools/templates/statefulset.yaml
index 417ab7e0b1..6564e798ef 100644
--- a/kubernetes/policy/charts/drools/templates/statefulset.yaml
+++ b/kubernetes/policy/charts/drools/templates/statefulset.yaml
@@ -116,7 +116,7 @@ spec:
exec:
command: ["/bin/sh", "-c", "export LOG=wait_logback.log; touch $LOG; export SRC=/tmp/logback.xml; export DST=/opt/app/policy/config/; while [ ! -e $DST ]; do echo 'Waiting for $DST...' >> $LOG; sleep 5; done; sleep 2; /bin/cp -f $SRC $DST; echo 'Done' >> $LOG"]
resources:
-{{ toYaml (pluck .Values.flavor .Values.resources| first) | indent 12 }}
+{{ include "common.resources" . | indent 12 }}
{{- if .Values.nodeSelector }}
- image: "{{ .Values.global.loggingRepository | default .Values.loggingRepository }}/{{ .Values.loggingImage }}"
imagePullPolicy: {{ .Values.pullPolicy }}
diff --git a/kubernetes/policy/charts/drools/values.yaml b/kubernetes/policy/charts/drools/values.yaml
index 0a05719054..b4a848a02b 100644
--- a/kubernetes/policy/charts/drools/values.yaml
+++ b/kubernetes/policy/charts/drools/values.yaml
@@ -86,4 +86,5 @@ resources:
memory: 8Gi
requests:
cpu: 200m
- memory: 2Gi \ No newline at end of file
+ memory: 2Gi
+ unlimited: {} \ No newline at end of file
diff --git a/kubernetes/policy/charts/mariadb/Chart.yaml b/kubernetes/policy/charts/mariadb/Chart.yaml
index b18b10fe0e..e8e6bb1d1a 100644
--- a/kubernetes/policy/charts/mariadb/Chart.yaml
+++ b/kubernetes/policy/charts/mariadb/Chart.yaml
@@ -16,4 +16,4 @@
apiVersion: v1
description: ONAP Policy MariaDB Service
name: mariadb
-version: 2.0.0
+version: 3.0.0
diff --git a/kubernetes/policy/charts/mariadb/requirements.yaml b/kubernetes/policy/charts/mariadb/requirements.yaml
index c414a0149a..e57547871c 100644
--- a/kubernetes/policy/charts/mariadb/requirements.yaml
+++ b/kubernetes/policy/charts/mariadb/requirements.yaml
@@ -15,7 +15,7 @@
dependencies:
- name: common
- version: ~2.0.0
+ version: ~3.0.0
# local reference to common chart, as it is
# a part of this chart's package and will not
# be published independently to a repo (at this point)
diff --git a/kubernetes/policy/charts/mariadb/templates/deployment.yaml b/kubernetes/policy/charts/mariadb/templates/deployment.yaml
index 17662c1c6d..c64fb9ab0f 100644
--- a/kubernetes/policy/charts/mariadb/templates/deployment.yaml
+++ b/kubernetes/policy/charts/mariadb/templates/deployment.yaml
@@ -76,7 +76,7 @@ spec:
- mountPath: /var/lib/mysql
name: mariadb-data
resources:
-{{ toYaml (pluck .Values.flavor .Values.resources| first) | indent 12 }}
+{{ include "common.resources" . | indent 12 }}
{{- if .Values.nodeSelector }}
nodeSelector:
{{ toYaml .Values.nodeSelector | indent 10 }}
diff --git a/kubernetes/policy/charts/mariadb/values.yaml b/kubernetes/policy/charts/mariadb/values.yaml
index b2a848b028..90f5be4e1b 100644
--- a/kubernetes/policy/charts/mariadb/values.yaml
+++ b/kubernetes/policy/charts/mariadb/values.yaml
@@ -91,4 +91,5 @@ resources:
memory: 4Gi
requests:
cpu: 20m
- memory: 1Gi \ No newline at end of file
+ memory: 1Gi
+ unlimited: {} \ No newline at end of file
diff --git a/kubernetes/policy/charts/pdp/Chart.yaml b/kubernetes/policy/charts/pdp/Chart.yaml
index 7cce4ddd70..7963667ba7 100644
--- a/kubernetes/policy/charts/pdp/Chart.yaml
+++ b/kubernetes/policy/charts/pdp/Chart.yaml
@@ -16,4 +16,4 @@
apiVersion: v1
description: ONAP Policy PDP
name: pdp
-version: 2.0.0
+version: 3.0.0
diff --git a/kubernetes/policy/charts/pdp/requirements.yaml b/kubernetes/policy/charts/pdp/requirements.yaml
index c414a0149a..e57547871c 100644
--- a/kubernetes/policy/charts/pdp/requirements.yaml
+++ b/kubernetes/policy/charts/pdp/requirements.yaml
@@ -15,7 +15,7 @@
dependencies:
- name: common
- version: ~2.0.0
+ version: ~3.0.0
# local reference to common chart, as it is
# a part of this chart's package and will not
# be published independently to a repo (at this point)
diff --git a/kubernetes/policy/charts/pdp/templates/statefulset.yaml b/kubernetes/policy/charts/pdp/templates/statefulset.yaml
index 5bc7b55839..a3a8f6a9ac 100644
--- a/kubernetes/policy/charts/pdp/templates/statefulset.yaml
+++ b/kubernetes/policy/charts/pdp/templates/statefulset.yaml
@@ -59,7 +59,7 @@ spec:
image: "{{ include "common.repository" . }}/{{ .Values.image }}"
imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
resources:
-{{ toYaml (pluck .Values.flavor .Values.resources| first) | indent 12 }}
+{{ include "common.resources" . | indent 12 }}
ports:
- containerPort: {{ .Values.service.externalPort }}
{{- if eq .Values.liveness.enabled true }}
diff --git a/kubernetes/policy/charts/pdp/values.yaml b/kubernetes/policy/charts/pdp/values.yaml
index 45ab96deeb..6559b42551 100644
--- a/kubernetes/policy/charts/pdp/values.yaml
+++ b/kubernetes/policy/charts/pdp/values.yaml
@@ -84,4 +84,5 @@ resources:
memory: 8Gi
requests:
cpu: 20m
- memory: 2Gi \ No newline at end of file
+ memory: 2Gi
+ unlimited: {} \ No newline at end of file
diff --git a/kubernetes/policy/charts/policy-apex-pdp/Chart.yaml b/kubernetes/policy/charts/policy-apex-pdp/Chart.yaml
index 5a07fff6d4..95cfc9f3c6 100644
--- a/kubernetes/policy/charts/policy-apex-pdp/Chart.yaml
+++ b/kubernetes/policy/charts/policy-apex-pdp/Chart.yaml
@@ -19,4 +19,4 @@
apiVersion: v1
description: ONAP Policy APEX PDP
name: policy-apex-pdp
-version: 2.0.0
+version: 3.0.0
diff --git a/kubernetes/policy/charts/policy-apex-pdp/requirements.yaml b/kubernetes/policy/charts/policy-apex-pdp/requirements.yaml
index fee7a3c24d..9f02100f08 100644
--- a/kubernetes/policy/charts/policy-apex-pdp/requirements.yaml
+++ b/kubernetes/policy/charts/policy-apex-pdp/requirements.yaml
@@ -18,5 +18,5 @@
dependencies:
- name: common
- version: ~2.0.0
+ version: ~3.0.0
repository: '@local'
diff --git a/kubernetes/policy/charts/policy-apex-pdp/templates/statefulset.yaml b/kubernetes/policy/charts/policy-apex-pdp/templates/statefulset.yaml
index 8063c83817..29a24e66bf 100644
--- a/kubernetes/policy/charts/policy-apex-pdp/templates/statefulset.yaml
+++ b/kubernetes/policy/charts/policy-apex-pdp/templates/statefulset.yaml
@@ -72,7 +72,7 @@ spec:
- mountPath: /home/apexuser/config
name: apexconfig
resources:
-{{ toYaml (pluck .Values.flavor .Values.resources| first) | indent 12 }}
+{{ include "common.resources" . | indent 12 }}
{{- if .Values.nodeSelector }}
nodeSelector:
{{ toYaml .Values.nodeSelector | indent 10 }}
diff --git a/kubernetes/policy/charts/policy-apex-pdp/values.yaml b/kubernetes/policy/charts/policy-apex-pdp/values.yaml
index ef90c917b8..5d7a4d64a0 100644
--- a/kubernetes/policy/charts/policy-apex-pdp/values.yaml
+++ b/kubernetes/policy/charts/policy-apex-pdp/values.yaml
@@ -82,4 +82,5 @@ resources:
memory: 8Gi
requests:
cpu: 20m
- memory: 2Gi \ No newline at end of file
+ memory: 2Gi
+ unlimited: {} \ No newline at end of file
diff --git a/kubernetes/policy/charts/policy-common/Chart.yaml b/kubernetes/policy/charts/policy-common/Chart.yaml
index 73d81d0c3c..62f31facfc 100644
--- a/kubernetes/policy/charts/policy-common/Chart.yaml
+++ b/kubernetes/policy/charts/policy-common/Chart.yaml
@@ -16,4 +16,4 @@
apiVersion: v1
description: ONAP Policy Common
name: policy-common
-version: 2.0.0
+version: 3.0.0
diff --git a/kubernetes/policy/charts/policy-common/requirements.yaml b/kubernetes/policy/charts/policy-common/requirements.yaml
index c414a0149a..e57547871c 100644
--- a/kubernetes/policy/charts/policy-common/requirements.yaml
+++ b/kubernetes/policy/charts/policy-common/requirements.yaml
@@ -15,7 +15,7 @@
dependencies:
- name: common
- version: ~2.0.0
+ version: ~3.0.0
# local reference to common chart, as it is
# a part of this chart's package and will not
# be published independently to a repo (at this point)
diff --git a/kubernetes/policy/charts/policy-common/resources/config/pe/base.conf b/kubernetes/policy/charts/policy-common/resources/config/pe/base.conf
index be18e55746..93dad89255 100644
--- a/kubernetes/policy/charts/policy-common/resources/config/pe/base.conf
+++ b/kubernetes/policy/charts/policy-common/resources/config/pe/base.conf
@@ -33,6 +33,9 @@ max_fpc_update_interval=60
test_via_jmx=false
jmx_fqdn=
+AAF_NAMESPACE=org.onap.policy
+AAF_HOST=aaf-locate.{{.Release.Namespace}}
+
ENVIRONMENT=TEST
#Micro Service Model Properties
diff --git a/kubernetes/policy/charts/policy-distribution/Chart.yaml b/kubernetes/policy/charts/policy-distribution/Chart.yaml
index 0f85689a24..f840d06bfe 100644
--- a/kubernetes/policy/charts/policy-distribution/Chart.yaml
+++ b/kubernetes/policy/charts/policy-distribution/Chart.yaml
@@ -19,4 +19,4 @@
apiVersion: v1
description: ONAP Policy Distribution
name: policy-distribution
-version: 2.0.0
+version: 3.0.0
diff --git a/kubernetes/policy/charts/policy-distribution/requirements.yaml b/kubernetes/policy/charts/policy-distribution/requirements.yaml
index fee7a3c24d..9f02100f08 100644
--- a/kubernetes/policy/charts/policy-distribution/requirements.yaml
+++ b/kubernetes/policy/charts/policy-distribution/requirements.yaml
@@ -18,5 +18,5 @@
dependencies:
- name: common
- version: ~2.0.0
+ version: ~3.0.0
repository: '@local'
diff --git a/kubernetes/policy/charts/policy-distribution/templates/deployment.yaml b/kubernetes/policy/charts/policy-distribution/templates/deployment.yaml
index 12029f3b03..8722e03ad4 100644
--- a/kubernetes/policy/charts/policy-distribution/templates/deployment.yaml
+++ b/kubernetes/policy/charts/policy-distribution/templates/deployment.yaml
@@ -45,7 +45,7 @@ spec:
- mountPath: /opt/app/policy/distribution/etc/mounted
name: distributionconfig
resources:
-{{ toYaml .Values.resources | indent 12 }}
+{{ include "common.resources" . | indent 12 }}
{{- if .Values.nodeSelector }}
nodeSelector:
{{ toYaml .Values.nodeSelector | indent 10 }}
diff --git a/kubernetes/policy/requirements.yaml b/kubernetes/policy/requirements.yaml
index c414a0149a..e57547871c 100644
--- a/kubernetes/policy/requirements.yaml
+++ b/kubernetes/policy/requirements.yaml
@@ -15,7 +15,7 @@
dependencies:
- name: common
- version: ~2.0.0
+ version: ~3.0.0
# local reference to common chart, as it is
# a part of this chart's package and will not
# be published independently to a repo (at this point)
diff --git a/kubernetes/policy/templates/deployment.yaml b/kubernetes/policy/templates/deployment.yaml
index bcd25510c8..ea177e4627 100644
--- a/kubernetes/policy/templates/deployment.yaml
+++ b/kubernetes/policy/templates/deployment.yaml
@@ -55,7 +55,7 @@ spec:
image: "{{ include "common.repository" . }}/{{ .Values.image }}"
imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
resources:
-{{ toYaml (pluck .Values.flavor .Values.resources| first) | indent 12 }}
+{{ include "common.resources" . | indent 12 }}
ports:
- containerPort: {{ .Values.service.externalPort }}
- containerPort: {{ .Values.service.externalPort2 }}
diff --git a/kubernetes/policy/values.yaml b/kubernetes/policy/values.yaml
index 6583045edb..0813f4c9c5 100644
--- a/kubernetes/policy/values.yaml
+++ b/kubernetes/policy/values.yaml
@@ -99,7 +99,7 @@ service:
ingress:
enabled: false
-# Resource Limit flavor -By Default using small
+# Resource Limit flavor -By Default using small
flavor: small
# Segregation for Different environment (Small and Large)
resources:
@@ -116,4 +116,5 @@ resources:
memory: 8Gi
requests:
cpu: 20m
- memory: 2Gi \ No newline at end of file
+ memory: 2Gi
+ unlimited: {} \ No newline at end of file
diff --git a/kubernetes/pomba/Chart.yaml b/kubernetes/pomba/Chart.yaml
index 6801c7dfe1..0124bc1943 100644
--- a/kubernetes/pomba/Chart.yaml
+++ b/kubernetes/pomba/Chart.yaml
@@ -15,4 +15,4 @@
apiVersion: v1
description: ONAP Post Orchestration Model Based Audit
name: pomba
-version: 2.0.0
+version: 3.0.0
diff --git a/kubernetes/pomba/charts/pomba-aaictxbuilder/Chart.yaml b/kubernetes/pomba/charts/pomba-aaictxbuilder/Chart.yaml
index 2b3fb14980..f64eb73ba4 100644
--- a/kubernetes/pomba/charts/pomba-aaictxbuilder/Chart.yaml
+++ b/kubernetes/pomba/charts/pomba-aaictxbuilder/Chart.yaml
@@ -15,4 +15,4 @@
apiVersion: v1
description: ONAP POMBA AAI Context Builder
name: pomba-aaictxbuilder
-version: 2.0.0
+version: 3.0.0
diff --git a/kubernetes/pomba/charts/pomba-aaictxbuilder/requirements.yaml b/kubernetes/pomba/charts/pomba-aaictxbuilder/requirements.yaml
index 37545fe2e0..cf4086962c 100644
--- a/kubernetes/pomba/charts/pomba-aaictxbuilder/requirements.yaml
+++ b/kubernetes/pomba/charts/pomba-aaictxbuilder/requirements.yaml
@@ -14,5 +14,5 @@
dependencies:
- name: common
- version: ~2.0.0
+ version: ~3.0.0
repository: '@local'
diff --git a/kubernetes/pomba/charts/pomba-aaictxbuilder/templates/deployment.yaml b/kubernetes/pomba/charts/pomba-aaictxbuilder/templates/deployment.yaml
index 99b1150553..6d46e9de09 100644
--- a/kubernetes/pomba/charts/pomba-aaictxbuilder/templates/deployment.yaml
+++ b/kubernetes/pomba/charts/pomba-aaictxbuilder/templates/deployment.yaml
@@ -66,7 +66,7 @@ spec:
readOnly: true
resources:
-{{ toYaml .Values.resources | indent 12 }}
+{{ include "common.resources" . | indent 12 }}
{{- if .Values.nodeSelector }}
nodeSelector:
{{ toYaml .Values.nodeSelector | indent 10 }}
diff --git a/kubernetes/pomba/charts/pomba-contextaggregator/Chart.yaml b/kubernetes/pomba/charts/pomba-contextaggregator/Chart.yaml
index 0f41ac3193..28bd0ec88a 100644
--- a/kubernetes/pomba/charts/pomba-contextaggregator/Chart.yaml
+++ b/kubernetes/pomba/charts/pomba-contextaggregator/Chart.yaml
@@ -15,4 +15,4 @@
apiVersion: v1
description: ONAP POMBA Context Aggregator
name: pomba-contextaggregator
-version: 2.0.0
+version: 3.0.0
diff --git a/kubernetes/pomba/charts/pomba-contextaggregator/requirements.yaml b/kubernetes/pomba/charts/pomba-contextaggregator/requirements.yaml
index 1e8f788318..896eaf4baa 100755
--- a/kubernetes/pomba/charts/pomba-contextaggregator/requirements.yaml
+++ b/kubernetes/pomba/charts/pomba-contextaggregator/requirements.yaml
@@ -14,5 +14,5 @@
dependencies:
- name: common
- version: ~2.0.0
+ version: ~3.0.0
repository: '@local' \ No newline at end of file
diff --git a/kubernetes/pomba/charts/pomba-contextaggregator/resources/config/builders/networkdiscovery.properties b/kubernetes/pomba/charts/pomba-contextaggregator/resources/config/builders/ndcb.properties
index aa80aed310..aa80aed310 100755
--- a/kubernetes/pomba/charts/pomba-contextaggregator/resources/config/builders/networkdiscovery.properties
+++ b/kubernetes/pomba/charts/pomba-contextaggregator/resources/config/builders/ndcb.properties
diff --git a/kubernetes/pomba/charts/pomba-contextaggregator/resources/config/builders/sdnc.properties b/kubernetes/pomba/charts/pomba-contextaggregator/resources/config/builders/sdnc.properties
deleted file mode 100755
index f06d335213..0000000000
--- a/kubernetes/pomba/charts/pomba-contextaggregator/resources/config/builders/sdnc.properties
+++ /dev/null
@@ -1,28 +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.
-server.host={{ .Values.config.sdncCtxBuilderHost }}
-basicauth.username={{ .Values.config.sdncCtxBuilderUsername }}
-basicauth.password={{ .Values.config.sdncCtxBuilderPassword }}
-server.port={{ .Values.config.ctxBuilderExternalPort }}
-server.protocol=http
-trust.store.path=/auth/tomcat_keystore
-key.store.path=/auth/aai-client-cert.p12
-key.store.password=70c87528c88dcd9f9c2558d30e817868
-key.store.type=PKCS12
-key.manager.factory.algorithm=SunX509
-security.protocol=TLS
-connection.timeout.ms=15000
-read.timeout.ms=10000
-base.uri=/sdnccontextbuilder/service/context
-
diff --git a/kubernetes/pomba/charts/pomba-contextaggregator/templates/deployment.yaml b/kubernetes/pomba/charts/pomba-contextaggregator/templates/deployment.yaml
index 4dffd6e68b..44268db46e 100755
--- a/kubernetes/pomba/charts/pomba-contextaggregator/templates/deployment.yaml
+++ b/kubernetes/pomba/charts/pomba-contextaggregator/templates/deployment.yaml
@@ -64,7 +64,7 @@ spec:
name: {{ include "common.fullname" . }}-config-builders
readOnly: true
resources:
-{{ toYaml .Values.resources | indent 12 }}
+{{ include "common.resources" . | indent 12 }}
{{- if .Values.nodeSelector }}
nodeSelector:
{{- toYaml .Values.nodeSelector | indent 10 }}
diff --git a/kubernetes/pomba/charts/pomba-contextaggregator/values.yaml b/kubernetes/pomba/charts/pomba-contextaggregator/values.yaml
index 072357fddf..905ea87efa 100755
--- a/kubernetes/pomba/charts/pomba-contextaggregator/values.yaml
+++ b/kubernetes/pomba/charts/pomba-contextaggregator/values.yaml
@@ -33,16 +33,16 @@ debugEnabled: false
config:
aaiCtxBuilderHost: pomba-aaictxbuilder
aaiCtxBuilderUsername: admin
- aaiCtxBuilderPassword: admin
+ aaiCtxBuilderPassword: OBF:1u2a1toa1w8v1tok1u30
sdcCtxBuilderHost: pomba-sdcctxbuilder
sdcCtxBuilderUsername: admin
- sdcCtxBuilderPassword: admin
+ sdcCtxBuilderPassword: OBF:1u2a1toa1w8v1tok1u30
sdncCtxBuilderHost: pomba-sdncctxbuilder
sdncCtxBuilderUsername: admin
- sdncCtxBuilderPassword: admin
+ sdncCtxBuilderPassword: OBF:1u2a1toa1w8v1tok1u30
networkdiscoveryCtxBuilderHost: pomba-networkdiscoveryctxbuilder
networkdiscoveryCtxBuilderUsername: admin
- networkdiscoveryCtxBuilderPassword: admin
+ networkdiscoveryCtxBuilderPassword: OBF:1u2a1toa1w8v1tok1u30
ctxBuilderExternalPort: 9530
# default number of instances
diff --git a/kubernetes/pomba/charts/pomba-data-router/Chart.yaml b/kubernetes/pomba/charts/pomba-data-router/Chart.yaml
index 6b2857dc41..6bc19c5aad 100644
--- a/kubernetes/pomba/charts/pomba-data-router/Chart.yaml
+++ b/kubernetes/pomba/charts/pomba-data-router/Chart.yaml
@@ -14,4 +14,4 @@
apiVersion: v1
description: ONAP POMBA Data-Router
name: pomba-data-router
-version: 2.0.0
+version: 3.0.0
diff --git a/kubernetes/pomba/charts/pomba-elasticsearch/Chart.yaml b/kubernetes/pomba/charts/pomba-elasticsearch/Chart.yaml
index a6ff94bcdb..a198fb42fa 100644
--- a/kubernetes/pomba/charts/pomba-elasticsearch/Chart.yaml
+++ b/kubernetes/pomba/charts/pomba-elasticsearch/Chart.yaml
@@ -15,4 +15,4 @@
apiVersion: v1
description: ONAP POMBA Elasticsearch
name: pomba-elasticsearch
-version: 2.0.0
+version: 3.0.0
diff --git a/kubernetes/pomba/charts/pomba-elasticsearch/requirements.yaml b/kubernetes/pomba/charts/pomba-elasticsearch/requirements.yaml
index 1e8f788318..896eaf4baa 100644
--- a/kubernetes/pomba/charts/pomba-elasticsearch/requirements.yaml
+++ b/kubernetes/pomba/charts/pomba-elasticsearch/requirements.yaml
@@ -14,5 +14,5 @@
dependencies:
- name: common
- version: ~2.0.0
+ version: ~3.0.0
repository: '@local' \ No newline at end of file
diff --git a/kubernetes/pomba/charts/pomba-elasticsearch/templates/deployment.yaml b/kubernetes/pomba/charts/pomba-elasticsearch/templates/deployment.yaml
index c4491b914d..93b5539cfc 100644
--- a/kubernetes/pomba/charts/pomba-elasticsearch/templates/deployment.yaml
+++ b/kubernetes/pomba/charts/pomba-elasticsearch/templates/deployment.yaml
@@ -88,7 +88,7 @@ spec:
- mountPath: /usr/share/elasticsearch/data/
name: {{ include "common.fullname" . }}-data
resources:
-{{ toYaml .Values.resources | indent 12 }}
+{{ include "common.resources" . | indent 12 }}
{{- if .Values.nodeSelector }}
nodeSelector:
{{ toYaml .Values.nodeSelector | indent 10 }}
diff --git a/kubernetes/pomba/charts/pomba-kibana/Chart.yaml b/kubernetes/pomba/charts/pomba-kibana/Chart.yaml
index 6247556eff..667059f147 100644
--- a/kubernetes/pomba/charts/pomba-kibana/Chart.yaml
+++ b/kubernetes/pomba/charts/pomba-kibana/Chart.yaml
@@ -15,4 +15,4 @@
apiVersion: v1
description: ONAP POMBA Kibana
name: pomba-kibana
-version: 2.0.0
+version: 3.0.0
diff --git a/kubernetes/pomba/charts/pomba-kibana/requirements.yaml b/kubernetes/pomba/charts/pomba-kibana/requirements.yaml
index 1e8f788318..896eaf4baa 100644
--- a/kubernetes/pomba/charts/pomba-kibana/requirements.yaml
+++ b/kubernetes/pomba/charts/pomba-kibana/requirements.yaml
@@ -14,5 +14,5 @@
dependencies:
- name: common
- version: ~2.0.0
+ version: ~3.0.0
repository: '@local' \ No newline at end of file
diff --git a/kubernetes/pomba/charts/pomba-kibana/templates/deployment.yaml b/kubernetes/pomba/charts/pomba-kibana/templates/deployment.yaml
index 694f501746..e87a04faba 100644
--- a/kubernetes/pomba/charts/pomba-kibana/templates/deployment.yaml
+++ b/kubernetes/pomba/charts/pomba-kibana/templates/deployment.yaml
@@ -146,7 +146,7 @@ spec:
- mountPath: /usr/share/kibana/config/
name: {{ include "common.fullname" . }}
resources:
-{{ toYaml .Values.resources | indent 12 }}
+{{ include "common.resources" . | indent 12 }}
{{- if .Values.nodeSelector }}
nodeSelector:
{{ toYaml .Values.nodeSelector | indent 10 }}
diff --git a/kubernetes/pomba/charts/pomba-networkdiscovery/Chart.yaml b/kubernetes/pomba/charts/pomba-networkdiscovery/Chart.yaml
index 13c1a6b765..5ab80a70f4 100644
--- a/kubernetes/pomba/charts/pomba-networkdiscovery/Chart.yaml
+++ b/kubernetes/pomba/charts/pomba-networkdiscovery/Chart.yaml
@@ -15,4 +15,4 @@
apiVersion: v1
description: ONAP POMBA Network Discovery
name: pomba-networkdiscovery
-version: 2.0.0
+version: 3.0.0
diff --git a/kubernetes/pomba/charts/pomba-networkdiscovery/requirements.yaml b/kubernetes/pomba/charts/pomba-networkdiscovery/requirements.yaml
index 9bae0310a0..8f9493a9a7 100644
--- a/kubernetes/pomba/charts/pomba-networkdiscovery/requirements.yaml
+++ b/kubernetes/pomba/charts/pomba-networkdiscovery/requirements.yaml
@@ -14,5 +14,5 @@
dependencies:
- name: common
- version: ~2.0.0
+ version: ~3.0.0
repository: '@local'
diff --git a/kubernetes/pomba/charts/pomba-networkdiscovery/templates/deployment.yaml b/kubernetes/pomba/charts/pomba-networkdiscovery/templates/deployment.yaml
index 1bd0309367..7f44106bf9 100644
--- a/kubernetes/pomba/charts/pomba-networkdiscovery/templates/deployment.yaml
+++ b/kubernetes/pomba/charts/pomba-networkdiscovery/templates/deployment.yaml
@@ -70,7 +70,7 @@ spec:
readOnly: true
resources:
-{{ toYaml .Values.resources | indent 12 }}
+{{ include "common.resources" . | indent 12 }}
{{- if .Values.nodeSelector }}
nodeSelector:
{{ toYaml .Values.nodeSelector | indent 10 }}
diff --git a/kubernetes/pomba/charts/pomba-networkdiscovery/values.yaml b/kubernetes/pomba/charts/pomba-networkdiscovery/values.yaml
index b65f3be7d7..e10b6db668 100644
--- a/kubernetes/pomba/charts/pomba-networkdiscovery/values.yaml
+++ b/kubernetes/pomba/charts/pomba-networkdiscovery/values.yaml
@@ -1,96 +1,96 @@
-# 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.
-
-#################################################################
-# Global configuration defaults.
-#################################################################
-global:
- nodePortPrefix: 302
- repository: nexus3.onap.org:10001
-
-#################################################################
-# Application configuration defaults.
-#################################################################
-# application image
-repository: nexus3.onap.org:10001
-image: onap/network-discovery:latest
-pullPolicy: Always
-
-# flag to enable debugging - application support required
-debugEnabled: false
-
-# application configuration
-# Example:
-config:
- # Network Discovery Micro Service REST Client Configuration
- # Basic Authorization credentials for Network Discovery Micro Service Rest Service
- networkDiscoveryUserId: admin
- networkDiscoveryPassword: OBF:1u2a1toa1w8v1tok1u30
-
-# default number of instances
-replicaCount: 1
-
-nodeSelector: {}
-
-affinity: {}
-
-# probe configuration parameters
-liveness:
- initialDelaySeconds: 10
- periodSeconds: 10
- # necessary to disable liveness probe when setting breakpoints
- # in debugger so K8s doesn't restart unresponsive container
- enabled: true
-
-readiness:
- initialDelaySeconds: 10
- periodSeconds: 10
-
-#Example service definition with external, internal and node ports.
-service:
- # The default service name (exposed in the service.yaml) will be the same
- # name as the chart. If the service name needs to be overriden (such as
- # when a subchart is shared), uncomment the value below.
- #name: <service-name-override>
-
- #Services may use any combination of ports depending on the 'type' of
- #service being defined.
- type: ClusterIP
- externalPort: 9531
- internalPort: 8080
-# nodePort: <replace with unused node port suffix eg. 23>
- # optional port name override - default can be defined in service.yaml
- #portName: http
-
-ingress:
- enabled: false
-
-resources: {}
- # We usually recommend not to specify default resources and to leave this as a conscious
- # choice for the user. This also increases chances charts run on environments with little
- # resources, such as Minikube. If you do want to specify resources, uncomment the following
- # lines, adjust them as necessary, and remove the curly braces after 'resources:'.
- #
- # Example:
- # Configure resource requests and limits
- # ref: http://kubernetes.io/docs/user-guide/compute-resources/
- # Minimum memory for development is 2 CPU cores and 4GB memory
- # Minimum memory for production is 4 CPU cores and 8GB memory
-#resources:
-# limits:
-# cpu: 2
-# memory: 4Gi
-# requests:
-# cpu: 2
-# memory: 4Gi
+# 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.
+
+#################################################################
+# Global configuration defaults.
+#################################################################
+global:
+ nodePortPrefix: 302
+ repository: nexus3.onap.org:10001
+
+#################################################################
+# Application configuration defaults.
+#################################################################
+# application image
+repository: nexus3.onap.org:10001
+image: onap/network-discovery:latest
+pullPolicy: Always
+
+# flag to enable debugging - application support required
+debugEnabled: false
+
+# application configuration
+# Example:
+config:
+ # Network Discovery Micro Service REST Client Configuration
+ # Basic Authorization credentials for Network Discovery Micro Service Rest Service
+ networkDiscoveryUserId: admin
+ networkDiscoveryPassword: OBF:1u2a1toa1w8v1tok1u30
+
+# default number of instances
+replicaCount: 1
+
+nodeSelector: {}
+
+affinity: {}
+
+# probe configuration parameters
+liveness:
+ initialDelaySeconds: 10
+ periodSeconds: 10
+ # necessary to disable liveness probe when setting breakpoints
+ # in debugger so K8s doesn't restart unresponsive container
+ enabled: true
+
+readiness:
+ initialDelaySeconds: 10
+ periodSeconds: 10
+
+#Example service definition with external, internal and node ports.
+service:
+ # The default service name (exposed in the service.yaml) will be the same
+ # name as the chart. If the service name needs to be overriden (such as
+ # when a subchart is shared), uncomment the value below.
+ #name: <service-name-override>
+
+ #Services may use any combination of ports depending on the 'type' of
+ #service being defined.
+ type: ClusterIP
+ externalPort: 9531
+ internalPort: 8080
+# nodePort: <replace with unused node port suffix eg. 23>
+ # optional port name override - default can be defined in service.yaml
+ #portName: http
+
+ingress:
+ enabled: false
+
+resources: {}
+ # We usually recommend not to specify default resources and to leave this as a conscious
+ # choice for the user. This also increases chances charts run on environments with little
+ # resources, such as Minikube. If you do want to specify resources, uncomment the following
+ # lines, adjust them as necessary, and remove the curly braces after 'resources:'.
+ #
+ # Example:
+ # Configure resource requests and limits
+ # ref: http://kubernetes.io/docs/user-guide/compute-resources/
+ # Minimum memory for development is 2 CPU cores and 4GB memory
+ # Minimum memory for production is 4 CPU cores and 8GB memory
+#resources:
+# limits:
+# cpu: 2
+# memory: 4Gi
+# requests:
+# cpu: 2
+# memory: 4Gi
diff --git a/kubernetes/pomba/charts/pomba-networkdiscoveryctxbuilder/Chart.yaml b/kubernetes/pomba/charts/pomba-networkdiscoveryctxbuilder/Chart.yaml
index 12449e8c1f..1ded7ec8e3 100644
--- a/kubernetes/pomba/charts/pomba-networkdiscoveryctxbuilder/Chart.yaml
+++ b/kubernetes/pomba/charts/pomba-networkdiscoveryctxbuilder/Chart.yaml
@@ -15,4 +15,4 @@
apiVersion: v1
description: ONAP POMBA Network Discovery Context Builder
name: pomba-networkdiscoveryctxbuilder
-version: 2.0.0
+version: 3.0.0
diff --git a/kubernetes/pomba/charts/pomba-networkdiscoveryctxbuilder/requirements.yaml b/kubernetes/pomba/charts/pomba-networkdiscoveryctxbuilder/requirements.yaml
index 37545fe2e0..cf4086962c 100644
--- a/kubernetes/pomba/charts/pomba-networkdiscoveryctxbuilder/requirements.yaml
+++ b/kubernetes/pomba/charts/pomba-networkdiscoveryctxbuilder/requirements.yaml
@@ -14,5 +14,5 @@
dependencies:
- name: common
- version: ~2.0.0
+ version: ~3.0.0
repository: '@local'
diff --git a/kubernetes/pomba/charts/pomba-networkdiscoveryctxbuilder/templates/deployment.yaml b/kubernetes/pomba/charts/pomba-networkdiscoveryctxbuilder/templates/deployment.yaml
index 2b53154e57..462ee68563 100644
--- a/kubernetes/pomba/charts/pomba-networkdiscoveryctxbuilder/templates/deployment.yaml
+++ b/kubernetes/pomba/charts/pomba-networkdiscoveryctxbuilder/templates/deployment.yaml
@@ -66,7 +66,7 @@ spec:
subPath: application.properties
resources:
-{{ toYaml .Values.resources | indent 12 }}
+{{ include "common.resources" . | indent 12 }}
{{- if .Values.nodeSelector }}
nodeSelector:
{{ toYaml .Values.nodeSelector | indent 10 }}
diff --git a/kubernetes/pomba/charts/pomba-sdcctxbuilder/Chart.yaml b/kubernetes/pomba/charts/pomba-sdcctxbuilder/Chart.yaml
index f187557d67..4a49d84c07 100644
--- a/kubernetes/pomba/charts/pomba-sdcctxbuilder/Chart.yaml
+++ b/kubernetes/pomba/charts/pomba-sdcctxbuilder/Chart.yaml
@@ -15,4 +15,4 @@
apiVersion: v1
description: ONAP POMBA SDC Context Builder
name: pomba-sdcctxbuilder
-version: 2.0.0
+version: 3.0.0
diff --git a/kubernetes/pomba/charts/pomba-sdcctxbuilder/requirements.yaml b/kubernetes/pomba/charts/pomba-sdcctxbuilder/requirements.yaml
index 1e8f788318..896eaf4baa 100644
--- a/kubernetes/pomba/charts/pomba-sdcctxbuilder/requirements.yaml
+++ b/kubernetes/pomba/charts/pomba-sdcctxbuilder/requirements.yaml
@@ -14,5 +14,5 @@
dependencies:
- name: common
- version: ~2.0.0
+ version: ~3.0.0
repository: '@local' \ No newline at end of file
diff --git a/kubernetes/pomba/charts/pomba-sdcctxbuilder/templates/deployment.yaml b/kubernetes/pomba/charts/pomba-sdcctxbuilder/templates/deployment.yaml
index 32119f79ac..f2c7ec75b0 100644
--- a/kubernetes/pomba/charts/pomba-sdcctxbuilder/templates/deployment.yaml
+++ b/kubernetes/pomba/charts/pomba-sdcctxbuilder/templates/deployment.yaml
@@ -60,7 +60,7 @@ spec:
subPath: application.properties
readOnly: true
resources:
-{{ toYaml .Values.resources | indent 12 }}
+{{ include "common.resources" . | indent 12 }}
{{- if .Values.nodeSelector }}
nodeSelector:
{{ toYaml .Values.nodeSelector | indent 10 }}
diff --git a/kubernetes/pomba/charts/pomba-search-data/Chart.yaml b/kubernetes/pomba/charts/pomba-search-data/Chart.yaml
index ef0e5d6973..1895998edb 100644
--- a/kubernetes/pomba/charts/pomba-search-data/Chart.yaml
+++ b/kubernetes/pomba/charts/pomba-search-data/Chart.yaml
@@ -15,4 +15,4 @@
apiVersion: v1
description: ONAP POMBA search-data
name: pomba-search-data
-version: 2.0.0
+version: 3.0.0
diff --git a/kubernetes/pomba/charts/pomba-search-data/templates/deployment.yaml b/kubernetes/pomba/charts/pomba-search-data/templates/deployment.yaml
index c0e2568476..fd03c6c92d 100644
--- a/kubernetes/pomba/charts/pomba-search-data/templates/deployment.yaml
+++ b/kubernetes/pomba/charts/pomba-search-data/templates/deployment.yaml
@@ -92,7 +92,7 @@ spec:
initialDelaySeconds: {{ .Values.readiness.initialDelaySeconds }}
periodSeconds: {{ .Values.readiness.periodSeconds }}
resources:
-{{ toYaml .Values.resources | indent 10 }}
+{{ include "common.resources" . | indent 10 }}
{{- if .Values.nodeSelector }}
nodeSelector:
{{ toYaml .Values.nodeSelector | indent 8 }}
diff --git a/kubernetes/pomba/charts/pomba-servicedecomposition/Chart.yaml b/kubernetes/pomba/charts/pomba-servicedecomposition/Chart.yaml
index 4b89acffba..98b2e9771c 100644
--- a/kubernetes/pomba/charts/pomba-servicedecomposition/Chart.yaml
+++ b/kubernetes/pomba/charts/pomba-servicedecomposition/Chart.yaml
@@ -15,4 +15,4 @@
apiVersion: v1
description: ONAP POMBA Network Discovery Service Decomposition
name: pomba-servicedecomposition
-version: 2.0.0
+version: 3.0.0
diff --git a/kubernetes/pomba/charts/pomba-servicedecomposition/requirements.yaml b/kubernetes/pomba/charts/pomba-servicedecomposition/requirements.yaml
index 8ba6926d14..653f6ac0f1 100644
--- a/kubernetes/pomba/charts/pomba-servicedecomposition/requirements.yaml
+++ b/kubernetes/pomba/charts/pomba-servicedecomposition/requirements.yaml
@@ -14,5 +14,5 @@
dependencies:
- name: common
- version: ~2.0.0
+ version: ~3.0.0
repository: '@local'
diff --git a/kubernetes/pomba/charts/pomba-servicedecomposition/templates/deployment.yaml b/kubernetes/pomba/charts/pomba-servicedecomposition/templates/deployment.yaml
index 14513f3b05..7c6d4ba856 100644
--- a/kubernetes/pomba/charts/pomba-servicedecomposition/templates/deployment.yaml
+++ b/kubernetes/pomba/charts/pomba-servicedecomposition/templates/deployment.yaml
@@ -66,7 +66,7 @@ spec:
readOnly: true
resources:
-{{ toYaml .Values.resources | indent 12 }}
+{{ include "common.resources" . | indent 12 }}
{{- if .Values.nodeSelector }}
nodeSelector:
{{ toYaml .Values.nodeSelector | indent 10 }}
diff --git a/kubernetes/pomba/charts/pomba-servicedecomposition/values.yaml b/kubernetes/pomba/charts/pomba-servicedecomposition/values.yaml
index 3de087ef00..f43eea1e53 100644
--- a/kubernetes/pomba/charts/pomba-servicedecomposition/values.yaml
+++ b/kubernetes/pomba/charts/pomba-servicedecomposition/values.yaml
@@ -1,96 +1,96 @@
-# 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.
-
-#################################################################
-# Global configuration defaults.
-#################################################################
-global:
- nodePortPrefix: 302
- repository: nexus3.onap.org:10001
-
-#################################################################
-# Application configuration defaults.
-#################################################################
-# application image
-repository: nexus3.onap.org:10001
-image: onap/service-decomposition:latest
-pullPolicy: Always
-
-# flag to enable debugging - application support required
-debugEnabled: false
-
-# application configuration
-# Example:
-config:
- # Service Decomposition REST Client Configuration
- # Basic Authorization Client credentials for Service Decomposition REST service
- serviceDecompositionUserId: admin
- serviceDecompositionPassword: OBF:1u2a1toa1w8v1tok1u30
-
-# default number of instances
-replicaCount: 1
-
-nodeSelector: {}
-
-affinity: {}
-
-# probe configuration parameters
-liveness:
- initialDelaySeconds: 10
- periodSeconds: 10
- # necessary to disable liveness probe when setting breakpoints
- # in debugger so K8s doesn't restart unresponsive container
- enabled: true
-
-readiness:
- initialDelaySeconds: 10
- periodSeconds: 10
-
-#Example service definition with external, internal and node ports.
-service:
- # The default service name (exposed in the service.yaml) will be the same
- # name as the chart. If the service name needs to be overriden (such as
- # when a subchart is shared), uncomment the value below.
- #name: <service-name-override>
-
- #Services may use any combination of ports depending on the 'type' of
- #service being defined.
- type: ClusterIP
- externalPort: 9532
- internalPort: 8080
-# nodePort: <replace with unused node port suffix eg. 23>
- # optional port name override - default can be defined in service.yaml
- #portName: http
-
-ingress:
- enabled: false
-
-resources: {}
- # We usually recommend not to specify default resources and to leave this as a conscious
- # choice for the user. This also increases chances charts run on environments with little
- # resources, such as Minikube. If you do want to specify resources, uncomment the following
- # lines, adjust them as necessary, and remove the curly braces after 'resources:'.
- #
- # Example:
- # Configure resource requests and limits
- # ref: http://kubernetes.io/docs/user-guide/compute-resources/
- # Minimum memory for development is 2 CPU cores and 4GB memory
- # Minimum memory for production is 4 CPU cores and 8GB memory
-#resources:
-# limits:
-# cpu: 2
-# memory: 4Gi
-# requests:
-# cpu: 2
-# memory: 4Gi
+# 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.
+
+#################################################################
+# Global configuration defaults.
+#################################################################
+global:
+ nodePortPrefix: 302
+ repository: nexus3.onap.org:10001
+
+#################################################################
+# Application configuration defaults.
+#################################################################
+# application image
+repository: nexus3.onap.org:10001
+image: onap/service-decomposition:latest
+pullPolicy: Always
+
+# flag to enable debugging - application support required
+debugEnabled: false
+
+# application configuration
+# Example:
+config:
+ # Service Decomposition REST Client Configuration
+ # Basic Authorization Client credentials for Service Decomposition REST service
+ serviceDecompositionUserId: admin
+ serviceDecompositionPassword: OBF:1u2a1toa1w8v1tok1u30
+
+# default number of instances
+replicaCount: 1
+
+nodeSelector: {}
+
+affinity: {}
+
+# probe configuration parameters
+liveness:
+ initialDelaySeconds: 10
+ periodSeconds: 10
+ # necessary to disable liveness probe when setting breakpoints
+ # in debugger so K8s doesn't restart unresponsive container
+ enabled: true
+
+readiness:
+ initialDelaySeconds: 10
+ periodSeconds: 10
+
+#Example service definition with external, internal and node ports.
+service:
+ # The default service name (exposed in the service.yaml) will be the same
+ # name as the chart. If the service name needs to be overriden (such as
+ # when a subchart is shared), uncomment the value below.
+ #name: <service-name-override>
+
+ #Services may use any combination of ports depending on the 'type' of
+ #service being defined.
+ type: ClusterIP
+ externalPort: 9532
+ internalPort: 8080
+# nodePort: <replace with unused node port suffix eg. 23>
+ # optional port name override - default can be defined in service.yaml
+ #portName: http
+
+ingress:
+ enabled: false
+
+resources: {}
+ # We usually recommend not to specify default resources and to leave this as a conscious
+ # choice for the user. This also increases chances charts run on environments with little
+ # resources, such as Minikube. If you do want to specify resources, uncomment the following
+ # lines, adjust them as necessary, and remove the curly braces after 'resources:'.
+ #
+ # Example:
+ # Configure resource requests and limits
+ # ref: http://kubernetes.io/docs/user-guide/compute-resources/
+ # Minimum memory for development is 2 CPU cores and 4GB memory
+ # Minimum memory for production is 4 CPU cores and 8GB memory
+#resources:
+# limits:
+# cpu: 2
+# memory: 4Gi
+# requests:
+# cpu: 2
+# memory: 4Gi
diff --git a/kubernetes/pomba/charts/pomba-validation-service/Chart.yaml b/kubernetes/pomba/charts/pomba-validation-service/Chart.yaml
index 0f6a3a61fe..3fbbb5d8b6 100644
--- a/kubernetes/pomba/charts/pomba-validation-service/Chart.yaml
+++ b/kubernetes/pomba/charts/pomba-validation-service/Chart.yaml
@@ -15,4 +15,4 @@
apiVersion: v1
description: POMBA Validaton-Service
name: pomba-validation-service
-version: 2.0.0
+version: 3.0.0
diff --git a/kubernetes/pomba/charts/pomba-validation-service/requirements.yaml b/kubernetes/pomba/charts/pomba-validation-service/requirements.yaml
index ce82a2f838..9f23fac6f8 100644
--- a/kubernetes/pomba/charts/pomba-validation-service/requirements.yaml
+++ b/kubernetes/pomba/charts/pomba-validation-service/requirements.yaml
@@ -14,5 +14,5 @@
dependencies:
- name: common
- version: ~2.0.0
+ version: ~3.0.0
repository: '@local'
diff --git a/kubernetes/pomba/charts/pomba-validation-service/templates/deployment.yaml b/kubernetes/pomba/charts/pomba-validation-service/templates/deployment.yaml
index 5faa45357c..f802245c5a 100644
--- a/kubernetes/pomba/charts/pomba-validation-service/templates/deployment.yaml
+++ b/kubernetes/pomba/charts/pomba-validation-service/templates/deployment.yaml
@@ -75,7 +75,7 @@ spec:
- mountPath: {{ .Values.config.rulesDir }}/
name: rules
resources:
-{{ toYaml .Values.resources | indent 12 }}
+{{ include "common.resources" . | indent 12 }}
{{- if .Values.nodeSelector }}
nodeSelector:
{{ toYaml .Values.nodeSelector | indent 10 }}
diff --git a/kubernetes/pomba/requirements.yaml b/kubernetes/pomba/requirements.yaml
index ba1e974b9e..5359e3b505 100644
--- a/kubernetes/pomba/requirements.yaml
+++ b/kubernetes/pomba/requirements.yaml
@@ -14,7 +14,7 @@
dependencies:
- name: common
- version: ~2.0.0
+ version: ~3.0.0
# local reference to common chart, as it is
# a part of this chart's package and will not
# be published independently to a repo (at this point)
diff --git a/kubernetes/portal/Chart.yaml b/kubernetes/portal/Chart.yaml
index bc3737a45f..84105d2db2 100644
--- a/kubernetes/portal/Chart.yaml
+++ b/kubernetes/portal/Chart.yaml
@@ -16,4 +16,4 @@
apiVersion: v1
description: ONAP Web Portal
name: portal
-version: 2.0.0
+version: 3.0.0
diff --git a/kubernetes/portal/charts/portal-app/Chart.yaml b/kubernetes/portal/charts/portal-app/Chart.yaml
index 0ccf705063..01e83e8e28 100644
--- a/kubernetes/portal/charts/portal-app/Chart.yaml
+++ b/kubernetes/portal/charts/portal-app/Chart.yaml
@@ -15,4 +15,4 @@
apiVersion: v1
description: ONAP Portal application
name: portal-app
-version: 2.0.0 \ No newline at end of file
+version: 3.0.0 \ No newline at end of file
diff --git a/kubernetes/portal/charts/portal-app/templates/deployment.yaml b/kubernetes/portal/charts/portal-app/templates/deployment.yaml
index f22bc480e2..2ab570aab2 100644
--- a/kubernetes/portal/charts/portal-app/templates/deployment.yaml
+++ b/kubernetes/portal/charts/portal-app/templates/deployment.yaml
@@ -98,7 +98,7 @@ spec:
- name: var-log-onap
mountPath: /var/log/onap
resources:
-{{ toYaml (pluck .Values.flavor .Values.resources| first) | indent 12 }}
+{{ include "common.resources" . | indent 12 }}
{{- if .Values.nodeSelector }}
nodeSelector:
{{ toYaml .Values.nodeSelector | indent 10 }}
diff --git a/kubernetes/portal/charts/portal-app/values.yaml b/kubernetes/portal/charts/portal-app/values.yaml
index c8aa81f84f..a71e0c4da3 100644
--- a/kubernetes/portal/charts/portal-app/values.yaml
+++ b/kubernetes/portal/charts/portal-app/values.yaml
@@ -86,7 +86,7 @@ messageRouter:
ingress:
enabled: false
-# Resource Limit flavor -By Default using small
+# Resource Limit flavor -By Default using small
flavor: small
# Segregation for Different environment (Small and Large)
resources:
@@ -104,3 +104,4 @@ resources:
requests:
cpu: 2
memory: 8Gi
+ unlimited: {}
diff --git a/kubernetes/portal/charts/portal-cassandra/Chart.yaml b/kubernetes/portal/charts/portal-cassandra/Chart.yaml
index a38a44cded..a899183ee8 100644
--- a/kubernetes/portal/charts/portal-cassandra/Chart.yaml
+++ b/kubernetes/portal/charts/portal-cassandra/Chart.yaml
@@ -16,4 +16,4 @@
apiVersion: v1
description: Portal cassandra
name: portal-cassandra
-version: 2.0.0
+version: 3.0.0
diff --git a/kubernetes/portal/charts/portal-cassandra/templates/deployment.yaml b/kubernetes/portal/charts/portal-cassandra/templates/deployment.yaml
index 38c6028aa9..0adf4e1b79 100644
--- a/kubernetes/portal/charts/portal-cassandra/templates/deployment.yaml
+++ b/kubernetes/portal/charts/portal-cassandra/templates/deployment.yaml
@@ -83,7 +83,7 @@ spec:
- name: {{ include "common.fullname" . }}-data
mountPath: /var/lib/cassandra/data
resources:
-{{ toYaml (pluck .Values.flavor .Values.resources| first) | indent 12 }}
+{{ include "common.resources" . | indent 12 }}
{{- if .Values.nodeSelector }}
nodeSelector:
{{ toYaml .Values.nodeSelector | indent 10 }}
diff --git a/kubernetes/portal/charts/portal-cassandra/values.yaml b/kubernetes/portal/charts/portal-cassandra/values.yaml
index 6c55391d3d..c46ca4238c 100644
--- a/kubernetes/portal/charts/portal-cassandra/values.yaml
+++ b/kubernetes/portal/charts/portal-cassandra/values.yaml
@@ -73,7 +73,7 @@ persistence:
size: 2Gi
mountPath: /dockerdata-nfs
mountSubPath: portal/cassandra/data
-
+
service:
type: ClusterIP
name: portal-cassandra
@@ -92,7 +92,7 @@ service:
ingress:
enabled: false
-# Resource Limit flavor -By Default using small
+# Resource Limit flavor -By Default using small
flavor: small
# Segregation for Different environment (Small and Large)
resources:
@@ -110,3 +110,4 @@ resources:
requests:
cpu: 2
memory: 6Gi
+ unlimited: {}
diff --git a/kubernetes/portal/charts/portal-mariadb/Chart.yaml b/kubernetes/portal/charts/portal-mariadb/Chart.yaml
index 78a7e28a26..8a966214a5 100644
--- a/kubernetes/portal/charts/portal-mariadb/Chart.yaml
+++ b/kubernetes/portal/charts/portal-mariadb/Chart.yaml
@@ -16,4 +16,4 @@
apiVersion: v1
description: MariaDB Service
name: portal-mariadb
-version: 2.0.0
+version: 3.0.0
diff --git a/kubernetes/portal/charts/portal-mariadb/templates/deployment.yaml b/kubernetes/portal/charts/portal-mariadb/templates/deployment.yaml
index 951f00ba16..20fa9cecc2 100644
--- a/kubernetes/portal/charts/portal-mariadb/templates/deployment.yaml
+++ b/kubernetes/portal/charts/portal-mariadb/templates/deployment.yaml
@@ -66,7 +66,7 @@ spec:
name: localtime
readOnly: true
resources:
-{{ toYaml (pluck .Values.flavor .Values.resources| first) | indent 12 }}
+{{ include "common.resources" . | indent 12 }}
{{- if .Values.nodeSelector }}
nodeSelector:
{{ toYaml .Values.nodeSelector | indent 10 }}
diff --git a/kubernetes/portal/charts/portal-mariadb/values.yaml b/kubernetes/portal/charts/portal-mariadb/values.yaml
index 308558848e..bd68f9aaec 100644
--- a/kubernetes/portal/charts/portal-mariadb/values.yaml
+++ b/kubernetes/portal/charts/portal-mariadb/values.yaml
@@ -121,7 +121,7 @@ service:
ingress:
enabled: false
-# Resource Limit flavor -By Default using small
+# Resource Limit flavor -By Default using small
flavor: small
# Segregation for Different environment (Small and Large)
resources:
@@ -139,3 +139,4 @@ resources:
requests:
cpu: 800m
memory: 1Gi
+ unlimited: {}
diff --git a/kubernetes/portal/charts/portal-sdk/Chart.yaml b/kubernetes/portal/charts/portal-sdk/Chart.yaml
index 155072c1b4..5eac1fc958 100644
--- a/kubernetes/portal/charts/portal-sdk/Chart.yaml
+++ b/kubernetes/portal/charts/portal-sdk/Chart.yaml
@@ -16,4 +16,4 @@
apiVersion: v1
description: Portal software development kit
name: portal-sdk
-version: 2.0.0
+version: 3.0.0
diff --git a/kubernetes/portal/charts/portal-sdk/templates/deployment.yaml b/kubernetes/portal/charts/portal-sdk/templates/deployment.yaml
index 4a9f4a0dfc..f59a16a671 100644
--- a/kubernetes/portal/charts/portal-sdk/templates/deployment.yaml
+++ b/kubernetes/portal/charts/portal-sdk/templates/deployment.yaml
@@ -90,7 +90,7 @@ spec:
- name: var-log-onap
mountPath: /var/log/onap
resources:
-{{ toYaml (pluck .Values.flavor .Values.resources| first) | indent 12 }}
+{{ include "common.resources" . | indent 12 }}
{{- if .Values.nodeSelector }}
nodeSelector:
{{ toYaml .Values.nodeSelector | indent 10 }}
diff --git a/kubernetes/portal/charts/portal-sdk/values.yaml b/kubernetes/portal/charts/portal-sdk/values.yaml
index 22a0b2ffc0..89d2e77182 100644
--- a/kubernetes/portal/charts/portal-sdk/values.yaml
+++ b/kubernetes/portal/charts/portal-sdk/values.yaml
@@ -82,7 +82,7 @@ messageRouter:
ingress:
enabled: false
-# Resource Limit flavor -By Default using small
+# Resource Limit flavor -By Default using small
flavor: small
# Segregation for Different environment (Small and Large)
resources:
@@ -100,3 +100,4 @@ resources:
requests:
cpu: 4
memory: 10Gi
+ unlimited: {}
diff --git a/kubernetes/portal/charts/portal-widget/Chart.yaml b/kubernetes/portal/charts/portal-widget/Chart.yaml
index c2f8a91ae9..1e73c38e9e 100644
--- a/kubernetes/portal/charts/portal-widget/Chart.yaml
+++ b/kubernetes/portal/charts/portal-widget/Chart.yaml
@@ -16,4 +16,4 @@
apiVersion: v1
description: Portal widgets micro service application
name: portal-widget
-version: 2.0.0
+version: 3.0.0
diff --git a/kubernetes/portal/charts/portal-widget/templates/deployment.yaml b/kubernetes/portal/charts/portal-widget/templates/deployment.yaml
index 8c16974322..fdf9915f2e 100644
--- a/kubernetes/portal/charts/portal-widget/templates/deployment.yaml
+++ b/kubernetes/portal/charts/portal-widget/templates/deployment.yaml
@@ -77,7 +77,7 @@ spec:
mountPath: "/application.yml"
subPath: application.yml
resources:
-{{ toYaml (pluck .Values.flavor .Values.resources| first) | indent 12 }}
+{{ include "common.resources" . | indent 12 }}
{{- if .Values.nodeSelector }}
nodeSelector:
{{ toYaml .Values.nodeSelector | indent 10 }}
diff --git a/kubernetes/portal/charts/portal-widget/values.yaml b/kubernetes/portal/charts/portal-widget/values.yaml
index 52649384aa..0724653b43 100644
--- a/kubernetes/portal/charts/portal-widget/values.yaml
+++ b/kubernetes/portal/charts/portal-widget/values.yaml
@@ -68,7 +68,7 @@ service:
ingress:
enabled: false
-# Resource Limit flavor -By Default using small
+# Resource Limit flavor -By Default using small
flavor: small
# Segregation for Different environment (Small and Large)
resources:
@@ -86,3 +86,4 @@ resources:
requests:
cpu: 1
memory: 4Gi
+ unlimited: {}
diff --git a/kubernetes/portal/charts/portal-zookeeper/Chart.yaml b/kubernetes/portal/charts/portal-zookeeper/Chart.yaml
index 4deb608284..fc02f4df58 100644
--- a/kubernetes/portal/charts/portal-zookeeper/Chart.yaml
+++ b/kubernetes/portal/charts/portal-zookeeper/Chart.yaml
@@ -16,4 +16,4 @@
apiVersion: v1
description: Zookeeper for ONAP Portal
name: portal-zookeeper
-version: 2.0.0
+version: 3.0.0
diff --git a/kubernetes/portal/charts/portal-zookeeper/templates/deployment.yaml b/kubernetes/portal/charts/portal-zookeeper/templates/deployment.yaml
index 598d5ffe28..73056beaed 100644
--- a/kubernetes/portal/charts/portal-zookeeper/templates/deployment.yaml
+++ b/kubernetes/portal/charts/portal-zookeeper/templates/deployment.yaml
@@ -54,7 +54,7 @@ spec:
name: localtime
readOnly: true
resources:
-{{ toYaml (pluck .Values.flavor .Values.resources| first) | indent 12 }}
+{{ include "common.resources" . | indent 12 }}
{{- if .Values.nodeSelector }}
nodeSelector:
{{ toYaml .Values.nodeSelector | indent 10 }}
diff --git a/kubernetes/portal/charts/portal-zookeeper/values.yaml b/kubernetes/portal/charts/portal-zookeeper/values.yaml
index b8e93c45a7..c7c8030339 100644
--- a/kubernetes/portal/charts/portal-zookeeper/values.yaml
+++ b/kubernetes/portal/charts/portal-zookeeper/values.yaml
@@ -56,7 +56,7 @@ service:
ingress:
enabled: false
-# Resource Limit flavor -By Default using small
+# Resource Limit flavor -By Default using small
flavor: small
# Segregation for Different environment (Small and Large)
resources:
@@ -74,3 +74,4 @@ resources:
requests:
cpu: 500m
memory: 600Mi
+ unlimited: {}
diff --git a/kubernetes/portal/requirements.yaml b/kubernetes/portal/requirements.yaml
index 204a77562f..897df32ce0 100644
--- a/kubernetes/portal/requirements.yaml
+++ b/kubernetes/portal/requirements.yaml
@@ -15,5 +15,5 @@
dependencies:
- name: common
- version: ~2.0.0
+ version: ~3.0.0
repository: '@local'
diff --git a/kubernetes/robot/Chart.yaml b/kubernetes/robot/Chart.yaml
index 46b81dccf7..228ea3d4a4 100644
--- a/kubernetes/robot/Chart.yaml
+++ b/kubernetes/robot/Chart.yaml
@@ -15,4 +15,4 @@
apiVersion: v1
description: A helm Chart for kubernetes-ONAP Robot
name: robot
-version: 2.0.0
+version: 3.0.0
diff --git a/kubernetes/robot/requirements.yaml b/kubernetes/robot/requirements.yaml
index 9b24f824d5..db85323b82 100644
--- a/kubernetes/robot/requirements.yaml
+++ b/kubernetes/robot/requirements.yaml
@@ -14,7 +14,7 @@
dependencies:
- name: common
- version: ~2.0.0
+ version: ~3.0.0
# local reference to common chart, as it is
# a part of this chart's package and will not
# be published independently to a repo (at this point)
diff --git a/kubernetes/robot/resources/config/eteshare/config/vm_properties.py b/kubernetes/robot/resources/config/eteshare/config/vm_properties.py
index cdd319a103..ad74cdf913 100644
--- a/kubernetes/robot/resources/config/eteshare/config/vm_properties.py
+++ b/kubernetes/robot/resources/config/eteshare/config/vm_properties.py
@@ -32,9 +32,9 @@ GLOBAL_INJECTED_EXTERNAL_DNS = "N/A"
GLOBAL_INJECTED_LOG_ELASTICSEARCH_IP_ADDR = "log-es.{{include "common.namespace" .}}"
GLOBAL_INJECTED_LOG_KIBANA_IP_ADDR = "log-kibana.{{include "common.namespace" .}}"
GLOBAL_INJECTED_LOG_LOGSTASH_IP_ADDR = "log-ls-http.{{include "common.namespace" .}}"
-GLOBAL_INJECTED_POMBA_AAI_CONTEXT_BUILDER_IP_ADDR = "pomba-aaictxbuilder-http.{{include "common.namespace" .}}"
-GLOBAL_INJECTED_POMBA_SDC_CONTEXT_BUILDER_IP_ADDR = "pomba-sdcctxbuilder-http.{{include "common.namespace" .}}"
-GLOBAL_INJECTED_POMBA_NETWORK_DISC_CONTEXT_BUILDER_IP_ADDR = "pomba-networkdiscovery-http.{{include "common.namespace" .}}"
+GLOBAL_INJECTED_POMBA_AAI_CONTEXT_BUILDER_IP_ADDR = "pomba-aaictxbuilder.{{include "common.namespace" .}}"
+GLOBAL_INJECTED_POMBA_SDC_CONTEXT_BUILDER_IP_ADDR = "pomba-sdcctxbuilder.{{include "common.namespace" .}}"
+GLOBAL_INJECTED_POMBA_NETWORK_DISC_CONTEXT_BUILDER_IP_ADDR = "pomba-networkdiscoveryctxbuilder.{{include "common.namespace" .}}"
GLOBAL_INJECTED_KEYSTONE = "{{ .Values.openStackKeyStoneUrl }}"
GLOBAL_INJECTED_MR_IP_ADDR = "message-router.{{include "common.namespace" .}}"
GLOBAL_INJECTED_MUSIC_IP_ADDR = "music.{{include "common.namespace" .}}"
@@ -101,9 +101,9 @@ GLOBAL_INJECTED_PROPERTIES = {
"GLOBAL_INJECTED_LOG_KIBANA_IP_ADDR" : "log-kibana.{{include "common.namespace" .}}",
"GLOBAL_INJECTED_LOG_LOGSTASH_IP_ADDR" : "log-ls.{{include "common.namespace" .}}",
"GLOBAL_INJECTED_MR_IP_ADDR" : "message-router.{{include "common.namespace" .}}",
- "GLOBAL_INJECTED_POMBA_AAI_CONTEXT_BUILDER_IP_ADDR" = "pomba-aaictxbuilder-http.{{include "common.namespace" .}}",
- "GLOBAL_INJECTED_POMBA_SDC_CONTEXT_BUILDER_IP_ADDR" = "pomba-sdcctxbuilder-http.{{include "common.namespace" .}}",
- "GLOBAL_INJECTED_POMBA_NETWORK_DISC_CONTEXT_BUILDER_IP_ADDR" = "pomba-networkdiscovery-http.{{include "common.namespace" .}}",
+ "GLOBAL_INJECTED_POMBA_AAI_CONTEXT_BUILDER_IP_ADDR" : "pomba-aaictxbuilder.{{include "common.namespace" .}}",
+ "GLOBAL_INJECTED_POMBA_SDC_CONTEXT_BUILDER_IP_ADDR" : "pomba-sdcctxbuilder.{{include "common.namespace" .}}",
+ "GLOBAL_INJECTED_POMBA_NETWORK_DISC_CONTEXT_BUILDER_IP_ADDR" : "pomba-networkdiscovery.{{include "common.namespace" .}}",
"GLOBAL_INJECTED_MUSIC_IP_ADDR" : "music.{{include "common.namespace" .}}",
"GLOBAL_INJECTED_NBI_IP_ADDR" : "nbi.{{include "common.namespace" .}}",
"GLOBAL_INJECTED_NETWORK" : "{{ .Values.openStackPrivateNetId }}",
diff --git a/kubernetes/robot/templates/deployment.yaml b/kubernetes/robot/templates/deployment.yaml
index 319ef59386..e50620f1d3 100644
--- a/kubernetes/robot/templates/deployment.yaml
+++ b/kubernetes/robot/templates/deployment.yaml
@@ -57,7 +57,7 @@ spec:
- name: robot-logs
mountPath: /share/logs
resources:
-{{ toYaml (pluck .Values.flavor .Values.resources| first) | indent 12 }}
+{{ include "common.resources" . | indent 12 }}
{{- if .Values.nodeSelector }}
nodeSelector:
{{ toYaml .Values.nodeSelector | indent 10 }}
diff --git a/kubernetes/robot/values.yaml b/kubernetes/robot/values.yaml
index 146c0be941..4d320dde76 100755
--- a/kubernetes/robot/values.yaml
+++ b/kubernetes/robot/values.yaml
@@ -84,7 +84,7 @@ nodeSelector: {}
affinity: {}
-# Resource Limit flavor -By Default using small
+# Resource Limit flavor -By Default using small
flavor: small
# Segregation for Different environment (Small and Large)
resources:
@@ -102,6 +102,7 @@ resources:
requests:
cpu: 1000m
memory: 2Gi
+ unlimited: {}
# probe configuration parameters
liveness:
diff --git a/kubernetes/sdc/Chart.yaml b/kubernetes/sdc/Chart.yaml
index 020c8d2f14..e51a7e1399 100644
--- a/kubernetes/sdc/Chart.yaml
+++ b/kubernetes/sdc/Chart.yaml
@@ -16,4 +16,4 @@
apiVersion: v1
description: Service Design and Creation Umbrella Helm charts
name: sdc
-version: 2.0.0
+version: 3.0.0
diff --git a/kubernetes/sdc/charts/sdc-be/Chart.yaml b/kubernetes/sdc/charts/sdc-be/Chart.yaml
index cb18777964..827ad834cb 100644
--- a/kubernetes/sdc/charts/sdc-be/Chart.yaml
+++ b/kubernetes/sdc/charts/sdc-be/Chart.yaml
@@ -16,4 +16,4 @@
apiVersion: v1
description: ONAP Service Design and Creation Backend API
name: sdc-be
-version: 2.0.0
+version: 3.0.0
diff --git a/kubernetes/sdc/charts/sdc-be/templates/deployment.yaml b/kubernetes/sdc/charts/sdc-be/templates/deployment.yaml
index 82a1b43a8b..e3e97816fe 100644
--- a/kubernetes/sdc/charts/sdc-be/templates/deployment.yaml
+++ b/kubernetes/sdc/charts/sdc-be/templates/deployment.yaml
@@ -81,7 +81,7 @@ spec:
initialDelaySeconds: {{ .Values.readiness.initialDelaySeconds }}
periodSeconds: {{ .Values.readiness.periodSeconds }}
resources:
-{{ toYaml (pluck .Values.flavor .Values.resources| first) | indent 12 }}
+{{ include "common.resources" . | indent 12 }}
env:
- name: ENVNAME
value: {{ .Values.global.env.name }}
diff --git a/kubernetes/sdc/charts/sdc-be/values.yaml b/kubernetes/sdc/charts/sdc-be/values.yaml
index 24c71407f6..f262525801 100644
--- a/kubernetes/sdc/charts/sdc-be/values.yaml
+++ b/kubernetes/sdc/charts/sdc-be/values.yaml
@@ -88,3 +88,4 @@ resources:
requests:
cpu: 20m
memory: 2Gi
+ unlimited: {}
diff --git a/kubernetes/sdc/charts/sdc-cs/Chart.yaml b/kubernetes/sdc/charts/sdc-cs/Chart.yaml
index d58c2b5dd0..4c21c9c6b4 100644
--- a/kubernetes/sdc/charts/sdc-cs/Chart.yaml
+++ b/kubernetes/sdc/charts/sdc-cs/Chart.yaml
@@ -16,4 +16,4 @@
apiVersion: v1
description: ONAP Service Design and Creation Cassandra
name: sdc-cs
-version: 2.0.0
+version: 3.0.0
diff --git a/kubernetes/sdc/charts/sdc-cs/templates/deployment.yaml b/kubernetes/sdc/charts/sdc-cs/templates/deployment.yaml
index 5552515c77..4731edfebb 100644
--- a/kubernetes/sdc/charts/sdc-cs/templates/deployment.yaml
+++ b/kubernetes/sdc/charts/sdc-cs/templates/deployment.yaml
@@ -52,7 +52,7 @@ spec:
initialDelaySeconds: {{ .Values.readiness.initialDelaySeconds }}
periodSeconds: {{ .Values.readiness.periodSeconds }}
resources:
-{{ toYaml (pluck .Values.flavor .Values.resources| first) | indent 12 }}
+{{ include "common.resources" . | indent 12 }}
env:
- name: ENVNAME
value: {{ .Values.global.env.name }}
diff --git a/kubernetes/sdc/charts/sdc-cs/values.yaml b/kubernetes/sdc/charts/sdc-cs/values.yaml
index c35617a3f1..949b47f93a 100644
--- a/kubernetes/sdc/charts/sdc-cs/values.yaml
+++ b/kubernetes/sdc/charts/sdc-cs/values.yaml
@@ -111,3 +111,4 @@ resources:
requests:
cpu: 20m
memory: 2Gi
+ unlimited: {}
diff --git a/kubernetes/sdc/charts/sdc-es/Chart.yaml b/kubernetes/sdc/charts/sdc-es/Chart.yaml
index d1deff3b5a..cbcfc13f77 100644
--- a/kubernetes/sdc/charts/sdc-es/Chart.yaml
+++ b/kubernetes/sdc/charts/sdc-es/Chart.yaml
@@ -14,4 +14,4 @@
apiVersion: v1
description: ONAP Service Design and Creation Elasticsearch
name: sdc-es
-version: 2.0.0
+version: 3.0.0
diff --git a/kubernetes/sdc/charts/sdc-es/templates/deployment.yaml b/kubernetes/sdc/charts/sdc-es/templates/deployment.yaml
index 9fd394b71e..c3d9600d5b 100644
--- a/kubernetes/sdc/charts/sdc-es/templates/deployment.yaml
+++ b/kubernetes/sdc/charts/sdc-es/templates/deployment.yaml
@@ -53,7 +53,7 @@ spec:
initialDelaySeconds: {{ .Values.readiness.initialDelaySeconds }}
periodSeconds: {{ .Values.readiness.periodSeconds }}
resources:
-{{ toYaml (pluck .Values.flavor .Values.resources| first) | indent 12 }}
+{{ include "common.resources" . | indent 12 }}
env:
- name: ENVNAME
value: {{ .Values.global.env.name }}
diff --git a/kubernetes/sdc/charts/sdc-es/values.yaml b/kubernetes/sdc/charts/sdc-es/values.yaml
index f0beda9e5c..763fa40865 100644
--- a/kubernetes/sdc/charts/sdc-es/values.yaml
+++ b/kubernetes/sdc/charts/sdc-es/values.yaml
@@ -115,4 +115,5 @@ resources:
requests:
cpu: 20m
memory: 2Gi
+ unlimited: {}
diff --git a/kubernetes/sdc/charts/sdc-fe/Chart.yaml b/kubernetes/sdc/charts/sdc-fe/Chart.yaml
index c1e05bbca0..b8cef2b9d3 100644
--- a/kubernetes/sdc/charts/sdc-fe/Chart.yaml
+++ b/kubernetes/sdc/charts/sdc-fe/Chart.yaml
@@ -16,4 +16,4 @@
apiVersion: v1
description: ONAP Service Design and Creation Front End
name: sdc-fe
-version: 2.0.0
+version: 3.0.0
diff --git a/kubernetes/sdc/charts/sdc-fe/templates/deployment.yaml b/kubernetes/sdc/charts/sdc-fe/templates/deployment.yaml
index 7544d46a4f..9a342638ce 100644
--- a/kubernetes/sdc/charts/sdc-fe/templates/deployment.yaml
+++ b/kubernetes/sdc/charts/sdc-fe/templates/deployment.yaml
@@ -80,7 +80,7 @@ spec:
initialDelaySeconds: {{ .Values.readiness.initialDelaySeconds }}
periodSeconds: {{ .Values.readiness.periodSeconds }}
resources:
-{{ toYaml (pluck .Values.flavor .Values.resources| first) | indent 12 }}
+{{ include "common.resources" . | indent 12 }}
env:
- name: ENVNAME
value: {{ .Values.global.env.name }}
diff --git a/kubernetes/sdc/charts/sdc-fe/values.yaml b/kubernetes/sdc/charts/sdc-fe/values.yaml
index 38efb2714f..df3d689e61 100644
--- a/kubernetes/sdc/charts/sdc-fe/values.yaml
+++ b/kubernetes/sdc/charts/sdc-fe/values.yaml
@@ -88,3 +88,4 @@ resources:
requests:
cpu: 20m
memory: 2Gi
+ unlimited: {}
diff --git a/kubernetes/sdc/charts/sdc-kb/Chart.yaml b/kubernetes/sdc/charts/sdc-kb/Chart.yaml
index 99e0678ad9..db4a4629d6 100644
--- a/kubernetes/sdc/charts/sdc-kb/Chart.yaml
+++ b/kubernetes/sdc/charts/sdc-kb/Chart.yaml
@@ -16,4 +16,4 @@
apiVersion: v1
description: ONAP Service Design and Creation Kibana
name: sdc-kb
-version: 2.0.0
+version: 3.0.0
diff --git a/kubernetes/sdc/charts/sdc-kb/templates/deployment.yaml b/kubernetes/sdc/charts/sdc-kb/templates/deployment.yaml
index 397f7072d6..ef279782f5 100644
--- a/kubernetes/sdc/charts/sdc-kb/templates/deployment.yaml
+++ b/kubernetes/sdc/charts/sdc-kb/templates/deployment.yaml
@@ -65,7 +65,7 @@ spec:
initialDelaySeconds: {{ .Values.readiness.initialDelaySeconds }}
periodSeconds: {{ .Values.readiness.periodSeconds }}
resources:
-{{ toYaml (pluck .Values.flavor .Values.resources| first) | indent 12 }}
+{{ include "common.resources" . | indent 12 }}
env:
- name: ENVNAME
value: {{ .Values.global.env.name }}
diff --git a/kubernetes/sdc/charts/sdc-kb/values.yaml b/kubernetes/sdc/charts/sdc-kb/values.yaml
index 15bb72ce1c..541ab99d56 100644
--- a/kubernetes/sdc/charts/sdc-kb/values.yaml
+++ b/kubernetes/sdc/charts/sdc-kb/values.yaml
@@ -86,3 +86,4 @@ resources:
requests:
cpu: 20m
memory: 2Gi
+ unlimited: {}
diff --git a/kubernetes/sdc/charts/sdc-onboarding-be/Chart.yaml b/kubernetes/sdc/charts/sdc-onboarding-be/Chart.yaml
index 55477aee45..59a5672985 100644
--- a/kubernetes/sdc/charts/sdc-onboarding-be/Chart.yaml
+++ b/kubernetes/sdc/charts/sdc-onboarding-be/Chart.yaml
@@ -16,4 +16,4 @@
apiVersion: v1
description: ONAP Service Design and Creation Onboarding API
name: sdc-onboarding-be
-version: 2.0.0
+version: 3.0.0
diff --git a/kubernetes/sdc/charts/sdc-onboarding-be/templates/deployment.yaml b/kubernetes/sdc/charts/sdc-onboarding-be/templates/deployment.yaml
index bc34246ce8..ee5f78b3a4 100644
--- a/kubernetes/sdc/charts/sdc-onboarding-be/templates/deployment.yaml
+++ b/kubernetes/sdc/charts/sdc-onboarding-be/templates/deployment.yaml
@@ -67,7 +67,7 @@ spec:
initialDelaySeconds: {{ .Values.readiness.initialDelaySeconds }}
periodSeconds: {{ .Values.readiness.periodSeconds }}
resources:
-{{ toYaml (pluck .Values.flavor .Values.resources| first) | indent 12 }}
+{{ include "common.resources" . | indent 12 }}
env:
- name: ENVNAME
value: {{ .Values.global.env.name }}
diff --git a/kubernetes/sdc/charts/sdc-onboarding-be/values.yaml b/kubernetes/sdc/charts/sdc-onboarding-be/values.yaml
index a1a141189e..f5f7c3a77f 100644
--- a/kubernetes/sdc/charts/sdc-onboarding-be/values.yaml
+++ b/kubernetes/sdc/charts/sdc-onboarding-be/values.yaml
@@ -111,3 +111,4 @@ resources:
requests:
cpu: 20m
memory: 2Gi
+ unlimited: {} \ No newline at end of file
diff --git a/kubernetes/sdc/charts/sdc-wfd-be/Chart.yaml b/kubernetes/sdc/charts/sdc-wfd-be/Chart.yaml
index 0de4faaeb4..dffba5aa99 100644
--- a/kubernetes/sdc/charts/sdc-wfd-be/Chart.yaml
+++ b/kubernetes/sdc/charts/sdc-wfd-be/Chart.yaml
@@ -15,4 +15,4 @@
apiVersion: v1
description: ONAP Service Design and Creation Workflow Designer backend
name: sdc-wfd-be
-version: 2.0.0 \ No newline at end of file
+version: 3.0.0 \ No newline at end of file
diff --git a/kubernetes/sdc/charts/sdc-wfd-fe/Chart.yaml b/kubernetes/sdc/charts/sdc-wfd-fe/Chart.yaml
index 60dd6c2ae8..8498477aaa 100644
--- a/kubernetes/sdc/charts/sdc-wfd-fe/Chart.yaml
+++ b/kubernetes/sdc/charts/sdc-wfd-fe/Chart.yaml
@@ -15,4 +15,4 @@
apiVersion: v1
description: ONAP Service Design and Creation Workflow Designer frontend
name: sdc-wfd-fe
-version: 2.0.0 \ No newline at end of file
+version: 3.0.0 \ No newline at end of file
diff --git a/kubernetes/sdc/charts/sdc-wfd-fe/templates/deployment.yaml b/kubernetes/sdc/charts/sdc-wfd-fe/templates/deployment.yaml
index 0dfc61afb5..c284f2dfd0 100644
--- a/kubernetes/sdc/charts/sdc-wfd-fe/templates/deployment.yaml
+++ b/kubernetes/sdc/charts/sdc-wfd-fe/templates/deployment.yaml
@@ -75,7 +75,7 @@ spec:
mountPath: /etc/localtime
readOnly: true
resources:
-{{ toYaml .Values.resources | indent 12 }}
+{{ include "common.resources" . | indent 12 }}
{{- if .Values.nodeSelector }}
nodeSelector:
{{ toYaml .Values.nodeSelector | indent 10 }}
diff --git a/kubernetes/sdc/requirements.yaml b/kubernetes/sdc/requirements.yaml
index 2a8452d6b6..849843d31c 100644
--- a/kubernetes/sdc/requirements.yaml
+++ b/kubernetes/sdc/requirements.yaml
@@ -15,5 +15,5 @@
dependencies:
- name: common
- version: ~2.0.0
+ version: ~3.0.0
repository: '@local'
diff --git a/kubernetes/sdnc/Chart.yaml b/kubernetes/sdnc/Chart.yaml
index fe27426f13..6d12ea7f73 100644
--- a/kubernetes/sdnc/Chart.yaml
+++ b/kubernetes/sdnc/Chart.yaml
@@ -15,4 +15,4 @@
apiVersion: v1
description: SDN Controller
name: sdnc
-version: 2.0.0
+version: 3.0.0
diff --git a/kubernetes/sdnc/charts/dmaap-listener/Chart.yaml b/kubernetes/sdnc/charts/dmaap-listener/Chart.yaml
index ba2e574d06..866a8d4280 100644
--- a/kubernetes/sdnc/charts/dmaap-listener/Chart.yaml
+++ b/kubernetes/sdnc/charts/dmaap-listener/Chart.yaml
@@ -15,4 +15,4 @@
apiVersion: v1
description: SDNC DMaaP Listener
name: dmaap-listener
-version: 2.0.0 \ No newline at end of file
+version: 3.0.0 \ No newline at end of file
diff --git a/kubernetes/sdnc/charts/dmaap-listener/requirements.yaml b/kubernetes/sdnc/charts/dmaap-listener/requirements.yaml
index ce82a2f838..9f23fac6f8 100644
--- a/kubernetes/sdnc/charts/dmaap-listener/requirements.yaml
+++ b/kubernetes/sdnc/charts/dmaap-listener/requirements.yaml
@@ -14,5 +14,5 @@
dependencies:
- name: common
- version: ~2.0.0
+ version: ~3.0.0
repository: '@local'
diff --git a/kubernetes/sdnc/charts/dmaap-listener/templates/deployment.yaml b/kubernetes/sdnc/charts/dmaap-listener/templates/deployment.yaml
index d69d67dfc4..7a5b1f217c 100644
--- a/kubernetes/sdnc/charts/dmaap-listener/templates/deployment.yaml
+++ b/kubernetes/sdnc/charts/dmaap-listener/templates/deployment.yaml
@@ -77,7 +77,7 @@ spec:
name: properties
subPath: aai.properties
resources:
-{{ toYaml (pluck .Values.flavor .Values.resources| first) | indent 12 }}
+{{ include "common.resources" . | indent 12 }}
{{- if .Values.nodeSelector }}
nodeSelector:
{{ toYaml .Values.nodeSelector | indent 10 }}
diff --git a/kubernetes/sdnc/charts/dmaap-listener/values.yaml b/kubernetes/sdnc/charts/dmaap-listener/values.yaml
index 2520fb1fc0..a0ac529426 100644
--- a/kubernetes/sdnc/charts/dmaap-listener/values.yaml
+++ b/kubernetes/sdnc/charts/dmaap-listener/values.yaml
@@ -90,4 +90,5 @@ resources:
memory: 4Gi
requests:
cpu: 1
- memory: 2Gi \ No newline at end of file
+ memory: 2Gi
+ unlimited: {} \ No newline at end of file
diff --git a/kubernetes/sdnc/charts/sdnc-ansible-server/Chart.yaml b/kubernetes/sdnc/charts/sdnc-ansible-server/Chart.yaml
index 82b9fc5f89..013131d44d 100644
--- a/kubernetes/sdnc/charts/sdnc-ansible-server/Chart.yaml
+++ b/kubernetes/sdnc/charts/sdnc-ansible-server/Chart.yaml
@@ -15,4 +15,4 @@
apiVersion: v1
description: SDN-C Ansible Server
name: sdnc-ansible-server
-version: 2.0.0 \ No newline at end of file
+version: 3.0.0 \ No newline at end of file
diff --git a/kubernetes/sdnc/charts/sdnc-ansible-server/requirements.yaml b/kubernetes/sdnc/charts/sdnc-ansible-server/requirements.yaml
index 1e8f788318..896eaf4baa 100644
--- a/kubernetes/sdnc/charts/sdnc-ansible-server/requirements.yaml
+++ b/kubernetes/sdnc/charts/sdnc-ansible-server/requirements.yaml
@@ -14,5 +14,5 @@
dependencies:
- name: common
- version: ~2.0.0
+ version: ~3.0.0
repository: '@local' \ No newline at end of file
diff --git a/kubernetes/sdnc/charts/sdnc-ansible-server/templates/deployment.yaml b/kubernetes/sdnc/charts/sdnc-ansible-server/templates/deployment.yaml
index fe9d302e17..55c381102f 100644
--- a/kubernetes/sdnc/charts/sdnc-ansible-server/templates/deployment.yaml
+++ b/kubernetes/sdnc/charts/sdnc-ansible-server/templates/deployment.yaml
@@ -75,7 +75,7 @@ spec:
name: config
subPath: RestServer_config
resources:
-{{ toYaml (pluck .Values.flavor .Values.resources| first) | indent 12 }}
+{{ include "common.resources" . | indent 12 }}
{{- if .Values.nodeSelector }}
nodeSelector:
{{ toYaml .Values.nodeSelector | indent 10 }}
diff --git a/kubernetes/sdnc/charts/sdnc-ansible-server/values.yaml b/kubernetes/sdnc/charts/sdnc-ansible-server/values.yaml
index 04eca00052..d8e828742d 100644
--- a/kubernetes/sdnc/charts/sdnc-ansible-server/values.yaml
+++ b/kubernetes/sdnc/charts/sdnc-ansible-server/values.yaml
@@ -89,3 +89,4 @@ resources:
requests:
cpu: 1
memory: 1Gi
+ unlimited: {}
diff --git a/kubernetes/sdnc/charts/sdnc-portal/Chart.yaml b/kubernetes/sdnc/charts/sdnc-portal/Chart.yaml
index 193c38ffce..1484ec5191 100644
--- a/kubernetes/sdnc/charts/sdnc-portal/Chart.yaml
+++ b/kubernetes/sdnc/charts/sdnc-portal/Chart.yaml
@@ -15,4 +15,4 @@
apiVersion: v1
description: SDN-C Admin Portal
name: sdnc-portal
-version: 2.0.0 \ No newline at end of file
+version: 3.0.0 \ No newline at end of file
diff --git a/kubernetes/sdnc/charts/sdnc-portal/requirements.yaml b/kubernetes/sdnc/charts/sdnc-portal/requirements.yaml
index 1e8f788318..896eaf4baa 100644
--- a/kubernetes/sdnc/charts/sdnc-portal/requirements.yaml
+++ b/kubernetes/sdnc/charts/sdnc-portal/requirements.yaml
@@ -14,5 +14,5 @@
dependencies:
- name: common
- version: ~2.0.0
+ version: ~3.0.0
repository: '@local' \ No newline at end of file
diff --git a/kubernetes/sdnc/charts/sdnc-portal/templates/deployment.yaml b/kubernetes/sdnc/charts/sdnc-portal/templates/deployment.yaml
index aba6870908..35dffee552 100644
--- a/kubernetes/sdnc/charts/sdnc-portal/templates/deployment.yaml
+++ b/kubernetes/sdnc/charts/sdnc-portal/templates/deployment.yaml
@@ -97,7 +97,7 @@ spec:
name: properties
subPath: svclogic.properties.sdnctldb02
resources:
-{{ toYaml (pluck .Values.flavor .Values.resources| first) | indent 12 }}
+{{ include "common.resources" . | indent 12 }}
{{- if .Values.nodeSelector }}
nodeSelector:
{{ toYaml .Values.nodeSelector | indent 10 }}
diff --git a/kubernetes/sdnc/charts/sdnc-portal/values.yaml b/kubernetes/sdnc/charts/sdnc-portal/values.yaml
index 1fba2a16ea..1d56d84c15 100644
--- a/kubernetes/sdnc/charts/sdnc-portal/values.yaml
+++ b/kubernetes/sdnc/charts/sdnc-portal/values.yaml
@@ -96,3 +96,4 @@ resources:
requests:
cpu: 1
memory: 1Gi
+ unlimited: {}
diff --git a/kubernetes/sdnc/charts/ueb-listener/Chart.yaml b/kubernetes/sdnc/charts/ueb-listener/Chart.yaml
index 35b2a2e9c3..ee5c7f91e2 100644
--- a/kubernetes/sdnc/charts/ueb-listener/Chart.yaml
+++ b/kubernetes/sdnc/charts/ueb-listener/Chart.yaml
@@ -15,4 +15,4 @@
apiVersion: v1
description: SDNC UEB Listener
name: ueb-listener
-version: 2.0.0 \ No newline at end of file
+version: 3.0.0 \ No newline at end of file
diff --git a/kubernetes/sdnc/charts/ueb-listener/requirements.yaml b/kubernetes/sdnc/charts/ueb-listener/requirements.yaml
index ce82a2f838..9f23fac6f8 100644
--- a/kubernetes/sdnc/charts/ueb-listener/requirements.yaml
+++ b/kubernetes/sdnc/charts/ueb-listener/requirements.yaml
@@ -14,5 +14,5 @@
dependencies:
- name: common
- version: ~2.0.0
+ version: ~3.0.0
repository: '@local'
diff --git a/kubernetes/sdnc/charts/ueb-listener/templates/deployment.yaml b/kubernetes/sdnc/charts/ueb-listener/templates/deployment.yaml
index 2258d4ab94..1c5f9179c0 100644
--- a/kubernetes/sdnc/charts/ueb-listener/templates/deployment.yaml
+++ b/kubernetes/sdnc/charts/ueb-listener/templates/deployment.yaml
@@ -73,7 +73,7 @@ spec:
name: properties
subPath: ueb-listener.properties
resources:
-{{ toYaml (pluck .Values.flavor .Values.resources| first) | indent 12 }}
+{{ include "common.resources" . | indent 12 }}
{{- if .Values.nodeSelector }}
nodeSelector:
{{ toYaml .Values.nodeSelector | indent 10 }}
diff --git a/kubernetes/sdnc/charts/ueb-listener/values.yaml b/kubernetes/sdnc/charts/ueb-listener/values.yaml
index c1dafbcd76..35602161d8 100644
--- a/kubernetes/sdnc/charts/ueb-listener/values.yaml
+++ b/kubernetes/sdnc/charts/ueb-listener/values.yaml
@@ -92,3 +92,4 @@ resources:
requests:
cpu: 1
memory: 2Gi
+ unlimited: {}
diff --git a/kubernetes/sdnc/requirements.yaml b/kubernetes/sdnc/requirements.yaml
index f2be094d1c..8c16310ce0 100644
--- a/kubernetes/sdnc/requirements.yaml
+++ b/kubernetes/sdnc/requirements.yaml
@@ -14,18 +14,21 @@
dependencies:
- name: common
- version: ~2.0.0
+ version: ~3.0.0
repository: '@local'
- name: controller-blueprints
version: ~3.0.0
repository: '@local'
- name: mysql
- version: ~2.0.0
+ version: ~3.0.0
+ repository: '@local'
+ - name: network-name-gen
+ version: ~3.0.0
repository: '@local'
- name: dgbuilder
- version: ~2.0.0
+ version: ~3.0.0
repository: '@local'
- name: sdnc-prom
- version: ~2.0.0
+ version: ~3.0.0
repository: '@local'
condition: config.geoEnabled
diff --git a/kubernetes/sdnc/resources/config/conf/aaiclient.properties b/kubernetes/sdnc/resources/config/conf/aaiclient.properties
index c925bfd07f..035942b304 100755
--- a/kubernetes/sdnc/resources/config/conf/aaiclient.properties
+++ b/kubernetes/sdnc/resources/config/conf/aaiclient.properties
@@ -30,8 +30,8 @@ org.onap.ccsdk.sli.adaptors.aai.ssl.trust=/opt/onap/sdnc/data/stores/truststoreO
org.onap.ccsdk.sli.adaptors.aai.ssl.trust.psswd=changeit
org.onap.ccsdk.sli.adaptors.aai.host.certificate.ignore=true
-org.onap.ccsdk.sli.adaptors.aai.client.name=SDNC
-org.onap.ccsdk.sli.adaptors.aai.client.psswd=SDNC
+org.onap.ccsdk.sli.adaptors.aai.client.name=sdnc@sdnc.onap.org
+org.onap.ccsdk.sli.adaptors.aai.client.psswd=demo123456!
org.onap.ccsdk.sli.adaptors.aai.application=openECOMP
#
diff --git a/kubernetes/sdnc/sdnc-prom/Chart.yaml b/kubernetes/sdnc/sdnc-prom/Chart.yaml
index 3c678e2b92..d4e5daa03b 100644
--- a/kubernetes/sdnc/sdnc-prom/Chart.yaml
+++ b/kubernetes/sdnc/sdnc-prom/Chart.yaml
@@ -15,4 +15,4 @@
apiVersion: v1
description: ONAP SDNC Policy Driven Ownership Management
name: sdnc-prom
-version: 2.0.0
+version: 3.0.0
diff --git a/kubernetes/sdnc/sdnc-prom/requirements.yaml b/kubernetes/sdnc/sdnc-prom/requirements.yaml
index 37545fe2e0..cf4086962c 100644
--- a/kubernetes/sdnc/sdnc-prom/requirements.yaml
+++ b/kubernetes/sdnc/sdnc-prom/requirements.yaml
@@ -14,5 +14,5 @@
dependencies:
- name: common
- version: ~2.0.0
+ version: ~3.0.0
repository: '@local'
diff --git a/kubernetes/sdnc/sdnc-prom/templates/deployment.yaml b/kubernetes/sdnc/sdnc-prom/templates/deployment.yaml
index 76f722c65f..d457bd8f98 100644
--- a/kubernetes/sdnc/sdnc-prom/templates/deployment.yaml
+++ b/kubernetes/sdnc/sdnc-prom/templates/deployment.yaml
@@ -68,7 +68,7 @@ spec:
mountPath: /app/config/coredns
resources:
-{{ toYaml .Values.resources | indent 12 }}
+{{ include "common.resources" . | indent 12 }}
{{- if .Values.nodeSelector }}
nodeSelector:
{{ toYaml .Values.nodeSelector | indent 10 }}
diff --git a/kubernetes/sdnc/templates/statefulset.yaml b/kubernetes/sdnc/templates/statefulset.yaml
index 784bc6982f..32d98840f7 100644
--- a/kubernetes/sdnc/templates/statefulset.yaml
+++ b/kubernetes/sdnc/templates/statefulset.yaml
@@ -134,7 +134,7 @@ spec:
- mountPath: /var/log/onap
name: logs
resources:
-{{ toYaml (pluck .Values.flavor .Values.resources| first) | indent 12 }}
+{{ include "common.resources" . | indent 12 }}
{{- if .Values.nodeSelector }}
nodeSelector:
{{ toYaml .Values.nodeSelector | indent 10 }}
diff --git a/kubernetes/sdnc/values.yaml b/kubernetes/sdnc/values.yaml
index 800cd0d1b8..8560166ef6 100644
--- a/kubernetes/sdnc/values.yaml
+++ b/kubernetes/sdnc/values.yaml
@@ -216,3 +216,4 @@ resources:
requests:
cpu: 2
memory: 4Gi
+ unlimited: {}
diff --git a/kubernetes/sniro-emulator/Chart.yaml b/kubernetes/sniro-emulator/Chart.yaml
index 8916167b7e..6cbeb319d5 100644
--- a/kubernetes/sniro-emulator/Chart.yaml
+++ b/kubernetes/sniro-emulator/Chart.yaml
@@ -15,4 +15,4 @@
apiVersion: v1
description: ONAP Mock Sniro Emulator
name: sniro-emulator
-version: 2.0.0
+version: 3.0.0
diff --git a/kubernetes/sniro-emulator/requirements.yaml b/kubernetes/sniro-emulator/requirements.yaml
index f639633537..f3e793cfbb 100644
--- a/kubernetes/sniro-emulator/requirements.yaml
+++ b/kubernetes/sniro-emulator/requirements.yaml
@@ -14,7 +14,7 @@
dependencies:
- name: common
- version: ~2.0.0
+ version: ~3.0.0
# local reference to common chart, as it is
# a part of this chart's package and will not
# be published independently to a repo (at this point)
diff --git a/kubernetes/sniro-emulator/templates/deployment.yaml b/kubernetes/sniro-emulator/templates/deployment.yaml
index da5266a1ca..2b0eaec1b6 100644
--- a/kubernetes/sniro-emulator/templates/deployment.yaml
+++ b/kubernetes/sniro-emulator/templates/deployment.yaml
@@ -49,7 +49,7 @@ spec:
initialDelaySeconds: {{ .Values.readiness.initialDelaySeconds }}
periodSeconds: {{ .Values.readiness.periodSeconds }}
resources:
-{{ toYaml .Values.resources | indent 12 }}
+{{ include "common.resources" . | indent 12 }}
{{- if .Values.nodeSelector }}
nodeSelector:
{{ toYaml .Values.nodeSelector | indent 10 }}
diff --git a/kubernetes/so/Chart.yaml b/kubernetes/so/Chart.yaml
index dcd4eb5c43..b8c92cb21a 100755
--- a/kubernetes/so/Chart.yaml
+++ b/kubernetes/so/Chart.yaml
@@ -14,4 +14,4 @@
apiVersion: v1
description: ONAP Service Orchestrator
name: so
-version: 2.0.0 \ No newline at end of file
+version: 3.0.0 \ No newline at end of file
diff --git a/kubernetes/so/charts/so-bpmn-infra/Chart.yaml b/kubernetes/so/charts/so-bpmn-infra/Chart.yaml
index 6feed26418..1de4161d41 100755
--- a/kubernetes/so/charts/so-bpmn-infra/Chart.yaml
+++ b/kubernetes/so/charts/so-bpmn-infra/Chart.yaml
@@ -15,4 +15,4 @@ apiVersion: v1
appVersion: "1.0"
description: A Helm chart for Kubernetes
name: so-bpmn-infra
-version: 2.0.0 \ No newline at end of file
+version: 3.0.0 \ No newline at end of file
diff --git a/kubernetes/so/charts/so-bpmn-infra/templates/deployment.yaml b/kubernetes/so/charts/so-bpmn-infra/templates/deployment.yaml
index 43ca1d9864..20068a8edd 100755
--- a/kubernetes/so/charts/so-bpmn-infra/templates/deployment.yaml
+++ b/kubernetes/so/charts/so-bpmn-infra/templates/deployment.yaml
@@ -38,7 +38,7 @@ spec:
- name: {{ include "common.name" . }}
image: {{ include "common.repository" . }}/{{ .Values.image }}
resources:
-{{ toYaml (pluck .Values.flavor .Values.resources| first) | indent 12 }}
+{{ include "common.resources" . | indent 12 }}
env:
- name: DB_HOST
valueFrom:
diff --git a/kubernetes/so/charts/so-bpmn-infra/values.yaml b/kubernetes/so/charts/so-bpmn-infra/values.yaml
index fd7451ece7..6f301b9774 100755
--- a/kubernetes/so/charts/so-bpmn-infra/values.yaml
+++ b/kubernetes/so/charts/so-bpmn-infra/values.yaml
@@ -46,6 +46,7 @@ resources:
requests:
memory: 2Gi
cpu: 1000m
+ unlimited: {}
livenessProbe:
path: /manage/health
scheme: HTTP
diff --git a/kubernetes/so/charts/so-catalog-db-adapter/Chart.yaml b/kubernetes/so/charts/so-catalog-db-adapter/Chart.yaml
index 75a61264ed..8fd7b921c7 100755
--- a/kubernetes/so/charts/so-catalog-db-adapter/Chart.yaml
+++ b/kubernetes/so/charts/so-catalog-db-adapter/Chart.yaml
@@ -14,4 +14,4 @@
apiVersion: v1
description: A Helm chart for so-catalog-db-adapter
name: so-catalog-db-adapter
-version: 2.0.0 \ No newline at end of file
+version: 3.0.0 \ No newline at end of file
diff --git a/kubernetes/so/charts/so-catalog-db-adapter/templates/deployment.yaml b/kubernetes/so/charts/so-catalog-db-adapter/templates/deployment.yaml
index 43ca1d9864..20068a8edd 100755
--- a/kubernetes/so/charts/so-catalog-db-adapter/templates/deployment.yaml
+++ b/kubernetes/so/charts/so-catalog-db-adapter/templates/deployment.yaml
@@ -38,7 +38,7 @@ spec:
- name: {{ include "common.name" . }}
image: {{ include "common.repository" . }}/{{ .Values.image }}
resources:
-{{ toYaml (pluck .Values.flavor .Values.resources| first) | indent 12 }}
+{{ include "common.resources" . | indent 12 }}
env:
- name: DB_HOST
valueFrom:
diff --git a/kubernetes/so/charts/so-catalog-db-adapter/values.yaml b/kubernetes/so/charts/so-catalog-db-adapter/values.yaml
index 9eccf4bacb..2083633599 100755
--- a/kubernetes/so/charts/so-catalog-db-adapter/values.yaml
+++ b/kubernetes/so/charts/so-catalog-db-adapter/values.yaml
@@ -1,62 +1,63 @@
-# Copyright © 2018 AT&T USA
-#
-# 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.
-repository: nexus3.onap.org:10001
+# Copyright © 2018 AT&T USA
+#
+# 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.
+repository: nexus3.onap.org:10001
image: onap/so/catalog-db-adapter:1.3.0-STAGING-latest
-pullPolicy: IfNotPresent
-replicaCount: 1
-minReadySeconds: 10
-containerPort: 8082
-logPath: ./logs/catdb/
-app: catalog-db-adapter
-service:
- type: ClusterIP
- internalPort: 8082
- externalPort: 8082
- portName: so-catdb-port
-updateStrategy:
- type: RollingUpdate
- maxUnavailable: 1
- maxSurge: 1
-# Resource Limit flavor -By Default using small
-flavor: small
-# Segregation for Different environment (Small and Large)
-resources:
- small:
- limits:
- memory: 4Gi
- cpu: 2000m
- requests:
- memory: 1Gi
- cpu: 500m
- large:
- limits:
- memory: 8Gi
- cpu: 4000m
- requests:
- memory: 2Gi
- cpu: 1000m
-livenessProbe:
- path: /manage/health
- port: 8082
- scheme: HTTP
- initialDelaySeconds: 600
- periodSeconds: 60
- timeoutSeconds: 10
- successThreshold: 1
- failureThreshold: 3
-ingress:
- enabled: false
-nodeSelector: {}
-tolerations: []
-affinity: {}
+pullPolicy: IfNotPresent
+replicaCount: 1
+minReadySeconds: 10
+containerPort: 8082
+logPath: ./logs/catdb/
+app: catalog-db-adapter
+service:
+ type: ClusterIP
+ internalPort: 8082
+ externalPort: 8082
+ portName: so-catdb-port
+updateStrategy:
+ type: RollingUpdate
+ maxUnavailable: 1
+ maxSurge: 1
+# Resource Limit flavor -By Default using small
+flavor: small
+# Segregation for Different environment (Small and Large)
+resources:
+ small:
+ limits:
+ memory: 4Gi
+ cpu: 2000m
+ requests:
+ memory: 1Gi
+ cpu: 500m
+ large:
+ limits:
+ memory: 8Gi
+ cpu: 4000m
+ requests:
+ memory: 2Gi
+ cpu: 1000m
+ unlimited: {}
+livenessProbe:
+ path: /manage/health
+ port: 8082
+ scheme: HTTP
+ initialDelaySeconds: 600
+ periodSeconds: 60
+ timeoutSeconds: 10
+ successThreshold: 1
+ failureThreshold: 3
+ingress:
+ enabled: false
+nodeSelector: {}
+tolerations: []
+affinity: {}
diff --git a/kubernetes/so/charts/so-db-secrets/Chart.yaml b/kubernetes/so/charts/so-db-secrets/Chart.yaml
index f9470e23a1..449976b94a 100755
--- a/kubernetes/so/charts/so-db-secrets/Chart.yaml
+++ b/kubernetes/so/charts/so-db-secrets/Chart.yaml
@@ -14,4 +14,4 @@
apiVersion: v1
description: A Helm chart for DB secrets
name: so-db-secrets
-version: 2.0.0 \ No newline at end of file
+version: 3.0.0 \ No newline at end of file
diff --git a/kubernetes/so/charts/so-mariadb/Chart.yaml b/kubernetes/so/charts/so-mariadb/Chart.yaml
index 789280a92d..800b660fd6 100755
--- a/kubernetes/so/charts/so-mariadb/Chart.yaml
+++ b/kubernetes/so/charts/so-mariadb/Chart.yaml
@@ -14,4 +14,4 @@
apiVersion: v1
description: MariaDB Service
name: so-mariadb
-version: 2.0.0 \ No newline at end of file
+version: 3.0.0 \ No newline at end of file
diff --git a/kubernetes/so/charts/so-mariadb/templates/deployment.yaml b/kubernetes/so/charts/so-mariadb/templates/deployment.yaml
index 07feb4aba2..6c7b85fbc8 100755
--- a/kubernetes/so/charts/so-mariadb/templates/deployment.yaml
+++ b/kubernetes/so/charts/so-mariadb/templates/deployment.yaml
@@ -81,7 +81,7 @@ spec:
- name: docker-entrypoint-initdb-d
mountPath: "/docker-entrypoint-initdb.d"
resources:
-{{ toYaml (pluck .Values.flavor .Values.resources| first) | indent 12 }}
+{{ include "common.resources" . | indent 12 }}
{{- if .Values.nodeSelector }}
nodeSelector:
{{ toYaml .Values.nodeSelector | indent 10 }}
diff --git a/kubernetes/so/charts/so-mariadb/values.yaml b/kubernetes/so/charts/so-mariadb/values.yaml
index 427257df96..954589967c 100755
--- a/kubernetes/so/charts/so-mariadb/values.yaml
+++ b/kubernetes/so/charts/so-mariadb/values.yaml
@@ -89,3 +89,4 @@ resources:
requests:
cpu: 2
memory: 4Gi
+ unlimited: {}
diff --git a/kubernetes/so/charts/so-openstack-adapter/Chart.yaml b/kubernetes/so/charts/so-openstack-adapter/Chart.yaml
index 5ebc0f7b7b..b34c514969 100755
--- a/kubernetes/so/charts/so-openstack-adapter/Chart.yaml
+++ b/kubernetes/so/charts/so-openstack-adapter/Chart.yaml
@@ -15,4 +15,4 @@ apiVersion: v1
appVersion: "1.0"
description: A Helm chart for Kubernetes
name: so-openstack-adapter
-version: 2.0.0 \ No newline at end of file
+version: 3.0.0 \ No newline at end of file
diff --git a/kubernetes/so/charts/so-openstack-adapter/templates/deployment.yaml b/kubernetes/so/charts/so-openstack-adapter/templates/deployment.yaml
index 43ca1d9864..20068a8edd 100755
--- a/kubernetes/so/charts/so-openstack-adapter/templates/deployment.yaml
+++ b/kubernetes/so/charts/so-openstack-adapter/templates/deployment.yaml
@@ -38,7 +38,7 @@ spec:
- name: {{ include "common.name" . }}
image: {{ include "common.repository" . }}/{{ .Values.image }}
resources:
-{{ toYaml (pluck .Values.flavor .Values.resources| first) | indent 12 }}
+{{ include "common.resources" . | indent 12 }}
env:
- name: DB_HOST
valueFrom:
diff --git a/kubernetes/so/charts/so-openstack-adapter/values.yaml b/kubernetes/so/charts/so-openstack-adapter/values.yaml
index 3883ae0b7a..867e599202 100755
--- a/kubernetes/so/charts/so-openstack-adapter/values.yaml
+++ b/kubernetes/so/charts/so-openstack-adapter/values.yaml
@@ -45,6 +45,7 @@ resources:
requests:
memory: 2Gi
cpu: 1000m
+ unlimited: {}
livenessProbe:
path: /manage/health
port: 8087
diff --git a/kubernetes/so/charts/so-request-db-adapter/Chart.yaml b/kubernetes/so/charts/so-request-db-adapter/Chart.yaml
index 9e7dd05e2a..b03f1ff5b4 100755
--- a/kubernetes/so/charts/so-request-db-adapter/Chart.yaml
+++ b/kubernetes/so/charts/so-request-db-adapter/Chart.yaml
@@ -14,4 +14,4 @@
apiVersion: v1
description: A Helm chart for request-db-adapter
name: so-request-db-adapter
-version: 2.0.0 \ No newline at end of file
+version: 3.0.0 \ No newline at end of file
diff --git a/kubernetes/so/charts/so-request-db-adapter/templates/deployment.yaml b/kubernetes/so/charts/so-request-db-adapter/templates/deployment.yaml
index 43ca1d9864..20068a8edd 100755
--- a/kubernetes/so/charts/so-request-db-adapter/templates/deployment.yaml
+++ b/kubernetes/so/charts/so-request-db-adapter/templates/deployment.yaml
@@ -38,7 +38,7 @@ spec:
- name: {{ include "common.name" . }}
image: {{ include "common.repository" . }}/{{ .Values.image }}
resources:
-{{ toYaml (pluck .Values.flavor .Values.resources| first) | indent 12 }}
+{{ include "common.resources" . | indent 12 }}
env:
- name: DB_HOST
valueFrom:
diff --git a/kubernetes/so/charts/so-request-db-adapter/values.yaml b/kubernetes/so/charts/so-request-db-adapter/values.yaml
index a0f7279ed1..50eb7ba776 100755
--- a/kubernetes/so/charts/so-request-db-adapter/values.yaml
+++ b/kubernetes/so/charts/so-request-db-adapter/values.yaml
@@ -1,61 +1,62 @@
-# Copyright © 2018 AT&T USA
-#
-# 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.
+# Copyright © 2018 AT&T USA
+#
+# 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.
image: onap/so/request-db-adapter:1.3.0-STAGING-latest
-pullPolicy: IfNotPresent
-replicaCount: 1
-minReadySeconds: 10
-containerPort: 8083
-logPath: ./logs/reqdb/
-app: request-db-adapter
-service:
- type: ClusterIP
- internalPort: 8083
- externalPort: 8083
- portName: so-reqdb-port
-updateStrategy:
- type: RollingUpdate
- maxUnavailable: 1
- maxSurge: 1
-# Resource Limit flavor -By Default using small
-flavor: small
-# Segregation for Different environment (Small and Large)
-resources:
- small:
- limits:
- memory: 4Gi
- cpu: 2000m
- requests:
- memory: 1Gi
- cpu: 500m
- large:
- limits:
- memory: 8Gi
- cpu: 4000m
- requests:
- memory: 2Gi
- cpu: 1000m
-livenessProbe:
- path: /manage/health
- port: 8083
- scheme: HTTP
- initialDelaySeconds: 600
- periodSeconds: 60
- timeoutSeconds: 10
- successThreshold: 1
- failureThreshold: 3
-ingress:
- enabled: false
-nodeSelector: {}
-tolerations: []
-affinity: {}
+pullPolicy: IfNotPresent
+replicaCount: 1
+minReadySeconds: 10
+containerPort: 8083
+logPath: ./logs/reqdb/
+app: request-db-adapter
+service:
+ type: ClusterIP
+ internalPort: 8083
+ externalPort: 8083
+ portName: so-reqdb-port
+updateStrategy:
+ type: RollingUpdate
+ maxUnavailable: 1
+ maxSurge: 1
+# Resource Limit flavor -By Default using small
+flavor: small
+# Segregation for Different environment (Small and Large)
+resources:
+ small:
+ limits:
+ memory: 4Gi
+ cpu: 2000m
+ requests:
+ memory: 1Gi
+ cpu: 500m
+ large:
+ limits:
+ memory: 8Gi
+ cpu: 4000m
+ requests:
+ memory: 2Gi
+ cpu: 1000m
+ unlimited: {}
+livenessProbe:
+ path: /manage/health
+ port: 8083
+ scheme: HTTP
+ initialDelaySeconds: 600
+ periodSeconds: 60
+ timeoutSeconds: 10
+ successThreshold: 1
+ failureThreshold: 3
+ingress:
+ enabled: false
+nodeSelector: {}
+tolerations: []
+affinity: {}
diff --git a/kubernetes/so/charts/so-sdc-controller/Chart.yaml b/kubernetes/so/charts/so-sdc-controller/Chart.yaml
index 5c9b234dc4..2d7e66f7f0 100755
--- a/kubernetes/so/charts/so-sdc-controller/Chart.yaml
+++ b/kubernetes/so/charts/so-sdc-controller/Chart.yaml
@@ -15,4 +15,4 @@ apiVersion: v1
appVersion: "1.0"
description: A Helm chart for Kubernetes
name: so-sdc-controller
-version: 2.0.0 \ No newline at end of file
+version: 3.0.0 \ No newline at end of file
diff --git a/kubernetes/so/charts/so-sdc-controller/templates/deployment.yaml b/kubernetes/so/charts/so-sdc-controller/templates/deployment.yaml
index 43ca1d9864..20068a8edd 100755
--- a/kubernetes/so/charts/so-sdc-controller/templates/deployment.yaml
+++ b/kubernetes/so/charts/so-sdc-controller/templates/deployment.yaml
@@ -38,7 +38,7 @@ spec:
- name: {{ include "common.name" . }}
image: {{ include "common.repository" . }}/{{ .Values.image }}
resources:
-{{ toYaml (pluck .Values.flavor .Values.resources| first) | indent 12 }}
+{{ include "common.resources" . | indent 12 }}
env:
- name: DB_HOST
valueFrom:
diff --git a/kubernetes/so/charts/so-sdc-controller/values.yaml b/kubernetes/so/charts/so-sdc-controller/values.yaml
index 50ff616d47..2981a82c0d 100755
--- a/kubernetes/so/charts/so-sdc-controller/values.yaml
+++ b/kubernetes/so/charts/so-sdc-controller/values.yaml
@@ -45,6 +45,7 @@ resources:
requests:
memory: 2Gi
cpu: 1000m
+ unlimited: {}
livenessProbe:
path: /manage/health
port: 8085
diff --git a/kubernetes/so/charts/so-sdnc-adapter/Chart.yaml b/kubernetes/so/charts/so-sdnc-adapter/Chart.yaml
index b437fd337b..4720a10bb0 100755
--- a/kubernetes/so/charts/so-sdnc-adapter/Chart.yaml
+++ b/kubernetes/so/charts/so-sdnc-adapter/Chart.yaml
@@ -15,4 +15,4 @@ apiVersion: v1
appVersion: "1.0"
description: A Helm chart for Kubernetes
name: so-sdnc-adapter
-version: 2.0.0 \ No newline at end of file
+version: 3.0.0 \ No newline at end of file
diff --git a/kubernetes/so/charts/so-sdnc-adapter/templates/deployment.yaml b/kubernetes/so/charts/so-sdnc-adapter/templates/deployment.yaml
index 43ca1d9864..20068a8edd 100755
--- a/kubernetes/so/charts/so-sdnc-adapter/templates/deployment.yaml
+++ b/kubernetes/so/charts/so-sdnc-adapter/templates/deployment.yaml
@@ -38,7 +38,7 @@ spec:
- name: {{ include "common.name" . }}
image: {{ include "common.repository" . }}/{{ .Values.image }}
resources:
-{{ toYaml (pluck .Values.flavor .Values.resources| first) | indent 12 }}
+{{ include "common.resources" . | indent 12 }}
env:
- name: DB_HOST
valueFrom:
diff --git a/kubernetes/so/charts/so-sdnc-adapter/values.yaml b/kubernetes/so/charts/so-sdnc-adapter/values.yaml
index b56c415148..4bab856b98 100755
--- a/kubernetes/so/charts/so-sdnc-adapter/values.yaml
+++ b/kubernetes/so/charts/so-sdnc-adapter/values.yaml
@@ -45,6 +45,7 @@ resources:
requests:
memory: 2Gi
cpu: 1000m
+ unlimited: {}
livenessProbe:
path: /manage/health
port: 8086
diff --git a/kubernetes/so/charts/so-vfc-adapter/Chart.yaml b/kubernetes/so/charts/so-vfc-adapter/Chart.yaml
index 9a6f6a0a50..7c754b4289 100755
--- a/kubernetes/so/charts/so-vfc-adapter/Chart.yaml
+++ b/kubernetes/so/charts/so-vfc-adapter/Chart.yaml
@@ -15,4 +15,4 @@ apiVersion: v1
appVersion: "1.0"
description: A Helm chart for Kubernetes
name: so-vfc-adapter
-version: 2.0.0 \ No newline at end of file
+version: 3.0.0 \ No newline at end of file
diff --git a/kubernetes/so/charts/so-vfc-adapter/templates/deployment.yaml b/kubernetes/so/charts/so-vfc-adapter/templates/deployment.yaml
index 43ca1d9864..20068a8edd 100755
--- a/kubernetes/so/charts/so-vfc-adapter/templates/deployment.yaml
+++ b/kubernetes/so/charts/so-vfc-adapter/templates/deployment.yaml
@@ -38,7 +38,7 @@ spec:
- name: {{ include "common.name" . }}
image: {{ include "common.repository" . }}/{{ .Values.image }}
resources:
-{{ toYaml (pluck .Values.flavor .Values.resources| first) | indent 12 }}
+{{ include "common.resources" . | indent 12 }}
env:
- name: DB_HOST
valueFrom:
diff --git a/kubernetes/so/charts/so-vfc-adapter/values.yaml b/kubernetes/so/charts/so-vfc-adapter/values.yaml
index 0b6f13681f..b0c3b0114e 100755
--- a/kubernetes/so/charts/so-vfc-adapter/values.yaml
+++ b/kubernetes/so/charts/so-vfc-adapter/values.yaml
@@ -45,6 +45,7 @@ resources:
requests:
memory: 2Gi
cpu: 1000m
+ unlimited: {}
livenessProbe:
path: /manage/health
port: 8084
diff --git a/kubernetes/so/requirements.yaml b/kubernetes/so/requirements.yaml
index 2b88f5f7c4..c289225a5d 100755
--- a/kubernetes/so/requirements.yaml
+++ b/kubernetes/so/requirements.yaml
@@ -13,7 +13,7 @@
# limitations under the License.
dependencies:
- name: common
- version: ~2.0.0
+ version: ~3.0.0
# local reference to common chart, as it is
# a part of this chart's package and will not
# be published independently to a repo (at this point)
diff --git a/kubernetes/so/templates/deployment.yaml b/kubernetes/so/templates/deployment.yaml
index 43ca1d9864..20068a8edd 100755
--- a/kubernetes/so/templates/deployment.yaml
+++ b/kubernetes/so/templates/deployment.yaml
@@ -38,7 +38,7 @@ spec:
- name: {{ include "common.name" . }}
image: {{ include "common.repository" . }}/{{ .Values.image }}
resources:
-{{ toYaml (pluck .Values.flavor .Values.resources| first) | indent 12 }}
+{{ include "common.resources" . | indent 12 }}
env:
- name: DB_HOST
valueFrom:
diff --git a/kubernetes/so/values.yaml b/kubernetes/so/values.yaml
index 03154ae521..60d0424e6f 100755
--- a/kubernetes/so/values.yaml
+++ b/kubernetes/so/values.yaml
@@ -46,6 +46,7 @@ resources:
requests:
cpu: 1000m
memory: 2Gi
+ unlimited: {}
livenessProbe:
path: /manage/health
scheme: HTTP
diff --git a/kubernetes/uui/Chart.yaml b/kubernetes/uui/Chart.yaml
index b55d80414f..6a1f879297 100644
--- a/kubernetes/uui/Chart.yaml
+++ b/kubernetes/uui/Chart.yaml
@@ -15,4 +15,4 @@
apiVersion: v1
description: ONAP uui
name: uui
-version: 2.0.0
+version: 3.0.0
diff --git a/kubernetes/uui/charts/uui-server/Chart.yaml b/kubernetes/uui/charts/uui-server/Chart.yaml
index 7bf1143254..bede388887 100644
--- a/kubernetes/uui/charts/uui-server/Chart.yaml
+++ b/kubernetes/uui/charts/uui-server/Chart.yaml
@@ -15,4 +15,4 @@
apiVersion: v1
description: ONAP uui server
name: uui-server
-version: 2.0.0
+version: 3.0.0
diff --git a/kubernetes/uui/charts/uui-server/templates/deployment.yaml b/kubernetes/uui/charts/uui-server/templates/deployment.yaml
index 0a73fff646..f0d5d297f7 100644
--- a/kubernetes/uui/charts/uui-server/templates/deployment.yaml
+++ b/kubernetes/uui/charts/uui-server/templates/deployment.yaml
@@ -46,7 +46,7 @@ spec:
periodSeconds: {{ .Values.liveness.periodSeconds }}
{{ end -}}
resources:
-{{ toYaml (pluck .Values.flavor .Values.resources| first) | indent 12 }}
+{{ include "common.resources" . | indent 12 }}
readinessProbe:
tcpSocket:
port: {{ .Values.service.internalPort }}
diff --git a/kubernetes/uui/charts/uui-server/values.yaml b/kubernetes/uui/charts/uui-server/values.yaml
index ecc93c0a7b..268c6f3e41 100644
--- a/kubernetes/uui/charts/uui-server/values.yaml
+++ b/kubernetes/uui/charts/uui-server/values.yaml
@@ -90,3 +90,4 @@ resources:
requests:
cpu: 500m
memory: 500Mi
+ unlimited: {}
diff --git a/kubernetes/uui/requirements.yaml b/kubernetes/uui/requirements.yaml
index 9b24f824d5..db85323b82 100644
--- a/kubernetes/uui/requirements.yaml
+++ b/kubernetes/uui/requirements.yaml
@@ -14,7 +14,7 @@
dependencies:
- name: common
- version: ~2.0.0
+ version: ~3.0.0
# local reference to common chart, as it is
# a part of this chart's package and will not
# be published independently to a repo (at this point)
diff --git a/kubernetes/uui/templates/deployment.yaml b/kubernetes/uui/templates/deployment.yaml
index 5d564cf902..6c0992487d 100644
--- a/kubernetes/uui/templates/deployment.yaml
+++ b/kubernetes/uui/templates/deployment.yaml
@@ -58,7 +58,7 @@ spec:
- name: MSB_ADDR
value: {{ tpl .Values.msbaddr . }}
resources:
-{{ toYaml (pluck .Values.flavor .Values.resources| first) | indent 12 }}
+{{ include "common.resources" . | indent 12 }}
{{- if .Values.nodeSelector }}
nodeSelector:
{{ toYaml .Values.nodeSelector | indent 10 }}
diff --git a/kubernetes/uui/values.yaml b/kubernetes/uui/values.yaml
index 95be04ba7c..266d17b8e5 100644
--- a/kubernetes/uui/values.yaml
+++ b/kubernetes/uui/values.yaml
@@ -90,3 +90,4 @@ resources:
requests:
cpu: 500m
memory: 1Gi
+ unlimited: {}
diff --git a/kubernetes/vfc/Chart.yaml b/kubernetes/vfc/Chart.yaml
index a6a6065802..5f4dab5686 100644
--- a/kubernetes/vfc/Chart.yaml
+++ b/kubernetes/vfc/Chart.yaml
@@ -15,4 +15,4 @@
apiVersion: v1
description: ONAP Virtual Function Controller (VF-C)
name: vfc
-version: 2.0.0
+version: 3.0.0
diff --git a/kubernetes/vfc/charts/vfc-catalog/Chart.yaml b/kubernetes/vfc/charts/vfc-catalog/Chart.yaml
index f90ad5b72e..9817a9b7ae 100644
--- a/kubernetes/vfc/charts/vfc-catalog/Chart.yaml
+++ b/kubernetes/vfc/charts/vfc-catalog/Chart.yaml
@@ -15,4 +15,4 @@
apiVersion: v1
description: ONAP VFC - Catalog
name: vfc-catalog
-version: 2.0.0 \ No newline at end of file
+version: 3.0.0 \ No newline at end of file
diff --git a/kubernetes/vfc/charts/vfc-catalog/templates/deployment.yaml b/kubernetes/vfc/charts/vfc-catalog/templates/deployment.yaml
index 65339119f9..e33d749de6 100644
--- a/kubernetes/vfc/charts/vfc-catalog/templates/deployment.yaml
+++ b/kubernetes/vfc/charts/vfc-catalog/templates/deployment.yaml
@@ -82,7 +82,7 @@ spec:
mountPath: /opt/vfc/catalog/config/log.yml
subPath: log.yml
resources:
-{{ toYaml .Values.resources | indent 12 }}
+{{ include "common.resources" . | indent 12 }}
{{- if .Values.nodeSelector }}
nodeSelector:
{{ toYaml .Values.nodeSelector | indent 10 }}
diff --git a/kubernetes/vfc/charts/vfc-db/Chart.yaml b/kubernetes/vfc/charts/vfc-db/Chart.yaml
index 327f308017..4a9bb99916 100644
--- a/kubernetes/vfc/charts/vfc-db/Chart.yaml
+++ b/kubernetes/vfc/charts/vfc-db/Chart.yaml
@@ -15,4 +15,4 @@
apiVersion: v1
description: ONAP VFC - DB
name: vfc-db
-version: 2.0.0
+version: 3.0.0
diff --git a/kubernetes/vfc/charts/vfc-db/templates/deployment.yaml b/kubernetes/vfc/charts/vfc-db/templates/deployment.yaml
index 6fc4a6d031..1b4b31e3cf 100644
--- a/kubernetes/vfc/charts/vfc-db/templates/deployment.yaml
+++ b/kubernetes/vfc/charts/vfc-db/templates/deployment.yaml
@@ -55,7 +55,7 @@ spec:
- name: MSB_ADDR
value: "{{ .Values.global.config.msbServiceName }}:{{ .Values.global.config.msbPort }}"
resources:
-{{ toYaml .Values.resources | indent 12 }}
+{{ include "common.resources" . | indent 12 }}
{{- if .Values.nodeSelector }}
nodeSelector:
{{ toYaml .Values.nodeSelector | indent 10 }}
diff --git a/kubernetes/vfc/charts/vfc-ems-driver/Chart.yaml b/kubernetes/vfc/charts/vfc-ems-driver/Chart.yaml
index 1bd751fa77..328b95d34a 100644
--- a/kubernetes/vfc/charts/vfc-ems-driver/Chart.yaml
+++ b/kubernetes/vfc/charts/vfc-ems-driver/Chart.yaml
@@ -15,4 +15,4 @@
apiVersion: v1
description: ONAP VFC - EMS Driver
name: vfc-ems-driver
-version: 2.0.0 \ No newline at end of file
+version: 3.0.0 \ No newline at end of file
diff --git a/kubernetes/vfc/charts/vfc-ems-driver/templates/deployment.yaml b/kubernetes/vfc/charts/vfc-ems-driver/templates/deployment.yaml
index 9949157923..dbad6a75a5 100644
--- a/kubernetes/vfc/charts/vfc-ems-driver/templates/deployment.yaml
+++ b/kubernetes/vfc/charts/vfc-ems-driver/templates/deployment.yaml
@@ -76,7 +76,7 @@ spec:
- name: VES_AUTHINFO
value: "{{ .Values.config.vescollectorUser }}:{{ .Values.config.vescollectorPassword }}"
resources:
-{{ toYaml .Values.resources | indent 12 }}
+{{ include "common.resources" . | indent 12 }}
{{- if .Values.nodeSelector }}
nodeSelector:
{{ toYaml .Values.nodeSelector | indent 10 }}
diff --git a/kubernetes/vfc/charts/vfc-generic-vnfm-driver/Chart.yaml b/kubernetes/vfc/charts/vfc-generic-vnfm-driver/Chart.yaml
index c472770b31..b86f58fc99 100644
--- a/kubernetes/vfc/charts/vfc-generic-vnfm-driver/Chart.yaml
+++ b/kubernetes/vfc/charts/vfc-generic-vnfm-driver/Chart.yaml
@@ -15,4 +15,4 @@
apiVersion: v1
description: ONAP VFC - Generic VNFM Driver
name: vfc-generic-vnfm-driver
-version: 2.0.0 \ No newline at end of file
+version: 3.0.0 \ No newline at end of file
diff --git a/kubernetes/vfc/charts/vfc-generic-vnfm-driver/templates/deployment.yaml b/kubernetes/vfc/charts/vfc-generic-vnfm-driver/templates/deployment.yaml
index e8f085802e..a25a497df5 100644
--- a/kubernetes/vfc/charts/vfc-generic-vnfm-driver/templates/deployment.yaml
+++ b/kubernetes/vfc/charts/vfc-generic-vnfm-driver/templates/deployment.yaml
@@ -81,7 +81,7 @@ spec:
mountPath: /opt/vfc/gvnfmdriver/config/log.yml
subPath: log.yml
resources:
-{{ toYaml .Values.resources | indent 12 }}
+{{ include "common.resources" . | indent 12 }}
{{- if .Values.nodeSelector }}
nodeSelector:
{{ toYaml .Values.nodeSelector | indent 10 }}
diff --git a/kubernetes/vfc/charts/vfc-huawei-vnfm-driver/Chart.yaml b/kubernetes/vfc/charts/vfc-huawei-vnfm-driver/Chart.yaml
index 550401c6ba..cf3fc6fafc 100644
--- a/kubernetes/vfc/charts/vfc-huawei-vnfm-driver/Chart.yaml
+++ b/kubernetes/vfc/charts/vfc-huawei-vnfm-driver/Chart.yaml
@@ -15,4 +15,4 @@
apiVersion: v1
description: ONAP VFC - Huawei VNFM Driver
name: vfc-huawei-vnfm-driver
-version: 2.0.0 \ No newline at end of file
+version: 3.0.0 \ No newline at end of file
diff --git a/kubernetes/vfc/charts/vfc-huawei-vnfm-driver/templates/deployment.yaml b/kubernetes/vfc/charts/vfc-huawei-vnfm-driver/templates/deployment.yaml
index ff307eb035..8046512a9b 100644
--- a/kubernetes/vfc/charts/vfc-huawei-vnfm-driver/templates/deployment.yaml
+++ b/kubernetes/vfc/charts/vfc-huawei-vnfm-driver/templates/deployment.yaml
@@ -82,7 +82,7 @@ spec:
mountPath: /opt/vfc/hwvnfmdriver/config/log4j.properties
subPath: log4j.properties
resources:
-{{ toYaml .Values.resources | indent 12 }}
+{{ include "common.resources" . | indent 12 }}
{{- if .Values.nodeSelector }}
nodeSelector:
{{ toYaml .Values.nodeSelector | indent 10 }}
diff --git a/kubernetes/vfc/charts/vfc-juju-vnfm-driver/Chart.yaml b/kubernetes/vfc/charts/vfc-juju-vnfm-driver/Chart.yaml
index d0d74071ad..2a9161ede8 100644
--- a/kubernetes/vfc/charts/vfc-juju-vnfm-driver/Chart.yaml
+++ b/kubernetes/vfc/charts/vfc-juju-vnfm-driver/Chart.yaml
@@ -15,4 +15,4 @@
apiVersion: v1
description: ONAP VFC - Juju VNFM Driver
name: vfc-juju-vnfm-driver
-version: 2.0.0 \ No newline at end of file
+version: 3.0.0 \ No newline at end of file
diff --git a/kubernetes/vfc/charts/vfc-juju-vnfm-driver/templates/deployment.yaml b/kubernetes/vfc/charts/vfc-juju-vnfm-driver/templates/deployment.yaml
index 7f7a6e897b..e41378b999 100644
--- a/kubernetes/vfc/charts/vfc-juju-vnfm-driver/templates/deployment.yaml
+++ b/kubernetes/vfc/charts/vfc-juju-vnfm-driver/templates/deployment.yaml
@@ -81,7 +81,7 @@ spec:
mountPath: /opt/vfc/jujudriver/config/log4j.properties
subPath: log4j.properties
resources:
-{{ toYaml .Values.resources | indent 12 }}
+{{ include "common.resources" . | indent 12 }}
{{- if .Values.nodeSelector }}
nodeSelector:
{{ toYaml .Values.nodeSelector | indent 10 }}
diff --git a/kubernetes/vfc/charts/vfc-multivim-proxy/Chart.yaml b/kubernetes/vfc/charts/vfc-multivim-proxy/Chart.yaml
index 3ceafe924c..a18d9bc96d 100644
--- a/kubernetes/vfc/charts/vfc-multivim-proxy/Chart.yaml
+++ b/kubernetes/vfc/charts/vfc-multivim-proxy/Chart.yaml
@@ -15,4 +15,4 @@
apiVersion: v1
description: ONAP VFC - MultiVIM Proxy
name: vfc-multivim-proxy
-version: 2.0.0 \ No newline at end of file
+version: 3.0.0 \ No newline at end of file
diff --git a/kubernetes/vfc/charts/vfc-multivim-proxy/templates/deployment.yaml b/kubernetes/vfc/charts/vfc-multivim-proxy/templates/deployment.yaml
index 0bb774abd7..dd61e6534e 100644
--- a/kubernetes/vfc/charts/vfc-multivim-proxy/templates/deployment.yaml
+++ b/kubernetes/vfc/charts/vfc-multivim-proxy/templates/deployment.yaml
@@ -72,7 +72,7 @@ spec:
- name: MSB_ADDR
value: "{{ .Values.global.config.msbServiceName }}:{{ .Values.global.config.msbPort }}"
resources:
-{{ toYaml .Values.resources | indent 12 }}
+{{ include "common.resources" . | indent 12 }}
{{- if .Values.nodeSelector }}
nodeSelector:
{{ toYaml .Values.nodeSelector | indent 10 }}
diff --git a/kubernetes/vfc/charts/vfc-nokia-v2vnfm-driver/Chart.yaml b/kubernetes/vfc/charts/vfc-nokia-v2vnfm-driver/Chart.yaml
index dbed709128..0d45db68f1 100644
--- a/kubernetes/vfc/charts/vfc-nokia-v2vnfm-driver/Chart.yaml
+++ b/kubernetes/vfc/charts/vfc-nokia-v2vnfm-driver/Chart.yaml
@@ -15,4 +15,4 @@
apiVersion: v1
description: ONAP VFC - Nokia V2VNFM Driver
name: vfc-nokia-v2vnfm-driver
-version: 2.0.0 \ No newline at end of file
+version: 3.0.0 \ No newline at end of file
diff --git a/kubernetes/vfc/charts/vfc-nokia-v2vnfm-driver/templates/deployment.yaml b/kubernetes/vfc/charts/vfc-nokia-v2vnfm-driver/templates/deployment.yaml
index 0bb774abd7..dd61e6534e 100644
--- a/kubernetes/vfc/charts/vfc-nokia-v2vnfm-driver/templates/deployment.yaml
+++ b/kubernetes/vfc/charts/vfc-nokia-v2vnfm-driver/templates/deployment.yaml
@@ -72,7 +72,7 @@ spec:
- name: MSB_ADDR
value: "{{ .Values.global.config.msbServiceName }}:{{ .Values.global.config.msbPort }}"
resources:
-{{ toYaml .Values.resources | indent 12 }}
+{{ include "common.resources" . | indent 12 }}
{{- if .Values.nodeSelector }}
nodeSelector:
{{ toYaml .Values.nodeSelector | indent 10 }}
diff --git a/kubernetes/vfc/charts/vfc-nokia-vnfm-driver/Chart.yaml b/kubernetes/vfc/charts/vfc-nokia-vnfm-driver/Chart.yaml
index eb3a6ce3e2..c39f54e342 100644
--- a/kubernetes/vfc/charts/vfc-nokia-vnfm-driver/Chart.yaml
+++ b/kubernetes/vfc/charts/vfc-nokia-vnfm-driver/Chart.yaml
@@ -15,4 +15,4 @@
apiVersion: v1
description: ONAP VFC - Nokia VNFM Driver
name: vfc-nokia-vnfm-driver
-version: 2.0.0 \ No newline at end of file
+version: 3.0.0 \ No newline at end of file
diff --git a/kubernetes/vfc/charts/vfc-nokia-vnfm-driver/templates/deployment.yaml b/kubernetes/vfc/charts/vfc-nokia-vnfm-driver/templates/deployment.yaml
index cab32301ad..eb0885a0e4 100644
--- a/kubernetes/vfc/charts/vfc-nokia-vnfm-driver/templates/deployment.yaml
+++ b/kubernetes/vfc/charts/vfc-nokia-vnfm-driver/templates/deployment.yaml
@@ -81,7 +81,7 @@ spec:
mountPath: /opt/vfc/nokiavnfmdriver/config/logback.xml
subPath: logback.xml
resources:
-{{ toYaml .Values.resources | indent 12 }}
+{{ include "common.resources" . | indent 12 }}
{{- if .Values.nodeSelector }}
nodeSelector:
{{ toYaml .Values.nodeSelector | indent 10 }}
diff --git a/kubernetes/vfc/charts/vfc-nslcm/Chart.yaml b/kubernetes/vfc/charts/vfc-nslcm/Chart.yaml
index 362857333a..519db8e94a 100644
--- a/kubernetes/vfc/charts/vfc-nslcm/Chart.yaml
+++ b/kubernetes/vfc/charts/vfc-nslcm/Chart.yaml
@@ -15,4 +15,4 @@
apiVersion: v1
description: ONAP VFC - NS Life Cycle Management
name: vfc-nslcm
-version: 2.0.0 \ No newline at end of file
+version: 3.0.0 \ No newline at end of file
diff --git a/kubernetes/vfc/charts/vfc-nslcm/templates/deployment.yaml b/kubernetes/vfc/charts/vfc-nslcm/templates/deployment.yaml
index 6c499aa3d6..184ceb5dfa 100644
--- a/kubernetes/vfc/charts/vfc-nslcm/templates/deployment.yaml
+++ b/kubernetes/vfc/charts/vfc-nslcm/templates/deployment.yaml
@@ -82,7 +82,7 @@ spec:
mountPath: /opt/vfc/nslcm/config/log.yml
subPath: log.yml
resources:
-{{ toYaml .Values.resources | indent 12 }}
+{{ include "common.resources" . | indent 12 }}
{{- if .Values.nodeSelector }}
nodeSelector:
{{ toYaml .Values.nodeSelector | indent 10 }}
diff --git a/kubernetes/vfc/charts/vfc-resmgr/Chart.yaml b/kubernetes/vfc/charts/vfc-resmgr/Chart.yaml
index 604c6b64cf..0730ff7859 100644
--- a/kubernetes/vfc/charts/vfc-resmgr/Chart.yaml
+++ b/kubernetes/vfc/charts/vfc-resmgr/Chart.yaml
@@ -15,4 +15,4 @@
apiVersion: v1
description: ONAP VFC - Resource Manager
name: vfc-resmgr
-version: 2.0.0 \ No newline at end of file
+version: 3.0.0 \ No newline at end of file
diff --git a/kubernetes/vfc/charts/vfc-resmgr/templates/deployment.yaml b/kubernetes/vfc/charts/vfc-resmgr/templates/deployment.yaml
index c42d22e463..e4dc3c2c9f 100644
--- a/kubernetes/vfc/charts/vfc-resmgr/templates/deployment.yaml
+++ b/kubernetes/vfc/charts/vfc-resmgr/templates/deployment.yaml
@@ -81,7 +81,7 @@ spec:
mountPath: /opt/vfc/resmgr/config/log4j.properties
subPath: log4j.properties
resources:
-{{ toYaml .Values.resources | indent 12 }}
+{{ include "common.resources" . | indent 12 }}
{{- if .Values.nodeSelector }}
nodeSelector:
{{ toYaml .Values.nodeSelector | indent 10 }}
diff --git a/kubernetes/vfc/charts/vfc-vnflcm/Chart.yaml b/kubernetes/vfc/charts/vfc-vnflcm/Chart.yaml
index 507d4e6b35..f03b164bad 100644
--- a/kubernetes/vfc/charts/vfc-vnflcm/Chart.yaml
+++ b/kubernetes/vfc/charts/vfc-vnflcm/Chart.yaml
@@ -15,4 +15,4 @@
apiVersion: v1
description: ONAP VFC - VNF Life Cycle Management
name: vfc-vnflcm
-version: 2.0.0 \ No newline at end of file
+version: 3.0.0 \ No newline at end of file
diff --git a/kubernetes/vfc/charts/vfc-vnflcm/templates/deployment.yaml b/kubernetes/vfc/charts/vfc-vnflcm/templates/deployment.yaml
index d2974c618a..95e90a1e4e 100644
--- a/kubernetes/vfc/charts/vfc-vnflcm/templates/deployment.yaml
+++ b/kubernetes/vfc/charts/vfc-vnflcm/templates/deployment.yaml
@@ -82,7 +82,7 @@ spec:
mountPath: /opt/vfc/gvnfm-vnflcm/config/log.yml
subPath: log.yml
resources:
-{{ toYaml .Values.resources | indent 12 }}
+{{ include "common.resources" . | indent 12 }}
{{- if .Values.nodeSelector }}
nodeSelector:
{{ toYaml .Values.nodeSelector | indent 10 }}
diff --git a/kubernetes/vfc/charts/vfc-vnfmgr/Chart.yaml b/kubernetes/vfc/charts/vfc-vnfmgr/Chart.yaml
index b70e11c762..1fe5dc8c48 100644
--- a/kubernetes/vfc/charts/vfc-vnfmgr/Chart.yaml
+++ b/kubernetes/vfc/charts/vfc-vnfmgr/Chart.yaml
@@ -15,4 +15,4 @@
apiVersion: v1
description: ONAP VFC - VNF Manager
name: vfc-vnfmgr
-version: 2.0.0 \ No newline at end of file
+version: 3.0.0 \ No newline at end of file
diff --git a/kubernetes/vfc/charts/vfc-vnfmgr/templates/deployment.yaml b/kubernetes/vfc/charts/vfc-vnfmgr/templates/deployment.yaml
index 807bb8b59c..219f2f2961 100644
--- a/kubernetes/vfc/charts/vfc-vnfmgr/templates/deployment.yaml
+++ b/kubernetes/vfc/charts/vfc-vnfmgr/templates/deployment.yaml
@@ -83,7 +83,7 @@ spec:
mountPath: /opt/vfc/gvnfm-vnfmgr/config/log.yml
subPath: log.yml
resources:
-{{ toYaml .Values.resources | indent 12 }}
+{{ include "common.resources" . | indent 12 }}
{{- if .Values.nodeSelector }}
nodeSelector:
{{ toYaml .Values.nodeSelector | indent 10 }}
diff --git a/kubernetes/vfc/charts/vfc-vnfres/Chart.yaml b/kubernetes/vfc/charts/vfc-vnfres/Chart.yaml
index 5fd923bcd7..cefadcacfc 100644
--- a/kubernetes/vfc/charts/vfc-vnfres/Chart.yaml
+++ b/kubernetes/vfc/charts/vfc-vnfres/Chart.yaml
@@ -15,4 +15,4 @@
apiVersion: v1
description: ONAP VFC - VNF Resource Manager
name: vfc-vnfres
-version: 2.0.0 \ No newline at end of file
+version: 3.0.0 \ No newline at end of file
diff --git a/kubernetes/vfc/charts/vfc-vnfres/templates/deployment.yaml b/kubernetes/vfc/charts/vfc-vnfres/templates/deployment.yaml
index 767b709db5..9f9f1b3377 100644
--- a/kubernetes/vfc/charts/vfc-vnfres/templates/deployment.yaml
+++ b/kubernetes/vfc/charts/vfc-vnfres/templates/deployment.yaml
@@ -82,7 +82,7 @@ spec:
mountPath: /opt/vfc/gvnfm-vnfres/config/log.yml
subPath: log.yml
resources:
-{{ toYaml .Values.resources | indent 12 }}
+{{ include "common.resources" . | indent 12 }}
{{- if .Values.nodeSelector }}
nodeSelector:
{{ toYaml .Values.nodeSelector | indent 10 }}
diff --git a/kubernetes/vfc/charts/vfc-workflow-engine/Chart.yaml b/kubernetes/vfc/charts/vfc-workflow-engine/Chart.yaml
index 913778b689..15f8868860 100644
--- a/kubernetes/vfc/charts/vfc-workflow-engine/Chart.yaml
+++ b/kubernetes/vfc/charts/vfc-workflow-engine/Chart.yaml
@@ -15,4 +15,4 @@
apiVersion: v1
description: ONAP VFC - Workflow Engine
name: vfc-workflow-engine
-version: 2.0.0 \ No newline at end of file
+version: 3.0.0 \ No newline at end of file
diff --git a/kubernetes/vfc/charts/vfc-workflow-engine/templates/deployment.yaml b/kubernetes/vfc/charts/vfc-workflow-engine/templates/deployment.yaml
index a25cace8e7..208329aaa1 100644
--- a/kubernetes/vfc/charts/vfc-workflow-engine/templates/deployment.yaml
+++ b/kubernetes/vfc/charts/vfc-workflow-engine/templates/deployment.yaml
@@ -80,7 +80,7 @@ spec:
- name: OPENPALETTE_MSB_PORT
value: "{{ .Values.global.config.msbPort | default 80 }}"
resources:
-{{ toYaml .Values.resources | indent 12 }}
+{{ include "common.resources" . | indent 12 }}
{{- if .Values.nodeSelector }}
nodeSelector:
{{ toYaml .Values.nodeSelector | indent 10 }}
diff --git a/kubernetes/vfc/charts/vfc-workflow/Chart.yaml b/kubernetes/vfc/charts/vfc-workflow/Chart.yaml
index a711c50671..767d7993b6 100644
--- a/kubernetes/vfc/charts/vfc-workflow/Chart.yaml
+++ b/kubernetes/vfc/charts/vfc-workflow/Chart.yaml
@@ -15,4 +15,4 @@
apiVersion: v1
description: ONAP VFC - Workflow
name: vfc-workflow
-version: 2.0.0 \ No newline at end of file
+version: 3.0.0 \ No newline at end of file
diff --git a/kubernetes/vfc/charts/vfc-workflow/templates/deployment.yaml b/kubernetes/vfc/charts/vfc-workflow/templates/deployment.yaml
index 0bbfd75074..a42769bf21 100644
--- a/kubernetes/vfc/charts/vfc-workflow/templates/deployment.yaml
+++ b/kubernetes/vfc/charts/vfc-workflow/templates/deployment.yaml
@@ -80,7 +80,7 @@ spec:
- name: OPENPALETTE_MSB_PORT
value: "{{ .Values.global.config.msbPort | default 80 }}"
resources:
-{{ toYaml .Values.resources | indent 12 }}
+{{ include "common.resources" . | indent 12 }}
{{- if .Values.nodeSelector }}
nodeSelector:
{{ toYaml .Values.nodeSelector | indent 10 }}
diff --git a/kubernetes/vfc/charts/vfc-zte-sdnc-driver/Chart.yaml b/kubernetes/vfc/charts/vfc-zte-sdnc-driver/Chart.yaml
index f1d71da2d2..cf12fce30d 100644
--- a/kubernetes/vfc/charts/vfc-zte-sdnc-driver/Chart.yaml
+++ b/kubernetes/vfc/charts/vfc-zte-sdnc-driver/Chart.yaml
@@ -15,4 +15,4 @@
apiVersion: v1
description: ONAP VFC - ZTE SDNC Driver
name: vfc-zte-sdnc-driver
-version: 2.0.0 \ No newline at end of file
+version: 3.0.0 \ No newline at end of file
diff --git a/kubernetes/vfc/charts/vfc-zte-sdnc-driver/templates/deployment.yaml b/kubernetes/vfc/charts/vfc-zte-sdnc-driver/templates/deployment.yaml
index 0bb774abd7..dd61e6534e 100644
--- a/kubernetes/vfc/charts/vfc-zte-sdnc-driver/templates/deployment.yaml
+++ b/kubernetes/vfc/charts/vfc-zte-sdnc-driver/templates/deployment.yaml
@@ -72,7 +72,7 @@ spec:
- name: MSB_ADDR
value: "{{ .Values.global.config.msbServiceName }}:{{ .Values.global.config.msbPort }}"
resources:
-{{ toYaml .Values.resources | indent 12 }}
+{{ include "common.resources" . | indent 12 }}
{{- if .Values.nodeSelector }}
nodeSelector:
{{ toYaml .Values.nodeSelector | indent 10 }}
diff --git a/kubernetes/vfc/charts/vfc-zte-vnfm-driver/Chart.yaml b/kubernetes/vfc/charts/vfc-zte-vnfm-driver/Chart.yaml
index b4e9f84e3d..627a6d363a 100644
--- a/kubernetes/vfc/charts/vfc-zte-vnfm-driver/Chart.yaml
+++ b/kubernetes/vfc/charts/vfc-zte-vnfm-driver/Chart.yaml
@@ -15,4 +15,4 @@
apiVersion: v1
description: ONAP VFC - ZTE VNFM Driver
name: vfc-zte-vnfm-driver
-version: 2.0.0 \ No newline at end of file
+version: 3.0.0 \ No newline at end of file
diff --git a/kubernetes/vfc/charts/vfc-zte-vnfm-driver/templates/deployment.yaml b/kubernetes/vfc/charts/vfc-zte-vnfm-driver/templates/deployment.yaml
index 8125215840..bdaf139862 100644
--- a/kubernetes/vfc/charts/vfc-zte-vnfm-driver/templates/deployment.yaml
+++ b/kubernetes/vfc/charts/vfc-zte-vnfm-driver/templates/deployment.yaml
@@ -81,7 +81,7 @@ spec:
mountPath: /opt/vfc/ztevnfmdriver/config/log.yml
subPath: log.yml
resources:
-{{ toYaml .Values.resources | indent 12 }}
+{{ include "common.resources" . | indent 12 }}
{{- if .Values.nodeSelector }}
nodeSelector:
{{ toYaml .Values.nodeSelector | indent 10 }}
diff --git a/kubernetes/vfc/requirements.yaml b/kubernetes/vfc/requirements.yaml
index 1e8f788318..896eaf4baa 100644
--- a/kubernetes/vfc/requirements.yaml
+++ b/kubernetes/vfc/requirements.yaml
@@ -14,5 +14,5 @@
dependencies:
- name: common
- version: ~2.0.0
+ version: ~3.0.0
repository: '@local' \ No newline at end of file
diff --git a/kubernetes/vid/Chart.yaml b/kubernetes/vid/Chart.yaml
index 4df4dae10c..9502b0ca93 100644
--- a/kubernetes/vid/Chart.yaml
+++ b/kubernetes/vid/Chart.yaml
@@ -15,4 +15,4 @@
apiVersion: v1
description: ONAP Virtual Infrastructure Deployment
name: vid
-version: 2.0.0
+version: 3.0.0
diff --git a/kubernetes/vid/charts/vid-mariadb-galera/templates/statefulset.yaml b/kubernetes/vid/charts/vid-mariadb-galera/templates/statefulset.yaml
index 8ddcb4a69d..0c77a17261 100644
--- a/kubernetes/vid/charts/vid-mariadb-galera/templates/statefulset.yaml
+++ b/kubernetes/vid/charts/vid-mariadb-galera/templates/statefulset.yaml
@@ -97,7 +97,7 @@ spec:
timeoutSeconds: {{ .Values.liveness.timeoutSeconds }}
{{- end }}
resources:
-{{ toYaml (pluck .Values.flavor .Values.resources| first) | indent 12 }}
+{{ include "common.resources" . | indent 12 }}
volumeMounts:
{{- if .Values.externalConfig }}
- mountPath: /etc/config
diff --git a/kubernetes/vid/charts/vid-mariadb-galera/values.yaml b/kubernetes/vid/charts/vid-mariadb-galera/values.yaml
index 10509d987a..d5ed703767 100644
--- a/kubernetes/vid/charts/vid-mariadb-galera/values.yaml
+++ b/kubernetes/vid/charts/vid-mariadb-galera/values.yaml
@@ -42,7 +42,7 @@ config:
mysqlDatabase: vid_openecomp_epsdk
-# default number of instances in the StatefulSet
+# default number of instances in the StatefulSet
# keep in mind that if the number is increased you need to update vid-galera-config-job.yaml so that the job will know to wait for all pods.
replicaCount: 1
@@ -106,7 +106,7 @@ ingress:
#externalConfig: {}
externalConfig: |-
lower_case_table_names = 1
-# Resource Limit flavor -By Default using small
+# Resource Limit flavor -By Default using small
flavor: small
# Segregation for Different environment (Small and Large)
resources:
@@ -124,6 +124,7 @@ resources:
requests:
cpu: 20m
memory: 1Gi
+ unlimited: {}
# Name for mariadb-galera cluster - should be unique accross all projects or other clusters
nameOverride: vid-mariadb-galera
diff --git a/kubernetes/vid/requirements.yaml b/kubernetes/vid/requirements.yaml
index f639633537..f3e793cfbb 100644
--- a/kubernetes/vid/requirements.yaml
+++ b/kubernetes/vid/requirements.yaml
@@ -14,7 +14,7 @@
dependencies:
- name: common
- version: ~2.0.0
+ version: ~3.0.0
# local reference to common chart, as it is
# a part of this chart's package and will not
# be published independently to a repo (at this point)
diff --git a/kubernetes/vid/templates/deployment.yaml b/kubernetes/vid/templates/deployment.yaml
index 9b9ee8d81f..9a23c1d7fc 100644
--- a/kubernetes/vid/templates/deployment.yaml
+++ b/kubernetes/vid/templates/deployment.yaml
@@ -118,7 +118,7 @@ spec:
name: vid-logback
subPath: logback.xml
resources:
-{{ toYaml (pluck .Values.flavor .Values.resources| first) | indent 12 }}
+{{ include "common.resources" . | indent 12 }}
{{- if .Values.nodeSelector }}
nodeSelector:
{{ toYaml .Values.nodeSelector | indent 10 }}
diff --git a/kubernetes/vid/values.yaml b/kubernetes/vid/values.yaml
index 4b0f38c4b8..79e9440a25 100644
--- a/kubernetes/vid/values.yaml
+++ b/kubernetes/vid/values.yaml
@@ -91,7 +91,7 @@ service:
ingress:
enabled: false
-# Resource Limit flavor -By Default using small
+# Resource Limit flavor -By Default using small
flavor: small
# Segregation for Different environment (Small and Large)
resources:
@@ -108,4 +108,5 @@ resources:
memory: 4Gi
requests:
cpu: 200m
- memory: 2Gi \ No newline at end of file
+ memory: 2Gi
+ unlimited: {} \ No newline at end of file
diff --git a/kubernetes/vnfsdk/Chart.yaml b/kubernetes/vnfsdk/Chart.yaml
index d11ff56434..f0fb733720 100644
--- a/kubernetes/vnfsdk/Chart.yaml
+++ b/kubernetes/vnfsdk/Chart.yaml
@@ -15,4 +15,4 @@
apiVersion: v1
description: ONAP VNF SDK
name: vnfsdk
-version: 2.0.0
+version: 3.0.0
diff --git a/kubernetes/vnfsdk/requirements.yaml b/kubernetes/vnfsdk/requirements.yaml
index 3b2a02a480..a01c7c02bc 100644
--- a/kubernetes/vnfsdk/requirements.yaml
+++ b/kubernetes/vnfsdk/requirements.yaml
@@ -14,8 +14,8 @@
dependencies:
- name: common
- version: ~2.0.0
+ version: ~3.0.0
repository: '@local'
- name: postgres
- version: ~2.0.0
+ version: ~3.0.0
repository: '@local'
diff --git a/kubernetes/vnfsdk/templates/deployment.yaml b/kubernetes/vnfsdk/templates/deployment.yaml
index ee779f408f..b53b92091c 100644
--- a/kubernetes/vnfsdk/templates/deployment.yaml
+++ b/kubernetes/vnfsdk/templates/deployment.yaml
@@ -53,7 +53,7 @@ spec:
imagePullPolicy: {{ .Values.pullPolicy | default .Values.global.pullPolicy }}
name: {{ include "common.name" . }}
resources:
-{{ toYaml (pluck .Values.flavor .Values.resources| first) | indent 12 }}
+{{ include "common.resources" . | indent 12 }}
env:
- name: POSTGRES_SERVICE_HOST
value: "$(VNFSDK_DBSET_SERVICE_HOST)"
diff --git a/kubernetes/vnfsdk/values.yaml b/kubernetes/vnfsdk/values.yaml
index 89630c9876..b9b90166f2 100644
--- a/kubernetes/vnfsdk/values.yaml
+++ b/kubernetes/vnfsdk/values.yaml
@@ -61,7 +61,7 @@ nodeSelector: {}
affinity: {}
-# Resource Limit flavor -By Default using small
+# Resource Limit flavor -By Default using small
flavor: small
# Segregation for Different environment (Small and Large)
resources:
@@ -79,6 +79,7 @@ resources:
requests:
cpu: 1000m
memory: 2Gi
+ unlimited: {}
# probe configuration parameters
liveness: