aboutsummaryrefslogtreecommitdiffstats
path: root/kubernetes
diff options
context:
space:
mode:
Diffstat (limited to 'kubernetes')
-rw-r--r--kubernetes/aaf/Chart.yaml2
-rw-r--r--kubernetes/aaf/charts/aaf-cass/Chart.yaml2
-rw-r--r--kubernetes/aaf/charts/aaf-cm/Chart.yaml2
-rw-r--r--kubernetes/aaf/charts/aaf-fs/Chart.yaml2
-rw-r--r--kubernetes/aaf/charts/aaf-gui/Chart.yaml2
-rw-r--r--kubernetes/aaf/charts/aaf-hello/Chart.yaml2
-rw-r--r--kubernetes/aaf/charts/aaf-locate/Chart.yaml2
-rw-r--r--kubernetes/aaf/charts/aaf-oauth/Chart.yaml2
-rw-r--r--kubernetes/aaf/charts/aaf-service/Chart.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-vault/Chart.yaml2
-rw-r--r--kubernetes/aaf/charts/aaf-sms/charts/aaf-sms-vault/templates/service.yaml2
-rw-r--r--kubernetes/aaf/charts/aaf-sms/templates/service.yaml2
-rw-r--r--kubernetes/aaf/charts/aaf-sshsm/Chart.yaml2
-rw-r--r--kubernetes/aaf/charts/aaf-sshsm/charts/aaf-sshsm-abrmd/Chart.yaml2
-rw-r--r--kubernetes/aaf/charts/aaf-sshsm/charts/aaf-sshsm-distcenter/Chart.yaml2
-rw-r--r--kubernetes/aaf/charts/aaf-sshsm/charts/aaf-sshsm-testca/Chart.yaml2
-rw-r--r--kubernetes/aaf/charts/aaf-sshsm/requirements.yaml2
-rw-r--r--kubernetes/aaf/requirements.yaml2
m---------kubernetes/aai0
-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/pv.yaml4
-rw-r--r--kubernetes/appc/charts/appc-ansible-server/templates/statefulset.yaml17
-rw-r--r--kubernetes/appc/charts/appc-ansible-server/values.yaml4
-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/values.yaml2
-rw-r--r--kubernetes/appc/requirements.yaml6
-rwxr-xr-xkubernetes/appc/resources/config/appc/opt/onap/appc/bin/installFeatures.sh184
-rwxr-xr-xkubernetes/appc/resources/config/appc/opt/onap/appc/bin/startODL.sh3
-rwxr-xr-xkubernetes/appc/resources/config/appc/opt/onap/ccsdk/bin/startODL.sh68
-rw-r--r--kubernetes/appc/templates/statefulset.yaml18
-rw-r--r--kubernetes/appc/values.yaml4
-rw-r--r--kubernetes/cds/Chart.yaml2
-rwxr-xr-xkubernetes/cds/charts/cds-blueprints-processor/Chart.yaml2
-rwxr-xr-xkubernetes/cds/charts/cds-blueprints-processor/requirements.yaml2
-rwxr-xr-xkubernetes/cds/charts/cds-blueprints-processor/templates/deployment.yaml4
-rwxr-xr-xkubernetes/cds/charts/cds-command-executor/Chart.yaml2
-rwxr-xr-xkubernetes/cds/charts/cds-command-executor/requirements.yaml2
-rw-r--r--kubernetes/cds/charts/cds-controller-blueprints/Chart.yaml2
-rw-r--r--kubernetes/cds/charts/cds-controller-blueprints/requirements.yaml2
-rwxr-xr-xkubernetes/cds/charts/cds-sdc-listener/Chart.yaml2
-rwxr-xr-xkubernetes/cds/charts/cds-sdc-listener/requirements.yaml2
-rw-r--r--kubernetes/cds/charts/cds-ui/Chart.yaml2
-rw-r--r--kubernetes/cds/charts/cds-ui/requirements.yaml2
-rw-r--r--kubernetes/cds/charts/cds-ui/templates/deployment.yaml24
-rw-r--r--kubernetes/cds/charts/cds-ui/values.yaml18
-rw-r--r--kubernetes/cds/requirements.yaml4
-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-kibana/Chart.yaml2
-rw-r--r--kubernetes/clamp/charts/clamp-dash-kibana/requirements.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/mariadb/Chart.yaml2
-rw-r--r--kubernetes/clamp/requirements.yaml2
-rw-r--r--kubernetes/cli/Chart.yaml2
-rw-r--r--kubernetes/cli/requirements.yaml2
-rw-r--r--kubernetes/common/cassandra/Chart.yaml2
-rw-r--r--kubernetes/common/cassandra/requirements.yaml2
-rw-r--r--kubernetes/common/common/Chart.yaml2
-rw-r--r--kubernetes/common/dgbuilder/Chart.yaml2
-rw-r--r--kubernetes/common/dgbuilder/requirements.yaml2
-rw-r--r--kubernetes/common/etcd/Chart.yaml2
-rw-r--r--kubernetes/common/etcd/requirements.yaml2
-rw-r--r--kubernetes/common/mariadb-galera/Chart.yaml2
-rw-r--r--kubernetes/common/mariadb-galera/requirements.yaml2
-rw-r--r--kubernetes/common/mongo/Chart.yaml2
-rw-r--r--kubernetes/common/mongo/requirements.yaml2
-rw-r--r--kubernetes/common/music/Chart.yaml2
-rw-r--r--kubernetes/common/music/charts/music-cassandra-job/Chart.yaml2
-rw-r--r--kubernetes/common/music/charts/music-cassandra/Chart.yaml2
-rw-r--r--kubernetes/common/music/charts/music-cassandra/requirements.yaml2
-rwxr-xr-xkubernetes/common/music/charts/music-tomcat/Chart.yaml2
-rwxr-xr-xkubernetes/common/music/charts/music-tomcat/requirements.yaml2
-rw-r--r--kubernetes/common/music/requirements.yaml2
-rw-r--r--kubernetes/common/mysql/Chart.yaml2
-rw-r--r--kubernetes/common/mysql/requirements.yaml2
-rw-r--r--kubernetes/common/network-name-gen/Chart.yaml2
-rw-r--r--kubernetes/common/network-name-gen/requirements.yaml4
-rw-r--r--kubernetes/common/nfs-provisioner/Chart.yaml2
-rw-r--r--kubernetes/common/nfs-provisioner/requirements.yaml2
-rw-r--r--kubernetes/common/postgres/Chart.yaml2
-rw-r--r--kubernetes/common/postgres/charts/pgpool/Chart.yaml2
-rw-r--r--kubernetes/common/postgres/charts/pgpool/requirements.yaml2
-rw-r--r--kubernetes/common/postgres/requirements.yaml2
-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-nginx/Chart.yaml2
-rwxr-xr-xkubernetes/contrib/charts/netbox/charts/netbox-postgres/Chart.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-config-binding-service/Chart.yaml2
-rw-r--r--kubernetes/dcaegen2/charts/dcae-config-binding-service/requirements.yaml2
-rw-r--r--kubernetes/dcaegen2/charts/dcae-deployment-handler/Chart.yaml2
-rw-r--r--kubernetes/dcaegen2/charts/dcae-deployment-handler/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-policy-handler/Chart.yaml2
-rw-r--r--kubernetes/dcaegen2/charts/dcae-policy-handler/requirements.yaml2
-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-servicechange-handler/Chart.yaml2
-rw-r--r--kubernetes/dcaegen2/charts/dcae-servicechange-handler/charts/dcae-inventory-api/Chart.yaml2
-rw-r--r--kubernetes/dcaegen2/charts/dcae-servicechange-handler/charts/dcae-inventory-api/requirements.yaml4
-rw-r--r--kubernetes/dcaegen2/charts/dcae-servicechange-handler/requirements.yaml2
-rw-r--r--kubernetes/dcaegen2/requirements.yaml2
-rw-r--r--kubernetes/dmaap/Chart.yaml2
-rw-r--r--kubernetes/dmaap/components/dmaap-bc/Chart.yaml2
-rw-r--r--kubernetes/dmaap/components/dmaap-bc/requirements.yaml4
-rw-r--r--kubernetes/dmaap/components/dmaap-dr-node/Chart.yaml2
-rw-r--r--kubernetes/dmaap/components/dmaap-dr-node/requirements.yaml2
-rw-r--r--kubernetes/dmaap/components/dmaap-dr-prov/Chart.yaml2
-rw-r--r--kubernetes/dmaap/components/dmaap-dr-prov/requirements.yaml4
-rw-r--r--kubernetes/dmaap/components/message-router/Chart.yaml2
-rw-r--r--kubernetes/dmaap/components/message-router/charts/message-router-kafka/Chart.yaml2
-rw-r--r--kubernetes/dmaap/components/message-router/charts/message-router-mirrormaker/Chart.yaml2
-rw-r--r--kubernetes/dmaap/components/message-router/charts/message-router-zookeeper/Chart.yaml2
-rw-r--r--kubernetes/dmaap/components/message-router/requirements.yaml2
-rw-r--r--kubernetes/dmaap/requirements.yaml10
-rw-r--r--kubernetes/esr/Chart.yaml2
-rw-r--r--kubernetes/esr/charts/esr-gui/Chart.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/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/log/Chart.yaml2
-rw-r--r--kubernetes/log/charts/log-elasticsearch/Chart.yaml2
-rw-r--r--kubernetes/log/charts/log-elasticsearch/requirements.yaml2
-rw-r--r--kubernetes/log/charts/log-kibana/Chart.yaml2
-rw-r--r--kubernetes/log/charts/log-kibana/requirements.yaml2
-rw-r--r--kubernetes/log/charts/log-kibana/resources/config/README.txt1
-rw-r--r--kubernetes/log/charts/log-kibana/resources/config/kibana-onboarding.json0
-rw-r--r--kubernetes/log/charts/log-kibana/templates/deployment.yaml18
-rw-r--r--kubernetes/log/charts/log-kibana/values.yaml4
-rw-r--r--kubernetes/log/charts/log-logstash/Chart.yaml2
-rw-r--r--kubernetes/log/charts/log-logstash/requirements.yaml2
-rw-r--r--kubernetes/log/requirements.yaml2
-rw-r--r--kubernetes/modeling/Chart.yaml2
-rw-r--r--kubernetes/modeling/charts/modeling-genericparser/Chart.yaml2
-rw-r--r--kubernetes/modeling/requirements.yaml4
-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/msb-consul/Chart.yaml2
-rw-r--r--kubernetes/msb/charts/msb-consul/requirements.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-eag/Chart.yaml2
-rw-r--r--kubernetes/msb/charts/msb-eag/requirements.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/requirements.yaml2
-rw-r--r--kubernetes/multicloud/Chart.yaml2
-rw-r--r--kubernetes/multicloud/charts/multicloud-azure/Chart.yaml2
-rw-r--r--kubernetes/multicloud/charts/multicloud-fcaps/Chart.yaml2
-rw-r--r--kubernetes/multicloud/charts/multicloud-k8s/Chart.yaml2
-rw-r--r--kubernetes/multicloud/charts/multicloud-k8s/requirements.yaml6
-rw-r--r--kubernetes/multicloud/charts/multicloud-lenovo/Chart.yaml2
-rw-r--r--kubernetes/multicloud/charts/multicloud-ocata/Chart.yaml2
-rw-r--r--kubernetes/multicloud/charts/multicloud-pike/Chart.yaml2
-rw-r--r--kubernetes/multicloud/charts/multicloud-prometheus/Chart.yaml2
-rw-r--r--kubernetes/multicloud/charts/multicloud-prometheus/charts/prometheus-alertmanager/Chart.yaml2
-rw-r--r--kubernetes/multicloud/charts/multicloud-prometheus/charts/prometheus-grafana/Chart.yaml2
-rw-r--r--kubernetes/multicloud/charts/multicloud-vio/Chart.yaml2
-rw-r--r--kubernetes/multicloud/charts/multicloud-windriver/Chart.yaml2
-rw-r--r--kubernetes/multicloud/requirements.yaml2
-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/requirements.yaml4
-rw-r--r--kubernetes/onap/Chart.yaml6
-rwxr-xr-x[-rw-r--r--]kubernetes/onap/requirements.yaml70
-rw-r--r--kubernetes/onap/resources/environments/public-cloud.yaml2
-rw-r--r--kubernetes/onap/resources/overrides/environment.yaml225
-rw-r--r--kubernetes/onap/resources/overrides/onap-all-ingress-nginx.yaml80
-rw-r--r--kubernetes/onap/resources/overrides/onap-all.yaml2
-rwxr-xr-x[-rw-r--r--]kubernetes/onap/values.yaml2
-rwxr-xr-xkubernetes/oof/Chart.yaml2
-rw-r--r--kubernetes/oof/charts/oof-cmso/Chart.yaml2
-rw-r--r--kubernetes/oof/charts/oof-cmso/charts/oof-cmso-optimizer/Chart.yaml2
-rw-r--r--kubernetes/oof/charts/oof-cmso/charts/oof-cmso-service/Chart.yaml2
-rw-r--r--kubernetes/oof/charts/oof-cmso/charts/oof-cmso-ticketmgt/Chart.yaml2
-rw-r--r--kubernetes/oof/charts/oof-cmso/charts/oof-cmso-topology/Chart.yaml2
-rw-r--r--kubernetes/oof/charts/oof-cmso/requirements.yaml4
-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-controller/Chart.yaml2
-rwxr-xr-xkubernetes/oof/charts/oof-has/charts/oof-has-data/Chart.yaml2
-rwxr-xr-xkubernetes/oof/charts/oof-has/charts/oof-has-reservation/Chart.yaml2
-rwxr-xr-xkubernetes/oof/charts/oof-has/charts/oof-has-solver/Chart.yaml2
-rwxr-xr-xkubernetes/oof/charts/oof-has/requirements.yaml4
-rwxr-xr-xkubernetes/oof/requirements.yaml2
-rw-r--r--kubernetes/pnda/Chart.yaml2
-rw-r--r--kubernetes/pnda/charts/dcae-pnda-bootstrap/Chart.yaml2
-rw-r--r--kubernetes/pnda/charts/dcae-pnda-bootstrap/requirements.yaml2
-rw-r--r--kubernetes/pnda/charts/dcae-pnda-mirror/Chart.yaml2
-rw-r--r--kubernetes/pnda/charts/dcae-pnda-mirror/requirements.yaml2
-rw-r--r--kubernetes/pnda/requirements.yaml2
-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/resources/config/pe/brmsgw.conf4
-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/values.yaml2
-rw-r--r--kubernetes/policy/charts/drools/requirements.yaml2
-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/values.yaml2
-rw-r--r--kubernetes/policy/charts/pdp/Chart.yaml2
-rw-r--r--kubernetes/policy/charts/pdp/requirements.yaml2
-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-api/Chart.yaml2
-rw-r--r--kubernetes/policy/charts/policy-api/requirements.yaml2
-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-distribution/Chart.yaml2
-rw-r--r--kubernetes/policy/charts/policy-distribution/requirements.yaml2
-rw-r--r--kubernetes/policy/charts/policy-pap/Chart.yaml2
-rw-r--r--kubernetes/policy/charts/policy-pap/requirements.yaml2
-rw-r--r--kubernetes/policy/charts/policy-xacml-pdp/Chart.yaml2
-rw-r--r--kubernetes/policy/charts/policy-xacml-pdp/requirements.yaml2
-rw-r--r--kubernetes/policy/requirements.yaml2
-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-contextaggregator/Chart.yaml2
-rwxr-xr-xkubernetes/pomba/charts/pomba-contextaggregator/requirements.yaml2
-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-kibana/Chart.yaml2
-rw-r--r--kubernetes/pomba/charts/pomba-kibana/requirements.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-networkdiscoveryctxbuilder/Chart.yaml2
-rw-r--r--kubernetes/pomba/charts/pomba-networkdiscoveryctxbuilder/requirements.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-sdncctxbuilder/Chart.yaml2
-rw-r--r--kubernetes/pomba/charts/pomba-sdncctxbuilder/requirements.yaml2
-rw-r--r--kubernetes/pomba/charts/pomba-search-data/Chart.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-validation-service/Chart.yaml2
-rw-r--r--kubernetes/pomba/charts/pomba-validation-service/requirements.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-cassandra/Chart.yaml2
-rw-r--r--kubernetes/portal/charts/portal-mariadb/Chart.yaml2
-rw-r--r--kubernetes/portal/charts/portal-mariadb/templates/service.yaml2
-rw-r--r--kubernetes/portal/charts/portal-sdk/Chart.yaml2
-rw-r--r--kubernetes/portal/charts/portal-widget/Chart.yaml2
-rw-r--r--kubernetes/portal/charts/portal-zookeeper/Chart.yaml2
-rw-r--r--kubernetes/portal/charts/portal-zookeeper/templates/service.yaml2
-rw-r--r--kubernetes/portal/requirements.yaml2
-rw-r--r--kubernetes/readiness/docker/init/job_complete.py23
-rw-r--r--kubernetes/readiness/docker/init/ready.py58
-rw-r--r--kubernetes/robot/Chart.yaml2
-rwxr-xr-xkubernetes/robot/demo-k8s.sh5
-rw-r--r--kubernetes/robot/onap_dev.pvt27
-rw-r--r--kubernetes/robot/requirements.yaml2
-rw-r--r--kubernetes/robot/resources/config/eteshare/config/integration_preload_parameters.py542
-rw-r--r--kubernetes/robot/resources/config/eteshare/config/integration_robot_properties.py11
-rw-r--r--kubernetes/robot/resources/config/eteshare/config/vm_properties.py22
-rw-r--r--kubernetes/robot/values.yaml57
-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.yaml6
-rw-r--r--kubernetes/sdc/charts/sdc-be/values.yaml2
-rw-r--r--kubernetes/sdc/charts/sdc-cs/Chart.yaml2
-rw-r--r--kubernetes/sdc/charts/sdc-dcae-be/Chart.yaml2
-rw-r--r--kubernetes/sdc/charts/sdc-dcae-dt/Chart.yaml2
-rw-r--r--kubernetes/sdc/charts/sdc-dcae-fe/Chart.yaml2
-rw-r--r--kubernetes/sdc/charts/sdc-dcae-tosca-lab/Chart.yaml2
-rw-r--r--kubernetes/sdc/charts/sdc-es/Chart.yaml2
-rw-r--r--kubernetes/sdc/charts/sdc-fe/Chart.yaml2
-rw-r--r--kubernetes/sdc/charts/sdc-kb/Chart.yaml2
-rw-r--r--kubernetes/sdc/charts/sdc-onboarding-be/Chart.yaml2
-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/ingress.yaml34
-rw-r--r--kubernetes/sdc/charts/sdc-wfd-fe/values.yaml1
-rw-r--r--kubernetes/sdc/requirements.yaml4
-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/sdnc-ansible-server/Chart.yaml2
-rw-r--r--kubernetes/sdnc/charts/sdnc-ansible-server/requirements.yaml2
-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/ueb-listener/Chart.yaml2
-rw-r--r--kubernetes/sdnc/charts/ueb-listener/requirements.yaml2
-rw-r--r--kubernetes/sdnc/requirements.yaml12
-rw-r--r--kubernetes/sdnc/resources/config/bin/installSdncDb.sh38
-rwxr-xr-xkubernetes/sdnc/resources/config/bin/startODL.sh35
-rw-r--r--kubernetes/sdnc/sdnc-prom/Chart.yaml2
-rw-r--r--kubernetes/sdnc/sdnc-prom/requirements.yaml2
-rwxr-xr-xkubernetes/sdnc/templates/job.yaml129
-rw-r--r--kubernetes/sdnc/values.yaml5
-rw-r--r--kubernetes/sniro-emulator/Chart.yaml2
-rw-r--r--kubernetes/sniro-emulator/requirements.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/resources/config/overrides/override.yaml3
-rwxr-xr-xkubernetes/so/charts/so-catalog-db-adapter/Chart.yaml2
-rwxr-xr-xkubernetes/so/charts/so-db-secrets/Chart.yaml2
-rwxr-xr-xkubernetes/so/charts/so-mariadb/Chart.yaml2
-rw-r--r--kubernetes/so/charts/so-monitoring/Chart.yaml2
-rw-r--r--kubernetes/so/charts/so-monitoring/resources/config/overrides/override.yaml8
-rwxr-xr-xkubernetes/so/charts/so-openstack-adapter/Chart.yaml2
-rwxr-xr-xkubernetes/so/charts/so-request-db-adapter/Chart.yaml2
-rwxr-xr-xkubernetes/so/charts/so-sdc-controller/Chart.yaml2
-rwxr-xr-xkubernetes/so/charts/so-sdnc-adapter/Chart.yaml2
-rwxr-xr-xkubernetes/so/charts/so-vfc-adapter/Chart.yaml2
-rwxr-xr-xkubernetes/so/charts/so-vnfm-adapter/Chart.yaml2
-rwxr-xr-xkubernetes/so/requirements.yaml4
-rwxr-xr-xkubernetes/so/values.yaml2
-rw-r--r--kubernetes/uui/Chart.yaml2
-rw-r--r--kubernetes/uui/charts/uui-server/Chart.yaml2
-rw-r--r--kubernetes/uui/requirements.yaml2
-rw-r--r--kubernetes/vfc/Chart.yaml2
-rw-r--r--kubernetes/vfc/charts/vfc-catalog/Chart.yaml2
-rw-r--r--kubernetes/vfc/charts/vfc-ems-driver/Chart.yaml2
-rw-r--r--kubernetes/vfc/charts/vfc-generic-vnfm-driver/Chart.yaml2
-rw-r--r--kubernetes/vfc/charts/vfc-huawei-vnfm-driver/Chart.yaml2
-rw-r--r--kubernetes/vfc/charts/vfc-juju-vnfm-driver/Chart.yaml2
-rw-r--r--kubernetes/vfc/charts/vfc-multivim-proxy/Chart.yaml2
-rw-r--r--kubernetes/vfc/charts/vfc-nokia-v2vnfm-driver/Chart.yaml2
-rw-r--r--kubernetes/vfc/charts/vfc-nslcm/Chart.yaml2
-rw-r--r--kubernetes/vfc/charts/vfc-redis/Chart.yaml2
-rw-r--r--kubernetes/vfc/charts/vfc-resmgr/Chart.yaml2
-rw-r--r--kubernetes/vfc/charts/vfc-vnflcm/Chart.yaml2
-rw-r--r--kubernetes/vfc/charts/vfc-vnfmgr/Chart.yaml2
-rw-r--r--kubernetes/vfc/charts/vfc-vnfres/Chart.yaml2
-rw-r--r--kubernetes/vfc/charts/vfc-workflow-engine/Chart.yaml2
-rw-r--r--kubernetes/vfc/charts/vfc-workflow/Chart.yaml2
-rw-r--r--kubernetes/vfc/charts/vfc-zte-sdnc-driver/Chart.yaml2
-rw-r--r--kubernetes/vfc/charts/vfc-zte-vnfm-driver/Chart.yaml2
-rw-r--r--kubernetes/vfc/requirements.yaml4
-rw-r--r--kubernetes/vid/Chart.yaml2
-rw-r--r--kubernetes/vid/charts/vid-mariadb-galera/Chart.yaml2
-rw-r--r--kubernetes/vid/requirements.yaml2
-rw-r--r--kubernetes/vnfsdk/Chart.yaml2
-rw-r--r--kubernetes/vnfsdk/requirements.yaml4
-rw-r--r--kubernetes/vnfsdk/templates/service.yaml2
365 files changed, 1150 insertions, 1318 deletions
diff --git a/kubernetes/aaf/Chart.yaml b/kubernetes/aaf/Chart.yaml
index b7bfb7f59b..5d0582a53d 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: 4.0.0
+version: 5.0.0
diff --git a/kubernetes/aaf/charts/aaf-cass/Chart.yaml b/kubernetes/aaf/charts/aaf-cass/Chart.yaml
index f06d149300..370681042b 100644
--- a/kubernetes/aaf/charts/aaf-cass/Chart.yaml
+++ b/kubernetes/aaf/charts/aaf-cass/Chart.yaml
@@ -15,4 +15,4 @@
apiVersion: v1
description: ONAP AAF cassandra
name: aaf-cass
-version: 4.0.0
+version: 5.0.0
diff --git a/kubernetes/aaf/charts/aaf-cm/Chart.yaml b/kubernetes/aaf/charts/aaf-cm/Chart.yaml
index 3ece45da49..b284d5b903 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: 4.0.0
+version: 5.0.0
diff --git a/kubernetes/aaf/charts/aaf-fs/Chart.yaml b/kubernetes/aaf/charts/aaf-fs/Chart.yaml
index 5c94aa8141..3c0a4d19f4 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: 4.0.0 \ No newline at end of file
+version: 5.0.0 \ No newline at end of file
diff --git a/kubernetes/aaf/charts/aaf-gui/Chart.yaml b/kubernetes/aaf/charts/aaf-gui/Chart.yaml
index 3313c66999..fb41c5fc02 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: 4.0.0 \ No newline at end of file
+version: 5.0.0 \ No newline at end of file
diff --git a/kubernetes/aaf/charts/aaf-hello/Chart.yaml b/kubernetes/aaf/charts/aaf-hello/Chart.yaml
index 89f061b553..0ab6de1c03 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: 4.0.0 \ No newline at end of file
+version: 5.0.0 \ No newline at end of file
diff --git a/kubernetes/aaf/charts/aaf-locate/Chart.yaml b/kubernetes/aaf/charts/aaf-locate/Chart.yaml
index 10c2b3e3aa..c7f5fc301d 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: 4.0.0 \ No newline at end of file
+version: 5.0.0 \ No newline at end of file
diff --git a/kubernetes/aaf/charts/aaf-oauth/Chart.yaml b/kubernetes/aaf/charts/aaf-oauth/Chart.yaml
index 4ce29df626..c0736529fd 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: 4.0.0 \ No newline at end of file
+version: 5.0.0 \ No newline at end of file
diff --git a/kubernetes/aaf/charts/aaf-service/Chart.yaml b/kubernetes/aaf/charts/aaf-service/Chart.yaml
index 80b2b8f7c7..a5a38f49cc 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: 4.0.0
+version: 5.0.0
diff --git a/kubernetes/aaf/charts/aaf-sms/Chart.yaml b/kubernetes/aaf/charts/aaf-sms/Chart.yaml
index 9402b0033b..0cb82cbabc 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: 4.0.0
+version: 5.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 88079d2ed4..876f358da4 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: 4.0.0
+version: 5.0.0
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 2c8a7a627a..1c3a1afce8 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: 4.0.0
+version: 5.0.0
diff --git a/kubernetes/aaf/charts/aaf-sms/charts/aaf-sms-vault/templates/service.yaml b/kubernetes/aaf/charts/aaf-sms/charts/aaf-sms-vault/templates/service.yaml
index 04e9a5a92f..de6130cb1d 100644
--- a/kubernetes/aaf/charts/aaf-sms/charts/aaf-sms-vault/templates/service.yaml
+++ b/kubernetes/aaf/charts/aaf-sms/charts/aaf-sms-vault/templates/service.yaml
@@ -28,7 +28,7 @@ spec:
- name: {{ .Values.service.portName }}
{{if eq .Values.service.type "NodePort" -}}
port: {{ .Values.service.internalPort }}
- nodePort: {{ .Values.global.nodePortPrefix | default "302" }}{{ .Values.service.nodePort }}
+ nodePort: {{ .Values.global.nodePortPrefix | default .Values.nodePortPrefix }}{{ .Values.service.nodePort }}
{{- else -}}
port: {{ .Values.service.externalPort }}
targetPort: {{ .Values.service.internalPort }}
diff --git a/kubernetes/aaf/charts/aaf-sms/templates/service.yaml b/kubernetes/aaf/charts/aaf-sms/templates/service.yaml
index 18334a301c..5e6bffb89f 100644
--- a/kubernetes/aaf/charts/aaf-sms/templates/service.yaml
+++ b/kubernetes/aaf/charts/aaf-sms/templates/service.yaml
@@ -28,7 +28,7 @@ spec:
- name: {{ .Values.service.PortName }}
{{if eq .Values.service.type "NodePort" -}}
port: {{ .Values.service.internalPort }}
- nodePort: {{ .Values.global.nodePortPrefix | default "302" }}{{ .Values.service.nodePort }}
+ nodePort: {{ .Values.global.nodePortPrefix | default .Values.nodePortPrefix }}{{ .Values.service.nodePort }}
{{- else -}}
port: {{ .Values.service.externalPort }}
targetPort: {{ .Values.service.internalPort }}
diff --git a/kubernetes/aaf/charts/aaf-sshsm/Chart.yaml b/kubernetes/aaf/charts/aaf-sshsm/Chart.yaml
index 6ad7e7ff93..5b9b3e5315 100644
--- a/kubernetes/aaf/charts/aaf-sshsm/Chart.yaml
+++ b/kubernetes/aaf/charts/aaf-sshsm/Chart.yaml
@@ -15,4 +15,4 @@
apiVersion: v1
description: ONAP Hardware Security Components
name: aaf-sshsm
-version: 4.0.0
+version: 5.0.0
diff --git a/kubernetes/aaf/charts/aaf-sshsm/charts/aaf-sshsm-abrmd/Chart.yaml b/kubernetes/aaf/charts/aaf-sshsm/charts/aaf-sshsm-abrmd/Chart.yaml
index ce7488774e..3a9b9cdcb7 100644
--- a/kubernetes/aaf/charts/aaf-sshsm/charts/aaf-sshsm-abrmd/Chart.yaml
+++ b/kubernetes/aaf/charts/aaf-sshsm/charts/aaf-sshsm-abrmd/Chart.yaml
@@ -15,4 +15,4 @@
apiVersion: v1
description: ONAP Trusted Platform Module Resource Manager
name: aaf-sshsm-abrmd
-version: 4.0.0
+version: 5.0.0
diff --git a/kubernetes/aaf/charts/aaf-sshsm/charts/aaf-sshsm-distcenter/Chart.yaml b/kubernetes/aaf/charts/aaf-sshsm/charts/aaf-sshsm-distcenter/Chart.yaml
index 14ddd7b2e9..50ee07c4f5 100644
--- a/kubernetes/aaf/charts/aaf-sshsm/charts/aaf-sshsm-distcenter/Chart.yaml
+++ b/kubernetes/aaf/charts/aaf-sshsm/charts/aaf-sshsm-distcenter/Chart.yaml
@@ -15,4 +15,4 @@
apiVersion: v1
description: ONAP Trusted Platform Module Distribution Center
name: aaf-sshsm-distcenter
-version: 4.0.0
+version: 5.0.0
diff --git a/kubernetes/aaf/charts/aaf-sshsm/charts/aaf-sshsm-testca/Chart.yaml b/kubernetes/aaf/charts/aaf-sshsm/charts/aaf-sshsm-testca/Chart.yaml
index 6260cdd4ac..bc0f559987 100644
--- a/kubernetes/aaf/charts/aaf-sshsm/charts/aaf-sshsm-testca/Chart.yaml
+++ b/kubernetes/aaf/charts/aaf-sshsm/charts/aaf-sshsm-testca/Chart.yaml
@@ -15,4 +15,4 @@
apiVersion: v1
description: ONAP Trusted Platform Module Test CA Service
name: aaf-sshsm-testca
-version: 4.0.0
+version: 5.0.0
diff --git a/kubernetes/aaf/charts/aaf-sshsm/requirements.yaml b/kubernetes/aaf/charts/aaf-sshsm/requirements.yaml
index 7c18fbc982..e6ac00b28d 100644
--- a/kubernetes/aaf/charts/aaf-sshsm/requirements.yaml
+++ b/kubernetes/aaf/charts/aaf-sshsm/requirements.yaml
@@ -14,5 +14,5 @@
dependencies:
- name: common
- version: ~4.x-0
+ version: ~5.x-0
repository: '@local'
diff --git a/kubernetes/aaf/requirements.yaml b/kubernetes/aaf/requirements.yaml
index 1d30dfd918..1063d172a6 100644
--- a/kubernetes/aaf/requirements.yaml
+++ b/kubernetes/aaf/requirements.yaml
@@ -14,5 +14,5 @@
dependencies:
- name: common
- version: ~4.x-0
+ version: ~5.x-0
repository: '@local' \ No newline at end of file
diff --git a/kubernetes/aai b/kubernetes/aai
-Subproject a1e0153fcc6ba67737f23fa0b14c95b0ab66d18
+Subproject c2d6e68b32be2bc2a421f21d23b12abdf314198
diff --git a/kubernetes/appc/Chart.yaml b/kubernetes/appc/Chart.yaml
index b7a0755841..fdda8bb2ea 100644
--- a/kubernetes/appc/Chart.yaml
+++ b/kubernetes/appc/Chart.yaml
@@ -16,4 +16,4 @@
apiVersion: v1
description: Application Controller
name: appc
-version: 4.0.0
+version: 5.0.0
diff --git a/kubernetes/appc/charts/appc-ansible-server/Chart.yaml b/kubernetes/appc/charts/appc-ansible-server/Chart.yaml
index de5213fd40..c1ffaefe27 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: 4.0.0
+version: 5.0.0
diff --git a/kubernetes/appc/charts/appc-ansible-server/requirements.yaml b/kubernetes/appc/charts/appc-ansible-server/requirements.yaml
index 394444104e..dedaefb1a1 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: ~4.x-0
+ version: ~5.x-0
repository: '@local'
diff --git a/kubernetes/appc/charts/appc-ansible-server/templates/pv.yaml b/kubernetes/appc/charts/appc-ansible-server/templates/pv.yaml
index 25257eaeaf..6fef70ceb5 100644
--- a/kubernetes/appc/charts/appc-ansible-server/templates/pv.yaml
+++ b/kubernetes/appc/charts/appc-ansible-server/templates/pv.yaml
@@ -19,7 +19,7 @@
kind: PersistentVolume
apiVersion: v1
metadata:
- name: {{ include "common.fullname" $global }}-data{{$i}}
+ name: {{ include "common.fullname" $global }}-playbook{{$i}}
namespace: {{ include "common.namespace" $global }}
labels:
app: {{ include "common.fullname" $global }}
@@ -32,7 +32,7 @@ spec:
storage: {{ $global.Values.persistence.size}}
accessModes:
- {{ $global.Values.persistence.accessMode }}
- storageClassName: "{{ include "common.fullname" $global }}-data"
+ storageClassName: "{{ include "common.fullname" $global }}-playbook"
persistentVolumeReclaimPolicy: {{ $global.Values.persistence.volumeReclaimPolicy }}
hostPath:
path: {{ $global.Values.global.persistence.mountPath | default $global.Values.persistence.mountPath }}/{{ $global.Release.Name }}/{{ $global.Values.persistence.mountSubPath }}{{$i}}
diff --git a/kubernetes/appc/charts/appc-ansible-server/templates/statefulset.yaml b/kubernetes/appc/charts/appc-ansible-server/templates/statefulset.yaml
index 1df20c291d..f7fa15ca89 100644
--- a/kubernetes/appc/charts/appc-ansible-server/templates/statefulset.yaml
+++ b/kubernetes/appc/charts/appc-ansible-server/templates/statefulset.yaml
@@ -30,6 +30,13 @@ spec:
app: {{ include "common.name" . }}
release: {{ .Release.Name }}
spec:
+ initContainers:
+ - name: {{ include "common.name" . }}-chown
+ image: "busybox"
+ command: ["sh", "-c", "chown -R {{ .Values.config.ansibleUid }}:{{ .Values.config.ansibleGid}} {{ .Values.persistence.playbookPath }}"]
+ volumeMounts:
+ - mountPath: {{ .Values.persistence.playbookPath }}
+ name: {{ include "common.fullname" . }}-playbook
containers:
- name: {{ include "common.name" . }}
command: ["/bin/bash"]
@@ -60,7 +67,7 @@ spec:
name: config
subPath: RestServer_config
- mountPath: {{ .Values.persistence.playbookPath }}
- name: {{ include "common.fullname" . }}-data
+ name: {{ include "common.fullname" . }}-playbook
resources:
{{ include "common.resources" . | indent 12 }}
{{- if .Values.nodeSelector }}
@@ -80,20 +87,18 @@ spec:
name: {{ include "common.fullname" . }}
defaultMode: 0644
{{ if not .Values.persistence.enabled }}
- - name: {{ include "common.fullname" . }}-data
+ - name: {{ include "common.fullname" . }}-playbook
emptyDir: {}
{{ else }}
volumeClaimTemplates:
- metadata:
- name: {{ include "common.fullname" . }}-data
+ name: {{ include "common.fullname" . }}-playbook
labels:
name: {{ include "common.fullname" . }}
spec:
accessModes: [ {{ .Values.persistence.accessMode }} ]
- storageClassName: {{ include "common.fullname" . }}-data
+ storageClassName: {{ include "common.fullname" . }}-playbook
resources:
requests:
storage: {{ .Values.persistence.size }}
{{ end }}
- imagePullSecrets:
- - name: "{{ include "common.namespace" . }}-docker-registry-key"
diff --git a/kubernetes/appc/charts/appc-ansible-server/values.yaml b/kubernetes/appc/charts/appc-ansible-server/values.yaml
index 59cf29f70c..f2dd150160 100644
--- a/kubernetes/appc/charts/appc-ansible-server/values.yaml
+++ b/kubernetes/appc/charts/appc-ansible-server/values.yaml
@@ -37,6 +37,8 @@ debugEnabled: false
# application configuration
config:
+ ansibleUid: 100
+ ansibleGid: 101
appcChartName: appc
mysqlServiceName: appc-dbhost
configDir: /opt/onap/ccsdk
@@ -89,7 +91,7 @@ persistence:
size: 1Gi
mountPath: /dockerdata-nfs
mountSubPath: appc/ansible
- playbookPath: /var/local
+ playbookPath: /home/ansible
ingress:
enabled: false
diff --git a/kubernetes/appc/charts/appc-cdt/Chart.yaml b/kubernetes/appc/charts/appc-cdt/Chart.yaml
index 7680f7fd50..8bbbbd439a 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: 4.0.0
+version: 5.0.0
diff --git a/kubernetes/appc/charts/appc-cdt/requirements.yaml b/kubernetes/appc/charts/appc-cdt/requirements.yaml
index fae2fe2fe7..ad039c205b 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: ~4.x-0
+ version: ~5.x-0
repository: '@local'
diff --git a/kubernetes/appc/charts/appc-cdt/values.yaml b/kubernetes/appc/charts/appc-cdt/values.yaml
index 13dcc1c75b..7db9527a7f 100644
--- a/kubernetes/appc/charts/appc-cdt/values.yaml
+++ b/kubernetes/appc/charts/appc-cdt/values.yaml
@@ -26,7 +26,7 @@ flavor: small
# application image
repository: nexus3.onap.org:10001
-image: onap/appc-cdt-image:1.5.2
+image: onap/appc-cdt-image:1.5.3
pullPolicy: Always
# application configuration
diff --git a/kubernetes/appc/requirements.yaml b/kubernetes/appc/requirements.yaml
index e48d857709..43eeee3490 100644
--- a/kubernetes/appc/requirements.yaml
+++ b/kubernetes/appc/requirements.yaml
@@ -14,11 +14,11 @@
dependencies:
- name: common
- version: ~4.x-0
+ version: ~5.x-0
repository: '@local'
- name: mariadb-galera
- version: ~4.x-0
+ version: ~5.x-0
repository: '@local'
- name: dgbuilder
- version: ~4.x-0
+ version: ~5.x-0
repository: '@local'
diff --git a/kubernetes/appc/resources/config/appc/opt/onap/appc/bin/installFeatures.sh b/kubernetes/appc/resources/config/appc/opt/onap/appc/bin/installFeatures.sh
deleted file mode 100755
index 724f4e767d..0000000000
--- a/kubernetes/appc/resources/config/appc/opt/onap/appc/bin/installFeatures.sh
+++ /dev/null
@@ -1,184 +0,0 @@
-#!/bin/bash
-
-###
-# ============LICENSE_START=======================================================
-# APPC
-# ================================================================================
-# Copyright (C) 2017 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.
-# ============LICENSE_END=========================================================
-# ECOMP is a trademark and service mark of AT&T Intellectual Property.
-###
-
-ODL_HOME=${ODL_HOME:-/opt/opendaylight/current}
-APPC_HOME=${APPC_HOME:-/opt/onap/appc}
-ENABLE_ODL_CLUSTER=${ENABLE_ODL_CLUSTER:-false}
-APPC_FEATURE_DIR=${APPC_FEATURE_DIR:-${APPC_HOME}/features}
-
-function featureInstall {
-COUNT=0
-while [ $COUNT -lt 10 ]; do
- ${ODL_HOME}/bin/client feature:install $1 2> /tmp/installErr
- cat /tmp/installErr
- if grep -q 'Failed to get the session' /tmp/installErr; then
- sleep 10
- else
- let COUNT=10
- fi
- let COUNT=COUNT+1
-done
-}
-
- APPC_FEATURES=" \
- appc-metric \
- appc-dmaap-adapter \
- appc-chef-adapter \
- appc-netconf-adapter \
- appc-rest-adapter \
- appc-lifecycle-management \
- appc-dispatcher \
- appc-provider \
- appc-dg-util \
- appc-dg-shared \
- appc-sdc-listener \
- appc-oam \
- appc-iaas-adapter \
- appc-ansible-adapter \
- appc-sequence-generator \
- appc-artifact-handler \
- appc-aai-client"
-
-APPC_FEATURES_1=" \
- onap-appc-core \
- onap-appc-metric \
- onap-appc-dmaap-adapter \
- onap-appc-chef-adapter \
- onap-appc-netconf-adapter \
- onap-appc-rest-adapter \
- onap-appc-lifecycle-management \
- onap-appc-license-manager"
-
- APPC_FEATURES_2=" \
- onap-appc-dg-util \
- onap-appc-dg-shared \
- onap-appc-sdc-listener \
- onap-appc-oam \
- onap-appc-iaas-adapter \
- onap-appc-ansible-adapter \
- onap-appc-sequence-generator \
- onap-appc-config-generator \
- onap-appc-config-data-services \
- onap-appc-config-adaptor \
- onap-appc-config-audit \
- onap-appc-config-encryption-tool \
- onap-appc-config-flow-controller \
- onap-appc-config-params \
- onap-appc-artifact-handler
- onap-appc-aai-client \
- onap-appc-event-listener \
- onap-appc-network-inventory-client \
- onap-appc-design-services \
- onap-appc-interfaces-service"
-
- APPC_FEATURES_UNZIP=" \
- appc-core \
- appc-metric \
- appc-dmaap-adapter \
- appc-event-listener \
- appc-chef-adapter \
- appc-netconf-adapter \
- appc-rest-adapter \
- appc-lifecycle-management \
- appc-dispatcher \
- appc-provider \
- appc-dg-util \
- appc-dg-shared \
- appc-sdc-listener \
- appc-oam \
- appc-iaas-adapter \
- appc-ansible-adapter \
- appc-sequence-generator \
- appc-config-generator \
- appc-config-data-services \
- appc-config-adaptor \
- appc-config-audit \
- appc-config-encryption-tool \
- appc-config-flow-controller \
- appc-config-params \
- appc-artifact-handler \
- appc-aai-client \
- appc-network-inventory-client \
- appc-design-services \
- appc-interfaces-service"
-
-
-if $ENABLE_ODL_CLUSTER
- then
- echo "Enabling core APP-C features with clustering enabled"
- featureInstall odl-netconf-connector-all
- featureInstall odl-restconf-noauth
- featureInstall odl-netconf-clustered-topology
- else
- echo "Enabling core APP-C features with clustering disabled"
- featureInstall odl-netconf-connector-all
- featureInstall odl-restconf-noauth
- featureInstall odl-netconf-topology
-fi
-
-sleep 7s
-echo "Installing APP-C Features"
-echo ""
-
-for feature in ${APPC_FEATURES_UNZIP}
-do
- if [ -f ${APPC_FEATURE_DIR}/${feature}/install-feature.sh ]
- then
- ${APPC_FEATURE_DIR}/${feature}/install-feature.sh
- else
- echo "No installer found for feature ${feature}"
- fi
-done
-
-#${ODL_HOME}/bin/client feature:install appc-metric appc-dmaap-adapter appc-event-listener appc-chef-adapter appc-netconf-adapter appc-rest-adapter appc-lifecycle-management appc-dispatcher appc-provider appc-dg-util appc-dg-shared appc-sdc-listener appc-oam appc-iaas-adapter appc-ansible-adapter appc-sequence-generator appc-config-generator appc-config-data-services appc-config-adaptor appc-config-audit appc-config-encryption-tool appc-config-flow-controller appc-config-params appc-artifact-handler appc-aai-client
-
-for feature in ${APPC_FEATURES_1}
-do
- echo "Installing ${feature}"
- start=$(date +%s)
- ${ODL_HOME}/bin/client "feature:install -r ${feature}"
- end=$(date +%s)
- echo "Install of ${feature} took $(expr $end - $start) seconds"
- sleep 7s
- echo "Sleep Finished"
-done
-
- echo "Installing dispatcher features"
- start=$(date +%s)
- ${ODL_HOME}/bin/client "feature:install -r onap-appc-request-handler onap-appc-command-executor onap-appc-lifecycle-management onap-appc-workflow-management lock-manager onap-appc-provider"
- end=$(date +%s)
- echo "Install of dispatcher features took $(expr $end - $start) seconds"
- sleep 7s
- echo "Sleep Finished"
-
-for feature in ${APPC_FEATURES_2}
-do
- echo "Installing ${feature}"
- start=$(date +%s)
- ${ODL_HOME}/bin/client "feature:install -r ${feature}"
- end=$(date +%s)
- echo "Install of ${feature} took $(expr $end - $start) seconds"
- sleep 7s
- echo "Sleep Finished"
-done
-
diff --git a/kubernetes/appc/resources/config/appc/opt/onap/appc/bin/startODL.sh b/kubernetes/appc/resources/config/appc/opt/onap/appc/bin/startODL.sh
index ed35de8f77..ad135f863a 100755
--- a/kubernetes/appc/resources/config/appc/opt/onap/appc/bin/startODL.sh
+++ b/kubernetes/appc/resources/config/appc/opt/onap/appc/bin/startODL.sh
@@ -132,8 +132,7 @@ then
if $ENABLE_ODL_CLUSTER
then
- echo "Installing Opendaylight cluster features"
- ${ODL_HOME}/bin/client feature:install odl-mdsal-clustering
+ echo "Enabling Opendaylight cluster features"
enable_odl_cluster
fi
diff --git a/kubernetes/appc/resources/config/appc/opt/onap/ccsdk/bin/startODL.sh b/kubernetes/appc/resources/config/appc/opt/onap/ccsdk/bin/startODL.sh
deleted file mode 100755
index 231fd0a24e..0000000000
--- a/kubernetes/appc/resources/config/appc/opt/onap/ccsdk/bin/startODL.sh
+++ /dev/null
@@ -1,68 +0,0 @@
-#!/bin/bash
-
-###
-# ============LICENSE_START=======================================================
-# openECOMP : SDN-C
-# ================================================================================
-# Copyright (C) 2017 AT&T Intellectual Property. All rights
-# reserved.
-# Modifications 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.
-# ============LICENSE_END=========================================================
-###
-
-
-# Install SDN-C platform components if not already installed and start container
-
-ODL_HOME=${ODL_HOME:-/opt/opendaylight/current}
-ODL_ADMIN_PASSWORD=${ODL_ADMIN_PASSWORD:-Kp8bJ4SXszM0WXlhak3eHlcse2gAw84vaoGGmJvUy2U}
-SDNC_HOME=${SDNC_HOME:-/opt/onap/sdnc}
-SLEEP_TIME=${SLEEP_TIME:-120}
-MYSQL_PASSWD=${MYSQL_PASSWD:-{{.Values.config.mariadbRootPassword}}}
-
-#
-# Wait for database
-#
-echo "Waiting for mariadbgalera"
-until mysql -h {{.Values.config.mariadbGaleraSVCName}}.{{.Release.Namespace}} -u root -p{{.Values.config.mariadbRootPassword}} mysql &> /dev/null
-do
- printf "."
- sleep 1
-done
-echo -e "\nmariadbgalera ready"
-
-if [ ! -f ${SDNC_HOME}/.installed ]
-then
- echo "Installing SDN-C database"
- ${SDNC_HOME}/bin/installSdncDb.sh
- echo "Starting OpenDaylight"
- ${ODL_HOME}/bin/start
- echo "Waiting ${SLEEP_TIME} seconds for OpenDaylight to initialize"
- sleep ${SLEEP_TIME}
- echo "Installing SDN-C platform features"
- ${SDNC_HOME}/bin/installFeatures.sh
- if [ -x ${SDNC_HOME}/svclogic/bin/install.sh ]
- then
- echo "Installing directed graphs"
- ${SDNC_HOME}/svclogic/bin/install.sh
- fi
-
-
- echo "Restarting OpenDaylight"
- ${ODL_HOME}/bin/stop
- echo "Installed at `date`" > ${SDNC_HOME}/.installed
-fi
-
-exec ${ODL_HOME}/bin/karaf
-
diff --git a/kubernetes/appc/templates/statefulset.yaml b/kubernetes/appc/templates/statefulset.yaml
index 6677516990..4fded9aa24 100644
--- a/kubernetes/appc/templates/statefulset.yaml
+++ b/kubernetes/appc/templates/statefulset.yaml
@@ -32,10 +32,9 @@ spec:
app: {{ include "common.name" . }}
release: {{ .Release.Name }}
spec:
- imagePullSecrets:
- - name: "{{ include "common.namespace" . }}-docker-registry-key"
initContainers:
- - command:
+ - name: {{ include "common.name" . }}-readiness
+ command:
- /root/ready.py
args:
- --container-name
@@ -48,7 +47,12 @@ spec:
fieldPath: metadata.namespace
image: "{{ .Values.global.readinessRepository }}/{{ .Values.global.readinessImage }}"
imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
- name: {{ include "common.name" . }}-readiness
+ - name: {{ include "common.name" . }}-chown
+ image: "busybox"
+ command: ["sh", "-c", "chown -R {{ .Values.config.odlUid }}:{{ .Values.config.odlGid}} {{ .Values.persistence.mdsalPath }}"]
+ volumeMounts:
+ - mountPath: {{ .Values.persistence.mdsalPath }}
+ name: {{ include "common.fullname" . }}-data
containers:
- name: {{ include "common.name" . }}
image: "{{ include "common.repository" . }}/{{ .Values.image }}"
@@ -116,9 +120,6 @@ spec:
- mountPath: /opt/onap/appc/bin/installAppcDb.sh
name: onap-appc-bin
subPath: installAppcDb.sh
- - mountPath: /opt/onap/appc/bin/installFeatures.sh
- name: onap-appc-bin
- subPath: installFeatures.sh
- mountPath: /opt/onap/appc/bin/health_check.sh
name: onap-appc-bin
subPath: health_check.sh
@@ -137,9 +138,6 @@ spec:
- mountPath: /opt/onap/ccsdk/svclogic/bin/showActiveGraphs.sh
name: onap-sdnc-svclogic-bin
subPath: showActiveGraphs.sh
- - mountPath: /opt/onap/ccsdk/bin/startODL.sh
- name: onap-sdnc-bin
- subPath: startODL.sh
- mountPath: /opt/onap/ccsdk/bin/installSdncDb.sh
name: onap-sdnc-bin
subPath: installSdncDb.sh
diff --git a/kubernetes/appc/values.yaml b/kubernetes/appc/values.yaml
index 4998b2ec5a..6fa7e65ca6 100644
--- a/kubernetes/appc/values.yaml
+++ b/kubernetes/appc/values.yaml
@@ -31,7 +31,7 @@ global:
flavor: small
# application image
repository: nexus3.onap.org:10001
-image: onap/appc-image:1.5.2
+image: onap/appc-image:1.5.3
pullPolicy: Always
# flag to enable debugging - application support required
@@ -39,6 +39,8 @@ debugEnabled: false
# application configuration
config:
+ odlUid: 100
+ odlGid: 101
ansibleServiceName: appc-ansible-server
ansiblePort: 8000
mariadbRootPassword: secretpassword
diff --git a/kubernetes/cds/Chart.yaml b/kubernetes/cds/Chart.yaml
index acf35d4c8b..f96054fa70 100644
--- a/kubernetes/cds/Chart.yaml
+++ b/kubernetes/cds/Chart.yaml
@@ -16,4 +16,4 @@
apiVersion: v1
description: ONAP Controller Design Studio (CDS)
name: cds
-version: 4.0.0
+version: 5.0.0
diff --git a/kubernetes/cds/charts/cds-blueprints-processor/Chart.yaml b/kubernetes/cds/charts/cds-blueprints-processor/Chart.yaml
index 0563675792..2bd381ef0b 100755
--- a/kubernetes/cds/charts/cds-blueprints-processor/Chart.yaml
+++ b/kubernetes/cds/charts/cds-blueprints-processor/Chart.yaml
@@ -15,4 +15,4 @@
apiVersion: v1
description: ONAP CDS Blueprints Processor
name: cds-blueprints-processor
-version: 4.0.0 \ No newline at end of file
+version: 5.0.0 \ No newline at end of file
diff --git a/kubernetes/cds/charts/cds-blueprints-processor/requirements.yaml b/kubernetes/cds/charts/cds-blueprints-processor/requirements.yaml
index 9f92507a99..e2f56f5200 100755
--- a/kubernetes/cds/charts/cds-blueprints-processor/requirements.yaml
+++ b/kubernetes/cds/charts/cds-blueprints-processor/requirements.yaml
@@ -14,5 +14,5 @@
dependencies:
- name: common
- version: ~4.x-0
+ version: ~5.x-0
repository: '@local' \ No newline at end of file
diff --git a/kubernetes/cds/charts/cds-blueprints-processor/templates/deployment.yaml b/kubernetes/cds/charts/cds-blueprints-processor/templates/deployment.yaml
index 736b5cea24..95069fcbff 100755
--- a/kubernetes/cds/charts/cds-blueprints-processor/templates/deployment.yaml
+++ b/kubernetes/cds/charts/cds-blueprints-processor/templates/deployment.yaml
@@ -60,7 +60,7 @@ spec:
{{ if .Values.liveness.enabled }}
livenessProbe:
httpGet:
- path: /api/v1/execution-service/ping
+ path: /api/v1/execution-service/health-check
port: {{ .Values.service.http.internalPort }}
httpHeaders:
- name: Authorization
@@ -70,7 +70,7 @@ spec:
{{ end }}
readinessProbe:
httpGet:
- path: /api/v1/execution-service/ping
+ path: /api/v1/execution-service/health-check
port: {{ .Values.service.http.internalPort }}
httpHeaders:
- name: Authorization
diff --git a/kubernetes/cds/charts/cds-command-executor/Chart.yaml b/kubernetes/cds/charts/cds-command-executor/Chart.yaml
index 6f17c88c46..3b6bb99eab 100755
--- a/kubernetes/cds/charts/cds-command-executor/Chart.yaml
+++ b/kubernetes/cds/charts/cds-command-executor/Chart.yaml
@@ -15,4 +15,4 @@
apiVersion: v1
description: ONAP CDS Command Executor
name: cds-command-executor
-version: 4.0.0 \ No newline at end of file
+version: 5.0.0 \ No newline at end of file
diff --git a/kubernetes/cds/charts/cds-command-executor/requirements.yaml b/kubernetes/cds/charts/cds-command-executor/requirements.yaml
index a57d2b6103..d7301b6ae3 100755
--- a/kubernetes/cds/charts/cds-command-executor/requirements.yaml
+++ b/kubernetes/cds/charts/cds-command-executor/requirements.yaml
@@ -14,5 +14,5 @@
dependencies:
- name: common
- version: ~4.x-0
+ version: ~5.x-0
repository: '@local' \ No newline at end of file
diff --git a/kubernetes/cds/charts/cds-controller-blueprints/Chart.yaml b/kubernetes/cds/charts/cds-controller-blueprints/Chart.yaml
index fa04a16b00..45776ca7d2 100644
--- a/kubernetes/cds/charts/cds-controller-blueprints/Chart.yaml
+++ b/kubernetes/cds/charts/cds-controller-blueprints/Chart.yaml
@@ -15,4 +15,4 @@
apiVersion: v1
description: ONAP CDS Controller Blueprints
name: cds-controller-blueprints
-version: 4.0.0 \ No newline at end of file
+version: 5.0.0 \ No newline at end of file
diff --git a/kubernetes/cds/charts/cds-controller-blueprints/requirements.yaml b/kubernetes/cds/charts/cds-controller-blueprints/requirements.yaml
index 857a963ada..35b34205db 100644
--- a/kubernetes/cds/charts/cds-controller-blueprints/requirements.yaml
+++ b/kubernetes/cds/charts/cds-controller-blueprints/requirements.yaml
@@ -14,5 +14,5 @@
dependencies:
- name: common
- version: ~4.x-0
+ version: ~5.x-0
repository: '@local' \ No newline at end of file
diff --git a/kubernetes/cds/charts/cds-sdc-listener/Chart.yaml b/kubernetes/cds/charts/cds-sdc-listener/Chart.yaml
index 4385de11c6..e00a959dd1 100755
--- a/kubernetes/cds/charts/cds-sdc-listener/Chart.yaml
+++ b/kubernetes/cds/charts/cds-sdc-listener/Chart.yaml
@@ -15,4 +15,4 @@
apiVersion: v1
description: ONAP CDS SDC listener microservice
name: cds-sdc-listener
-version: 4.0.0 \ No newline at end of file
+version: 5.0.0 \ No newline at end of file
diff --git a/kubernetes/cds/charts/cds-sdc-listener/requirements.yaml b/kubernetes/cds/charts/cds-sdc-listener/requirements.yaml
index a57d2b6103..d7301b6ae3 100755
--- a/kubernetes/cds/charts/cds-sdc-listener/requirements.yaml
+++ b/kubernetes/cds/charts/cds-sdc-listener/requirements.yaml
@@ -14,5 +14,5 @@
dependencies:
- name: common
- version: ~4.x-0
+ version: ~5.x-0
repository: '@local' \ No newline at end of file
diff --git a/kubernetes/cds/charts/cds-ui/Chart.yaml b/kubernetes/cds/charts/cds-ui/Chart.yaml
index d168e7cb9f..3eb310ae8f 100644
--- a/kubernetes/cds/charts/cds-ui/Chart.yaml
+++ b/kubernetes/cds/charts/cds-ui/Chart.yaml
@@ -15,4 +15,4 @@
apiVersion: v1
description: ONAP CDS UI
name: cds-ui
-version: 4.0.0 \ No newline at end of file
+version: 5.0.0 \ No newline at end of file
diff --git a/kubernetes/cds/charts/cds-ui/requirements.yaml b/kubernetes/cds/charts/cds-ui/requirements.yaml
index a57d2b6103..d7301b6ae3 100644
--- a/kubernetes/cds/charts/cds-ui/requirements.yaml
+++ b/kubernetes/cds/charts/cds-ui/requirements.yaml
@@ -14,5 +14,5 @@
dependencies:
- name: common
- version: ~4.x-0
+ version: ~5.x-0
repository: '@local' \ No newline at end of file
diff --git a/kubernetes/cds/charts/cds-ui/templates/deployment.yaml b/kubernetes/cds/charts/cds-ui/templates/deployment.yaml
index ead1b2edbd..562cd54b31 100644
--- a/kubernetes/cds/charts/cds-ui/templates/deployment.yaml
+++ b/kubernetes/cds/charts/cds-ui/templates/deployment.yaml
@@ -50,14 +50,22 @@ spec:
env:
- name: HOST
value: 0.0.0.0
- - name: API_BLUEPRINT_CONTROLLER_BASE_URL
- value: {{ .Values.config.api.controller.baseUrl }}
- - name: API_BLUEPRINT_CONTROLLER_AUTH_TOKEN
- value: {{ .Values.config.api.controller.authToken }}
- - name: API_BLUEPRINT_PROCESSOR_BASE_URL
- value: {{ .Values.config.api.processor.baseUrl }}
- - name: API_BLUEPRINT_PROCESSOR_AUTH_TOKEN
- value: {{ .Values.config.api.processor.authToken }}
+ - name: APP_ACTION_DEPLOY_BLUEPRINT_GRPC_ENABLED
+ value: "{{ .Values.config.app.action.deployBlueprint.grpcEnabled }}"
+ - name: API_BLUEPRINT_CONTROLLER_HTTP_BASE_URL
+ value: {{ .Values.config.api.controller.http.baseUrl }}
+ - name: API_BLUEPRINT_CONTROLLER_HTTP_AUTH_TOKEN
+ value: {{ .Values.config.api.controller.http.authToken }}
+ - name: API_BLUEPRINT_PROCESSOR_HHTP_BASE_URL
+ value: {{ .Values.config.api.processor.http.baseUrl }}
+ - name: API_BLUEPRINT_PROCESSOR_HTTP_AUTH_TOKEN
+ value: {{ .Values.config.api.processor.http.authToken }}
+ - name: API_BLUEPRINT_PROCESSOR_GRPC_HOST
+ value: {{ .Values.config.api.processor.grpc.host }}
+ - name: API_BLUEPRINT_PROCESSOR_GRPC_PORT
+ value: "{{ .Values.config.api.processor.grpc.port }}"
+ - name: API_BLUEPRINT_PROCESSOR_GRPC_AUTH_TOKEN
+ value: {{ .Values.config.api.processor.grpc.authToken }}
readinessProbe:
tcpSocket:
port: {{ .Values.service.internalPort }}
diff --git a/kubernetes/cds/charts/cds-ui/values.yaml b/kubernetes/cds/charts/cds-ui/values.yaml
index 036b888ea7..1ba8a17049 100644
--- a/kubernetes/cds/charts/cds-ui/values.yaml
+++ b/kubernetes/cds/charts/cds-ui/values.yaml
@@ -33,13 +33,23 @@ pullPolicy: Always
# application configuration
config:
+ app:
+ action:
+ deployBlueprint:
+ grpcEnabled: true
api:
controller:
- baseUrl: http://cds-controller-blueprints:8080/api/v1
- authToken: Basic Y2NzZGthcHBzOmNjc2RrYXBwcw==
+ http:
+ baseUrl: http://cds-controller-blueprints:8080/api/v1
+ authToken: Basic Y2NzZGthcHBzOmNjc2RrYXBwcw==
processor:
- baseUrl: http://cds-blueprints-processor-http:8080/api/v1
- authToken: Basic Y2NzZGthcHBzOmNjc2RrYXBwcw==
+ http:
+ baseUrl: http://cds-blueprints-processor-http:8080/api/v1
+ authToken: Basic Y2NzZGthcHBzOmNjc2RrYXBwcw==
+ grpc:
+ host: cds-blueprints-processor-grpc
+ port: 9111
+ authToken: Basic Y2NzZGthcHBzOmNjc2RrYXBwcw==
# default number of instances
replicaCount: 1
diff --git a/kubernetes/cds/requirements.yaml b/kubernetes/cds/requirements.yaml
index 51a4e3f9a1..d6975c49e4 100644
--- a/kubernetes/cds/requirements.yaml
+++ b/kubernetes/cds/requirements.yaml
@@ -15,8 +15,8 @@
dependencies:
- name: common
- version: ~4.x-0
+ version: ~5.x-0
repository: '@local'
- name: mariadb-galera
- version: ~4.x-0
+ version: ~5.x-0
repository: '@local' \ No newline at end of file
diff --git a/kubernetes/clamp/Chart.yaml b/kubernetes/clamp/Chart.yaml
index dc04da7d43..54f2df1fee 100644
--- a/kubernetes/clamp/Chart.yaml
+++ b/kubernetes/clamp/Chart.yaml
@@ -16,4 +16,4 @@
apiVersion: v1
description: ONAP Clamp
name: clamp
-version: 4.0.0
+version: 5.0.0
diff --git a/kubernetes/clamp/charts/clamp-dash-es/Chart.yaml b/kubernetes/clamp/charts/clamp-dash-es/Chart.yaml
index 23367ab5f8..c43b7f312d 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: 4.0.0
+version: 5.0.0
diff --git a/kubernetes/clamp/charts/clamp-dash-es/requirements.yaml b/kubernetes/clamp/charts/clamp-dash-es/requirements.yaml
index 0ba9e4746c..57ee781445 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: ~4.x-0
+ version: ~5.x-0
repository: '@local'
diff --git a/kubernetes/clamp/charts/clamp-dash-kibana/Chart.yaml b/kubernetes/clamp/charts/clamp-dash-kibana/Chart.yaml
index 0a00ba0626..954eebc2eb 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: 4.0.0
+version: 5.0.0
diff --git a/kubernetes/clamp/charts/clamp-dash-kibana/requirements.yaml b/kubernetes/clamp/charts/clamp-dash-kibana/requirements.yaml
index 0ba9e4746c..57ee781445 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: ~4.x-0
+ version: ~5.x-0
repository: '@local'
diff --git a/kubernetes/clamp/charts/clamp-dash-logstash/Chart.yaml b/kubernetes/clamp/charts/clamp-dash-logstash/Chart.yaml
index 4c7c84d0bf..4960a701f8 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: 4.0.0
+version: 5.0.0
diff --git a/kubernetes/clamp/charts/clamp-dash-logstash/requirements.yaml b/kubernetes/clamp/charts/clamp-dash-logstash/requirements.yaml
index 0ba9e4746c..57ee781445 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: ~4.x-0
+ version: ~5.x-0
repository: '@local'
diff --git a/kubernetes/clamp/charts/mariadb/Chart.yaml b/kubernetes/clamp/charts/mariadb/Chart.yaml
index 74183611f3..ef12d234a6 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: 4.0.0
+version: 5.0.0
diff --git a/kubernetes/clamp/requirements.yaml b/kubernetes/clamp/requirements.yaml
index 68a7d9ec14..05d49a8d7b 100644
--- a/kubernetes/clamp/requirements.yaml
+++ b/kubernetes/clamp/requirements.yaml
@@ -15,7 +15,7 @@
dependencies:
- name: common
- version: ~4.x-0
+ version: ~5.x-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/Chart.yaml b/kubernetes/cli/Chart.yaml
index d3a1927fe8..8c1f4919ee 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: 4.0.0
+version: 5.0.0
diff --git a/kubernetes/cli/requirements.yaml b/kubernetes/cli/requirements.yaml
index 9996777c42..6a748bee0c 100644
--- a/kubernetes/cli/requirements.yaml
+++ b/kubernetes/cli/requirements.yaml
@@ -14,7 +14,7 @@
dependencies:
- name: common
- version: ~4.x-0
+ version: ~5.x-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/common/cassandra/Chart.yaml b/kubernetes/common/cassandra/Chart.yaml
index 25cfebf98a..29688cde2c 100644
--- a/kubernetes/common/cassandra/Chart.yaml
+++ b/kubernetes/common/cassandra/Chart.yaml
@@ -16,4 +16,4 @@
apiVersion: v1
description: ONAP cassandra
name: cassandra
-version: 4.0.0
+version: 5.0.0
diff --git a/kubernetes/common/cassandra/requirements.yaml b/kubernetes/common/cassandra/requirements.yaml
index 645b41bae9..8c1b1975c0 100644
--- a/kubernetes/common/cassandra/requirements.yaml
+++ b/kubernetes/common/cassandra/requirements.yaml
@@ -15,5 +15,5 @@
dependencies:
- name: common
- version: ~4.x-0
+ version: ~5.x-0
repository: '@local'
diff --git a/kubernetes/common/common/Chart.yaml b/kubernetes/common/common/Chart.yaml
index 201b0d582f..f4cca48edb 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: 4.0.0
+version: 5.0.0
diff --git a/kubernetes/common/dgbuilder/Chart.yaml b/kubernetes/common/dgbuilder/Chart.yaml
index edcd2e9794..2063cb390e 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: 4.0.0 \ No newline at end of file
+version: 5.0.0 \ No newline at end of file
diff --git a/kubernetes/common/dgbuilder/requirements.yaml b/kubernetes/common/dgbuilder/requirements.yaml
index 4a81e88a6f..3ec7ed7fdd 100644
--- a/kubernetes/common/dgbuilder/requirements.yaml
+++ b/kubernetes/common/dgbuilder/requirements.yaml
@@ -14,5 +14,5 @@
dependencies:
- name: common
- version: ~4.x-0
+ version: ~5.x-0
repository: '@local' \ No newline at end of file
diff --git a/kubernetes/common/etcd/Chart.yaml b/kubernetes/common/etcd/Chart.yaml
index 31a8ad55f0..a01524c42f 100644
--- a/kubernetes/common/etcd/Chart.yaml
+++ b/kubernetes/common/etcd/Chart.yaml
@@ -14,7 +14,7 @@
name: etcd
home: https://github.com/coreos/etcd
-version: 4.0.0
+version: 5.0.0
appVersion: 2.2.5
description: Distributed reliable key-value store for the most critical data of a
distributed system.
diff --git a/kubernetes/common/etcd/requirements.yaml b/kubernetes/common/etcd/requirements.yaml
index 0ddbcbef4a..29a38351ef 100644
--- a/kubernetes/common/etcd/requirements.yaml
+++ b/kubernetes/common/etcd/requirements.yaml
@@ -14,5 +14,5 @@
# limitations under the License
dependencies:
- name: common
- version: ~4.x-0
+ version: ~5.x-0
repository: '@local'
diff --git a/kubernetes/common/mariadb-galera/Chart.yaml b/kubernetes/common/mariadb-galera/Chart.yaml
index 64ba32dbcc..1688e0e9c2 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: 4.0.0
+version: 5.0.0
keywords:
- mariadb
- mysql
diff --git a/kubernetes/common/mariadb-galera/requirements.yaml b/kubernetes/common/mariadb-galera/requirements.yaml
index f01f533591..d323ddaa2b 100644
--- a/kubernetes/common/mariadb-galera/requirements.yaml
+++ b/kubernetes/common/mariadb-galera/requirements.yaml
@@ -14,5 +14,5 @@
dependencies:
- name: common
- version: ~4.x-0
+ version: ~5.x-0
repository: 'file://../common' \ No newline at end of file
diff --git a/kubernetes/common/mongo/Chart.yaml b/kubernetes/common/mongo/Chart.yaml
index 98c9cf8df0..f08a53bdc8 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: 4.0.0
+version: 5.0.0
diff --git a/kubernetes/common/mongo/requirements.yaml b/kubernetes/common/mongo/requirements.yaml
index 71fbbc5ce9..79d7de4dd3 100644
--- a/kubernetes/common/mongo/requirements.yaml
+++ b/kubernetes/common/mongo/requirements.yaml
@@ -14,5 +14,5 @@
dependencies:
- name: common
- version: ~4.x-0
+ version: ~5.x-0
repository: '@local'
diff --git a/kubernetes/common/music/Chart.yaml b/kubernetes/common/music/Chart.yaml
index 3b08fb02cd..db8962ca10 100644
--- a/kubernetes/common/music/Chart.yaml
+++ b/kubernetes/common/music/Chart.yaml
@@ -15,4 +15,4 @@
apiVersion: v1
description: MUSIC - Multi-site State Coordination Service
name: music
-version: 4.0.0
+version: 5.0.0
diff --git a/kubernetes/common/music/charts/music-cassandra-job/Chart.yaml b/kubernetes/common/music/charts/music-cassandra-job/Chart.yaml
index 1cf5470f25..0a8cf35ba3 100644
--- a/kubernetes/common/music/charts/music-cassandra-job/Chart.yaml
+++ b/kubernetes/common/music/charts/music-cassandra-job/Chart.yaml
@@ -15,5 +15,5 @@
apiVersion: v1
description: Cassandra Job - Run CQL Scripts after Cassandra Starts.
name: music-cassandra-job
-version: 4.0.0
+version: 5.0.0
diff --git a/kubernetes/common/music/charts/music-cassandra/Chart.yaml b/kubernetes/common/music/charts/music-cassandra/Chart.yaml
index da15d33d7f..b94527f96b 100644
--- a/kubernetes/common/music/charts/music-cassandra/Chart.yaml
+++ b/kubernetes/common/music/charts/music-cassandra/Chart.yaml
@@ -15,5 +15,5 @@
apiVersion: v1
description: ONAP - Cassandra Database
name: music-cassandra
-version: 4.0.0
+version: 5.0.0
diff --git a/kubernetes/common/music/charts/music-cassandra/requirements.yaml b/kubernetes/common/music/charts/music-cassandra/requirements.yaml
index cee64a54ac..761922361a 100644
--- a/kubernetes/common/music/charts/music-cassandra/requirements.yaml
+++ b/kubernetes/common/music/charts/music-cassandra/requirements.yaml
@@ -14,5 +14,5 @@
dependencies:
- name: common
- version: ~4.x-0
+ version: ~5.x-0
repository: '@local' \ No newline at end of file
diff --git a/kubernetes/common/music/charts/music-tomcat/Chart.yaml b/kubernetes/common/music/charts/music-tomcat/Chart.yaml
index ef9e966327..207f9dcc03 100755
--- a/kubernetes/common/music/charts/music-tomcat/Chart.yaml
+++ b/kubernetes/common/music/charts/music-tomcat/Chart.yaml
@@ -15,4 +15,4 @@
apiVersion: v1
description: ONAP - MUSIC Tomcat Container
name: music-tomcat
-version: 4.0.0
+version: 5.0.0
diff --git a/kubernetes/common/music/charts/music-tomcat/requirements.yaml b/kubernetes/common/music/charts/music-tomcat/requirements.yaml
index 8b30624577..a3dabc0508 100755
--- a/kubernetes/common/music/charts/music-tomcat/requirements.yaml
+++ b/kubernetes/common/music/charts/music-tomcat/requirements.yaml
@@ -15,5 +15,5 @@
dependencies:
- name: common
- version: ~4.x-0
+ version: ~5.x-0
repository: '@local' \ No newline at end of file
diff --git a/kubernetes/common/music/requirements.yaml b/kubernetes/common/music/requirements.yaml
index fae2fe2fe7..ad039c205b 100644
--- a/kubernetes/common/music/requirements.yaml
+++ b/kubernetes/common/music/requirements.yaml
@@ -14,5 +14,5 @@
dependencies:
- name: common
- version: ~4.x-0
+ version: ~5.x-0
repository: '@local'
diff --git a/kubernetes/common/mysql/Chart.yaml b/kubernetes/common/mysql/Chart.yaml
index 1ff737d9bd..7f272295ff 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: 4.0.0
+version: 5.0.0
diff --git a/kubernetes/common/mysql/requirements.yaml b/kubernetes/common/mysql/requirements.yaml
index 71fbbc5ce9..79d7de4dd3 100644
--- a/kubernetes/common/mysql/requirements.yaml
+++ b/kubernetes/common/mysql/requirements.yaml
@@ -14,5 +14,5 @@
dependencies:
- name: common
- version: ~4.x-0
+ version: ~5.x-0
repository: '@local'
diff --git a/kubernetes/common/network-name-gen/Chart.yaml b/kubernetes/common/network-name-gen/Chart.yaml
index 4b7690b3ee..4ba7de9022 100644
--- a/kubernetes/common/network-name-gen/Chart.yaml
+++ b/kubernetes/common/network-name-gen/Chart.yaml
@@ -15,4 +15,4 @@
apiVersion: v1
description: Name Generation Micro Service
name: network-name-gen
-version: 4.0.0
+version: 5.0.0
diff --git a/kubernetes/common/network-name-gen/requirements.yaml b/kubernetes/common/network-name-gen/requirements.yaml
index 31fe2fd159..9ef8db89a4 100644
--- a/kubernetes/common/network-name-gen/requirements.yaml
+++ b/kubernetes/common/network-name-gen/requirements.yaml
@@ -14,8 +14,8 @@
dependencies:
- name: common
- version: ~4.x-0
+ version: ~5.x-0
repository: '@local'
- name: mariadb-galera
- version: ~4.x-0
+ version: ~5.x-0
repository: file://../mariadb-galera/
diff --git a/kubernetes/common/nfs-provisioner/Chart.yaml b/kubernetes/common/nfs-provisioner/Chart.yaml
index fcb69b31e3..ad16ed747b 100644
--- a/kubernetes/common/nfs-provisioner/Chart.yaml
+++ b/kubernetes/common/nfs-provisioner/Chart.yaml
@@ -15,4 +15,4 @@
apiVersion: v1
description: NFS provisioner
name: nfs-provisioner
-version: 4.0.0
+version: 5.0.0
diff --git a/kubernetes/common/nfs-provisioner/requirements.yaml b/kubernetes/common/nfs-provisioner/requirements.yaml
index d175386e2b..542c262ef0 100644
--- a/kubernetes/common/nfs-provisioner/requirements.yaml
+++ b/kubernetes/common/nfs-provisioner/requirements.yaml
@@ -14,5 +14,5 @@
dependencies:
- name: common
- version: ~4.x-0
+ version: ~5.x-0
repository: '@local'
diff --git a/kubernetes/common/postgres/Chart.yaml b/kubernetes/common/postgres/Chart.yaml
index 2de3b42f92..b16a55a012 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: 4.0.0
+version: 5.0.0
diff --git a/kubernetes/common/postgres/charts/pgpool/Chart.yaml b/kubernetes/common/postgres/charts/pgpool/Chart.yaml
index 7807d5bf8e..e2818139fa 100644
--- a/kubernetes/common/postgres/charts/pgpool/Chart.yaml
+++ b/kubernetes/common/postgres/charts/pgpool/Chart.yaml
@@ -15,4 +15,4 @@
apiVersion: v1
description: ONAP Postgres Server
name: pgpool
-version: 4.0.0
+version: 5.0.0
diff --git a/kubernetes/common/postgres/charts/pgpool/requirements.yaml b/kubernetes/common/postgres/charts/pgpool/requirements.yaml
index 27f4c40177..5b097f3ab7 100644
--- a/kubernetes/common/postgres/charts/pgpool/requirements.yaml
+++ b/kubernetes/common/postgres/charts/pgpool/requirements.yaml
@@ -14,5 +14,5 @@
dependencies:
- name: common
- version: ~4.x-0
+ version: ~5.x-0
repository: '@local'
diff --git a/kubernetes/common/postgres/requirements.yaml b/kubernetes/common/postgres/requirements.yaml
index 27f4c40177..5b097f3ab7 100644
--- a/kubernetes/common/postgres/requirements.yaml
+++ b/kubernetes/common/postgres/requirements.yaml
@@ -14,5 +14,5 @@
dependencies:
- name: common
- version: ~4.x-0
+ version: ~5.x-0
repository: '@local'
diff --git a/kubernetes/consul/Chart.yaml b/kubernetes/consul/Chart.yaml
index 1bbeea9660..33b1891d71 100644
--- a/kubernetes/consul/Chart.yaml
+++ b/kubernetes/consul/Chart.yaml
@@ -16,4 +16,4 @@
apiVersion: v1
description: ONAP Consul Agent
name: consul
-version: 4.0.0
+version: 5.0.0
diff --git a/kubernetes/consul/charts/consul-server/Chart.yaml b/kubernetes/consul/charts/consul-server/Chart.yaml
index f8244f0b2c..c80364a122 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: 4.0.0
+version: 5.0.0
diff --git a/kubernetes/consul/charts/consul-server/requirements.yaml b/kubernetes/consul/charts/consul-server/requirements.yaml
index 68a7d9ec14..05d49a8d7b 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: ~4.x-0
+ version: ~5.x-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 68a7d9ec14..05d49a8d7b 100644
--- a/kubernetes/consul/requirements.yaml
+++ b/kubernetes/consul/requirements.yaml
@@ -15,7 +15,7 @@
dependencies:
- name: common
- version: ~4.x-0
+ version: ~5.x-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 634b692a96..703e2bcf0b 100755
--- a/kubernetes/contrib/Chart.yaml
+++ b/kubernetes/contrib/Chart.yaml
@@ -15,4 +15,4 @@
apiVersion: v1
description: ONAP optional tools
name: contrib
-version: 4.0.0
+version: 5.0.0
diff --git a/kubernetes/contrib/charts/netbox/Chart.yaml b/kubernetes/contrib/charts/netbox/Chart.yaml
index db2c984266..86b41aa17c 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: 4.0.0
+version: 5.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 c23cb20e1e..cfd2a3a5e7 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: 4.0.0
+version: 5.0.0
diff --git a/kubernetes/contrib/charts/netbox/charts/netbox-nginx/Chart.yaml b/kubernetes/contrib/charts/netbox/charts/netbox-nginx/Chart.yaml
index 11acec15c8..783edc1431 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: 4.0.0
+version: 5.0.0
diff --git a/kubernetes/contrib/charts/netbox/charts/netbox-postgres/Chart.yaml b/kubernetes/contrib/charts/netbox/charts/netbox-postgres/Chart.yaml
index 7490bf0efd..17468c4d57 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: 4.0.0
+version: 5.0.0
diff --git a/kubernetes/contrib/charts/netbox/requirements.yaml b/kubernetes/contrib/charts/netbox/requirements.yaml
index 5d820137cf..ab55e205e7 100755
--- a/kubernetes/contrib/charts/netbox/requirements.yaml
+++ b/kubernetes/contrib/charts/netbox/requirements.yaml
@@ -14,5 +14,5 @@
dependencies:
- name: common
- version: ~4.x-0
+ version: ~5.x-0
repository: '@local' \ No newline at end of file
diff --git a/kubernetes/contrib/requirements.yaml b/kubernetes/contrib/requirements.yaml
index 5d820137cf..ab55e205e7 100644
--- a/kubernetes/contrib/requirements.yaml
+++ b/kubernetes/contrib/requirements.yaml
@@ -14,5 +14,5 @@
dependencies:
- name: common
- version: ~4.x-0
+ version: ~5.x-0
repository: '@local' \ No newline at end of file
diff --git a/kubernetes/dcaegen2/Chart.yaml b/kubernetes/dcaegen2/Chart.yaml
index ceda39bd75..9c23194558 100644
--- a/kubernetes/dcaegen2/Chart.yaml
+++ b/kubernetes/dcaegen2/Chart.yaml
@@ -15,4 +15,4 @@
apiVersion: v1
description: ONAP DCAE Gen2
name: dcaegen2
-version: 4.0.0
+version: 5.0.0
diff --git a/kubernetes/dcaegen2/charts/dcae-bootstrap/Chart.yaml b/kubernetes/dcaegen2/charts/dcae-bootstrap/Chart.yaml
index 6ac53de0b8..b92c9439e8 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: 4.0.0
+version: 5.0.0
diff --git a/kubernetes/dcaegen2/charts/dcae-bootstrap/requirements.yaml b/kubernetes/dcaegen2/charts/dcae-bootstrap/requirements.yaml
index 5807f08e29..4b650c06dd 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: ~4.x-0
+ version: ~5.x-0
repository: '@local'
- name: postgres
- version: ~4.x-0
+ version: ~5.x-0
repository: '@local'
diff --git a/kubernetes/dcaegen2/charts/dcae-cloudify-manager/Chart.yaml b/kubernetes/dcaegen2/charts/dcae-cloudify-manager/Chart.yaml
index 1f84269f17..159e2b5933 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: 4.0.0
+version: 5.0.0
diff --git a/kubernetes/dcaegen2/charts/dcae-cloudify-manager/requirements.yaml b/kubernetes/dcaegen2/charts/dcae-cloudify-manager/requirements.yaml
index 0ba9e4746c..57ee781445 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: ~4.x-0
+ version: ~5.x-0
repository: '@local'
diff --git a/kubernetes/dcaegen2/charts/dcae-config-binding-service/Chart.yaml b/kubernetes/dcaegen2/charts/dcae-config-binding-service/Chart.yaml
index 295abdbe2a..f1aa82bc69 100644
--- a/kubernetes/dcaegen2/charts/dcae-config-binding-service/Chart.yaml
+++ b/kubernetes/dcaegen2/charts/dcae-config-binding-service/Chart.yaml
@@ -18,4 +18,4 @@
apiVersion: v1
description: ONAP DCAE Config Binding Service
name: dcae-config-binding-service
-version: 4.0.0 \ No newline at end of file
+version: 5.0.0 \ No newline at end of file
diff --git a/kubernetes/dcaegen2/charts/dcae-config-binding-service/requirements.yaml b/kubernetes/dcaegen2/charts/dcae-config-binding-service/requirements.yaml
index 0ba9e4746c..57ee781445 100644
--- a/kubernetes/dcaegen2/charts/dcae-config-binding-service/requirements.yaml
+++ b/kubernetes/dcaegen2/charts/dcae-config-binding-service/requirements.yaml
@@ -15,5 +15,5 @@
dependencies:
- name: common
- version: ~4.x-0
+ version: ~5.x-0
repository: '@local'
diff --git a/kubernetes/dcaegen2/charts/dcae-deployment-handler/Chart.yaml b/kubernetes/dcaegen2/charts/dcae-deployment-handler/Chart.yaml
index 35d892a9cf..042eb68648 100644
--- a/kubernetes/dcaegen2/charts/dcae-deployment-handler/Chart.yaml
+++ b/kubernetes/dcaegen2/charts/dcae-deployment-handler/Chart.yaml
@@ -18,4 +18,4 @@
apiVersion: v1
description: ONAP DCAE Deployment Handler
name: dcae-deployment-handler
-version: 4.0.0
+version: 5.0.0
diff --git a/kubernetes/dcaegen2/charts/dcae-deployment-handler/requirements.yaml b/kubernetes/dcaegen2/charts/dcae-deployment-handler/requirements.yaml
index d2b64d33b2..2dabd190b1 100644
--- a/kubernetes/dcaegen2/charts/dcae-deployment-handler/requirements.yaml
+++ b/kubernetes/dcaegen2/charts/dcae-deployment-handler/requirements.yaml
@@ -15,5 +15,5 @@
dependencies:
- name: common
- version: ~4.0.0
+ version: ~5.x-0
repository: '@local'
diff --git a/kubernetes/dcaegen2/charts/dcae-healthcheck/Chart.yaml b/kubernetes/dcaegen2/charts/dcae-healthcheck/Chart.yaml
index 56e49c9e9b..c6db31d6f6 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: 4.0.0
+version: 5.0.0
diff --git a/kubernetes/dcaegen2/charts/dcae-healthcheck/requirements.yaml b/kubernetes/dcaegen2/charts/dcae-healthcheck/requirements.yaml
index 5b4519e15a..500ab3c5f9 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: ~4.x-0
+ version: ~5.x-0
repository: '@local'
diff --git a/kubernetes/dcaegen2/charts/dcae-policy-handler/Chart.yaml b/kubernetes/dcaegen2/charts/dcae-policy-handler/Chart.yaml
index 98844dce4f..d2b275b615 100644
--- a/kubernetes/dcaegen2/charts/dcae-policy-handler/Chart.yaml
+++ b/kubernetes/dcaegen2/charts/dcae-policy-handler/Chart.yaml
@@ -18,4 +18,4 @@
apiVersion: v1
description: ONAP DCAE Policy Handler
name: dcae-policy-handler
-version: 4.0.0
+version: 5.0.0
diff --git a/kubernetes/dcaegen2/charts/dcae-policy-handler/requirements.yaml b/kubernetes/dcaegen2/charts/dcae-policy-handler/requirements.yaml
index d2b64d33b2..2dabd190b1 100644
--- a/kubernetes/dcaegen2/charts/dcae-policy-handler/requirements.yaml
+++ b/kubernetes/dcaegen2/charts/dcae-policy-handler/requirements.yaml
@@ -15,5 +15,5 @@
dependencies:
- name: common
- version: ~4.0.0
+ version: ~5.x-0
repository: '@local'
diff --git a/kubernetes/dcaegen2/charts/dcae-redis/Chart.yaml b/kubernetes/dcaegen2/charts/dcae-redis/Chart.yaml
index f01b6280df..49ae5d27b5 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: 4.0.0
+version: 5.0.0
diff --git a/kubernetes/dcaegen2/charts/dcae-redis/requirements.yaml b/kubernetes/dcaegen2/charts/dcae-redis/requirements.yaml
index f6b154516e..c0e6595354 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: ~4.x-0
+ version: ~5.x-0
repository: '@local'
diff --git a/kubernetes/dcaegen2/charts/dcae-servicechange-handler/Chart.yaml b/kubernetes/dcaegen2/charts/dcae-servicechange-handler/Chart.yaml
index 918f82e9d4..64c891097c 100644
--- a/kubernetes/dcaegen2/charts/dcae-servicechange-handler/Chart.yaml
+++ b/kubernetes/dcaegen2/charts/dcae-servicechange-handler/Chart.yaml
@@ -18,4 +18,4 @@
apiVersion: v1
description: ONAP DCAE Service Change Handler
name: dcae-servicechange-handler
-version: 4.0.0 \ No newline at end of file
+version: 5.0.0 \ No newline at end of file
diff --git a/kubernetes/dcaegen2/charts/dcae-servicechange-handler/charts/dcae-inventory-api/Chart.yaml b/kubernetes/dcaegen2/charts/dcae-servicechange-handler/charts/dcae-inventory-api/Chart.yaml
index 1b6e852d28..e1735ec8e3 100644
--- a/kubernetes/dcaegen2/charts/dcae-servicechange-handler/charts/dcae-inventory-api/Chart.yaml
+++ b/kubernetes/dcaegen2/charts/dcae-servicechange-handler/charts/dcae-inventory-api/Chart.yaml
@@ -18,4 +18,4 @@
apiVersion: v1
description: ONAP DCAE Inventory API Service
name: dcae-inventory-api
-version: 4.0.0 \ No newline at end of file
+version: 5.0.0 \ No newline at end of file
diff --git a/kubernetes/dcaegen2/charts/dcae-servicechange-handler/charts/dcae-inventory-api/requirements.yaml b/kubernetes/dcaegen2/charts/dcae-servicechange-handler/charts/dcae-inventory-api/requirements.yaml
index 55ac83926f..9136278557 100644
--- a/kubernetes/dcaegen2/charts/dcae-servicechange-handler/charts/dcae-inventory-api/requirements.yaml
+++ b/kubernetes/dcaegen2/charts/dcae-servicechange-handler/charts/dcae-inventory-api/requirements.yaml
@@ -15,8 +15,8 @@
dependencies:
- name: common
- version: ~4.x-0
+ version: ~5.x-0
repository: '@local'
- name: postgres
- version: ~4.x-0
+ version: ~5.x-0
repository: '@local'
diff --git a/kubernetes/dcaegen2/charts/dcae-servicechange-handler/requirements.yaml b/kubernetes/dcaegen2/charts/dcae-servicechange-handler/requirements.yaml
index 0ba9e4746c..57ee781445 100644
--- a/kubernetes/dcaegen2/charts/dcae-servicechange-handler/requirements.yaml
+++ b/kubernetes/dcaegen2/charts/dcae-servicechange-handler/requirements.yaml
@@ -15,5 +15,5 @@
dependencies:
- name: common
- version: ~4.x-0
+ version: ~5.x-0
repository: '@local'
diff --git a/kubernetes/dcaegen2/requirements.yaml b/kubernetes/dcaegen2/requirements.yaml
index fae2fe2fe7..ad039c205b 100644
--- a/kubernetes/dcaegen2/requirements.yaml
+++ b/kubernetes/dcaegen2/requirements.yaml
@@ -14,5 +14,5 @@
dependencies:
- name: common
- version: ~4.x-0
+ version: ~5.x-0
repository: '@local'
diff --git a/kubernetes/dmaap/Chart.yaml b/kubernetes/dmaap/Chart.yaml
index 810e863128..669b9a0d86 100644
--- a/kubernetes/dmaap/Chart.yaml
+++ b/kubernetes/dmaap/Chart.yaml
@@ -16,4 +16,4 @@
apiVersion: v1
description: ONAP DMaaP components
name: dmaap
-version: 4.0.1
+version: 5.0.0 \ No newline at end of file
diff --git a/kubernetes/dmaap/components/dmaap-bc/Chart.yaml b/kubernetes/dmaap/components/dmaap-bc/Chart.yaml
index 37862dcc67..05389d3483 100644
--- a/kubernetes/dmaap/components/dmaap-bc/Chart.yaml
+++ b/kubernetes/dmaap/components/dmaap-bc/Chart.yaml
@@ -16,4 +16,4 @@
apiVersion: v1
description: a Helm chart to deploy ONAP DMaaP Bus Controller (aka dmaap-bc) in Kubernetes
name: dmaap-bc
-version: 4.0.0
+version: 5.0.0
diff --git a/kubernetes/dmaap/components/dmaap-bc/requirements.yaml b/kubernetes/dmaap/components/dmaap-bc/requirements.yaml
index ff249ee683..66da1c5a3d 100644
--- a/kubernetes/dmaap/components/dmaap-bc/requirements.yaml
+++ b/kubernetes/dmaap/components/dmaap-bc/requirements.yaml
@@ -14,9 +14,9 @@
dependencies:
- name: common
- version: ~4.x-0
+ version: ~5.x-0
repository: '@local'
- name: postgres
- version: ~4.x-0
+ version: ~5.x-0
repository: '@local'
condition: PG.enabled
diff --git a/kubernetes/dmaap/components/dmaap-dr-node/Chart.yaml b/kubernetes/dmaap/components/dmaap-dr-node/Chart.yaml
index 44bf9dfc80..eac85ac90e 100644
--- a/kubernetes/dmaap/components/dmaap-dr-node/Chart.yaml
+++ b/kubernetes/dmaap/components/dmaap-dr-node/Chart.yaml
@@ -15,4 +15,4 @@
apiVersion: v1
description: ONAP DMaaP Data Router Node Server
name: dmaap-dr-node
-version: 4.0.0
+version: 5.0.0
diff --git a/kubernetes/dmaap/components/dmaap-dr-node/requirements.yaml b/kubernetes/dmaap/components/dmaap-dr-node/requirements.yaml
index 0b6190657a..3b3cf9a343 100644
--- a/kubernetes/dmaap/components/dmaap-dr-node/requirements.yaml
+++ b/kubernetes/dmaap/components/dmaap-dr-node/requirements.yaml
@@ -20,5 +20,5 @@
dependencies:
- name: common
- version: ~4.x-0
+ version: ~5.x-0
repository: '@local'
diff --git a/kubernetes/dmaap/components/dmaap-dr-prov/Chart.yaml b/kubernetes/dmaap/components/dmaap-dr-prov/Chart.yaml
index fd9a51a6ef..4457ee5f7a 100644
--- a/kubernetes/dmaap/components/dmaap-dr-prov/Chart.yaml
+++ b/kubernetes/dmaap/components/dmaap-dr-prov/Chart.yaml
@@ -15,4 +15,4 @@
apiVersion: v1
description: ONAP DMaaP Data Router Provisioning Server
name: dmaap-dr-prov
-version: 4.0.0
+version: 5.0.0
diff --git a/kubernetes/dmaap/components/dmaap-dr-prov/requirements.yaml b/kubernetes/dmaap/components/dmaap-dr-prov/requirements.yaml
index 949b5bbdc6..8af1edb0ca 100644
--- a/kubernetes/dmaap/components/dmaap-dr-prov/requirements.yaml
+++ b/kubernetes/dmaap/components/dmaap-dr-prov/requirements.yaml
@@ -20,9 +20,9 @@
dependencies:
- name: common
- version: ~4.x-0
+ version: ~5.x-0
repository: '@local'
- name: mariadb-galera
alias: mariadb
- version: ~4.x-0
+ version: ~5.x-0
repository: '@local' \ No newline at end of file
diff --git a/kubernetes/dmaap/components/message-router/Chart.yaml b/kubernetes/dmaap/components/message-router/Chart.yaml
index 1a05378712..87ae24e640 100644
--- a/kubernetes/dmaap/components/message-router/Chart.yaml
+++ b/kubernetes/dmaap/components/message-router/Chart.yaml
@@ -16,4 +16,4 @@
apiVersion: v1
description: ONAP Message Router
name: message-router
-version: 4.0.0
+version: 5.0.0
diff --git a/kubernetes/dmaap/components/message-router/charts/message-router-kafka/Chart.yaml b/kubernetes/dmaap/components/message-router/charts/message-router-kafka/Chart.yaml
index 0f7c27701d..83f619d0a1 100644
--- a/kubernetes/dmaap/components/message-router/charts/message-router-kafka/Chart.yaml
+++ b/kubernetes/dmaap/components/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: 4.0.0
+version: 5.0.0
diff --git a/kubernetes/dmaap/components/message-router/charts/message-router-mirrormaker/Chart.yaml b/kubernetes/dmaap/components/message-router/charts/message-router-mirrormaker/Chart.yaml
index 1d0b7bea22..921865dcbe 100644
--- a/kubernetes/dmaap/components/message-router/charts/message-router-mirrormaker/Chart.yaml
+++ b/kubernetes/dmaap/components/message-router/charts/message-router-mirrormaker/Chart.yaml
@@ -16,5 +16,5 @@
apiVersion: v1
description: ONAP Message Router Kafka Service
name: message-router-mirrormaker
-version: 4.0.0
+version: 5.0.0
diff --git a/kubernetes/dmaap/components/message-router/charts/message-router-zookeeper/Chart.yaml b/kubernetes/dmaap/components/message-router/charts/message-router-zookeeper/Chart.yaml
index a6a73b5d3d..61246f59a5 100644
--- a/kubernetes/dmaap/components/message-router/charts/message-router-zookeeper/Chart.yaml
+++ b/kubernetes/dmaap/components/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: 4.0.0
+version: 5.0.0
diff --git a/kubernetes/dmaap/components/message-router/requirements.yaml b/kubernetes/dmaap/components/message-router/requirements.yaml
index a13c53da2c..6d98d6823b 100644
--- a/kubernetes/dmaap/components/message-router/requirements.yaml
+++ b/kubernetes/dmaap/components/message-router/requirements.yaml
@@ -15,7 +15,7 @@
dependencies:
- name: common
- version: ~4.x-0
+ version: ~5.x-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 3507bd87cd..50ff2590ab 100644
--- a/kubernetes/dmaap/requirements.yaml
+++ b/kubernetes/dmaap/requirements.yaml
@@ -15,21 +15,21 @@
dependencies:
- name: common
- version: ~4.x-0
+ version: ~5.x-0
repository: '@local'
- name: message-router
- version: ~4.x-0
+ version: ~5.x-0
repository: 'file://components/message-router'
condition: message-router.enabled
- name: dmaap-bc
- version: ~4.x-0
+ version: ~5.x-0
repository: 'file://components/dmaap-bc'
condition: dmaap-bc.enabled
- name: dmaap-dr-node
- version: ~4.x-0
+ version: ~5.x-0
repository: 'file://components/dmaap-dr-node'
condition: dmaap-dr-node.enabled
- name: dmaap-dr-prov
- version: ~4.x-0
+ version: ~5.x-0
repository: 'file://components/dmaap-dr-prov'
condition: dmaap-dr-prov.enabled
diff --git a/kubernetes/esr/Chart.yaml b/kubernetes/esr/Chart.yaml
index 0f48961e81..79436f7d7c 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: 4.0.0
+version: 5.0.0
diff --git a/kubernetes/esr/charts/esr-gui/Chart.yaml b/kubernetes/esr/charts/esr-gui/Chart.yaml
index dfc1e26418..d60387756e 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: 4.0.0
+version: 5.0.0
diff --git a/kubernetes/esr/charts/esr-server/Chart.yaml b/kubernetes/esr/charts/esr-server/Chart.yaml
index c9718f28a7..66fcffc35c 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: 4.0.0
+version: 5.0.0
diff --git a/kubernetes/esr/charts/esr-server/requirements.yaml b/kubernetes/esr/charts/esr-server/requirements.yaml
index 9ebc9b9df1..bcc64d828c 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: ~4.x-0
+ version: ~5.x-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/requirements.yaml b/kubernetes/esr/requirements.yaml
index 68a7d9ec14..05d49a8d7b 100644
--- a/kubernetes/esr/requirements.yaml
+++ b/kubernetes/esr/requirements.yaml
@@ -15,7 +15,7 @@
dependencies:
- name: common
- version: ~4.x-0
+ version: ~5.x-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 b3472d4d98..efb130ff82 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: 4.0.0 \ No newline at end of file
+version: 5.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 1d30dfd918..1063d172a6 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: ~4.x-0
+ version: ~5.x-0
repository: '@local' \ No newline at end of file
diff --git a/kubernetes/log/Chart.yaml b/kubernetes/log/Chart.yaml
index 09edd37565..b0a75cb6e3 100644
--- a/kubernetes/log/Chart.yaml
+++ b/kubernetes/log/Chart.yaml
@@ -16,4 +16,4 @@
apiVersion: v1
description: ONAP Logging ElasticStack
name: log
-version: 4.0.0
+version: 5.0.0
diff --git a/kubernetes/log/charts/log-elasticsearch/Chart.yaml b/kubernetes/log/charts/log-elasticsearch/Chart.yaml
index b5275ebbff..484a8e3a8a 100644
--- a/kubernetes/log/charts/log-elasticsearch/Chart.yaml
+++ b/kubernetes/log/charts/log-elasticsearch/Chart.yaml
@@ -16,4 +16,4 @@
apiVersion: v1
description: ONAP Logging Elasticsearch
name: log-elasticsearch
-version: 4.0.0
+version: 5.0.0
diff --git a/kubernetes/log/charts/log-elasticsearch/requirements.yaml b/kubernetes/log/charts/log-elasticsearch/requirements.yaml
index 0ba9e4746c..57ee781445 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: ~4.x-0
+ version: ~5.x-0
repository: '@local'
diff --git a/kubernetes/log/charts/log-kibana/Chart.yaml b/kubernetes/log/charts/log-kibana/Chart.yaml
index 20384764c9..0e85c910c6 100644
--- a/kubernetes/log/charts/log-kibana/Chart.yaml
+++ b/kubernetes/log/charts/log-kibana/Chart.yaml
@@ -16,4 +16,4 @@
apiVersion: v1
description: ONAP Logging Kibana
name: log-kibana
-version: 4.0.0
+version: 5.0.0
diff --git a/kubernetes/log/charts/log-kibana/requirements.yaml b/kubernetes/log/charts/log-kibana/requirements.yaml
index 0ba9e4746c..57ee781445 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: ~4.x-0
+ version: ~5.x-0
repository: '@local'
diff --git a/kubernetes/log/charts/log-kibana/resources/config/README.txt b/kubernetes/log/charts/log-kibana/resources/config/README.txt
new file mode 100644
index 0000000000..2863c1d5e5
--- /dev/null
+++ b/kubernetes/log/charts/log-kibana/resources/config/README.txt
@@ -0,0 +1 @@
+"kibana-onboarding.json" file contains initial setup of Kibana obtained using Elasticdump tool. \ No newline at end of file
diff --git a/kubernetes/log/charts/log-kibana/resources/config/kibana-onboarding.json b/kubernetes/log/charts/log-kibana/resources/config/kibana-onboarding.json
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/kubernetes/log/charts/log-kibana/resources/config/kibana-onboarding.json
diff --git a/kubernetes/log/charts/log-kibana/templates/deployment.yaml b/kubernetes/log/charts/log-kibana/templates/deployment.yaml
index ac52f62fde..657dca41a8 100644
--- a/kubernetes/log/charts/log-kibana/templates/deployment.yaml
+++ b/kubernetes/log/charts/log-kibana/templates/deployment.yaml
@@ -46,6 +46,22 @@ spec:
image: "{{ .Values.global.readinessRepository }}/{{ .Values.global.readinessImage }}"
imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
name: {{ include "common.name" . }}-readiness
+ - args:
+ - --input=/config/kibana-onboarding.json
+ - --output=http://{{.Values.config.elasticsearchServiceName}}.{{ include "common.namespace" . }}:{{.Values.config.elasticsearchPort}}/.kibana
+ env:
+ - name: NAMESPACE
+ valueFrom:
+ fieldRef:
+ apiVersion: v1
+ fieldPath: metadata.namespace
+ image: "{{ .Values.elasticdumpRepository }}/{{ .Values.elasticdumpImage }}"
+ imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
+ name: {{ include "common.name" . }}-elasticdump
+ volumeMounts:
+ - mountPath: /config/kibana-onboarding.json
+ name: {{ include "common.fullname" . }}
+ subPath: kibana-onboarding.json
containers:
- name: {{ include "common.name" . }}
image: "{{ .Values.global.loggingRepository | default .Values.loggingRepository }}/{{ .Values.image }}"
@@ -90,5 +106,7 @@ spec:
items:
- key: kibana.yml
path: kibana.yml
+ - key: kibana-onboarding.json
+ path: kibana-onboarding.json
imagePullSecrets:
- name: "{{ include "common.namespace" . }}-docker-registry-key"
diff --git a/kubernetes/log/charts/log-kibana/values.yaml b/kubernetes/log/charts/log-kibana/values.yaml
index 8a56151c38..5132768206 100644
--- a/kubernetes/log/charts/log-kibana/values.yaml
+++ b/kubernetes/log/charts/log-kibana/values.yaml
@@ -26,6 +26,10 @@ global:
# Application configuration defaults.
#################################################################
+# Elasticdump image
+elasticdumpRepository: docker.io
+elasticdumpImage: taskrabbit/elasticsearch-dump
+
# BusyBox image
busyboxRepository: registry.hub.docker.com
busyboxImage: library/busybox:latest
diff --git a/kubernetes/log/charts/log-logstash/Chart.yaml b/kubernetes/log/charts/log-logstash/Chart.yaml
index 51bf8780a1..398a322571 100644
--- a/kubernetes/log/charts/log-logstash/Chart.yaml
+++ b/kubernetes/log/charts/log-logstash/Chart.yaml
@@ -16,4 +16,4 @@
apiVersion: v1
description: ONAP Logging Logstash
name: log-logstash
-version: 4.0.0
+version: 5.0.0
diff --git a/kubernetes/log/charts/log-logstash/requirements.yaml b/kubernetes/log/charts/log-logstash/requirements.yaml
index 0ba9e4746c..57ee781445 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: ~4.x-0
+ version: ~5.x-0
repository: '@local'
diff --git a/kubernetes/log/requirements.yaml b/kubernetes/log/requirements.yaml
index fae2fe2fe7..ad039c205b 100644
--- a/kubernetes/log/requirements.yaml
+++ b/kubernetes/log/requirements.yaml
@@ -14,5 +14,5 @@
dependencies:
- name: common
- version: ~4.x-0
+ version: ~5.x-0
repository: '@local'
diff --git a/kubernetes/modeling/Chart.yaml b/kubernetes/modeling/Chart.yaml
index 5094318953..526cef7962 100644
--- a/kubernetes/modeling/Chart.yaml
+++ b/kubernetes/modeling/Chart.yaml
@@ -15,4 +15,4 @@
apiVersion: v1
description: ONAP Modeling (Modeling)
name: modeling
-version: 4.0.0
+version: 5.0.0
diff --git a/kubernetes/modeling/charts/modeling-genericparser/Chart.yaml b/kubernetes/modeling/charts/modeling-genericparser/Chart.yaml
index 48c0c64eb9..d5f20be640 100644
--- a/kubernetes/modeling/charts/modeling-genericparser/Chart.yaml
+++ b/kubernetes/modeling/charts/modeling-genericparser/Chart.yaml
@@ -15,4 +15,4 @@
apiVersion: v1
description: ONAP Modeling - Genericparser
name: modeling-genericparser
-version: 4.0.0 \ No newline at end of file
+version: 5.0.0 \ No newline at end of file
diff --git a/kubernetes/modeling/requirements.yaml b/kubernetes/modeling/requirements.yaml
index 71bfc00487..c2c445c4e5 100644
--- a/kubernetes/modeling/requirements.yaml
+++ b/kubernetes/modeling/requirements.yaml
@@ -14,8 +14,8 @@
dependencies:
- name: common
- version: ~4.x-0
+ version: ~5.x-0
repository: '@local'
- name: mariadb-galera
- version: ~4.x-0
+ version: ~5.x-0
repository: '@local'
diff --git a/kubernetes/msb/Chart.yaml b/kubernetes/msb/Chart.yaml
index a0714aa465..ddd8ba4272 100644
--- a/kubernetes/msb/Chart.yaml
+++ b/kubernetes/msb/Chart.yaml
@@ -16,4 +16,4 @@
apiVersion: v1
description: ONAP MicroServices Bus
name: msb
-version: 4.0.0
+version: 5.0.0
diff --git a/kubernetes/msb/charts/kube2msb/Chart.yaml b/kubernetes/msb/charts/kube2msb/Chart.yaml
index 3290f4de33..e0dc244447 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: 4.0.0
+version: 5.0.0
diff --git a/kubernetes/msb/charts/kube2msb/requirements.yaml b/kubernetes/msb/charts/kube2msb/requirements.yaml
index 2d2a9f0c02..798f2d32fe 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: ~4.x-0
+ version: ~5.x-0
repository: '@local'
diff --git a/kubernetes/msb/charts/msb-consul/Chart.yaml b/kubernetes/msb/charts/msb-consul/Chart.yaml
index ce0088e07f..ccb6e3d948 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: 4.0.0
+version: 5.0.0
diff --git a/kubernetes/msb/charts/msb-consul/requirements.yaml b/kubernetes/msb/charts/msb-consul/requirements.yaml
index 2d2a9f0c02..798f2d32fe 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: ~4.x-0
+ version: ~5.x-0
repository: '@local'
diff --git a/kubernetes/msb/charts/msb-discovery/Chart.yaml b/kubernetes/msb/charts/msb-discovery/Chart.yaml
index 88e0aa6bb7..7e1b554cdd 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: 4.0.0
+version: 5.0.0
diff --git a/kubernetes/msb/charts/msb-discovery/requirements.yaml b/kubernetes/msb/charts/msb-discovery/requirements.yaml
index 2d2a9f0c02..798f2d32fe 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: ~4.x-0
+ version: ~5.x-0
repository: '@local'
diff --git a/kubernetes/msb/charts/msb-eag/Chart.yaml b/kubernetes/msb/charts/msb-eag/Chart.yaml
index c9f7c905e7..5360093105 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: 4.0.0
+version: 5.0.0
diff --git a/kubernetes/msb/charts/msb-eag/requirements.yaml b/kubernetes/msb/charts/msb-eag/requirements.yaml
index 2d2a9f0c02..798f2d32fe 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: ~4.x-0
+ version: ~5.x-0
repository: '@local'
diff --git a/kubernetes/msb/charts/msb-iag/Chart.yaml b/kubernetes/msb/charts/msb-iag/Chart.yaml
index 870d95179a..549a199c3c 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: 4.0.0
+version: 5.0.0
diff --git a/kubernetes/msb/charts/msb-iag/requirements.yaml b/kubernetes/msb/charts/msb-iag/requirements.yaml
index 2d2a9f0c02..798f2d32fe 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: ~4.x-0
+ version: ~5.x-0
repository: '@local'
diff --git a/kubernetes/msb/requirements.yaml b/kubernetes/msb/requirements.yaml
index 2d2a9f0c02..798f2d32fe 100644
--- a/kubernetes/msb/requirements.yaml
+++ b/kubernetes/msb/requirements.yaml
@@ -13,5 +13,5 @@
# limitations under the License.
dependencies:
- name: common
- version: ~4.x-0
+ version: ~5.x-0
repository: '@local'
diff --git a/kubernetes/multicloud/Chart.yaml b/kubernetes/multicloud/Chart.yaml
index 9b90b2b321..0c7b001959 100644
--- a/kubernetes/multicloud/Chart.yaml
+++ b/kubernetes/multicloud/Chart.yaml
@@ -16,4 +16,4 @@
apiVersion: v1
description: ONAP multicloud broker
name: multicloud
-version: 4.0.0
+version: 5.0.0
diff --git a/kubernetes/multicloud/charts/multicloud-azure/Chart.yaml b/kubernetes/multicloud/charts/multicloud-azure/Chart.yaml
index 825eaf6305..b6221b3236 100644
--- a/kubernetes/multicloud/charts/multicloud-azure/Chart.yaml
+++ b/kubernetes/multicloud/charts/multicloud-azure/Chart.yaml
@@ -16,4 +16,4 @@
apiVersion: v1
description: ONAP multicloud Azure plugin
name: multicloud-azure
-version: 4.0.0
+version: 5.0.0
diff --git a/kubernetes/multicloud/charts/multicloud-fcaps/Chart.yaml b/kubernetes/multicloud/charts/multicloud-fcaps/Chart.yaml
index ac5e8172f0..5ceb5b1c34 100644
--- a/kubernetes/multicloud/charts/multicloud-fcaps/Chart.yaml
+++ b/kubernetes/multicloud/charts/multicloud-fcaps/Chart.yaml
@@ -15,4 +15,4 @@
apiVersion: v1
description: ONAP multicloud OpenStack fcaps Plugin
name: multicloud-fcaps
-version: 4.0.0
+version: 5.0.0
diff --git a/kubernetes/multicloud/charts/multicloud-k8s/Chart.yaml b/kubernetes/multicloud/charts/multicloud-k8s/Chart.yaml
index 5a73ee32b4..3c61d81dad 100644
--- a/kubernetes/multicloud/charts/multicloud-k8s/Chart.yaml
+++ b/kubernetes/multicloud/charts/multicloud-k8s/Chart.yaml
@@ -15,4 +15,4 @@
apiVersion: v1
description: ONAP Multicloud Kubernetes Plugin
name: multicloud-k8s
-version: 4.0.0
+version: 5.0.0
diff --git a/kubernetes/multicloud/charts/multicloud-k8s/requirements.yaml b/kubernetes/multicloud/charts/multicloud-k8s/requirements.yaml
index 77546853ca..fa1c39700a 100644
--- a/kubernetes/multicloud/charts/multicloud-k8s/requirements.yaml
+++ b/kubernetes/multicloud/charts/multicloud-k8s/requirements.yaml
@@ -14,14 +14,14 @@
dependencies:
- name: common
- version: ~4.x-0
+ version: ~5.x-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: ~4.x-0
+ version: ~5.x-0
repository: '@local'
- name: etcd
- version: ~4.x-0
+ version: ~5.x-0
repository: '@local'
diff --git a/kubernetes/multicloud/charts/multicloud-lenovo/Chart.yaml b/kubernetes/multicloud/charts/multicloud-lenovo/Chart.yaml
index 702bafe9e4..fc682be388 100644
--- a/kubernetes/multicloud/charts/multicloud-lenovo/Chart.yaml
+++ b/kubernetes/multicloud/charts/multicloud-lenovo/Chart.yaml
@@ -15,4 +15,4 @@
apiVersion: v1
description: ONAP multicloud OpenStack Lenovo Plugin
name: multicloud-lenovo
-version: 4.0.0
+version: 5.0.0
diff --git a/kubernetes/multicloud/charts/multicloud-ocata/Chart.yaml b/kubernetes/multicloud/charts/multicloud-ocata/Chart.yaml
index ba8b70acfd..85be0151b3 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: 4.0.0
+version: 5.0.0
diff --git a/kubernetes/multicloud/charts/multicloud-pike/Chart.yaml b/kubernetes/multicloud/charts/multicloud-pike/Chart.yaml
index 6c71dea0ab..f936566861 100644
--- a/kubernetes/multicloud/charts/multicloud-pike/Chart.yaml
+++ b/kubernetes/multicloud/charts/multicloud-pike/Chart.yaml
@@ -15,4 +15,4 @@
apiVersion: v1
description: ONAP multicloud OpenStack Pike Plugin
name: multicloud-pike
-version: 4.0.0
+version: 5.0.0
diff --git a/kubernetes/multicloud/charts/multicloud-prometheus/Chart.yaml b/kubernetes/multicloud/charts/multicloud-prometheus/Chart.yaml
index 6e54b93e5b..5eaffa7f15 100644
--- a/kubernetes/multicloud/charts/multicloud-prometheus/Chart.yaml
+++ b/kubernetes/multicloud/charts/multicloud-prometheus/Chart.yaml
@@ -15,4 +15,4 @@
apiVersion: v1
description: ONAP Multicloud Prometheus
name: multicloud-prometheus
-version: 4.0.0
+version: 5.0.0
diff --git a/kubernetes/multicloud/charts/multicloud-prometheus/charts/prometheus-alertmanager/Chart.yaml b/kubernetes/multicloud/charts/multicloud-prometheus/charts/prometheus-alertmanager/Chart.yaml
index 6dae8efa2d..0020823b0e 100644
--- a/kubernetes/multicloud/charts/multicloud-prometheus/charts/prometheus-alertmanager/Chart.yaml
+++ b/kubernetes/multicloud/charts/multicloud-prometheus/charts/prometheus-alertmanager/Chart.yaml
@@ -15,4 +15,4 @@
apiVersion: v1
description: ONAP Multicloud Prometheus Alert Manager
name: prometheus-alertmanager
-version: 4.0.0
+version: 5.0.0
diff --git a/kubernetes/multicloud/charts/multicloud-prometheus/charts/prometheus-grafana/Chart.yaml b/kubernetes/multicloud/charts/multicloud-prometheus/charts/prometheus-grafana/Chart.yaml
index 77970b8e13..6c3f8a4ef7 100644
--- a/kubernetes/multicloud/charts/multicloud-prometheus/charts/prometheus-grafana/Chart.yaml
+++ b/kubernetes/multicloud/charts/multicloud-prometheus/charts/prometheus-grafana/Chart.yaml
@@ -15,4 +15,4 @@
apiVersion: v1
description: ONAP Multicloud Grafana for Prometheus
name: prometheus-grafana
-version: 4.0.0
+version: 5.0.0
diff --git a/kubernetes/multicloud/charts/multicloud-vio/Chart.yaml b/kubernetes/multicloud/charts/multicloud-vio/Chart.yaml
index ae7dba61ec..70250e9231 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: 4.0.0
+version: 5.0.0
diff --git a/kubernetes/multicloud/charts/multicloud-windriver/Chart.yaml b/kubernetes/multicloud/charts/multicloud-windriver/Chart.yaml
index fa0ea64e0d..46c5dfb8dc 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: 4.0.0
+version: 5.0.0
diff --git a/kubernetes/multicloud/requirements.yaml b/kubernetes/multicloud/requirements.yaml
index 0ba9e4746c..57ee781445 100644
--- a/kubernetes/multicloud/requirements.yaml
+++ b/kubernetes/multicloud/requirements.yaml
@@ -15,5 +15,5 @@
dependencies:
- name: common
- version: ~4.x-0
+ version: ~5.x-0
repository: '@local'
diff --git a/kubernetes/nbi/Chart.yaml b/kubernetes/nbi/Chart.yaml
index 76b668ef6d..f82bf472ff 100644
--- a/kubernetes/nbi/Chart.yaml
+++ b/kubernetes/nbi/Chart.yaml
@@ -16,4 +16,4 @@
apiVersion: v1
description: ONAP Northbound Interface
name: nbi
-version: 4.0.0
+version: 5.0.0
diff --git a/kubernetes/nbi/charts/mariadb/Chart.yaml b/kubernetes/nbi/charts/mariadb/Chart.yaml
index 96b11ea7f1..06ac100abb 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: 4.0.0
+version: 5.0.0
diff --git a/kubernetes/nbi/charts/mariadb/requirements.yaml b/kubernetes/nbi/charts/mariadb/requirements.yaml
index ce3bc4618a..56097c0af4 100644
--- a/kubernetes/nbi/charts/mariadb/requirements.yaml
+++ b/kubernetes/nbi/charts/mariadb/requirements.yaml
@@ -15,7 +15,7 @@
dependencies:
- name: common
- version: ~4.x-0
+ version: ~5.x-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/requirements.yaml b/kubernetes/nbi/requirements.yaml
index d9dd0bc677..b440b1e30f 100644
--- a/kubernetes/nbi/requirements.yaml
+++ b/kubernetes/nbi/requirements.yaml
@@ -15,12 +15,12 @@
dependencies:
- name: common
- version: ~4.x-0
+ version: ~5.x-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: ~4.x-0
+ version: ~5.x-0
repository: '@local'
diff --git a/kubernetes/onap/Chart.yaml b/kubernetes/onap/Chart.yaml
index 82228a8b10..fa2ed65617 100644
--- a/kubernetes/onap/Chart.yaml
+++ b/kubernetes/onap/Chart.yaml
@@ -14,10 +14,10 @@
apiVersion: v1
name: onap
-version: 4.0.0
-appVersion: Dublin
+version: 5.0.0
+appVersion: El Alto
description: Open Network Automation Platform (ONAP)
home: https://www.onap.org/
sources:
- https://gerrit.onap.org/r/#/admin/projects/
-icon: https://wiki.onap.org/download/thumbnails/1015829/onap_704x271%20copy.png?version=1&modificationDate=1488326334000&api=v2 \ No newline at end of file
+icon: https://wiki.onap.org/download/thumbnails/1015829/onap_704x271%20copy.png?version=1&modificationDate=1488326334000&api=v2
diff --git a/kubernetes/onap/requirements.yaml b/kubernetes/onap/requirements.yaml
index c267eaa021..5dd51a006b 100644..100755
--- a/kubernetes/onap/requirements.yaml
+++ b/kubernetes/onap/requirements.yaml
@@ -18,133 +18,137 @@
# > helm repo add local http://127.0.0.1:8879
dependencies:
- name: aaf
- version: ~4.x-0
+ version: ~5.x-0
repository: '@local'
condition: aaf.enabled
- name: aai
- version: ~4.x-0
+ version: ~5.x-0
repository: '@local'
condition: aai.enabled
- name: appc
- version: ~4.x-0
+ version: ~5.x-0
repository: '@local'
condition: appc.enabled
- name: cassandra
- version: ~4.x-0
+ version: ~5.x-0
repository: '@local'
condition: cassandra.enabled
- name: clamp
- version: ~4.x-0
+ version: ~5.x-0
repository: '@local'
condition: clamp.enabled
- name: cli
- version: ~4.x-0
+ version: ~5.x-0
repository: '@local'
condition: cli.enabled
- name: common
- version: ~4.x-0
+ version: ~5.x-0
repository: '@local'
- name: consul
- version: ~4.x-0
+ version: ~5.x-0
repository: '@local'
condition: consul.enabled
- name: contrib
- version: ~4.x-0
+ version: ~5.x-0
repository: '@local'
condition: contrib.enabled
- name: dcaegen2
- version: ~4.x-0
+ version: ~5.x-0
repository: '@local'
condition: dcaegen2.enabled
- name: dmaap
- version: ~4.x-0
+ version: ~5.x-0
repository: '@local'
condition: dmaap.enabled
- name: esr
- version: ~4.x-0
+ version: ~5.x-0
repository: '@local'
condition: esr.enabled
- name: log
- version: ~4.x-0
+ version: ~5.x-0
repository: '@local'
condition: log.enabled
- name: sniro-emulator
- version: ~4.x-0
+ version: ~5.x-0
repository: '@local'
condition: sniro-emulator.enabled
- name: mariadb-galera
- version: ~4.x-0
+ version: ~5.x-0
repository: '@local'
condition: mariadb-galera.enabled
- name: msb
- version: ~4.x-0
+ version: ~5.x-0
repository: '@local'
condition: msb.enabled
- name: multicloud
- version: ~4.x-0
+ version: ~5.x-0
repository: '@local'
condition: multicloud.enabled
- name: nbi
- version: ~4.x-0
+ version: ~5.x-0
repository: '@local'
condition: nbi.enabled
- name: nfs-provisioner
- version: ~4.x-0
+ version: ~5.x-0
repository: '@local'
condition: nfs-provisioner.enabled
- name: pnda
- version: ~4.x-0
+ version: ~5.x-0
repository: '@local'
condition: pnda.enabled
- name: policy
- version: ~4.x-0
+ version: ~5.x-0
repository: '@local'
condition: policy.enabled
- name: pomba
- version: ~4.x-0
+ version: ~5.x-0
repository: '@local'
condition: pomba.enabled
- name: portal
- version: ~4.x-0
+ version: ~5.x-0
repository: '@local'
condition: portal.enabled
- name: oof
- version: ~4.x-0
+ version: ~5.x-0
repository: '@local'
condition: oof.enabled
- name: robot
- version: ~4.x-0
+ version: ~5.x-0
repository: '@local'
condition: robot.enabled
- name: sdc
- version: ~4.x-0
+ version: ~5.x-0
repository: '@local'
condition: sdc.enabled
- name: sdnc
- version: ~4.x-0
+ version: ~5.x-0
repository: '@local'
condition: sdnc.enabled
- name: so
- version: ~4.x-0
+ version: ~5.x-0
repository: '@local'
condition: so.enabled
- name: uui
- version: ~4.x-0
+ version: ~5.x-0
repository: '@local'
condition: uui.enabled
- name: vfc
- version: ~4.x-0
+ version: ~5.x-0
repository: '@local'
condition: vfc.enabled
- name: vid
- version: ~4.x-0
+ version: ~5.x-0
repository: '@local'
condition: vid.enabled
- name: vnfsdk
- version: ~4.x-0
+ version: ~5.x-0
repository: '@local'
condition: vnfsdk.enabled
- name: modeling
- version: ~4.x-0
+ version: ~5.x-0
repository: '@local'
condition: modeling.enabled
+ - name: nginx-ingress
+ version: ~1.6.18
+ repository: 'https://kubernetes-charts.storage.googleapis.com'
+ condition: nginx-ingress.enabled
diff --git a/kubernetes/onap/resources/environments/public-cloud.yaml b/kubernetes/onap/resources/environments/public-cloud.yaml
index d751534bd9..2d4360c579 100644
--- a/kubernetes/onap/resources/environments/public-cloud.yaml
+++ b/kubernetes/onap/resources/environments/public-cloud.yaml
@@ -141,7 +141,7 @@ sdnc:
so:
liveness:
initialDelaySeconds: 120
- mariadb:
+ so-mariadb:
liveness:
initialDelaySeconds: 900
readiness:
diff --git a/kubernetes/onap/resources/overrides/environment.yaml b/kubernetes/onap/resources/overrides/environment.yaml
new file mode 100644
index 0000000000..75ce8e529b
--- /dev/null
+++ b/kubernetes/onap/resources/overrides/environment.yaml
@@ -0,0 +1,225 @@
+# Copyright © 2017,2019 Amdocs, AT&T , 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.
+
+#################################################################
+#
+# These overrides will affect all helm charts (ie. applications)
+# that are listed below and are 'enabled'.
+#
+#
+# This is specifically for the environments which take time to
+# deploy ONAP. This increase in timeouts prevents false restarting of
+# the pods during startup configuration.
+#
+# These timers have been tuned by the ONAP integration team. They
+# have been tested and validated in the ONAP integration lab (Intel/Windriver lab).
+# They are however indicative and may be adapted to your environment as they
+# depend on the performance of the infrastructure you are installing ONAP on.
+#
+# Please note that these timers must remain reasonable, in other words, if
+# your infrastructure is not performant enough, extending the timers to very
+# large value may not fix all installation issues on over subscribed hardware.
+#
+#################################################################
+aaf:
+ aaf-cs:
+ liveness:
+ initialDelaySeconds: 240
+ readiness:
+ initialDelaySeconds: 240
+ aaf-gui:
+ liveness:
+ initialDelaySeconds: 120
+ readiness:
+ initialDelaySeconds: 120
+ aaf-oauth:
+ liveness:
+ initialDelaySeconds: 300
+ readiness:
+ initialDelaySeconds: 300
+ aaf-service:
+ liveness:
+ initialDelaySeconds: 300
+ readiness:
+ initialDelaySeconds: 300
+aai:
+ liveness:
+ initialDelaySeconds: 120
+ aai-champ:
+ liveness:
+ initialDelaySeconds: 120
+ readiness:
+ initialDelaySeconds: 120
+ aai-data-router:
+ liveness:
+ initialDelaySeconds: 120
+ aai-sparky-be:
+ liveness:
+ initialDelaySeconds: 120
+ aai-spike:
+ liveness:
+ initialDelaySeconds: 120
+ aai-cassandra:
+ liveness:
+ periodSeconds: 120
+ readiness:
+ periodSeconds: 60
+appc:
+ mariadb-galera:
+ liveness:
+ initialDelaySeconds: 180
+ periodSeconds: 60
+cassandra:
+ liveness:
+ initialDelaySeconds: 120
+ periodSeconds: 120
+ readiness:
+ initialDelaySeconds: 120
+ periodSeconds: 60
+clamp:
+ liveness:
+ initialDelaySeconds: 60
+ readiness:
+ initialDelaySeconds: 60
+dcaegen2:
+ dcae-cloudify-manager:
+ liveness:
+ initialDelaySeconds: 120
+ readiness:
+ initialDelaySeconds: 120
+dmaap:
+ dmaap-bus-controller:
+ liveness:
+ initialDelaySeconds: 120
+ readiness:
+ initialDelaySeconds: 120
+ message-router:
+ liveness:
+ initialDelaySeconds: 120
+ readiness:
+ initialDelaySeconds: 120
+ dmaap-dr-prov:
+ liveness:
+ initialDelaySeconds: 120
+ readiness:
+ initialDelaySeconds: 120
+ mariadb:
+ liveness:
+ initialDelaySeconds: 180
+ periodSeconds: 60
+ dmaap-dr-node:
+ liveness:
+ initialDelaySeconds: 120
+ readiness:
+ initialDelaySeconds: 120
+mariadb-galera:
+ liveness:
+ initialDelaySeconds: 180
+ periodSeconds: 60
+ mariadb-galera-server:
+ liveness:
+ initialDelaySeconds: 120
+ readiness:
+ initialDelaySeconds: 120
+modeling:
+ mariadb-galera:
+ liveness:
+ initialDelaySeconds: 180
+ periodSeconds: 60
+oof:
+ oof-has:
+ music:
+ music-cassandra:
+ liveness:
+ periodSeconds: 120
+ readiness:
+ periodSeconds: 60
+portal:
+ portal-app:
+ liveness:
+ initialDelaySeconds: 60
+ readiness:
+ initialDelaySeconds: 60
+ portal-cassandra:
+ liveness:
+ periodSeconds: 120
+ readiness:
+ periodSeconds: 60
+sdc:
+ sdc-be:
+ liveness:
+ initialDelaySeconds: 120
+ readiness:
+ initialDelaySeconds: 120
+ sdc-cs:
+ liveness:
+ initialDelaySeconds: 120
+ periodSeconds: 120
+ readiness:
+ initialDelaySeconds: 120
+ periodSeconds: 60
+ sdc-es:
+ liveness:
+ initialDelaySeconds: 60
+ readiness:
+ initialDelaySeconds: 120
+ sdc-onboarding-be:
+ liveness:
+ initialDelaySeconds: 120
+ readiness:
+ initialDelaySeconds: 120
+sdnc:
+ liveness:
+ initialDelaySeconds: 60
+ readiness:
+ initialDelaySeconds: 60
+ dmaap-listener:
+ liveness:
+ initialDelaySeconds: 120
+ readiness:
+ initialDelaySeconds: 120
+ mariadb-galera:
+ liveness:
+ initialDelaySeconds: 180
+ periodSeconds: 60
+ sdnc-ansible-server:
+ readiness:
+ initialDelaySeconds: 120
+ sdnc-portal:
+ readiness:
+ initialDelaySeconds: 120
+ ueb-listener:
+ liveness:
+ initialDelaySeconds: 60
+ readiness:
+ initialDelaySeconds: 60
+so:
+ liveness:
+ initialDelaySeconds: 120
+ mariadb:
+ liveness:
+ initialDelaySeconds: 900
+ readiness:
+ initialDelaySeconds: 900
+uui:
+ uui-server:
+ liveness:
+ initialDelaySeconds: 120
+ readiness:
+ initialDelaySeconds: 120
+vfc:
+ mariadb-galera:
+ liveness:
+ initialDelaySeconds: 180
+ periodSeconds: 60
diff --git a/kubernetes/onap/resources/overrides/onap-all-ingress-nginx.yaml b/kubernetes/onap/resources/overrides/onap-all-ingress-nginx.yaml
new file mode 100644
index 0000000000..ee27269564
--- /dev/null
+++ b/kubernetes/onap/resources/overrides/onap-all-ingress-nginx.yaml
@@ -0,0 +1,80 @@
+# Copyright © 2019 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.
+
+###################################################################
+# This override file enables helm charts for all ONAP applications.
+###################################################################
+cassandra:
+ enabled: true
+mariadb-galera:
+ enabled: true
+
+aaf:
+ enabled: true
+aai:
+ enabled: true
+appc:
+ enabled: true
+clamp:
+ enabled: true
+cli:
+ enabled: true
+consul:
+ enabled: true
+contrib:
+ enabled: true
+dcaegen2:
+ enabled: true
+dmaap:
+ enabled: true
+esr:
+ enabled: true
+log:
+ enabled: true
+sniro-emulator:
+ enabled: true
+oof:
+ enabled: true
+msb:
+ enabled: true
+multicloud:
+ enabled: true
+nbi:
+ enabled: true
+policy:
+ enabled: true
+pomba:
+ enabled: true
+portal:
+ enabled: true
+robot:
+ enabled: true
+sdc:
+ enabled: true
+sdnc:
+ enabled: true
+so:
+ enabled: true
+uui:
+ enabled: true
+vfc:
+ enabled: true
+vid:
+ enabled: true
+ ingress:
+ enabled: true
+vnfsdk:
+ enabled: true
+nginx-ingress:
+ enabled: true
diff --git a/kubernetes/onap/resources/overrides/onap-all.yaml b/kubernetes/onap/resources/overrides/onap-all.yaml
index 1716415b3e..04fbc97f54 100644
--- a/kubernetes/onap/resources/overrides/onap-all.yaml
+++ b/kubernetes/onap/resources/overrides/onap-all.yaml
@@ -74,3 +74,5 @@ vid:
enabled: true
vnfsdk:
enabled: true
+modeling:
+ enabled: true
diff --git a/kubernetes/onap/values.yaml b/kubernetes/onap/values.yaml
index c0095049b5..46c8db6e5e 100644..100755
--- a/kubernetes/onap/values.yaml
+++ b/kubernetes/onap/values.yaml
@@ -168,3 +168,5 @@ vnfsdk:
enabled: false
modeling:
enabled: false
+nginx-ingress:
+ enabled: false
diff --git a/kubernetes/oof/Chart.yaml b/kubernetes/oof/Chart.yaml
index a623d59c69..09b363c6fc 100755
--- a/kubernetes/oof/Chart.yaml
+++ b/kubernetes/oof/Chart.yaml
@@ -16,4 +16,4 @@
apiVersion: v1
description: ONAP Optimization Framework
name: oof
-version: 4.0.0
+version: 5.0.0
diff --git a/kubernetes/oof/charts/oof-cmso/Chart.yaml b/kubernetes/oof/charts/oof-cmso/Chart.yaml
index 253f3503b6..65e225a670 100644
--- a/kubernetes/oof/charts/oof-cmso/Chart.yaml
+++ b/kubernetes/oof/charts/oof-cmso/Chart.yaml
@@ -15,4 +15,4 @@
apiVersion: v1
description: Chart for Change Management Service Orchestrator (CMSO)
name: oof-cmso
-version: 4.0.0
+version: 5.0.0
diff --git a/kubernetes/oof/charts/oof-cmso/charts/oof-cmso-optimizer/Chart.yaml b/kubernetes/oof/charts/oof-cmso/charts/oof-cmso-optimizer/Chart.yaml
index 78fedfdef2..db69108df5 100644
--- a/kubernetes/oof/charts/oof-cmso/charts/oof-cmso-optimizer/Chart.yaml
+++ b/kubernetes/oof/charts/oof-cmso/charts/oof-cmso-optimizer/Chart.yaml
@@ -15,4 +15,4 @@
apiVersion: v1
description: Chart for Change Management Service Orchestrator (CMSO) Optimizer
name: oof-cmso-optimizer
-version: 4.0.0
+version: 5.0.0
diff --git a/kubernetes/oof/charts/oof-cmso/charts/oof-cmso-service/Chart.yaml b/kubernetes/oof/charts/oof-cmso/charts/oof-cmso-service/Chart.yaml
index 2cfc9e78b9..97cfe27647 100644
--- a/kubernetes/oof/charts/oof-cmso/charts/oof-cmso-service/Chart.yaml
+++ b/kubernetes/oof/charts/oof-cmso/charts/oof-cmso-service/Chart.yaml
@@ -15,4 +15,4 @@
apiVersion: v1
description: Chart for Change Management Service Orchestrator (CMSO) Service
name: oof-cmso-service
-version: 4.0.0
+version: 5.0.0
diff --git a/kubernetes/oof/charts/oof-cmso/charts/oof-cmso-ticketmgt/Chart.yaml b/kubernetes/oof/charts/oof-cmso/charts/oof-cmso-ticketmgt/Chart.yaml
index e99b3bea31..7c726b98ff 100644
--- a/kubernetes/oof/charts/oof-cmso/charts/oof-cmso-ticketmgt/Chart.yaml
+++ b/kubernetes/oof/charts/oof-cmso/charts/oof-cmso-ticketmgt/Chart.yaml
@@ -15,4 +15,4 @@
apiVersion: v1
description: Chart for Change Management Service Orchestrator (CMSO) Ticket Management
name: oof-cmso-ticketmgt
-version: 4.0.0
+version: 5.0.0
diff --git a/kubernetes/oof/charts/oof-cmso/charts/oof-cmso-topology/Chart.yaml b/kubernetes/oof/charts/oof-cmso/charts/oof-cmso-topology/Chart.yaml
index 258d9ee317..361c4cb1d6 100644
--- a/kubernetes/oof/charts/oof-cmso/charts/oof-cmso-topology/Chart.yaml
+++ b/kubernetes/oof/charts/oof-cmso/charts/oof-cmso-topology/Chart.yaml
@@ -15,4 +15,4 @@
apiVersion: v1
description: Chart for Change Management Service Orchestrator (CMSO) Service
name: oof-cmso-topology
-version: 4.0.0
+version: 5.0.0
diff --git a/kubernetes/oof/charts/oof-cmso/requirements.yaml b/kubernetes/oof/charts/oof-cmso/requirements.yaml
index a1b9f7ab3e..16c438f6f7 100644
--- a/kubernetes/oof/charts/oof-cmso/requirements.yaml
+++ b/kubernetes/oof/charts/oof-cmso/requirements.yaml
@@ -14,11 +14,11 @@
dependencies:
- name: common
- version: ~4.x-0
+ version: ~5.x-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: mariadb-galera
- version: ~4.x-0
+ version: ~5.x-0
repository: '@local'
diff --git a/kubernetes/oof/charts/oof-has/Chart.yaml b/kubernetes/oof/charts/oof-has/Chart.yaml
index 4000b12075..4b50543b60 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: 4.0.0
+version: 5.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 ad7698034b..666b750fd2 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: 4.0.0
+version: 5.0.0
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 64f13ed172..9690161418 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: 4.0.0
+version: 5.0.0
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 21e82c7dba..d47b40a9f4 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: 4.0.0
+version: 5.0.0
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 e6594a4110..ee1b9cb6ad 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: 4.0.0
+version: 5.0.0
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 f4a594bbf4..7afd9e8349 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: 4.0.0
+version: 5.0.0
diff --git a/kubernetes/oof/charts/oof-has/requirements.yaml b/kubernetes/oof/charts/oof-has/requirements.yaml
index ca6d2b1595..0acd1ef449 100755
--- a/kubernetes/oof/charts/oof-has/requirements.yaml
+++ b/kubernetes/oof/charts/oof-has/requirements.yaml
@@ -15,8 +15,8 @@
dependencies:
- name: common
- version: ~4.x-0
+ version: ~5.x-0
repository: '@local'
- name: music
- version: ~4.x-0
+ version: ~5.x-0
repository: '@local'
diff --git a/kubernetes/oof/requirements.yaml b/kubernetes/oof/requirements.yaml
index f8b0466960..38538de827 100755
--- a/kubernetes/oof/requirements.yaml
+++ b/kubernetes/oof/requirements.yaml
@@ -15,5 +15,5 @@
dependencies:
- name: common
- version: ~4.x-0
+ version: ~5.x-0
repository: '@local'
diff --git a/kubernetes/pnda/Chart.yaml b/kubernetes/pnda/Chart.yaml
index 5a661813ba..6f95f40883 100644
--- a/kubernetes/pnda/Chart.yaml
+++ b/kubernetes/pnda/Chart.yaml
@@ -15,4 +15,4 @@
apiVersion: v1
description: ONAP DCAE PNDA
name: pnda
-version: 4.0.0
+version: 5.0.0
diff --git a/kubernetes/pnda/charts/dcae-pnda-bootstrap/Chart.yaml b/kubernetes/pnda/charts/dcae-pnda-bootstrap/Chart.yaml
index 0286bd74dd..226b9e06c6 100644
--- a/kubernetes/pnda/charts/dcae-pnda-bootstrap/Chart.yaml
+++ b/kubernetes/pnda/charts/dcae-pnda-bootstrap/Chart.yaml
@@ -17,4 +17,4 @@
apiVersion: v1
description: ONAP DCAE PNDA Bootstrap
name: dcae-pnda-bootstrap
-version: 4.0.0
+version: 5.0.0
diff --git a/kubernetes/pnda/charts/dcae-pnda-bootstrap/requirements.yaml b/kubernetes/pnda/charts/dcae-pnda-bootstrap/requirements.yaml
index d195f831da..dc0355b84d 100644
--- a/kubernetes/pnda/charts/dcae-pnda-bootstrap/requirements.yaml
+++ b/kubernetes/pnda/charts/dcae-pnda-bootstrap/requirements.yaml
@@ -16,5 +16,5 @@
dependencies:
- name: common
- version: ~4.x-0
+ version: ~5.x-0
repository: '@local'
diff --git a/kubernetes/pnda/charts/dcae-pnda-mirror/Chart.yaml b/kubernetes/pnda/charts/dcae-pnda-mirror/Chart.yaml
index 94754f7923..15ac85dccd 100644
--- a/kubernetes/pnda/charts/dcae-pnda-mirror/Chart.yaml
+++ b/kubernetes/pnda/charts/dcae-pnda-mirror/Chart.yaml
@@ -17,4 +17,4 @@
apiVersion: v1
description: ONAP DCAE PNDA Mirror
name: dcae-pnda-mirror
-version: 4.0.0
+version: 5.0.0
diff --git a/kubernetes/pnda/charts/dcae-pnda-mirror/requirements.yaml b/kubernetes/pnda/charts/dcae-pnda-mirror/requirements.yaml
index d195f831da..dc0355b84d 100644
--- a/kubernetes/pnda/charts/dcae-pnda-mirror/requirements.yaml
+++ b/kubernetes/pnda/charts/dcae-pnda-mirror/requirements.yaml
@@ -16,5 +16,5 @@
dependencies:
- name: common
- version: ~4.x-0
+ version: ~5.x-0
repository: '@local'
diff --git a/kubernetes/pnda/requirements.yaml b/kubernetes/pnda/requirements.yaml
index d195f831da..dc0355b84d 100644
--- a/kubernetes/pnda/requirements.yaml
+++ b/kubernetes/pnda/requirements.yaml
@@ -16,5 +16,5 @@
dependencies:
- name: common
- version: ~4.x-0
+ version: ~5.x-0
repository: '@local'
diff --git a/kubernetes/policy/Chart.yaml b/kubernetes/policy/Chart.yaml
index e56e4fabac..9dc7c2862c 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: 4.0.0
+version: 5.0.0
diff --git a/kubernetes/policy/charts/brmsgw/Chart.yaml b/kubernetes/policy/charts/brmsgw/Chart.yaml
index 01bff49818..2538be9f70 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: 4.0.0
+version: 5.0.0
diff --git a/kubernetes/policy/charts/brmsgw/requirements.yaml b/kubernetes/policy/charts/brmsgw/requirements.yaml
index 68a7d9ec14..05d49a8d7b 100644
--- a/kubernetes/policy/charts/brmsgw/requirements.yaml
+++ b/kubernetes/policy/charts/brmsgw/requirements.yaml
@@ -15,7 +15,7 @@
dependencies:
- name: common
- version: ~4.x-0
+ version: ~5.x-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/resources/config/pe/brmsgw.conf b/kubernetes/policy/charts/brmsgw/resources/config/pe/brmsgw.conf
index 7f611a1976..01c79be6e3 100644
--- a/kubernetes/policy/charts/brmsgw/resources/config/pe/brmsgw.conf
+++ b/kubernetes/policy/charts/brmsgw/resources/config/pe/brmsgw.conf
@@ -63,5 +63,5 @@ BRMS_UEB_API_KEY=
BRMS_UEB_API_SECRET=
#Dependency.json file version
-BRMS_DEPENDENCY_VERSION=1.4.0
-BRMS_MODELS_DEPENDENCY_VERSION=2.0.0
+BRMS_DEPENDENCY_VERSION=1.4.2
+BRMS_MODELS_DEPENDENCY_VERSION=2.0.2
diff --git a/kubernetes/policy/charts/drools/Chart.yaml b/kubernetes/policy/charts/drools/Chart.yaml
index 31c8b6d3c1..c6b11a43f8 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: 4.0.0
+version: 5.0.0
diff --git a/kubernetes/policy/charts/drools/charts/nexus/Chart.yaml b/kubernetes/policy/charts/drools/charts/nexus/Chart.yaml
index 1125e49a9d..d7ff043192 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: 4.0.0
+version: 5.0.0
diff --git a/kubernetes/policy/charts/drools/charts/nexus/requirements.yaml b/kubernetes/policy/charts/drools/charts/nexus/requirements.yaml
index 68a7d9ec14..05d49a8d7b 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: ~4.x-0
+ version: ~5.x-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/values.yaml b/kubernetes/policy/charts/drools/charts/nexus/values.yaml
index 62a17e515e..5d85f6c5b0 100644
--- a/kubernetes/policy/charts/drools/charts/nexus/values.yaml
+++ b/kubernetes/policy/charts/drools/charts/nexus/values.yaml
@@ -29,7 +29,7 @@ global:
#################################################################
# application image
repository: nexus3.onap.org:10001
-image: sonatype/nexus:2.14.8-01
+image: sonatype/nexus:2.14.13-01
pullPolicy: Always
# flag to enable debugging - application support required
diff --git a/kubernetes/policy/charts/drools/requirements.yaml b/kubernetes/policy/charts/drools/requirements.yaml
index 68a7d9ec14..05d49a8d7b 100644
--- a/kubernetes/policy/charts/drools/requirements.yaml
+++ b/kubernetes/policy/charts/drools/requirements.yaml
@@ -15,7 +15,7 @@
dependencies:
- name: common
- version: ~4.x-0
+ version: ~5.x-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/Chart.yaml b/kubernetes/policy/charts/mariadb/Chart.yaml
index a6493b4a7f..59bd592fdd 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: 4.0.0
+version: 5.0.0
diff --git a/kubernetes/policy/charts/mariadb/requirements.yaml b/kubernetes/policy/charts/mariadb/requirements.yaml
index 68a7d9ec14..05d49a8d7b 100644
--- a/kubernetes/policy/charts/mariadb/requirements.yaml
+++ b/kubernetes/policy/charts/mariadb/requirements.yaml
@@ -15,7 +15,7 @@
dependencies:
- name: common
- version: ~4.x-0
+ version: ~5.x-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/values.yaml b/kubernetes/policy/charts/mariadb/values.yaml
index fcd7093607..15c75b753c 100644
--- a/kubernetes/policy/charts/mariadb/values.yaml
+++ b/kubernetes/policy/charts/mariadb/values.yaml
@@ -25,7 +25,7 @@ global:
#################################################################
# application image
repository: nexus3.onap.org:10001
-image: mariadb:10.2.14
+image: mariadb:10.2.25
pullPolicy: Always
# flag to enable debugging - application support required
diff --git a/kubernetes/policy/charts/pdp/Chart.yaml b/kubernetes/policy/charts/pdp/Chart.yaml
index 5c228c67c3..d17329a544 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: 4.0.0
+version: 5.0.0
diff --git a/kubernetes/policy/charts/pdp/requirements.yaml b/kubernetes/policy/charts/pdp/requirements.yaml
index 68a7d9ec14..05d49a8d7b 100644
--- a/kubernetes/policy/charts/pdp/requirements.yaml
+++ b/kubernetes/policy/charts/pdp/requirements.yaml
@@ -15,7 +15,7 @@
dependencies:
- name: common
- version: ~4.x-0
+ version: ~5.x-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-apex-pdp/Chart.yaml b/kubernetes/policy/charts/policy-apex-pdp/Chart.yaml
index 592180fa18..34bd140eab 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: 4.0.0
+version: 5.0.0
diff --git a/kubernetes/policy/charts/policy-apex-pdp/requirements.yaml b/kubernetes/policy/charts/policy-apex-pdp/requirements.yaml
index e4bbf69f3c..138addd99c 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: ~4.x-0
+ version: ~5.x-0
repository: '@local'
diff --git a/kubernetes/policy/charts/policy-api/Chart.yaml b/kubernetes/policy/charts/policy-api/Chart.yaml
index a50c8d9a58..ad74784c7e 100644
--- a/kubernetes/policy/charts/policy-api/Chart.yaml
+++ b/kubernetes/policy/charts/policy-api/Chart.yaml
@@ -19,4 +19,4 @@
apiVersion: v1
description: ONAP Policy Design API
name: policy-api
-version: 4.0.0
+version: 5.0.0
diff --git a/kubernetes/policy/charts/policy-api/requirements.yaml b/kubernetes/policy/charts/policy-api/requirements.yaml
index 768bdb372d..316e7e376b 100644
--- a/kubernetes/policy/charts/policy-api/requirements.yaml
+++ b/kubernetes/policy/charts/policy-api/requirements.yaml
@@ -18,5 +18,5 @@
dependencies:
- name: common
- version: ~4.x-0
+ version: ~5.x-0
repository: '@local'
diff --git a/kubernetes/policy/charts/policy-common/Chart.yaml b/kubernetes/policy/charts/policy-common/Chart.yaml
index 8c5553d4fb..028a5b56b7 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: 4.0.0
+version: 5.0.0
diff --git a/kubernetes/policy/charts/policy-common/requirements.yaml b/kubernetes/policy/charts/policy-common/requirements.yaml
index 68a7d9ec14..05d49a8d7b 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: ~4.x-0
+ version: ~5.x-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-distribution/Chart.yaml b/kubernetes/policy/charts/policy-distribution/Chart.yaml
index 40abc9188d..e6c8910238 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: 4.0.0
+version: 5.0.0
diff --git a/kubernetes/policy/charts/policy-distribution/requirements.yaml b/kubernetes/policy/charts/policy-distribution/requirements.yaml
index e4bbf69f3c..138addd99c 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: ~4.x-0
+ version: ~5.x-0
repository: '@local'
diff --git a/kubernetes/policy/charts/policy-pap/Chart.yaml b/kubernetes/policy/charts/policy-pap/Chart.yaml
index dccf45d77e..85e44e75d3 100644
--- a/kubernetes/policy/charts/policy-pap/Chart.yaml
+++ b/kubernetes/policy/charts/policy-pap/Chart.yaml
@@ -19,4 +19,4 @@
apiVersion: v1
description: ONAP Policy Administration (PAP)
name: policy-pap
-version: 4.0.0
+version: 5.0.0
diff --git a/kubernetes/policy/charts/policy-pap/requirements.yaml b/kubernetes/policy/charts/policy-pap/requirements.yaml
index 849db8393f..f035fb9801 100644
--- a/kubernetes/policy/charts/policy-pap/requirements.yaml
+++ b/kubernetes/policy/charts/policy-pap/requirements.yaml
@@ -18,5 +18,5 @@
dependencies:
- name: common
- version: ~4.x-0
+ version: ~5.x-0
repository: '@local'
diff --git a/kubernetes/policy/charts/policy-xacml-pdp/Chart.yaml b/kubernetes/policy/charts/policy-xacml-pdp/Chart.yaml
index be4325e6b2..d9f6056fac 100644
--- a/kubernetes/policy/charts/policy-xacml-pdp/Chart.yaml
+++ b/kubernetes/policy/charts/policy-xacml-pdp/Chart.yaml
@@ -19,4 +19,4 @@
apiVersion: v1
description: ONAP Policy XACML PDP
name: policy-xacml-pdp
-version: 4.0.0
+version: 5.0.0
diff --git a/kubernetes/policy/charts/policy-xacml-pdp/requirements.yaml b/kubernetes/policy/charts/policy-xacml-pdp/requirements.yaml
index 768bdb372d..316e7e376b 100644
--- a/kubernetes/policy/charts/policy-xacml-pdp/requirements.yaml
+++ b/kubernetes/policy/charts/policy-xacml-pdp/requirements.yaml
@@ -18,5 +18,5 @@
dependencies:
- name: common
- version: ~4.x-0
+ version: ~5.x-0
repository: '@local'
diff --git a/kubernetes/policy/requirements.yaml b/kubernetes/policy/requirements.yaml
index 68a7d9ec14..05d49a8d7b 100644
--- a/kubernetes/policy/requirements.yaml
+++ b/kubernetes/policy/requirements.yaml
@@ -15,7 +15,7 @@
dependencies:
- name: common
- version: ~4.x-0
+ version: ~5.x-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/pomba/Chart.yaml b/kubernetes/pomba/Chart.yaml
index b1899fd72d..fca1743d12 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: 4.0.0
+version: 5.0.0
diff --git a/kubernetes/pomba/charts/pomba-aaictxbuilder/Chart.yaml b/kubernetes/pomba/charts/pomba-aaictxbuilder/Chart.yaml
index 7ec60c580c..d5ea12312a 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: 4.0.0
+version: 5.0.0
diff --git a/kubernetes/pomba/charts/pomba-aaictxbuilder/requirements.yaml b/kubernetes/pomba/charts/pomba-aaictxbuilder/requirements.yaml
index 509eaddf3d..a12911b78b 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: ~4.x-0
+ version: ~5.x-0
repository: '@local'
diff --git a/kubernetes/pomba/charts/pomba-contextaggregator/Chart.yaml b/kubernetes/pomba/charts/pomba-contextaggregator/Chart.yaml
index 77182fb07e..05ed2957f2 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: 4.0.0
+version: 5.0.0
diff --git a/kubernetes/pomba/charts/pomba-contextaggregator/requirements.yaml b/kubernetes/pomba/charts/pomba-contextaggregator/requirements.yaml
index 1d30dfd918..1063d172a6 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: ~4.x-0
+ version: ~5.x-0
repository: '@local' \ No newline at end of file
diff --git a/kubernetes/pomba/charts/pomba-data-router/Chart.yaml b/kubernetes/pomba/charts/pomba-data-router/Chart.yaml
index 5d91c65360..9504790e0e 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: 4.0.0
+version: 5.0.0
diff --git a/kubernetes/pomba/charts/pomba-elasticsearch/Chart.yaml b/kubernetes/pomba/charts/pomba-elasticsearch/Chart.yaml
index e62e7fdeba..cf1fd2d963 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: 4.0.0
+version: 5.0.0
diff --git a/kubernetes/pomba/charts/pomba-elasticsearch/requirements.yaml b/kubernetes/pomba/charts/pomba-elasticsearch/requirements.yaml
index 1d30dfd918..1063d172a6 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: ~4.x-0
+ version: ~5.x-0
repository: '@local' \ No newline at end of file
diff --git a/kubernetes/pomba/charts/pomba-kibana/Chart.yaml b/kubernetes/pomba/charts/pomba-kibana/Chart.yaml
index d732104cbf..c53fe6d7ac 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: 4.0.0
+version: 5.0.0
diff --git a/kubernetes/pomba/charts/pomba-kibana/requirements.yaml b/kubernetes/pomba/charts/pomba-kibana/requirements.yaml
index 1d30dfd918..1063d172a6 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: ~4.x-0
+ version: ~5.x-0
repository: '@local' \ No newline at end of file
diff --git a/kubernetes/pomba/charts/pomba-networkdiscovery/Chart.yaml b/kubernetes/pomba/charts/pomba-networkdiscovery/Chart.yaml
index eb27414348..0565c3e5fd 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: 4.0.0
+version: 5.0.0
diff --git a/kubernetes/pomba/charts/pomba-networkdiscovery/requirements.yaml b/kubernetes/pomba/charts/pomba-networkdiscovery/requirements.yaml
index 1e8f79bc0e..4b6860c560 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: ~4.x-0
+ version: ~5.x-0
repository: '@local'
diff --git a/kubernetes/pomba/charts/pomba-networkdiscoveryctxbuilder/Chart.yaml b/kubernetes/pomba/charts/pomba-networkdiscoveryctxbuilder/Chart.yaml
index 4479e0931f..f3b18a5461 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: 4.0.0
+version: 5.0.0
diff --git a/kubernetes/pomba/charts/pomba-networkdiscoveryctxbuilder/requirements.yaml b/kubernetes/pomba/charts/pomba-networkdiscoveryctxbuilder/requirements.yaml
index 509eaddf3d..a12911b78b 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: ~4.x-0
+ version: ~5.x-0
repository: '@local'
diff --git a/kubernetes/pomba/charts/pomba-sdcctxbuilder/Chart.yaml b/kubernetes/pomba/charts/pomba-sdcctxbuilder/Chart.yaml
index c77e28d19f..4b1fa9c3d5 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: 4.0.0
+version: 5.0.0
diff --git a/kubernetes/pomba/charts/pomba-sdcctxbuilder/requirements.yaml b/kubernetes/pomba/charts/pomba-sdcctxbuilder/requirements.yaml
index 1d30dfd918..1063d172a6 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: ~4.x-0
+ version: ~5.x-0
repository: '@local' \ No newline at end of file
diff --git a/kubernetes/pomba/charts/pomba-sdncctxbuilder/Chart.yaml b/kubernetes/pomba/charts/pomba-sdncctxbuilder/Chart.yaml
index 2acbe53495..dcaeddbb18 100644
--- a/kubernetes/pomba/charts/pomba-sdncctxbuilder/Chart.yaml
+++ b/kubernetes/pomba/charts/pomba-sdncctxbuilder/Chart.yaml
@@ -15,4 +15,4 @@
apiVersion: v1
description: ONAP POMBA SDNC Context Builder
name: pomba-sdncctxbuilder
-version: 4.0.0
+version: 5.0.0
diff --git a/kubernetes/pomba/charts/pomba-sdncctxbuilder/requirements.yaml b/kubernetes/pomba/charts/pomba-sdncctxbuilder/requirements.yaml
index 509eaddf3d..a12911b78b 100644
--- a/kubernetes/pomba/charts/pomba-sdncctxbuilder/requirements.yaml
+++ b/kubernetes/pomba/charts/pomba-sdncctxbuilder/requirements.yaml
@@ -14,5 +14,5 @@
dependencies:
- name: common
- version: ~4.x-0
+ version: ~5.x-0
repository: '@local'
diff --git a/kubernetes/pomba/charts/pomba-search-data/Chart.yaml b/kubernetes/pomba/charts/pomba-search-data/Chart.yaml
index bd5bdb6a68..633a062242 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: 4.0.0
+version: 5.0.0
diff --git a/kubernetes/pomba/charts/pomba-servicedecomposition/Chart.yaml b/kubernetes/pomba/charts/pomba-servicedecomposition/Chart.yaml
index 153e98d105..3d2efd5da6 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: 4.0.0
+version: 5.0.0
diff --git a/kubernetes/pomba/charts/pomba-servicedecomposition/requirements.yaml b/kubernetes/pomba/charts/pomba-servicedecomposition/requirements.yaml
index d64f5a31e1..01448d59da 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: ~4.x-0
+ version: ~5.x-0
repository: '@local'
diff --git a/kubernetes/pomba/charts/pomba-validation-service/Chart.yaml b/kubernetes/pomba/charts/pomba-validation-service/Chart.yaml
index 020409da0b..4dd05d2a29 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: 4.0.0
+version: 5.0.0
diff --git a/kubernetes/pomba/charts/pomba-validation-service/requirements.yaml b/kubernetes/pomba/charts/pomba-validation-service/requirements.yaml
index 71fbbc5ce9..79d7de4dd3 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: ~4.x-0
+ version: ~5.x-0
repository: '@local'
diff --git a/kubernetes/pomba/requirements.yaml b/kubernetes/pomba/requirements.yaml
index 845a5fe571..540643001c 100644
--- a/kubernetes/pomba/requirements.yaml
+++ b/kubernetes/pomba/requirements.yaml
@@ -14,7 +14,7 @@
dependencies:
- name: common
- version: ~4.x-0
+ version: ~5.x-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 8ab304f5c0..08ed65565f 100644
--- a/kubernetes/portal/Chart.yaml
+++ b/kubernetes/portal/Chart.yaml
@@ -16,4 +16,4 @@
apiVersion: v1
description: ONAP Web Portal
name: portal
-version: 4.0.0
+version: 5.0.0
diff --git a/kubernetes/portal/charts/portal-app/Chart.yaml b/kubernetes/portal/charts/portal-app/Chart.yaml
index 0df66c88bd..e7ee96c565 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: 4.0.0 \ No newline at end of file
+version: 5.0.0 \ No newline at end of file
diff --git a/kubernetes/portal/charts/portal-cassandra/Chart.yaml b/kubernetes/portal/charts/portal-cassandra/Chart.yaml
index 1f0252b19c..5511e3442f 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: 4.0.0
+version: 5.0.0
diff --git a/kubernetes/portal/charts/portal-mariadb/Chart.yaml b/kubernetes/portal/charts/portal-mariadb/Chart.yaml
index f6cf25dfc2..7b2ea08749 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: 4.0.0
+version: 5.0.0
diff --git a/kubernetes/portal/charts/portal-mariadb/templates/service.yaml b/kubernetes/portal/charts/portal-mariadb/templates/service.yaml
index 4580e569b6..5ef05c94c8 100644
--- a/kubernetes/portal/charts/portal-mariadb/templates/service.yaml
+++ b/kubernetes/portal/charts/portal-mariadb/templates/service.yaml
@@ -28,7 +28,7 @@ spec:
ports:
{{if eq .Values.service.type "NodePort" -}}
- port: {{ .Values.service.internalPort }}
- nodePort: {{ .Values.global.nodePortPrefix | default "302" }}{{ .Values.service.externalPort }}
+ nodePort: {{ .Values.global.nodePortPrefix | default .Values.nodePortPrefix }}{{ .Values.service.externalPort }}
{{- else -}}
- port: {{ .Values.service.externalPort }}
targetPort: {{ .Values.service.internalPort }}
diff --git a/kubernetes/portal/charts/portal-sdk/Chart.yaml b/kubernetes/portal/charts/portal-sdk/Chart.yaml
index bb85ea68da..6d13062b47 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: 4.0.0
+version: 5.0.0
diff --git a/kubernetes/portal/charts/portal-widget/Chart.yaml b/kubernetes/portal/charts/portal-widget/Chart.yaml
index b7617c933a..1f3a807dae 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: 4.0.0
+version: 5.0.0
diff --git a/kubernetes/portal/charts/portal-zookeeper/Chart.yaml b/kubernetes/portal/charts/portal-zookeeper/Chart.yaml
index b6bacff6a3..021f359a71 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: 4.0.0
+version: 5.0.0
diff --git a/kubernetes/portal/charts/portal-zookeeper/templates/service.yaml b/kubernetes/portal/charts/portal-zookeeper/templates/service.yaml
index 4580e569b6..5ef05c94c8 100644
--- a/kubernetes/portal/charts/portal-zookeeper/templates/service.yaml
+++ b/kubernetes/portal/charts/portal-zookeeper/templates/service.yaml
@@ -28,7 +28,7 @@ spec:
ports:
{{if eq .Values.service.type "NodePort" -}}
- port: {{ .Values.service.internalPort }}
- nodePort: {{ .Values.global.nodePortPrefix | default "302" }}{{ .Values.service.externalPort }}
+ nodePort: {{ .Values.global.nodePortPrefix | default .Values.nodePortPrefix }}{{ .Values.service.externalPort }}
{{- else -}}
- port: {{ .Values.service.externalPort }}
targetPort: {{ .Values.service.internalPort }}
diff --git a/kubernetes/portal/requirements.yaml b/kubernetes/portal/requirements.yaml
index 0ba9e4746c..57ee781445 100644
--- a/kubernetes/portal/requirements.yaml
+++ b/kubernetes/portal/requirements.yaml
@@ -15,5 +15,5 @@
dependencies:
- name: common
- version: ~4.x-0
+ version: ~5.x-0
repository: '@local'
diff --git a/kubernetes/readiness/docker/init/job_complete.py b/kubernetes/readiness/docker/init/job_complete.py
index b20cb5adec..a9570c5951 100644
--- a/kubernetes/readiness/docker/init/job_complete.py
+++ b/kubernetes/readiness/docker/init/job_complete.py
@@ -20,7 +20,8 @@ with open(token_path, 'r') as token_file:
# setup logging
log = logging.getLogger(__name__)
handler = logging.StreamHandler(sys.stdout)
-handler.setFormatter(logging.Formatter('%(asctime)s - %(levelname)s - %(message)s'))
+formatter = logging.Formatter('%(asctime)s - %(levelname)s - %(message)s')
+handler.setFormatter(formatter)
handler.setLevel(logging.INFO)
log.addHandler(handler)
log.setLevel(logging.INFO)
@@ -54,17 +55,22 @@ def is_job_complete(job_name):
DEF_TIMEOUT = 10
DESCRIPTION = "Kubernetes container job complete check utility"
-USAGE = "Usage: job_complete.py [-t <timeout>] -j <job_name> [-j <job_name> ...]\n" \
+USAGE = "Usage: job_complete.py [-t <timeout>] -j <job_name> " \
+ "[-j <job_name> ...]\n" \
"where\n" \
- "<timeout> - wait for container job complete timeout in min, default is " + str(DEF_TIMEOUT) + "\n" \
+ "<timeout> - wait for container job complete timeout in min, " \
+ "default is " + str(DEF_TIMEOUT) + "\n" \
"<job_name> - name of the job to wait for\n"
+
def main(argv):
# args are a list of job names
job_names = []
timeout = DEF_TIMEOUT
try:
- opts, args = getopt.getopt(argv, "hj:t:", ["job-name=", "timeout=", "help"])
+ opts, args = getopt.getopt(argv, "hj:t:", ["job-name=",
+ "timeout=",
+ "help"])
for opt, arg in opts:
if opt in ("-h", "--help"):
print("%s\n\n%s" % (DESCRIPTION, USAGE))
@@ -89,11 +95,14 @@ def main(argv):
if complete is True:
break
elif time.time() > timeout:
- log.warning("timed out waiting for '" + job_name + "' to be completed")
+ log.warning("timed out waiting for '" + job_name +
+ "' to be completed")
exit(1)
else:
- # spread in time potentially parallel execution in multiple containers
+ # spread in time potentially parallel execution in multiple
+ # containers
time.sleep(random.randint(5, 11))
+
if __name__ == "__main__":
- main(sys.argv[1:]) \ No newline at end of file
+ main(sys.argv[1:])
diff --git a/kubernetes/readiness/docker/init/ready.py b/kubernetes/readiness/docker/init/ready.py
index 0e133eab01..db7105a18d 100644
--- a/kubernetes/readiness/docker/init/ready.py
+++ b/kubernetes/readiness/docker/init/ready.py
@@ -20,7 +20,8 @@ with open(token_path, 'r') as token_file:
# setup logging
log = logging.getLogger(__name__)
handler = logging.StreamHandler(sys.stdout)
-handler.setFormatter(logging.Formatter('%(asctime)s - %(levelname)s - %(message)s'))
+formatter = logging.Formatter('%(asctime)s - %(levelname)s - %(message)s')
+handler.setFormatter(formatter)
handler.setLevel(logging.INFO)
log.addHandler(handler)
log.setLevel(logging.INFO)
@@ -31,14 +32,14 @@ configuration.ssl_ca_cert = cert
configuration.api_key['authorization'] = token
configuration.api_key_prefix['authorization'] = 'Bearer'
coreV1Api = client.CoreV1Api(client.ApiClient(configuration))
-api_instance=client.ExtensionsV1beta1Api(client.ApiClient(configuration))
+api_instance = client.ExtensionsV1beta1Api(client.ApiClient(configuration))
api = client.AppsV1beta1Api(client.ApiClient(configuration))
batchV1Api = client.BatchV1Api(client.ApiClient(configuration))
+
def is_job_complete(job_name):
complete = False
log.info("Checking if " + job_name + " is complete")
- response = ""
try:
response = batchV1Api.read_namespaced_job_status(job_name, namespace)
if response.status.succeeded == 1:
@@ -54,11 +55,12 @@ def is_job_complete(job_name):
except Exception as e:
log.error("Exception when calling read_namespaced_job_status: %s\n" % e)
+
def wait_for_statefulset_complete(statefulset_name):
try:
response = api.read_namespaced_stateful_set(statefulset_name, namespace)
s = response.status
- if ( s.updated_replicas == response.spec.replicas and
+ if (s.updated_replicas == response.spec.replicas and
s.replicas == response.spec.replicas and
s.ready_replicas == response.spec.replicas and
s.current_replicas == response.spec.replicas and
@@ -71,11 +73,12 @@ def wait_for_statefulset_complete(statefulset_name):
except Exception as e:
log.error("Exception when waiting for Statefulset status: %s\n" % e)
+
def wait_for_deployment_complete(deployment_name):
try:
response = api.read_namespaced_deployment(deployment_name, namespace)
s = response.status
- if ( s.unavailable_replicas == None and
+ if (s.unavailable_replicas is None and
s.updated_replicas == response.spec.replicas and
s.replicas == response.spec.replicas and
s.ready_replicas == response.spec.replicas and
@@ -88,24 +91,27 @@ def wait_for_deployment_complete(deployment_name):
except Exception as e:
log.error("Exception when waiting for deployment status: %s\n" % e)
+
def is_ready(container_name):
ready = False
log.info("Checking if " + container_name + " is ready")
try:
- response = coreV1Api.list_namespaced_pod(namespace=namespace, watch=False)
+ response = coreV1Api.list_namespaced_pod(namespace=namespace,
+ watch=False)
for i in response.items:
# container_statuses can be None, which is non-iterable.
if i.status.container_statuses is None:
continue
for s in i.status.container_statuses:
if s.name == container_name:
- if i.metadata.owner_references[0].kind == "StatefulSet":
- ready = wait_for_statefulset_complete(i.metadata.owner_references[0].name)
+ name = read_name(i)
+ if i.metadata.owner_references[0].kind == "StatefulSet":
+ ready = wait_for_statefulset_complete(name)
elif i.metadata.owner_references[0].kind == "ReplicaSet":
- api_response = api_instance.read_namespaced_replica_set_status(i.metadata.owner_references[0].name, namespace)
- ready = wait_for_deployment_complete(api_response.metadata.owner_references[0].name)
+ deployment_name = get_deployment_name(name)
+ ready = wait_for_deployment_complete(deployment_name)
elif i.metadata.owner_references[0].kind == "Job":
- ready = is_job_complete(i.metadata.owner_references[0].name)
+ ready = is_job_complete(name)
return ready
@@ -115,19 +121,36 @@ def is_ready(container_name):
except Exception as e:
log.error("Exception when calling list_namespaced_pod: %s\n" % e)
+
+def read_name(item):
+ return item.metadata.owner_reference[0].name
+
+
+def get_deployment_name(replicaset):
+ api_response = api_instance.read_namespaced_replica_set_status(replicaset,
+ namespace)
+ deployment_name = read_name(api_response)
+ return deployment_name
+
+
DEF_TIMEOUT = 10
DESCRIPTION = "Kubernetes container readiness check utility"
-USAGE = "Usage: ready.py [-t <timeout>] -c <container_name> [-c <container_name> ...]\n" \
+USAGE = "Usage: ready.py [-t <timeout>] -c <container_name> " \
+ "[-c <container_name> ...]\n" \
"where\n" \
- "<timeout> - wait for container readiness timeout in min, default is " + str(DEF_TIMEOUT) + "\n" \
+ "<timeout> - wait for container readiness timeout in min, " \
+ "default is " + str(DEF_TIMEOUT) + "\n" \
"<container_name> - name of the container to wait for\n"
+
def main(argv):
# args are a list of container names
container_names = []
timeout = DEF_TIMEOUT
try:
- opts, args = getopt.getopt(argv, "hc:t:", ["container-name=", "timeout=", "help"])
+ opts, args = getopt.getopt(argv, "hc:t:", ["container-name=",
+ "timeout=",
+ "help"])
for opt, arg in opts:
if opt in ("-h", "--help"):
print("%s\n\n%s" % (DESCRIPTION, USAGE))
@@ -152,12 +175,15 @@ def main(argv):
if ready is True:
break
elif time.time() > timeout:
- log.warning("timed out waiting for '" + container_name + "' to be ready")
+ log.warning("timed out waiting for '" + container_name +
+ "' to be ready")
exit(1)
else:
- # spread in time potentially parallel execution in multiple containers
+ # spread in time potentially parallel execution in multiple
+ # containers
time.sleep(random.randint(5, 11))
+
if __name__ == "__main__":
main(sys.argv[1:])
diff --git a/kubernetes/robot/Chart.yaml b/kubernetes/robot/Chart.yaml
index 6ccc7a3880..7dbed546dc 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: 4.0.0
+version: 5.0.0
diff --git a/kubernetes/robot/demo-k8s.sh b/kubernetes/robot/demo-k8s.sh
index 8b76f64a25..eb6744b1ac 100755
--- a/kubernetes/robot/demo-k8s.sh
+++ b/kubernetes/robot/demo-k8s.sh
@@ -59,7 +59,7 @@ function usage
# Set the defaults
-echo "Number of parameters:"
+echo "Number of parameters:"
echo $#
if [ $# -lt 2 ];then
@@ -199,7 +199,7 @@ do
vfwclosedloop)
TAG="vfwclosedloop"
shift
- VARIABLES="$VARIABLES -v pkg_host:$1"
+ VARIABLES="$VARIABLES -v PACKET_GENERATOR_HOST:$1 -v pkg_host:$1"
shift
;;
*)
@@ -221,4 +221,3 @@ DISPLAY_NUM=$(($GLOBAL_BUILD_NUMBER + 90))
VARIABLEFILES="-V /share/config/vm_properties.py -V /share/config/integration_robot_properties.py -V /share/config/integration_preload_parameters.py"
kubectl --namespace $NAMESPACE exec ${POD} -- ${ETEHOME}/runTags.sh ${VARIABLEFILES} ${VARIABLES} -d /share/logs/${OUTPUT_FOLDER} -i ${TAG} --display $DISPLAY_NUM 2> ${TAG}.out
-
diff --git a/kubernetes/robot/onap_dev.pvt b/kubernetes/robot/onap_dev.pvt
new file mode 100644
index 0000000000..81e334a684
--- /dev/null
+++ b/kubernetes/robot/onap_dev.pvt
@@ -0,0 +1,27 @@
+-----BEGIN RSA PRIVATE KEY-----
+MIIEpQIBAAKCAQEAylw4KKN/ljqnFBvP+blG5PNfsnM4MAuGPMsE5rkKmzcZWNaE
+NGMXTFKlJ4YrUl7OUv8kbgFTmB8BoNpgrNtKACDaz/psQSOeOADCG/YrT4wrYKrR
+NhFqOjJpxRmxweEsd14qBOxeFT7Ie42qbCMMzo260HvjLmtUxkOXeJ3xDkGmoJVy
+yzxX7nO1m4WyWyukO6x6mX0XDsADF4A6AapcqinoisJ7pnXaNkcjU/JY2Jrwem7s
++ypzIp86O6gdLpLVU9ORR/UYNAk1h+Z6K5Rual4D9mrpC9IJNaYfIgLe7mC39ZLa
+fiySNoGhei9P6pYvRJlQki69bid/EPAgX5YZIQIDAQABAoIBAQClDekkhI9ZqseC
+qFjPuKaxsizZMg+faJb6WSHLSxzyk1OSWY6F6FklgLeC8HW/fuLNYZyGOYDEsG20
+lMqL02Wdiy7OutS3oOS5iyzIf9a90HfFJi706el6RIpvINETcaXCS0T8tQrcS1Rd
+KqTaBRC6HXJGAPbBcvw3pwQSdskatU6a/Kt2a3x6DsqqinQcgEB/SbrDaJCUX9sb
+F2HVUwdq7aZK1Lk0ozr1FID9mrhjwWuQ6XC+vjG0FqtyXeMpR5iaQ73hex3FXQ8z
+OjkFbMwuHWSh1DSx70r5yFrrBqwQKnMsBqx4QDRf3fIENUnWviaL+n+gwcXA07af
+4kaNUFUtAoGBAPuNNRAGhZnyZ9zguns9PM56nmeMUikV5dPN2DTbQb79cpfV+7pC
+6PeSH/dTKFLz62d6qAM2EsNXQvewf8fipBVBRPsRqKOv+uepd01dHNy62I5B+zRm
+be9Kbe+EN60qdzvyPM+2hV6CnvGv1dirimS9pu6RrxD2Rmz1ectnJE+rAoGBAM3w
+UbSEemyZ6EKjck2RfdipzY0MNBnIZ2cUqHh8mmPXjdTLzpXb9vmPbHb01Qwo8MP+
+gMnTbTBOzyNAaHdIrCO9FHW6C85j3ot5Yzcr+EcBVcua+7KHU0Sgn44JNH8DisJ7
+Y63UP/1Xb4d1/QvHfxYy3WOvvRdVZ7pPo8JNX95jAoGAIe5CIg8/JizUZa7KeKUh
+9pgDleQPkQsrHQ6/AyIwFBsLwf9THSS5V+uV9D57SfUs46Bf2U8J6N90YQSlt8iS
+aWuManFPVgT+yxDIzt6obf2mCEpOIBtQ6N4ZRh2HhQwdWTCrkzkDdGQaHG+jYL6C
+xGPwiG2ON7OAfGIAM7eN5lECgYEAhoRLWlaOgRGnHKAWsYQvZ67CjTdDcPPuVu6v
+fMQnNMA/7JeTwV+E205L0wfpgZ/cZKmBBlQMJlnUA3q2wfO+PTnse1mjDJU/cGtB
+22/lJLxChlQdxGeQhGtGzUhF+hEeOhrO6WSSx7CtMRZoy6Dr6lwfMFZCdVNcBd6v
+YOOZk3ECgYEAseUKGb6E80XTVVNziyuiVbQCsI0ZJuRfqMZ2IIDQJU9u6AnGAway
+itqHbkGsmDT+4HUz01+1JKnnw42RdSrHdU/LaOonD+RIGqe2x800QXzqASKLdCXr
+y7RoiFqJtkdFQykzJemA+xOXvHLgKi/MXFsU90PCD0VJKLj8vwpX78Y=
+-----END RSA PRIVATE KEY-----
diff --git a/kubernetes/robot/requirements.yaml b/kubernetes/robot/requirements.yaml
index 3ee610f486..537ede6137 100644
--- a/kubernetes/robot/requirements.yaml
+++ b/kubernetes/robot/requirements.yaml
@@ -14,7 +14,7 @@
dependencies:
- name: common
- version: ~4.x-0
+ version: ~5.x-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/integration_preload_parameters.py b/kubernetes/robot/resources/config/eteshare/config/integration_preload_parameters.py
deleted file mode 100644
index d58e1389cd..0000000000
--- a/kubernetes/robot/resources/config/eteshare/config/integration_preload_parameters.py
+++ /dev/null
@@ -1,542 +0,0 @@
-# Copyright (c) 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.
-
-import json
-import os.path
-from itertools import chain
-from collections import defaultdict
-
-
-GLOBAL_PRELOAD_PARAMETERS = {
- # heat template parameter values common to all heat template continaing these parameters
- "defaults" : {
- 'key_name' : 'vfw_key${uuid}',
- "pub_key" : "{{ .Values.vnfPubKey }}",
- "repo_url_blob" : "https://nexus.onap.org/content/repositories/raw",
- "repo_url_artifacts" : "{{ .Values.demoArtifactsRepoUrl }}",
- "demo_artifacts_version" : "${GLOBAL_INJECTED_ARTIFACTS_VERSION}",
- "onap_private_net_id" : "${GLOBAL_INJECTED_NETWORK}",
- "onap_private_subnet_id" : "{{ .Values.openStackPrivateSubnetId }}",
- "onap_private_net_cidr" : "{{ .Values.openStackPrivateNetCidr }}",
- "sec_group" : "{{ .Values.openStackSecurityGroup }}",
- "dcae_collector_ip" : "{{ .Values.dcaeCollectorIp }}",
- "dcae_collector_port" : "30235",
- "public_net_id" : "${GLOBAL_INJECTED_PUBLIC_NET_ID}",
- "cloud_env" : "${GLOBAL_INJECTED_CLOUD_ENV}",
- "install_script_version" : "${GLOBAL_INJECTED_SCRIPT_VERSION}",
- },
- # ##
- # heat template parameter values for heat template instances created during Vnf-Orchestration test cases
- # ##
- "Vnf-Orchestration" : {
- "vfw_preload.template": {
- "unprotected_private_net_id" : "vofwl01_unprotected${hostid}",
- "unprotected_private_net_cidr" : "192.168.10.0/24",
- "protected_private_net_id" : "vofwl01_protected${hostid}",
- "protected_private_net_cidr" : "192.168.20.0/24",
- "vfw_int_unprotected_private_ip_0" : "192.168.10.100",
- "vfw_int_protected_private_ip_0" : "192.168.20.100",
- "vfw_onap_private_ip_0" : "{{.Values.openStackOamNetworkCidrPrefix}}.${ecompnet}.1",
- "vfw_int_protected_private_floating_ip" : "192.168.10.200",
- "vpg_int_unprotected_private_ip_0" : "192.168.10.200",
- "vpg_onap_private_ip_0" : "{{.Values.openStackOamNetworkCidrPrefix}}.${ecompnet}.2",
- "vsn_int_protected_private_ip_0" : "192.168.20.250",
- "vsn_onap_private_ip_0" : "{{.Values.openStackOamNetworkCidrPrefix}}.${ecompnet}.3",
- "sec_group" : "{{ .Values.openStackSecurityGroup }}",
- 'vfw_name_0':'vofwl01fwl${hostid}',
- 'vpg_name_0':'vofwl01pgn${hostid}',
- "vfw_image_name" : "${GLOBAL_INJECTED_UBUNTU_1404_IMAGE}",
- "vfw_flavor_name" : "${GLOBAL_INJECTED_VM_FLAVOR}",
- "vpg_image_name" : "${GLOBAL_INJECTED_UBUNTU_1404_IMAGE}",
- "vpg_flavor_name" : "${GLOBAL_INJECTED_VM_FLAVOR}",
- "vsn_image_name" : "${GLOBAL_INJECTED_UBUNTU_1404_IMAGE}",
- "vsn_flavor_name" : "${GLOBAL_INJECTED_VM_FLAVOR}",
- 'vsn_name_0':'vofwl01snk${hostid}'
- },
- "vfwsnk_preload.template": {
- "int_unprotected_private_net_id" : "vofwlsnk_unprotected${hostid}",
- "int_unprotected_private_subnet_id" : "vofwlsnk_unprotected_sub${hostid}",
- "unprotected_private_net_cidr" : "192.168.10.0/24",
- "int_protected_private_net_id" : "vofwlsnk_protected${hostid}",
- "int_protected_private_subnet_id" : "vofwlsnk_protected_sub${hostid}",
- "protected_private_net_cidr" : "192.168.20.0/24",
- "vfw_int_unprotected_private_ip_0" : "192.168.10.100",
- # this should be the same value as vpg_private_ip_0
- "vfw_int_protected_private_floating_ip" : "192.168.10.200",
- "vfw_int_protected_private_ip_0" : "192.168.20.100",
- "vfw_onap_private_ip_0" : "{{.Values.openStackOamNetworkCidrPrefix}}.${ecompnet}.101",
- "vsn_int_protected_private_ip_0" : "192.168.20.250",
- "vsn_onap_private_ip_0" : "{{.Values.openStackOamNetworkCidrPrefix}}.${ecompnet}.102",
- "sec_group" : "{{ .Values.openStackSecurityGroup }}",
- 'vfw_name_0':'vofwl01fwl${hostid}',
- 'vsn_name_0':'vofwl01snk${hostid}',
- "vfw_image_name" : "${GLOBAL_INJECTED_UBUNTU_1404_IMAGE}",
- "vfw_flavor_name" : "${GLOBAL_INJECTED_VM_FLAVOR}",
- "vsn_image_name" : "${GLOBAL_INJECTED_UBUNTU_1404_IMAGE}",
- "vsn_flavor_name" : "${GLOBAL_INJECTED_VM_FLAVOR}",
- },
- "vpkg_preload.template": {
- # vFWSNK_ prepended to vpkg since the default behoir for vFWSNK tempalte is to concatenate vnf_name and network_name
- "unprotected_private_net_id" : "vFWSNK_vofwlsnk_unprotected${hostid}",
- "unprotected_private_subnet_id" : "vFWSNK_vofwlsnk_unprotected_sub${hostid}",
- "unprotected_private_net_cidr" : "192.168.10.0/24",
- "protected_private_net_cidr" : "192.168.20.0/24",
- "vfw_private_ip_0" : "192.168.10.100",
- "vpg_unprotected_private_ip_0" : "192.168.10.200",
- "vpg_onap_private_ip_0" : "{{.Values.openStackOamNetworkCidrPrefix}}.${ecompnet}.103",
- "vsn_private_ip_0" : "192.168.20.250",
- "sec_group" : "{{ .Values.openStackSecurityGroup }}",
- 'vpg_name_0':'vofwl01pgn${hostid}',
- "vpg_image_name" : "${GLOBAL_INJECTED_UBUNTU_1404_IMAGE}",
- "vpg_flavor_name" : "${GLOBAL_INJECTED_VM_FLAVOR}",
- },
- # vFWDT preload data
- "vfwdt_vpkg_preload.template": {
- "unprotected_private_net_id" : "vofwlsnk_unprotected${hostid}",
- "unprotected_private_subnet_id" : "vofwlsnk_unprotected_sub${hostid}",
- "unprotected_private_net_cidr" : "192.168.10.0/24",
- "protected_private_net_cidr" : "192.168.20.0/24",
- "vfw_private_ip_0" : "192.168.10.100",
- "vpg_private_ip_0" : "192.168.10.200",
- "vpg_private_ip_1" : "{{.Values.openStackOamNetworkCidrPrefix}}.${ecompnet}.103",
- "vsn_private_ip_0" : "192.168.20.250",
- "sec_group" : "{{ .Values.openStackSecurityGroup }}",
- 'vpg_name_0':'vofwl01pgn${hostid}',
- "vfw_name_0": "vofwl01vfw${hostid}",
- "vsn_name_0": "vofwl01snk${hostid}",
- "image_name" : "${GLOBAL_INJECTED_UBUNTU_1404_IMAGE}",
- "flavor_name" : "${GLOBAL_INJECTED_VM_FLAVOR}",
- "protected_private_net_id" : "vofwlsnk01_protected${hostid}",
- "protected_private_subnet_id" : "vofwlsnk01_protected_sub${hostid}",
- "ext_private_net_id": "onap_oam_ext",
- "ext_private_subnet_id": "onap_oam_ext_sub",
- "ext_private_net_cidr": "10.100.0.0/16",
- "vfw_private_ip_1": "192.168.20.100",
- "vfw_private_ip_2": "10.0.110.1",
- "vfw_private_ip_3": "10.100.100.1",
- "vsn_private_ip_1": "10.0.110.3",
- "vsn_private_ip_0": "192.168.20.250",
- "vsn_private_ip_2": "10.100.100.3",
- },
- "vfwdt_vfwsnk0_preload.template": {
- "unprotected_private_net_id" : "vofwlsnk_unprotected${hostid}",
- "unprotected_private_subnet_id" : "vofwlsnk_unprotected_sub${hostid}",
- "unprotected_private_net_cidr" : "192.168.10.0/24",
- "protected_private_net_cidr" : "192.168.20.0/24",
- "vfw_private_ip_0" : "192.168.10.100",
- "vpg_private_ip_0" : "192.168.10.200",
- "vpg_private_ip_1" : "{{.Values.openStackOamNetworkCidrPrefix}}.${ecompnet}.103",
- "vsn_private_ip_0" : "192.168.20.250",
- "sec_group" : "{{ .Values.openStackSecurityGroup }}",
- 'vpg_name_0':'vofwl01pgn${hostid}',
- "vsn_name_0": "vofwl01snk${hostid}",
- "vfw_name_0": "vofwl01vfw${hostid}",
- "image_name" : "${GLOBAL_INJECTED_UBUNTU_1404_IMAGE}",
- "flavor_name" : "${GLOBAL_INJECTED_VM_FLAVOR}",
- "protected_private_net_id" : "vofwlsnk01_protected${hostid}",
- "protected_private_subnet_id" : "vofwlsnk01_protected_sub${hostid}",
- "ext_private_net_id": "onap_oam_ext",
- "ext_private_subnet_id": "onap_oam_ext_sub",
- "ext_private_net_cidr": "10.100.0.0/16",
- "vfw_private_ip_1": "192.168.20.100",
- "vfw_private_ip_2": "10.0.110.1",
- "vfw_private_ip_3": "10.100.100.1",
- "vsn_private_ip_1": "10.0.110.3",
- "vsn_private_ip_0": "192.168.20.250",
- "vpg_private_ip_2": "10.100.100.2",
- "vsn_private_ip_1": "10.0.110.3",
- "vsn_private_ip_0": "192.168.20.250",
- "vsn_private_ip_2": "10.100.100.3"
- },
- "vfwdt_vfwsnk1_preload.template": {
- "unprotected_private_net_id" : "vofwlsnk_unprotected${hostid}",
- "unprotected_private_subnet_id" : "vofwlsnk_unprotected_sub${hostid}",
- "unprotected_private_net_cidr" : "192.168.10.0/24",
- "protected_private_net_cidr" : "192.168.20.0/24",
- "vfw_private_ip_0" : "192.168.10.110",
- "vpg_private_ip_0" : "192.168.10.200",
- "vpg_private_ip_1" : "{{.Values.openStackOamNetworkCidrPrefix}}.${ecompnet}.103",
- "vsn_private_ip_0" : "192.168.20.250",
- "sec_group" : "{{ .Values.openStackSecurityGroup }}",
- 'vpg_name_0':'vofwl01pgn${hostid}',
- "vsn_name_0": "vofwl01snk${hostid}",
- "vfw_name_0": "vofwl01vfw${hostid}",
- "image_name" : "${GLOBAL_INJECTED_UBUNTU_1404_IMAGE}",
- "flavor_name" : "${GLOBAL_INJECTED_VM_FLAVOR}",
- "protected_private_net_id" : "vofwlsnk01_protected${hostid}",
- "protected_private_subnet_id" : "vofwlsnk01_protected_sub${hostid}",
- "ext_private_net_id": "onap_oam_ext",
- "ext_private_subnet_id": "onap_oam_ext_sub",
- "ext_private_net_cidr": "10.100.0.0/16",
- "vfw_private_ip_1": "192.168.20.110",
- "vfw_private_ip_2": "10.0.110.4",
- "vfw_private_ip_3": "10.100.100.4",
- "vpg_private_ip_0": "192.168.10.200",
- "vpg_private_ip_1": "10.0.110.2",
- "vpg_private_ip_2": "10.100.100.2",
- "vsn_private_ip_0": "192.168.20.240",
- "vsn_private_ip_1": "10.0.110.5",
- "vsn_private_ip_2": "10.100.100.5"
- },
- "vlb_preload.template" : {
- "vlb_image_name" : "${GLOBAL_INJECTED_UBUNTU_1604_IMAGE}",
- "vlb_flavor_name" : "${GLOBAL_INJECTED_VM_FLAVOR}",
- "vdns_image_name" : "${GLOBAL_INJECTED_UBUNTU_1604_IMAGE}",
- "vdns_flavor_name" : "${GLOBAL_INJECTED_VM_FLAVOR}",
- "vpg_image_name" : "${GLOBAL_INJECTED_UBUNTU_1604_IMAGE}",
- "vpg_flavor_name" : "${GLOBAL_INJECTED_VM_FLAVOR}",
- 'vlb_name_0':'vovlblb${hostid}',
- 'vdns_name_0':'vovlbdns${hostid}',
- "vpg_name_0" : "vovlbpgn${hostid}",
- "vlb_private_net_id" : "volb01_private${hostid}",
- "vlb_private_net_cidr" : "192.168.30.0/24",
- "pktgen_private_net_id" : "volb01_pktgen${hostid}",
- "pktgen_private_net_cidr" : "192.168.9.0/24",
- "vlb_int_private_ip_0" : "192.168.30.100",
- "vlb_onap_private_ip_0" : "{{.Values.openStackOamNetworkCidrPrefix}}.${ecompnet}.4",
- "vlb_int_pktgen_private_ip_0" : "192.168.9.111",
- "vdns_int_private_ip_0" : "192.168.30.110",
- "vdns_onap_private_ip_0" : "{{.Values.openStackOamNetworkCidrPrefix}}.${ecompnet}.5",
- "vpg_int_pktgen_private_ip_0" : "192.168.9.110",
- "vpg_onap_private_ip_0" : "{{.Values.openStackOamNetworkCidrPrefix}}.${ecompnet}.7",
- "sec_group" : "{{ .Values.openStackSecurityGroup }}",
- "pg_int" : "192.168.9.109",
- "vip" : "192.168.9.112",
- "gre_ipaddr" : "192.168.30.112",
- "vnf_id" : "vLoadBalancer_${hostid}",
- "vf_module_id" : "vLoadBalancer"
-
- },
- "dnsscaling_preload.template" : {
- "int_private_net_id" : "vLBMS_volb01_private${hostid}",
- "int_private_subnet_id" : "vLBMS_volb01_private${hostid}_subnet",
- "vlb_int_private_ip_0" : "192.168.30.100",
- "vlb_onap_private_ip_0" : "{{.Values.openStackOamNetworkCidrPrefix}}.${ecompnet}.4",
- "vlb_int_pktgen_private_ip_0" : "192.168.9.111",
- "vdns_int_private_ip_0" : "192.168.30.222",
- "vdns_onap_private_ip_0" : "{{.Values.openStackOamNetworkCidrPrefix}}.${ecompnet}.6",
- "sec_group" : "{{ .Values.openStackSecurityGroup }}",
- 'vdns_name_0':'vovlbscaling${hostid}',
- "vlb_private_net_cidr" : "192.168.30.0/24"
- },
- "vims_preload.template" : {
- "bono_image_name" : "${GLOBAL_INJECTED_UBUNTU_1404_IMAGE}",
- "sprout_image_name" : "${GLOBAL_INJECTED_UBUNTU_1404_IMAGE}",
- "homer_image_name" : "${GLOBAL_INJECTED_UBUNTU_1404_IMAGE}",
- "homestead_image_name" : "${GLOBAL_INJECTED_UBUNTU_1404_IMAGE}",
- "ralf_image_name" : "${GLOBAL_INJECTED_UBUNTU_1404_IMAGE}",
- "ellis_image_name" : "${GLOBAL_INJECTED_UBUNTU_1404_IMAGE}",
- "dns_image_name" : "${GLOBAL_INJECTED_UBUNTU_1404_IMAGE}",
- "bono_flavor_name" : "${GLOBAL_INJECTED_VM_FLAVOR}",
- "sprout_flavor_name" : "${GLOBAL_INJECTED_VM_FLAVOR}",
- "homer_flavor_name" : "${GLOBAL_INJECTED_VM_FLAVOR}",
- "homestead_flavor_name" : "${GLOBAL_INJECTED_VM_FLAVOR}",
- "ralf_flavor_name" : "${GLOBAL_INJECTED_VM_FLAVOR}",
- "ellis_flavor_name" : "${GLOBAL_INJECTED_VM_FLAVOR}",
- "dns_flavor_name" : "${GLOBAL_INJECTED_VM_FLAVOR}",
- "repo_url" : "http://repo.cw-ngv.com/stable",
- "zone" : "me.cw-ngv.com",
- "dn_range_start" : "2425550000",
- "dn_range_length" : "10000",
- "dnssec_key" : "9FPdYTWhk5+LbhrqtTPQKw=="
-
- },
- "vvg_preload.template" : {
- }
- },
-# heat template parameter values for heat template instances created during Closed-Loop test cases
- "Closed-Loop" : {
- "vfw_preload.template": {
- "unprotected_private_net_id" : "clfwl01_unprotected${hostid}",
- "unprotected_private_net_cidr" : "192.168.110.0/24",
- "protected_private_net_id" : "clfwl01_protected${hostid}",
- "protected_private_net_cidr" : "192.168.120.0/24",
- "vfw_int_unprotected_private_ip_0" : "192.168.110.100",
- "vfw_int_protected_private_ip_0" : "192.168.120.100",
- "vfw_onap_private_ip_0" : "{{.Values.openStackOamNetworkCidrPrefix}}.${ecompnet}.11",
- "vfw_int_protected_private_floating_ip" : "192.168.110.200",
- "vpg_int_unprotected_private_ip_0" : "192.168.110.200",
- "vpg_onap_private_ip_0" : "{{.Values.openStackOamNetworkCidrPrefix}}.${ecompnet}.12",
- "vsn_int_protected_private_ip_0" : "192.168.120.250",
- "vsn_onap_private_ip_0" : "{{.Values.openStackOamNetworkCidrPrefix}}.${ecompnet}.13",
- "sec_group" : "{{ .Values.openStackSecurityGroup }}",
- 'vfw_name_0':'clfwl01fwl${hostid}',
- 'vpg_name_0':'clfwl01pgn${hostid}',
- "vfw_image_name" : "${GLOBAL_INJECTED_UBUNTU_1404_IMAGE}",
- "vfw_flavor_name" : "${GLOBAL_INJECTED_VM_FLAVOR}",
- "vpg_image_name" : "${GLOBAL_INJECTED_UBUNTU_1404_IMAGE}",
- "vpg_flavor_name" : "${GLOBAL_INJECTED_VM_FLAVOR}",
- "vsn_image_name" : "${GLOBAL_INJECTED_UBUNTU_1404_IMAGE}",
- "vsn_flavor_name" : "${GLOBAL_INJECTED_VM_FLAVOR}",
- 'vsn_name_0':'clfwl01snk${hostid}'
- },
- "vfwsnk_preload.template": {
- "int_unprotected_private_net_id" : "clfwlsnk_unprotected${hostid}",
- "int_unprotected_private_subnet_id" : "clfwlsnk_unprotected_sub${hostid}",
- "unprotected_private_net_cidr" : "192.168.10.0/24",
- "int_protected_private_net_id" : "clfwlsnk_protected${hostid}",
- "int_protected_private_subnet_id" : "clfwlsnk_protected_sub${hostid}",
- "protected_private_net_cidr" : "192.168.20.0/24",
- "vfw_int_unprotected_private_ip_0" : "192.168.10.100",
- # this should be the same value as vpg_private_ip_0
- "vfw_int_protected_private_floating_ip" : "192.168.10.200",
- "vfw_int_protected_private_ip_0" : "192.168.20.100",
- "vfw_onap_private_ip_0" : "{{.Values.openStackOamNetworkCidrPrefix}}.${ecompnet}.111",
- "vsn_int_protected_private_ip_0" : "192.168.20.250",
- "vsn_onap_private_ip_0" : "{{.Values.openStackOamNetworkCidrPrefix}}.${ecompnet}.112",
- "sec_group" : "{{ .Values.openStackSecurityGroup }}",
- 'vfw_name_0':'clfwl01fwl${hostid}',
- 'vsn_name_0':'clfwl01snk${hostid}',
- "vfw_image_name" : "${GLOBAL_INJECTED_UBUNTU_1404_IMAGE}",
- "vfw_flavor_name" : "${GLOBAL_INJECTED_VM_FLAVOR}",
- "vsn_image_name" : "${GLOBAL_INJECTED_UBUNTU_1404_IMAGE}",
- "vsn_flavor_name" : "${GLOBAL_INJECTED_VM_FLAVOR}",
- },
- "vpkg_preload.template": {
- "unprotected_private_net_id" : "vFWSNK_clfwlsnk_unprotected${hostid}",
- "unprotected_private_subnet_id" : "vFWSNK_clfwlsnk_unprotected_sub${hostid}",
- "unprotected_private_net_cidr" : "192.168.10.0/24",
- "protected_private_net_cidr" : "192.168.20.0/24",
- "vfw_private_ip_0" : "192.168.10.100",
- "vpg_unprotected_private_ip_0" : "192.168.10.200",
- "vpg_onap_private_ip_0" : "{{.Values.openStackOamNetworkCidrPrefix}}.${ecompnet}.113",
- "vsn_private_ip_0" : "192.168.20.250",
- "sec_group" : "{{ .Values.openStackSecurityGroup }}",
- 'vpg_name_0':'clfwl01pgn${hostid}',
- "vpg_image_name" : "${GLOBAL_INJECTED_UBUNTU_1404_IMAGE}",
- "vpg_flavor_name" : "${GLOBAL_INJECTED_VM_FLAVOR}",
- },
- # vLBMS
- "vlb_preload.template" : {
- "vlb_image_name" : "${GLOBAL_INJECTED_UBUNTU_1604_IMAGE}",
- "vlb_flavor_name" : "${GLOBAL_INJECTED_VM_FLAVOR}",
- "vdns_image_name" : "${GLOBAL_INJECTED_UBUNTU_1604_IMAGE}",
- "vdns_flavor_name" : "${GLOBAL_INJECTED_VM_FLAVOR}",
- "vpg_image_name" : "${GLOBAL_INJECTED_UBUNTU_1604_IMAGE}",
- "vpg_flavor_name" : "${GLOBAL_INJECTED_VM_FLAVOR}",
- 'vlb_name_0':'clvlblb${hostid}',
- 'vdns_name_0':'clvlbdns${hostid}',
- "vpg_name_0" : "clvlbpgn${hostid}",
- "vlb_private_net_id" : "cllb01_private${hostid}",
- "vlb_private_net_cidr" : "192.168.30.0/24",
- "pktgen_private_net_id" : "cllb01_pktgen${hostid}",
- "pktgen_private_net_cidr" : "192.168.9.0/24",
- "vlb_int_private_ip_0" : "192.168.30.100",
- "vlb_onap_private_ip_0" : "{{.Values.openStackOamNetworkCidrPrefix}}.${ecompnet}.14",
- "vlb_int_pktgen_private_ip_0" : "192.168.9.111",
- "vdns_int_private_ip_0" : "192.168.30.110",
- "vdns_onap_private_ip_0" : "{{.Values.openStackOamNetworkCidrPrefix}}.${ecompnet}.15",
- "vpg_int_pktgen_private_ip_0" : "192.168.9.110",
- "vpg_onap_private_ip_0" : "{{.Values.openStackOamNetworkCidrPrefix}}.${ecompnet}.17",
- "sec_group" : "{{ .Values.openStackSecurityGroup }}",
- "pg_int" : "192.168.9.109",
- "vip" : "192.168.9.112",
- "gre_ipaddr" : "192.168.30.112",
- "vnf_id" : "vLoadBalancer_${hostid}",
- "vf_module_id" : "vLoadBalancer"
- },
- "dnsscaling_preload.template" : {
- "int_private_net_id" : "vLBMS_cllb01_private${hostid}",
- "int_private_subnet_id" : "vLBMS_cllb01_private${hostid}_subnet",
- "vlb_int_private_ip_0" : "192.168.30.100",
- "vlb_onap_private_ip_0" : "{{.Values.openStackOamNetworkCidrPrefix}}.${ecompnet}.14",
- "vlb_int_pktgen_private_ip_0" : "192.168.9.111",
- "vdns_int_private_ip_0" : "192.168.30.222",
- "vdns_onap_private_ip_0" : "{{.Values.openStackOamNetworkCidrPrefix}}.${ecompnet}.16",
- "sec_group" : "{{ .Values.openStackSecurityGroup }}",
- 'vdns_name_0':'clvlbscaling${hostid}',
- "vlb_private_net_cidr" : "192.168.10.0/24"
- },
- "vims_preload.template" : {
- "bono_image_name" : "${GLOBAL_INJECTED_UBUNTU_1404_IMAGE}",
- "sprout_image_name" : "${GLOBAL_INJECTED_UBUNTU_1404_IMAGE}",
- "homer_image_name" : "${GLOBAL_INJECTED_UBUNTU_1404_IMAGE}",
- "homestead_image_name" : "${GLOBAL_INJECTED_UBUNTU_1404_IMAGE}",
- "ralf_image_name" : "${GLOBAL_INJECTED_UBUNTU_1404_IMAGE}",
- "ellis_image_name" : "${GLOBAL_INJECTED_UBUNTU_1404_IMAGE}",
- "dns_image_name" : "${GLOBAL_INJECTED_UBUNTU_1404_IMAGE}",
- "bono_flavor_name" : "${GLOBAL_INJECTED_VM_FLAVOR}",
- "sprout_flavor_name" : "${GLOBAL_INJECTED_VM_FLAVOR}",
- "homer_flavor_name" : "${GLOBAL_INJECTED_VM_FLAVOR}",
- "homestead_flavor_name" : "${GLOBAL_INJECTED_VM_FLAVOR}",
- "ralf_flavor_name" : "${GLOBAL_INJECTED_VM_FLAVOR}",
- "ellis_flavor_name" : "${GLOBAL_INJECTED_VM_FLAVOR}",
- "dns_flavor_name" : "${GLOBAL_INJECTED_VM_FLAVOR}",
- "repo_url" : "http://repo.cw-ngv.com/stable",
- "zone" : "me.cw-ngv.com",
- "dn_range_start" : "2425550000",
- "dn_range_length" : "10000",
- "dnssec_key" : "9FPdYTWhk5+LbhrqtTPQKw=="
- },
- "vvg_preload.template" : {
- }
- },
- # heat template parameter values for heat template instances created for hands on demo test case
- "Demo" : {
- "vfw_preload.template": {
- "unprotected_private_net_id" : "demofwl_unprotected",
- "unprotected_private_net_cidr" : "192.168.110.0/24",
- "protected_private_net_id" : "demofwl_protected",
- "protected_private_net_cidr" : "192.168.120.0/24",
- "vfw_int_unprotected_private_ip_0" : "192.168.110.100",
- "vfw_int_protected_private_ip_0" : "192.168.120.100",
- "vfw_onap_private_ip_0" : "{{.Values.openStackOamNetworkCidrPrefix}}.${ecompnet}.11",
- "vpg_int_unprotected_private_ip_0" : "192.168.110.200",
- "vfw_int_protected_private_floating_ip" : "192.168.110.200",
- "vpg_onap_private_ip_0" : "{{.Values.openStackOamNetworkCidrPrefix}}.${ecompnet}.12",
- "vsn_int_protected_private_ip_0" : "192.168.120.250",
- "vsn_onap_private_ip_0" : "{{.Values.openStackOamNetworkCidrPrefix}}.${ecompnet}.13",
- "sec_group" : "{{ .Values.openStackSecurityGroup }}",
- 'vfw_name_0':'demofwl01fwl',
- 'vpg_name_0':'demofwl01pgn',
- "vfw_image_name" : "${GLOBAL_INJECTED_UBUNTU_1404_IMAGE}",
- "vfw_flavor_name" : "${GLOBAL_INJECTED_VM_FLAVOR}",
- "vpg_image_name" : "${GLOBAL_INJECTED_UBUNTU_1404_IMAGE}",
- "vpg_flavor_name" : "${GLOBAL_INJECTED_VM_FLAVOR}",
- "vsn_image_name" : "${GLOBAL_INJECTED_UBUNTU_1404_IMAGE}",
- "vsn_flavor_name" : "${GLOBAL_INJECTED_VM_FLAVOR}",
- 'vsn_name_0':'demofwl01snk'
- },
- "vfwsnk_preload.template": {
- "int_unprotected_private_net_id" : "demofwlsnk_unprotected${hostid}",
- "int_unprotected_private_subnet_id" : "demofwlsnk_unprotected_sub${hostid}",
- "unprotected_private_net_cidr" : "192.168.10.0/24",
- "int_protected_private_net_id" : "demofwlsnk_protected${hostid}",
- "int_protected_private_subnet_id" : "vofwlsnk_protected_sub${hostid}",
- "protected_private_net_cidr" : "192.168.20.0/24",
- "vfw_int_unprotected_private_ip_0" : "192.168.10.100",
- # this should be the same value as vpg_private_ip_0
- "vfw_int_protected_private_floating_ip" : "192.168.10.200",
- "vfw_int_protected_private_ip_0" : "192.168.20.100",
- "vfw_onap_private_ip_0" : "{{.Values.openStackOamNetworkCidrPrefix}}.${ecompnet}.121",
- "vsn_int_protected_private_ip_0" : "192.168.20.250",
- "vsn_onap_private_ip_0" : "{{.Values.openStackOamNetworkCidrPrefix}}.${ecompnet}.122",
- "sec_group" : "{{ .Values.openStackSecurityGroup }}",
- 'vfw_name_0':'${generic_vnf_name}',
- 'vsn_name_0':'demofwl01snk${hostid}',
- "vfw_image_name" : "${GLOBAL_INJECTED_UBUNTU_1404_IMAGE}",
- "vfw_flavor_name" : "${GLOBAL_INJECTED_VM_FLAVOR}",
- "vsn_image_name" : "${GLOBAL_INJECTED_UBUNTU_1404_IMAGE}",
- "vsn_flavor_name" : "${GLOBAL_INJECTED_VM_FLAVOR}",
- },
- "vpkg_preload.template": {
- "unprotected_private_net_id" : "vFWSNK_demofwlsnk_unprotected${hostid}",
- "unprotected_private_subnet_id" : "vFWSNK_demofwlsnk_unprotected_sub${hostid}",
- "unprotected_private_net_cidr" : "192.168.10.0/24",
- "protected_private_net_cidr" : "192.168.20.0/24",
- "vfw_private_ip_0" : "192.168.10.100",
- "vpg_unprotected_private_ip_0" : "192.168.10.200",
- "vpg_onap_private_ip_0" : "{{.Values.openStackOamNetworkCidrPrefix}}.${ecompnet}.123",
- "vsn_private_ip_0" : "192.168.20.250",
- "sec_group" : "{{ .Values.openStackSecurityGroup }}",
- 'vpg_name_0':'demofwl01pgn${hostid}',
- "vpg_image_name" : "${GLOBAL_INJECTED_UBUNTU_1404_IMAGE}",
- "vpg_flavor_name" : "${GLOBAL_INJECTED_VM_FLAVOR}"
- },
- # vLBMS
- "vlb_preload.template" : {
- "vlb_image_name" : "${GLOBAL_INJECTED_UBUNTU_1604_IMAGE}",
- "vlb_flavor_name" : "${GLOBAL_INJECTED_VM_FLAVOR}",
- "vdns_image_name" : "${GLOBAL_INJECTED_UBUNTU_1604_IMAGE}",
- "vdns_flavor_name" : "${GLOBAL_INJECTED_VM_FLAVOR}",
- "vpg_image_name" : "${GLOBAL_INJECTED_UBUNTU_1604_IMAGE}",
- "vpg_flavor_name" : "${GLOBAL_INJECTED_VM_FLAVOR}",
- 'vlb_name_0':'demovlblb${hostid}',
- 'vdns_name_0':'demovlbdns${hostid}',
- "vpg_name_0" : "clvlbpgn${hostid}",
- "vlb_private_net_id" : "demolb_private${hostid}",
- "vlb_private_net_cidr" : "192.168.30.0/24",
- "pktgen_private_net_id" : "demolb_pktgen${hostid}",
- "pktgen_private_net_cidr" : "192.168.9.0/24",
- "vlb_int_private_ip_0" : "192.168.30.100",
- "vlb_onap_private_ip_0" : "{{.Values.openStackOamNetworkCidrPrefix}}.${ecompnet}.24",
- "vlb_int_pktgen_private_ip_0" : "192.168.9.111",
- "vdns_int_private_ip_0" : "192.168.30.110",
- "vdns_onap_private_ip_0" : "{{.Values.openStackOamNetworkCidrPrefix}}.${ecompnet}.25",
- "vpg_onap_private_ip_0" : "{{.Values.openStackOamNetworkCidrPrefix}}.${ecompnet}.27",
- "vpg_int_pktgen_private_ip_0" : "192.168.9.110",
- "pg_int" : "192.168.9.109",
- "vip" : "192.168.9.112",
- "gre_ipaddr" : "192.168.30.112",
- "vnf_id" : "vLoadBalancer_${hostid}",
- "vf_module_id" : "vLoadBalancer",
- "sec_group" : "{{ .Values.openStackSecurityGroup }}"
- },
- "dnsscaling_preload.template" : {
- "int_private_net_id" : "vLBMS_demolb_private${hostid}",
- "int_private_subnet_id" : "vLBMS_demolb_private${hostid}_subnet",
- "vlb_int_private_ip_0" : "192.168.30.100",
- "vlb_onap_private_ip_0" : "{{.Values.openStackOamNetworkCidrPrefix}}.${ecompnet}.24",
- "vlb_int_pktgen_private_ip_0" : "192.168.9.111",
- "vdns_int_private_ip_0" : "192.168.30.222",
- "vdns_onap_private_ip_0" : "{{.Values.openStackOamNetworkCidrPrefix}}.${ecompnet}.26",
- "sec_group" : "{{ .Values.openStackSecurityGroup }}",
- 'vdns_name_0':'demovlbscaling${hostid}',
- "vlb_private_net_cidr" : "192.168.30.0/24"
- },
- "vims_preload.template" : {
- "bono_image_name" : "${GLOBAL_INJECTED_UBUNTU_1404_IMAGE}",
- "sprout_image_name" : "${GLOBAL_INJECTED_UBUNTU_1404_IMAGE}",
- "homer_image_name" : "${GLOBAL_INJECTED_UBUNTU_1404_IMAGE}",
- "homestead_image_name" : "${GLOBAL_INJECTED_UBUNTU_1404_IMAGE}",
- "ralf_image_name" : "${GLOBAL_INJECTED_UBUNTU_1404_IMAGE}",
- "ellis_image_name" : "${GLOBAL_INJECTED_UBUNTU_1404_IMAGE}",
- "dns_image_name" : "${GLOBAL_INJECTED_UBUNTU_1404_IMAGE}",
- "bono_flavor_name" : "${GLOBAL_INJECTED_VM_FLAVOR}",
- "sprout_flavor_name" : "${GLOBAL_INJECTED_VM_FLAVOR}",
- "homer_flavor_name" : "${GLOBAL_INJECTED_VM_FLAVOR}",
- "homestead_flavor_name" : "${GLOBAL_INJECTED_VM_FLAVOR}",
- "ralf_flavor_name" : "${GLOBAL_INJECTED_VM_FLAVOR}",
- "ellis_flavor_name" : "${GLOBAL_INJECTED_VM_FLAVOR}",
- "dns_flavor_name" : "${GLOBAL_INJECTED_VM_FLAVOR}",
- "repo_url" : "http://repo.cw-ngv.com/stable",
- "zone" : "me.cw-ngv.com",
- "dn_range_start" : "2425550000",
- "dn_range_length" : "10000",
- "dnssec_key" : "9FPdYTWhk5+LbhrqtTPQKw=="
- },
- "vvg_preload.template" : {
- }
- }
-}
-
-
-# Create dictionaries for new MAPPING data to join to original MAPPING data
-GLOBAL_PRELOAD_PARAMETERS2 = {}
-
-
-folder=os.path.join('/var/opt/ONAP/demo/preload_data')
-subfolders = [d for d in os.listdir(folder) if os.path.isdir(os.path.join(folder, d))]
-
-for service in subfolders:
- filepath=os.path.join('/var/opt/ONAP/demo/preload_data', service, 'preload_data.json')
- with open(filepath, 'r') as f:
- preload_data = json.load(f)
- GLOBAL_PRELOAD_PARAMETERS2['Demo']=preload_data
-
-
-# Merge dictionaries
-# preload_data.json is for Demo key in GLOBAL_PRELOAD_PARAMETERS
-
-
-GLOBAL_PRELOAD_PARAMETERS3 = {'Demo':{}}
-
-for k, v in chain(GLOBAL_PRELOAD_PARAMETERS['Demo'].items(), GLOBAL_PRELOAD_PARAMETERS2['Demo'].items()):
- GLOBAL_PRELOAD_PARAMETERS3['Demo'][k] = v
-# print(k, v)
-
-GLOBAL_PRELOAD_PARAMETERS = dict(GLOBAL_PRELOAD_PARAMETERS.items() + GLOBAL_PRELOAD_PARAMETERS3.items())
-
-#print GLOBAL_PRELOAD_PARAMETERS
-
diff --git a/kubernetes/robot/resources/config/eteshare/config/integration_robot_properties.py b/kubernetes/robot/resources/config/eteshare/config/integration_robot_properties.py
index 0370bbc71d..2bbfa565bd 100644
--- a/kubernetes/robot/resources/config/eteshare/config/integration_robot_properties.py
+++ b/kubernetes/robot/resources/config/eteshare/config/integration_robot_properties.py
@@ -123,11 +123,16 @@ GLOBAL_MUSIC_SERVER_PORT = "8080"
GLOBAL_OOF_SERVER_PROTOCOL = "https"
# oof-homing info - everything is from the private oam network (also called onap private network)
GLOBAL_OOF_HOMING_SERVER_PORT = "8091"
+GLOBAL_OOF_HOMING_USERNAME="{{ .Values.oofHomingUsername }}"
+GLOBAL_OOF_HOMING_PASSWORD="{{ .Values.oofHomingPassword }}"
# oof-sniro info - everything is from the private oam network (also called onap private network)
GLOBAL_OOF_SNIRO_SERVER_PORT = "8698"
#oof user
GLOBAL_OOF_OSDF_USERNAME="{{ .Values.oofUsername }}"
GLOBAL_OOF_OSDF_PASSWORD="{{ .Values.oofPassword }}"
+#oof pci user
+GLOBAL_OOF_PCI_USERNAME="{{ .Values.oofOsdfPciOptUsername }}"
+GLOBAL_OOF_PCI_PASSWORD="{{ .Values.oofOsdfPciOptPassword }}"
# oof cmso global info - everything is from the private oam network (also called onap private network)
GLOBAL_OOF_CMSO_PROTOCOL = "https"
GLOBAL_OOF_CMSO_SERVER_PORT = "8080"
@@ -174,10 +179,14 @@ GLOBAL_VID_HEALTH_PASSWORD = '{{ .Values.vidHealthPassword }}'
# vnfsdk info - everything is from the private oam network (also called onap private network)
GLOBAL_VNFSDK_SERVER_PROTOCOL = "http"
GLOBAL_VNFSDK_SERVER_PORT = "8702"
+
+GLOBAL_DCAE_VES_PROTOCOL = "http"
+GLOBAL_DCAE_VES_SERVER_PORT = "8080"
#global selenium info
GLOBAL_PROXY_WARNING_TITLE=""
GLOBAL_PROXY_WARNING_CONTINUE_XPATH=""
# dns info
GLOBAL_DNS_TRAFFIC_DURATION = "600"
-# location where heat templates are loaded from
+# location where heat templates and data are loaded from
GLOBAL_HEAT_TEMPLATES_FOLDER = "/var/opt/ONAP/demo/heat"
+GLOBAL_PRELOAD_DATA_FOLDER = "/var/opt/ONAP/demo/preload-data"
diff --git a/kubernetes/robot/resources/config/eteshare/config/vm_properties.py b/kubernetes/robot/resources/config/eteshare/config/vm_properties.py
index e46b5fc723..b2fa288fff 100644
--- a/kubernetes/robot/resources/config/eteshare/config/vm_properties.py
+++ b/kubernetes/robot/resources/config/eteshare/config/vm_properties.py
@@ -20,10 +20,13 @@ GLOBAL_INJECTED_AAI2_IP_ADDR = 'N/A'
GLOBAL_INJECTED_APPC_IP_ADDR = 'appc.{{include "common.namespace" .}}'
GLOBAL_INJECTED_APPC_CDT_IP_ADDR = 'appc-cdt.{{include "common.namespace" .}}'
GLOBAL_INJECTED_ARTIFACTS_VERSION = '{{.Values.demoArtifactsVersion}}'
+GLOBAL_INJECTED_ARTIFACTS_REPO_URL = "{{ .Values.demoArtifactsRepoUrl }}"
GLOBAL_INJECTED_CLAMP_IP_ADDR = 'clamp.{{include "common.namespace" .}}'
GLOBAL_INJECTED_CLI_IP_ADDR = 'cli.{{include "common.namespace" .}}'
GLOBAL_INJECTED_CLOUD_ENV = 'openstack'
+GLOBAL_INJECTED_DCAE_COLLECTOR_IP = "{{ .Values.dcaeCollectorIp }}"
GLOBAL_INJECTED_DCAE_IP_ADDR = 'dcae-healthcheck.{{include "common.namespace" .}}'
+GLOBAL_INJECTED_DCAE_VES_HOST = 'dcae-ves-collector.{{include "common.namespace" .}}'
GLOBAL_INJECTED_DMAAP_DR_PROV_IP_ADDR = 'dmaap-dr-prov.{{include "common.namespace" .}}'
GLOBAL_INJECTED_DMAAP_DR_NODE_IP_ADDR = 'dmaap-dr-node.{{include "common.namespace" .}}'
GLOBAL_INJECTED_DNS_IP_ADDR = 'N/A'
@@ -63,6 +66,7 @@ GLOBAL_INJECTED_OPENSTACK_TENANT_ID = '{{ .Values.openStackTenantId }}'
GLOBAL_INJECTED_OPENSTACK_USERNAME = '{{ .Values.openStackUserName }}'
GLOBAL_INJECTED_OPENSTACK_PROJECT_NAME = '{{ .Values.openStackProjectName }}'
GLOBAL_INJECTED_OPENSTACK_DOMAIN_ID = '{{ .Values.openStackDomainId }}'
+GLOBAL_INJECTED_OPENSTACK_USER_DOMAIN = '{{ .Values.openStackUserDomain }}'
GLOBAL_INJECTED_OPENSTACK_KEYSTONE_API_VERSION = '{{ .Values.openStackKeystoneAPIVersion }}'
GLOBAL_INJECTED_REGION_THREE = '{{ .Values.openStackRegionRegionThree }}'
GLOBAL_INJECTED_KEYSTONE_REGION_THREE = '{{ .Values.openStackKeyStoneUrlRegionThree }}'
@@ -70,10 +74,15 @@ GLOBAL_INJECTED_OPENSTACK_KEYSTONE_API_VERSION_REGION_THREE = '{{ .Values.openSt
GLOBAL_INJECTED_OPENSTACK_USERNAME_REGION_THREE = '{{ .Values.openStackUserNameRegionThree }}'
GLOBAL_INJECTED_OPENSTACK_PASSWORD_REGION_THREE = '{{ .Values.openStackPasswordRegionThree }}'
GLOBAL_INJECTED_OPENSTACK_MSO_ENCRYPTED_PASSWORD_REGION_THREE = '{{ .Values.openSackMsoEncryptdPasswordRegionThree }}'
+GLOBAL_INJECTED_OPENSTACK_SO_ENCRYPTED_PASSWORD = '{{ .Values.config.openStackSoEncryptedPassword}}'
GLOBAL_INJECTED_OPENSTACK_TENANT_ID_REGION_THREE = '{{ .Values.openStackTenantIdRegionThree }}'
GLOBAL_INJECTED_OPENSTACK_PROJECT_DOMAIN_REGION_THREE = '{{ .Values.openStackProjectNameRegionThree }}'
GLOBAL_INJECTED_OPENSTACK_USER_DOMAIN_REGION_THREE = '{{ .Values.openStackDomainIdRegionThree }}'
GLOBAL_INJECTED_OPENSTACK_OAM_NETWORK_CIDR_PREFIX = '{{ .Values.openStackOamNetworkCidrPrefix }}'
+GLOBAL_INJECTED_OPENSTACK_PUBLIC_NETWORK = '{{ .Values.openStackPublicNetworkName }}'
+GLOBAL_INJECTED_OPENSTACK_SECURITY_GROUP = '{{ .Values.openStackSecurityGroup }}'
+GLOBAL_INJECTED_OPENSTACK_PRIVATE_SUBNET_ID = "{{ .Values.openStackPrivateSubnetId }}"
+GLOBAL_INJECTED_OPENSTACK_PRIVATE_NET_CIDR = "{{ .Values.openStackPrivateNetCidr }}"
GLOBAL_INJECTED_POLICY_IP_ADDR = 'pdp.{{include "common.namespace" .}}'
GLOBAL_INJECTED_POLICY_HEALTHCHECK_IP_ADDR = 'drools.{{include "common.namespace" .}}'
GLOBAL_INJECTED_PORTAL_IP_ADDR = 'portal-app.{{include "common.namespace" .}}'
@@ -83,6 +92,8 @@ GLOBAL_INJECTED_POLICY_DISTRIBUTION_IP_ADDR = 'policy-distribution.{{include "co
GLOBAL_INJECTED_POLICY_PDPX_IP_ADDR = 'policy-xacml-pdp.{{include "common.namespace" .}}'
GLOBAL_INJECTED_POLICY_APEX_PDP_IP_ADDR = 'policy-apex-pdp.{{include "common.namespace" .}}'
GLOBAL_INJECTED_PUBLIC_NET_ID = '{{ .Values.openStackPublicNetId }}'
+GLOBAL_INJECTED_PRIVATE_KEY = "{{ .Files.Get .Values.vnfPrivateKey }}"
+GLOBAL_INJECTED_PUBLIC_KEY = "{{ .Values.vnfPubKey }}"
GLOBAL_INJECTED_REGION = '{{ .Values.openStackRegion }}'
GLOBAL_INJECTED_SCRIPT_VERSION = '{{ .Values.scriptVersion }}'
GLOBAL_INJECTED_SDC_BE_IP_ADDR = 'sdc-be.{{include "common.namespace" .}}'
@@ -115,10 +126,13 @@ GLOBAL_INJECTED_PROPERTIES = {
"GLOBAL_INJECTED_APPC_IP_ADDR" : 'appc.{{include "common.namespace" .}}',
"GLOBAL_INJECTED_APPC_CDT_IP_ADDR" : 'appc-cdt.{{include "common.namespace" .}}',
"GLOBAL_INJECTED_ARTIFACTS_VERSION" : '{{.Values.demoArtifactsVersion}}',
+ "GLOBAL_INJECTED_ARTIFACTS_REPO_URL" : "{{ .Values.demoArtifactsRepoUrl }}",
"GLOBAL_INJECTED_CLAMP_IP_ADDR" : 'clamp.{{include "common.namespace" .}}',
"GLOBAL_INJECTED_CLI_IP_ADDR" : 'cli.{{include "common.namespace" .}}',
"GLOBAL_INJECTED_CLOUD_ENV" : 'openstack',
+ "GLOBAL_INJECTED_DCAE_COLLECTOR_IP" : "{{ .Values.dcaeCollectorIp }}",
"GLOBAL_INJECTED_DCAE_IP_ADDR" : 'dcae-healthcheck.{{include "common.namespace" .}}',
+ "GLOBAL_INJECTED_DCAE_VES_HOST" : 'dcae-ves-collector.{{include "common.namespace" .}}',
"GLOBAL_INJECTED_DMAAP_DR_PROV_IP_ADDR" : 'dmaap-dr-prov.{{include "common.namespace" .}}',
"GLOBAL_INJECTED_DMAAP_DR_NODE_IP_ADDR" : 'dmaap-dr-node.{{include "common.namespace" .}}',
"GLOBAL_INJECTED_DNS_IP_ADDR" : 'N/A',
@@ -154,6 +168,7 @@ GLOBAL_INJECTED_PROPERTIES = {
"GLOBAL_INJECTED_OPENSTACK_USERNAME" : '{{ .Values.openStackUserName }}',
"GLOBAL_INJECTED_OPENSTACK_PROJECT_NAME" : '{{ .Values.openStackProjectName }}',
"GLOBAL_INJECTED_OPENSTACK_DOMAIN_ID" : '{{ .Values.openStackDomainId }}',
+ "GLOBAL_INJECTED_OPENSTACK_USER_DOMAIN" : '{{ .Values.openStackUserDomain }}',
"GLOBAL_INJECTED_OPENSTACK_KEYSTONE_API_VERSION" : '{{ .Values.openStackKeystoneAPIVersion }}',
"GLOBAL_INJECTED_REGION_THREE" : '{{ .Values.openStackRegionRegionThree }}',
"GLOBAL_INJECTED_KEYSTONE_REGION_THREE" : '{{ .Values.openStackKeyStoneUrlRegionThree }}',
@@ -161,10 +176,15 @@ GLOBAL_INJECTED_PROPERTIES = {
"GLOBAL_INJECTED_OPENSTACK_USERNAME_REGION_THREE" : '{{ .Values.openStackUserNameRegionThree }}',
"GLOBAL_INJECTED_OPENSTACK_PASSWORD_REGION_THREE" : '{{ .Values.openStackPasswordRegionThree }}',
"GLOBAL_INJECTED_OPENSTACK_MSO_ENCRYPTED_PASSWORD_REGION_THREE" : '{{ .Values.openSackMsoEncryptdPasswordRegionThree }}',
+ "GLOBAL_INJECTED_OPENSTACK_SO_ENCRYPTED_PASSWORD" : '{{ .Values.config.openStackSoEncryptedPassword}}',
"GLOBAL_INJECTED_OPENSTACK_TENANT_ID_REGION_THREE" : '{{ .Values.openStackTenantIdRegionThree }}',
"GLOBAL_INJECTED_OPENSTACK_PROJECT_DOMAIN_REGION_THREE" : '{{ .Values.openStackProjectNameRegionThree }}',
"GLOBAL_INJECTED_OPENSTACK_USER_DOMAIN_REGION_THREE" : '{{ .Values.openStackDomainIdRegionThree }}',
"GLOBAL_INJECTED_OPENSTACK_OAM_NETWORK_CIDR_PREFIX" : '{{ .Values.openStackOamNetworkCidrPrefix }}',
+ "GLOBAL_INJECTED_OPENSTACK_PUBLIC_NETWORK" : '{{ .Values.openStackPublicNetworkName }}',
+ "GLOBAL_INJECTED_OPENSTACK_SECURITY_GROUP": '{{ .Values.openStackSecurityGroup }}',
+ "GLOBAL_INJECTED_OPENSTACK_PRIVATE_SUBNET_ID" : "{{ .Values.openStackPrivateSubnetId }}",
+ "GLOBAL_INJECTED_OPENSTACK_PRIVATE_NET_CIDR" : "{{ .Values.openStackPrivateNetCidr }}",
"GLOBAL_INJECTED_POLICY_IP_ADDR" : 'pdp.{{include "common.namespace" .}}',
"GLOBAL_INJECTED_POLICY_HEALTHCHECK_IP_ADDR" : 'drools.{{include "common.namespace" .}}',
"GLOBAL_INJECTED_POLICY_API_IP_ADDR" : 'policy-api.{{include "common.namespace" .}}',
@@ -174,6 +194,8 @@ GLOBAL_INJECTED_PROPERTIES = {
"GLOBAL_INJECTED_POLICY_APEX_PDP_IP_ADDR" : 'policy-apex-pdp.{{include "common.namespace" .}}',
"GLOBAL_INJECTED_PORTAL_IP_ADDR" : 'portal-app.{{include "common.namespace" .}}',
"GLOBAL_INJECTED_PUBLIC_NET_ID" : '{{ .Values.openStackPublicNetId }}',
+ "GLOBAL_INJECTED_PRIVATE_KEY" : '{{ .Files.Get .Values.vnfPrivateKey }}',
+ "GLOBAL_INJECTED_PUBLIC_KEY" : '{{ .Values.vnfPubKey }}',
"GLOBAL_INJECTED_REGION" : '{{ .Values.openStackRegion }}',
"GLOBAL_INJECTED_SDC_BE_IP_ADDR" : 'sdc-be.{{include "common.namespace" .}}',
"GLOBAL_INJECTED_SDC_BE_ONBOARD_IP_ADDR" : 'sdc-onboarding-be.{{include "common.namespace" .}}',
diff --git a/kubernetes/robot/values.yaml b/kubernetes/robot/values.yaml
index f19c0e25a6..cb10e384af 100644
--- a/kubernetes/robot/values.yaml
+++ b/kubernetes/robot/values.yaml
@@ -22,7 +22,7 @@ global: # global defaults
# application image
repository: nexus3.onap.org:10001
-image: onap/testsuite:1.4.1
+image: onap/testsuite:1.4.2
pullPolicy: Always
ubuntuInitImage: oomk8s/ubuntu-init:2.0.0
@@ -37,6 +37,7 @@ config:
# openStackEncryptedPasswordHere should match the encrypted string used in SO and APPC and overridden per environment
openStackEncryptedPasswordHere: "c124921a3a0efbe579782cde8227681e"
+ openStackSoEncryptedPassword: "SAME_STRING_AS_SO_JAVA_ENCRYPTED_PASSWORD"
# Demo configuration
# Nexus demo artifact version. Maps to GLOBAL_INJECTED_ARTIFACTS_VERSION
@@ -45,24 +46,47 @@ demoArtifactsVersion: "1.4.0"
demoArtifactsRepoUrl: "https://nexus.onap.org/content/repositories/releases"
# Openstack medium sized flavour name. Maps GLOBAL_INJECTED_VM_FLAVOR
openStackFlavourMedium: "m1.medium"
+
+################# Openstack .RC Parameters ################################333
+# KEYSTONE Version 3 Required for Rocky and beyond
+# Openstack Keystone API version. Valid values are [ v2.0, v3 ]. Maps to GLOBAL_INJECTED_OPENSTACK_KEYSTONE_API_VERSION
+openStackKeystoneAPIVersion: "v2.0"
+
+# OS_AUTH_URL without the /v3 or /v2.0 from the openstack .RC file
# Openstack keystone URL. Maps to GLOBAL_INJECTED_KEYSTONE
openStackKeyStoneUrl: "http://1.2.3.4:5000"
+
+# OS_PROJECT_ID from the openstack .RC file
+# Openstack tenant UUID where VNFs will be spawned. Maps to GLOBAL_INJECTED_OPENSTACK_TENANT_ID
+openStackTenantId: "47899782ed714295b1151681fdfd51f5"
+
+# OS_PROJECT_NAME from the openstack .RC file
+# Project name of Openstack where VNFs will be spawned. Maps to GLOBAL_INJECTED_OPENSTACK_PROJECT_NAME
+openStackProjectName: "onap"
+
+# OS_USERNAME from the openstack .RC file
+# username for Openstack tenant where VNFs will be spawned. Maps to GLOBAL_INJECTED_OPENSTACK_USERNAME
+openStackUserName: "tenantUsername"
+
+# OS_PROJECT_DOMAIN_ID from the openstack .RC file
+# in some environments it is a string but in other environmens it may be a numeric
+# Domain id of openstack where VNFs will be deployed. Maps to GLOBAL_INJECTED_OPENSTACK_DOMAIN_ID
+openStackDomainId: "default"
+
+# OS_USER_DOMAIN from the openstack .RC file
+# Use Domain of openstack where VNFs will be deployed. Maps to GLOBAL_INJECTED_OPENSTACK_USER_DOMAIN
+openStackUserDomain: "Default"
+
+
# UUID of the Openstack network that can assign floating ips. Maps to GLOBAL_INJECTED_PUBLIC_NET_ID
openStackPublicNetId: "e8f51958045716781ffc"
+openStackPublicNetworkName: "public"
# password for Openstack tenant where VNFs will be spawned. Maps to GLOBAL_INJECTED_OPENSTACK_PASSWORD
openStackPassword: "tenantPassword"
# Openstack region. Maps to GLOBAL_INJECTED_REGION
openStackRegion: "RegionOne"
-# Openstack tenant UUID where VNFs will be spawned. Maps to GLOBAL_INJECTED_OPENSTACK_TENANT_ID
-openStackTenantId: "47899782ed714295b1151681fdfd51f5"
-# username for Openstack tenant where VNFs will be spawned. Maps to GLOBAL_INJECTED_OPENSTACK_USERNAME
-openStackUserName: "tenantUsername"
-# Project name of Openstack where VNFs will be spawned. Maps to GLOBAL_INJECTED_OPENSTACK_PROJECT_NAME
-openStackProjectName: "onap"
-# Domain id of openstack where VNFs will be deployed. Maps to GLOBAL_INJECTED_OPENSTACK_DOMAIN_ID
-openStackDomainId: "Default"
-# Openstack Keystone API version. Valid values are [ v2.0, v3 ]. Maps to GLOBAL_INJECTED_OPENSTACK_KEYSTONE_API_VERSION
-openStackKeystoneAPIVersion: "v2.0"
+
+
# Values for second cloud instante for VNF instantiatioen testing and keystone v3
openStackRegionRegionThree: "RegionThree"
openStackKeyStoneUrlRegionThree: "http://1.2.3.4:5000"
@@ -72,7 +96,7 @@ openStackPasswordRegionThree: "tenantPassword"
# this is the java encrypted password that is needed for SO
openSackMsoEncryptdPasswordRegionThree: "XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX"
openStackTenantIdRegionThree: "3583253e932845a09cd4c8ca2f31d095"
-openStackProjectNameRegionThree: "Integration-HEAT-Staging-Daily"
+openStackProjectNameRegionThree: "Integration-SB-RegionThree"
openStackDomainIdRegionThree: "Default"
#
# Openstack glance image name for Ubuntu 14. Maps to GLOBAL_INJECTED_UBUNTU_1404_IMAGE
@@ -98,7 +122,9 @@ openStackOamNetworkCidrPrefix: "10.0"
vidServerProtocol: "http"
vidServerPort: "8080"
# Override with Pub Key for access to VNF
-vnfPubKey: "FILL_IN_WITH_PUB_KEY"
+vnfPubKey: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDKXDgoo3+WOqcUG8/5uUbk81+yczgwC4Y8ywTmuQqbNxlY1oQ0YxdMUqUnhitSXs5S/yRuAVOYHwGg2mCs20oAINrP+mxBI544AMIb9itPjCtgqtE2EWo6MmnFGbHB4Sx3XioE7F4VPsh7japsIwzOjbrQe+Mua1TGQ5d4nfEOQaaglXLLPFfuc7WbhbJbK6Q7rHqZfRcOwAMXgDoBqlyqKeiKwnumddo2RyNT8ljYmvB6buz7KnMinzo7qB0uktVT05FH9Rg0CTWH5norlG5qXgP2aukL0gk1ph8iAt7uYLf1ktp+LJI2gaF6L0/qli9EmVCSLr1uJ38Q8CBflhkh imported-openssh-key"
+# Override with Private Key for access to VNF
+vnfPrivateKey: "onap_dev.yaml"
# Override with DCAE VES Collector external IP
dcaeCollectorIp: "FILL_IN_WITH_DCAE_VES_COLLECTOR_IP"
@@ -156,6 +182,11 @@ oofUsername: "oof@oof.onap.org"
oofPassword: "demo123456!"
cmsoUsername: "oof@oof.onap.org"
cmsoPassword: "demo123456!"
+oofOsdfPciOptUsername: "oof@oof.onap.org"
+oofOsdfPciOptPassword: "demo123456!"
+oofHomingUsername: "admin1"
+oofHomingPassword: "plan.15"
+
# default number of instances
replicaCount: 1
diff --git a/kubernetes/sdc/Chart.yaml b/kubernetes/sdc/Chart.yaml
index 46e2d5c798..abcd09d032 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: 4.0.0
+version: 5.0.0
diff --git a/kubernetes/sdc/charts/sdc-be/Chart.yaml b/kubernetes/sdc/charts/sdc-be/Chart.yaml
index fab2243ba9..33852a3951 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: 4.0.0
+version: 5.0.0
diff --git a/kubernetes/sdc/charts/sdc-be/templates/deployment.yaml b/kubernetes/sdc/charts/sdc-be/templates/deployment.yaml
index 0b015aa95c..2d47f4b588 100644
--- a/kubernetes/sdc/charts/sdc-be/templates/deployment.yaml
+++ b/kubernetes/sdc/charts/sdc-be/templates/deployment.yaml
@@ -69,9 +69,9 @@ spec:
- containerPort: {{ .Values.service.internalPort2 }}
{{ if eq .Values.liveness.enabled true }}
livenessProbe:
- exec:
- command:
- - "/var/lib/ready-probe.sh"
+ httpGet:
+ path: /sdc2/rest/version
+ port: {{ .Values.service.internalPort2 }}
initialDelaySeconds: {{ .Values.liveness.initialDelaySeconds }}
periodSeconds: {{ .Values.liveness.periodSeconds }}
timeoutSeconds: {{ .Values.liveness.timeoutSeconds }}
diff --git a/kubernetes/sdc/charts/sdc-be/values.yaml b/kubernetes/sdc/charts/sdc-be/values.yaml
index 1ee2f69b19..db724a48d2 100644
--- a/kubernetes/sdc/charts/sdc-be/values.yaml
+++ b/kubernetes/sdc/charts/sdc-be/values.yaml
@@ -48,7 +48,7 @@ affinity: {}
# probe configuration parameters
liveness:
- initialDelaySeconds: 60
+ initialDelaySeconds: 120
periodSeconds: 10
timeoutSeconds: 5
# necessary to disable liveness probe when setting breakpoints
diff --git a/kubernetes/sdc/charts/sdc-cs/Chart.yaml b/kubernetes/sdc/charts/sdc-cs/Chart.yaml
index 0537757d12..6d0df56015 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: 4.0.0
+version: 5.0.0
diff --git a/kubernetes/sdc/charts/sdc-dcae-be/Chart.yaml b/kubernetes/sdc/charts/sdc-dcae-be/Chart.yaml
index 050a093cde..fcc2e68a55 100644
--- a/kubernetes/sdc/charts/sdc-dcae-be/Chart.yaml
+++ b/kubernetes/sdc/charts/sdc-dcae-be/Chart.yaml
@@ -15,4 +15,4 @@
apiVersion: v1
description: ONAP SDC DCAE Backend client of TOSCALAB and SDC
name: sdc-dcae-be
-version: 4.0.0
+version: 5.0.0
diff --git a/kubernetes/sdc/charts/sdc-dcae-dt/Chart.yaml b/kubernetes/sdc/charts/sdc-dcae-dt/Chart.yaml
index 75f5b2bf8c..1f3ee3bf10 100644
--- a/kubernetes/sdc/charts/sdc-dcae-dt/Chart.yaml
+++ b/kubernetes/sdc/charts/sdc-dcae-dt/Chart.yaml
@@ -15,4 +15,4 @@
apiVersion: v1
description: ONAP DCAE desiner composition tool for creating customized templates
name: sdc-dcae-dt
-version: 4.0.0
+version: 5.0.0
diff --git a/kubernetes/sdc/charts/sdc-dcae-fe/Chart.yaml b/kubernetes/sdc/charts/sdc-dcae-fe/Chart.yaml
index 5679cdeaf5..2ce7ed3064 100644
--- a/kubernetes/sdc/charts/sdc-dcae-fe/Chart.yaml
+++ b/kubernetes/sdc/charts/sdc-dcae-fe/Chart.yaml
@@ -15,4 +15,4 @@
apiVersion: v1
description: ONAP SDC DCAE UI for service monitoring and MC create and configure
name: sdc-dcae-fe
-version: 4.0.0
+version: 5.0.0
diff --git a/kubernetes/sdc/charts/sdc-dcae-tosca-lab/Chart.yaml b/kubernetes/sdc/charts/sdc-dcae-tosca-lab/Chart.yaml
index e69503f217..bdee850b90 100644
--- a/kubernetes/sdc/charts/sdc-dcae-tosca-lab/Chart.yaml
+++ b/kubernetes/sdc/charts/sdc-dcae-tosca-lab/Chart.yaml
@@ -15,4 +15,4 @@
apiVersion: v1
description: ONAP Tosca model for component monitoring and descriptors deployment
name: sdc-dcae-tosca-lab
-version: 4.0.0
+version: 5.0.0
diff --git a/kubernetes/sdc/charts/sdc-es/Chart.yaml b/kubernetes/sdc/charts/sdc-es/Chart.yaml
index 7254f682a5..d1c46d06ba 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: 4.0.0
+version: 5.0.0
diff --git a/kubernetes/sdc/charts/sdc-fe/Chart.yaml b/kubernetes/sdc/charts/sdc-fe/Chart.yaml
index a249a5ba75..f171607fdc 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: 4.0.0
+version: 5.0.0
diff --git a/kubernetes/sdc/charts/sdc-kb/Chart.yaml b/kubernetes/sdc/charts/sdc-kb/Chart.yaml
index 3b87b1e306..d6f0b32e26 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: 4.0.0
+version: 5.0.0
diff --git a/kubernetes/sdc/charts/sdc-onboarding-be/Chart.yaml b/kubernetes/sdc/charts/sdc-onboarding-be/Chart.yaml
index 9f22430bb1..9dae6d2536 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: 4.0.0
+version: 5.0.0
diff --git a/kubernetes/sdc/charts/sdc-wfd-be/Chart.yaml b/kubernetes/sdc/charts/sdc-wfd-be/Chart.yaml
index feac7ace9a..7ae97cf3a5 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: 4.0.0 \ No newline at end of file
+version: 5.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 d5e69279cc..008e807f00 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: 4.0.0 \ No newline at end of file
+version: 5.0.0 \ No newline at end of file
diff --git a/kubernetes/sdc/charts/sdc-wfd-fe/templates/ingress.yaml b/kubernetes/sdc/charts/sdc-wfd-fe/templates/ingress.yaml
index d051eafead..e10de6df20 100644
--- a/kubernetes/sdc/charts/sdc-wfd-fe/templates/ingress.yaml
+++ b/kubernetes/sdc/charts/sdc-wfd-fe/templates/ingress.yaml
@@ -12,7 +12,17 @@
# See the License for the specific language governing permissions and
# limitations under the License.
+{{- define "rules.wf" -}}
+- http:
+ paths:
+ - path: /workflows/
+ backend:
+ serviceName: {{.Values.service.name}}
+ servicePort: {{.Values.service.internalPort}}
+{{- end -}}
+
{{- if .Values.ingress.enabled }}
+
apiVersion: extensions/v1beta1
kind: Ingress
metadata:
@@ -29,11 +39,21 @@ metadata:
{{- end }}
spec:
rules:
- - http:
- paths:
- - path: /workflows/
- backend:
- serviceName: {{.Values.service.name}}
- servicePort: {{.Values.service.internalPort}}
+{{- if .Values.ingress.hosts}}
+{{- range .Values.ingress.hosts}}
+{{- include "rules.wf" $ | nindent 2}}
+{{- if .}}
+ host: {{. | quote}}
+{{- end}}
+{{- end}}
+ tls:
+ - hosts:
+{{- range .Values.ingress.hosts}}
+{{- if .}}
+ - {{ . | quote }}
+{{- end}}
+{{- end }}
+{{- else}}
+{{- include "rules.wf" . | nindent 2}}
+{{- end}}
{{ end }}
-
diff --git a/kubernetes/sdc/charts/sdc-wfd-fe/values.yaml b/kubernetes/sdc/charts/sdc-wfd-fe/values.yaml
index 5aa3c44efc..1b5d27066e 100644
--- a/kubernetes/sdc/charts/sdc-wfd-fe/values.yaml
+++ b/kubernetes/sdc/charts/sdc-wfd-fe/values.yaml
@@ -80,6 +80,7 @@ service:
ingress:
enabled: false
+ hosts: ~
annotations:
ingress.kubernetes.io/secure-backends: "false"
nginx.ingress.kubernetes.io/secure-backends: "false"
diff --git a/kubernetes/sdc/requirements.yaml b/kubernetes/sdc/requirements.yaml
index e9661315f3..134205a2b2 100644
--- a/kubernetes/sdc/requirements.yaml
+++ b/kubernetes/sdc/requirements.yaml
@@ -15,11 +15,11 @@
dependencies:
- name: common
- version: ~4.x-0
+ version: ~5.x-0
repository: '@local'
- name: cassandra
- version: ~4.x-0
+ version: ~5.x-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/sdnc/Chart.yaml b/kubernetes/sdnc/Chart.yaml
index 7b04c64e6e..e618e4f8b4 100644
--- a/kubernetes/sdnc/Chart.yaml
+++ b/kubernetes/sdnc/Chart.yaml
@@ -15,4 +15,4 @@
apiVersion: v1
description: SDN Controller
name: sdnc
-version: 4.0.0
+version: 5.0.0
diff --git a/kubernetes/sdnc/charts/dmaap-listener/Chart.yaml b/kubernetes/sdnc/charts/dmaap-listener/Chart.yaml
index aceda60ae0..f63b09e461 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: 4.0.0 \ No newline at end of file
+version: 5.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 71fbbc5ce9..79d7de4dd3 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: ~4.x-0
+ version: ~5.x-0
repository: '@local'
diff --git a/kubernetes/sdnc/charts/sdnc-ansible-server/Chart.yaml b/kubernetes/sdnc/charts/sdnc-ansible-server/Chart.yaml
index de678bf4ed..114a688ba8 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: 4.0.0 \ No newline at end of file
+version: 5.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 1d30dfd918..1063d172a6 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: ~4.x-0
+ version: ~5.x-0
repository: '@local' \ No newline at end of file
diff --git a/kubernetes/sdnc/charts/sdnc-portal/Chart.yaml b/kubernetes/sdnc/charts/sdnc-portal/Chart.yaml
index 9efac5c95a..68d8b42551 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: 4.0.0 \ No newline at end of file
+version: 5.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 1d30dfd918..1063d172a6 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: ~4.x-0
+ version: ~5.x-0
repository: '@local' \ No newline at end of file
diff --git a/kubernetes/sdnc/charts/ueb-listener/Chart.yaml b/kubernetes/sdnc/charts/ueb-listener/Chart.yaml
index da6342c850..fbac3edde7 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: 4.0.0 \ No newline at end of file
+version: 5.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 71fbbc5ce9..79d7de4dd3 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: ~4.x-0
+ version: ~5.x-0
repository: '@local'
diff --git a/kubernetes/sdnc/requirements.yaml b/kubernetes/sdnc/requirements.yaml
index a4bffc077f..913fed12ba 100644
--- a/kubernetes/sdnc/requirements.yaml
+++ b/kubernetes/sdnc/requirements.yaml
@@ -14,24 +14,24 @@
dependencies:
- name: common
- version: ~4.x-0
+ version: ~5.x-0
repository: '@local'
- name: cds
- version: ~4.x-0
+ version: ~5.x-0
repository: '@local'
condition: cds.enabled
- name: network-name-gen
- version: ~4.x-0
+ version: ~5.x-0
repository: '@local'
- name: dgbuilder
- version: ~4.x-0
+ version: ~5.x-0
repository: '@local'
- name: sdnc-prom
- version: ~4.x-0
+ version: ~5.x-0
repository: '@local'
condition: config.geoEnabled
- name: mariadb-galera
- version: ~4.x-0
+ version: ~5.x-0
repository: '@local'
condition: config.localDBCluster
diff --git a/kubernetes/sdnc/resources/config/bin/installSdncDb.sh b/kubernetes/sdnc/resources/config/bin/installSdncDb.sh
index 2a733de7d5..455cb834f9 100644
--- a/kubernetes/sdnc/resources/config/bin/installSdncDb.sh
+++ b/kubernetes/sdnc/resources/config/bin/installSdncDb.sh
@@ -22,37 +22,49 @@
###
SDNC_HOME=${SDNC_HOME:-/opt/onap/sdnc}
-MYSQL_HOST=${MYSQL_HOST:-{{.Values.config.mariadbGalera.serviceName}}.{{.Release.Namespace}}}
-MYSQL_PASSWD=${MYSQL_PASSWD:-{{.Values.config.dbRootPassword}}}
+ETC_DIR=${ETC_DIR:-${SDNC_HOME}/data}
+BIN_DIR=${BIN_DIR-${SDNC_HOME}/bin}
+MYSQL_HOST=${MYSQL_HOST:-dbhost}
+MYSQL_PASSWORD=${MYSQL_PASSWORD:-openECOMP1.0}
SDNC_DB_USER=${SDNC_DB_USER:-sdnctl}
-SDNC_DB_PASSWD=${SDNC_DB_PASSWD:-gamma}
+SDNC_DB_PASSWORD=${SDNC_DB_PASSWORD:-gamma}
SDNC_DB_DATABASE=${SDN_DB_DATABASE:-sdnctl}
# Create tablespace and user account
-mysql -h ${MYSQL_HOST} -u root -p${MYSQL_PASSWD} mysql <<-END
-CREATE DATABASE ${SDNC_DB_DATABASE};
-CREATE USER '${SDNC_DB_USER}'@'localhost' IDENTIFIED BY '${SDNC_DB_PASSWD}';
-CREATE USER '${SDNC_DB_USER}'@'%' IDENTIFIED BY '${SDNC_DB_PASSWD}';
+mysql -h ${MYSQL_HOST} -u root -p${MYSQL_PASSWORD} mysql <<-END
+CREATE DATABASE IF NOT EXISTS ${SDNC_DB_DATABASE};
+CREATE USER '${SDNC_DB_USER}'@'localhost' IDENTIFIED BY '${SDNC_DB_PASSWORD}';
+CREATE USER '${SDNC_DB_USER}'@'%' IDENTIFIED BY '${SDNC_DB_PASSWORD}';
GRANT ALL PRIVILEGES ON ${SDNC_DB_DATABASE}.* TO '${SDNC_DB_USER}'@'localhost' WITH GRANT OPTION;
GRANT ALL PRIVILEGES ON ${SDNC_DB_DATABASE}.* TO '${SDNC_DB_USER}'@'%' WITH GRANT OPTION;
+flush privileges;
commit;
END
# load schema
-if [ -f ${SDNC_HOME}/data/sdnctl.dump ]
+if [ -f ${ETC_DIR}/sdnctl.dump ]
then
- mysql -h ${MYSQL_HOST} -u root -p${MYSQL_PASSWD} sdnctl < ${SDNC_HOME}/data/sdnctl.dump
+ mysql -h ${MYSQL_HOST} -u root -p${MYSQL_PASSWORD} sdnctl < ${ETC_DIR}/sdnctl.dump
fi
-for datafile in ${SDNC_HOME}/data/*.data.dump
+for datafile in ${ETC_DIR}/*.data.dump
do
- mysql -h ${MYSQL_HOST} -u root -p${MYSQL_PASSWD} sdnctl < $datafile
+ mysql -h ${MYSQL_HOST} -u root -p${MYSQL_PASSWORD} sdnctl < $datafile
done
# Create VNIs 100-199
-${SDNC_HOME}/bin/addVnis.sh 100 199
+${BIN_DIR}/addVnis.sh 100 199
# Drop FK_NETWORK_MODEL foreign key as workaround for SDNC-291.
-${SDNC_HOME}/bin/rmForeignKey.sh NETWORK_MODEL FK_NETWORK_MODEL
+${BIN_DIR}/rmForeignKey.sh NETWORK_MODEL FK_NETWORK_MODEL
+
+if [ -x ${SDNC_HOME}/svclogic/bin/install.sh ]
+then
+ echo "Installing directed graphs"
+ ${SDNC_HOME}/svclogic/bin/install.sh
+fi
+
+
+exit 0
diff --git a/kubernetes/sdnc/resources/config/bin/startODL.sh b/kubernetes/sdnc/resources/config/bin/startODL.sh
index eb49a69086..5586ebbca6 100755
--- a/kubernetes/sdnc/resources/config/bin/startODL.sh
+++ b/kubernetes/sdnc/resources/config/bin/startODL.sh
@@ -118,12 +118,8 @@ ODL_ADMIN_PASSWORD=${ODL_ADMIN_PASSWORD:-Kp8bJ4SXszM0WXlhak3eHlcse2gAw84vaoGGmJv
SDNC_HOME=${SDNC_HOME:-/opt/onap/sdnc}
SDNC_BIN=${SDNC_BIN:-/opt/onap/sdnc/bin}
CCSDK_HOME=${CCSDK_HOME:-/opt/onap/ccsdk}
-SLEEP_TIME=${SLEEP_TIME:-120}
-MYSQL_PASSWD=${MYSQL_PASSWD:-{{.Values.config.dbRootPassword}}}
-MYSQL_HOST=${MYSQL_HOST:-{{.Values.config.dbServiceName}}.{{.Release.Namespace}}}
ENABLE_ODL_CLUSTER=${ENABLE_ODL_CLUSTER:-false}
GEO_ENABLED=${GEO_ENABLED:-false}
-DBINIT_DIR=${DBINIT_DIR:-/opt/opendaylight/current/daexim}
SDNRWT=${SDNRWT:-false}
SDNRWT_BOOTFEATURES=${SDNRWT_BOOTFEATURES:-sdnr-wt-feature-aggregator}
export ODL_ADMIN_PASSWORD ODL_ADMIN_USERNAME
@@ -133,44 +129,13 @@ echo " ENABLE_ODL_CLUSTER=$ENABLE_ODL_CLUSTER"
echo " SDNC_REPLICAS=$SDNC_REPLICAS"
echo " SDNRWT=$SDNRWT"
-#
-# Wait for database to init properly
-#
-echo "Waiting for mysql"
-until mysql -h ${MYSQL_HOST} -u root -p${MYSQL_PASSWD} mysql &> /dev/null
-do
- printf "."
- sleep 1
-done
-echo -e "\nmysql ready"
-
-if [ ! -d ${DBINIT_DIR} ]
-then
- mkdir -p ${DBINIT_DIR}
-fi
-if [ ! -f ${DBINIT_DIR}/.installed ]
-then
- echo "Installing SDNC database"
- ${SDNC_HOME}/bin/installSdncDb.sh
-
- if [ -x ${SDNC_HOME}/svclogic/bin/install.sh ]
- then
- echo "Installing directed graphs"
- ${SDNC_HOME}/svclogic/bin/install.sh
- fi
-
- echo "Installed at `date`" > ${DBINIT_DIR}/.installed
-fi
if [ ! -f ${SDNC_HOME}/.installed ]
then
echo "Installing SDN-C keyStore"
${SDNC_HOME}/bin/addSdncKeyStore.sh
- # No longer needed (this was a workaround for bug in Nitrogen)
- #${CCSDK_HOME}/bin/installOdlHostKey.sh
-
if $ENABLE_ODL_CLUSTER ; then enable_odl_cluster ; fi
if $SDNRWT ; then install_sdnrwt_features ; fi
diff --git a/kubernetes/sdnc/sdnc-prom/Chart.yaml b/kubernetes/sdnc/sdnc-prom/Chart.yaml
index 4344db0b15..f0363e871d 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: 4.0.0
+version: 5.0.0
diff --git a/kubernetes/sdnc/sdnc-prom/requirements.yaml b/kubernetes/sdnc/sdnc-prom/requirements.yaml
index 509eaddf3d..a12911b78b 100644
--- a/kubernetes/sdnc/sdnc-prom/requirements.yaml
+++ b/kubernetes/sdnc/sdnc-prom/requirements.yaml
@@ -14,5 +14,5 @@
dependencies:
- name: common
- version: ~4.x-0
+ version: ~5.x-0
repository: '@local'
diff --git a/kubernetes/sdnc/templates/job.yaml b/kubernetes/sdnc/templates/job.yaml
new file mode 100755
index 0000000000..9e79ebeec1
--- /dev/null
+++ b/kubernetes/sdnc/templates/job.yaml
@@ -0,0 +1,129 @@
+# Copyright © 2017 Amdocs, Bell Canada, AT&T
+#
+# 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: batch/v1
+kind: Job
+metadata:
+ name: {{ include "common.fullname" . }}-dbinit-job
+ namespace: {{ include "common.namespace" . }}
+ labels:
+ app: {{ include "common.name" . }}
+ chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
+ release: {{ .Release.Name }}
+ heritage: {{ .Release.Service }}
+ annotations:
+ "helm.sh/hook": post-install
+ "helm.sh/hook-weight": "0"
+ "helm.sh/hook-delete-policy": before-hook-creation
+spec:
+ backoffLimit: 20
+ template:
+ metadata:
+ labels:
+ app: {{ include "common.name" . }}-job
+ release: {{ .Release.Name }}
+ name: {{ include "common.name" . }}
+ spec:
+ initContainers:
+ - name: {{ include "common.name" . }}-readiness
+ command:
+ - /root/ready.py
+ args:
+ - --container-name
+ - {{ .Values.config.mariadbGalera.chartName }}
+ env:
+ - name: NAMESPACE
+ valueFrom:
+ fieldRef:
+ apiVersion: v1
+ fieldPath: metadata.namespace
+ image: "{{ .Values.global.readinessRepository }}/{{ .Values.global.readinessImage }}"
+ imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
+ containers:
+ - name: {{ include "common.name" . }}
+ image: "{{.Values.image}}"
+ imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
+ env:
+ - name: MYSQL_PASSWORD
+ valueFrom:
+ secretKeyRef:
+ name: {{ template "common.fullname" . }}
+ key: db-root-password
+ - name: ODL_ADMIN_PASSWORD
+ valueFrom:
+ secretKeyRef:
+ name: {{ template "common.fullname" . }}-odl
+ key: odl-password
+ - name: SDNC_DB_PASSWORD
+ valueFrom:
+ secretKeyRef:
+ name: {{ template "common.fullname" . }}-sdnctl
+ key: db-sdnctl-password
+ - name: MYSQL_HOST
+ value: "{{.Values.config.mariadbGalera.serviceName}}.{{.Release.Namespace}}"
+ - name: SDNC_HOME
+ value: "{{.Values.config.sdncHome}}"
+ - name: ETC_DIR
+ value: "{{.Values.config.etcDir}}"
+ - name: BIN_DIR
+ value: "{{.Values.config.binDir}}"
+ - name: SDNC_DB_USER
+ value: "{{.Values.config.dbSdnctlUser}}"
+ - name: SDNC_DB_DATABASE
+ value: "{{.Values.config.dbSdnctlDatabase}}"
+ volumeMounts:
+ - mountPath: {{ .Values.config.binDir }}/installSdncDb.sh
+ name: bin
+ subPath: installSdncDb.sh
+ - mountPath: {{ .Values.config.configDir }}/svclogic.properties
+ name: properties
+ subPath: svclogic.properties
+ - mountPath: /opt/onap/sdnc/svclogic/config/svclogic.properties
+ name: properties
+ subPath: svclogic.properties
+ - mountPath: {{ .Values.config.configDir }}/dblib.properties
+ name: properties
+ subPath: dblib.properties
+ command:
+ - /bin/bash
+ args:
+ - {{.Values.config.binDir }}/installSdncDb.sh
+ 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 }}
+ volumes:
+ - name: localtime
+ hostPath:
+ path: /etc/localtime
+ - name: docker-entrypoint-initdb-d
+ emptyDir: {}
+ - name: bin
+ configMap:
+ name: {{ include "common.fullname" . }}-bin
+ defaultMode: 0755
+ - name: properties
+ configMap:
+ name: {{ include "common.fullname" . }}-properties
+ defaultMode: 0644
+ restartPolicy: Never
+ imagePullSecrets:
+ - name: "{{ include "common.namespace" . }}-docker-registry-key"
+
diff --git a/kubernetes/sdnc/values.yaml b/kubernetes/sdnc/values.yaml
index 9bd50a1c47..dcf6938f0e 100644
--- a/kubernetes/sdnc/values.yaml
+++ b/kubernetes/sdnc/values.yaml
@@ -34,6 +34,7 @@ repository: nexus3.onap.org:10001
pullPolicy: Always
image: onap/sdnc-image:1.5.4
+
# flag to enable debugging - application support required
debugEnabled: false
@@ -43,9 +44,13 @@ config:
odlGid: 101
odlPassword: Kp8bJ4SXszM0WXlhak3eHlcse2gAw84vaoGGmJvUy2U
dbRootPassword: secretpassword
+ dbSdnctlUser: sdnctl
+ dbSdnctlDatabase: sdnctl
dbSdnctlPassword: gamma
enableClustering: true
+ sdncHome: /opt/onap/sdnc
binDir: /opt/onap/sdnc/bin
+ etcDir: /opt/onap/sdnc/data
geoEnabled: false
# if geoEnabled is set to true here, mysql.geoEnabled must be set to true
# if geoEnabled is set to true the following 3 values must be set to their proper values
diff --git a/kubernetes/sniro-emulator/Chart.yaml b/kubernetes/sniro-emulator/Chart.yaml
index 1f88ff5097..bc278bd500 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: 4.0.0
+version: 5.0.0
diff --git a/kubernetes/sniro-emulator/requirements.yaml b/kubernetes/sniro-emulator/requirements.yaml
index 9996777c42..6a748bee0c 100644
--- a/kubernetes/sniro-emulator/requirements.yaml
+++ b/kubernetes/sniro-emulator/requirements.yaml
@@ -14,7 +14,7 @@
dependencies:
- name: common
- version: ~4.x-0
+ version: ~5.x-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/Chart.yaml b/kubernetes/so/Chart.yaml
index 2c96502dca..7289a69e96 100755
--- a/kubernetes/so/Chart.yaml
+++ b/kubernetes/so/Chart.yaml
@@ -14,4 +14,4 @@
apiVersion: v1
description: ONAP Service Orchestrator
name: so
-version: 4.0.0 \ No newline at end of file
+version: 5.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 cbf3b83aa3..4e4d56509f 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: 4.0.0 \ No newline at end of file
+version: 5.0.0 \ No newline at end of file
diff --git a/kubernetes/so/charts/so-bpmn-infra/resources/config/overrides/override.yaml b/kubernetes/so/charts/so-bpmn-infra/resources/config/overrides/override.yaml
index 2c8d8658cc..35b86a33a0 100755
--- a/kubernetes/so/charts/so-bpmn-infra/resources/config/overrides/override.yaml
+++ b/kubernetes/so/charts/so-bpmn-infra/resources/config/overrides/override.yaml
@@ -48,6 +48,9 @@ bpelURL: http://so-bpmn-infra.{{ include "common.namespace" . }}:8081
msb-ip: msb-iag.{{ include "common.namespace" . }}
msb-port: 80
mso:
+ rainyDay:
+ retryDurationMultiplier: 2
+ maxRetries: 5
msoKey: 07a7159d3bf51a0e53be7a8f89699be7
correlation:
timeout: 60
diff --git a/kubernetes/so/charts/so-catalog-db-adapter/Chart.yaml b/kubernetes/so/charts/so-catalog-db-adapter/Chart.yaml
index 14d42be962..a06c8f954e 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: 4.0.0 \ No newline at end of file
+version: 5.0.0 \ No newline at end of file
diff --git a/kubernetes/so/charts/so-db-secrets/Chart.yaml b/kubernetes/so/charts/so-db-secrets/Chart.yaml
index 9dccc6499d..4af691afa9 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: 4.0.0 \ No newline at end of file
+version: 5.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 5e14c56948..b22a465caa 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: 4.0.0 \ No newline at end of file
+version: 5.0.0 \ No newline at end of file
diff --git a/kubernetes/so/charts/so-monitoring/Chart.yaml b/kubernetes/so/charts/so-monitoring/Chart.yaml
index 0ace01dcf2..496eacbf7d 100644
--- a/kubernetes/so/charts/so-monitoring/Chart.yaml
+++ b/kubernetes/so/charts/so-monitoring/Chart.yaml
@@ -19,4 +19,4 @@
apiVersion: v1
description: A Helm chart for ONAP Service Orchestration Monitoring
name: so-monitoring
-version: 4.0.0 \ No newline at end of file
+version: 5.0.0 \ No newline at end of file
diff --git a/kubernetes/so/charts/so-monitoring/resources/config/overrides/override.yaml b/kubernetes/so/charts/so-monitoring/resources/config/overrides/override.yaml
index c2e6ad06f3..dd649c14b8 100644
--- a/kubernetes/so/charts/so-monitoring/resources/config/overrides/override.yaml
+++ b/kubernetes/so/charts/so-monitoring/resources/config/overrides/override.yaml
@@ -15,3 +15,11 @@ mso:
api:
url: http://so-request-db-adapter.{{ include "common.namespace" . }}:8083/infraActiveRequests/
auth: Basic YnBlbDpwYXNzd29yZDEk
+
+spring:
+ security:
+ usercredentials:
+ -
+ username: gui
+ password: '$2a$10$Fh9ffgPw2vnmsghsRD3ZauBL1aKXebigbq3BB1RPWtE62UDILsjke'
+ role: GUI-Client
diff --git a/kubernetes/so/charts/so-openstack-adapter/Chart.yaml b/kubernetes/so/charts/so-openstack-adapter/Chart.yaml
index 9e9d1808fb..b4a955b5de 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: 4.0.0 \ No newline at end of file
+version: 5.0.0 \ No newline at end of file
diff --git a/kubernetes/so/charts/so-request-db-adapter/Chart.yaml b/kubernetes/so/charts/so-request-db-adapter/Chart.yaml
index 0d547b1a1f..74d98941d6 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: 4.0.0 \ No newline at end of file
+version: 5.0.0 \ No newline at end of file
diff --git a/kubernetes/so/charts/so-sdc-controller/Chart.yaml b/kubernetes/so/charts/so-sdc-controller/Chart.yaml
index 5d4b5cc044..23b95f517f 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: 4.0.0 \ No newline at end of file
+version: 5.0.0 \ No newline at end of file
diff --git a/kubernetes/so/charts/so-sdnc-adapter/Chart.yaml b/kubernetes/so/charts/so-sdnc-adapter/Chart.yaml
index 747e2ad9e8..04ee1dfdcb 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: 4.0.0 \ No newline at end of file
+version: 5.0.0 \ No newline at end of file
diff --git a/kubernetes/so/charts/so-vfc-adapter/Chart.yaml b/kubernetes/so/charts/so-vfc-adapter/Chart.yaml
index a218b113c1..6eb1ddf40a 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: 4.0.0 \ No newline at end of file
+version: 5.0.0 \ No newline at end of file
diff --git a/kubernetes/so/charts/so-vnfm-adapter/Chart.yaml b/kubernetes/so/charts/so-vnfm-adapter/Chart.yaml
index 80eda87e9a..3d99120cb5 100755
--- a/kubernetes/so/charts/so-vnfm-adapter/Chart.yaml
+++ b/kubernetes/so/charts/so-vnfm-adapter/Chart.yaml
@@ -14,4 +14,4 @@
apiVersion: v1
description: ONAP SO VNFM Adapter
name: so-vnfm-adapter
-version: 4.0.0
+version: 5.0.0
diff --git a/kubernetes/so/requirements.yaml b/kubernetes/so/requirements.yaml
index 237486d90b..7ef398f370 100755
--- a/kubernetes/so/requirements.yaml
+++ b/kubernetes/so/requirements.yaml
@@ -13,12 +13,12 @@
# limitations under the License.
dependencies:
- name: common
- version: ~4.x-0
+ version: ~5.x-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: mariadb-galera
- version: ~4.x-0
+ version: ~5.x-0
repository: '@local'
condition: global.mariadbGalera.localCluster
diff --git a/kubernetes/so/values.yaml b/kubernetes/so/values.yaml
index cf90eb1d9a..f94ddc8de3 100755
--- a/kubernetes/so/values.yaml
+++ b/kubernetes/so/values.yaml
@@ -43,7 +43,7 @@ global:
# Application configuration defaults.
#################################################################
repository: nexus3.onap.org:10001
-image: onap/so/api-handler-infra:1.4.3
+image: onap/so/api-handler-infra:1.4.4
pullPolicy: Always
replicaCount: 1
diff --git a/kubernetes/uui/Chart.yaml b/kubernetes/uui/Chart.yaml
index 0327cd81f1..0a4922946a 100644
--- a/kubernetes/uui/Chart.yaml
+++ b/kubernetes/uui/Chart.yaml
@@ -15,4 +15,4 @@
apiVersion: v1
description: ONAP uui
name: uui
-version: 4.0.0
+version: 5.0.0
diff --git a/kubernetes/uui/charts/uui-server/Chart.yaml b/kubernetes/uui/charts/uui-server/Chart.yaml
index b665476ee3..360323fa1a 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: 4.0.0
+version: 5.0.0
diff --git a/kubernetes/uui/requirements.yaml b/kubernetes/uui/requirements.yaml
index 3ee610f486..537ede6137 100644
--- a/kubernetes/uui/requirements.yaml
+++ b/kubernetes/uui/requirements.yaml
@@ -14,7 +14,7 @@
dependencies:
- name: common
- version: ~4.x-0
+ version: ~5.x-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/vfc/Chart.yaml b/kubernetes/vfc/Chart.yaml
index 03c5b9582b..bed76cb77f 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: 4.0.0
+version: 5.0.0
diff --git a/kubernetes/vfc/charts/vfc-catalog/Chart.yaml b/kubernetes/vfc/charts/vfc-catalog/Chart.yaml
index f04a7fa503..2b5283468d 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: 4.0.0 \ No newline at end of file
+version: 5.0.0 \ No newline at end of file
diff --git a/kubernetes/vfc/charts/vfc-ems-driver/Chart.yaml b/kubernetes/vfc/charts/vfc-ems-driver/Chart.yaml
index 214d3bb42c..ef4d9a555e 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: 4.0.0 \ No newline at end of file
+version: 5.0.0 \ No newline at end of file
diff --git a/kubernetes/vfc/charts/vfc-generic-vnfm-driver/Chart.yaml b/kubernetes/vfc/charts/vfc-generic-vnfm-driver/Chart.yaml
index 96d008ca5e..b09e73a524 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: 4.0.0 \ No newline at end of file
+version: 5.0.0 \ No newline at end of file
diff --git a/kubernetes/vfc/charts/vfc-huawei-vnfm-driver/Chart.yaml b/kubernetes/vfc/charts/vfc-huawei-vnfm-driver/Chart.yaml
index 61aaf32a05..d40ad5815c 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: 4.0.0 \ No newline at end of file
+version: 5.0.0 \ No newline at end of file
diff --git a/kubernetes/vfc/charts/vfc-juju-vnfm-driver/Chart.yaml b/kubernetes/vfc/charts/vfc-juju-vnfm-driver/Chart.yaml
index d3234ee56d..c92c9e1a91 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: 4.0.0 \ No newline at end of file
+version: 5.0.0 \ No newline at end of file
diff --git a/kubernetes/vfc/charts/vfc-multivim-proxy/Chart.yaml b/kubernetes/vfc/charts/vfc-multivim-proxy/Chart.yaml
index 94de876709..fffb9f6499 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: 4.0.0 \ No newline at end of file
+version: 5.0.0 \ No newline at end of file
diff --git a/kubernetes/vfc/charts/vfc-nokia-v2vnfm-driver/Chart.yaml b/kubernetes/vfc/charts/vfc-nokia-v2vnfm-driver/Chart.yaml
index 25414c4030..3178a5f2e9 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: 4.0.0 \ No newline at end of file
+version: 5.0.0 \ No newline at end of file
diff --git a/kubernetes/vfc/charts/vfc-nslcm/Chart.yaml b/kubernetes/vfc/charts/vfc-nslcm/Chart.yaml
index d417e87f6c..3e1ca383c1 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: 4.0.0 \ No newline at end of file
+version: 5.0.0 \ No newline at end of file
diff --git a/kubernetes/vfc/charts/vfc-redis/Chart.yaml b/kubernetes/vfc/charts/vfc-redis/Chart.yaml
index 90ffba90b0..6955e70433 100644
--- a/kubernetes/vfc/charts/vfc-redis/Chart.yaml
+++ b/kubernetes/vfc/charts/vfc-redis/Chart.yaml
@@ -15,4 +15,4 @@
apiVersion: v1
description: ONAP VFC - DB
name: vfc-redis
-version: 4.0.0
+version: 5.0.0
diff --git a/kubernetes/vfc/charts/vfc-resmgr/Chart.yaml b/kubernetes/vfc/charts/vfc-resmgr/Chart.yaml
index c883caca2d..13ec6f85c0 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: 4.0.0 \ No newline at end of file
+version: 5.0.0 \ No newline at end of file
diff --git a/kubernetes/vfc/charts/vfc-vnflcm/Chart.yaml b/kubernetes/vfc/charts/vfc-vnflcm/Chart.yaml
index 67c2164e57..541c75985d 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: 4.0.0 \ No newline at end of file
+version: 5.0.0 \ No newline at end of file
diff --git a/kubernetes/vfc/charts/vfc-vnfmgr/Chart.yaml b/kubernetes/vfc/charts/vfc-vnfmgr/Chart.yaml
index 362715ff14..6460a2f42d 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: 4.0.0 \ No newline at end of file
+version: 5.0.0 \ No newline at end of file
diff --git a/kubernetes/vfc/charts/vfc-vnfres/Chart.yaml b/kubernetes/vfc/charts/vfc-vnfres/Chart.yaml
index 12515067b4..8fab2ce5fc 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: 4.0.0 \ No newline at end of file
+version: 5.0.0 \ No newline at end of file
diff --git a/kubernetes/vfc/charts/vfc-workflow-engine/Chart.yaml b/kubernetes/vfc/charts/vfc-workflow-engine/Chart.yaml
index 591a9954e9..9705919d11 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: 4.0.0 \ No newline at end of file
+version: 5.0.0 \ No newline at end of file
diff --git a/kubernetes/vfc/charts/vfc-workflow/Chart.yaml b/kubernetes/vfc/charts/vfc-workflow/Chart.yaml
index ccf00f8c44..78a7c4696e 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: 4.0.0 \ No newline at end of file
+version: 5.0.0 \ No newline at end of file
diff --git a/kubernetes/vfc/charts/vfc-zte-sdnc-driver/Chart.yaml b/kubernetes/vfc/charts/vfc-zte-sdnc-driver/Chart.yaml
index 36eb8dc32b..3b5543594e 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: 4.0.0 \ No newline at end of file
+version: 5.0.0 \ No newline at end of file
diff --git a/kubernetes/vfc/charts/vfc-zte-vnfm-driver/Chart.yaml b/kubernetes/vfc/charts/vfc-zte-vnfm-driver/Chart.yaml
index 4ac2046c59..e3ffd72a28 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: 4.0.0 \ No newline at end of file
+version: 5.0.0 \ No newline at end of file
diff --git a/kubernetes/vfc/requirements.yaml b/kubernetes/vfc/requirements.yaml
index 71bfc00487..c2c445c4e5 100644
--- a/kubernetes/vfc/requirements.yaml
+++ b/kubernetes/vfc/requirements.yaml
@@ -14,8 +14,8 @@
dependencies:
- name: common
- version: ~4.x-0
+ version: ~5.x-0
repository: '@local'
- name: mariadb-galera
- version: ~4.x-0
+ version: ~5.x-0
repository: '@local'
diff --git a/kubernetes/vid/Chart.yaml b/kubernetes/vid/Chart.yaml
index deb0fc6017..e4aa0890a5 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: 4.0.0
+version: 5.0.0
diff --git a/kubernetes/vid/charts/vid-mariadb-galera/Chart.yaml b/kubernetes/vid/charts/vid-mariadb-galera/Chart.yaml
index dd00351b5f..041914734f 100644
--- a/kubernetes/vid/charts/vid-mariadb-galera/Chart.yaml
+++ b/kubernetes/vid/charts/vid-mariadb-galera/Chart.yaml
@@ -15,7 +15,7 @@
apiVersion: v1
description: ONAP VID MariaDB Galera cluster
name: vid_mariadb_galera
-version: 4.0.0
+version: 5.0.0
keywords:
- mariadb
- mysql
diff --git a/kubernetes/vid/requirements.yaml b/kubernetes/vid/requirements.yaml
index 9996777c42..6a748bee0c 100644
--- a/kubernetes/vid/requirements.yaml
+++ b/kubernetes/vid/requirements.yaml
@@ -14,7 +14,7 @@
dependencies:
- name: common
- version: ~4.x-0
+ version: ~5.x-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/vnfsdk/Chart.yaml b/kubernetes/vnfsdk/Chart.yaml
index f8c49333c0..2a6b5c84c2 100644
--- a/kubernetes/vnfsdk/Chart.yaml
+++ b/kubernetes/vnfsdk/Chart.yaml
@@ -15,4 +15,4 @@
apiVersion: v1
description: ONAP VNF SDK
name: vnfsdk
-version: 4.0.0
+version: 5.0.0
diff --git a/kubernetes/vnfsdk/requirements.yaml b/kubernetes/vnfsdk/requirements.yaml
index fc43cb260a..7b1f490e6f 100644
--- a/kubernetes/vnfsdk/requirements.yaml
+++ b/kubernetes/vnfsdk/requirements.yaml
@@ -14,8 +14,8 @@
dependencies:
- name: common
- version: ~4.x-0
+ version: ~5.x-0
repository: '@local'
- name: postgres
- version: ~4.x-0
+ version: ~5.x-0
repository: '@local'
diff --git a/kubernetes/vnfsdk/templates/service.yaml b/kubernetes/vnfsdk/templates/service.yaml
index f6208cf965..c683d4ce8b 100644
--- a/kubernetes/vnfsdk/templates/service.yaml
+++ b/kubernetes/vnfsdk/templates/service.yaml
@@ -27,7 +27,7 @@ spec:
ports:
{{if eq .Values.service.type "NodePort" -}}
- port: {{ .Values.service.internalPort }}
- nodePort: {{ .Values.global.nodePortPrefix | default "302" }}{{ .Values.service.nodePort }}
+ nodePort: {{ .Values.global.nodePortPrefix | default .Values.nodePortPrefix }}{{ .Values.service.nodePort }}
{{- else -}}
- port: {{ .Values.service.externalPort }}
targetPort: {{ .Values.service.internalPort }}