summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.gitignore4
-rw-r--r--docs/helm-search.txt80
-rw-r--r--docs/oom_developer_guide.rst5
-rw-r--r--docs/oom_quickstart_guide.rst1
-rw-r--r--docs/oom_user_guide.rst66
-rw-r--r--kubernetes/Makefile38
-rw-r--r--kubernetes/a1policymanagement/Chart.yaml19
-rw-r--r--kubernetes/a1policymanagement/requirements.yaml30
-rw-r--r--kubernetes/a1policymanagement/templates/statefulset.yaml4
-rw-r--r--kubernetes/aaf/Chart.yaml47
-rw-r--r--kubernetes/aaf/Makefile4
-rw-r--r--kubernetes/aaf/components/Makefile4
-rw-r--r--kubernetes/aaf/components/aaf-cass/Chart.yaml13
-rw-r--r--kubernetes/aaf/components/aaf-cass/requirements.yaml21
-rw-r--r--kubernetes/aaf/components/aaf-cm/Chart.yaml16
-rw-r--r--kubernetes/aaf/components/aaf-cm/requirements.yaml24
-rw-r--r--kubernetes/aaf/components/aaf-fs/Chart.yaml16
-rw-r--r--kubernetes/aaf/components/aaf-fs/requirements.yaml24
-rw-r--r--kubernetes/aaf/components/aaf-gui/Chart.yaml16
-rw-r--r--kubernetes/aaf/components/aaf-gui/requirements.yaml24
-rw-r--r--kubernetes/aaf/components/aaf-hello/Chart.yaml16
-rw-r--r--kubernetes/aaf/components/aaf-hello/requirements.yaml24
-rw-r--r--kubernetes/aaf/components/aaf-locate/Chart.yaml16
-rw-r--r--kubernetes/aaf/components/aaf-locate/requirements.yaml24
-rw-r--r--kubernetes/aaf/components/aaf-oauth/Chart.yaml16
-rw-r--r--kubernetes/aaf/components/aaf-oauth/requirements.yaml24
-rw-r--r--kubernetes/aaf/components/aaf-service/Chart.yaml16
-rw-r--r--kubernetes/aaf/components/aaf-service/requirements.yaml24
-rw-r--r--kubernetes/aaf/components/aaf-sms/Chart.yaml22
-rw-r--r--kubernetes/aaf/components/aaf-sms/Makefile4
-rw-r--r--kubernetes/aaf/components/aaf-sms/components/Makefile4
-rw-r--r--kubernetes/aaf/components/aaf-sms/components/aaf-sms-quorumclient/Chart.yaml13
-rw-r--r--kubernetes/aaf/components/aaf-sms/components/aaf-sms-quorumclient/requirements.yaml21
-rw-r--r--kubernetes/aaf/components/aaf-sms/components/aaf-sms-vault/Chart.yaml13
-rw-r--r--kubernetes/aaf/components/aaf-sms/components/aaf-sms-vault/requirements.yaml21
-rw-r--r--kubernetes/aaf/components/aaf-sms/requirements.yaml30
-rw-r--r--kubernetes/aaf/components/aaf-sshsm/Chart.yaml25
-rw-r--r--kubernetes/aaf/components/aaf-sshsm/Makefile4
-rw-r--r--kubernetes/aaf/components/aaf-sshsm/components/Makefile4
-rw-r--r--kubernetes/aaf/components/aaf-sshsm/components/aaf-sshsm-abrmd/Chart.yaml13
-rw-r--r--kubernetes/aaf/components/aaf-sshsm/components/aaf-sshsm-abrmd/requirements.yaml22
-rw-r--r--kubernetes/aaf/components/aaf-sshsm/components/aaf-sshsm-distcenter/Chart.yaml13
-rw-r--r--kubernetes/aaf/components/aaf-sshsm/components/aaf-sshsm-distcenter/requirements.yaml22
-rw-r--r--kubernetes/aaf/components/aaf-sshsm/components/aaf-sshsm-testca/Chart.yaml13
-rw-r--r--kubernetes/aaf/components/aaf-sshsm/components/aaf-sshsm-testca/requirements.yaml22
-rw-r--r--kubernetes/aaf/components/aaf-sshsm/requirements.yaml34
-rw-r--r--kubernetes/aaf/components/aaf-templates/Chart.yaml10
-rw-r--r--kubernetes/aaf/components/aaf-templates/requirements.yaml18
-rw-r--r--kubernetes/aaf/requirements.yaml58
-rw-r--r--kubernetes/aai/Chart.yaml57
-rw-r--r--kubernetes/aai/Makefile4
-rw-r--r--kubernetes/aai/components/Makefile4
-rw-r--r--kubernetes/aai/components/aai-babel/Chart.yaml22
-rw-r--r--kubernetes/aai/components/aai-babel/requirements.yaml32
-rw-r--r--kubernetes/aai/components/aai-babel/templates/deployment.yaml4
-rw-r--r--kubernetes/aai/components/aai-graphadmin/Chart.yaml22
-rw-r--r--kubernetes/aai/components/aai-graphadmin/requirements.yaml32
-rw-r--r--kubernetes/aai/components/aai-graphadmin/templates/deployment.yaml8
-rw-r--r--kubernetes/aai/components/aai-graphadmin/templates/job-copy-db-backup.yaml10
-rw-r--r--kubernetes/aai/components/aai-graphadmin/templates/job-create-db.yaml10
-rw-r--r--kubernetes/aai/components/aai-graphadmin/templates/job-migration.yaml12
-rw-r--r--kubernetes/aai/components/aai-modelloader/Chart.yaml22
-rw-r--r--kubernetes/aai/components/aai-modelloader/requirements.yaml32
-rw-r--r--kubernetes/aai/components/aai-modelloader/templates/deployment.yaml8
-rw-r--r--kubernetes/aai/components/aai-resources/Chart.yaml22
-rw-r--r--kubernetes/aai/components/aai-resources/requirements.yaml32
-rw-r--r--kubernetes/aai/components/aai-schema-service/Chart.yaml22
-rw-r--r--kubernetes/aai/components/aai-schema-service/requirements.yaml32
-rw-r--r--kubernetes/aai/components/aai-sparky-be/Chart.yaml22
-rw-r--r--kubernetes/aai/components/aai-sparky-be/requirements.yaml32
-rw-r--r--kubernetes/aai/components/aai-sparky-be/templates/deployment.yaml2
-rw-r--r--kubernetes/aai/components/aai-traversal/Chart.yaml22
-rw-r--r--kubernetes/aai/components/aai-traversal/requirements.yaml32
-rw-r--r--kubernetes/aai/components/aai-traversal/templates/job.yaml2
-rw-r--r--kubernetes/aai/requirements.yaml67
-rw-r--r--kubernetes/appc/Chart.yaml27
-rw-r--r--kubernetes/appc/Makefile4
-rw-r--r--kubernetes/appc/components/Makefile4
-rw-r--r--kubernetes/appc/components/appc-ansible-server/Chart.yaml13
-rw-r--r--kubernetes/appc/components/appc-ansible-server/requirements.yaml22
-rw-r--r--kubernetes/appc/components/appc-cdt/Chart.yaml16
-rw-r--r--kubernetes/appc/components/appc-cdt/requirements.yaml25
-rw-r--r--kubernetes/appc/requirements.yaml36
-rw-r--r--kubernetes/cds/Chart.yaml33
-rw-r--r--kubernetes/cds/Makefile4
-rw-r--r--kubernetes/cds/components/Makefile4
-rwxr-xr-xkubernetes/cds/components/cds-blueprints-processor/Chart.yaml19
-rwxr-xr-xkubernetes/cds/components/cds-blueprints-processor/requirements.yaml28
-rwxr-xr-xkubernetes/cds/components/cds-command-executor/Chart.yaml16
-rwxr-xr-xkubernetes/cds/components/cds-command-executor/requirements.yaml25
-rwxr-xr-xkubernetes/cds/components/cds-py-executor/Chart.yaml16
-rwxr-xr-xkubernetes/cds/components/cds-py-executor/requirements.yaml25
-rwxr-xr-xkubernetes/cds/components/cds-sdc-listener/Chart.yaml16
-rwxr-xr-xkubernetes/cds/components/cds-sdc-listener/requirements.yaml25
-rw-r--r--kubernetes/cds/components/cds-ui/Chart.yaml19
-rw-r--r--kubernetes/cds/components/cds-ui/requirements.yaml28
-rw-r--r--kubernetes/cds/requirements.yaml42
-rw-r--r--kubernetes/cli/Chart.yaml22
-rw-r--r--kubernetes/cli/requirements.yaml31
-rw-r--r--kubernetes/common/Makefile4
-rw-r--r--kubernetes/common/cassandra/Chart.yaml16
-rw-r--r--kubernetes/common/cassandra/requirements.yaml26
-rw-r--r--kubernetes/common/cassandra/resources/config/docker-entrypoint.sh3
-rw-r--r--kubernetes/common/cert-wrapper/Chart.yaml10
-rw-r--r--kubernetes/common/cert-wrapper/requirements.yaml19
-rw-r--r--kubernetes/common/certInitializer/Chart.yaml16
-rw-r--r--kubernetes/common/certInitializer/requirements.yaml25
-rw-r--r--kubernetes/common/certManagerCertificate/Chart.yaml13
-rw-r--r--kubernetes/common/certManagerCertificate/requirements.yaml22
-rw-r--r--kubernetes/common/cmpv2Config/Chart.yaml10
-rw-r--r--kubernetes/common/cmpv2Config/requirements.yaml19
-rw-r--r--kubernetes/common/common/Chart.yaml4
-rw-r--r--kubernetes/common/dgbuilder/Chart.yaml19
-rw-r--r--kubernetes/common/dgbuilder/requirements.yaml28
-rw-r--r--kubernetes/common/elasticsearch/Chart.yaml27
-rw-r--r--kubernetes/common/elasticsearch/Makefile4
-rw-r--r--kubernetes/common/elasticsearch/components/Makefile4
-rw-r--r--kubernetes/common/elasticsearch/components/curator/Chart.yaml13
-rw-r--r--kubernetes/common/elasticsearch/components/curator/requirements.yaml22
-rw-r--r--kubernetes/common/elasticsearch/components/data/Chart.yaml13
-rw-r--r--kubernetes/common/elasticsearch/components/data/requirements.yaml22
-rw-r--r--kubernetes/common/elasticsearch/components/master/Chart.yaml15
-rw-r--r--kubernetes/common/elasticsearch/components/master/requirements.yaml22
-rw-r--r--kubernetes/common/elasticsearch/requirements.yaml36
-rw-r--r--kubernetes/common/etcd-init/Chart.yaml13
-rw-r--r--kubernetes/common/etcd-init/requirements.yaml22
-rw-r--r--kubernetes/common/etcd/Chart.yaml13
-rw-r--r--kubernetes/common/etcd/requirements.yaml21
-rw-r--r--kubernetes/common/logConfiguration/Chart.yaml10
-rw-r--r--kubernetes/common/logConfiguration/requirements.yaml19
-rw-r--r--kubernetes/common/mariadb-galera/Chart.yaml19
-rw-r--r--kubernetes/common/mariadb-galera/requirements.yaml28
-rw-r--r--kubernetes/common/mariadb-init/Chart.yaml13
-rw-r--r--kubernetes/common/mariadb-init/requirements.yaml22
-rw-r--r--kubernetes/common/mongo/Chart.yaml13
-rw-r--r--kubernetes/common/mongo/requirements.yaml22
-rw-r--r--kubernetes/common/music/Chart.yaml19
-rw-r--r--kubernetes/common/music/Makefile4
-rw-r--r--kubernetes/common/music/components/Makefile4
-rw-r--r--kubernetes/common/music/components/music-cassandra/Chart.yaml13
-rw-r--r--kubernetes/common/music/components/music-cassandra/requirements.yaml22
-rw-r--r--kubernetes/common/music/requirements.yaml28
-rw-r--r--kubernetes/common/network-name-gen/Chart.yaml21
-rw-r--r--kubernetes/common/network-name-gen/requirements.yaml30
-rw-r--r--kubernetes/common/postgres-init/Chart.yaml14
-rw-r--r--kubernetes/common/postgres-init/requirements.yaml21
-rw-r--r--kubernetes/common/postgres/Chart.yaml13
-rw-r--r--kubernetes/common/postgres/requirements.yaml22
-rw-r--r--kubernetes/common/readinessCheck/Chart.yaml13
-rw-r--r--kubernetes/common/readinessCheck/requirements.yaml22
-rw-r--r--kubernetes/common/repository-wrapper/Chart.yaml13
-rw-r--r--kubernetes/common/repository-wrapper/requirements.yaml22
-rw-r--r--kubernetes/common/repositoryGenerator/Chart.yaml4
-rw-r--r--kubernetes/common/repositoryGenerator/requirements.yaml14
-rw-r--r--kubernetes/common/roles-wrapper/Chart.yaml10
-rw-r--r--kubernetes/common/roles-wrapper/requirements.yaml18
-rw-r--r--kubernetes/common/serviceAccount/Chart.yaml10
-rw-r--r--kubernetes/common/serviceAccount/requirements.yaml19
-rw-r--r--kubernetes/common/timescaledb/Chart.yaml16
-rw-r--r--kubernetes/common/timescaledb/requirements.yaml29
-rwxr-xr-xkubernetes/config/prepull_docker.sh11
-rw-r--r--kubernetes/consul/Chart.yaml23
-rw-r--r--kubernetes/consul/Makefile4
-rw-r--r--kubernetes/consul/components/Makefile4
-rw-r--r--kubernetes/consul/components/consul-server/Chart.yaml19
-rw-r--r--kubernetes/consul/components/consul-server/requirements.yaml29
-rw-r--r--kubernetes/consul/requirements.yaml33
-rwxr-xr-xkubernetes/contrib/Chart.yaml25
-rw-r--r--kubernetes/contrib/Makefile4
-rw-r--r--kubernetes/contrib/components/Makefile4
-rwxr-xr-xkubernetes/contrib/components/awx/Chart.yaml19
-rw-r--r--kubernetes/contrib/components/awx/Makefile4
-rw-r--r--kubernetes/contrib/components/awx/components/Makefile4
-rwxr-xr-xkubernetes/contrib/components/awx/components/awx-postgres/Chart.yaml16
-rwxr-xr-xkubernetes/contrib/components/awx/components/awx-postgres/requirements.yaml25
-rwxr-xr-xkubernetes/contrib/components/awx/requirements.yaml28
-rw-r--r--kubernetes/contrib/components/ejbca/Chart.yaml27
-rw-r--r--kubernetes/contrib/components/ejbca/requirements.yaml35
-rwxr-xr-xkubernetes/contrib/components/netbox/Chart.yaml22
-rw-r--r--kubernetes/contrib/components/netbox/Makefile4
-rw-r--r--kubernetes/contrib/components/netbox/components/Makefile4
-rwxr-xr-xkubernetes/contrib/components/netbox/components/netbox-app/Chart.yaml16
-rwxr-xr-xkubernetes/contrib/components/netbox/components/netbox-app/requirements.yaml25
-rwxr-xr-xkubernetes/contrib/components/netbox/components/netbox-nginx/Chart.yaml16
-rwxr-xr-xkubernetes/contrib/components/netbox/components/netbox-nginx/requirements.yaml25
-rwxr-xr-xkubernetes/contrib/components/netbox/components/netbox-postgres/Chart.yaml16
-rwxr-xr-xkubernetes/contrib/components/netbox/components/netbox-postgres/requirements.yaml25
-rwxr-xr-xkubernetes/contrib/components/netbox/requirements.yaml31
-rw-r--r--kubernetes/contrib/dns-server-for-vhost-ingress-testing/bind9dns/Chart.yaml2
-rwxr-xr-xkubernetes/contrib/dns-server-for-vhost-ingress-testing/deploy_dns.sh21
-rwxr-xr-xkubernetes/contrib/metallb-loadbalancer-inst/install-metallb-on-cluster.sh9
-rw-r--r--kubernetes/contrib/requirements.yaml34
-rw-r--r--kubernetes/cps/Chart.yaml22
-rw-r--r--kubernetes/cps/Makefile4
-rw-r--r--kubernetes/cps/components/Makefile4
-rw-r--r--kubernetes/cps/components/cps-core/Chart.yaml28
-rw-r--r--kubernetes/cps/components/cps-core/requirements.yaml36
-rw-r--r--kubernetes/cps/components/cps-core/values.yaml3
-rw-r--r--kubernetes/cps/components/cps-temporal/Chart.yaml22
-rw-r--r--kubernetes/cps/components/cps-temporal/requirements.yaml35
-rw-r--r--kubernetes/cps/components/cps-temporal/values.yaml3
-rw-r--r--kubernetes/cps/components/ncmp-dmi-plugin/Chart.yaml19
-rw-r--r--kubernetes/cps/components/ncmp-dmi-plugin/requirements.yaml32
-rw-r--r--kubernetes/cps/components/ncmp-dmi-plugin/values.yaml3
-rw-r--r--kubernetes/cps/requirements.yaml31
-rw-r--r--kubernetes/dcaegen2-services/Chart.yaml88
-rw-r--r--kubernetes/dcaegen2-services/Makefile4
-rw-r--r--kubernetes/dcaegen2-services/common/Makefile4
-rw-r--r--kubernetes/dcaegen2-services/common/dcaegen2-services-common/Chart.yaml12
-rw-r--r--kubernetes/dcaegen2-services/common/dcaegen2-services-common/requirements.yaml19
-rw-r--r--kubernetes/dcaegen2-services/common/dcaegen2-services-common/templates/_deployment.tpl3
-rw-r--r--kubernetes/dcaegen2-services/components/Makefile4
-rw-r--r--kubernetes/dcaegen2-services/components/dcae-bbs-eventprocessor-ms/Chart.yaml24
-rw-r--r--kubernetes/dcaegen2-services/components/dcae-bbs-eventprocessor-ms/requirements.yaml34
-rw-r--r--kubernetes/dcaegen2-services/components/dcae-datafile-collector/Chart.yaml27
-rw-r--r--kubernetes/dcaegen2-services/components/dcae-datafile-collector/requirements.yaml37
-rw-r--r--kubernetes/dcaegen2-services/components/dcae-datalake-admin-ui/Chart.yaml24
-rw-r--r--kubernetes/dcaegen2-services/components/dcae-datalake-des/Chart.yaml24
-rw-r--r--kubernetes/dcaegen2-services/components/dcae-datalake-des/requirements.yaml34
-rw-r--r--kubernetes/dcaegen2-services/components/dcae-datalake-feeder/Chart.yaml27
-rw-r--r--kubernetes/dcaegen2-services/components/dcae-datalake-feeder/requirements.yaml37
-rw-r--r--kubernetes/dcaegen2-services/components/dcae-heartbeat/Chart.yaml27
-rw-r--r--kubernetes/dcaegen2-services/components/dcae-heartbeat/requirements.yaml37
-rw-r--r--kubernetes/dcaegen2-services/components/dcae-hv-ves-collector/Chart.yaml27
-rw-r--r--kubernetes/dcaegen2-services/components/dcae-hv-ves-collector/requirements.yaml36
-rw-r--r--kubernetes/dcaegen2-services/components/dcae-kpi-ms/Chart.yaml24
-rw-r--r--kubernetes/dcaegen2-services/components/dcae-kpi-ms/requirements.yaml34
-rw-r--r--kubernetes/dcaegen2-services/components/dcae-ms-healthcheck/Chart.yaml18
-rw-r--r--kubernetes/dcaegen2-services/components/dcae-ms-healthcheck/requirements.yaml29
-rw-r--r--kubernetes/dcaegen2-services/components/dcae-ms-healthcheck/values.yaml2
-rw-r--r--kubernetes/dcaegen2-services/components/dcae-pm-mapper/Chart.yaml24
-rw-r--r--kubernetes/dcaegen2-services/components/dcae-pm-mapper/requirements.yaml34
-rw-r--r--kubernetes/dcaegen2-services/components/dcae-pmsh/Chart.yaml27
-rw-r--r--kubernetes/dcaegen2-services/components/dcae-pmsh/requirements.yaml37
-rw-r--r--kubernetes/dcaegen2-services/components/dcae-prh/Chart.yaml24
-rw-r--r--kubernetes/dcaegen2-services/components/dcae-prh/requirements.yaml32
-rw-r--r--kubernetes/dcaegen2-services/components/dcae-restconf-collector/Chart.yaml24
-rw-r--r--kubernetes/dcaegen2-services/components/dcae-restconf-collector/requirements.yaml34
-rw-r--r--kubernetes/dcaegen2-services/components/dcae-slice-analysis-ms/Chart.yaml27
-rw-r--r--kubernetes/dcaegen2-services/components/dcae-snmptrap-collector/Chart.yaml24
-rw-r--r--kubernetes/dcaegen2-services/components/dcae-snmptrap-collector/requirements.yaml34
-rw-r--r--kubernetes/dcaegen2-services/components/dcae-son-handler/Chart.yaml27
-rw-r--r--kubernetes/dcaegen2-services/components/dcae-son-handler/requirements.yaml37
-rw-r--r--kubernetes/dcaegen2-services/components/dcae-tcagen2/Chart.yaml30
-rw-r--r--kubernetes/dcaegen2-services/components/dcae-tcagen2/requirements.yaml35
-rw-r--r--kubernetes/dcaegen2-services/components/dcae-tcagen2/values.yaml15
-rw-r--r--kubernetes/dcaegen2-services/components/dcae-ves-collector/Chart.yaml27
-rw-r--r--kubernetes/dcaegen2-services/components/dcae-ves-collector/requirements.yaml36
-rw-r--r--kubernetes/dcaegen2-services/components/dcae-ves-mapper/Chart.yaml24
-rw-r--r--kubernetes/dcaegen2-services/components/dcae-ves-mapper/requirements.yaml34
-rw-r--r--kubernetes/dcaegen2-services/requirements.yaml97
-rw-r--r--kubernetes/dcaegen2-services/resources/expected-components.json74
-rw-r--r--kubernetes/dcaegen2/Chart.yaml50
-rw-r--r--kubernetes/dcaegen2/Makefile4
-rw-r--r--kubernetes/dcaegen2/components/Makefile4
-rw-r--r--kubernetes/dcaegen2/components/dcae-bootstrap/Chart.yaml20
-rw-r--r--kubernetes/dcaegen2/components/dcae-bootstrap/requirements.yaml38
-rw-r--r--kubernetes/dcaegen2/components/dcae-bootstrap/values.yaml14
-rw-r--r--kubernetes/dcaegen2/components/dcae-cloudify-manager/Chart.yaml19
-rw-r--r--kubernetes/dcaegen2/components/dcae-cloudify-manager/requirements.yaml30
-rw-r--r--kubernetes/dcaegen2/components/dcae-config-binding-service/Chart.yaml16
-rw-r--r--kubernetes/dcaegen2/components/dcae-config-binding-service/requirements.yaml26
-rw-r--r--kubernetes/dcaegen2/components/dcae-config-binding-service/templates/deployment.yaml5
-rw-r--r--kubernetes/dcaegen2/components/dcae-dashboard/Chart.yaml20
-rw-r--r--kubernetes/dcaegen2/components/dcae-dashboard/requirements.yaml28
-rw-r--r--kubernetes/dcaegen2/components/dcae-deployment-handler/Chart.yaml16
-rw-r--r--kubernetes/dcaegen2/components/dcae-deployment-handler/requirements.yaml26
-rw-r--r--kubernetes/dcaegen2/components/dcae-healthcheck/Chart.yaml16
-rw-r--r--kubernetes/dcaegen2/components/dcae-healthcheck/requirements.yaml29
-rw-r--r--kubernetes/dcaegen2/components/dcae-healthcheck/values.yaml2
-rw-r--r--kubernetes/dcaegen2/components/dcae-inventory-api/Chart.yaml19
-rw-r--r--kubernetes/dcaegen2/components/dcae-inventory-api/requirements.yaml29
-rw-r--r--kubernetes/dcaegen2/components/dcae-policy-handler/Chart.yaml16
-rw-r--r--kubernetes/dcaegen2/components/dcae-policy-handler/requirements.yaml26
-rw-r--r--kubernetes/dcaegen2/components/dcae-servicechange-handler/Chart.yaml16
-rw-r--r--kubernetes/dcaegen2/components/dcae-servicechange-handler/requirements.yaml26
-rw-r--r--kubernetes/dcaegen2/components/dcae-ves-openapi-manager/Chart.yaml19
-rw-r--r--kubernetes/dcaegen2/components/dcae-ves-openapi-manager/requirements.yaml30
-rw-r--r--kubernetes/dcaegen2/requirements.yaml60
-rw-r--r--kubernetes/dcaegen2/resources/expected-components.json59
-rw-r--r--kubernetes/dcaegen2/values.yaml14
-rw-r--r--kubernetes/dcaemod/Chart.yaml38
-rw-r--r--kubernetes/dcaemod/components/dcaemod-designtool/Chart.yaml16
-rw-r--r--kubernetes/dcaemod/components/dcaemod-designtool/requirements.yaml28
-rw-r--r--kubernetes/dcaemod/components/dcaemod-distributor-api/Chart.yaml16
-rw-r--r--kubernetes/dcaemod/components/dcaemod-distributor-api/requirements.yaml28
-rw-r--r--kubernetes/dcaemod/components/dcaemod-genprocessor/Chart.yaml16
-rw-r--r--kubernetes/dcaemod/components/dcaemod-genprocessor/requirements.yaml28
-rw-r--r--kubernetes/dcaemod/components/dcaemod-healthcheck/Chart.yaml16
-rw-r--r--kubernetes/dcaemod/components/dcaemod-healthcheck/requirements.yaml29
-rw-r--r--kubernetes/dcaemod/components/dcaemod-nifi-registry/Chart.yaml16
-rw-r--r--kubernetes/dcaemod/components/dcaemod-nifi-registry/requirements.yaml28
-rw-r--r--kubernetes/dcaemod/components/dcaemod-onboarding-api/Chart.yaml19
-rw-r--r--kubernetes/dcaemod/components/dcaemod-onboarding-api/requirements.yaml31
-rw-r--r--kubernetes/dcaemod/components/dcaemod-onboarding-api/values.yaml2
-rw-r--r--kubernetes/dcaemod/components/dcaemod-runtime-api/Chart.yaml19
-rw-r--r--kubernetes/dcaemod/components/dcaemod-runtime-api/requirements.yaml28
-rw-r--r--kubernetes/dcaemod/components/dcaemod-runtime-api/resources/config/addons/templates/certificates.yaml3
-rw-r--r--kubernetes/dcaemod/components/dcaemod-runtime-api/resources/config/base/Chart.yaml (renamed from kubernetes/dcaegen2-services/components/dcae-slice-analysis-ms/requirements.yaml)28
-rw-r--r--kubernetes/dcaemod/components/dcaemod-runtime-api/resources/config/base/templates/configmap.yaml1
-rw-r--r--kubernetes/dcaemod/components/dcaemod-runtime-api/resources/config/base/templates/deployment.yaml1
-rw-r--r--kubernetes/dcaemod/components/dcaemod-runtime-api/resources/config/base/templates/secret.yaml1
-rw-r--r--kubernetes/dcaemod/components/dcaemod-runtime-api/resources/config/base/templates/service.yaml1
-rw-r--r--kubernetes/dcaemod/components/dcaemod-runtime-api/resources/config/base/values.yaml100
-rw-r--r--kubernetes/dcaemod/components/dcaemod-runtime-api/templates/configmap.yaml (renamed from kubernetes/dcaegen2-services/components/dcae-datalake-admin-ui/requirements.yaml)45
-rw-r--r--kubernetes/dcaemod/components/dcaemod-runtime-api/templates/deployment.yaml34
-rw-r--r--kubernetes/dcaemod/components/dcaemod-runtime-api/values.yaml27
-rw-r--r--kubernetes/dcaemod/requirements.yaml47
-rw-r--r--kubernetes/dmaap/Chart.yaml29
-rw-r--r--kubernetes/dmaap/Makefile5
-rw-r--r--kubernetes/dmaap/components/Makefile5
-rw-r--r--kubernetes/dmaap/components/dmaap-bc/Chart.yaml23
-rw-r--r--kubernetes/dmaap/components/dmaap-bc/requirements.yaml32
-rw-r--r--kubernetes/dmaap/components/dmaap-dr-node/Chart.yaml19
-rw-r--r--kubernetes/dmaap/components/dmaap-dr-node/requirements.yaml34
-rw-r--r--kubernetes/dmaap/components/dmaap-dr-prov/Chart.yaml25
-rw-r--r--kubernetes/dmaap/components/dmaap-dr-prov/requirements.yaml41
-rw-r--r--kubernetes/dmaap/components/message-router/Chart.yaml28
-rw-r--r--kubernetes/dmaap/components/message-router/Makefile4
-rw-r--r--kubernetes/dmaap/components/message-router/components/Makefile4
-rw-r--r--kubernetes/dmaap/components/message-router/components/message-router-kafka/Chart.yaml22
-rw-r--r--kubernetes/dmaap/components/message-router/components/message-router-kafka/requirements.yaml32
-rw-r--r--kubernetes/dmaap/components/message-router/components/message-router-zookeeper/Chart.yaml19
-rw-r--r--kubernetes/dmaap/components/message-router/components/message-router-zookeeper/requirements.yaml29
-rw-r--r--kubernetes/dmaap/components/message-router/requirements.yaml38
-rw-r--r--kubernetes/dmaap/components/message-router/templates/statefulset.yaml14
-rw-r--r--kubernetes/dmaap/components/message-router/values.yaml16
-rw-r--r--kubernetes/dmaap/requirements.yaml39
-rwxr-xr-xkubernetes/helm/plugins/deploy/deploy.sh27
-rw-r--r--kubernetes/helm/starters/onap-app/Chart.yaml13
-rw-r--r--kubernetes/helm/starters/onap-app/requirements.yaml22
-rw-r--r--kubernetes/holmes/Chart.yaml27
-rw-r--r--kubernetes/holmes/Makefile4
-rw-r--r--kubernetes/holmes/components/Makefile4
-rw-r--r--kubernetes/holmes/components/holmes-engine-mgmt/Chart.yaml20
-rw-r--r--kubernetes/holmes/components/holmes-engine-mgmt/requirements.yaml28
-rw-r--r--kubernetes/holmes/components/holmes-engine-mgmt/templates/deployment.yaml3
-rw-r--r--kubernetes/holmes/components/holmes-rule-mgmt/Chart.yaml20
-rw-r--r--kubernetes/holmes/components/holmes-rule-mgmt/requirements.yaml28
-rw-r--r--kubernetes/holmes/components/holmes-rule-mgmt/templates/deployment.yaml3
-rw-r--r--kubernetes/holmes/requirements.yaml35
-rw-r--r--kubernetes/log/Chart.yaml22
-rw-r--r--kubernetes/log/Makefile4
-rw-r--r--kubernetes/log/components/Makefile4
-rw-r--r--kubernetes/log/components/log-elasticsearch/Chart.yaml13
-rw-r--r--kubernetes/log/components/log-elasticsearch/requirements.yaml23
-rw-r--r--kubernetes/log/components/log-kibana/Chart.yaml13
-rw-r--r--kubernetes/log/components/log-kibana/requirements.yaml23
-rw-r--r--kubernetes/log/components/log-logstash/Chart.yaml13
-rw-r--r--kubernetes/log/components/log-logstash/requirements.yaml23
-rw-r--r--kubernetes/log/requirements.yaml31
-rw-r--r--kubernetes/modeling/Chart.yaml10
-rw-r--r--kubernetes/modeling/Makefile4
-rw-r--r--kubernetes/modeling/components/Makefile4
-rw-r--r--kubernetes/modeling/components/modeling-etsicatalog/Chart.yaml27
-rw-r--r--kubernetes/modeling/components/modeling-etsicatalog/requirements.yaml36
-rw-r--r--kubernetes/modeling/requirements.yaml19
-rw-r--r--kubernetes/msb/Chart.yaml29
-rw-r--r--kubernetes/msb/Makefile4
-rw-r--r--kubernetes/msb/components/Makefile4
-rw-r--r--kubernetes/msb/components/kube2msb/Chart.yaml13
-rw-r--r--kubernetes/msb/components/kube2msb/requirements.yaml22
-rw-r--r--kubernetes/msb/components/msb-consul/Chart.yaml16
-rw-r--r--kubernetes/msb/components/msb-consul/requirements.yaml24
-rw-r--r--kubernetes/msb/components/msb-discovery/Chart.yaml16
-rw-r--r--kubernetes/msb/components/msb-discovery/requirements.yaml24
-rw-r--r--kubernetes/msb/components/msb-discovery/templates/deployment.yaml21
-rw-r--r--kubernetes/msb/components/msb-discovery/values.yaml5
-rw-r--r--kubernetes/msb/components/msb-eag/Chart.yaml19
-rw-r--r--kubernetes/msb/components/msb-eag/requirements.yaml27
-rw-r--r--kubernetes/msb/components/msb-eag/templates/deployment.yaml21
-rw-r--r--kubernetes/msb/components/msb-eag/values.yaml5
-rw-r--r--kubernetes/msb/components/msb-iag/Chart.yaml19
-rw-r--r--kubernetes/msb/components/msb-iag/requirements.yaml27
-rw-r--r--kubernetes/msb/components/msb-iag/templates/deployment.yaml21
-rw-r--r--kubernetes/msb/components/msb-iag/values.yaml5
-rw-r--r--kubernetes/msb/requirements.yaml36
-rw-r--r--kubernetes/msb/templates/configmap.yaml8
-rw-r--r--kubernetes/msb/values.yaml8
-rw-r--r--kubernetes/multicloud/Chart.yaml44
-rw-r--r--kubernetes/multicloud/Makefile4
-rw-r--r--kubernetes/multicloud/components/Makefile4
-rw-r--r--kubernetes/multicloud/components/multicloud-fcaps/Chart.yaml15
-rw-r--r--kubernetes/multicloud/components/multicloud-fcaps/requirements.yaml26
-rw-r--r--kubernetes/multicloud/components/multicloud-fcaps/templates/deployment.yaml20
-rw-r--r--kubernetes/multicloud/components/multicloud-fcaps/values.yaml5
-rw-r--r--kubernetes/multicloud/components/multicloud-k8s/Chart.yaml25
-rw-r--r--kubernetes/multicloud/components/multicloud-k8s/requirements.yaml34
-rw-r--r--kubernetes/multicloud/components/multicloud-pike/Chart.yaml16
-rw-r--r--kubernetes/multicloud/components/multicloud-pike/requirements.yaml26
-rw-r--r--kubernetes/multicloud/components/multicloud-pike/templates/deployment.yaml20
-rw-r--r--kubernetes/multicloud/components/multicloud-pike/values.yaml5
-rw-r--r--kubernetes/multicloud/components/multicloud-prometheus/Chart.yaml22
-rw-r--r--kubernetes/multicloud/components/multicloud-prometheus/components/prometheus-alertmanager/Chart.yaml4
-rw-r--r--kubernetes/multicloud/components/multicloud-prometheus/components/prometheus-grafana/Chart.yaml4
-rw-r--r--kubernetes/multicloud/components/multicloud-prometheus/requirements.yaml32
-rw-r--r--kubernetes/multicloud/components/multicloud-starlingx/Chart.yaml16
-rw-r--r--kubernetes/multicloud/components/multicloud-starlingx/requirements.yaml26
-rw-r--r--kubernetes/multicloud/components/multicloud-starlingx/templates/deployment.yaml20
-rw-r--r--kubernetes/multicloud/components/multicloud-starlingx/values.yaml5
-rw-r--r--kubernetes/multicloud/components/multicloud-vio/Chart.yaml16
-rw-r--r--kubernetes/multicloud/components/multicloud-vio/requirements.yaml26
-rw-r--r--kubernetes/multicloud/components/multicloud-vio/templates/deployment.yaml20
-rw-r--r--kubernetes/multicloud/components/multicloud-vio/values.yaml5
-rw-r--r--kubernetes/multicloud/components/multicloud-windriver/Chart.yaml16
-rw-r--r--kubernetes/multicloud/components/multicloud-windriver/requirements.yaml26
-rw-r--r--kubernetes/multicloud/components/multicloud-windriver/templates/deployment.yaml20
-rw-r--r--kubernetes/multicloud/components/multicloud-windriver/values.yaml5
-rw-r--r--kubernetes/multicloud/requirements.yaml54
-rw-r--r--kubernetes/multicloud/templates/configmap.yaml13
-rw-r--r--kubernetes/multicloud/templates/deployment.yaml20
-rw-r--r--kubernetes/multicloud/values.yaml10
-rw-r--r--kubernetes/nbi/Chart.yaml33
-rw-r--r--kubernetes/nbi/requirements.yaml42
-rw-r--r--kubernetes/onap/.helmignore22
-rw-r--r--kubernetes/onap/Chart.yaml165
-rwxr-xr-xkubernetes/onap/requirements.yaml180
-rw-r--r--kubernetes/onap/resources/overrides/environment.yaml9
-rwxr-xr-xkubernetes/oof/Chart.yaml26
-rw-r--r--kubernetes/oof/Makefile4
-rwxr-xr-xkubernetes/oof/components/Makefile4
-rwxr-xr-xkubernetes/oof/components/oof-has/Chart.yaml46
-rw-r--r--kubernetes/oof/components/oof-has/Makefile4
-rwxr-xr-xkubernetes/oof/components/oof-has/components/Makefile4
-rwxr-xr-xkubernetes/oof/components/oof-has/components/oof-has-api/Chart.yaml22
-rw-r--r--kubernetes/oof/components/oof-has/components/oof-has-api/requirements.yaml31
-rwxr-xr-xkubernetes/oof/components/oof-has/components/oof-has-controller/Chart.yaml19
-rw-r--r--kubernetes/oof/components/oof-has/components/oof-has-controller/requirements.yaml28
-rwxr-xr-xkubernetes/oof/components/oof-has/components/oof-has-data/Chart.yaml19
-rw-r--r--kubernetes/oof/components/oof-has/components/oof-has-data/requirements.yaml28
-rwxr-xr-xkubernetes/oof/components/oof-has/components/oof-has-reservation/Chart.yaml19
-rw-r--r--kubernetes/oof/components/oof-has/components/oof-has-reservation/requirements.yaml28
-rwxr-xr-xkubernetes/oof/components/oof-has/components/oof-has-solver/Chart.yaml19
-rw-r--r--kubernetes/oof/components/oof-has/components/oof-has-solver/requirements.yaml28
-rwxr-xr-xkubernetes/oof/components/oof-has/requirements.yaml55
-rwxr-xr-xkubernetes/oof/components/oof-templates/Chart.yaml11
-rwxr-xr-xkubernetes/oof/components/oof-templates/requirements.yaml20
-rwxr-xr-xkubernetes/oof/requirements.yaml36
-rw-r--r--kubernetes/oof/resources/config/conf/common_config.yaml16
-rw-r--r--kubernetes/platform/Chart.yaml16
-rw-r--r--kubernetes/platform/Makefile4
-rw-r--r--kubernetes/platform/components/Makefile4
-rw-r--r--kubernetes/platform/components/chartmuseum/Chart.yaml19
-rw-r--r--kubernetes/platform/components/chartmuseum/requirements.yaml30
-rw-r--r--kubernetes/platform/components/cmpv2-cert-provider/Chart.yaml13
-rw-r--r--kubernetes/platform/components/cmpv2-cert-provider/requirements.yaml21
-rw-r--r--kubernetes/platform/components/oom-cert-service/Chart.yaml19
-rw-r--r--kubernetes/platform/components/oom-cert-service/requirements.yaml27
-rw-r--r--kubernetes/platform/requirements.yaml27
-rwxr-xr-xkubernetes/policy/Chart.yaml67
-rwxr-xr-xkubernetes/policy/Makefile4
-rwxr-xr-xkubernetes/policy/components/Makefile4
-rwxr-xr-xkubernetes/policy/components/policy-apex-pdp/Chart.yaml19
-rwxr-xr-xkubernetes/policy/components/policy-apex-pdp/requirements.yaml33
-rwxr-xr-xkubernetes/policy/components/policy-api/Chart.yaml19
-rwxr-xr-xkubernetes/policy/components/policy-api/requirements.yaml32
-rw-r--r--kubernetes/policy/components/policy-clamp-be/Chart.yaml16
-rw-r--r--kubernetes/policy/components/policy-clamp-be/requirements.yaml26
-rw-r--r--kubernetes/policy/components/policy-clamp-cl-http-ppnt/Chart.yaml19
-rw-r--r--kubernetes/policy/components/policy-clamp-cl-http-ppnt/requirements.yaml31
-rw-r--r--kubernetes/policy/components/policy-clamp-cl-k8s-ppnt/Chart.yaml19
-rw-r--r--kubernetes/policy/components/policy-clamp-cl-k8s-ppnt/requirements.yaml32
-rw-r--r--kubernetes/policy/components/policy-clamp-cl-pf-ppnt/Chart.yaml19
-rw-r--r--kubernetes/policy/components/policy-clamp-cl-pf-ppnt/requirements.yaml31
-rw-r--r--kubernetes/policy/components/policy-clamp-cl-runtime/Chart.yaml19
-rw-r--r--kubernetes/policy/components/policy-clamp-cl-runtime/requirements.yaml32
-rw-r--r--kubernetes/policy/components/policy-clamp-fe/Chart.yaml16
-rw-r--r--kubernetes/policy/components/policy-clamp-fe/requirements.yaml26
-rwxr-xr-xkubernetes/policy/components/policy-distribution/Chart.yaml19
-rwxr-xr-xkubernetes/policy/components/policy-distribution/requirements.yaml33
-rwxr-xr-xkubernetes/policy/components/policy-drools-pdp/Chart.yaml19
-rwxr-xr-xkubernetes/policy/components/policy-drools-pdp/requirements.yaml29
-rw-r--r--kubernetes/policy/components/policy-gui/Chart.yaml16
-rw-r--r--kubernetes/policy/components/policy-gui/requirements.yaml29
-rwxr-xr-xkubernetes/policy/components/policy-nexus/Chart.yaml19
-rwxr-xr-xkubernetes/policy/components/policy-nexus/requirements.yaml29
-rwxr-xr-xkubernetes/policy/components/policy-pap/Chart.yaml19
-rwxr-xr-xkubernetes/policy/components/policy-pap/requirements.yaml33
-rwxr-xr-xkubernetes/policy/components/policy-xacml-pdp/Chart.yaml19
-rwxr-xr-xkubernetes/policy/components/policy-xacml-pdp/requirements.yaml32
-rwxr-xr-xkubernetes/policy/requirements.yaml86
-rw-r--r--kubernetes/portal/Chart.yaml25
-rw-r--r--kubernetes/portal/Makefile4
-rw-r--r--kubernetes/portal/components/Makefile4
-rw-r--r--kubernetes/portal/components/portal-app/Chart.yaml16
-rw-r--r--kubernetes/portal/components/portal-app/requirements.yaml25
-rw-r--r--kubernetes/portal/components/portal-cassandra/Chart.yaml13
-rw-r--r--kubernetes/portal/components/portal-cassandra/requirements.yaml22
-rw-r--r--kubernetes/portal/components/portal-mariadb/Chart.yaml13
-rw-r--r--kubernetes/portal/components/portal-mariadb/requirements.yaml22
-rw-r--r--kubernetes/portal/components/portal-mariadb/resources/config/mariadb/docker-entrypoint.sh31
-rw-r--r--kubernetes/portal/components/portal-sdk/Chart.yaml16
-rw-r--r--kubernetes/portal/components/portal-sdk/requirements.yaml25
-rw-r--r--kubernetes/portal/components/portal-widget/Chart.yaml13
-rw-r--r--kubernetes/portal/components/portal-widget/requirements.yaml22
-rw-r--r--kubernetes/portal/requirements.yaml35
-rw-r--r--kubernetes/robot/Chart.yaml16
-rw-r--r--kubernetes/robot/requirements.yaml25
-rw-r--r--kubernetes/robot/resources/config/eteshare/config/robot_properties.py2
-rw-r--r--kubernetes/robot/values.yaml2
-rw-r--r--kubernetes/sdc/Chart.yaml31
-rw-r--r--kubernetes/sdc/Makefile4
-rw-r--r--kubernetes/sdc/components/Makefile4
-rw-r--r--kubernetes/sdc/components/sdc-be/Chart.yaml16
-rw-r--r--kubernetes/sdc/components/sdc-be/requirements.yaml30
-rw-r--r--kubernetes/sdc/components/sdc-be/templates/deployment.yaml2
-rw-r--r--kubernetes/sdc/components/sdc-be/values.yaml4
-rw-r--r--kubernetes/sdc/components/sdc-cs/Chart.yaml16
-rw-r--r--kubernetes/sdc/components/sdc-cs/requirements.yaml30
-rw-r--r--kubernetes/sdc/components/sdc-cs/values.yaml4
-rw-r--r--kubernetes/sdc/components/sdc-fe/Chart.yaml16
-rw-r--r--kubernetes/sdc/components/sdc-fe/requirements.yaml30
-rw-r--r--kubernetes/sdc/components/sdc-fe/values.yaml2
-rw-r--r--kubernetes/sdc/components/sdc-helm-validator/Chart.yaml13
-rw-r--r--kubernetes/sdc/components/sdc-helm-validator/requirements.yaml24
-rw-r--r--kubernetes/sdc/components/sdc-onboarding-be/Chart.yaml16
-rw-r--r--kubernetes/sdc/components/sdc-onboarding-be/requirements.yaml30
-rw-r--r--kubernetes/sdc/components/sdc-onboarding-be/values.yaml4
-rw-r--r--kubernetes/sdc/components/sdc-wfd-be/Chart.yaml16
-rw-r--r--kubernetes/sdc/components/sdc-wfd-be/requirements.yaml30
-rw-r--r--kubernetes/sdc/components/sdc-wfd-fe/Chart.yaml16
-rw-r--r--kubernetes/sdc/components/sdc-wfd-fe/requirements.yaml30
-rw-r--r--kubernetes/sdc/requirements.yaml41
-rw-r--r--kubernetes/sdnc/Chart.yaml62
-rw-r--r--kubernetes/sdnc/Makefile4
-rw-r--r--kubernetes/sdnc/components/Makefile4
-rw-r--r--kubernetes/sdnc/components/dmaap-listener/Chart.yaml15
-rw-r--r--kubernetes/sdnc/components/dmaap-listener/requirements.yaml25
-rw-r--r--kubernetes/sdnc/components/sdnc-ansible-server/Chart.yaml16
-rw-r--r--kubernetes/sdnc/components/sdnc-ansible-server/requirements.yaml25
-rw-r--r--kubernetes/sdnc/components/sdnc-prom/Chart.yaml16
-rw-r--r--kubernetes/sdnc/components/sdnc-prom/requirements.yaml25
-rwxr-xr-xkubernetes/sdnc/components/sdnc-prom/resources/bin/sdnc.failover6
-rw-r--r--kubernetes/sdnc/components/sdnc-web/Chart.yaml18
-rw-r--r--kubernetes/sdnc/components/sdnc-web/requirements.yaml29
-rw-r--r--kubernetes/sdnc/components/ueb-listener/Chart.yaml16
-rw-r--r--kubernetes/sdnc/components/ueb-listener/requirements.yaml25
-rw-r--r--kubernetes/sdnc/requirements.yaml73
-rw-r--r--kubernetes/sdnc/templates/statefulset.yaml22
-rw-r--r--kubernetes/sdnc/values.yaml19
-rw-r--r--kubernetes/sniro-emulator/Chart.yaml16
-rw-r--r--kubernetes/sniro-emulator/requirements.yaml25
-rwxr-xr-xkubernetes/so/Chart.yaml92
-rw-r--r--kubernetes/so/Makefile4
-rw-r--r--kubernetes/so/components/Makefile4
-rw-r--r--kubernetes/so/components/so-admin-cockpit/Chart.yaml22
-rwxr-xr-xkubernetes/so/components/so-admin-cockpit/requirements.yaml31
-rw-r--r--kubernetes/so/components/so-appc-orchestrator/Chart.yaml22
-rwxr-xr-xkubernetes/so/components/so-appc-orchestrator/requirements.yaml30
-rwxr-xr-xkubernetes/so/components/so-bpmn-infra/Chart.yaml25
-rwxr-xr-xkubernetes/so/components/so-bpmn-infra/requirements.yaml33
-rwxr-xr-xkubernetes/so/components/so-catalog-db-adapter/Chart.yaml25
-rwxr-xr-xkubernetes/so/components/so-catalog-db-adapter/requirements.yaml33
-rwxr-xr-xkubernetes/so/components/so-cnf-adapter/Chart.yaml25
-rwxr-xr-xkubernetes/so/components/so-cnf-adapter/requirements.yaml34
-rw-r--r--kubernetes/so/components/so-etsi-nfvo-ns-lcm/Chart.yaml22
-rwxr-xr-xkubernetes/so/components/so-etsi-nfvo-ns-lcm/requirements.yaml30
-rwxr-xr-xkubernetes/so/components/so-etsi-sol003-adapter/Chart.yaml22
-rwxr-xr-xkubernetes/so/components/so-etsi-sol003-adapter/requirements.yaml30
-rwxr-xr-xkubernetes/so/components/so-etsi-sol005-adapter/Chart.yaml25
-rwxr-xr-xkubernetes/so/components/so-etsi-sol005-adapter/requirements.yaml33
-rwxr-xr-xkubernetes/so/components/so-mariadb/Chart.yaml22
-rwxr-xr-xkubernetes/so/components/so-mariadb/requirements.yaml30
-rwxr-xr-xkubernetes/so/components/so-nssmf-adapter/Chart.yaml25
-rwxr-xr-xkubernetes/so/components/so-nssmf-adapter/requirements.yaml33
-rwxr-xr-xkubernetes/so/components/so-oof-adapter/Chart.yaml22
-rw-r--r--kubernetes/so/components/so-oof-adapter/requirements.yaml31
-rwxr-xr-xkubernetes/so/components/so-openstack-adapter/Chart.yaml25
-rwxr-xr-xkubernetes/so/components/so-openstack-adapter/requirements.yaml33
-rwxr-xr-xkubernetes/so/components/so-request-db-adapter/Chart.yaml25
-rwxr-xr-xkubernetes/so/components/so-request-db-adapter/requirements.yaml33
-rwxr-xr-xkubernetes/so/components/so-sdc-controller/Chart.yaml25
-rwxr-xr-xkubernetes/so/components/so-sdc-controller/requirements.yaml33
-rwxr-xr-xkubernetes/so/components/so-sdnc-adapter/Chart.yaml22
-rwxr-xr-xkubernetes/so/components/so-sdnc-adapter/requirements.yaml30
-rwxr-xr-xkubernetes/so/components/so-ve-vnfm-adapter/Chart.yaml25
-rwxr-xr-xkubernetes/so/components/so-ve-vnfm-adapter/requirements.yaml33
-rwxr-xr-xkubernetes/so/components/soHelpers/Chart.yaml16
-rwxr-xr-xkubernetes/so/components/soHelpers/requirements.yaml24
-rwxr-xr-xkubernetes/so/requirements.yaml100
-rw-r--r--kubernetes/uui/Chart.yaml25
-rw-r--r--kubernetes/uui/Makefile4
-rw-r--r--kubernetes/uui/components/Makefile4
-rw-r--r--kubernetes/uui/components/uui-nlp/Chart.yaml16
-rw-r--r--kubernetes/uui/components/uui-nlp/requirements.yaml27
-rw-r--r--kubernetes/uui/components/uui-server/Chart.yaml19
-rw-r--r--kubernetes/uui/components/uui-server/requirements.yaml27
-rw-r--r--kubernetes/uui/requirements.yaml35
-rw-r--r--kubernetes/vfc/Chart.yaml49
-rw-r--r--kubernetes/vfc/Makefile4
-rw-r--r--kubernetes/vfc/components/Makefile4
-rw-r--r--kubernetes/vfc/components/vfc-generic-vnfm-driver/Chart.yaml13
-rw-r--r--kubernetes/vfc/components/vfc-generic-vnfm-driver/requirements.yaml22
-rw-r--r--kubernetes/vfc/components/vfc-generic-vnfm-driver/templates/deployment.yaml22
-rw-r--r--kubernetes/vfc/components/vfc-generic-vnfm-driver/values.yaml5
-rw-r--r--kubernetes/vfc/components/vfc-huawei-vnfm-driver/Chart.yaml13
-rw-r--r--kubernetes/vfc/components/vfc-huawei-vnfm-driver/requirements.yaml22
-rw-r--r--kubernetes/vfc/components/vfc-huawei-vnfm-driver/templates/deployment.yaml22
-rw-r--r--kubernetes/vfc/components/vfc-huawei-vnfm-driver/values.yaml7
-rw-r--r--kubernetes/vfc/components/vfc-nslcm/Chart.yaml13
-rw-r--r--kubernetes/vfc/components/vfc-nslcm/requirements.yaml22
-rw-r--r--kubernetes/vfc/components/vfc-nslcm/templates/deployment.yaml20
-rw-r--r--kubernetes/vfc/components/vfc-nslcm/values.yaml5
-rw-r--r--kubernetes/vfc/components/vfc-redis/Chart.yaml13
-rw-r--r--kubernetes/vfc/components/vfc-redis/requirements.yaml22
-rw-r--r--kubernetes/vfc/components/vfc-vnflcm/Chart.yaml13
-rw-r--r--kubernetes/vfc/components/vfc-vnflcm/requirements.yaml22
-rw-r--r--kubernetes/vfc/components/vfc-vnflcm/templates/deployment.yaml22
-rw-r--r--kubernetes/vfc/components/vfc-vnflcm/values.yaml5
-rw-r--r--kubernetes/vfc/components/vfc-vnfmgr/Chart.yaml13
-rw-r--r--kubernetes/vfc/components/vfc-vnfmgr/requirements.yaml22
-rw-r--r--kubernetes/vfc/components/vfc-vnfmgr/templates/deployment.yaml21
-rw-r--r--kubernetes/vfc/components/vfc-vnfmgr/values.yaml5
-rw-r--r--kubernetes/vfc/components/vfc-vnfres/Chart.yaml13
-rw-r--r--kubernetes/vfc/components/vfc-vnfres/requirements.yaml22
-rw-r--r--kubernetes/vfc/components/vfc-vnfres/templates/deployment.yaml20
-rw-r--r--kubernetes/vfc/components/vfc-vnfres/values.yaml5
-rw-r--r--kubernetes/vfc/components/vfc-zte-vnfm-driver/Chart.yaml13
-rw-r--r--kubernetes/vfc/components/vfc-zte-vnfm-driver/requirements.yaml22
-rw-r--r--kubernetes/vfc/components/vfc-zte-vnfm-driver/templates/deployment.yaml22
-rw-r--r--kubernetes/vfc/components/vfc-zte-vnfm-driver/values.yaml7
-rw-r--r--kubernetes/vfc/requirements.yaml58
-rw-r--r--kubernetes/vfc/resources/config/log/filebeat/filebeat.yml (renamed from kubernetes/vfc/resources/config/logging/filebeat/filebeat.yml)0
-rw-r--r--kubernetes/vfc/templates/configmap.yaml8
-rw-r--r--kubernetes/vfc/values.yaml8
-rw-r--r--kubernetes/vid/Chart.yaml27
-rw-r--r--kubernetes/vid/requirements.yaml36
-rw-r--r--kubernetes/vnfsdk/Chart.yaml19
-rw-r--r--kubernetes/vnfsdk/requirements.yaml28
-rw-r--r--tox.ini3
630 files changed, 5350 insertions, 8330 deletions
diff --git a/.gitignore b/.gitignore
index cb4cb34579..6d071f6cb1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,8 +10,8 @@ __snapshot__
kubernetes/config/onap-parameters.yaml
kubernetes/dist/*
kubernetes/common/dist/*
-requirements.lock
-**/charts/*.tgz
+Chart.lock
+#**/charts/*.tgz
*.orig
# AAI Schema
diff --git a/docs/helm-search.txt b/docs/helm-search.txt
index c17cd25207..035b9a6b91 100644
--- a/docs/helm-search.txt
+++ b/docs/helm-search.txt
@@ -1,41 +1,41 @@
NAME CHART VERSION APP VERSION DESCRIPTION
-local/onap 9.0.0 Istanbul Open Network Automation Platform (ONAP)
-local/aaf 9.0.0 ONAP Application Authorization Framework
-local/aai 9.0.0 ONAP Active and Available Inventory
-local/appc 9.0.0 Application Controller
-local/cassandra 9.0.0 ONAP cassandra
-local/cds 9.0.0 ONAP Controller Design Studio (CDS)
-local/clamp 9.0.0 ONAP Clamp
-local/cli 9.0.0 ONAP Command Line Interface
-local/common 9.0.0 Common templates for inclusion in other charts
-local/consul 9.0.0 ONAP Consul Agent
-local/contrib 9.0.0 ONAP optional tools
-local/cps 9.0.0 ONAP Configuration Persistene Service (CPS)
-local/dcaegen2 9.0.0 ONAP DCAE Gen2
-local/dgbuilder 9.0.0 D.G. Builder application
-local/dmaap 9.0.0 ONAP DMaaP components
-local/log 9.0.0 ONAP Logging ElasticStack
-local/mariadb-galera 9.0.0 Chart for MariaDB Galera cluster
-local/mongo 9.0.0 MongoDB Server
-local/msb 9.0.0 ONAP MicroServices Bus
-local/multicloud 9.0.0 ONAP multicloud broker
-local/music 9.0.0 MUSIC - Multi-site State Coordination Service
-local/mysql 9.0.0 MySQL Server
-local/nbi 9.0.0 ONAP Northbound Interface
-local/network-name-gen 9.0.0 Name Generation Micro Service
-local/nfs-provisioner 9.0.0 NFS provisioner
-local/oof 9.0.0 ONAP Optimization Framework
-local/policy 9.0.0 ONAP Policy Administration Point
-local/pomba 9.0.0 ONAP Post Orchestration Model Based Audit
-local/portal 9.0.0 ONAP Web Portal
-local/postgres 9.0.0 ONAP Postgres Server
-local/robot 9.0.0 A helm Chart for kubernetes-ONAP Robot
-local/sdc 9.0.0 Service Design and Creation Umbrella Helm charts
-local/sdnc 9.0.0 SDN Controller
-local/sdnc-prom 9.0.0 ONAP SDNC Policy Driven Ownership Management
-local/sniro-emulator 9.0.0 ONAP Mock Sniro Emulator
-local/so 9.0.0 ONAP Service Orchestrator
-local/uui 9.0.0 ONAP uui
-local/vfc 9.0.0 ONAP Virtual Function Controller (VF-C)
-local/vid 9.0.0 ONAP Virtual Infrastructure Deployment
-local/vnfsdk 9.0.0 ONAP VNF SDK
+local/onap 10.0.0 Jakarta Open Network Automation Platform (ONAP)
+local/aaf 10.0.0 ONAP Application Authorization Framework
+local/aai 10.0.0 ONAP Active and Available Inventory
+local/appc 10.0.0 Application Controller
+local/cassandra 10.0.0 ONAP cassandra
+local/cds 10.0.0 ONAP Controller Design Studio (CDS)
+local/clamp 10.0.0 ONAP Clamp
+local/cli 10.0.0 ONAP Command Line Interface
+local/common 10.0.0 Common templates for inclusion in other charts
+local/consul 10.0.0 ONAP Consul Agent
+local/contrib 10.0.0 ONAP optional tools
+local/cps 10.0.0 ONAP Configuration Persistene Service (CPS)
+local/dcaegen2 10.0.0 ONAP DCAE Gen2
+local/dgbuilder 10.0.0 D.G. Builder application
+local/dmaap 10.0.0 ONAP DMaaP components
+local/log 10.0.0 ONAP Logging ElasticStack
+local/mariadb-galera 10.0.0 Chart for MariaDB Galera cluster
+local/mongo 10.0.0 MongoDB Server
+local/msb 10.0.0 ONAP MicroServices Bus
+local/multicloud 10.0.0 ONAP multicloud broker
+local/music 10.0.0 MUSIC - Multi-site State Coordination Service
+local/mysql 10.0.0 MySQL Server
+local/nbi 10.0.0 ONAP Northbound Interface
+local/network-name-gen 10.0.0 Name Generation Micro Service
+local/nfs-provisioner 10.0.0 NFS provisioner
+local/oof 10.0.0 ONAP Optimization Framework
+local/policy 10.0.0 ONAP Policy Administration Point
+local/pomba 10.0.0 ONAP Post Orchestration Model Based Audit
+local/portal 10.0.0 ONAP Web Portal
+local/postgres 10.0.0 ONAP Postgres Server
+local/robot 10.0.0 A helm Chart for kubernetes-ONAP Robot
+local/sdc 10.0.0 Service Design and Creation Umbrella Helm charts
+local/sdnc 10.0.0 SDN Controller
+local/sdnc-prom 10.0.0 ONAP SDNC Policy Driven Ownership Management
+local/sniro-emulator 10.0.0 ONAP Mock Sniro Emulator
+local/so 10.0.0 ONAP Service Orchestrator
+local/uui 10.0.0 ONAP uui
+local/vfc 10.0.0 ONAP Virtual Function Controller (VF-C)
+local/vid 10.0.0 ONAP Virtual Infrastructure Deployment
+local/vnfsdk 10.0.0 ONAP VNF SDK
diff --git a/docs/oom_developer_guide.rst b/docs/oom_developer_guide.rst
index 552aea25a7..05cdca1c46 100644
--- a/docs/oom_developer_guide.rst
+++ b/docs/oom_developer_guide.rst
@@ -85,7 +85,6 @@ The top level of the ONAP charts is shown below:
common
├── cassandra
│   ├── Chart.yaml
- │   ├── requirements.yaml
│   ├── resources
│   │   ├── config
│   │   │   └── docker-entrypoint.sh
@@ -121,7 +120,6 @@ The top level of the ONAP charts is shown below:
├── ...
└── postgres-legacy
   ├── Chart.yaml
-   ├── requirements.yaml
├── charts
└── configs
@@ -137,7 +135,6 @@ All of the ONAP components have charts that follow the pattern shown below:
name-of-my-component
├── Chart.yaml
- ├── requirements.yaml
├── component
│   └── subcomponent-folder
├── charts
@@ -182,7 +179,7 @@ This choice is done in root `values.yaml`:
component2:
enabled: true
-Then in `requirements.yaml`, you'll use these values:
+Then in `Chart.yaml` dependencies section, you'll use these values:
.. code-block:: yaml
diff --git a/docs/oom_quickstart_guide.rst b/docs/oom_quickstart_guide.rst
index 6b91b2ca42..79a30567fb 100644
--- a/docs/oom_quickstart_guide.rst
+++ b/docs/oom_quickstart_guide.rst
@@ -28,6 +28,7 @@ where <BRANCH> can be an official release tag, such as
* 7.0.0 for Guilin
* 8.0.0 for Honolulu
* 9.0.0 for Istanbul
+* 10.0.0 for Jakarta
**Step 2.** Install Helm Plugins required to deploy ONAP::
diff --git a/docs/oom_user_guide.rst b/docs/oom_user_guide.rst
index 74f8c57f6e..019d84363f 100644
--- a/docs/oom_user_guide.rst
+++ b/docs/oom_user_guide.rst
@@ -1,7 +1,7 @@
.. This work is licensed under a Creative Commons Attribution 4.0
.. International License.
.. http://creativecommons.org/licenses/by/4.0
-.. Copyright 2018-2020 Amdocs, Bell Canada, Orange, Samsung
+.. Copyright 2018-2021 Amdocs, Bell Canada, Orange, Samsung, Nordix Foundation
.. _oom_user_guide:
.. Links
@@ -118,7 +118,7 @@ stable which should be removed to avoid confusion::
To prepare your system for an installation of ONAP, you'll need to::
- > git clone -b guilin --recurse-submodules -j2 http://gerrit.onap.org/r/oom
+ > git clone -b jakarta --recurse-submodules -j2 http://gerrit.onap.org/r/oom
> cd oom/kubernetes
@@ -156,12 +156,12 @@ system, and looks for matches::
> helm search repo local
NAME VERSION DESCRIPTION
- local/appc 2.0.0 Application Controller
- local/clamp 2.0.0 ONAP Clamp
- local/common 2.0.0 Common templates for inclusion in other charts
- local/onap 2.0.0 Open Network Automation Platform (ONAP)
- local/robot 2.0.0 A helm Chart for kubernetes-ONAP Robot
- local/so 2.0.0 ONAP Service Orchestrator
+ local/appc 10.0.0 Application Controller
+ local/clamp 10.0.0 ONAP Clamp
+ local/common 10.0.0 Common templates for inclusion in other charts
+ local/onap 10.0.0 Open Network Automation Platform (ONAP)
+ local/robot 10.0.0 A helm Chart for kubernetes-ONAP Robot
+ local/so 10.0.0 ONAP Service Orchestrator
In any case, setup of the Helm repository is a one time activity.
@@ -204,7 +204,7 @@ deployment::
To install a specific version of a single ONAP component (`so` in this example)
with the given release name enter::
- > helm deploy so onap/so --version 9.0.0 --set global.masterPassword=password --set global.flavor=unlimited --namespace onap
+ > helm deploy so onap/so --version 10.0.0 --set global.masterPassword=password --set global.flavor=unlimited --namespace onap
.. note::
The dependent components should be installed for component being installed
@@ -244,9 +244,9 @@ precedence of all.
oValues [label="values.yaml"]
demo [label="onap-demo.yaml"]
prod [label="onap-production.yaml"]
- oReq [label="requirements.yaml"]
+ oReq [label="Chart.yaml"]
soValues [label="values.yaml"]
- soReq [label="requirements.yaml"]
+ soReq [label="Chart.yaml"]
mdValues [label="values.yaml"]
}
{
@@ -319,27 +319,23 @@ To deploy ONAP with this environment file, enter::
.. include:: environments_onap_demo.yaml
:code: yaml
-When deploying all of ONAP a requirements.yaml file control which and what
-version of the ONAP components are included. Here is an excerpt of this
-file:
+When deploying all of ONAP, the dependencies section of the Chart.yaml file
+controls which and what version of the ONAP components are included.
+Here is an excerpt of this file:
.. code-block:: yaml
- # Referencing a named repo called 'local'.
- # Can add this repo by running commands like:
- # > helm serve
- # > helm repo add local http://127.0.0.1:8879
dependencies:
<...>
- name: so
- version: ~9.0.0
+ version: ~10.0.0
repository: '@local'
condition: so.enabled
<...>
-The ~ operator in the `so` version value indicates that the latest "8.X.X"
+The ~ operator in the `so` version value indicates that the latest "10.X.X"
version of `so` shall be used thus allowing the chart to allow for minor
-upgrades that don't impact the so API; hence, version 8.0.1 will be installed
+upgrades that don't impact the so API; hence, version 10.0.1 will be installed
in this case.
The onap/resources/environment/dev.yaml (see the excerpt below) enables
@@ -562,10 +558,10 @@ Below is the example for the same::
> helm list
NAME REVISION UPDATED STATUS CHART APP VERSION NAMESPACE
- dev 1 Wed Oct 14 13:49:52 2020 DEPLOYED onap-9.0.0 Istanbul onap
- dev-cassandra 5 Thu Oct 15 14:45:34 2020 DEPLOYED cassandra-9.0.0 onap
- dev-contrib 1 Wed Oct 14 13:52:53 2020 DEPLOYED contrib-9.0.0 onap
- dev-mariadb-galera 1 Wed Oct 14 13:55:56 2020 DEPLOYED mariadb-galera-9.0.0 onap
+ dev 1 Wed Oct 14 13:49:52 2020 DEPLOYED onap-10.0.0 Jakarta onap
+ dev-cassandra 5 Thu Oct 15 14:45:34 2020 DEPLOYED cassandra-10.0.0 onap
+ dev-contrib 1 Wed Oct 14 13:52:53 2020 DEPLOYED contrib-10.0.0 onap
+ dev-mariadb-galera 1 Wed Oct 14 13:55:56 2020 DEPLOYED mariadb-galera-10.0.0 onap
Here the Name column shows the RELEASE NAME, In our case we want to try the
scale operation on cassandra, thus the RELEASE NAME would be dev-cassandra.
@@ -579,10 +575,10 @@ Below is the example for the same::
> helm search cassandra
NAME CHART VERSION APP VERSION DESCRIPTION
- local/cassandra 9.0.0 ONAP cassandra
- local/portal-cassandra 9.0.0 Portal cassandra
- local/aaf-cass 9.0.0 ONAP AAF cassandra
- local/sdc-cs 9.0.0 ONAP Service Design and Creation Cassandra
+ local/cassandra 10.0.0 ONAP cassandra
+ local/portal-cassandra 10.0.0 Portal cassandra
+ local/aaf-cass 10.0.0 ONAP AAF cassandra
+ local/sdc-cs 10.0.0 ONAP Service Design and Creation Cassandra
Here the Name column shows the chart name. As we want to try the scale
operation for cassandra, thus the corresponding chart name is local/cassandra
@@ -644,7 +640,7 @@ Prior to doing an upgrade, determine of the status of the deployed charts::
> helm list
NAME REVISION UPDATED STATUS CHART NAMESPACE
- so 1 Mon Feb 5 10:05:22 2020 DEPLOYED so-9.0.0 onap
+ so 1 Mon Feb 5 10:05:22 2020 DEPLOYED so-10.0.0 onap
When upgrading a cluster a parameter controls the minimum size of the cluster
during the upgrade while another parameter controls the maximum number of nodes
@@ -680,8 +676,8 @@ To fetch release history enter::
> helm history so
REVISION UPDATED STATUS CHART DESCRIPTION
- 1 Mon Feb 5 10:05:22 2020 SUPERSEDED so-8.0.0 Install complete
- 2 Mon Feb 5 10:10:55 2020 DEPLOYED so-9.0.0 Upgrade complete
+ 1 Mon Feb 5 10:05:22 2020 SUPERSEDED so-9.0.0 Install complete
+ 2 Mon Feb 5 10:10:55 2020 DEPLOYED so-10.0.0 Upgrade complete
Unfortunately, not all upgrades are successful. In recognition of this the
lineup of pods within an ONAP deployment is tagged such that an administrator
@@ -703,9 +699,9 @@ For example, to roll-back back to previous system revision enter::
> helm history so
REVISION UPDATED STATUS CHART DESCRIPTION
- 1 Mon Feb 5 10:05:22 2020 SUPERSEDED so-8.0.0 Install complete
- 2 Mon Feb 5 10:10:55 2020 SUPERSEDED so-9.0.0 Upgrade complete
- 3 Mon Feb 5 10:14:32 2020 DEPLOYED so-8.0.0 Rollback to 1
+ 1 Mon Feb 5 10:05:22 2020 SUPERSEDED so-9.0.0 Install complete
+ 2 Mon Feb 5 10:10:55 2020 SUPERSEDED so-10.0.0 Upgrade complete
+ 3 Mon Feb 5 10:14:32 2020 DEPLOYED so-9.0.0 Rollback to 1
.. note::
diff --git a/kubernetes/Makefile b/kubernetes/Makefile
index d994397269..f96a32a4f0 100644
--- a/kubernetes/Makefile
+++ b/kubernetes/Makefile
@@ -1,4 +1,5 @@
# Copyright © 2017 Amdocs, Bell Canada
+# Modification copyright (C) 2021 Nordix Foundation
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -21,16 +22,11 @@ PACKAGE_DIR := $(OUTPUT_DIR)/packages
SECRET_DIR := $(OUTPUT_DIR)/secrets
HELM_BIN := helm
-# Helm v2 and helm v3 uses different version format so we first try in helm v3 format
-# and if it fails then we fallback to helm v2 one
HELM_VER := $(shell $(HELM_BIN) version --template "{{.Version}}" 2>/dev/null)
-ifneq "$(findstring v3,$(HELM_VER))" "v3"
- HELM_VER := $(shell $(HELM_BIN) version -c --template "{{.Client.SemVer}}")
-endif
# use this if you would like to push onap charts to repo with other name
# WARNING: Helm v3+ only
-# WARNING: Make sure to edit also requirements files
+# WARNING: Make sure to edit also Chart files
HELM_REPO := local
ifneq ($(SKIP_LINT),TRUE)
@@ -61,9 +57,9 @@ $(SUBMODS):
@make package-$@
submod-%:
- @make $*/requirements.yaml
+ @make $*/Chart.yaml
-%/requirements.yaml:
+%/Chart.yaml:
$(error Submodule $* needs to be retrieved from gerrit. See https://wiki.onap.org/display/DW/OOM+-+Development+workflow+after+code+transfer+to+tech+teams ); fi
print_helm_bin:
@@ -73,22 +69,17 @@ make-%:
@if [ -f $*/Makefile ]; then make -C $*; fi
dep-%: make-%
- @if [ -f $*/requirements.yaml ]; then $(HELM_BIN) dep up $*; fi
+ @if [ -f $*/Chart.yaml ]; then $(HELM_BIN) dep up $*; fi
lint-%: dep-%
@if [ -f $*/Chart.yaml ]; then $(HELM_LINT_CMD) $*; fi
package-%: lint-%
@mkdir -p $(PACKAGE_DIR)
-ifeq "$(findstring v3,$(HELM_VER))" "v3"
@if [ -f $*/Chart.yaml ]; then PACKAGE_NAME=$$($(HELM_BIN) package -d $(PACKAGE_DIR) $* | cut -d":" -f2) && $(HELM_BIN) push -f $$PACKAGE_NAME $(HELM_REPO); fi
-else
- @if [ -f $*/Chart.yaml ]; then $(HELM_BIN) package -d $(PACKAGE_DIR) $*; fi
- @$(HELM_BIN) repo index $(PACKAGE_DIR)
-endif
clean:
- @rm -f */requirements.lock
+ @rm -f */Chart.lock
@find . -type f -name '*.tgz' -delete
@rm -rf $(PACKAGE_DIR)/*
@@ -96,28 +87,11 @@ clean:
plugins:
@cp -R helm $(PACKAGE_DIR)/
-# start up a local helm repo to serve up helm chart packages
-# WARNING: Only helm < v3 supported
-repo:
- @mkdir -p $(PACKAGE_DIR)
- @$(HELM_BIN) serve --repo-path $(PACKAGE_DIR) &
- @sleep 3
- @$(HELM_BIN) repo index $(PACKAGE_DIR)
- @$(HELM_BIN) repo add local http://127.0.0.1:8879
-
-# stop local helm repo
-# WARNING: Only helm < v3 supported
-repo-stop:
- @pkill $(HELM_BIN)
- @$(HELM_BIN) repo remove local
-
check-for-staging-images:
$(ROOT_DIR)/contrib/tools/check-for-staging-images.sh
helm-repo-update:
-ifeq "$(findstring v3,$(HELM_VER))" "v3"
@$(HELM_BIN) repo update
-endif
%:
@:
diff --git a/kubernetes/a1policymanagement/Chart.yaml b/kubernetes/a1policymanagement/Chart.yaml
index 6d0049e927..4c9f519e8d 100644
--- a/kubernetes/a1policymanagement/Chart.yaml
+++ b/kubernetes/a1policymanagement/Chart.yaml
@@ -1,6 +1,7 @@
################################################################################
# Copyright (c) 2020 Nordix Foundation. #
# Modifications Copyright © 2021 Orange #
+# Modifications Copyright © 2021 Nordix Foundation #
# #
# Licensed under the Apache License, Version 2.0 (the "License"); #
# you may not use this file except in compliance with the License. #
@@ -15,8 +16,22 @@
# limitations under the License. #
################################################################################
-apiVersion: v1
+apiVersion: v2
appVersion: "1.0.0"
description: A Helm chart for A1 Policy Management Service
name: a1policymanagement
-version: 9.0.0
+version: 10.0.0
+
+dependencies:
+ - name: common
+ version: ~10.x-0
+ repository: '@local'
+ - name: certInitializer
+ version: ~10.x-0
+ repository: '@local'
+ - name: repositoryGenerator
+ version: ~10.x-0
+ repository: '@local'
+ - name: serviceAccount
+ version: ~10.x-0
+ repository: '@local'
diff --git a/kubernetes/a1policymanagement/requirements.yaml b/kubernetes/a1policymanagement/requirements.yaml
deleted file mode 100644
index 12a8b12f2c..0000000000
--- a/kubernetes/a1policymanagement/requirements.yaml
+++ /dev/null
@@ -1,30 +0,0 @@
-################################################################################
-# Copyright (c) 2020 Nordix Foundation. #
-# Modifications Copyright © 2021 Orange #
-# #
-# Licensed under the Apache License, Version 2.0 (the "License"); #
-# you may not use this file except in compliance with the License. #
-# You may obtain a copy of the License at #
-# #
-# http://www.apache.org/licenses/LICENSE-2.0 #
-# #
-# Unless required by applicable law or agreed to in writing, software #
-# distributed under the License is distributed on an "AS IS" BASIS, #
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. #
-# See the License for the specific language governing permissions and #
-# limitations under the License. #
-################################################################################
-
-dependencies:
- - name: common
- version: ~9.x-0
- repository: '@local'
- - name: certInitializer
- version: ~9.x-0
- repository: '@local'
- - name: repositoryGenerator
- version: ~9.x-0
- repository: '@local'
- - name: serviceAccount
- version: ~9.x-0
- repository: '@local'
diff --git a/kubernetes/a1policymanagement/templates/statefulset.yaml b/kubernetes/a1policymanagement/templates/statefulset.yaml
index 1d25f31e7f..0114b30158 100644
--- a/kubernetes/a1policymanagement/templates/statefulset.yaml
+++ b/kubernetes/a1policymanagement/templates/statefulset.yaml
@@ -28,6 +28,8 @@ spec:
metadata:
labels: {{- include "common.labels" . | nindent 8 }}
spec:
+ imagePullSecrets:
+ - name: "{{ include "common.namespace" . }}-docker-registry-key"
initContainers: {{ include "common.certInitializer.initContainer" . | nindent 6 }}
- name: {{ include "common.name" . }}-bootstrap-config
image: {{ include "repositoryGenerator.image.envsubst" . }}
@@ -58,7 +60,7 @@ spec:
name: config
containers:
- name: {{ include "common.name" . }}-update-config
- image: "{{ .Values.global.envsubstImage }}"
+ image: {{ include "repositoryGenerator.image.envsubst" . }}
imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
securityContext:
runAsGroup: {{ .Values.groupID }}
diff --git a/kubernetes/aaf/Chart.yaml b/kubernetes/aaf/Chart.yaml
index 0a4168b7da..2c51172dfb 100644
--- a/kubernetes/aaf/Chart.yaml
+++ b/kubernetes/aaf/Chart.yaml
@@ -1,6 +1,7 @@
# Copyright © 2018 ZTE
# Modifications Copyright © 2018 AT&T, Amdocs, Bell Canada
# Modifications Copyright © 2021 Orange
+# Modifications Copyright © 2021 Nordix Foundation
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -14,7 +15,49 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-apiVersion: v1
+apiVersion: v2
description: ONAP Application Authorization Framework
name: aaf
-version: 9.0.0
+version: 10.0.0
+
+dependencies:
+ - name: aaf-cass
+ version: ~10.x-0
+ repository: 'file://components/aaf-cass'
+ condition: aaf-authz.enabled
+ - name: aaf-cm
+ version: ~10.x-0
+ repository: 'file://components/aaf-cm'
+ condition: aaf-authz.enabled
+ - name: aaf-fs
+ version: ~10.x-0
+ repository: 'file://components/aaf-fs'
+ condition: aaf-authz.enabled
+ - name: aaf-gui
+ version: ~10.x-0
+ repository: 'file://components/aaf-gui'
+ condition: aaf-authz.enabled
+ - name: aaf-hello
+ version: ~10.x-0
+ repository: 'file://components/aaf-hello'
+ condition: aaf-hello.enabled
+ - name: aaf-locate
+ version: ~10.x-0
+ repository: 'file://components/aaf-locate'
+ condition: aaf-authz.enabled
+ - name: aaf-oauth
+ version: ~10.x-0
+ repository: 'file://components/aaf-oauth'
+ condition: aaf-authz.enabled
+ - name: aaf-service
+ version: ~10.x-0
+ repository: 'file://components/aaf-service'
+ condition: aaf-authz.enabled
+ - name: aaf-sms
+ version: ~10.x-0
+ repository: 'file://components/aaf-sms'
+ condition: aaf-sms.enabled
+ - name: aaf-sshsm
+ version: ~10.x-0
+ repository: 'file://components/aaf-sshsm'
+ condition: aaf-sshsm.enabled
diff --git a/kubernetes/aaf/Makefile b/kubernetes/aaf/Makefile
index 764533e624..dbb84a1eff 100644
--- a/kubernetes/aaf/Makefile
+++ b/kubernetes/aaf/Makefile
@@ -33,7 +33,7 @@ make-%:
@if [ -f $*/Makefile ]; then make -C $*; fi
dep-%: make-%
- @if [ -f $*/requirements.yaml ]; then $(HELM_BIN) dep up $*; fi
+ @if [ -f $*/Chart.yaml ]; then $(HELM_BIN) dep up $*; fi
lint-%: dep-%
@if [ -f $*/Chart.yaml ]; then $(HELM_BIN) lint $*; fi
@@ -44,7 +44,7 @@ package-%: lint-%
@$(HELM_BIN) repo index $(PACKAGE_DIR)
clean:
- @rm -f */requirements.lock
+ @rm -f */Chart.lock
@rm -f *tgz */charts/*tgz
@rm -rf $(PACKAGE_DIR)
%:
diff --git a/kubernetes/aaf/components/Makefile b/kubernetes/aaf/components/Makefile
index bf267b7720..f4c9784bc4 100644
--- a/kubernetes/aaf/components/Makefile
+++ b/kubernetes/aaf/components/Makefile
@@ -33,7 +33,7 @@ make-%:
@if [ -f $*/Makefile ]; then make -C $*; fi
dep-%: make-%
- @if [ -f $*/requirements.yaml ]; then $(HELM_BIN) dep up $*; fi
+ @if [ -f $*/Chart.yaml ]; then $(HELM_BIN) dep up $*; fi
lint-%: dep-%
@if [ -f $*/Chart.yaml ]; then $(HELM_BIN) lint $*; fi
@@ -44,7 +44,7 @@ package-%: lint-%
@$(HELM_BIN) repo index $(PACKAGE_DIR)
clean:
- @rm -f */requirements.lock
+ @rm -f */Chart.lock
@rm -f *tgz */charts/*tgz
@rm -rf $(PACKAGE_DIR)
%:
diff --git a/kubernetes/aaf/components/aaf-cass/Chart.yaml b/kubernetes/aaf/components/aaf-cass/Chart.yaml
index ab6858ce8e..3f1394cc87 100644
--- a/kubernetes/aaf/components/aaf-cass/Chart.yaml
+++ b/kubernetes/aaf/components/aaf-cass/Chart.yaml
@@ -1,5 +1,6 @@
# Copyright © 2018 Amdocs, Bell Canada
# Modifications Copyright © 2021 Orange
+# Modifications Copyright © 2021 Nordix Foundation
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -13,7 +14,15 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-apiVersion: v1
+apiVersion: v2
description: ONAP AAF cassandra
name: aaf-cass
-version: 9.0.0
+version: 10.0.0
+
+dependencies:
+ - name: common
+ version: ~10.x-0
+ repository: '@local'
+ - name: repositoryGenerator
+ version: ~10.x-0
+ repository: '@local'
diff --git a/kubernetes/aaf/components/aaf-cass/requirements.yaml b/kubernetes/aaf/components/aaf-cass/requirements.yaml
deleted file mode 100644
index ac7f3c6875..0000000000
--- a/kubernetes/aaf/components/aaf-cass/requirements.yaml
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright © 2020-2021 Orange
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-dependencies:
- - name: common
- version: ~9.x-0
- repository: '@local'
- - name: repositoryGenerator
- version: ~9.x-0
- repository: '@local'
diff --git a/kubernetes/aaf/components/aaf-cm/Chart.yaml b/kubernetes/aaf/components/aaf-cm/Chart.yaml
index 8d0566eed9..ab91b7252b 100644
--- a/kubernetes/aaf/components/aaf-cm/Chart.yaml
+++ b/kubernetes/aaf/components/aaf-cm/Chart.yaml
@@ -1,6 +1,7 @@
# Copyright © 2017 Amdocs, Bell Canada
# Modifications Copyright © 2018 AT&T, ZTE
# Modifications Copyright © 2021 Orange
+# Modifications Copyright © 2021 Nordix Foundation
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -14,7 +15,18 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-apiVersion: v1
+apiVersion: v2
description: ONAP AAF Certificate Manager
name: aaf-cm
-version: 9.0.0
+version: 10.0.0
+
+dependencies:
+ - name: common
+ version: ~10.x-0
+ repository: '@local'
+ - name: repositoryGenerator
+ version: ~10.x-0
+ repository: '@local'
+ - name: aaf-templates
+ version: ~10.x-0
+ repository: 'file://../aaf-templates'
diff --git a/kubernetes/aaf/components/aaf-cm/requirements.yaml b/kubernetes/aaf/components/aaf-cm/requirements.yaml
deleted file mode 100644
index 5086cc977c..0000000000
--- a/kubernetes/aaf/components/aaf-cm/requirements.yaml
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright © 2020-2021 Orange
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-dependencies:
- - name: common
- version: ~9.x-0
- repository: '@local'
- - name: repositoryGenerator
- version: ~9.x-0
- repository: '@local'
- - name: aaf-templates
- version: ~9.x-0
- repository: 'file://../aaf-templates'
diff --git a/kubernetes/aaf/components/aaf-fs/Chart.yaml b/kubernetes/aaf/components/aaf-fs/Chart.yaml
index 28c05e71b1..72b7133f24 100644
--- a/kubernetes/aaf/components/aaf-fs/Chart.yaml
+++ b/kubernetes/aaf/components/aaf-fs/Chart.yaml
@@ -1,5 +1,6 @@
# Copyright © 2017 Amdocs, Bell Canada
# Modifications Copyright © 2021 Orange
+# Modifications Copyright © 2021 Nordix Foundation
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -13,7 +14,18 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-apiVersion: v1
+apiVersion: v2
description: ONAP AAF File Server
name: aaf-fs
-version: 9.0.0
+version: 10.0.0
+
+dependencies:
+ - name: common
+ version: ~10.x-0
+ repository: '@local'
+ - name: repositoryGenerator
+ version: ~10.x-0
+ repository: '@local'
+ - name: aaf-templates
+ version: ~10.x-0
+ repository: 'file://../aaf-templates'
diff --git a/kubernetes/aaf/components/aaf-fs/requirements.yaml b/kubernetes/aaf/components/aaf-fs/requirements.yaml
deleted file mode 100644
index 5086cc977c..0000000000
--- a/kubernetes/aaf/components/aaf-fs/requirements.yaml
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright © 2020-2021 Orange
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-dependencies:
- - name: common
- version: ~9.x-0
- repository: '@local'
- - name: repositoryGenerator
- version: ~9.x-0
- repository: '@local'
- - name: aaf-templates
- version: ~9.x-0
- repository: 'file://../aaf-templates'
diff --git a/kubernetes/aaf/components/aaf-gui/Chart.yaml b/kubernetes/aaf/components/aaf-gui/Chart.yaml
index 81a51e686c..be01174cea 100644
--- a/kubernetes/aaf/components/aaf-gui/Chart.yaml
+++ b/kubernetes/aaf/components/aaf-gui/Chart.yaml
@@ -1,5 +1,6 @@
# Copyright © 2017 Amdocs, Bell Canada
# Modifications Copyright © 2021 Orange
+# Modifications Copyright © 2021 Nordix Foundation
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -13,7 +14,18 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-apiVersion: v1
+apiVersion: v2
description: ONAP AAF GUI
name: aaf-gui
-version: 9.0.0
+version: 10.0.0
+
+dependencies:
+ - name: common
+ version: ~10.x-0
+ repository: '@local'
+ - name: repositoryGenerator
+ version: ~10.x-0
+ repository: '@local'
+ - name: aaf-templates
+ version: ~10.x-0
+ repository: 'file://../aaf-templates'
diff --git a/kubernetes/aaf/components/aaf-gui/requirements.yaml b/kubernetes/aaf/components/aaf-gui/requirements.yaml
deleted file mode 100644
index 5086cc977c..0000000000
--- a/kubernetes/aaf/components/aaf-gui/requirements.yaml
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright © 2020-2021 Orange
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-dependencies:
- - name: common
- version: ~9.x-0
- repository: '@local'
- - name: repositoryGenerator
- version: ~9.x-0
- repository: '@local'
- - name: aaf-templates
- version: ~9.x-0
- repository: 'file://../aaf-templates'
diff --git a/kubernetes/aaf/components/aaf-hello/Chart.yaml b/kubernetes/aaf/components/aaf-hello/Chart.yaml
index 872491428b..5a368d5430 100644
--- a/kubernetes/aaf/components/aaf-hello/Chart.yaml
+++ b/kubernetes/aaf/components/aaf-hello/Chart.yaml
@@ -1,5 +1,6 @@
# Copyright © 2017 Amdocs, Bell Canada
# Modifications Copyright © 2021 Orange
+# Modifications Copyright © 2021 Nordix Foundation
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -13,7 +14,18 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-apiVersion: v1
+apiVersion: v2
description: ONAP AAF Hello
name: aaf-hello
-version: 9.0.0
+version: 10.0.0
+
+dependencies:
+ - name: common
+ version: ~10.x-0
+ repository: '@local'
+ - name: repositoryGenerator
+ version: ~10.x-0
+ repository: '@local'
+ - name: aaf-templates
+ version: ~10.x-0
+ repository: 'file://../aaf-templates'
diff --git a/kubernetes/aaf/components/aaf-hello/requirements.yaml b/kubernetes/aaf/components/aaf-hello/requirements.yaml
deleted file mode 100644
index 5086cc977c..0000000000
--- a/kubernetes/aaf/components/aaf-hello/requirements.yaml
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright © 2020-2021 Orange
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-dependencies:
- - name: common
- version: ~9.x-0
- repository: '@local'
- - name: repositoryGenerator
- version: ~9.x-0
- repository: '@local'
- - name: aaf-templates
- version: ~9.x-0
- repository: 'file://../aaf-templates'
diff --git a/kubernetes/aaf/components/aaf-locate/Chart.yaml b/kubernetes/aaf/components/aaf-locate/Chart.yaml
index 947284df14..15ac5ee554 100644
--- a/kubernetes/aaf/components/aaf-locate/Chart.yaml
+++ b/kubernetes/aaf/components/aaf-locate/Chart.yaml
@@ -1,5 +1,6 @@
# Copyright © 2017 Amdocs, Bell Canada
# Modifications Copyright © 2021 Orange
+# Modifications Copyright © 2021 Nordix Foundation
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -13,7 +14,18 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-apiVersion: v1
+apiVersion: v2
description: ONAP AAF Locate
name: aaf-locate
-version: 9.0.0
+version: 10.0.0
+
+dependencies:
+ - name: common
+ version: ~10.x-0
+ repository: '@local'
+ - name: repositoryGenerator
+ version: ~10.x-0
+ repository: '@local'
+ - name: aaf-templates
+ version: ~10.x-0
+ repository: 'file://../aaf-templates'
diff --git a/kubernetes/aaf/components/aaf-locate/requirements.yaml b/kubernetes/aaf/components/aaf-locate/requirements.yaml
deleted file mode 100644
index 5086cc977c..0000000000
--- a/kubernetes/aaf/components/aaf-locate/requirements.yaml
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright © 2020-2021 Orange
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-dependencies:
- - name: common
- version: ~9.x-0
- repository: '@local'
- - name: repositoryGenerator
- version: ~9.x-0
- repository: '@local'
- - name: aaf-templates
- version: ~9.x-0
- repository: 'file://../aaf-templates'
diff --git a/kubernetes/aaf/components/aaf-oauth/Chart.yaml b/kubernetes/aaf/components/aaf-oauth/Chart.yaml
index 3c48c63cbf..31239e9f68 100644
--- a/kubernetes/aaf/components/aaf-oauth/Chart.yaml
+++ b/kubernetes/aaf/components/aaf-oauth/Chart.yaml
@@ -1,5 +1,6 @@
# Copyright © 2017 Amdocs, Bell Canada
# Modifications Copyright © 2021 Orange
+# Modifications Copyright © 2021 Nordix Foundation
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -13,7 +14,18 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-apiVersion: v1
+apiVersion: v2
description: ONAP AAF OAuth
name: aaf-oauth
-version: 9.0.0
+version: 10.0.0
+
+dependencies:
+ - name: common
+ version: ~10.x-0
+ repository: '@local'
+ - name: repositoryGenerator
+ version: ~10.x-0
+ repository: '@local'
+ - name: aaf-templates
+ version: ~10.x-0
+ repository: 'file://../aaf-templates'
diff --git a/kubernetes/aaf/components/aaf-oauth/requirements.yaml b/kubernetes/aaf/components/aaf-oauth/requirements.yaml
deleted file mode 100644
index 5086cc977c..0000000000
--- a/kubernetes/aaf/components/aaf-oauth/requirements.yaml
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright © 2020-2021 Orange
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-dependencies:
- - name: common
- version: ~9.x-0
- repository: '@local'
- - name: repositoryGenerator
- version: ~9.x-0
- repository: '@local'
- - name: aaf-templates
- version: ~9.x-0
- repository: 'file://../aaf-templates'
diff --git a/kubernetes/aaf/components/aaf-service/Chart.yaml b/kubernetes/aaf/components/aaf-service/Chart.yaml
index 33df46f21e..5cd6cc5a83 100644
--- a/kubernetes/aaf/components/aaf-service/Chart.yaml
+++ b/kubernetes/aaf/components/aaf-service/Chart.yaml
@@ -1,5 +1,6 @@
# Copyright © 2017 Amdocs, Bell Canada
# Modifications Copyright © 2021 Orange
+# Modifications Copyright © 2021 Nordix Foundation
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -13,7 +14,18 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-apiVersion: v1
+apiVersion: v2
description: ONAP AAF Service
name: aaf-service
-version: 9.0.0
+version: 10.0.0
+
+dependencies:
+ - name: common
+ version: ~10.x-0
+ repository: '@local'
+ - name: repositoryGenerator
+ version: ~10.x-0
+ repository: '@local'
+ - name: aaf-templates
+ version: ~10.x-0
+ repository: 'file://../aaf-templates' \ No newline at end of file
diff --git a/kubernetes/aaf/components/aaf-service/requirements.yaml b/kubernetes/aaf/components/aaf-service/requirements.yaml
deleted file mode 100644
index 5086cc977c..0000000000
--- a/kubernetes/aaf/components/aaf-service/requirements.yaml
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright © 2020-2021 Orange
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-dependencies:
- - name: common
- version: ~9.x-0
- repository: '@local'
- - name: repositoryGenerator
- version: ~9.x-0
- repository: '@local'
- - name: aaf-templates
- version: ~9.x-0
- repository: 'file://../aaf-templates'
diff --git a/kubernetes/aaf/components/aaf-sms/Chart.yaml b/kubernetes/aaf/components/aaf-sms/Chart.yaml
index 3e315fbd40..c3e1692dc9 100644
--- a/kubernetes/aaf/components/aaf-sms/Chart.yaml
+++ b/kubernetes/aaf/components/aaf-sms/Chart.yaml
@@ -1,5 +1,6 @@
# Copyright 2018 Intel Corporation, Inc
# Modifications Copyright © 2021 Orange
+# Modifications Copyright © 2021 Nordix Foundation
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -13,7 +14,24 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-apiVersion: v1
+apiVersion: v2
description: ONAP Secret Management Service
name: aaf-sms
-version: 9.0.0
+version: 10.0.0
+
+dependencies:
+ - name: common
+ version: ~10.x-0
+ repository: '@local'
+ - name: repositoryGenerator
+ version: ~10.x-0
+ repository: '@local'
+ - name: certInitializer
+ version: ~10.x-0
+ repository: '@local'
+ - name: aaf-sms-quorumclient
+ version: ~10.x-0
+ repository: 'file://components/aaf-sms-quorumclient'
+ - name: aaf-sms-vault
+ version: ~10.x-0
+ repository: 'file://components/aaf-sms-vault'
diff --git a/kubernetes/aaf/components/aaf-sms/Makefile b/kubernetes/aaf/components/aaf-sms/Makefile
index 4c79718d02..51d7de122c 100644
--- a/kubernetes/aaf/components/aaf-sms/Makefile
+++ b/kubernetes/aaf/components/aaf-sms/Makefile
@@ -33,7 +33,7 @@ make-%:
@if [ -f $*/Makefile ]; then make -C $*; fi
dep-%: make-%
- @if [ -f $*/requirements.yaml ]; then $(HELM_BIN) dep up $*; fi
+ @if [ -f $*/Chart.yaml ]; then $(HELM_BIN) dep up $*; fi
lint-%: dep-%
@if [ -f $*/Chart.yaml ]; then $(HELM_BIN) lint $*; fi
@@ -44,7 +44,7 @@ package-%: lint-%
@$(HELM_BIN) repo index $(PACKAGE_DIR)
clean:
- @rm -f */requirements.lock
+ @rm -f */Chart.lock
@rm -f *tgz */charts/*tgz
@rm -rf $(PACKAGE_DIR)
%:
diff --git a/kubernetes/aaf/components/aaf-sms/components/Makefile b/kubernetes/aaf/components/aaf-sms/components/Makefile
index bf267b7720..f4c9784bc4 100644
--- a/kubernetes/aaf/components/aaf-sms/components/Makefile
+++ b/kubernetes/aaf/components/aaf-sms/components/Makefile
@@ -33,7 +33,7 @@ make-%:
@if [ -f $*/Makefile ]; then make -C $*; fi
dep-%: make-%
- @if [ -f $*/requirements.yaml ]; then $(HELM_BIN) dep up $*; fi
+ @if [ -f $*/Chart.yaml ]; then $(HELM_BIN) dep up $*; fi
lint-%: dep-%
@if [ -f $*/Chart.yaml ]; then $(HELM_BIN) lint $*; fi
@@ -44,7 +44,7 @@ package-%: lint-%
@$(HELM_BIN) repo index $(PACKAGE_DIR)
clean:
- @rm -f */requirements.lock
+ @rm -f */Chart.lock
@rm -f *tgz */charts/*tgz
@rm -rf $(PACKAGE_DIR)
%:
diff --git a/kubernetes/aaf/components/aaf-sms/components/aaf-sms-quorumclient/Chart.yaml b/kubernetes/aaf/components/aaf-sms/components/aaf-sms-quorumclient/Chart.yaml
index 2b879571ad..b777223e89 100644
--- a/kubernetes/aaf/components/aaf-sms/components/aaf-sms-quorumclient/Chart.yaml
+++ b/kubernetes/aaf/components/aaf-sms/components/aaf-sms-quorumclient/Chart.yaml
@@ -1,5 +1,6 @@
# Copyright 2018 Intel Corporation, Inc
# Modifications Copyright © 2021 Orange
+# Modifications Copyright © 2021 Nordix Foundation
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -13,7 +14,15 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-apiVersion: v1
+apiVersion: v2
description: ONAP Secret Management Service Quorum Client
name: aaf-sms-quorumclient
-version: 9.0.0
+version: 10.0.0
+
+dependencies:
+ - name: common
+ version: ~10.x-0
+ repository: '@local'
+ - name: repositoryGenerator
+ version: ~10.x-0
+ repository: '@local'
diff --git a/kubernetes/aaf/components/aaf-sms/components/aaf-sms-quorumclient/requirements.yaml b/kubernetes/aaf/components/aaf-sms/components/aaf-sms-quorumclient/requirements.yaml
deleted file mode 100644
index ac7f3c6875..0000000000
--- a/kubernetes/aaf/components/aaf-sms/components/aaf-sms-quorumclient/requirements.yaml
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright © 2020-2021 Orange
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-dependencies:
- - name: common
- version: ~9.x-0
- repository: '@local'
- - name: repositoryGenerator
- version: ~9.x-0
- repository: '@local'
diff --git a/kubernetes/aaf/components/aaf-sms/components/aaf-sms-vault/Chart.yaml b/kubernetes/aaf/components/aaf-sms/components/aaf-sms-vault/Chart.yaml
index b05165e4da..b3935d4372 100644
--- a/kubernetes/aaf/components/aaf-sms/components/aaf-sms-vault/Chart.yaml
+++ b/kubernetes/aaf/components/aaf-sms/components/aaf-sms-vault/Chart.yaml
@@ -1,5 +1,6 @@
# Copyright 2018 Intel Corporation, Inc
# Modifications Copyright © 2021 Orange
+# Modifications Copyright © 2021 Nordix Foundation
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -13,8 +14,16 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-apiVersion: v1
+apiVersion: v2
description: Chart to launch Vault as SMS backend
name: aaf-sms-vault
appVersion: 0.9.5
-version: 9.0.0
+version: 10.0.0
+
+dependencies:
+ - name: common
+ version: ~10.x-0
+ repository: '@local'
+ - name: repositoryGenerator
+ version: ~10.x-0
+ repository: '@local'
diff --git a/kubernetes/aaf/components/aaf-sms/components/aaf-sms-vault/requirements.yaml b/kubernetes/aaf/components/aaf-sms/components/aaf-sms-vault/requirements.yaml
deleted file mode 100644
index ac7f3c6875..0000000000
--- a/kubernetes/aaf/components/aaf-sms/components/aaf-sms-vault/requirements.yaml
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright © 2020-2021 Orange
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-dependencies:
- - name: common
- version: ~9.x-0
- repository: '@local'
- - name: repositoryGenerator
- version: ~9.x-0
- repository: '@local'
diff --git a/kubernetes/aaf/components/aaf-sms/requirements.yaml b/kubernetes/aaf/components/aaf-sms/requirements.yaml
deleted file mode 100644
index 0cbd2a2edd..0000000000
--- a/kubernetes/aaf/components/aaf-sms/requirements.yaml
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright © 2020-2021 Orange
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-dependencies:
- - name: common
- version: ~9.x-0
- repository: '@local'
- - name: repositoryGenerator
- version: ~9.x-0
- repository: '@local'
- - name: certInitializer
- version: ~9.x-0
- repository: '@local'
- - name: aaf-sms-quorumclient
- version: ~9.x-0
- repository: 'file://components/aaf-sms-quorumclient'
- - name: aaf-sms-vault
- version: ~9.x-0
- repository: 'file://components/aaf-sms-vault'
diff --git a/kubernetes/aaf/components/aaf-sshsm/Chart.yaml b/kubernetes/aaf/components/aaf-sshsm/Chart.yaml
index 9bf0e7b47c..a7fd8f5fe2 100644
--- a/kubernetes/aaf/components/aaf-sshsm/Chart.yaml
+++ b/kubernetes/aaf/components/aaf-sshsm/Chart.yaml
@@ -1,5 +1,6 @@
# Copyright 2018 Intel Corporation, Inc
# Modifications Copyright © 2021 Orange
+# Modifications Copyright © 2021 Nordix Foundation
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -13,7 +14,27 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-apiVersion: v1
+apiVersion: v2
description: ONAP Hardware Security Components
name: aaf-sshsm
-version: 9.0.0
+version: 10.0.0
+
+dependencies:
+ - name: common
+ version: ~10.x-0
+ repository: '@local'
+ - name: repositoryGenerator
+ version: ~10.x-0
+ repository: '@local'
+ - name: aaf-sshsm-abrmd
+ version: ~10.x-0
+ repository: 'file://components/aaf-sshsm-abrmd'
+ condition: aaf-sshsm-abrmd.enabled
+ - name: aaf-sshsm-distcenter
+ version: ~10.x-0
+ repository: 'file://components/aaf-sshsm-distcenter'
+ condition: aaf-sshsm-distcenter.enabled
+ - name: aaf-sshsm-testca
+ version: ~10.x-0
+ repository: 'file://components/aaf-sshsm-testca'
+ condition: aaf-sshsm-testca.testca.enabled
diff --git a/kubernetes/aaf/components/aaf-sshsm/Makefile b/kubernetes/aaf/components/aaf-sshsm/Makefile
index 4c79718d02..51d7de122c 100644
--- a/kubernetes/aaf/components/aaf-sshsm/Makefile
+++ b/kubernetes/aaf/components/aaf-sshsm/Makefile
@@ -33,7 +33,7 @@ make-%:
@if [ -f $*/Makefile ]; then make -C $*; fi
dep-%: make-%
- @if [ -f $*/requirements.yaml ]; then $(HELM_BIN) dep up $*; fi
+ @if [ -f $*/Chart.yaml ]; then $(HELM_BIN) dep up $*; fi
lint-%: dep-%
@if [ -f $*/Chart.yaml ]; then $(HELM_BIN) lint $*; fi
@@ -44,7 +44,7 @@ package-%: lint-%
@$(HELM_BIN) repo index $(PACKAGE_DIR)
clean:
- @rm -f */requirements.lock
+ @rm -f */Chart.lock
@rm -f *tgz */charts/*tgz
@rm -rf $(PACKAGE_DIR)
%:
diff --git a/kubernetes/aaf/components/aaf-sshsm/components/Makefile b/kubernetes/aaf/components/aaf-sshsm/components/Makefile
index bf267b7720..f4c9784bc4 100644
--- a/kubernetes/aaf/components/aaf-sshsm/components/Makefile
+++ b/kubernetes/aaf/components/aaf-sshsm/components/Makefile
@@ -33,7 +33,7 @@ make-%:
@if [ -f $*/Makefile ]; then make -C $*; fi
dep-%: make-%
- @if [ -f $*/requirements.yaml ]; then $(HELM_BIN) dep up $*; fi
+ @if [ -f $*/Chart.yaml ]; then $(HELM_BIN) dep up $*; fi
lint-%: dep-%
@if [ -f $*/Chart.yaml ]; then $(HELM_BIN) lint $*; fi
@@ -44,7 +44,7 @@ package-%: lint-%
@$(HELM_BIN) repo index $(PACKAGE_DIR)
clean:
- @rm -f */requirements.lock
+ @rm -f */Chart.lock
@rm -f *tgz */charts/*tgz
@rm -rf $(PACKAGE_DIR)
%:
diff --git a/kubernetes/aaf/components/aaf-sshsm/components/aaf-sshsm-abrmd/Chart.yaml b/kubernetes/aaf/components/aaf-sshsm/components/aaf-sshsm-abrmd/Chart.yaml
index 4908c68780..f9dd2b9cb2 100644
--- a/kubernetes/aaf/components/aaf-sshsm/components/aaf-sshsm-abrmd/Chart.yaml
+++ b/kubernetes/aaf/components/aaf-sshsm/components/aaf-sshsm-abrmd/Chart.yaml
@@ -1,5 +1,6 @@
# Copyright 2018 Intel Corporation, Inc
# Modifications Copyright © 2021 Orange
+# Modifications Copyright © 2021 Nordix Foundation
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -13,7 +14,15 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-apiVersion: v1
+apiVersion: v2
description: ONAP Trusted Platform Module Resource Manager
name: aaf-sshsm-abrmd
-version: 9.0.0
+version: 10.0.0
+
+dependencies:
+ - name: common
+ version: ~10.x-0
+ repository: '@local'
+ - name: repositoryGenerator
+ version: ~10.x-0
+ repository: '@local'
diff --git a/kubernetes/aaf/components/aaf-sshsm/components/aaf-sshsm-abrmd/requirements.yaml b/kubernetes/aaf/components/aaf-sshsm/components/aaf-sshsm-abrmd/requirements.yaml
deleted file mode 100644
index 96c6cddeb8..0000000000
--- a/kubernetes/aaf/components/aaf-sshsm/components/aaf-sshsm-abrmd/requirements.yaml
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 2018 Intel Corporation, Inc
-# Modifications Copyright © 2021 Orange
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-dependencies:
- - name: common
- version: ~9.x-0
- repository: '@local'
- - name: repositoryGenerator
- version: ~9.x-0
- repository: '@local'
diff --git a/kubernetes/aaf/components/aaf-sshsm/components/aaf-sshsm-distcenter/Chart.yaml b/kubernetes/aaf/components/aaf-sshsm/components/aaf-sshsm-distcenter/Chart.yaml
index d237c7b92f..1f6b6f9afb 100644
--- a/kubernetes/aaf/components/aaf-sshsm/components/aaf-sshsm-distcenter/Chart.yaml
+++ b/kubernetes/aaf/components/aaf-sshsm/components/aaf-sshsm-distcenter/Chart.yaml
@@ -1,5 +1,6 @@
# Copyright 2018 Intel Corporation, Inc
# Modifications Copyright © 2021 Orange
+# Modifications Copyright © 2021 Nordix Foundation
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -13,7 +14,15 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-apiVersion: v1
+apiVersion: v2
description: ONAP Trusted Platform Module Distribution Center
name: aaf-sshsm-distcenter
-version: 9.0.0
+version: 10.0.0
+
+dependencies:
+ - name: common
+ version: ~10.x-0
+ repository: '@local'
+ - name: repositoryGenerator
+ version: ~10.x-0
+ repository: '@local'
diff --git a/kubernetes/aaf/components/aaf-sshsm/components/aaf-sshsm-distcenter/requirements.yaml b/kubernetes/aaf/components/aaf-sshsm/components/aaf-sshsm-distcenter/requirements.yaml
deleted file mode 100644
index 96c6cddeb8..0000000000
--- a/kubernetes/aaf/components/aaf-sshsm/components/aaf-sshsm-distcenter/requirements.yaml
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 2018 Intel Corporation, Inc
-# Modifications Copyright © 2021 Orange
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-dependencies:
- - name: common
- version: ~9.x-0
- repository: '@local'
- - name: repositoryGenerator
- version: ~9.x-0
- repository: '@local'
diff --git a/kubernetes/aaf/components/aaf-sshsm/components/aaf-sshsm-testca/Chart.yaml b/kubernetes/aaf/components/aaf-sshsm/components/aaf-sshsm-testca/Chart.yaml
index baa354e490..73ff507f91 100644
--- a/kubernetes/aaf/components/aaf-sshsm/components/aaf-sshsm-testca/Chart.yaml
+++ b/kubernetes/aaf/components/aaf-sshsm/components/aaf-sshsm-testca/Chart.yaml
@@ -1,5 +1,6 @@
# Copyright 2018 Intel Corporation, Inc
# Modifications Copyright © 2021 Orange
+# Modifications Copyright © 2021 Nordix Foundation
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -13,7 +14,15 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-apiVersion: v1
+apiVersion: v2
description: ONAP Trusted Platform Module Test CA Service
name: aaf-sshsm-testca
-version: 9.0.0
+version: 10.0.0
+
+dependencies:
+ - name: common
+ version: ~10.x-0
+ repository: '@local'
+ - name: repositoryGenerator
+ version: ~10.x-0
+ repository: '@local'
diff --git a/kubernetes/aaf/components/aaf-sshsm/components/aaf-sshsm-testca/requirements.yaml b/kubernetes/aaf/components/aaf-sshsm/components/aaf-sshsm-testca/requirements.yaml
deleted file mode 100644
index 96c6cddeb8..0000000000
--- a/kubernetes/aaf/components/aaf-sshsm/components/aaf-sshsm-testca/requirements.yaml
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 2018 Intel Corporation, Inc
-# Modifications Copyright © 2021 Orange
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-dependencies:
- - name: common
- version: ~9.x-0
- repository: '@local'
- - name: repositoryGenerator
- version: ~9.x-0
- repository: '@local'
diff --git a/kubernetes/aaf/components/aaf-sshsm/requirements.yaml b/kubernetes/aaf/components/aaf-sshsm/requirements.yaml
deleted file mode 100644
index e39cac8f0f..0000000000
--- a/kubernetes/aaf/components/aaf-sshsm/requirements.yaml
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 2018 Intel Corporation, Inc
-# Modifications Copyright © 2021 Orange
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-dependencies:
- - name: common
- version: ~9.x-0
- repository: '@local'
- - name: repositoryGenerator
- version: ~9.x-0
- repository: '@local'
- - name: aaf-sshsm-abrmd
- version: ~9.x-0
- repository: 'file://components/aaf-sshsm-abrmd'
- condition: aaf-sshsm-abrmd.enabled
- - name: aaf-sshsm-distcenter
- version: ~9.x-0
- repository: 'file://components/aaf-sshsm-distcenter'
- condition: aaf-sshsm-distcenter.enabled
- - name: aaf-sshsm-testca
- version: ~9.x-0
- repository: 'file://components/aaf-sshsm-testca'
- condition: aaf-sshsm-testca.testca.enabled
diff --git a/kubernetes/aaf/components/aaf-templates/Chart.yaml b/kubernetes/aaf/components/aaf-templates/Chart.yaml
index 708def6e19..9d0ecad16e 100644
--- a/kubernetes/aaf/components/aaf-templates/Chart.yaml
+++ b/kubernetes/aaf/components/aaf-templates/Chart.yaml
@@ -1,4 +1,5 @@
# Copyright © 2020-2021 Orange
+# Modifications Copyright © 2021 Nordix Foundation
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -12,7 +13,12 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-apiVersion: v1
+apiVersion: v2
description: ONAP Application Authorization Framework Templates
name: aaf-templates
-version: 9.0.0
+version: 10.0.0
+
+dependencies:
+ - name: common
+ version: ~10.x-0
+ repository: '@local'
diff --git a/kubernetes/aaf/components/aaf-templates/requirements.yaml b/kubernetes/aaf/components/aaf-templates/requirements.yaml
deleted file mode 100644
index 392fda15b4..0000000000
--- a/kubernetes/aaf/components/aaf-templates/requirements.yaml
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright © 2020-2021 Orange
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-dependencies:
- - name: common
- version: ~9.x-0
- repository: '@local'
diff --git a/kubernetes/aaf/requirements.yaml b/kubernetes/aaf/requirements.yaml
deleted file mode 100644
index 2bf9b2862e..0000000000
--- a/kubernetes/aaf/requirements.yaml
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright © 2017 Amdocs, Bell Canada
-# Modifications Copyright © 2018 AT&T
-# Modifications Copyright © 2020-2021 Orange
-# Modifications Copyright © 2020 Nokia
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-dependencies:
- - name: aaf-cass
- version: ~9.x-0
- repository: 'file://components/aaf-cass'
- condition: aaf-authz.enabled
- - name: aaf-cm
- version: ~9.x-0
- repository: 'file://components/aaf-cm'
- condition: aaf-authz.enabled
- - name: aaf-fs
- version: ~9.x-0
- repository: 'file://components/aaf-fs'
- condition: aaf-authz.enabled
- - name: aaf-gui
- version: ~9.x-0
- repository: 'file://components/aaf-gui'
- condition: aaf-authz.enabled
- - name: aaf-hello
- version: ~9.x-0
- repository: 'file://components/aaf-hello'
- condition: aaf-hello.enabled
- - name: aaf-locate
- version: ~9.x-0
- repository: 'file://components/aaf-locate'
- condition: aaf-authz.enabled
- - name: aaf-oauth
- version: ~9.x-0
- repository: 'file://components/aaf-oauth'
- condition: aaf-authz.enabled
- - name: aaf-service
- version: ~9.x-0
- repository: 'file://components/aaf-service'
- condition: aaf-authz.enabled
- - name: aaf-sms
- version: ~9.x-0
- repository: 'file://components/aaf-sms'
- condition: aaf-sms.enabled
- - name: aaf-sshsm
- version: ~9.x-0
- repository: 'file://components/aaf-sshsm'
- condition: aaf-sshsm.enabled
diff --git a/kubernetes/aai/Chart.yaml b/kubernetes/aai/Chart.yaml
index 8cb184630f..278e1cd595 100644
--- a/kubernetes/aai/Chart.yaml
+++ b/kubernetes/aai/Chart.yaml
@@ -1,6 +1,7 @@
# Copyright © 2017 Amdocs, Bell Canada
# Modifications Copyright © 2018 AT&T
# Modifications Copyright © 2021 Orange
+# Modifications Copyright © 2021 Nordix Foundation
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -14,7 +15,59 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-apiVersion: v1
+apiVersion: v2
description: ONAP Active and Available Inventory
name: aai
-version: 9.0.0
+version: 10.0.0
+
+dependencies:
+ - name: common
+ version: ~10.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: cassandra
+ version: ~10.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'
+ condition: global.cassandra.localCluster
+ - name: certInitializer
+ version: ~10.x-0
+ repository: '@local'
+ - name: repositoryGenerator
+ version: ~10.x-0
+ repository: '@local'
+ - name: aai-babel
+ version: ~10.x-0
+ repository: 'file://components/aai-babel'
+ condition: aai-babel.enabled
+ - name: aai-graphadmin
+ version: ~10.x-0
+ repository: 'file://components/aai-graphadmin'
+ condition: aai-graphadmin.enabled
+ - name: aai-modelloader
+ version: ~10.x-0
+ repository: 'file://components/aai-modelloader'
+ condition: aai-modelloader.enabled
+ - name: aai-resources
+ version: ~10.x-0
+ repository: 'file://components/aai-resources'
+ condition: aai-resources.enabled
+ - name: aai-schema-service
+ version: ~10.x-0
+ repository: 'file://components/aai-schema-service'
+ condition: aai-schema-service.enabled
+ - name: aai-sparky-be
+ version: ~10.x-0
+ repository: 'file://components/aai-sparky-be'
+ condition: aai-sparky-be.enabled
+ - name: aai-traversal
+ version: ~10.x-0
+ repository: 'file://components/aai-traversal'
+ condition: aai-traversal.enabled
+ - name: serviceAccount
+ version: ~10.x-0
+ repository: '@local'
diff --git a/kubernetes/aai/Makefile b/kubernetes/aai/Makefile
index 92102d2dfc..c0253952aa 100644
--- a/kubernetes/aai/Makefile
+++ b/kubernetes/aai/Makefile
@@ -33,7 +33,7 @@ make-%:
@if [ -f $*/Makefile ]; then make -C $*; fi
dep-%: make-%
- @if [ -f $*/requirements.yaml ]; then $(HELM_BIN) dep up $*; fi
+ @if [ -f $*/Chart.yaml ]; then $(HELM_BIN) dep up $*; fi
lint-%: dep-%
@if [ -f $*/Chart.yaml ]; then $(HELM_BIN) lint $*; fi
@@ -44,7 +44,7 @@ package-%: lint-%
@$(HELM_BIN) repo index $(PACKAGE_DIR)
clean:
- @rm -f */requirements.lock
+ @rm -f */Chart.lock
@rm -f *tgz */charts/*tgz
@rm -rf $(PACKAGE_DIR)
%:
diff --git a/kubernetes/aai/components/Makefile b/kubernetes/aai/components/Makefile
index e9159f32a9..8674687e7d 100644
--- a/kubernetes/aai/components/Makefile
+++ b/kubernetes/aai/components/Makefile
@@ -33,7 +33,7 @@ make-%:
@if [ -f $*/Makefile ]; then make -C $*; fi
dep-%: make-%
- @if [ -f $*/requirements.yaml ]; then $(HELM_BIN) dep up $*; fi
+ @if [ -f $*/Chart.yaml ]; then $(HELM_BIN) dep up $*; fi
lint-%: dep-%
@if [ -f $*/Chart.yaml ]; then $(HELM_BIN) lint $*; fi
@@ -44,7 +44,7 @@ package-%: lint-%
@$(HELM_BIN) repo index $(PACKAGE_DIR)
clean:
- @rm -f */requirements.lock
+ @rm -f */Chart.lock
@rm -f *tgz */charts/*tgz
@rm -rf $(PACKAGE_DIR)
%:
diff --git a/kubernetes/aai/components/aai-babel/Chart.yaml b/kubernetes/aai/components/aai-babel/Chart.yaml
index f9212fa03c..30140136a9 100644
--- a/kubernetes/aai/components/aai-babel/Chart.yaml
+++ b/kubernetes/aai/components/aai-babel/Chart.yaml
@@ -1,6 +1,7 @@
# Copyright © 2018 Amdocs, AT&T
# Modifications Copyright © 2018 Bell Canada
# Modifications Copyright © 2021 Orange
+# Modifications Copyright © 2021 Nordix Foundation
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -14,7 +15,24 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-apiVersion: v1
+apiVersion: v2
description: Babel microservice
name: aai-babel
-version: 9.0.0
+version: 10.0.0
+
+dependencies:
+ - name: common
+ version: ~10.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: certInitializer
+ version: ~10.x-0
+ repository: '@local'
+ - name: repositoryGenerator
+ version: ~10.x-0
+ repository: '@local'
+ - name: serviceAccount
+ version: ~10.x-0
+ repository: '@local'
diff --git a/kubernetes/aai/components/aai-babel/requirements.yaml b/kubernetes/aai/components/aai-babel/requirements.yaml
deleted file mode 100644
index 7a434fc276..0000000000
--- a/kubernetes/aai/components/aai-babel/requirements.yaml
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright © 2018 Amdocs, AT&T
-# Modifications Copyright © 2018 Bell Canada
-# Modifications Copyright © 2021 Orange
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-dependencies:
- - name: common
- version: ~9.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: certInitializer
- version: ~9.x-0
- repository: '@local'
- - name: repositoryGenerator
- version: ~9.x-0
- repository: '@local'
- - name: serviceAccount
- version: ~9.x-0
- repository: '@local'
diff --git a/kubernetes/aai/components/aai-babel/templates/deployment.yaml b/kubernetes/aai/components/aai-babel/templates/deployment.yaml
index bd6b8c728c..38a4e484c3 100644
--- a/kubernetes/aai/components/aai-babel/templates/deployment.yaml
+++ b/kubernetes/aai/components/aai-babel/templates/deployment.yaml
@@ -70,6 +70,10 @@ spec:
initialDelaySeconds: {{ .Values.readiness.initialDelaySeconds }}
periodSeconds: {{ .Values.readiness.periodSeconds }}
env:
+ {{- if not (include "common.needTLS" .) }}
+ - name: KEY_STORE_PASSWORD
+ value: NotUsed
+ {{- end }}
- name: CONFIG_HOME
value: /opt/app/babel/config
volumeMounts: {{ include "common.certInitializer.volumeMount" . | nindent 10 }}
diff --git a/kubernetes/aai/components/aai-graphadmin/Chart.yaml b/kubernetes/aai/components/aai-graphadmin/Chart.yaml
index 4ccf89d4ca..0d5978aef7 100644
--- a/kubernetes/aai/components/aai-graphadmin/Chart.yaml
+++ b/kubernetes/aai/components/aai-graphadmin/Chart.yaml
@@ -4,6 +4,7 @@
# ================================================================================
# Copyright © 2018 AT&T Intellectual Property. All rights reserved.
# Modifications Copyright © 2021 Orange
+# Modifications Copyright © 2021 Nordix Foundation
# ================================================================================
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -18,7 +19,24 @@
# limitations under the License.
# ============LICENSE_END=========================================================
-apiVersion: v1
+apiVersion: v2
description: ONAP AAI GraphAdmin
name: aai-graphadmin
-version: 9.0.0
+version: 10.0.0
+
+dependencies:
+ - name: common
+ version: ~10.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: certInitializer
+ version: ~10.x-0
+ repository: '@local'
+ - name: repositoryGenerator
+ version: ~10.x-0
+ repository: '@local'
+ - name: serviceAccount
+ version: ~10.x-0
+ repository: '@local'
diff --git a/kubernetes/aai/components/aai-graphadmin/requirements.yaml b/kubernetes/aai/components/aai-graphadmin/requirements.yaml
deleted file mode 100644
index 5a41aefe84..0000000000
--- a/kubernetes/aai/components/aai-graphadmin/requirements.yaml
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright © 2018 Amdocs, AT&T
-# Modifications Copyright © 2018 Bell Canada
-# Modifications Copyright © 2020-2021 Orange
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-dependencies:
- - name: common
- version: ~9.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: certInitializer
- version: ~9.x-0
- repository: '@local'
- - name: repositoryGenerator
- version: ~9.x-0
- repository: '@local'
- - name: serviceAccount
- version: ~9.x-0
- repository: '@local'
diff --git a/kubernetes/aai/components/aai-graphadmin/templates/deployment.yaml b/kubernetes/aai/components/aai-graphadmin/templates/deployment.yaml
index 6b58eaa3fd..cccc2b1e66 100644
--- a/kubernetes/aai/components/aai-graphadmin/templates/deployment.yaml
+++ b/kubernetes/aai/components/aai-graphadmin/templates/deployment.yaml
@@ -222,12 +222,14 @@ spec:
- name: config
configMap:
name: {{ include "common.fullname" . }}
- - name: properties-input
- configMap:
- name: {{ include "common.fullname" . }}-properties
- name: properties
+ {{- if .Values.global.aafEnabled }}
emptyDir:
medium: Memory
+ - name: properties-input
+ {{- end }}
+ configMap:
+ name: {{ include "common.fullname" . }}-properties
restartPolicy: {{ .Values.restartPolicy }}
imagePullSecrets:
- name: {{ include "common.namespace" . }}-docker-registry-key
diff --git a/kubernetes/aai/components/aai-graphadmin/templates/job-copy-db-backup.yaml b/kubernetes/aai/components/aai-graphadmin/templates/job-copy-db-backup.yaml
index d1e72841bc..95c3fe2fbf 100644
--- a/kubernetes/aai/components/aai-graphadmin/templates/job-copy-db-backup.yaml
+++ b/kubernetes/aai/components/aai-graphadmin/templates/job-copy-db-backup.yaml
@@ -126,7 +126,7 @@ spec:
- -c
- |
bash docker-entrypoint.sh dataSnapshot.sh
- {{- include "common.serviceMesh.killSidecar" . | indent 11 | trim }}
+ {{ include "common.serviceMesh.killSidecar" . | indent 11 | trim }}
env:
- name: LOCAL_USER_ID
value: {{ .Values.securityContext.user_id | quote }}
@@ -174,12 +174,14 @@ spec:
- name: config
configMap:
name: {{ include "common.fullname" . }}
- - name: properties-input
- configMap:
- name: {{ include "common.fullname" . }}-properties
- name: properties
+ {{- if .Values.global.aafEnabled }}
emptyDir:
medium: Memory
+ - name: properties-input
+ {{- end }}
+ configMap:
+ name: {{ include "common.fullname" . }}-properties
- name: migration
configMap:
name: {{ include "common.fullname" . }}-migration
diff --git a/kubernetes/aai/components/aai-graphadmin/templates/job-create-db.yaml b/kubernetes/aai/components/aai-graphadmin/templates/job-create-db.yaml
index 4a7de648e7..62e27b6321 100644
--- a/kubernetes/aai/components/aai-graphadmin/templates/job-create-db.yaml
+++ b/kubernetes/aai/components/aai-graphadmin/templates/job-create-db.yaml
@@ -126,7 +126,7 @@ spec:
- -c
- |
bash docker-entrypoint.sh createDBSchema.sh
- {{- include "common.serviceMesh.killSidecar" . | indent 11 | trim }}
+ {{ include "common.serviceMesh.killSidecar" . | indent 11 | trim }}
env:
- name: LOCAL_USER_ID
value: {{ .Values.securityContext.user_id | quote }}
@@ -173,12 +173,14 @@ spec:
- name: config
configMap:
name: {{ include "common.fullname" . }}
- - name: properties-input
- configMap:
- name: {{ include "common.fullname" . }}-properties
- name: properties
+ {{- if .Values.global.aafEnabled }}
emptyDir:
medium: Memory
+ - name: properties-input
+ {{- end }}
+ configMap:
+ name: {{ include "common.fullname" . }}-properties
restartPolicy: Never
imagePullSecrets:
- name: {{ include "common.namespace" . }}-docker-registry-key
diff --git a/kubernetes/aai/components/aai-graphadmin/templates/job-migration.yaml b/kubernetes/aai/components/aai-graphadmin/templates/job-migration.yaml
index 1256e71e08..07009b2fbd 100644
--- a/kubernetes/aai/components/aai-graphadmin/templates/job-migration.yaml
+++ b/kubernetes/aai/components/aai-graphadmin/templates/job-migration.yaml
@@ -171,7 +171,7 @@ spec:
- -c
- |
bash docker-entrypoint.sh run_Migrations.sh -e UpdateAaiUriIndexMigration --commit --skipPreMigrationSnapShot --runDisabled RebuildAllEdges ;
- {{- include "common.serviceMesh.killSidecar" . | indent 11 | trim }}
+ {{ include "common.serviceMesh.killSidecar" . | indent 11 | trim }}
env:
- name: LOCAL_USER_ID
value: {{ .Values.securityContext.user_id | quote }}
@@ -221,12 +221,14 @@ spec:
- name: {{ include "common.fullname" . }}-snapshots
persistentVolumeClaim:
claimName: {{ include "common.fullname" . }}-migration
- - name: properties-input
- configMap:
- name: {{ include "common.fullname" . }}-properties
- name: properties
+ {{- if .Values.global.aafEnabled }}
emptyDir:
medium: Memory
+ - name: properties-input
+ {{- end }}
+ configMap:
+ name: {{ include "common.fullname" . }}-properties
restartPolicy: Never
imagePullSecrets:
- name: "{{ include "common.namespace" . }}-docker-registry-key"
@@ -322,7 +324,7 @@ spec:
- -c
- |
bash docker-entrypoint.sh dataSnapshot.sh
- {{- include "common.serviceMesh.killSidecar" . | indent 11 | trim }}
+ {{ include "common.serviceMesh.killSidecar" . | indent 11 | trim }}
env:
- name: LOCAL_USER_ID
value: {{ .Values.securityContext.user_id | quote }}
diff --git a/kubernetes/aai/components/aai-modelloader/Chart.yaml b/kubernetes/aai/components/aai-modelloader/Chart.yaml
index 31bf1bb17b..a56dfdc088 100644
--- a/kubernetes/aai/components/aai-modelloader/Chart.yaml
+++ b/kubernetes/aai/components/aai-modelloader/Chart.yaml
@@ -1,5 +1,6 @@
# Copyright © 2018 Amdocs, Bell Canada, AT&T
# Modifications Copyright © 2021 Orange
+# Modifications Copyright © 2021 Nordix Foundation
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -13,7 +14,24 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-apiVersion: v1
+apiVersion: v2
description: ONAP AAI modelloader
name: aai-modelloader
-version: 9.0.0
+version: 10.0.0
+
+dependencies:
+ - name: common
+ version: ~10.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: certInitializer
+ version: ~10.x-0
+ repository: '@local'
+ - name: repositoryGenerator
+ version: ~10.x-0
+ repository: '@local'
+ - name: serviceAccount
+ version: ~10.x-0
+ repository: '@local'
diff --git a/kubernetes/aai/components/aai-modelloader/requirements.yaml b/kubernetes/aai/components/aai-modelloader/requirements.yaml
deleted file mode 100644
index 5a41aefe84..0000000000
--- a/kubernetes/aai/components/aai-modelloader/requirements.yaml
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright © 2018 Amdocs, AT&T
-# Modifications Copyright © 2018 Bell Canada
-# Modifications Copyright © 2020-2021 Orange
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-dependencies:
- - name: common
- version: ~9.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: certInitializer
- version: ~9.x-0
- repository: '@local'
- - name: repositoryGenerator
- version: ~9.x-0
- repository: '@local'
- - name: serviceAccount
- version: ~9.x-0
- repository: '@local'
diff --git a/kubernetes/aai/components/aai-modelloader/templates/deployment.yaml b/kubernetes/aai/components/aai-modelloader/templates/deployment.yaml
index 0213d631a3..c4098b1a3b 100644
--- a/kubernetes/aai/components/aai-modelloader/templates/deployment.yaml
+++ b/kubernetes/aai/components/aai-modelloader/templates/deployment.yaml
@@ -116,12 +116,14 @@ spec:
- name: localtime
hostPath:
path: /etc/localtime
- - name: prop-config-input
- configMap:
- name: {{ include "common.fullname" . }}-prop
- name: prop-config
+ {{- if .Values.global.aafEnabled }}
emptyDir:
medium: Memory
+ - name: prop-config-input
+ {{- end }}
+ configMap:
+ name: {{ include "common.fullname" . }}-prop
- name: auth-config
secret:
secretName: {{ include "common.fullname" . }}
diff --git a/kubernetes/aai/components/aai-resources/Chart.yaml b/kubernetes/aai/components/aai-resources/Chart.yaml
index 50bf63ac67..c5ccf82da9 100644
--- a/kubernetes/aai/components/aai-resources/Chart.yaml
+++ b/kubernetes/aai/components/aai-resources/Chart.yaml
@@ -1,5 +1,6 @@
# Copyright © 2018 Amdocs, Bell Canada, AT&T
# Modifications Copyright © 2021 Orange
+# Modifications Copyright © 2021 Nordix Foundation
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -14,7 +15,24 @@
# limitations under the License.
-apiVersion: v1
+apiVersion: v2
description: ONAP AAI resources
name: aai-resources
-version: 9.0.0
+version: 10.0.0
+
+dependencies:
+ - name: common
+ version: ~10.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: certInitializer
+ version: ~10.x-0
+ repository: '@local'
+ - name: repositoryGenerator
+ version: ~10.x-0
+ repository: '@local'
+ - name: serviceAccount
+ version: ~10.x-0
+ repository: '@local'
diff --git a/kubernetes/aai/components/aai-resources/requirements.yaml b/kubernetes/aai/components/aai-resources/requirements.yaml
deleted file mode 100644
index 5a41aefe84..0000000000
--- a/kubernetes/aai/components/aai-resources/requirements.yaml
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright © 2018 Amdocs, AT&T
-# Modifications Copyright © 2018 Bell Canada
-# Modifications Copyright © 2020-2021 Orange
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-dependencies:
- - name: common
- version: ~9.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: certInitializer
- version: ~9.x-0
- repository: '@local'
- - name: repositoryGenerator
- version: ~9.x-0
- repository: '@local'
- - name: serviceAccount
- version: ~9.x-0
- repository: '@local'
diff --git a/kubernetes/aai/components/aai-schema-service/Chart.yaml b/kubernetes/aai/components/aai-schema-service/Chart.yaml
index 6dd82626dd..2553c943bd 100644
--- a/kubernetes/aai/components/aai-schema-service/Chart.yaml
+++ b/kubernetes/aai/components/aai-schema-service/Chart.yaml
@@ -1,5 +1,6 @@
# Copyright © 2019 AT&T
# Modifications Copyright © 2021 Orange
+# Modifications Copyright © 2021 Nordix Foundation
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -14,7 +15,24 @@
# limitations under the License.
-apiVersion: v1
+apiVersion: v2
description: ONAP AAI Schema Service
name: aai-schema-service
-version: 9.0.0
+version: 10.0.0
+
+dependencies:
+ - name: common
+ version: ~10.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: certInitializer
+ version: ~10.x-0
+ repository: '@local'
+ - name: repositoryGenerator
+ version: ~10.x-0
+ repository: '@local'
+ - name: serviceAccount
+ version: ~10.x-0
+ repository: '@local'
diff --git a/kubernetes/aai/components/aai-schema-service/requirements.yaml b/kubernetes/aai/components/aai-schema-service/requirements.yaml
deleted file mode 100644
index 5a41aefe84..0000000000
--- a/kubernetes/aai/components/aai-schema-service/requirements.yaml
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright © 2018 Amdocs, AT&T
-# Modifications Copyright © 2018 Bell Canada
-# Modifications Copyright © 2020-2021 Orange
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-dependencies:
- - name: common
- version: ~9.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: certInitializer
- version: ~9.x-0
- repository: '@local'
- - name: repositoryGenerator
- version: ~9.x-0
- repository: '@local'
- - name: serviceAccount
- version: ~9.x-0
- repository: '@local'
diff --git a/kubernetes/aai/components/aai-sparky-be/Chart.yaml b/kubernetes/aai/components/aai-sparky-be/Chart.yaml
index 66ac891fdd..ec1812e5e8 100644
--- a/kubernetes/aai/components/aai-sparky-be/Chart.yaml
+++ b/kubernetes/aai/components/aai-sparky-be/Chart.yaml
@@ -1,5 +1,6 @@
# Copyright © 2018 Amdocs, Bell Canada, AT&T
# Modifications Copyright © 2021 Orange
+# Modifications Copyright © 2021 Nordix Foundation
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -13,7 +14,24 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-apiVersion: v1
+apiVersion: v2
description: ONAP AAI sparky-be
name: aai-sparky-be
-version: 9.0.0
+version: 10.0.0
+
+dependencies:
+ - name: common
+ version: ~10.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: certInitializer
+ version: ~10.x-0
+ repository: '@local'
+ - name: repositoryGenerator
+ version: ~10.x-0
+ repository: '@local'
+ - name: serviceAccount
+ version: ~10.x-0
+ repository: '@local'
diff --git a/kubernetes/aai/components/aai-sparky-be/requirements.yaml b/kubernetes/aai/components/aai-sparky-be/requirements.yaml
deleted file mode 100644
index 5a41aefe84..0000000000
--- a/kubernetes/aai/components/aai-sparky-be/requirements.yaml
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright © 2018 Amdocs, AT&T
-# Modifications Copyright © 2018 Bell Canada
-# Modifications Copyright © 2020-2021 Orange
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-dependencies:
- - name: common
- version: ~9.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: certInitializer
- version: ~9.x-0
- repository: '@local'
- - name: repositoryGenerator
- version: ~9.x-0
- repository: '@local'
- - name: serviceAccount
- version: ~9.x-0
- repository: '@local'
diff --git a/kubernetes/aai/components/aai-sparky-be/templates/deployment.yaml b/kubernetes/aai/components/aai-sparky-be/templates/deployment.yaml
index 48a6b04913..6e5ab8b32b 100644
--- a/kubernetes/aai/components/aai-sparky-be/templates/deployment.yaml
+++ b/kubernetes/aai/components/aai-sparky-be/templates/deployment.yaml
@@ -174,9 +174,11 @@ spec:
configMap:
name: {{ include "common.fullname" . }}
- name: portal-config
+ {{- if .Values.global.aafEnabled }}
emptyDir:
medium: Memory
- name: portal-config-input
+ {{- end }}
configMap:
name: {{ include "common.fullname" . }}-portal
- name: portal-config-props
diff --git a/kubernetes/aai/components/aai-traversal/Chart.yaml b/kubernetes/aai/components/aai-traversal/Chart.yaml
index b4acc59090..41dbe23aa3 100644
--- a/kubernetes/aai/components/aai-traversal/Chart.yaml
+++ b/kubernetes/aai/components/aai-traversal/Chart.yaml
@@ -1,5 +1,6 @@
# Copyright © 2018 Amdocs, Bell Canada, AT&T
# Modifications Copyright © 2021 Orange
+# Modifications Copyright © 2021 Nordix Foundation
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -13,7 +14,24 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-apiVersion: v1
+apiVersion: v2
description: ONAP AAI traversal
name: aai-traversal
-version: 9.0.0
+version: 10.0.0
+
+dependencies:
+ - name: common
+ version: ~10.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: certInitializer
+ version: ~10.x-0
+ repository: '@local'
+ - name: repositoryGenerator
+ version: ~10.x-0
+ repository: '@local'
+ - name: serviceAccount
+ version: ~10.x-0
+ repository: '@local'
diff --git a/kubernetes/aai/components/aai-traversal/requirements.yaml b/kubernetes/aai/components/aai-traversal/requirements.yaml
deleted file mode 100644
index 5a41aefe84..0000000000
--- a/kubernetes/aai/components/aai-traversal/requirements.yaml
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright © 2018 Amdocs, AT&T
-# Modifications Copyright © 2018 Bell Canada
-# Modifications Copyright © 2020-2021 Orange
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-dependencies:
- - name: common
- version: ~9.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: certInitializer
- version: ~9.x-0
- repository: '@local'
- - name: repositoryGenerator
- version: ~9.x-0
- repository: '@local'
- - name: serviceAccount
- version: ~9.x-0
- repository: '@local'
diff --git a/kubernetes/aai/components/aai-traversal/templates/job.yaml b/kubernetes/aai/components/aai-traversal/templates/job.yaml
index f2e6ee61b5..ddd325d7a0 100644
--- a/kubernetes/aai/components/aai-traversal/templates/job.yaml
+++ b/kubernetes/aai/components/aai-traversal/templates/job.yaml
@@ -77,7 +77,7 @@ spec:
{{- else }}
until nc -w10 -z -v aai.{{.Release.Namespace}} 80; do echo "Retrying to reach aai on port 80"; done;
bash -x /opt/app/aai-traversal/docker-entrypoint.sh install/updateQueryData.sh ;
- {{- include "common.serviceMesh.killSidecar" . | indent 11 | trim }}
+ {{ include "common.serviceMesh.killSidecar" . | indent 11 | trim }}
{{- end }}
env:
- name: LOCAL_USER_ID
diff --git a/kubernetes/aai/requirements.yaml b/kubernetes/aai/requirements.yaml
deleted file mode 100644
index c3c702e3bb..0000000000
--- a/kubernetes/aai/requirements.yaml
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright © 2018 Amdocs, Bell Canada, AT&T
-# Modifications Copyright © 2020-2021 Orange
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
----
-dependencies:
- - name: common
- version: ~9.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: cassandra
- version: ~9.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'
- condition: global.cassandra.localCluster
- - name: certInitializer
- version: ~9.x-0
- repository: '@local'
- - name: repositoryGenerator
- version: ~9.x-0
- repository: '@local'
- - name: aai-babel
- version: ~9.x-0
- repository: 'file://components/aai-babel'
- condition: aai-babel.enabled
- - name: aai-graphadmin
- version: ~9.x-0
- repository: 'file://components/aai-graphadmin'
- condition: aai-graphadmin.enabled
- - name: aai-modelloader
- version: ~9.x-0
- repository: 'file://components/aai-modelloader'
- condition: aai-modelloader.enabled
- - name: aai-resources
- version: ~9.x-0
- repository: 'file://components/aai-resources'
- condition: aai-resources.enabled
- - name: aai-schema-service
- version: ~9.x-0
- repository: 'file://components/aai-schema-service'
- condition: aai-schema-service.enabled
- - name: aai-sparky-be
- version: ~9.x-0
- repository: 'file://components/aai-sparky-be'
- condition: aai-sparky-be.enabled
- - name: aai-traversal
- version: ~9.x-0
- repository: 'file://components/aai-traversal'
- condition: aai-traversal.enabled
- - name: serviceAccount
- version: ~9.x-0
- repository: '@local'
diff --git a/kubernetes/appc/Chart.yaml b/kubernetes/appc/Chart.yaml
index 99b838899f..d08a83ec4d 100644
--- a/kubernetes/appc/Chart.yaml
+++ b/kubernetes/appc/Chart.yaml
@@ -1,6 +1,7 @@
# Copyright © 2017 Amdocs, Bell Canada
# Modifications Copyright © 2018 AT&T
# Modifications Copyright © 2021 Orange
+# Modifications Copyright © 2021 Nordix Foundation
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -14,7 +15,29 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-apiVersion: v1
+apiVersion: v2
description: Application Controller
name: appc
-version: 9.0.0
+version: 10.0.0
+
+dependencies:
+ - name: common
+ version: ~10.x-0
+ repository: '@local'
+ - name: mariadb-galera
+ version: ~10.x-0
+ repository: '@local'
+ - name: dgbuilder
+ version: ~10.x-0
+ repository: '@local'
+ - name: repositoryGenerator
+ version: ~10.x-0
+ repository: '@local'
+ - name: appc-ansible-server
+ version: ~10.x-0
+ repository: 'file://components/appc-ansible-server'
+ condition: appc-ansible-server.enabled
+ - name: appc-cdt
+ version: ~10.x-0
+ repository: 'file://components/appc-cdt'
+ condition: appc-cdt.enabled
diff --git a/kubernetes/appc/Makefile b/kubernetes/appc/Makefile
index 4c79718d02..51d7de122c 100644
--- a/kubernetes/appc/Makefile
+++ b/kubernetes/appc/Makefile
@@ -33,7 +33,7 @@ make-%:
@if [ -f $*/Makefile ]; then make -C $*; fi
dep-%: make-%
- @if [ -f $*/requirements.yaml ]; then $(HELM_BIN) dep up $*; fi
+ @if [ -f $*/Chart.yaml ]; then $(HELM_BIN) dep up $*; fi
lint-%: dep-%
@if [ -f $*/Chart.yaml ]; then $(HELM_BIN) lint $*; fi
@@ -44,7 +44,7 @@ package-%: lint-%
@$(HELM_BIN) repo index $(PACKAGE_DIR)
clean:
- @rm -f */requirements.lock
+ @rm -f */Chart.lock
@rm -f *tgz */charts/*tgz
@rm -rf $(PACKAGE_DIR)
%:
diff --git a/kubernetes/appc/components/Makefile b/kubernetes/appc/components/Makefile
index f2e7a1fb82..1ea8433a9c 100644
--- a/kubernetes/appc/components/Makefile
+++ b/kubernetes/appc/components/Makefile
@@ -33,7 +33,7 @@ make-%:
@if [ -f $*/Makefile ]; then make -C $*; fi
dep-%: make-%
- @if [ -f $*/requirements.yaml ]; then $(HELM_BIN) dep up $*; fi
+ @if [ -f $*/Chart.yaml ]; then $(HELM_BIN) dep up $*; fi
lint-%: dep-%
@if [ -f $*/Chart.yaml ]; then $(HELM_BIN) lint $*; fi
@@ -44,7 +44,7 @@ package-%: lint-%
@$(HELM_BIN) repo index $(PACKAGE_DIR)
clean:
- @rm -f */requirements.lock
+ @rm -f */Chart.lock
@rm -f *tgz */charts/*tgz
@rm -rf $(PACKAGE_DIR)
%:
diff --git a/kubernetes/appc/components/appc-ansible-server/Chart.yaml b/kubernetes/appc/components/appc-ansible-server/Chart.yaml
index 6896de06a6..6bdd1ecaef 100644
--- a/kubernetes/appc/components/appc-ansible-server/Chart.yaml
+++ b/kubernetes/appc/components/appc-ansible-server/Chart.yaml
@@ -1,5 +1,6 @@
# Copyright © 2018 Amdocs, Bell Canada, AT&T
# Modifications Copyright © 2021 Orange
+# Modifications Copyright © 2021 Nordix Foundation
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -13,7 +14,15 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-apiVersion: v1
+apiVersion: v2
description: ONAP APPC Ansible Server
name: appc-ansible-server
-version: 9.0.0
+version: 10.0.0
+
+dependencies:
+ - name: common
+ version: ~10.x-0
+ repository: '@local'
+ - name: repositoryGenerator
+ version: ~10.x-0
+ repository: '@local'
diff --git a/kubernetes/appc/components/appc-ansible-server/requirements.yaml b/kubernetes/appc/components/appc-ansible-server/requirements.yaml
deleted file mode 100644
index 0cbc5060f2..0000000000
--- a/kubernetes/appc/components/appc-ansible-server/requirements.yaml
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright © 2018 Amdocs, Bell Canada, AT&T
-# Modifications Copyright © 2021 Orange
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-dependencies:
- - name: common
- version: ~9.x-0
- repository: '@local'
- - name: repositoryGenerator
- version: ~9.x-0
- repository: '@local'
diff --git a/kubernetes/appc/components/appc-cdt/Chart.yaml b/kubernetes/appc/components/appc-cdt/Chart.yaml
index e8e41770f1..3cb22a4db6 100644
--- a/kubernetes/appc/components/appc-cdt/Chart.yaml
+++ b/kubernetes/appc/components/appc-cdt/Chart.yaml
@@ -1,5 +1,6 @@
# Copyright © 2018 AT&T, Amdocs, Bell Canada Intellectual Property. All rights reserved.
# Modifications Copyright © 2021 Orange
+# Modifications Copyright © 2021 Nordix Foundation
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -13,7 +14,18 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-apiVersion: v1
+apiVersion: v2
description: ONAP APPC Self Service Controller Design Tool
name: appc-cdt
-version: 9.0.0
+version: 10.0.0
+
+dependencies:
+ - name: common
+ version: ~10.x-0
+ repository: '@local'
+ - name: certInitializer
+ version: ~10.x-0
+ repository: '@local'
+ - name: repositoryGenerator
+ version: ~10.x-0
+ repository: '@local'
diff --git a/kubernetes/appc/components/appc-cdt/requirements.yaml b/kubernetes/appc/components/appc-cdt/requirements.yaml
deleted file mode 100644
index 517e284379..0000000000
--- a/kubernetes/appc/components/appc-cdt/requirements.yaml
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright © 2018 AT&T, Amdocs, Bell Canada Intellectual Property. All rights reserved.
-# Modifications Copyright © 2021 Orange
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-dependencies:
- - name: common
- version: ~9.x-0
- repository: '@local'
- - name: certInitializer
- version: ~9.x-0
- repository: '@local'
- - name: repositoryGenerator
- version: ~9.x-0
- repository: '@local'
diff --git a/kubernetes/appc/requirements.yaml b/kubernetes/appc/requirements.yaml
deleted file mode 100644
index 886e216704..0000000000
--- a/kubernetes/appc/requirements.yaml
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright © 2018 AT&T, Amdocs, Bell Canada Intellectual Property. All rights reserved.
-# Modifications Copyright © 2021 Orange
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-dependencies:
- - name: common
- version: ~9.x-0
- repository: '@local'
- - name: mariadb-galera
- version: ~9.x-0
- repository: '@local'
- - name: dgbuilder
- version: ~9.x-0
- repository: '@local'
- - name: repositoryGenerator
- version: ~9.x-0
- repository: '@local'
- - name: appc-ansible-server
- version: ~9.x-0
- repository: 'file://components/appc-ansible-server'
- condition: appc-ansible-server.enabled
- - name: appc-cdt
- version: ~9.x-0
- repository: 'file://components/appc-cdt'
- condition: appc-cdt.enabled
diff --git a/kubernetes/cds/Chart.yaml b/kubernetes/cds/Chart.yaml
index f2f6cc5092..2659767929 100644
--- a/kubernetes/cds/Chart.yaml
+++ b/kubernetes/cds/Chart.yaml
@@ -1,5 +1,6 @@
# Copyright © 2017 Amdocs, Bell Canada
# Modifications Copyright © 2018-2021 Orange
+# Modifications Copyright © 2021 Nordix Foundation
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -13,7 +14,35 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-apiVersion: v1
+apiVersion: v2
description: ONAP Controller Design Studio (CDS)
name: cds
-version: 9.0.0
+version: 10.0.0
+
+dependencies:
+ - name: common
+ version: ~10.x-0
+ repository: '@local'
+ - name: mariadb-galera
+ version: ~10.x-0
+ repository: '@local'
+ - name: cds-blueprints-processor
+ version: ~10.x-0
+ repository: 'file://components/cds-blueprints-processor'
+ condition: cds-blueprints-processor.enabled
+ - name: cds-command-executor
+ version: ~10.x-0
+ repository: 'file://components/cds-command-executor'
+ condition: cds-command-executor.enabled
+ - name: cds-py-executor
+ version: ~10.x-0
+ repository: 'file://components/cds-py-executor'
+ condition: cds-py-executor.enabled
+ - name: cds-sdc-listener
+ version: ~10.x-0
+ repository: 'file://components/cds-sdc-listener'
+ condition: cds-sdc-listener.enabled
+ - name: cds-ui
+ version: ~10.x-0
+ repository: 'file://components/cds-ui'
+ condition: cds-ui.enabled
diff --git a/kubernetes/cds/Makefile b/kubernetes/cds/Makefile
index 4c79718d02..51d7de122c 100644
--- a/kubernetes/cds/Makefile
+++ b/kubernetes/cds/Makefile
@@ -33,7 +33,7 @@ make-%:
@if [ -f $*/Makefile ]; then make -C $*; fi
dep-%: make-%
- @if [ -f $*/requirements.yaml ]; then $(HELM_BIN) dep up $*; fi
+ @if [ -f $*/Chart.yaml ]; then $(HELM_BIN) dep up $*; fi
lint-%: dep-%
@if [ -f $*/Chart.yaml ]; then $(HELM_BIN) lint $*; fi
@@ -44,7 +44,7 @@ package-%: lint-%
@$(HELM_BIN) repo index $(PACKAGE_DIR)
clean:
- @rm -f */requirements.lock
+ @rm -f */Chart.lock
@rm -f *tgz */charts/*tgz
@rm -rf $(PACKAGE_DIR)
%:
diff --git a/kubernetes/cds/components/Makefile b/kubernetes/cds/components/Makefile
index bf267b7720..f4c9784bc4 100644
--- a/kubernetes/cds/components/Makefile
+++ b/kubernetes/cds/components/Makefile
@@ -33,7 +33,7 @@ make-%:
@if [ -f $*/Makefile ]; then make -C $*; fi
dep-%: make-%
- @if [ -f $*/requirements.yaml ]; then $(HELM_BIN) dep up $*; fi
+ @if [ -f $*/Chart.yaml ]; then $(HELM_BIN) dep up $*; fi
lint-%: dep-%
@if [ -f $*/Chart.yaml ]; then $(HELM_BIN) lint $*; fi
@@ -44,7 +44,7 @@ package-%: lint-%
@$(HELM_BIN) repo index $(PACKAGE_DIR)
clean:
- @rm -f */requirements.lock
+ @rm -f */Chart.lock
@rm -f *tgz */charts/*tgz
@rm -rf $(PACKAGE_DIR)
%:
diff --git a/kubernetes/cds/components/cds-blueprints-processor/Chart.yaml b/kubernetes/cds/components/cds-blueprints-processor/Chart.yaml
index 18c18b6630..4374926e40 100755
--- a/kubernetes/cds/components/cds-blueprints-processor/Chart.yaml
+++ b/kubernetes/cds/components/cds-blueprints-processor/Chart.yaml
@@ -1,5 +1,6 @@
# Copyright (c) 2019 IBM, Bell Canada
# Modifications Copyright © 2021 Orange
+# Modifications Copyright © 2021 Nordix Foundation
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -13,7 +14,21 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-apiVersion: v1
+apiVersion: v2
description: ONAP CDS Blueprints Processor
name: cds-blueprints-processor
-version: 9.0.0
+version: 10.0.0
+
+dependencies:
+ - name: common
+ version: ~10.x-0
+ repository: '@local'
+ - name: repositoryGenerator
+ version: ~10.x-0
+ repository: '@local'
+ - name: serviceAccount
+ version: ~10.x-0
+ repository: '@local'
+ - name: certInitializer
+ version: ~10.x-0
+ repository: '@local'
diff --git a/kubernetes/cds/components/cds-blueprints-processor/requirements.yaml b/kubernetes/cds/components/cds-blueprints-processor/requirements.yaml
deleted file mode 100755
index 84fa9c4ce8..0000000000
--- a/kubernetes/cds/components/cds-blueprints-processor/requirements.yaml
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright (c) 2019 IBM, Bell Canada
-# Modifications Copyright © 2021 Orange
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-dependencies:
- - name: common
- version: ~9.x-0
- repository: '@local'
- - name: repositoryGenerator
- version: ~9.x-0
- repository: '@local'
- - name: serviceAccount
- version: ~9.x-0
- repository: '@local'
- - name: certInitializer
- version: ~9.x-0
- repository: '@local'
diff --git a/kubernetes/cds/components/cds-command-executor/Chart.yaml b/kubernetes/cds/components/cds-command-executor/Chart.yaml
index 8d0e5f3c76..e6b87930e3 100755
--- a/kubernetes/cds/components/cds-command-executor/Chart.yaml
+++ b/kubernetes/cds/components/cds-command-executor/Chart.yaml
@@ -1,5 +1,6 @@
# Copyright (c) 2019 Bell Canada
# Modifications Copyright © 2021 Orange
+# Modifications Copyright © 2021 Nordix Foundation
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -13,7 +14,18 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-apiVersion: v1
+apiVersion: v2
description: ONAP CDS Command Executor
name: cds-command-executor
-version: 9.0.0
+version: 10.0.0
+
+dependencies:
+ - name: common
+ version: ~10.x-0
+ repository: '@local'
+ - name: repositoryGenerator
+ version: ~10.x-0
+ repository: '@local'
+ - name: serviceAccount
+ version: ~10.x-0
+ repository: '@local' \ No newline at end of file
diff --git a/kubernetes/cds/components/cds-command-executor/requirements.yaml b/kubernetes/cds/components/cds-command-executor/requirements.yaml
deleted file mode 100755
index 59ed00428a..0000000000
--- a/kubernetes/cds/components/cds-command-executor/requirements.yaml
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright (c) 2019 Bell Canada
-# Modifications Copyright © 2021 Orange
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-dependencies:
- - name: common
- version: ~9.x-0
- repository: '@local'
- - name: repositoryGenerator
- version: ~9.x-0
- repository: '@local'
- - name: serviceAccount
- version: ~9.x-0
- repository: '@local'
diff --git a/kubernetes/cds/components/cds-py-executor/Chart.yaml b/kubernetes/cds/components/cds-py-executor/Chart.yaml
index d0bfc51c16..702d183555 100755
--- a/kubernetes/cds/components/cds-py-executor/Chart.yaml
+++ b/kubernetes/cds/components/cds-py-executor/Chart.yaml
@@ -1,5 +1,6 @@
# Copyright (c) 2020 Bell Canada, Deutsche Telekom
# Modifications Copyright © 2021 Orange
+# Modifications Copyright © 2021 Nordix Foundation
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -13,7 +14,18 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-apiVersion: v1
+apiVersion: v2
description: ONAP CDS Py Executor
name: cds-py-executor
-version: 9.0.0
+version: 10.0.0
+
+dependencies:
+ - name: common
+ version: ~10.x-0
+ repository: '@local'
+ - name: repositoryGenerator
+ version: ~10.x-0
+ repository: '@local'
+ - name: serviceAccount
+ version: ~10.x-0
+ repository: '@local'
diff --git a/kubernetes/cds/components/cds-py-executor/requirements.yaml b/kubernetes/cds/components/cds-py-executor/requirements.yaml
deleted file mode 100755
index 331a2a4810..0000000000
--- a/kubernetes/cds/components/cds-py-executor/requirements.yaml
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright (c) 2020 Bell Canada, Deutsche Telekom
-# Modifications Copyright © 2021 Orange
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-dependencies:
- - name: common
- version: ~9.x-0
- repository: '@local'
- - name: repositoryGenerator
- version: ~9.x-0
- repository: '@local'
- - name: serviceAccount
- version: ~9.x-0
- repository: '@local'
diff --git a/kubernetes/cds/components/cds-sdc-listener/Chart.yaml b/kubernetes/cds/components/cds-sdc-listener/Chart.yaml
index 8897062a39..3c547b9c76 100755
--- a/kubernetes/cds/components/cds-sdc-listener/Chart.yaml
+++ b/kubernetes/cds/components/cds-sdc-listener/Chart.yaml
@@ -1,5 +1,6 @@
# Copyright (c) 2019 Bell Canada
# Modifications Copyright © 2021 Orange
+# Modifications Copyright © 2021 Nordix Foundation
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -13,7 +14,18 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-apiVersion: v1
+apiVersion: v2
description: ONAP CDS SDC listener microservice
name: cds-sdc-listener
-version: 9.0.0
+version: 10.0.0
+
+dependencies:
+ - name: common
+ version: ~10.x-0
+ repository: '@local'
+ - name: repositoryGenerator
+ version: ~10.x-0
+ repository: '@local'
+ - name: serviceAccount
+ version: ~10.x-0
+ repository: '@local' \ No newline at end of file
diff --git a/kubernetes/cds/components/cds-sdc-listener/requirements.yaml b/kubernetes/cds/components/cds-sdc-listener/requirements.yaml
deleted file mode 100755
index 59ed00428a..0000000000
--- a/kubernetes/cds/components/cds-sdc-listener/requirements.yaml
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright (c) 2019 Bell Canada
-# Modifications Copyright © 2021 Orange
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-dependencies:
- - name: common
- version: ~9.x-0
- repository: '@local'
- - name: repositoryGenerator
- version: ~9.x-0
- repository: '@local'
- - name: serviceAccount
- version: ~9.x-0
- repository: '@local'
diff --git a/kubernetes/cds/components/cds-ui/Chart.yaml b/kubernetes/cds/components/cds-ui/Chart.yaml
index 5d40e2bdb8..e220b0ceab 100644
--- a/kubernetes/cds/components/cds-ui/Chart.yaml
+++ b/kubernetes/cds/components/cds-ui/Chart.yaml
@@ -1,5 +1,6 @@
# Copyright (c) 2019 Bell Canada
# Modifications Copyright © 2021 Orange
+# Modifications Copyright © 2021 Nordix Foundation
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -13,7 +14,21 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-apiVersion: v1
+apiVersion: v2
description: ONAP CDS UI
name: cds-ui
-version: 9.0.0
+version: 10.0.0
+
+dependencies:
+ - name: common
+ version: ~10.x-0
+ repository: '@local'
+ - name: certInitializer
+ version: ~10.x-0
+ repository: '@local'
+ - name: repositoryGenerator
+ version: ~10.x-0
+ repository: '@local'
+ - name: serviceAccount
+ version: ~10.x-0
+ repository: '@local'
diff --git a/kubernetes/cds/components/cds-ui/requirements.yaml b/kubernetes/cds/components/cds-ui/requirements.yaml
deleted file mode 100644
index fec1da905d..0000000000
--- a/kubernetes/cds/components/cds-ui/requirements.yaml
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright (c) 2019 Bell Canada
-# Modifications Copyright © 2021 Orange
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-dependencies:
- - name: common
- version: ~9.x-0
- repository: '@local'
- - name: certInitializer
- version: ~9.x-0
- repository: '@local'
- - name: repositoryGenerator
- version: ~9.x-0
- repository: '@local'
- - name: serviceAccount
- version: ~9.x-0
- repository: '@local'
diff --git a/kubernetes/cds/requirements.yaml b/kubernetes/cds/requirements.yaml
deleted file mode 100644
index c5c05bb43d..0000000000
--- a/kubernetes/cds/requirements.yaml
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright © 2017 Amdocs, Bell Canada
-# Modifications Copyright © 2018,2020-2021 Orange
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-dependencies:
- - name: common
- version: ~9.x-0
- repository: '@local'
- - name: mariadb-galera
- version: ~9.x-0
- repository: '@local'
- - name: cds-blueprints-processor
- version: ~9.x-0
- repository: 'file://components/cds-blueprints-processor'
- condition: cds-blueprints-processor.enabled
- - name: cds-command-executor
- version: ~9.x-0
- repository: 'file://components/cds-command-executor'
- condition: cds-command-executor.enabled
- - name: cds-py-executor
- version: ~9.x-0
- repository: 'file://components/cds-py-executor'
- condition: cds-py-executor.enabled
- - name: cds-sdc-listener
- version: ~9.x-0
- repository: 'file://components/cds-sdc-listener'
- condition: cds-sdc-listener.enabled
- - name: cds-ui
- version: ~9.x-0
- repository: 'file://components/cds-ui'
- condition: cds-ui.enabled
diff --git a/kubernetes/cli/Chart.yaml b/kubernetes/cli/Chart.yaml
index b6c6b16990..3f91203c1d 100644
--- a/kubernetes/cli/Chart.yaml
+++ b/kubernetes/cli/Chart.yaml
@@ -1,5 +1,6 @@
# Copyright © 2017 Amdocs, Bell Canada
# Modifications Copyright © 2021 Orange
+# Modifications Copyright © 2021 Nordix Foundation
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -13,7 +14,24 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-apiVersion: v1
+apiVersion: v2
description: ONAP Command Line Interface
name: cli
-version: 9.0.0
+version: 10.0.0
+
+dependencies:
+ - name: common
+ version: ~10.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: certInitializer
+ version: ~10.x-0
+ repository: '@local'
+ - name: repositoryGenerator
+ version: ~10.x-0
+ repository: '@local'
+ - name: serviceAccount
+ version: ~10.x-0
+ repository: '@local'
diff --git a/kubernetes/cli/requirements.yaml b/kubernetes/cli/requirements.yaml
deleted file mode 100644
index 4f792577c1..0000000000
--- a/kubernetes/cli/requirements.yaml
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright © 2017 Amdocs, Bell Canada
-# Modifications Copyright © 2021 Orange
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-dependencies:
- - name: common
- version: ~9.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: certInitializer
- version: ~9.x-0
- repository: '@local'
- - name: repositoryGenerator
- version: ~9.x-0
- repository: '@local'
- - name: serviceAccount
- version: ~9.x-0
- repository: '@local'
diff --git a/kubernetes/common/Makefile b/kubernetes/common/Makefile
index 6442068b2f..6d5d9365b7 100644
--- a/kubernetes/common/Makefile
+++ b/kubernetes/common/Makefile
@@ -40,7 +40,7 @@ make-%:
@if [ -f $*/Makefile ]; then make -C $*; fi
dep-%: make-%
- @if [ -f $*/requirements.yaml ]; then $(HELM_BIN) dep up $*; fi
+ @if [ -f $*/Chart.yaml ]; then $(HELM_BIN) dep up $*; fi
lint-%: dep-%
@if [ -f $*/Chart.yaml ]; then $(HELM_BIN) lint $*; fi
@@ -55,7 +55,7 @@ endif
@$(HELM_BIN) repo index $(PACKAGE_DIR)
clean:
- @rm -f */requirements.lock
+ @rm -f */Chart.lock
@rm -f *tgz */charts/*tgz
@rm -rf $(PACKAGE_DIR)
%:
diff --git a/kubernetes/common/cassandra/Chart.yaml b/kubernetes/common/cassandra/Chart.yaml
index ea00e39c27..f2f7ffa6a2 100644
--- a/kubernetes/common/cassandra/Chart.yaml
+++ b/kubernetes/common/cassandra/Chart.yaml
@@ -1,5 +1,6 @@
# Copyright © 2018 Amdocs, Bell Canada, AT&T
# Modifications Copyright © 2021 Orange
+# Modifications Copyright © 2021 Nordix Foundation
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -14,7 +15,18 @@
# limitations under the License.
-apiVersion: v1
+apiVersion: v2
description: ONAP cassandra
name: cassandra
-version: 9.0.0
+version: 10.0.0
+
+dependencies:
+ - name: common
+ version: ~10.x-0
+ repository: 'file://../common'
+ - name: repositoryGenerator
+ version: ~10.x-0
+ repository: 'file://../repositoryGenerator'
+ - name: serviceAccount
+ version: ~10.x-0
+ repository: 'file://../serviceAccount'
diff --git a/kubernetes/common/cassandra/requirements.yaml b/kubernetes/common/cassandra/requirements.yaml
deleted file mode 100644
index 4189d43387..0000000000
--- a/kubernetes/common/cassandra/requirements.yaml
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright © 2018 Amdocs, Bell Canada
-# Modifications Copyright © 2018 AT&T
-# Modifications Copyright © 2021 Orange
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-dependencies:
- - name: common
- version: ~9.x-0
- repository: 'file://../common'
- - name: repositoryGenerator
- version: ~9.x-0
- repository: 'file://../repositoryGenerator'
- - name: serviceAccount
- version: ~9.x-0
- repository: 'file://../serviceAccount'
diff --git a/kubernetes/common/cassandra/resources/config/docker-entrypoint.sh b/kubernetes/common/cassandra/resources/config/docker-entrypoint.sh
index 4dcebc8883..f9f62739f2 100644
--- a/kubernetes/common/cassandra/resources/config/docker-entrypoint.sh
+++ b/kubernetes/common/cassandra/resources/config/docker-entrypoint.sh
@@ -29,7 +29,8 @@ _ip_address() {
# "sed -i", but without "mv" (which doesn't work on a bind-mounted file, for example)
_sed_in_place() {
- local filename="$1"; shift
+ local filename
+ filename="$1"; shift
local tempFile
tempFile="$(mktemp)"
sed "$@" "$filename" > "$tempFile"
diff --git a/kubernetes/common/cert-wrapper/Chart.yaml b/kubernetes/common/cert-wrapper/Chart.yaml
index 242bb46e7d..550de8d618 100644
--- a/kubernetes/common/cert-wrapper/Chart.yaml
+++ b/kubernetes/common/cert-wrapper/Chart.yaml
@@ -1,5 +1,6 @@
# Copyright © 2020 Samsung Electronics
# Modifications Copyright © 2021 Orange
+# Modifications Copyright © 2021 Nordix Foundation
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -13,7 +14,12 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-apiVersion: v1
+apiVersion: v2
description: Wrapper chart to allow truststore to be shared among cert-initializer instances
name: cert-wrapper
-version: 9.0.0
+version: 10.0.0
+
+dependencies:
+ - name: certInitializer
+ version: ~10.x-0
+ repository: 'file://../certInitializer'
diff --git a/kubernetes/common/cert-wrapper/requirements.yaml b/kubernetes/common/cert-wrapper/requirements.yaml
deleted file mode 100644
index 08cf5307c8..0000000000
--- a/kubernetes/common/cert-wrapper/requirements.yaml
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright © 2020 Samsung Electronics
-# Modifications Copyright © 2021 Orange
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-dependencies:
- - name: certInitializer
- version: ~9.x-0
- repository: 'file://../certInitializer'
diff --git a/kubernetes/common/certInitializer/Chart.yaml b/kubernetes/common/certInitializer/Chart.yaml
index 0ed89d48fb..0f62dc7ae8 100644
--- a/kubernetes/common/certInitializer/Chart.yaml
+++ b/kubernetes/common/certInitializer/Chart.yaml
@@ -1,5 +1,6 @@
# Copyright © 2017 Amdocs, Bell Canada
# Modifications Copyright © 2021 Orange
+# Modifications Copyright © 2021 Nordix Foundation
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -13,7 +14,18 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-apiVersion: v1
+apiVersion: v2
description: Template used to obtain certificates in onap
name: certInitializer
-version: 9.0.0
+version: 10.0.0
+
+dependencies:
+ - name: common
+ version: ~10.x-0
+ repository: 'file://../common'
+ - name: readinessCheck
+ version: ~10.x-0
+ repository: 'file://../readinessCheck'
+ - name: repositoryGenerator
+ version: ~10.x-0
+ repository: 'file://../repositoryGenerator'
diff --git a/kubernetes/common/certInitializer/requirements.yaml b/kubernetes/common/certInitializer/requirements.yaml
deleted file mode 100644
index 96b54cdc13..0000000000
--- a/kubernetes/common/certInitializer/requirements.yaml
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright © 2018 Amdocs, Bell Canada
-# Modifications Copyright © 2021 Orange
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-dependencies:
- - name: common
- version: ~9.x-0
- repository: 'file://../common'
- - name: readinessCheck
- version: ~9.x-0
- repository: 'file://../readinessCheck'
- - name: repositoryGenerator
- version: ~9.x-0
- repository: 'file://../repositoryGenerator'
diff --git a/kubernetes/common/certManagerCertificate/Chart.yaml b/kubernetes/common/certManagerCertificate/Chart.yaml
index 84b9670d30..807b90d4c2 100644
--- a/kubernetes/common/certManagerCertificate/Chart.yaml
+++ b/kubernetes/common/certManagerCertificate/Chart.yaml
@@ -1,5 +1,6 @@
# Copyright © 2021 Nokia
# Modifications Copyright © 2021 Orange
+# Modifications Copyright © 2021 Nordix Foundation
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -13,7 +14,15 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-apiVersion: v1
+apiVersion: v2
name: certManagerCertificate
description: A Helm chart for Cert-Manager Certificate CRD template
-version: 9.0.0
+version: 10.0.0
+
+dependencies:
+ - name: common
+ version: ~10.x-0
+ repository: 'file://../common'
+ - name: cmpv2Config
+ version: ~10.x-0
+ repository: 'file://../cmpv2Config'
diff --git a/kubernetes/common/certManagerCertificate/requirements.yaml b/kubernetes/common/certManagerCertificate/requirements.yaml
deleted file mode 100644
index 42420ced52..0000000000
--- a/kubernetes/common/certManagerCertificate/requirements.yaml
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright © 2021 Nokia
-# Modifications Copyright © 2021 Orange
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-dependencies:
- - name: common
- version: ~9.x-0
- repository: 'file://../common'
- - name: cmpv2Config
- version: ~9.x-0
- repository: 'file://../cmpv2Config'
diff --git a/kubernetes/common/cmpv2Config/Chart.yaml b/kubernetes/common/cmpv2Config/Chart.yaml
index fb1c2d21ee..5210061426 100644
--- a/kubernetes/common/cmpv2Config/Chart.yaml
+++ b/kubernetes/common/cmpv2Config/Chart.yaml
@@ -1,5 +1,6 @@
# Copyright © 2020 Nokia
# Modifications Copyright © 2021 Orange
+# Modifications Copyright © 2021 Nordix Foundation
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -13,7 +14,12 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-apiVersion: v1
+apiVersion: v2
description: Template used to store cmpv2 configuration in onap
name: cmpv2Config
-version: 9.0.0
+version: 10.0.0
+
+dependencies:
+ - name: common
+ version: ~10.x-0
+ repository: 'file://../common'
diff --git a/kubernetes/common/cmpv2Config/requirements.yaml b/kubernetes/common/cmpv2Config/requirements.yaml
deleted file mode 100644
index f5c9d0c76c..0000000000
--- a/kubernetes/common/cmpv2Config/requirements.yaml
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright © 2020 Nokia
-# Modifications Copyright © 2021 Orange
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-dependencies:
- - name: common
- version: ~9.x-0
- repository: 'file://../common'
diff --git a/kubernetes/common/common/Chart.yaml b/kubernetes/common/common/Chart.yaml
index 1307a8adbc..15a3f721c3 100644
--- a/kubernetes/common/common/Chart.yaml
+++ b/kubernetes/common/common/Chart.yaml
@@ -13,7 +13,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-apiVersion: v1
+apiVersion: v2
description: Common templates for inclusion in other charts
name: common
-version: 9.0.0
+version: 10.0.0
diff --git a/kubernetes/common/dgbuilder/Chart.yaml b/kubernetes/common/dgbuilder/Chart.yaml
index 8f56294d7c..54106955fd 100644
--- a/kubernetes/common/dgbuilder/Chart.yaml
+++ b/kubernetes/common/dgbuilder/Chart.yaml
@@ -1,5 +1,6 @@
# Copyright © 2018 AT&T, Amdocs, Bell Canada
# Modifications Copyright © 2021 Orange
+# Modifications Copyright © 2021 Nordix Foundation
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -13,7 +14,21 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-apiVersion: v1
+apiVersion: v2
description: D.G. Builder application
name: dgbuilder
-version: 9.0.0
+version: 10.0.0
+
+dependencies:
+ - name: common
+ version: ~10.x-0
+ repository: 'file://../common'
+ - name: certInitializer
+ version: ~10.x-0
+ repository: '@local'
+ - name: repositoryGenerator
+ version: ~10.x-0
+ repository: 'file://../repositoryGenerator'
+ - name: serviceAccount
+ version: ~10.x-0
+ repository: 'file://../serviceAccount'
diff --git a/kubernetes/common/dgbuilder/requirements.yaml b/kubernetes/common/dgbuilder/requirements.yaml
deleted file mode 100644
index 5e56fe79e1..0000000000
--- a/kubernetes/common/dgbuilder/requirements.yaml
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright © 2018 AT&T, Amdocs, Bell Canada
-# Modifications Copyright © 2021 Orange
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-dependencies:
- - name: common
- version: ~9.x-0
- repository: 'file://../common'
- - name: certInitializer
- version: ~9.x-0
- repository: '@local'
- - name: repositoryGenerator
- version: ~9.x-0
- repository: 'file://../repositoryGenerator'
- - name: serviceAccount
- version: ~9.x-0
- repository: 'file://../serviceAccount'
diff --git a/kubernetes/common/elasticsearch/Chart.yaml b/kubernetes/common/elasticsearch/Chart.yaml
index 225e6c3816..6f6df2247d 100644
--- a/kubernetes/common/elasticsearch/Chart.yaml
+++ b/kubernetes/common/elasticsearch/Chart.yaml
@@ -1,5 +1,6 @@
# Copyright © 2020 Bitnami, AT&T, Amdocs, Bell Canada, highstreet technologies
# Modifications Copyright © 2021 Orange
+# Modifications Copyright © 2021 Nordix Foundation
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -14,7 +15,29 @@
# limitations under the License.
-apiVersion: v1
+apiVersion: v2
description: ONAP elasticsearch
name: elasticsearch
-version: 9.0.0
+version: 10.0.0
+
+dependencies:
+ - name: common
+ version: ~10.x-0
+ repository: 'file://../common'
+ - name: master
+ version: ~10.x-0
+ repository: 'file://components/master'
+ - name: data
+ version: ~10.x-0
+ repository: 'file://components/data'
+ condition: elasticsearch.data.enabled,data.enabled
+ - name: curator
+ version: ~10.x-0
+ repository: 'file://components/curator'
+ condition: elasticsearch.curator.enabled,curator.enabled
+ - name: certInitializer
+ version: ~10.x-0
+ repository: 'file://../certInitializer'
+ - name: repositoryGenerator
+ version: ~10.x-0
+ repository: 'file://../repositoryGenerator'
diff --git a/kubernetes/common/elasticsearch/Makefile b/kubernetes/common/elasticsearch/Makefile
index 4c79718d02..51d7de122c 100644
--- a/kubernetes/common/elasticsearch/Makefile
+++ b/kubernetes/common/elasticsearch/Makefile
@@ -33,7 +33,7 @@ make-%:
@if [ -f $*/Makefile ]; then make -C $*; fi
dep-%: make-%
- @if [ -f $*/requirements.yaml ]; then $(HELM_BIN) dep up $*; fi
+ @if [ -f $*/Chart.yaml ]; then $(HELM_BIN) dep up $*; fi
lint-%: dep-%
@if [ -f $*/Chart.yaml ]; then $(HELM_BIN) lint $*; fi
@@ -44,7 +44,7 @@ package-%: lint-%
@$(HELM_BIN) repo index $(PACKAGE_DIR)
clean:
- @rm -f */requirements.lock
+ @rm -f */Chart.lock
@rm -f *tgz */charts/*tgz
@rm -rf $(PACKAGE_DIR)
%:
diff --git a/kubernetes/common/elasticsearch/components/Makefile b/kubernetes/common/elasticsearch/components/Makefile
index f2e7a1fb82..1ea8433a9c 100644
--- a/kubernetes/common/elasticsearch/components/Makefile
+++ b/kubernetes/common/elasticsearch/components/Makefile
@@ -33,7 +33,7 @@ make-%:
@if [ -f $*/Makefile ]; then make -C $*; fi
dep-%: make-%
- @if [ -f $*/requirements.yaml ]; then $(HELM_BIN) dep up $*; fi
+ @if [ -f $*/Chart.yaml ]; then $(HELM_BIN) dep up $*; fi
lint-%: dep-%
@if [ -f $*/Chart.yaml ]; then $(HELM_BIN) lint $*; fi
@@ -44,7 +44,7 @@ package-%: lint-%
@$(HELM_BIN) repo index $(PACKAGE_DIR)
clean:
- @rm -f */requirements.lock
+ @rm -f */Chart.lock
@rm -f *tgz */charts/*tgz
@rm -rf $(PACKAGE_DIR)
%:
diff --git a/kubernetes/common/elasticsearch/components/curator/Chart.yaml b/kubernetes/common/elasticsearch/components/curator/Chart.yaml
index 1e51feca30..b1e80f034c 100644
--- a/kubernetes/common/elasticsearch/components/curator/Chart.yaml
+++ b/kubernetes/common/elasticsearch/components/curator/Chart.yaml
@@ -1,5 +1,6 @@
# Copyright © 2020 Bitnami, AT&T, Amdocs, Bell Canada, highstreet technologies
# Modifications Copyright © 2021 Orange
+# Modifications Copyright © 2021 Nordix Foundation
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -14,7 +15,15 @@
# limitations under the License.
-apiVersion: v1
+apiVersion: v2
description: ONAP elasticsearch curator
name: curator
-version: 9.0.0
+version: 10.0.0
+
+dependencies:
+ - name: common
+ version: ~10.x-0
+ repository: 'file://../../../common'
+ - name: repositoryGenerator
+ version: ~10.x-0
+ repository: 'file://../../../repositoryGenerator' \ No newline at end of file
diff --git a/kubernetes/common/elasticsearch/components/curator/requirements.yaml b/kubernetes/common/elasticsearch/components/curator/requirements.yaml
deleted file mode 100644
index e9170767dd..0000000000
--- a/kubernetes/common/elasticsearch/components/curator/requirements.yaml
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright © 2020 Bitnami, AT&T, Amdocs, Bell Canada, highstreet technologies
-# Modifications Copyright © 2021 Orange
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-dependencies:
- - name: common
- version: ~9.x-0
- repository: 'file://../../../common'
- - name: repositoryGenerator
- version: ~9.x-0
- repository: 'file://../../../repositoryGenerator'
diff --git a/kubernetes/common/elasticsearch/components/data/Chart.yaml b/kubernetes/common/elasticsearch/components/data/Chart.yaml
index 2218befc4e..fc5d402a95 100644
--- a/kubernetes/common/elasticsearch/components/data/Chart.yaml
+++ b/kubernetes/common/elasticsearch/components/data/Chart.yaml
@@ -1,5 +1,6 @@
# Copyright © 2020 Bitnami, AT&T, Amdocs, Bell Canada, highstreet technologies
# Modifications Copyright © 2021 Orange
+# Modifications Copyright © 2021 Nordix Foundation
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -14,7 +15,15 @@
# limitations under the License.
-apiVersion: v1
+apiVersion: v2
description: ONAP elasticsearch data
name: data
-version: 9.0.0
+version: 10.0.0
+
+dependencies:
+ - name: common
+ version: ~10.x-0
+ repository: 'file://../../../common'
+ - name: repositoryGenerator
+ version: ~10.x-0
+ repository: 'file://../../../repositoryGenerator'
diff --git a/kubernetes/common/elasticsearch/components/data/requirements.yaml b/kubernetes/common/elasticsearch/components/data/requirements.yaml
deleted file mode 100644
index 6212efabe3..0000000000
--- a/kubernetes/common/elasticsearch/components/data/requirements.yaml
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright © 2017 Amdocs, Bell Canada
-# Modifications Copyright © 2021 Orange
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-dependencies:
- - name: common
- version: ~9.x-0
- repository: 'file://../../../common'
- - name: repositoryGenerator
- version: ~9.x-0
- repository: 'file://../../../repositoryGenerator'
diff --git a/kubernetes/common/elasticsearch/components/master/Chart.yaml b/kubernetes/common/elasticsearch/components/master/Chart.yaml
index 49ed5d0e8d..01ee8f3c20 100644
--- a/kubernetes/common/elasticsearch/components/master/Chart.yaml
+++ b/kubernetes/common/elasticsearch/components/master/Chart.yaml
@@ -1,5 +1,6 @@
# Copyright © 2020 Bitnami, AT&T, Amdocs, Bell Canada, highstreet technologies
# Modifications Copyright © 2021 Orange
+# Modifications Copyright © 2021 Nordix Foundation
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -13,9 +14,15 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-
-
-apiVersion: v1
+apiVersion: v2
description: ONAP elasticsearch master
name: master
-version: 9.0.0
+version: 10.0.0
+
+dependencies:
+ - name: common
+ version: ~10.x-0
+ repository: 'file://../../../common'
+ - name: repositoryGenerator
+ version: ~10.x-0
+ repository: 'file://../../../repositoryGenerator'
diff --git a/kubernetes/common/elasticsearch/components/master/requirements.yaml b/kubernetes/common/elasticsearch/components/master/requirements.yaml
deleted file mode 100644
index 6212efabe3..0000000000
--- a/kubernetes/common/elasticsearch/components/master/requirements.yaml
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright © 2017 Amdocs, Bell Canada
-# Modifications Copyright © 2021 Orange
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-dependencies:
- - name: common
- version: ~9.x-0
- repository: 'file://../../../common'
- - name: repositoryGenerator
- version: ~9.x-0
- repository: 'file://../../../repositoryGenerator'
diff --git a/kubernetes/common/elasticsearch/requirements.yaml b/kubernetes/common/elasticsearch/requirements.yaml
deleted file mode 100644
index c41b3603e9..0000000000
--- a/kubernetes/common/elasticsearch/requirements.yaml
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright © 2020 Bitnami, AT&T, Amdocs, Bell Canada, highstreet technologies
-# Modifications Copyright © 2021 Orange
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-dependencies:
- - name: common
- version: ~9.x-0
- repository: 'file://../common'
- - name: master
- version: ~9.x-0
- repository: 'file://components/master'
- - name: data
- version: ~9.x-0
- repository: 'file://components/data'
- condition: elasticsearch.data.enabled,data.enabled
- - name: curator
- version: ~9.x-0
- repository: 'file://components/curator'
- condition: elasticsearch.curator.enabled,curator.enabled
- - name: certInitializer
- version: ~9.x-0
- repository: 'file://../certInitializer'
- - name: repositoryGenerator
- version: ~9.x-0
- repository: 'file://../repositoryGenerator'
diff --git a/kubernetes/common/etcd-init/Chart.yaml b/kubernetes/common/etcd-init/Chart.yaml
index 065d3dafa9..7f1e89e433 100644
--- a/kubernetes/common/etcd-init/Chart.yaml
+++ b/kubernetes/common/etcd-init/Chart.yaml
@@ -1,5 +1,6 @@
# Copyright (C) 2021 Wipro Limited.
# Modifications Copyright © 2021 Orange
+# Modifications Copyright © 2021 Nordix Foundation
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -13,7 +14,15 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-apiVersion: v1
+apiVersion: v2
description: Chart for etcd init job
name: etcd-init
-version: 9.0.0
+version: 10.0.0
+
+dependencies:
+ - name: common
+ version: ~10.x-0
+ repository: 'file://../common'
+ - name: repositoryGenerator
+ version: ~10.x-0
+ repository: 'file://../repositoryGenerator' \ No newline at end of file
diff --git a/kubernetes/common/etcd-init/requirements.yaml b/kubernetes/common/etcd-init/requirements.yaml
deleted file mode 100644
index a8c99d6501..0000000000
--- a/kubernetes/common/etcd-init/requirements.yaml
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright (C) 2021 Wipro Limited.
-# Modifications Copyright © 2021 Orange
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-dependencies:
- - name: common
- version: ~9.x-0
- repository: 'file://../common'
- - name: repositoryGenerator
- version: ~9.x-0
- repository: 'file://../repositoryGenerator'
diff --git a/kubernetes/common/etcd/Chart.yaml b/kubernetes/common/etcd/Chart.yaml
index 1e090890f5..9bc3702501 100644
--- a/kubernetes/common/etcd/Chart.yaml
+++ b/kubernetes/common/etcd/Chart.yaml
@@ -1,5 +1,6 @@
# Copyright © 2019 Intel Corporation
# Modifications Copyright © 2021 Orange
+# Modifications Copyright © 2021 Nordix Foundation
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -13,13 +14,21 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-apiVersion: v1
+apiVersion: v2
name: etcd
home: https://github.com/coreos/etcd
-version: 9.0.0
+version: 10.0.0
appVersion: 2.2.5
description: Distributed reliable key-value store for the most critical data of a
distributed system.
-icon: https://raw.githubusercontent.com/coreos/etcd/master/logos/etcd-horizontal-color.png
sources:
- https://github.com/coreos/etcd
+
+dependencies:
+ - name: common
+ version: ~10.x-0
+ repository: 'file://../common'
+ - name: repositoryGenerator
+ version: ~10.x-0
+ repository: 'file://../repositoryGenerator'
diff --git a/kubernetes/common/etcd/requirements.yaml b/kubernetes/common/etcd/requirements.yaml
deleted file mode 100644
index 48ff493371..0000000000
--- a/kubernetes/common/etcd/requirements.yaml
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright © 2017 Amdocs, Bell Canada
-# Modifications Copyright © 2018,2020-2021 Orange
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License
-dependencies:
- - name: common
- version: ~9.x-0
- repository: 'file://../common'
- - name: repositoryGenerator
- version: ~9.x-0
- repository: 'file://../repositoryGenerator'
diff --git a/kubernetes/common/logConfiguration/Chart.yaml b/kubernetes/common/logConfiguration/Chart.yaml
index 18628048da..3bdad3d339 100644
--- a/kubernetes/common/logConfiguration/Chart.yaml
+++ b/kubernetes/common/logConfiguration/Chart.yaml
@@ -1,5 +1,6 @@
# Copyright © 2017 Amdocs, Bell Canada
# Modifications Copyright © 2021 Orange
+# Modifications Copyright © 2021 Nordix Foundation
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -13,7 +14,12 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-apiVersion: v1
+apiVersion: v2
description: Template used to create same STDOUT log configuration
name: logConfiguration
-version: 9.0.0
+version: 10.0.0
+
+dependencies:
+ - name: common
+ version: ~10.x-0
+ repository: 'file://../common'
diff --git a/kubernetes/common/logConfiguration/requirements.yaml b/kubernetes/common/logConfiguration/requirements.yaml
deleted file mode 100644
index 8af67126df..0000000000
--- a/kubernetes/common/logConfiguration/requirements.yaml
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright © 2018 Amdocs, Bell Canada
-# Modifications Copyright © 2021 Orange
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-dependencies:
- - name: common
- version: ~9.x-0
- repository: 'file://../common'
diff --git a/kubernetes/common/mariadb-galera/Chart.yaml b/kubernetes/common/mariadb-galera/Chart.yaml
index 06169519e7..c255227262 100644
--- a/kubernetes/common/mariadb-galera/Chart.yaml
+++ b/kubernetes/common/mariadb-galera/Chart.yaml
@@ -1,6 +1,7 @@
# Copyright © 2018 Amdocs, Bell Canada
# Copyright © 2020 Bitnami, Orange
# Modifications Copyright © 2021 Orange
+# Modifications Copyright © 2021 Nordix Foundation
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -14,10 +15,10 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-apiVersion: v1
+apiVersion: v2
description: Chart for MariaDB Galera cluster
name: mariadb-galera
-version: 9.0.0
+version: 10.0.0
keywords:
- mariadb
- mysql
@@ -25,3 +26,17 @@ keywords:
- sql
- galera
- cluster
+
+dependencies:
+ - name: common
+ version: ~10.x-0
+ repository: 'file://../common'
+ - name: readinessCheck
+ version: ~10.x-0
+ repository: 'file://../readinessCheck'
+ - name: repositoryGenerator
+ version: ~10.x-0
+ repository: 'file://../repositoryGenerator'
+ - name: serviceAccount
+ version: ~10.x-0
+ repository: 'file://../serviceAccount' \ No newline at end of file
diff --git a/kubernetes/common/mariadb-galera/requirements.yaml b/kubernetes/common/mariadb-galera/requirements.yaml
deleted file mode 100644
index 767336e028..0000000000
--- a/kubernetes/common/mariadb-galera/requirements.yaml
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright © 2018 Amdocs, Bell Canada
-# Copyright © 2020-2021 Orange
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-dependencies:
- - name: common
- version: ~9.x-0
- repository: 'file://../common'
- - name: readinessCheck
- version: ~9.x-0
- repository: 'file://../readinessCheck'
- - name: repositoryGenerator
- version: ~9.x-0
- repository: 'file://../repositoryGenerator'
- - name: serviceAccount
- version: ~9.x-0
- repository: 'file://../serviceAccount'
diff --git a/kubernetes/common/mariadb-init/Chart.yaml b/kubernetes/common/mariadb-init/Chart.yaml
index 357a683966..ab8110fde7 100644
--- a/kubernetes/common/mariadb-init/Chart.yaml
+++ b/kubernetes/common/mariadb-init/Chart.yaml
@@ -1,5 +1,6 @@
# Copyright © 2018 Amdocs, Bell Canada
# Modifications Copyright © 2021 Orange
+# Modifications Copyright © 2021 Nordix Foundation
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -13,7 +14,15 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-apiVersion: v1
+apiVersion: v2
description: Chart for MariaDB Galera init job
name: mariadb-init
-version: 9.0.0
+version: 10.0.0
+
+dependencies:
+ - name: common
+ version: ~10.x-0
+ repository: 'file://../common'
+ - name: repositoryGenerator
+ version: ~10.x-0
+ repository: 'file://../repositoryGenerator' \ No newline at end of file
diff --git a/kubernetes/common/mariadb-init/requirements.yaml b/kubernetes/common/mariadb-init/requirements.yaml
deleted file mode 100644
index da8305e58d..0000000000
--- a/kubernetes/common/mariadb-init/requirements.yaml
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright © 2018 Amdocs, Bell Canada
-# Modifications Copyright © 2021 Orange
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-dependencies:
- - name: common
- version: ~9.x-0
- repository: 'file://../common'
- - name: repositoryGenerator
- version: ~9.x-0
- repository: 'file://../repositoryGenerator'
diff --git a/kubernetes/common/mongo/Chart.yaml b/kubernetes/common/mongo/Chart.yaml
index 84e1ea6374..5a97afed4e 100644
--- a/kubernetes/common/mongo/Chart.yaml
+++ b/kubernetes/common/mongo/Chart.yaml
@@ -1,4 +1,5 @@
# Copyright © 2018, 2021 Orange
+# Modifications Copyright © 2021 Nordix Foundation
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -12,7 +13,15 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-apiVersion: v1
+apiVersion: v2
description: MongoDB Server
name: mongo
-version: 9.0.0
+version: 10.0.0
+
+dependencies:
+ - name: common
+ version: ~10.x-0
+ repository: 'file://../common'
+ - name: repositoryGenerator
+ version: ~10.x-0
+ repository: 'file://../repositoryGenerator' \ No newline at end of file
diff --git a/kubernetes/common/mongo/requirements.yaml b/kubernetes/common/mongo/requirements.yaml
deleted file mode 100644
index c791c85323..0000000000
--- a/kubernetes/common/mongo/requirements.yaml
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright © 2017 Amdocs, Bell Canada
-# Modifications Copyright © 2021 Orange
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-dependencies:
- - name: common
- version: ~9.x-0
- repository: 'file://../common'
- - name: repositoryGenerator
- version: ~9.x-0
- repository: 'file://../repositoryGenerator'
diff --git a/kubernetes/common/music/Chart.yaml b/kubernetes/common/music/Chart.yaml
index 9ac168e4ae..723a125008 100644
--- a/kubernetes/common/music/Chart.yaml
+++ b/kubernetes/common/music/Chart.yaml
@@ -1,5 +1,6 @@
# Copyright © 2018 AT&T, Amdocs, Bell Canada Intellectual Property. All rights reserved.
# Modifications Copyright © 2021 Orange
+# Modifications Copyright © 2021 Nordix Foundation
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -13,7 +14,21 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-apiVersion: v1
+apiVersion: v2
description: MUSIC - Multi-site State Coordination Service
name: music
-version: 9.0.0
+version: 10.0.0
+
+dependencies:
+ - name: music-cassandra
+ version: ~10.x-0
+ repository: 'file://components/music-cassandra'
+ - name: common
+ version: ~10.x-0
+ repository: 'file://../common'
+ - name: repositoryGenerator
+ version: ~10.x-0
+ repository: 'file://../repositoryGenerator'
+ - name: certInitializer
+ version: ~10.x-0
+ repository: 'file://../certInitializer' \ No newline at end of file
diff --git a/kubernetes/common/music/Makefile b/kubernetes/common/music/Makefile
index 4c79718d02..51d7de122c 100644
--- a/kubernetes/common/music/Makefile
+++ b/kubernetes/common/music/Makefile
@@ -33,7 +33,7 @@ make-%:
@if [ -f $*/Makefile ]; then make -C $*; fi
dep-%: make-%
- @if [ -f $*/requirements.yaml ]; then $(HELM_BIN) dep up $*; fi
+ @if [ -f $*/Chart.yaml ]; then $(HELM_BIN) dep up $*; fi
lint-%: dep-%
@if [ -f $*/Chart.yaml ]; then $(HELM_BIN) lint $*; fi
@@ -44,7 +44,7 @@ package-%: lint-%
@$(HELM_BIN) repo index $(PACKAGE_DIR)
clean:
- @rm -f */requirements.lock
+ @rm -f */Chart.lock
@rm -f *tgz */charts/*tgz
@rm -rf $(PACKAGE_DIR)
%:
diff --git a/kubernetes/common/music/components/Makefile b/kubernetes/common/music/components/Makefile
index bf267b7720..f4c9784bc4 100644
--- a/kubernetes/common/music/components/Makefile
+++ b/kubernetes/common/music/components/Makefile
@@ -33,7 +33,7 @@ make-%:
@if [ -f $*/Makefile ]; then make -C $*; fi
dep-%: make-%
- @if [ -f $*/requirements.yaml ]; then $(HELM_BIN) dep up $*; fi
+ @if [ -f $*/Chart.yaml ]; then $(HELM_BIN) dep up $*; fi
lint-%: dep-%
@if [ -f $*/Chart.yaml ]; then $(HELM_BIN) lint $*; fi
@@ -44,7 +44,7 @@ package-%: lint-%
@$(HELM_BIN) repo index $(PACKAGE_DIR)
clean:
- @rm -f */requirements.lock
+ @rm -f */Chart.lock
@rm -f *tgz */charts/*tgz
@rm -rf $(PACKAGE_DIR)
%:
diff --git a/kubernetes/common/music/components/music-cassandra/Chart.yaml b/kubernetes/common/music/components/music-cassandra/Chart.yaml
index aa97c716b4..b902dd73f5 100644
--- a/kubernetes/common/music/components/music-cassandra/Chart.yaml
+++ b/kubernetes/common/music/components/music-cassandra/Chart.yaml
@@ -1,5 +1,6 @@
# Copyright © 2018 AT&T, Amdocs, Bell Canada Intellectual Property. All rights reserved.
# Modifications Copyright © 2021 Orange
+# Modifications Copyright © 2021 Nordix Foundation
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -13,7 +14,15 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-apiVersion: v1
+apiVersion: v2
description: ONAP - Cassandra Database
name: music-cassandra
-version: 9.0.0
+version: 10.0.0
+
+dependencies:
+ - name: common
+ version: ~10.x-0
+ repository: 'file://../../../common'
+ - name: repositoryGenerator
+ version: ~10.x-0
+ repository: 'file://../../../repositoryGenerator' \ No newline at end of file
diff --git a/kubernetes/common/music/components/music-cassandra/requirements.yaml b/kubernetes/common/music/components/music-cassandra/requirements.yaml
deleted file mode 100644
index 5fa28a7c7f..0000000000
--- a/kubernetes/common/music/components/music-cassandra/requirements.yaml
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright © 2018 AT&T, Amdocs, Bell Canada Intellectual Property. All rights reserved.
-# Modifications Copyright © 2021 Orange
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-dependencies:
- - name: common
- version: ~9.x-0
- repository: 'file://../../../common'
- - name: repositoryGenerator
- version: ~9.x-0
- repository: 'file://../../../repositoryGenerator'
diff --git a/kubernetes/common/music/requirements.yaml b/kubernetes/common/music/requirements.yaml
deleted file mode 100644
index e65219c1b4..0000000000
--- a/kubernetes/common/music/requirements.yaml
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright © 2018 AT&T, Amdocs, Bell Canada Intellectual Property. All rights reserved.
-# Modifications Copyright © 2021 Orange
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-dependencies:
- - name: music-cassandra
- version: ~9.x-0
- repository: 'file://components/music-cassandra'
- - name: common
- version: ~9.x-0
- repository: 'file://../common'
- - name: repositoryGenerator
- version: ~9.x-0
- repository: 'file://../repositoryGenerator'
- - name: certInitializer
- version: ~9.x-0
- repository: 'file://../certInitializer'
diff --git a/kubernetes/common/network-name-gen/Chart.yaml b/kubernetes/common/network-name-gen/Chart.yaml
index 3f549276ce..2712596e9b 100644
--- a/kubernetes/common/network-name-gen/Chart.yaml
+++ b/kubernetes/common/network-name-gen/Chart.yaml
@@ -1,5 +1,6 @@
# Copyright (C) 2018 AT&T Intellectual Property. All rights reserved.
# Modifications Copyright © 2021 Orange
+# Modifications Copyright © 2021 Nordix Foundation
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -13,7 +14,23 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-apiVersion: v1
+apiVersion: v2
description: Name Generation Micro Service
name: network-name-gen
-version: 9.0.0
+version: 10.0.0
+
+dependencies:
+ - name: common
+ version: ~10.x-0
+ repository: 'file://../common'
+ - name: repositoryGenerator
+ version: ~10.x-0
+ repository: 'file://../repositoryGenerator'
+ - name: mariadb-galera
+ version: ~10.x-0
+ repository: 'file://../mariadb-galera'
+ condition: global.mariadbGalera.localCluster
+ - name: mariadb-init
+ version: ~10.x-0
+ repository: 'file://../mariadb-init'
+ condition: not global.mariadbGalera.localCluster \ No newline at end of file
diff --git a/kubernetes/common/network-name-gen/requirements.yaml b/kubernetes/common/network-name-gen/requirements.yaml
deleted file mode 100644
index 88b6a3d968..0000000000
--- a/kubernetes/common/network-name-gen/requirements.yaml
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright (C) 2018 AT&T Intellectual Property. All rights reserved.
-# Modifications Copyright © 2021 Orange
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-dependencies:
- - name: common
- version: ~9.x-0
- repository: 'file://../common'
- - name: repositoryGenerator
- version: ~9.x-0
- repository: 'file://../repositoryGenerator'
- - name: mariadb-galera
- version: ~9.x-0
- repository: 'file://../mariadb-galera'
- condition: global.mariadbGalera.localCluster
- - name: mariadb-init
- version: ~9.x-0
- repository: 'file://../mariadb-init'
- condition: not global.mariadbGalera.localCluster
diff --git a/kubernetes/common/postgres-init/Chart.yaml b/kubernetes/common/postgres-init/Chart.yaml
index 7cf3861733..eacba404ed 100644
--- a/kubernetes/common/postgres-init/Chart.yaml
+++ b/kubernetes/common/postgres-init/Chart.yaml
@@ -1,4 +1,5 @@
# Copyright © 2021 Orange
+# Modifications Copyright © 2021 Nordix Foundation
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -12,7 +13,16 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-apiVersion: v1
+apiVersion: v2
description: Chart for Postgres init job
name: postgres-init
-version: 9.0.0
+version: 10.0.0
+
+
+dependencies:
+ - name: common
+ version: ~10.x-0
+ repository: 'file://../common'
+ - name: repositoryGenerator
+ version: ~10.x-0
+ repository: 'file://../repositoryGenerator' \ No newline at end of file
diff --git a/kubernetes/common/postgres-init/requirements.yaml b/kubernetes/common/postgres-init/requirements.yaml
deleted file mode 100644
index 1bc46754d7..0000000000
--- a/kubernetes/common/postgres-init/requirements.yaml
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright © 2021 Orange
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-dependencies:
- - name: common
- version: ~9.x-0
- repository: 'file://../common'
- - name: repositoryGenerator
- version: ~9.x-0
- repository: 'file://../repositoryGenerator'
diff --git a/kubernetes/common/postgres/Chart.yaml b/kubernetes/common/postgres/Chart.yaml
index b0759a5a2e..7cf590a275 100644
--- a/kubernetes/common/postgres/Chart.yaml
+++ b/kubernetes/common/postgres/Chart.yaml
@@ -1,5 +1,6 @@
# Copyright © 2018 Amdocs, AT&T, Bell Canada
# Modifications Copyright © 2021 Orange
+# Modifications Copyright © 2021 Nordix Foundation
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -13,7 +14,15 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-apiVersion: v1
+apiVersion: v2
description: ONAP Postgres Server
name: postgres
-version: 9.0.0
+version: 10.0.0
+
+dependencies:
+ - name: common
+ version: ~10.x-0
+ repository: 'file://../common'
+ - name: repositoryGenerator
+ version: ~10.x-0
+ repository: 'file://../repositoryGenerator' \ No newline at end of file
diff --git a/kubernetes/common/postgres/requirements.yaml b/kubernetes/common/postgres/requirements.yaml
deleted file mode 100644
index 8f1f3276c6..0000000000
--- a/kubernetes/common/postgres/requirements.yaml
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright © 2018 Amdocs, AT&T, Bell Canada
-# Modifications Copyright © 2021 Orange
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-dependencies:
- - name: common
- version: ~9.x-0
- repository: 'file://../common'
- - name: repositoryGenerator
- version: ~9.x-0
- repository: 'file://../repositoryGenerator'
diff --git a/kubernetes/common/readinessCheck/Chart.yaml b/kubernetes/common/readinessCheck/Chart.yaml
index 86aa1521d5..7591363143 100644
--- a/kubernetes/common/readinessCheck/Chart.yaml
+++ b/kubernetes/common/readinessCheck/Chart.yaml
@@ -1,5 +1,6 @@
# Copyright © 2017 Amdocs, Bell Canada
# Modifications Copyright © 2021 Orange
+# Modifications Copyright © 2021 Nordix Foundation
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -13,7 +14,15 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-apiVersion: v1
+apiVersion: v2
description: Template used to wait for other deployment/sts/jobs in onap
name: readinessCheck
-version: 9.0.0
+version: 10.0.0
+
+dependencies:
+ - name: common
+ version: ~10.x-0
+ repository: 'file://../common'
+ - name: repositoryGenerator
+ version: ~10.x-0
+ repository: 'file://../repositoryGenerator' \ No newline at end of file
diff --git a/kubernetes/common/readinessCheck/requirements.yaml b/kubernetes/common/readinessCheck/requirements.yaml
deleted file mode 100644
index da8305e58d..0000000000
--- a/kubernetes/common/readinessCheck/requirements.yaml
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright © 2018 Amdocs, Bell Canada
-# Modifications Copyright © 2021 Orange
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-dependencies:
- - name: common
- version: ~9.x-0
- repository: 'file://../common'
- - name: repositoryGenerator
- version: ~9.x-0
- repository: 'file://../repositoryGenerator'
diff --git a/kubernetes/common/repository-wrapper/Chart.yaml b/kubernetes/common/repository-wrapper/Chart.yaml
index 381e4514f9..49f747433a 100644
--- a/kubernetes/common/repository-wrapper/Chart.yaml
+++ b/kubernetes/common/repository-wrapper/Chart.yaml
@@ -1,5 +1,6 @@
# Copyright © 2017 Amdocs, Bell Canada
# Modifications Copyright © 2021 Orange
+# Modifications Copyright © 2021 Nordix Foundation
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -13,7 +14,15 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-apiVersion: v1
+apiVersion: v2
description: Wrapper chart to allow docker secret to be shared all instances
name: repository-wrapper
-version: 9.0.0
+version: 10.0.0
+
+dependencies:
+ - name: common
+ version: ~10.x-0
+ repository: 'file://../common'
+ - name: repositoryGenerator
+ version: ~10.x-0
+ repository: 'file://../repositoryGenerator' \ No newline at end of file
diff --git a/kubernetes/common/repository-wrapper/requirements.yaml b/kubernetes/common/repository-wrapper/requirements.yaml
deleted file mode 100644
index da8305e58d..0000000000
--- a/kubernetes/common/repository-wrapper/requirements.yaml
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright © 2018 Amdocs, Bell Canada
-# Modifications Copyright © 2021 Orange
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-dependencies:
- - name: common
- version: ~9.x-0
- repository: 'file://../common'
- - name: repositoryGenerator
- version: ~9.x-0
- repository: 'file://../repositoryGenerator'
diff --git a/kubernetes/common/repositoryGenerator/Chart.yaml b/kubernetes/common/repositoryGenerator/Chart.yaml
index 24d9f598b6..230525f415 100644
--- a/kubernetes/common/repositoryGenerator/Chart.yaml
+++ b/kubernetes/common/repositoryGenerator/Chart.yaml
@@ -13,7 +13,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-apiVersion: v1
+apiVersion: v2
description: Template used to generate the right repository link
name: repositoryGenerator
-version: 9.0.0
+version: 10.0.0
diff --git a/kubernetes/common/repositoryGenerator/requirements.yaml b/kubernetes/common/repositoryGenerator/requirements.yaml
deleted file mode 100644
index 70ab2ecce6..0000000000
--- a/kubernetes/common/repositoryGenerator/requirements.yaml
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright © 2018 Amdocs, Bell Canada
-# Copyright © 2020 Orange
-#
-# 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.
diff --git a/kubernetes/common/roles-wrapper/Chart.yaml b/kubernetes/common/roles-wrapper/Chart.yaml
index 0e4ba0b2d8..855dd52e81 100644
--- a/kubernetes/common/roles-wrapper/Chart.yaml
+++ b/kubernetes/common/roles-wrapper/Chart.yaml
@@ -1,4 +1,5 @@
# Copyright © 2021 Orange
+# Modifications Copyright © 2021 Nordix Foundation
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -12,7 +13,12 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-apiVersion: v1
+apiVersion: v2
description: Wrapper chart to allow default roles to be shared among onap instances
name: roles-wrapper
-version: 9.0.0
+version: 10.0.0
+
+dependencies:
+ - name: common
+ version: ~10.x-0
+ repository: 'file://../common' \ No newline at end of file
diff --git a/kubernetes/common/roles-wrapper/requirements.yaml b/kubernetes/common/roles-wrapper/requirements.yaml
deleted file mode 100644
index 102e00682e..0000000000
--- a/kubernetes/common/roles-wrapper/requirements.yaml
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright © 2021 Orange
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-dependencies:
- - name: common
- version: ~9.x-0
- repository: 'file://../common'
diff --git a/kubernetes/common/serviceAccount/Chart.yaml b/kubernetes/common/serviceAccount/Chart.yaml
index 54ab9690cd..6ddb8357c6 100644
--- a/kubernetes/common/serviceAccount/Chart.yaml
+++ b/kubernetes/common/serviceAccount/Chart.yaml
@@ -1,5 +1,6 @@
# Copyright © 2017 Amdocs, Bell Canada
# Modifications Copyright © 2021 Orange
+# Modifications Copyright © 2021 Nordix Foundation
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -13,7 +14,12 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-apiVersion: v1
+apiVersion: v2
description: Template used to create the right Service Accounts / Role / RoleBinding
name: serviceAccount
-version: 9.0.0
+version: 10.0.0
+
+dependencies:
+ - name: common
+ version: ~10.x-0
+ repository: 'file://../common' \ No newline at end of file
diff --git a/kubernetes/common/serviceAccount/requirements.yaml b/kubernetes/common/serviceAccount/requirements.yaml
deleted file mode 100644
index 8af67126df..0000000000
--- a/kubernetes/common/serviceAccount/requirements.yaml
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright © 2018 Amdocs, Bell Canada
-# Modifications Copyright © 2021 Orange
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-dependencies:
- - name: common
- version: ~9.x-0
- repository: 'file://../common'
diff --git a/kubernetes/common/timescaledb/Chart.yaml b/kubernetes/common/timescaledb/Chart.yaml
index e2e9e7df34..6099351928 100644
--- a/kubernetes/common/timescaledb/Chart.yaml
+++ b/kubernetes/common/timescaledb/Chart.yaml
@@ -1,6 +1,7 @@
# ============LICENSE_START=======================================================
# Copyright (c) 2021 Bell Canada.
# Modifications Copyright © 2021 Orange
+# Modifications Copyright © 2021 Nordix Foundation
# ================================================================================
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -17,8 +18,19 @@
# SPDX-License-Identifier: Apache-2.0
# ============LICENSE_END=========================================================
-apiVersion: v1
+apiVersion: v2
appVersion: "1.0"
description: ONAP timescaledb
name: timescaledb
-version: 9.0.0
+version: 10.0.0
+
+dependencies:
+ - name: common
+ version: ~10.x-0
+ repository: '@local'
+ - name: serviceAccount
+ version: ~10.x-0
+ repository: '@local'
+ - name: repositoryGenerator
+ version: ~10.x-0
+ repository: 'file://../repositoryGenerator' \ No newline at end of file
diff --git a/kubernetes/common/timescaledb/requirements.yaml b/kubernetes/common/timescaledb/requirements.yaml
deleted file mode 100644
index 1bcd103f27..0000000000
--- a/kubernetes/common/timescaledb/requirements.yaml
+++ /dev/null
@@ -1,29 +0,0 @@
-# ============LICENSE_START=======================================================
-# Copyright (c) 2021 Bell Canada.
-# Modifications Copyright © 2021 Orange
-# ================================================================================
-# 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.
-#
-# SPDX-License-Identifier: Apache-2.0
-# ============LICENSE_END=========================================================
-
-dependencies:
- - name: common
- version: ~9.x-0
- repository: '@local'
- - name: serviceAccount
- version: ~9.x-0
- repository: '@local'
- - name: repositoryGenerator
- version: ~9.x-0
- repository: 'file://../repositoryGenerator'
diff --git a/kubernetes/config/prepull_docker.sh b/kubernetes/config/prepull_docker.sh
index 596ace6ad5..bfd679bf3e 100755
--- a/kubernetes/config/prepull_docker.sh
+++ b/kubernetes/config/prepull_docker.sh
@@ -27,8 +27,15 @@ EOF
#calling syntax: parse_yaml <yaml_file_name>
parse_yaml () {
- local prefix=$2
- local s='[[:space:]]*' w='[a-zA-Z0-9_]*' fs=$(echo @|tr @ '\034')
+ local prefix
+ prefix=$2
+ local s
+ s='[[:space:]]*'
+ local w
+ w='[a-zA-Z0-9_]*'
+ local fs
+ fs=$(echo @|tr @ '\034')
+
sed -ne "s|^\($s\):|\1|" \
-e "s|^\($s\)\($w\)$s:$s[\"']\(.*\)[\"']$s\$|\1$fs\2$fs\3|p" \
-e "s|^\($s\)\($w\)$s:$s\(.*\)$s\$|\1$fs\2$fs\3|p" $1 |
diff --git a/kubernetes/consul/Chart.yaml b/kubernetes/consul/Chart.yaml
index 19c018232a..c80c318f7a 100644
--- a/kubernetes/consul/Chart.yaml
+++ b/kubernetes/consul/Chart.yaml
@@ -1,6 +1,7 @@
# Copyright © 2017 Amdocs, Bell Canada
# Modifications Copyright © 2018 AT&T
# Modifications Copyright © 2021 Orange
+# Modifications Copyright © 2021 Nordix Foundation
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -14,7 +15,25 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-apiVersion: v1
+apiVersion: v2
description: ONAP Consul Agent
name: consul
-version: 9.0.0
+version: 10.0.0
+
+dependencies:
+ - name: common
+ version: ~10.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: repositoryGenerator
+ version: ~10.x-0
+ repository: '@local'
+ - name: consul-server
+ version: ~10.x-0
+ repository: 'file://components/consul-server'
+ condition: consul-server.enabled
+ - name: serviceAccount
+ version: ~10.x-0
+ repository: '@local' \ No newline at end of file
diff --git a/kubernetes/consul/Makefile b/kubernetes/consul/Makefile
index 92102d2dfc..c0253952aa 100644
--- a/kubernetes/consul/Makefile
+++ b/kubernetes/consul/Makefile
@@ -33,7 +33,7 @@ make-%:
@if [ -f $*/Makefile ]; then make -C $*; fi
dep-%: make-%
- @if [ -f $*/requirements.yaml ]; then $(HELM_BIN) dep up $*; fi
+ @if [ -f $*/Chart.yaml ]; then $(HELM_BIN) dep up $*; fi
lint-%: dep-%
@if [ -f $*/Chart.yaml ]; then $(HELM_BIN) lint $*; fi
@@ -44,7 +44,7 @@ package-%: lint-%
@$(HELM_BIN) repo index $(PACKAGE_DIR)
clean:
- @rm -f */requirements.lock
+ @rm -f */Chart.lock
@rm -f *tgz */charts/*tgz
@rm -rf $(PACKAGE_DIR)
%:
diff --git a/kubernetes/consul/components/Makefile b/kubernetes/consul/components/Makefile
index e9159f32a9..8674687e7d 100644
--- a/kubernetes/consul/components/Makefile
+++ b/kubernetes/consul/components/Makefile
@@ -33,7 +33,7 @@ make-%:
@if [ -f $*/Makefile ]; then make -C $*; fi
dep-%: make-%
- @if [ -f $*/requirements.yaml ]; then $(HELM_BIN) dep up $*; fi
+ @if [ -f $*/Chart.yaml ]; then $(HELM_BIN) dep up $*; fi
lint-%: dep-%
@if [ -f $*/Chart.yaml ]; then $(HELM_BIN) lint $*; fi
@@ -44,7 +44,7 @@ package-%: lint-%
@$(HELM_BIN) repo index $(PACKAGE_DIR)
clean:
- @rm -f */requirements.lock
+ @rm -f */Chart.lock
@rm -f *tgz */charts/*tgz
@rm -rf $(PACKAGE_DIR)
%:
diff --git a/kubernetes/consul/components/consul-server/Chart.yaml b/kubernetes/consul/components/consul-server/Chart.yaml
index 466bbc6167..7460980a40 100644
--- a/kubernetes/consul/components/consul-server/Chart.yaml
+++ b/kubernetes/consul/components/consul-server/Chart.yaml
@@ -1,6 +1,7 @@
# Copyright © 2017 Amdocs, Bell Canada
# Modifications Copyright © 2018 AT&T
# Modifications Copyright © 2021 Orange
+# Modifications Copyright © 2021 Nordix Foundation
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -14,7 +15,21 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-apiVersion: v1
+apiVersion: v2
description: ONAP Consul Server
name: consul-server
-version: 9.0.0
+version: 10.0.0
+
+dependencies:
+ - name: common
+ version: ~10.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: serviceAccount
+ version: ~10.x-0
+ repository: '@local'
+ - name: repositoryGenerator
+ version: ~10.x-0
+ repository: '@local' \ No newline at end of file
diff --git a/kubernetes/consul/components/consul-server/requirements.yaml b/kubernetes/consul/components/consul-server/requirements.yaml
deleted file mode 100644
index 3ad1b357e1..0000000000
--- a/kubernetes/consul/components/consul-server/requirements.yaml
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright © 2017 Amdocs, Bell Canada
-# Modifications Copyright © 2018 AT&T
-# Modifications Copyright © 2021 Orange
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-dependencies:
- - name: common
- version: ~9.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: serviceAccount
- version: ~9.x-0
- repository: '@local'
- - name: repositoryGenerator
- version: ~9.x-0
- repository: '@local'
diff --git a/kubernetes/consul/requirements.yaml b/kubernetes/consul/requirements.yaml
deleted file mode 100644
index a0b33cca60..0000000000
--- a/kubernetes/consul/requirements.yaml
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright © 2017 Amdocs, Bell Canada
-# Modifications Copyright © 2018 AT&T
-# Modifications Copyright © 2021 Orange
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-dependencies:
- - name: common
- version: ~9.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: repositoryGenerator
- version: ~9.x-0
- repository: '@local'
- - name: consul-server
- version: ~9.x-0
- repository: 'file://components/consul-server'
- condition: consul-server.enabled
- - name: serviceAccount
- version: ~9.x-0
- repository: '@local'
diff --git a/kubernetes/contrib/Chart.yaml b/kubernetes/contrib/Chart.yaml
index 2df075a84e..1b5552a22e 100755
--- a/kubernetes/contrib/Chart.yaml
+++ b/kubernetes/contrib/Chart.yaml
@@ -1,5 +1,6 @@
# Copyright © 2017 Bell Canada
# Modifications Copyright © 2021 Orange
+# Modifications Copyright © 2021 Nordix Foundation
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -13,7 +14,27 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-apiVersion: v1
+apiVersion: v2
description: ONAP optional tools
name: contrib
-version: 9.0.0
+version: 10.0.0
+
+dependencies:
+ - name: common
+ version: ~10.x-0
+ repository: '@local'
+ - name: awx
+ version: ~10.x-0
+ repository: 'file://components/awx'
+ condition: awx.enabled
+ - name: ejbca
+ version: ~10.x-0
+ repository: 'file://components/ejbca'
+ condition: global.cmpv2Enabled
+ - name: netbox
+ version: ~10.x-0
+ repository: 'file://components/netbox'
+ condition: netbox.enabled
+ - name: repositoryGenerator
+ version: ~10.x-0
+ repository: '@local' \ No newline at end of file
diff --git a/kubernetes/contrib/Makefile b/kubernetes/contrib/Makefile
index 4d3514618d..81e43acc82 100644
--- a/kubernetes/contrib/Makefile
+++ b/kubernetes/contrib/Makefile
@@ -33,7 +33,7 @@ make-%:
@if [ -f $*/Makefile ]; then make -C $*; fi
dep-%: make-%
- @if [ -f $*/requirements.yaml ]; then $(HELM_BIN) dep up $*; fi
+ @if [ -f $*/Chart.yaml ]; then $(HELM_BIN) dep up $*; fi
lint-%: dep-%
@if [ -f $*/Chart.yaml ]; then $(HELM_BIN) lint $*; fi
@@ -44,7 +44,7 @@ package-%: lint-%
@$(HELM_BIN) repo index $(PACKAGE_DIR)
clean:
- @rm -f */requirements.lock
+ @rm -f */Chart.lock
@rm -f *tgz */charts/*tgz
@rm -rf $(PACKAGE_DIR)
%:
diff --git a/kubernetes/contrib/components/Makefile b/kubernetes/contrib/components/Makefile
index bf267b7720..f4c9784bc4 100644
--- a/kubernetes/contrib/components/Makefile
+++ b/kubernetes/contrib/components/Makefile
@@ -33,7 +33,7 @@ make-%:
@if [ -f $*/Makefile ]; then make -C $*; fi
dep-%: make-%
- @if [ -f $*/requirements.yaml ]; then $(HELM_BIN) dep up $*; fi
+ @if [ -f $*/Chart.yaml ]; then $(HELM_BIN) dep up $*; fi
lint-%: dep-%
@if [ -f $*/Chart.yaml ]; then $(HELM_BIN) lint $*; fi
@@ -44,7 +44,7 @@ package-%: lint-%
@$(HELM_BIN) repo index $(PACKAGE_DIR)
clean:
- @rm -f */requirements.lock
+ @rm -f */Chart.lock
@rm -f *tgz */charts/*tgz
@rm -rf $(PACKAGE_DIR)
%:
diff --git a/kubernetes/contrib/components/awx/Chart.yaml b/kubernetes/contrib/components/awx/Chart.yaml
index 6b7fb601c7..b29a3d79b3 100755
--- a/kubernetes/contrib/components/awx/Chart.yaml
+++ b/kubernetes/contrib/components/awx/Chart.yaml
@@ -1,5 +1,6 @@
# Copyright © 2019 Bell Canada
# Modifications Copyright © 2021 Orange
+# Modifications Copyright © 2021 Nordix Foundation
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -13,9 +14,23 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-apiVersion: v1
+apiVersion: v2
description: Ansible AWX
name: awx
sources:
- https://github.com/ansible/awx
-version: 9.0.0
+version: 10.0.0
+
+dependencies:
+ - name: common
+ version: ~10.x-0
+ repository: '@local'
+ - name: repositoryGenerator
+ version: ~10.x-0
+ repository: '@local'
+ - name: awx-postgres
+ version: ~10.x-0
+ repository: 'file://components/awx-postgres'
+ - name: serviceAccount
+ version: ~10.x-0
+ repository: '@local' \ No newline at end of file
diff --git a/kubernetes/contrib/components/awx/Makefile b/kubernetes/contrib/components/awx/Makefile
index 4c79718d02..51d7de122c 100644
--- a/kubernetes/contrib/components/awx/Makefile
+++ b/kubernetes/contrib/components/awx/Makefile
@@ -33,7 +33,7 @@ make-%:
@if [ -f $*/Makefile ]; then make -C $*; fi
dep-%: make-%
- @if [ -f $*/requirements.yaml ]; then $(HELM_BIN) dep up $*; fi
+ @if [ -f $*/Chart.yaml ]; then $(HELM_BIN) dep up $*; fi
lint-%: dep-%
@if [ -f $*/Chart.yaml ]; then $(HELM_BIN) lint $*; fi
@@ -44,7 +44,7 @@ package-%: lint-%
@$(HELM_BIN) repo index $(PACKAGE_DIR)
clean:
- @rm -f */requirements.lock
+ @rm -f */Chart.lock
@rm -f *tgz */charts/*tgz
@rm -rf $(PACKAGE_DIR)
%:
diff --git a/kubernetes/contrib/components/awx/components/Makefile b/kubernetes/contrib/components/awx/components/Makefile
index bf267b7720..f4c9784bc4 100644
--- a/kubernetes/contrib/components/awx/components/Makefile
+++ b/kubernetes/contrib/components/awx/components/Makefile
@@ -33,7 +33,7 @@ make-%:
@if [ -f $*/Makefile ]; then make -C $*; fi
dep-%: make-%
- @if [ -f $*/requirements.yaml ]; then $(HELM_BIN) dep up $*; fi
+ @if [ -f $*/Chart.yaml ]; then $(HELM_BIN) dep up $*; fi
lint-%: dep-%
@if [ -f $*/Chart.yaml ]; then $(HELM_BIN) lint $*; fi
@@ -44,7 +44,7 @@ package-%: lint-%
@$(HELM_BIN) repo index $(PACKAGE_DIR)
clean:
- @rm -f */requirements.lock
+ @rm -f */Chart.lock
@rm -f *tgz */charts/*tgz
@rm -rf $(PACKAGE_DIR)
%:
diff --git a/kubernetes/contrib/components/awx/components/awx-postgres/Chart.yaml b/kubernetes/contrib/components/awx/components/awx-postgres/Chart.yaml
index 66bf12e051..2999873ec7 100755
--- a/kubernetes/contrib/components/awx/components/awx-postgres/Chart.yaml
+++ b/kubernetes/contrib/components/awx/components/awx-postgres/Chart.yaml
@@ -1,5 +1,6 @@
# Copyright © 2019 Bell Canada
# Modifications Copyright © 2021 Orange
+# Modifications Copyright © 2021 Nordix Foundation
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -13,7 +14,18 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-apiVersion: v1
+apiVersion: v2
description: Ansible AWX database
name: awx-postgres
-version: 9.0.0
+version: 10.0.0
+
+dependencies:
+ - name: common
+ version: ~10.x-0
+ repository: '@local'
+ - name: repositoryGenerator
+ version: ~10.x-0
+ repository: '@local'
+ - name: serviceAccount
+ version: ~10.x-0
+ repository: '@local'
diff --git a/kubernetes/contrib/components/awx/components/awx-postgres/requirements.yaml b/kubernetes/contrib/components/awx/components/awx-postgres/requirements.yaml
deleted file mode 100755
index eae0750201..0000000000
--- a/kubernetes/contrib/components/awx/components/awx-postgres/requirements.yaml
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright © 2019 Bell Canada
-# Modifications Copyright © 2021 Orange
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-dependencies:
- - name: common
- version: ~9.x-0
- repository: '@local'
- - name: repositoryGenerator
- version: ~9.x-0
- repository: '@local'
- - name: serviceAccount
- version: ~9.x-0
- repository: '@local'
diff --git a/kubernetes/contrib/components/awx/requirements.yaml b/kubernetes/contrib/components/awx/requirements.yaml
deleted file mode 100755
index 8e588f5118..0000000000
--- a/kubernetes/contrib/components/awx/requirements.yaml
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright © 2019 Bell Canada
-# Modifications Copyright © 2021 Orange
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-dependencies:
- - name: common
- version: ~9.x-0
- repository: '@local'
- - name: repositoryGenerator
- version: ~9.x-0
- repository: '@local'
- - name: awx-postgres
- version: ~9.x-0
- repository: 'file://components/awx-postgres'
- - name: serviceAccount
- version: ~9.x-0
- repository: '@local'
diff --git a/kubernetes/contrib/components/ejbca/Chart.yaml b/kubernetes/contrib/components/ejbca/Chart.yaml
index 638c6db71a..2d683269af 100644
--- a/kubernetes/contrib/components/ejbca/Chart.yaml
+++ b/kubernetes/contrib/components/ejbca/Chart.yaml
@@ -1,5 +1,6 @@
# Copyright © 2020 Nokia
# Modifications Copyright © 2021 Orange
+# Modifications Copyright © 2021 Nordix Foundation
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -13,7 +14,29 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-apiVersion: v1
+apiVersion: v2
description: ONAP EJBCA test server
name: ejbca
-version: 9.0.0
+version: 10.0.0
+
+dependencies:
+ - name: common
+ version: ~10.x-0
+ repository: '@local'
+ - name: mariadb-galera
+ version: ~10.x-0
+ repository: '@local'
+ condition: global.mariadbGalera.localCluster
+ - name: mariadb-init
+ version: ~10.x-0
+ repository: '@local'
+ condition: not global.mariadbGalera.localCluster
+ - name: repositoryGenerator
+ version: ~10.x-0
+ repository: '@local'
+ - name: cmpv2Config
+ version: ~10.x-0
+ repository: '@local'
+ - name: serviceAccount
+ version: ~10.x-0
+ repository: '@local' \ No newline at end of file
diff --git a/kubernetes/contrib/components/ejbca/requirements.yaml b/kubernetes/contrib/components/ejbca/requirements.yaml
deleted file mode 100644
index dabf474ab6..0000000000
--- a/kubernetes/contrib/components/ejbca/requirements.yaml
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright © 2020 Orange, Ericsson
-# Modifications Copyright © 2021 Orange
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-dependencies:
- - name: common
- version: ~9.x-0
- repository: '@local'
- - name: mariadb-galera
- version: ~9.x-0
- repository: '@local'
- condition: global.mariadbGalera.localCluster
- - name: mariadb-init
- version: ~9.x-0
- repository: '@local'
- condition: not global.mariadbGalera.localCluster
- - name: repositoryGenerator
- version: ~9.x-0
- repository: '@local'
- - name: cmpv2Config
- version: ~9.x-0
- repository: '@local'
- - name: serviceAccount
- version: ~9.x-0
- repository: '@local'
diff --git a/kubernetes/contrib/components/netbox/Chart.yaml b/kubernetes/contrib/components/netbox/Chart.yaml
index a580269b6a..24c9801ded 100755
--- a/kubernetes/contrib/components/netbox/Chart.yaml
+++ b/kubernetes/contrib/components/netbox/Chart.yaml
@@ -1,5 +1,6 @@
# Copyright © 2018 Amdocs, Bell Canada
# Modifications Copyright © 2021 Orange
+# Modifications Copyright © 2021 Nordix Foundation
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -13,7 +14,24 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-apiVersion: v1
+apiVersion: v2
description: Netbox IPAM
name: netbox
-version: 9.0.0
+version: 10.0.0
+
+dependencies:
+ - name: common
+ version: ~10.x-0
+ repository: '@local'
+ - name: repositoryGenerator
+ version: ~10.x-0
+ repository: '@local'
+ - name: netbox-app
+ version: ~10.x-0
+ repository: 'file://components/netbox-app'
+ - name: netbox-nginx
+ version: ~10.x-0
+ repository: 'file://components/netbox-nginx'
+ - name: netbox-postgres
+ version: ~10.x-0
+ repository: 'file://components/netbox-postgres' \ No newline at end of file
diff --git a/kubernetes/contrib/components/netbox/Makefile b/kubernetes/contrib/components/netbox/Makefile
index 4c79718d02..51d7de122c 100644
--- a/kubernetes/contrib/components/netbox/Makefile
+++ b/kubernetes/contrib/components/netbox/Makefile
@@ -33,7 +33,7 @@ make-%:
@if [ -f $*/Makefile ]; then make -C $*; fi
dep-%: make-%
- @if [ -f $*/requirements.yaml ]; then $(HELM_BIN) dep up $*; fi
+ @if [ -f $*/Chart.yaml ]; then $(HELM_BIN) dep up $*; fi
lint-%: dep-%
@if [ -f $*/Chart.yaml ]; then $(HELM_BIN) lint $*; fi
@@ -44,7 +44,7 @@ package-%: lint-%
@$(HELM_BIN) repo index $(PACKAGE_DIR)
clean:
- @rm -f */requirements.lock
+ @rm -f */Chart.lock
@rm -f *tgz */charts/*tgz
@rm -rf $(PACKAGE_DIR)
%:
diff --git a/kubernetes/contrib/components/netbox/components/Makefile b/kubernetes/contrib/components/netbox/components/Makefile
index bf267b7720..f4c9784bc4 100644
--- a/kubernetes/contrib/components/netbox/components/Makefile
+++ b/kubernetes/contrib/components/netbox/components/Makefile
@@ -33,7 +33,7 @@ make-%:
@if [ -f $*/Makefile ]; then make -C $*; fi
dep-%: make-%
- @if [ -f $*/requirements.yaml ]; then $(HELM_BIN) dep up $*; fi
+ @if [ -f $*/Chart.yaml ]; then $(HELM_BIN) dep up $*; fi
lint-%: dep-%
@if [ -f $*/Chart.yaml ]; then $(HELM_BIN) lint $*; fi
@@ -44,7 +44,7 @@ package-%: lint-%
@$(HELM_BIN) repo index $(PACKAGE_DIR)
clean:
- @rm -f */requirements.lock
+ @rm -f */Chart.lock
@rm -f *tgz */charts/*tgz
@rm -rf $(PACKAGE_DIR)
%:
diff --git a/kubernetes/contrib/components/netbox/components/netbox-app/Chart.yaml b/kubernetes/contrib/components/netbox/components/netbox-app/Chart.yaml
index d274160fb1..19087d3999 100755
--- a/kubernetes/contrib/components/netbox/components/netbox-app/Chart.yaml
+++ b/kubernetes/contrib/components/netbox/components/netbox-app/Chart.yaml
@@ -1,5 +1,6 @@
# Copyright © 2018 Amdocs, Bell Canada
# Modifications Copyright © 2021 Orange
+# Modifications Copyright © 2021 Nordix Foundation
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -13,7 +14,18 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-apiVersion: v1
+apiVersion: v2
description: Netbox - Application (WSGI + Gunicorn)
name: netbox-app
-version: 9.0.0
+version: 10.0.0
+
+dependencies:
+ - name: common
+ version: ~10.x-0
+ repository: '@local'
+ - name: repositoryGenerator
+ version: ~10.x-0
+ repository: '@local'
+ - name: serviceAccount
+ version: ~10.x-0
+ repository: '@local'
diff --git a/kubernetes/contrib/components/netbox/components/netbox-app/requirements.yaml b/kubernetes/contrib/components/netbox/components/netbox-app/requirements.yaml
deleted file mode 100755
index 0bfe13754c..0000000000
--- a/kubernetes/contrib/components/netbox/components/netbox-app/requirements.yaml
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright © 2018 Amdocs, Bell Canada
-# Modifications Copyright © 2021 Orange
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-dependencies:
- - name: common
- version: ~9.x-0
- repository: '@local'
- - name: repositoryGenerator
- version: ~9.x-0
- repository: '@local'
- - name: serviceAccount
- version: ~9.x-0
- repository: '@local'
diff --git a/kubernetes/contrib/components/netbox/components/netbox-nginx/Chart.yaml b/kubernetes/contrib/components/netbox/components/netbox-nginx/Chart.yaml
index af54335170..4e4fdc0a28 100755
--- a/kubernetes/contrib/components/netbox/components/netbox-nginx/Chart.yaml
+++ b/kubernetes/contrib/components/netbox/components/netbox-nginx/Chart.yaml
@@ -1,5 +1,6 @@
# Copyright © 2018 Amdocs, Bell Canada
# Modifications Copyright © 2021 Orange
+# Modifications Copyright © 2021 Nordix Foundation
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -13,7 +14,18 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-apiVersion: v1
+apiVersion: v2
description: Netbox - Nginx web server
name: netbox-nginx
-version: 9.0.0
+version: 10.0.0
+
+dependencies:
+ - name: common
+ version: ~10.x-0
+ repository: '@local'
+ - name: repositoryGenerator
+ version: ~10.x-0
+ repository: '@local'
+ - name: serviceAccount
+ version: ~10.x-0
+ repository: '@local'
diff --git a/kubernetes/contrib/components/netbox/components/netbox-nginx/requirements.yaml b/kubernetes/contrib/components/netbox/components/netbox-nginx/requirements.yaml
deleted file mode 100755
index 0bfe13754c..0000000000
--- a/kubernetes/contrib/components/netbox/components/netbox-nginx/requirements.yaml
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright © 2018 Amdocs, Bell Canada
-# Modifications Copyright © 2021 Orange
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-dependencies:
- - name: common
- version: ~9.x-0
- repository: '@local'
- - name: repositoryGenerator
- version: ~9.x-0
- repository: '@local'
- - name: serviceAccount
- version: ~9.x-0
- repository: '@local'
diff --git a/kubernetes/contrib/components/netbox/components/netbox-postgres/Chart.yaml b/kubernetes/contrib/components/netbox/components/netbox-postgres/Chart.yaml
index 435c7e2c47..85654d953f 100755
--- a/kubernetes/contrib/components/netbox/components/netbox-postgres/Chart.yaml
+++ b/kubernetes/contrib/components/netbox/components/netbox-postgres/Chart.yaml
@@ -1,5 +1,6 @@
# Copyright © 2018 Amdocs, Bell Canada
# Modifications Copyright © 2021 Orange
+# Modifications Copyright © 2021 Nordix Foundation
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -13,7 +14,18 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-apiVersion: v1
+apiVersion: v2
description: Netbox Posgres database
name: netbox-postgres
-version: 9.0.0
+version: 10.0.0
+
+dependencies:
+ - name: common
+ version: ~10.x-0
+ repository: '@local'
+ - name: repositoryGenerator
+ version: ~10.x-0
+ repository: '@local'
+ - name: serviceAccount
+ version: ~10.x-0
+ repository: '@local'
diff --git a/kubernetes/contrib/components/netbox/components/netbox-postgres/requirements.yaml b/kubernetes/contrib/components/netbox/components/netbox-postgres/requirements.yaml
deleted file mode 100755
index 0bfe13754c..0000000000
--- a/kubernetes/contrib/components/netbox/components/netbox-postgres/requirements.yaml
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright © 2018 Amdocs, Bell Canada
-# Modifications Copyright © 2021 Orange
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-dependencies:
- - name: common
- version: ~9.x-0
- repository: '@local'
- - name: repositoryGenerator
- version: ~9.x-0
- repository: '@local'
- - name: serviceAccount
- version: ~9.x-0
- repository: '@local'
diff --git a/kubernetes/contrib/components/netbox/requirements.yaml b/kubernetes/contrib/components/netbox/requirements.yaml
deleted file mode 100755
index 467b6cf9d3..0000000000
--- a/kubernetes/contrib/components/netbox/requirements.yaml
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright © 2018 Amdocs, Bell Canada
-# Modifications Copyright © 2021 Orange
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-dependencies:
- - name: common
- version: ~9.x-0
- repository: '@local'
- - name: repositoryGenerator
- version: ~9.x-0
- repository: '@local'
- - name: netbox-app
- version: ~9.x-0
- repository: 'file://components/netbox-app'
- - name: netbox-nginx
- version: ~9.x-0
- repository: 'file://components/netbox-nginx'
- - name: netbox-postgres
- version: ~9.x-0
- repository: 'file://components/netbox-postgres'
diff --git a/kubernetes/contrib/dns-server-for-vhost-ingress-testing/bind9dns/Chart.yaml b/kubernetes/contrib/dns-server-for-vhost-ingress-testing/bind9dns/Chart.yaml
index a618fd792c..dede98e707 100644
--- a/kubernetes/contrib/dns-server-for-vhost-ingress-testing/bind9dns/Chart.yaml
+++ b/kubernetes/contrib/dns-server-for-vhost-ingress-testing/bind9dns/Chart.yaml
@@ -13,7 +13,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
#
-apiVersion: v1
+apiVersion: v2
appVersion: "1.0"
description: bind9 DNS server for kubernetes cluster
name: bind9dns
diff --git a/kubernetes/contrib/dns-server-for-vhost-ingress-testing/deploy_dns.sh b/kubernetes/contrib/dns-server-for-vhost-ingress-testing/deploy_dns.sh
index 3c66feeb46..294ae0a55e 100755
--- a/kubernetes/contrib/dns-server-for-vhost-ingress-testing/deploy_dns.sh
+++ b/kubernetes/contrib/dns-server-for-vhost-ingress-testing/deploy_dns.sh
@@ -49,10 +49,13 @@ Extra DNS server already deployed:
list_node_with_external_addrs()
{
- local WORKER_NODES=$(kubectl get no -l node-role.kubernetes.io/worker=true -o jsonpath='{.items..metadata.name}')
+ local WORKER_NODES
+ WORKER_NODES=$(kubectl get no -l node-role.kubernetes.io/worker=true -o jsonpath='{.items..metadata.name}')
for worker in $WORKER_NODES; do
- local external_ip=$(kubectl get no $worker -o jsonpath='{.metadata.annotations.rke\.cattle\.io/external-ip }')
- local internal_ip=$(kubectl get no $worker -o jsonpath='{.metadata.annotations.rke\.cattle\.io/internal-ip }')
+ local external_ip
+ external_ip=$(kubectl get no $worker -o jsonpath='{.metadata.annotations.rke\.cattle\.io/external-ip }')
+ local internal_ip
+ internal_ip=$(kubectl get no $worker -o jsonpath='{.metadata.annotations.rke\.cattle\.io/internal-ip }')
if [ $internal_ip != $external_ip ]; then
echo $external_ip
break
@@ -61,7 +64,8 @@ list_node_with_external_addrs()
}
ingress_controller_ip() {
- local metal_ns=$(kubectl get ns --no-headers --output=custom-columns=NAME:metadata.name |grep metallb-system)
+ local metal_ns
+ metal_ns=$(kubectl get ns --no-headers --output=custom-columns=NAME:metadata.name |grep metallb-system)
if [ -z $metal_ns ]; then
echo $CLUSTER_IP
else
@@ -70,13 +74,16 @@ ingress_controller_ip() {
}
deploy() {
- local ingress_ip=$(ingress_controller_ip)
+ local ingress_ip
+ ingress_ip=$(ingress_controller_ip)
initdir = $(pwd)
cd $SPATH/bind9dns
if [ $# -eq 0 ]; then
- local cl_domain="simpledemo.onap.org"
+ local cl_domain
+ cl_domain="simpledemo.onap.org"
else
- local cl_domain=$1
+ local cl_domain
+ cl_domain=$1
shift
fi
if [ $# -ne 0 ]; then
diff --git a/kubernetes/contrib/metallb-loadbalancer-inst/install-metallb-on-cluster.sh b/kubernetes/contrib/metallb-loadbalancer-inst/install-metallb-on-cluster.sh
index c62e2a51bd..495d540905 100755
--- a/kubernetes/contrib/metallb-loadbalancer-inst/install-metallb-on-cluster.sh
+++ b/kubernetes/contrib/metallb-loadbalancer-inst/install-metallb-on-cluster.sh
@@ -29,10 +29,13 @@ $0 [cluster_ip1] ... [cluster_ipn] Cluster address or ip ranges
find_nodes_with_external_addrs()
{
- local WORKER_NODES=$(kubectl get no -l node-role.kubernetes.io/worker=true -o jsonpath='{.items..metadata.name}')
+ local WORKER_NODES
+ WORKER_NODES=$(kubectl get no -l node-role.kubernetes.io/worker=true -o jsonpath='{.items..metadata.name}')
for worker in $WORKER_NODES; do
- local external_ip=$(kubectl get no $worker -o jsonpath='{.metadata.annotations.rke\.cattle\.io/external-ip }')
- local internal_ip=$(kubectl get no $worker -o jsonpath='{.metadata.annotations.rke\.cattle\.io/internal-ip }')
+ local external_ip
+ external_ip=$(kubectl get no $worker -o jsonpath='{.metadata.annotations.rke\.cattle\.io/external-ip }')
+ local internal_ip
+ internal_ip=$(kubectl get no $worker -o jsonpath='{.metadata.annotations.rke\.cattle\.io/internal-ip }')
if [ $internal_ip != $external_ip ]; then
echo $external_ip
fi
diff --git a/kubernetes/contrib/requirements.yaml b/kubernetes/contrib/requirements.yaml
deleted file mode 100644
index c6d0a19c18..0000000000
--- a/kubernetes/contrib/requirements.yaml
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright © 2018 Amdocs, Bell Canada
-# Modifications Copyright © 2021 Orange
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-dependencies:
- - name: common
- version: ~9.x-0
- repository: '@local'
- - name: awx
- version: ~9.x-0
- repository: 'file://components/awx'
- condition: awx.enabled
- - name: ejbca
- version: ~9.x-0
- repository: 'file://components/ejbca'
- condition: global.cmpv2Enabled
- - name: netbox
- version: ~9.x-0
- repository: 'file://components/netbox'
- condition: netbox.enabled
- - name: repositoryGenerator
- version: ~9.x-0
- repository: '@local'
diff --git a/kubernetes/cps/Chart.yaml b/kubernetes/cps/Chart.yaml
index fe80457aa5..097bb98559 100644
--- a/kubernetes/cps/Chart.yaml
+++ b/kubernetes/cps/Chart.yaml
@@ -1,5 +1,6 @@
# Copyright (C) 2021 Bell Canada
# Modifications Copyright © 2021 Orange
+# Modifications Copyright © 2021 Nordix Foundation
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -13,7 +14,24 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-apiVersion: v1
+apiVersion: v2
description: ONAP Configuration Persistance Service (CPS)
name: cps
-version: 9.0.0
+version: 10.0.0
+
+dependencies:
+ - name: common
+ version: ~10.x-0
+ repository: '@local'
+ - name: cps-core
+ version: ~10.x-0
+ repository: '@local'
+ condition: cps-core.enabled
+ - name: cps-temporal
+ version: ~10.x-0
+ repository: '@local'
+ condition: cps-temporal.enabled
+ - name: ncmp-dmi-plugin
+ version: ~10.x-0
+ repository: '@local'
+ condition: ncmp-dmi-plugin.enabled \ No newline at end of file
diff --git a/kubernetes/cps/Makefile b/kubernetes/cps/Makefile
index 70bb031af3..0e0560c68e 100644
--- a/kubernetes/cps/Makefile
+++ b/kubernetes/cps/Makefile
@@ -36,7 +36,7 @@ make-%:
@if [ -f $*/Makefile ]; then make -C $*; fi
dep-%: make-%
- @if [ -f $*/requirements.yaml ]; then $(HELM_BIN) dep up $*; fi
+ @if [ -f $*/Chart.yaml ]; then $(HELM_BIN) dep up $*; fi
lint-%: dep-%
@if [ -f $*/Chart.yaml ]; then $(HELM_BIN) lint $*; fi
@@ -47,7 +47,7 @@ package-%: lint-%
@sleep 3
clean:
- @rm -f */requirements.lock
+ @rm -f */Chart.lock
@rm -f *tgz */charts/*tgz
@rm -rf $(PACKAGE_DIR)
%:
diff --git a/kubernetes/cps/components/Makefile b/kubernetes/cps/components/Makefile
index db8704c2ca..9a84ab8375 100644
--- a/kubernetes/cps/components/Makefile
+++ b/kubernetes/cps/components/Makefile
@@ -43,7 +43,7 @@ make-%:
@if [ -f $*/Makefile ]; then make -C $*; fi
dep-%: make-%
- @if [ -f $*/requirements.yaml ]; then $(HELM_BIN) dep up $*; fi
+ @if [ -f $*/Chart.yaml ]; then $(HELM_BIN) dep up $*; fi
lint-%: dep-%
@if [ -f $*/Chart.yaml ]; then $(HELM_BIN) lint $*; fi
@@ -54,7 +54,7 @@ package-%: lint-%
@sleep 3
clean:
- @rm -f */requirements.lock
+ @rm -f */Chart.lock
@rm -f *tgz */charts/*tgz
@rm -rf $(PACKAGE_DIR)
diff --git a/kubernetes/cps/components/cps-core/Chart.yaml b/kubernetes/cps/components/cps-core/Chart.yaml
index 2d9274ee9b..c1ef7202a7 100644
--- a/kubernetes/cps/components/cps-core/Chart.yaml
+++ b/kubernetes/cps/components/cps-core/Chart.yaml
@@ -1,5 +1,6 @@
# Copyright (C) Pantheon.tech, Orange
# Modifications Copyright © 2021 Orange
+# Modifications Copyright © 2021 Nordix Foundation
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -13,7 +14,30 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-apiVersion: v1
+apiVersion: v2
description: ONAP Configuration Persistance Service (CPS) - Core
name: cps-core
-version: 9.0.0
+version: 10.0.0
+
+dependencies:
+ - name: common
+ version: ~10.x-0
+ repository: '@local'
+ - name: postgres
+ version: ~10.x-0
+ repository: '@local'
+ condition: global.postgres.localCluster
+ - name: postgres-init
+ version: ~10.x-0
+ repository: '@local'
+ condition: not global.postgres.localCluster
+ #condition: global.postgres.postgresInit
+ - name: readinessCheck
+ version: ~10.x-0
+ repository: '@local'
+ - name: repositoryGenerator
+ version: ~10.x-0
+ repository: '@local'
+ - name: serviceAccount
+ version: ~10.x-0
+ repository: '@local' \ No newline at end of file
diff --git a/kubernetes/cps/components/cps-core/requirements.yaml b/kubernetes/cps/components/cps-core/requirements.yaml
deleted file mode 100644
index 8a4ffbec81..0000000000
--- a/kubernetes/cps/components/cps-core/requirements.yaml
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright (C) 2021 Pantheon.tech, Orange
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-dependencies:
- - name: common
- version: ~9.x-0
- repository: '@local'
- - name: postgres
- version: ~9.x-0
- repository: '@local'
- condition: global.postgres.localCluster
- - name: postgres-init
- version: ~9.x-0
- repository: '@local'
- condition: not global.postgres.localCluster
- #condition: global.postgres.postgresInit
- - name: readinessCheck
- version: ~9.x-0
- repository: '@local'
- - name: repositoryGenerator
- version: ~9.x-0
- repository: '@local'
- - name: serviceAccount
- version: ~9.x-0
- repository: '@local'
diff --git a/kubernetes/cps/components/cps-core/values.yaml b/kubernetes/cps/components/cps-core/values.yaml
index eb7aa54130..a482152582 100644
--- a/kubernetes/cps/components/cps-core/values.yaml
+++ b/kubernetes/cps/components/cps-core/values.yaml
@@ -78,11 +78,10 @@ service:
targetPort: *mgt_port
prometheus:
- enabled: true
+ enabled: false
metrics:
serviceMonitor:
- enabled: true
port: http-management
## specify target port if name is not given to the port in the service definition
##
diff --git a/kubernetes/cps/components/cps-temporal/Chart.yaml b/kubernetes/cps/components/cps-temporal/Chart.yaml
index 99ff4221f8..502131bc7c 100644
--- a/kubernetes/cps/components/cps-temporal/Chart.yaml
+++ b/kubernetes/cps/components/cps-temporal/Chart.yaml
@@ -1,6 +1,7 @@
# ============LICENSE_START=======================================================
# Copyright (c) 2021 Bell Canada.
# Modifications Copyright © 2021 Orange
+# Modifications Copyright © 2021 Nordix Foundation
# ================================================================================
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -17,7 +18,24 @@
# SPDX-License-Identifier: Apache-2.0
# ============LICENSE_END=========================================================
-apiVersion: v1
+apiVersion: v2
description: ONAP Configuration Persistance Service (CPS) - Temporal
name: cps-temporal
-version: 9.0.0
+version: 10.0.0
+
+dependencies:
+ - name: common
+ version: ~10.x-0
+ repository: '@local'
+ - name: repositoryGenerator
+ version: ~10.x-0
+ repository: '@local'
+ - name: timescaledb
+ version: ~10.x-0
+ repository: '@local'
+ - name: readinessCheck
+ version: ~10.x-0
+ repository: '@local'
+ - name: serviceAccount
+ version: ~10.x-0
+ repository: '@local' \ No newline at end of file
diff --git a/kubernetes/cps/components/cps-temporal/requirements.yaml b/kubernetes/cps/components/cps-temporal/requirements.yaml
deleted file mode 100644
index 442261dad5..0000000000
--- a/kubernetes/cps/components/cps-temporal/requirements.yaml
+++ /dev/null
@@ -1,35 +0,0 @@
-# ============LICENSE_START=======================================================
-# Copyright (c) 2021 Bell Canada.
-# Modifications Copyright © 2021 Orange
-# ================================================================================
-# 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.
-#
-# SPDX-License-Identifier: Apache-2.0
-# ============LICENSE_END=========================================================
-
-dependencies:
- - name: common
- version: ~9.x-0
- repository: '@local'
- - name: repositoryGenerator
- version: ~9.x-0
- repository: '@local'
- - name: timescaledb
- version: ~9.x-0
- repository: '@local'
- - name: readinessCheck
- version: ~9.x-0
- repository: '@local'
- - name: serviceAccount
- version: ~9.x-0
- repository: '@local'
diff --git a/kubernetes/cps/components/cps-temporal/values.yaml b/kubernetes/cps/components/cps-temporal/values.yaml
index f8311697f5..8b3f16b64c 100644
--- a/kubernetes/cps/components/cps-temporal/values.yaml
+++ b/kubernetes/cps/components/cps-temporal/values.yaml
@@ -45,7 +45,7 @@ containerPort: &svc_port 8080
managementPort: &mgt_port 8081
prometheus:
- enabled: true
+ enabled: false
service:
type: ClusterIP
@@ -60,7 +60,6 @@ service:
metrics:
serviceMonitor:
- enabled: true
port: http-management
## specify target port if name is not given to the port in the service definition
##
diff --git a/kubernetes/cps/components/ncmp-dmi-plugin/Chart.yaml b/kubernetes/cps/components/ncmp-dmi-plugin/Chart.yaml
index 729eeb2c77..10c2aab323 100644
--- a/kubernetes/cps/components/ncmp-dmi-plugin/Chart.yaml
+++ b/kubernetes/cps/components/ncmp-dmi-plugin/Chart.yaml
@@ -1,6 +1,7 @@
# ============LICENSE_START=======================================================
# Copyright (C) 2021 Nordix Foundation
# Modifications Copyright © 2021 Orange
+# Modifications Copyright © 2021 Nordix Foundation
# ================================================================================
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -17,7 +18,21 @@
# SPDX-License-Identifier: Apache-2.0
# ============LICENSE_END=========================================================
-apiVersion: v1
+apiVersion: v2
description: ONAP Configuration Persistance Service (CPS) - NCMP-DMI-Plugin
name: ncmp-dmi-plugin
-version: 9.0.0
+version: 10.0.0
+
+dependencies:
+ - name: common
+ version: ~10.x-0
+ repository: '@local'
+ - name: readinessCheck
+ version: ~10.x-0
+ repository: '@local'
+ - name: repositoryGenerator
+ version: ~10.x-0
+ repository: '@local'
+ - name: serviceAccount
+ version: ~10.x-0
+ repository: '@local' \ No newline at end of file
diff --git a/kubernetes/cps/components/ncmp-dmi-plugin/requirements.yaml b/kubernetes/cps/components/ncmp-dmi-plugin/requirements.yaml
deleted file mode 100644
index 1814a7b281..0000000000
--- a/kubernetes/cps/components/ncmp-dmi-plugin/requirements.yaml
+++ /dev/null
@@ -1,32 +0,0 @@
-# ============LICENSE_START=======================================================
-# Copyright (C) 2021 Nordix Foundation
-# Modifications Copyright © 2021 Orange
-# ================================================================================
-# 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.
-#
-# SPDX-License-Identifier: Apache-2.0
-# ============LICENSE_END=========================================================
-
-dependencies:
- - name: common
- version: ~9.x-0
- repository: '@local'
- - name: readinessCheck
- version: ~9.x-0
- repository: '@local'
- - name: repositoryGenerator
- version: ~9.x-0
- repository: '@local'
- - name: serviceAccount
- version: ~9.x-0
- repository: '@local'
diff --git a/kubernetes/cps/components/ncmp-dmi-plugin/values.yaml b/kubernetes/cps/components/ncmp-dmi-plugin/values.yaml
index a4a56dee80..753b8baaff 100644
--- a/kubernetes/cps/components/ncmp-dmi-plugin/values.yaml
+++ b/kubernetes/cps/components/ncmp-dmi-plugin/values.yaml
@@ -52,7 +52,7 @@ containerPort: &svc_port 8080
managementPort: &mgt_port 8081
prometheus:
- enabled: true
+ enabled: false
service:
type: ClusterIP
@@ -66,7 +66,6 @@ service:
metrics:
serviceMonitor:
- enabled: true
port: http-management
## specify target port if name is not given to the port in the service definition
##
diff --git a/kubernetes/cps/requirements.yaml b/kubernetes/cps/requirements.yaml
deleted file mode 100644
index bd9a80c957..0000000000
--- a/kubernetes/cps/requirements.yaml
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright (C) 2021 Bell Canada.
-# Modifications Copyright © 2021 Orange
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-dependencies:
- - name: common
- version: ~9.x-0
- repository: '@local'
- - name: cps-core
- version: ~9.x-0
- repository: '@local'
- condition: cps-core.enabled
- - name: cps-temporal
- version: ~9.x-0
- repository: '@local'
- condition: cps-temporal.enabled
- - name: ncmp-dmi-plugin
- version: ~9.x-0
- repository: '@local'
- condition: ncmp-dmi-plugin.enabled
diff --git a/kubernetes/dcaegen2-services/Chart.yaml b/kubernetes/dcaegen2-services/Chart.yaml
index 058d142659..609d78b6f4 100644
--- a/kubernetes/dcaegen2-services/Chart.yaml
+++ b/kubernetes/dcaegen2-services/Chart.yaml
@@ -2,6 +2,7 @@
# ================================================================================
# Copyright (c) 2020 J. F. Lucas. All rights reserved.
# Modifications Copyright © 2021 Orange
+# Modifications Copyright © 2021 Nordix Foundation
# ================================================================================
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -16,8 +17,89 @@
# limitations under the License.
# ============LICENSE_END=========================================================
-apiVersion: v1
-appVersion: "Honolulu"
+apiVersion: v2
+appVersion: "Jakarta"
description: DCAE Microservices
name: dcaegen2-services
-version: 9.0.0
+version: 10.0.0
+
+dependencies:
+ - name: common
+ version: ~10.x-0
+ repository: '@local'
+ - name: dcae-bbs-eventprocessor-ms
+ version: ~10.x-0
+ repository: '@local'
+ condition: dcae-bbs-eventprocessor-ms.enabled
+ - name: dcae-datafile-collector
+ version: ~10.x-0
+ repository: '@local'
+ condition: dcae-datafile-collector.enabled
+ - name: dcae-datalake-admin-ui
+ version: ~10.x-0
+ repository: '@local'
+ condition: dcae-datalake-admin-ui.enabled
+ - name: dcae-datalake-des
+ version: ~10.x-0
+ repository: '@local'
+ condition: dcae-datalake-des.enabled
+ - name: dcae-datalake-feeder
+ version: ~10.x-0
+ repository: '@local'
+ condition: dcae-datalake-feeder.enabled
+ - name: dcae-heartbeat
+ version: ~10.x-0
+ repository: '@local'
+ condition: dcae-heartbeat.enabled
+ - name: dcae-hv-ves-collector
+ version: ~10.x-0
+ repository: '@local'
+ condition: dcae-hv-ves-collector.enabled
+ - name: dcae-kpi-ms
+ version: ~10.x-0
+ repository: '@local'
+ condition: dcae-kpi-ms.enabled
+ - name: dcae-ms-healthcheck
+ version: ~10.x-0
+ repository: '@local'
+ condition: dcae-ms-healthcheck.enabled
+ - name: dcae-pm-mapper
+ version: ~10.x-0
+ repository: '@local'
+ condition: dcae-pm-mapper.enabled
+ - name: dcae-pmsh
+ version: ~10.x-0
+ repository: '@local'
+ condition: dcae-pmsh.enabled
+ - name: dcae-prh
+ version: ~10.x-0
+ repository: '@local'
+ condition: dcae-prh.enabled
+ - name: dcae-restconf-collector
+ version: ~10.x-0
+ repository: '@local'
+ condition: dcae-restconf-collector.enabled
+ - name: dcae-slice-analysis-ms
+ version: ~10.x-0
+ repository: '@local'
+ condition: dcae-slice-analysis-ms.enabled
+ - name: dcae-snmptrap-collector
+ version: ~10.x-0
+ repository: '@local'
+ condition: dcae-snmptrap-collector.enabled
+ - name: dcae-son-handler
+ version: ~10.x-0
+ repository: '@local'
+ condition: dcae-son-handler.enabled
+ - name: dcae-tcagen2
+ version: ~10.x-0
+ repository: '@local'
+ condition: dcae-tcagen2.enabled
+ - name: dcae-ves-collector
+ version: ~10.x-0
+ repository: '@local'
+ condition: dcae-ves-collector.enabled
+ - name: dcae-ves-mapper
+ version: ~10.x-0
+ repository: '@local'
+ condition: dcae-ves-mapper.enabled
diff --git a/kubernetes/dcaegen2-services/Makefile b/kubernetes/dcaegen2-services/Makefile
index 70bb031af3..0e0560c68e 100644
--- a/kubernetes/dcaegen2-services/Makefile
+++ b/kubernetes/dcaegen2-services/Makefile
@@ -36,7 +36,7 @@ make-%:
@if [ -f $*/Makefile ]; then make -C $*; fi
dep-%: make-%
- @if [ -f $*/requirements.yaml ]; then $(HELM_BIN) dep up $*; fi
+ @if [ -f $*/Chart.yaml ]; then $(HELM_BIN) dep up $*; fi
lint-%: dep-%
@if [ -f $*/Chart.yaml ]; then $(HELM_BIN) lint $*; fi
@@ -47,7 +47,7 @@ package-%: lint-%
@sleep 3
clean:
- @rm -f */requirements.lock
+ @rm -f */Chart.lock
@rm -f *tgz */charts/*tgz
@rm -rf $(PACKAGE_DIR)
%:
diff --git a/kubernetes/dcaegen2-services/common/Makefile b/kubernetes/dcaegen2-services/common/Makefile
index db8704c2ca..9a84ab8375 100644
--- a/kubernetes/dcaegen2-services/common/Makefile
+++ b/kubernetes/dcaegen2-services/common/Makefile
@@ -43,7 +43,7 @@ make-%:
@if [ -f $*/Makefile ]; then make -C $*; fi
dep-%: make-%
- @if [ -f $*/requirements.yaml ]; then $(HELM_BIN) dep up $*; fi
+ @if [ -f $*/Chart.yaml ]; then $(HELM_BIN) dep up $*; fi
lint-%: dep-%
@if [ -f $*/Chart.yaml ]; then $(HELM_BIN) lint $*; fi
@@ -54,7 +54,7 @@ package-%: lint-%
@sleep 3
clean:
- @rm -f */requirements.lock
+ @rm -f */Chart.lock
@rm -f *tgz */charts/*tgz
@rm -rf $(PACKAGE_DIR)
diff --git a/kubernetes/dcaegen2-services/common/dcaegen2-services-common/Chart.yaml b/kubernetes/dcaegen2-services/common/dcaegen2-services-common/Chart.yaml
index 6f9b3fd0e7..b3c0146aed 100644
--- a/kubernetes/dcaegen2-services/common/dcaegen2-services-common/Chart.yaml
+++ b/kubernetes/dcaegen2-services/common/dcaegen2-services-common/Chart.yaml
@@ -2,6 +2,7 @@
# ================================================================================
# Copyright (c) 2020 J. F. Lucas. All rights reserved.
# Modifications Copyright © 2021 Orange
+# Modifications Copyright © 2021 Nordix Foundation
# ================================================================================
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -16,8 +17,13 @@
# limitations under the License.
# ============LICENSE_END=========================================================
-apiVersion: v1
-appVersion: "Honolulu"
+apiVersion: v2
+appVersion: "Jakarta"
description: DCAE Microservices Common templates
name: dcaegen2-services-common
-version: 9.0.0
+version: 10.0.0
+
+dependencies:
+ - name: common
+ version: ~10.x-0
+ repository: '@local'
diff --git a/kubernetes/dcaegen2-services/common/dcaegen2-services-common/requirements.yaml b/kubernetes/dcaegen2-services/common/dcaegen2-services-common/requirements.yaml
deleted file mode 100644
index 03f8b38bbc..0000000000
--- a/kubernetes/dcaegen2-services/common/dcaegen2-services-common/requirements.yaml
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright (c) 2021 J. F. Lucas. All rights reserved.
-# Modifications Copyright © 2021 Orange
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-dependencies:
- - name: common
- version: ~9.x-0
- repository: '@local'
diff --git a/kubernetes/dcaegen2-services/common/dcaegen2-services-common/templates/_deployment.tpl b/kubernetes/dcaegen2-services/common/dcaegen2-services-common/templates/_deployment.tpl
index dd0bf4bd48..aac0f4b3a9 100644
--- a/kubernetes/dcaegen2-services/common/dcaegen2-services-common/templates/_deployment.tpl
+++ b/kubernetes/dcaegen2-services/common/dcaegen2-services-common/templates/_deployment.tpl
@@ -272,6 +272,9 @@ spec:
args:
- --key-yaml
- "{{ include "common.name" . }}|/app-config/application_config.yaml"
+ env:
+ - name: CONSUL_HOST
+ value: {{ .Values.consulHost | default "consul-server-ui" }}.{{ include "common.namespace" . }}
resources: {{ include "common.resources" . | nindent 2 }}
volumeMounts:
- mountPath: /app-config
diff --git a/kubernetes/dcaegen2-services/components/Makefile b/kubernetes/dcaegen2-services/components/Makefile
index 284f99de6b..0f8aa99e0e 100644
--- a/kubernetes/dcaegen2-services/components/Makefile
+++ b/kubernetes/dcaegen2-services/components/Makefile
@@ -36,7 +36,7 @@ make-%:
@if [ -f $*/Makefile ]; then make -C $*; fi
dep-%: make-%
- @if [ -f $*/requirements.yaml ]; then $(HELM_BIN) dep up $*; fi
+ @if [ -f $*/Chart.yaml ]; then $(HELM_BIN) dep up $*; fi
lint-%: dep-%
@if [ -f $*/Chart.yaml ]; then $(HELM_BIN) lint $*; fi
@@ -47,7 +47,7 @@ package-%: lint-%
@sleep 5
clean:
- @rm -f */requirements.lock
+ @rm -f */Chart.lock
@rm -f *tgz */charts/*tgz
@rm -rf $(PACKAGE_DIR)
diff --git a/kubernetes/dcaegen2-services/components/dcae-bbs-eventprocessor-ms/Chart.yaml b/kubernetes/dcaegen2-services/components/dcae-bbs-eventprocessor-ms/Chart.yaml
index 65944ff296..5463d37a6e 100644
--- a/kubernetes/dcaegen2-services/components/dcae-bbs-eventprocessor-ms/Chart.yaml
+++ b/kubernetes/dcaegen2-services/components/dcae-bbs-eventprocessor-ms/Chart.yaml
@@ -2,6 +2,7 @@
# ============================================================================
# Copyright (c) 2021 AT&T Intellectual Property
# Modifications Copyright © 2021 Orange
+# Modifications Copyright © 2021 Nordix Foundation
# ============================================================================
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -16,8 +17,25 @@
# limitations under the License.
# ================================= LICENSE_END ==============================
-apiVersion: v1
-appVersion: "Honolulu"
+apiVersion: v2
+appVersion: "Jakarta"
description: DCAE BBS-EventProcessor Microservice
name: dcae-bbs-eventprocessor-ms
-version: 9.0.0
+version: 10.0.0
+
+dependencies:
+ - name: common
+ version: ~10.x-0
+ repository: '@local'
+ - name: readinessCheck
+ version: ~10.x-0
+ repository: '@local'
+ - name: repositoryGenerator
+ version: ~10.x-0
+ repository: '@local'
+ - name: dcaegen2-services-common
+ version: ~10.x-0
+ repository: '@local'
+ - name: serviceAccount
+ version: ~10.x-0
+ repository: '@local'
diff --git a/kubernetes/dcaegen2-services/components/dcae-bbs-eventprocessor-ms/requirements.yaml b/kubernetes/dcaegen2-services/components/dcae-bbs-eventprocessor-ms/requirements.yaml
deleted file mode 100644
index b02251cc51..0000000000
--- a/kubernetes/dcaegen2-services/components/dcae-bbs-eventprocessor-ms/requirements.yaml
+++ /dev/null
@@ -1,34 +0,0 @@
-# ================================ LICENSE_START =============================
-# ============================================================================
-# Copyright (c) 2021 AT&T Intellectual Property. All rights reserved.
-# Modifications Copyright © 2021 Orange
-# ============================================================================
-# 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 ==============================
-
-dependencies:
- - name: common
- version: ~9.x-0
- repository: '@local'
- - name: readinessCheck
- version: ~9.x-0
- repository: '@local'
- - name: repositoryGenerator
- version: ~9.x-0
- repository: '@local'
- - name: dcaegen2-services-common
- version: ~9.x-0
- repository: '@local'
- - name: serviceAccount
- version: ~9.x-0
- repository: '@local'
diff --git a/kubernetes/dcaegen2-services/components/dcae-datafile-collector/Chart.yaml b/kubernetes/dcaegen2-services/components/dcae-datafile-collector/Chart.yaml
index 2c5ecf9136..36edd4b6ae 100644
--- a/kubernetes/dcaegen2-services/components/dcae-datafile-collector/Chart.yaml
+++ b/kubernetes/dcaegen2-services/components/dcae-datafile-collector/Chart.yaml
@@ -2,6 +2,7 @@
# ============================================================================
# Copyright (C) 2021 Nordix Foundation.
# Modifications Copyright © 2021 Orange
+# Modifications Copyright © 2021 Nordix Foundation
# ============================================================================
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -16,8 +17,28 @@
# limitations under the License.
# ================================= LICENSE_END ==============================
-apiVersion: v1
-appVersion: "Honolulu"
+apiVersion: v2
+appVersion: "Jakarta"
description: DCAE DataFile Collector Helm charts
name: dcae-datafile-collector
-version: 9.0.0
+version: 10.0.0
+
+dependencies:
+ - name: common
+ version: ~10.x-0
+ repository: '@local'
+ - name: readinessCheck
+ version: ~10.x-0
+ repository: '@local'
+ - name: repositoryGenerator
+ version: ~10.x-0
+ repository: '@local'
+ - name: certManagerCertificate
+ version: ~10.x-0
+ repository: '@local'
+ - name: dcaegen2-services-common
+ version: ~10.x-0
+ repository: '@local'
+ - name: serviceAccount
+ version: ~10.x-0
+ repository: '@local'
diff --git a/kubernetes/dcaegen2-services/components/dcae-datafile-collector/requirements.yaml b/kubernetes/dcaegen2-services/components/dcae-datafile-collector/requirements.yaml
deleted file mode 100644
index a8c98985e3..0000000000
--- a/kubernetes/dcaegen2-services/components/dcae-datafile-collector/requirements.yaml
+++ /dev/null
@@ -1,37 +0,0 @@
-# ================================ LICENSE_START =============================
-# ============================================================================
-# Copyright (C) 2021 Nordix Foundation.
-# Modifications Copyright © 2021 Orange
-# ============================================================================
-# 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 ==============================
-
-dependencies:
- - name: common
- version: ~9.x-0
- repository: '@local'
- - name: readinessCheck
- version: ~9.x-0
- repository: '@local'
- - name: repositoryGenerator
- version: ~9.x-0
- repository: '@local'
- - name: certManagerCertificate
- version: ~9.x-0
- repository: '@local'
- - name: dcaegen2-services-common
- version: ~9.x-0
- repository: '@local'
- - name: serviceAccount
- version: ~9.x-0
- repository: '@local'
diff --git a/kubernetes/dcaegen2-services/components/dcae-datalake-admin-ui/Chart.yaml b/kubernetes/dcaegen2-services/components/dcae-datalake-admin-ui/Chart.yaml
index 24bb8e054a..d61a50c7bd 100644
--- a/kubernetes/dcaegen2-services/components/dcae-datalake-admin-ui/Chart.yaml
+++ b/kubernetes/dcaegen2-services/components/dcae-datalake-admin-ui/Chart.yaml
@@ -2,6 +2,7 @@
# ================================================================================
# Copyright (c) 2021 Wipro Limited.
# Modifications Copyright © 2021 Orange
+# Modifications Copyright © 2021 Nordix Foundation
# ================================================================================
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -16,8 +17,25 @@
# limitations under the License.
# ============LICENSE_END=========================================================
-apiVersion: v1
-appVersion: "Honolulu"
+apiVersion: v2
+appVersion: "Jakarta"
description: DCAE datalake-admin-ui helm chart
name: dcae-datalake-admin-ui
-version: 9.0.0
+version: 10.0.0
+
+dependencies:
+ - name: common
+ version: ~10.x-0
+ repository: '@local'
+ - name: repositoryGenerator
+ version: ~10.x-0
+ repository: '@local'
+ - name: readinessCheck
+ version: ~10.x-0
+ repository: '@local'
+ - name: dcaegen2-services-common
+ version: ~10.x-0
+ repository: '@local'
+ - name: serviceAccount
+ version: ~10.x-0
+ repository: '@local'
diff --git a/kubernetes/dcaegen2-services/components/dcae-datalake-des/Chart.yaml b/kubernetes/dcaegen2-services/components/dcae-datalake-des/Chart.yaml
index aa4c2178b1..7d2f36c350 100644
--- a/kubernetes/dcaegen2-services/components/dcae-datalake-des/Chart.yaml
+++ b/kubernetes/dcaegen2-services/components/dcae-datalake-des/Chart.yaml
@@ -2,6 +2,7 @@
# ============================================================================
# Copyright (C) 2021 Wipro Limited.
# Modifications Copyright © 2021 Orange
+# Modifications Copyright © 2021 Nordix Foundation
# ============================================================================
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -16,8 +17,25 @@
# limitations under the License.
# ================================= LICENSE_END ==============================
-apiVersion: v1
-appVersion: "Honolulu"
+apiVersion: v2
+appVersion: "Jakarta"
description: DCAE Datalake DES MS charts
name: dcae-datalake-des
-version: 9.0.0
+version: 10.0.0
+
+dependencies:
+ - name: common
+ version: ~10.x-0
+ repository: '@local'
+ - name: repositoryGenerator
+ version: ~10.x-0
+ repository: '@local'
+ - name: readinessCheck
+ version: ~10.x-0
+ repository: '@local'
+ - name: dcaegen2-services-common
+ version: ~10.x-0
+ repository: '@local'
+ - name: serviceAccount
+ version: ~10.x-0
+ repository: '@local'
diff --git a/kubernetes/dcaegen2-services/components/dcae-datalake-des/requirements.yaml b/kubernetes/dcaegen2-services/components/dcae-datalake-des/requirements.yaml
deleted file mode 100644
index 0faf38079b..0000000000
--- a/kubernetes/dcaegen2-services/components/dcae-datalake-des/requirements.yaml
+++ /dev/null
@@ -1,34 +0,0 @@
-# ================================ LICENSE_START =============================
-# ============================================================================
-# Copyright (C) 2021 Wipro Limited.
-# Modifications Copyright © 2021 Orange
-# ============================================================================
-# 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 ==============================
-
-dependencies:
- - name: common
- version: ~9.x-0
- repository: '@local'
- - name: repositoryGenerator
- version: ~9.x-0
- repository: '@local'
- - name: readinessCheck
- version: ~9.x-0
- repository: '@local'
- - name: dcaegen2-services-common
- version: ~9.x-0
- repository: '@local'
- - name: serviceAccount
- version: ~9.x-0
- repository: '@local'
diff --git a/kubernetes/dcaegen2-services/components/dcae-datalake-feeder/Chart.yaml b/kubernetes/dcaegen2-services/components/dcae-datalake-feeder/Chart.yaml
index 1b70dcd823..c62cbd1a0f 100644
--- a/kubernetes/dcaegen2-services/components/dcae-datalake-feeder/Chart.yaml
+++ b/kubernetes/dcaegen2-services/components/dcae-datalake-feeder/Chart.yaml
@@ -2,6 +2,7 @@
# ============================================================================
# Copyright (C) 2021 Wipro Limited
# Modifications Copyright © 2021 Orange
+# Modifications Copyright © 2021 Nordix Foundation
# ============================================================================
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -16,8 +17,28 @@
# limitations under the License.
# ================================= LICENSE_END ==============================
-apiVersion: v1
-appVersion: "Honolulu"
+apiVersion: v2
+appVersion: "Jakarta"
description: DCAE Datalake feeder MS charts
name: dcae-datalake-feeder
-version: 9.0.0
+version: 10.0.0
+
+dependencies:
+ - name: common
+ version: ~10.x-0
+ repository: '@local'
+ - name: postgres
+ version: ~10.x-0
+ repository: '@local'
+ - name: repositoryGenerator
+ version: ~10.x-0
+ repository: '@local'
+ - name: readinessCheck
+ version: ~10.x-0
+ repository: '@local'
+ - name: dcaegen2-services-common
+ version: ~10.x-0
+ repository: '@local'
+ - name: serviceAccount
+ version: ~10.x-0
+ repository: '@local'
diff --git a/kubernetes/dcaegen2-services/components/dcae-datalake-feeder/requirements.yaml b/kubernetes/dcaegen2-services/components/dcae-datalake-feeder/requirements.yaml
deleted file mode 100644
index a14fca9a35..0000000000
--- a/kubernetes/dcaegen2-services/components/dcae-datalake-feeder/requirements.yaml
+++ /dev/null
@@ -1,37 +0,0 @@
-# ================================ LICENSE_START =============================
-# ============================================================================
-# Copyright (C) 2021 Wipro Limited.
-# Modifications Copyright © 2021 Orange
-# ============================================================================
-# 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 ==============================
-
-dependencies:
- - name: common
- version: ~9.x-0
- repository: '@local'
- - name: postgres
- version: ~9.x-0
- repository: '@local'
- - name: repositoryGenerator
- version: ~9.x-0
- repository: '@local'
- - name: readinessCheck
- version: ~9.x-0
- repository: '@local'
- - name: dcaegen2-services-common
- version: ~9.x-0
- repository: '@local'
- - name: serviceAccount
- version: ~9.x-0
- repository: '@local'
diff --git a/kubernetes/dcaegen2-services/components/dcae-heartbeat/Chart.yaml b/kubernetes/dcaegen2-services/components/dcae-heartbeat/Chart.yaml
index a350b9326d..207052f077 100644
--- a/kubernetes/dcaegen2-services/components/dcae-heartbeat/Chart.yaml
+++ b/kubernetes/dcaegen2-services/components/dcae-heartbeat/Chart.yaml
@@ -2,6 +2,7 @@
# ============================================================================
# Copyright (c) 2021 AT&T Intellectual Property
# Modifications Copyright © 2021 Orange
+# Modifications Copyright © 2021 Nordix Foundation
# ============================================================================
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -16,8 +17,28 @@
# limitations under the License.
# ================================= LICENSE_END ==============================
-apiVersion: v1
-appVersion: "Honolulu"
+apiVersion: v2
+appVersion: "Jakarta"
description: DCAE Heartbeat Microservice
name: dcae-heartbeat
-version: 9.0.0
+version: 10.0.0
+
+dependencies:
+ - name: common
+ version: ~10.x-0
+ repository: '@local'
+ - name: postgres
+ version: ~10.x-0
+ repository: '@local'
+ - name: readinessCheck
+ version: ~10.x-0
+ repository: '@local'
+ - name: repositoryGenerator
+ version: ~10.x-0
+ repository: '@local'
+ - name: dcaegen2-services-common
+ version: ~10.x-0
+ repository: '@local'
+ - name: serviceAccount
+ version: ~10.x-0
+ repository: '@local'
diff --git a/kubernetes/dcaegen2-services/components/dcae-heartbeat/requirements.yaml b/kubernetes/dcaegen2-services/components/dcae-heartbeat/requirements.yaml
deleted file mode 100644
index dc8d47fc7d..0000000000
--- a/kubernetes/dcaegen2-services/components/dcae-heartbeat/requirements.yaml
+++ /dev/null
@@ -1,37 +0,0 @@
-# ================================ LICENSE_START =============================
-# ============================================================================
-# Copyright (c) 2021 AT&T Intellectual Property. All rights reserved.
-# Modifications Copyright © 2021 Orange
-# ============================================================================
-# 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 ==============================
-
-dependencies:
- - name: common
- version: ~9.x-0
- repository: '@local'
- - name: postgres
- version: ~9.x-0
- repository: '@local'
- - name: readinessCheck
- version: ~9.x-0
- repository: '@local'
- - name: repositoryGenerator
- version: ~9.x-0
- repository: '@local'
- - name: dcaegen2-services-common
- version: ~9.x-0
- repository: '@local'
- - name: serviceAccount
- version: ~9.x-0
- repository: '@local'
diff --git a/kubernetes/dcaegen2-services/components/dcae-hv-ves-collector/Chart.yaml b/kubernetes/dcaegen2-services/components/dcae-hv-ves-collector/Chart.yaml
index 149b149951..30d73f3844 100644
--- a/kubernetes/dcaegen2-services/components/dcae-hv-ves-collector/Chart.yaml
+++ b/kubernetes/dcaegen2-services/components/dcae-hv-ves-collector/Chart.yaml
@@ -2,6 +2,7 @@
# ================================================================================
# Copyright (c) 2021 J. F. Lucas. All rights reserved.
# Modifications Copyright © 2021 Orange
+# Modifications Copyright © 2021 Nordix Foundation
# ================================================================================
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -16,8 +17,28 @@
# limitations under the License.
# ============LICENSE_END=========================================================
-apiVersion: v1
-appVersion: "Honolulu"
+apiVersion: v2
+appVersion: "Jakarta"
description: DCAE HV VES collector
name: dcae-hv-ves-collector
-version: 9.0.0
+version: 10.0.0
+
+dependencies:
+ - name: common
+ version: ~10.x-0
+ repository: '@local'
+ - name: repositoryGenerator
+ version: ~10.x-0
+ repository: '@local'
+ - name: readinessCheck
+ version: ~10.x-0
+ repository: '@local'
+ - name: dcaegen2-services-common
+ version: ~10.x-0
+ repository: '@local'
+ - name: certManagerCertificate
+ version: ~10.x-0
+ repository: '@local'
+ - name: serviceAccount
+ version: ~10.x-0
+ repository: '@local'
diff --git a/kubernetes/dcaegen2-services/components/dcae-hv-ves-collector/requirements.yaml b/kubernetes/dcaegen2-services/components/dcae-hv-ves-collector/requirements.yaml
deleted file mode 100644
index a0878282e2..0000000000
--- a/kubernetes/dcaegen2-services/components/dcae-hv-ves-collector/requirements.yaml
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright (c) 2021 J. F. Lucas. All rights reserved.
-# Copyright (c) 2021 Nokia. All rights reserved.
-# Copyright (c) 2021 AT&T. All rights reserved.
-# Modifications Copyright © 2021 Orange
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-dependencies:
- - name: common
- version: ~9.x-0
- repository: '@local'
- - name: repositoryGenerator
- version: ~9.x-0
- repository: '@local'
- - name: readinessCheck
- version: ~9.x-0
- repository: '@local'
- - name: dcaegen2-services-common
- version: ~9.x-0
- repository: '@local'
- - name: certManagerCertificate
- version: ~9.x-0
- repository: '@local'
- - name: serviceAccount
- version: ~9.x-0
- repository: '@local'
diff --git a/kubernetes/dcaegen2-services/components/dcae-kpi-ms/Chart.yaml b/kubernetes/dcaegen2-services/components/dcae-kpi-ms/Chart.yaml
index 4fa84cbbc4..53b070ea90 100644
--- a/kubernetes/dcaegen2-services/components/dcae-kpi-ms/Chart.yaml
+++ b/kubernetes/dcaegen2-services/components/dcae-kpi-ms/Chart.yaml
@@ -2,6 +2,7 @@
# ================================================================================
# Copyright (c) 2021 Wipro Limited.
# Modifications Copyright © 2021 Orange
+# Modifications Copyright © 2021 Nordix Foundation
# ================================================================================
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -16,8 +17,25 @@
# limitations under the License.
# ============LICENSE_END=========================================================
-apiVersion: v1
-appVersion: "Honolulu"
+apiVersion: v2
+appVersion: "Jakarta"
description: DCAE KPI MS chart
name: dcae-kpi-ms
-version: 9.0.0
+version: 10.0.0
+
+dependencies:
+ - name: common
+ version: ~10.x-0
+ repository: '@local'
+ - name: readinessCheck
+ version: ~10.x-0
+ repository: '@local'
+ - name: repositoryGenerator
+ version: ~10.x-0
+ repository: '@local'
+ - name: dcaegen2-services-common
+ version: ~10.x-0
+ repository: '@local'
+ - name: serviceAccount
+ version: ~10.x-0
+ repository: '@local'
diff --git a/kubernetes/dcaegen2-services/components/dcae-kpi-ms/requirements.yaml b/kubernetes/dcaegen2-services/components/dcae-kpi-ms/requirements.yaml
deleted file mode 100644
index 824c63772c..0000000000
--- a/kubernetes/dcaegen2-services/components/dcae-kpi-ms/requirements.yaml
+++ /dev/null
@@ -1,34 +0,0 @@
-#============LICENSE_START========================================================
-# ================================================================================
-# Copyright (c) 2021 Wipro Limited.
-# Modifications Copyright © 2021 Orange
-# ================================================================================
-# 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=========================================================
-
-dependencies:
- - name: common
- version: ~9.x-0
- repository: '@local'
- - name: readinessCheck
- version: ~9.x-0
- repository: '@local'
- - name: repositoryGenerator
- version: ~9.x-0
- repository: '@local'
- - name: dcaegen2-services-common
- version: ~9.x-0
- repository: '@local'
- - name: serviceAccount
- version: ~9.x-0
- repository: '@local'
diff --git a/kubernetes/dcaegen2-services/components/dcae-ms-healthcheck/Chart.yaml b/kubernetes/dcaegen2-services/components/dcae-ms-healthcheck/Chart.yaml
index dbd20127cf..73331aa66a 100644
--- a/kubernetes/dcaegen2-services/components/dcae-ms-healthcheck/Chart.yaml
+++ b/kubernetes/dcaegen2-services/components/dcae-ms-healthcheck/Chart.yaml
@@ -4,6 +4,7 @@
# Modifications Copyright © 2018 Amdocs, Bell Canada
# Copyright (c) 2021 J. F. Lucas. All rights reserved.
# Modifications Copyright © 2021 Orange
+# Modifications Copyright © 2021 Nordix Foundation
# ================================================================================
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -18,8 +19,19 @@
# limitations under the License.
# ============LICENSE_END=========================================================
-apiVersion: v1
-appVersion: "Honolulu"
+apiVersion: v2
+appVersion: "Jakarta"
description: ONAP DCAE Microservice Health Check
name: dcae-ms-healthcheck
-version: 9.0.0
+version: 10.0.0
+
+dependencies:
+ - name: common
+ version: ~10.x-0
+ repository: '@local'
+ - name: repositoryGenerator
+ version: ~10.x-0
+ repository: '@local'
+ - name: serviceAccount
+ version: ~10.x-0
+ repository: '@local'
diff --git a/kubernetes/dcaegen2-services/components/dcae-ms-healthcheck/requirements.yaml b/kubernetes/dcaegen2-services/components/dcae-ms-healthcheck/requirements.yaml
deleted file mode 100644
index 747117cfd2..0000000000
--- a/kubernetes/dcaegen2-services/components/dcae-ms-healthcheck/requirements.yaml
+++ /dev/null
@@ -1,29 +0,0 @@
-#============LICENSE_START========================================================
-#=================================================================================
-# Copyright (c) 2018 AT&T Intellectual Property. All rights reserved.
-# Modifications Copyright © 2018 Amdocs, Bell Canada
-# Modifications Copyright © 2021 Orange
-# ================================================================================
-# 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=========================================================
-
-dependencies:
- - name: common
- version: ~9.x-0
- repository: '@local'
- - name: repositoryGenerator
- version: ~9.x-0
- repository: '@local'
- - name: serviceAccount
- version: ~9.x-0
- repository: '@local'
diff --git a/kubernetes/dcaegen2-services/components/dcae-ms-healthcheck/values.yaml b/kubernetes/dcaegen2-services/components/dcae-ms-healthcheck/values.yaml
index 8ec60a7bd1..58ae706e0a 100644
--- a/kubernetes/dcaegen2-services/components/dcae-ms-healthcheck/values.yaml
+++ b/kubernetes/dcaegen2-services/components/dcae-ms-healthcheck/values.yaml
@@ -43,7 +43,7 @@ readiness:
initialDelaySeconds: 10
periodSeconds: 10
# application image
-image: onap/org.onap.dcaegen2.deployments.healthcheck-container:2.2.0
+image: onap/org.onap.dcaegen2.deployments.healthcheck-container:2.3.0
# Resource Limit flavor -By Default using small
flavor: small
diff --git a/kubernetes/dcaegen2-services/components/dcae-pm-mapper/Chart.yaml b/kubernetes/dcaegen2-services/components/dcae-pm-mapper/Chart.yaml
index 5bd9b41ca6..d3a128f653 100644
--- a/kubernetes/dcaegen2-services/components/dcae-pm-mapper/Chart.yaml
+++ b/kubernetes/dcaegen2-services/components/dcae-pm-mapper/Chart.yaml
@@ -2,6 +2,7 @@
# ============================================================================
# Copyright (C) 2021 Nordix Foundation.
# Modifications Copyright © 2021 Orange
+# Modifications Copyright © 2021 Nordix Foundation
# ============================================================================
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -16,8 +17,25 @@
# limitations under the License.
# ================================= LICENSE_END ==============================
-apiVersion: v1
-appVersion: "Honolulu"
+apiVersion: v2
+appVersion: "Jakarta"
description: DCAE PM-Mapper Helm charts
name: dcae-pm-mapper
-version: 9.0.0
+version: 10.0.0
+
+dependencies:
+ - name: common
+ version: ~10.x-0
+ repository: '@local'
+ - name: readinessCheck
+ version: ~10.x-0
+ repository: '@local'
+ - name: repositoryGenerator
+ version: ~10.x-0
+ repository: '@local'
+ - name: dcaegen2-services-common
+ version: ~10.x-0
+ repository: 'file://../../common/dcaegen2-services-common'
+ - name: serviceAccount
+ version: ~10.x-0
+ repository: '@local'
diff --git a/kubernetes/dcaegen2-services/components/dcae-pm-mapper/requirements.yaml b/kubernetes/dcaegen2-services/components/dcae-pm-mapper/requirements.yaml
deleted file mode 100644
index 404489c7ce..0000000000
--- a/kubernetes/dcaegen2-services/components/dcae-pm-mapper/requirements.yaml
+++ /dev/null
@@ -1,34 +0,0 @@
-# ================================ LICENSE_START =============================
-# ============================================================================
-# Copyright (C) 2021 Nordix Foundation.
-# Modifications Copyright © 2021 Orange
-# ============================================================================
-# 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 ==============================
-
-dependencies:
- - name: common
- version: ~9.x-0
- repository: '@local'
- - name: readinessCheck
- version: ~9.x-0
- repository: '@local'
- - name: repositoryGenerator
- version: ~9.x-0
- repository: '@local'
- - name: dcaegen2-services-common
- version: ~9.x-0
- repository: 'file://../../common/dcaegen2-services-common'
- - name: serviceAccount
- version: ~9.x-0
- repository: '@local'
diff --git a/kubernetes/dcaegen2-services/components/dcae-pmsh/Chart.yaml b/kubernetes/dcaegen2-services/components/dcae-pmsh/Chart.yaml
index 49ccae41ac..25f25e69cb 100644
--- a/kubernetes/dcaegen2-services/components/dcae-pmsh/Chart.yaml
+++ b/kubernetes/dcaegen2-services/components/dcae-pmsh/Chart.yaml
@@ -3,6 +3,7 @@
# Copyright (C) 2021 Nordix Foundation.
# Copyright (c) 2021 AT&T. All rights reserved.
# Modifications Copyright © 2021 Orange
+# Modifications Copyright © 2021 Nordix Foundation
# ============================================================================
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -17,8 +18,28 @@
# limitations under the License.
# ================================= LICENSE_END ==============================
-apiVersion: v1
-appVersion: "Honolulu"
+apiVersion: v2
+appVersion: "Jakarta"
description: DCAE PMSH Service
name: dcae-pmsh
-version: 9.0.0
+version: 10.0.0
+
+dependencies:
+ - name: common
+ version: ~10.x-0
+ repository: '@local'
+ - name: postgres
+ version: ~10.x-0
+ repository: '@local'
+ - name: readinessCheck
+ version: ~10.x-0
+ repository: '@local'
+ - name: repositoryGenerator
+ version: ~10.x-0
+ repository: '@local'
+ - name: dcaegen2-services-common
+ version: ~10.x-0
+ repository: '@local'
+ - name: serviceAccount
+ version: ~10.x-0
+ repository: '@local'
diff --git a/kubernetes/dcaegen2-services/components/dcae-pmsh/requirements.yaml b/kubernetes/dcaegen2-services/components/dcae-pmsh/requirements.yaml
deleted file mode 100644
index 68c9165c5b..0000000000
--- a/kubernetes/dcaegen2-services/components/dcae-pmsh/requirements.yaml
+++ /dev/null
@@ -1,37 +0,0 @@
-# ================================ LICENSE_START =============================
-# ============================================================================
-# Copyright (C) 2021 Nordix Foundation.
-# Modifications Copyright © 2021 Orange
-# ============================================================================
-# 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 ==============================
-
-dependencies:
- - name: common
- version: ~9.x-0
- repository: '@local'
- - name: postgres
- version: ~9.x-0
- repository: '@local'
- - name: readinessCheck
- version: ~9.x-0
- repository: '@local'
- - name: repositoryGenerator
- version: ~9.x-0
- repository: '@local'
- - name: dcaegen2-services-common
- version: ~9.x-0
- repository: '@local'
- - name: serviceAccount
- version: ~9.x-0
- repository: '@local'
diff --git a/kubernetes/dcaegen2-services/components/dcae-prh/Chart.yaml b/kubernetes/dcaegen2-services/components/dcae-prh/Chart.yaml
index 862033240a..14e5e87b89 100644
--- a/kubernetes/dcaegen2-services/components/dcae-prh/Chart.yaml
+++ b/kubernetes/dcaegen2-services/components/dcae-prh/Chart.yaml
@@ -2,6 +2,7 @@
# ================================================================================
# Copyright (c) 2021 J. F. Lucas. All rights reserved.
# Modifications Copyright © 2021 Orange
+# Modifications Copyright © 2021 Nordix Foundation
# ================================================================================
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -16,8 +17,25 @@
# limitations under the License.
# ============LICENSE_END=========================================================
-apiVersion: v1
-appVersion: "Honolulu"
+apiVersion: v2
+appVersion: "Jakarta"
description: DCAE PRH
name: dcae-prh
-version: 9.0.0
+version: 10.0.0
+
+dependencies:
+ - name: common
+ version: ~10.x-0
+ repository: '@local'
+ - name: repositoryGenerator
+ version: ~10.x-0
+ repository: '@local'
+ - name: readinessCheck
+ version: ~10.x-0
+ repository: '@local'
+ - name: dcaegen2-services-common
+ version: ~10.x-0
+ repository: '@local'
+ - name: serviceAccount
+ version: ~10.x-0
+ repository: '@local'
diff --git a/kubernetes/dcaegen2-services/components/dcae-prh/requirements.yaml b/kubernetes/dcaegen2-services/components/dcae-prh/requirements.yaml
deleted file mode 100644
index 8006092485..0000000000
--- a/kubernetes/dcaegen2-services/components/dcae-prh/requirements.yaml
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright (c) 2021 J. F. Lucas. All rights reserved.
-# Copyright (c) 2021 AT&T. All rights reserved.
-# Modifications Copyright © 2021 Orange
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-dependencies:
- - name: common
- version: ~9.x-0
- repository: '@local'
- - name: repositoryGenerator
- version: ~9.x-0
- repository: '@local'
- - name: readinessCheck
- version: ~9.x-0
- repository: '@local'
- - name: dcaegen2-services-common
- version: ~9.x-0
- repository: '@local'
- - name: serviceAccount
- version: ~9.x-0
- repository: '@local'
diff --git a/kubernetes/dcaegen2-services/components/dcae-restconf-collector/Chart.yaml b/kubernetes/dcaegen2-services/components/dcae-restconf-collector/Chart.yaml
index 60445b11db..cec9575e9b 100644
--- a/kubernetes/dcaegen2-services/components/dcae-restconf-collector/Chart.yaml
+++ b/kubernetes/dcaegen2-services/components/dcae-restconf-collector/Chart.yaml
@@ -2,6 +2,7 @@
# ============================================================================
# Copyright (c) 2021 AT&T Intellectual Property
# Modifications Copyright © 2021 Orange
+# Modifications Copyright © 2021 Nordix Foundation
# ============================================================================
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -16,8 +17,25 @@
# limitations under the License.
# ================================= LICENSE_END ==============================
-apiVersion: v1
-appVersion: "Honolulu"
+apiVersion: v2
+appVersion: "Jakarta"
description: DCAE RESTConf Collector
name: dcae-restconf-collector
-version: 9.0.0
+version: 10.0.0
+
+dependencies:
+ - name: common
+ version: ~10.x-0
+ repository: '@local'
+ - name: readinessCheck
+ version: ~10.x-0
+ repository: '@local'
+ - name: repositoryGenerator
+ version: ~10.x-0
+ repository: '@local'
+ - name: dcaegen2-services-common
+ version: ~10.x-0
+ repository: '@local'
+ - name: serviceAccount
+ version: ~10.x-0
+ repository: '@local'
diff --git a/kubernetes/dcaegen2-services/components/dcae-restconf-collector/requirements.yaml b/kubernetes/dcaegen2-services/components/dcae-restconf-collector/requirements.yaml
deleted file mode 100644
index b02251cc51..0000000000
--- a/kubernetes/dcaegen2-services/components/dcae-restconf-collector/requirements.yaml
+++ /dev/null
@@ -1,34 +0,0 @@
-# ================================ LICENSE_START =============================
-# ============================================================================
-# Copyright (c) 2021 AT&T Intellectual Property. All rights reserved.
-# Modifications Copyright © 2021 Orange
-# ============================================================================
-# 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 ==============================
-
-dependencies:
- - name: common
- version: ~9.x-0
- repository: '@local'
- - name: readinessCheck
- version: ~9.x-0
- repository: '@local'
- - name: repositoryGenerator
- version: ~9.x-0
- repository: '@local'
- - name: dcaegen2-services-common
- version: ~9.x-0
- repository: '@local'
- - name: serviceAccount
- version: ~9.x-0
- repository: '@local'
diff --git a/kubernetes/dcaegen2-services/components/dcae-slice-analysis-ms/Chart.yaml b/kubernetes/dcaegen2-services/components/dcae-slice-analysis-ms/Chart.yaml
index b77f104318..bee29cd923 100644
--- a/kubernetes/dcaegen2-services/components/dcae-slice-analysis-ms/Chart.yaml
+++ b/kubernetes/dcaegen2-services/components/dcae-slice-analysis-ms/Chart.yaml
@@ -2,6 +2,7 @@
# ================================================================================
# Copyright (c) 2021 Wipro Limited.
# Modifications Copyright © 2021 Orange
+# Modifications Copyright © 2021 Nordix Foundation
# ================================================================================
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -16,8 +17,28 @@
# limitations under the License.
# ============LICENSE_END=========================================================
-apiVersion: v1
-appVersion: "Honolulu"
+apiVersion: v2
+appVersion: "Jakarta"
description: DCAE SliceAnalysis MS charts
name: dcae-slice-analysis-ms
-version: 9.0.0
+version: 10.0.0
+
+dependencies:
+ - name: common
+ version: ~10.x-0
+ repository: '@local'
+ - name: postgres
+ version: ~10.x-0
+ repository: '@local'
+ - name: repositoryGenerator
+ version: ~10.x-0
+ repository: '@local'
+ - name: readinessCheck
+ version: ~10.x-0
+ repository: '@local'
+ - name: dcaegen2-services-common
+ version: ~10.x-0
+ repository: '@local'
+ - name: serviceAccount
+ version: ~10.x-0
+ repository: '@local'
diff --git a/kubernetes/dcaegen2-services/components/dcae-snmptrap-collector/Chart.yaml b/kubernetes/dcaegen2-services/components/dcae-snmptrap-collector/Chart.yaml
index 57beb718ba..3cd71a357e 100644
--- a/kubernetes/dcaegen2-services/components/dcae-snmptrap-collector/Chart.yaml
+++ b/kubernetes/dcaegen2-services/components/dcae-snmptrap-collector/Chart.yaml
@@ -2,6 +2,7 @@
# ============================================================================
# Copyright (c) 2021 AT&T Intellectual Property
# Modifications Copyright © 2021 Orange
+# Modifications Copyright © 2021 Nordix Foundation
# ============================================================================
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -16,8 +17,25 @@
# limitations under the License.
# ================================= LICENSE_END ==============================
-apiVersion: v1
-appVersion: "Honolulu"
+apiVersion: v2
+appVersion: "Jakarta"
description: DCAE SNMPTrap Collector
name: dcae-snmptrap-collector
-version: 9.0.0
+version: 10.0.0
+
+dependencies:
+ - name: common
+ version: ~10.x-0
+ repository: '@local'
+ - name: readinessCheck
+ version: ~10.x-0
+ repository: '@local'
+ - name: repositoryGenerator
+ version: ~10.x-0
+ repository: '@local'
+ - name: dcaegen2-services-common
+ version: ~10.x-0
+ repository: '@local'
+ - name: serviceAccount
+ version: ~10.x-0
+ repository: '@local'
diff --git a/kubernetes/dcaegen2-services/components/dcae-snmptrap-collector/requirements.yaml b/kubernetes/dcaegen2-services/components/dcae-snmptrap-collector/requirements.yaml
deleted file mode 100644
index b02251cc51..0000000000
--- a/kubernetes/dcaegen2-services/components/dcae-snmptrap-collector/requirements.yaml
+++ /dev/null
@@ -1,34 +0,0 @@
-# ================================ LICENSE_START =============================
-# ============================================================================
-# Copyright (c) 2021 AT&T Intellectual Property. All rights reserved.
-# Modifications Copyright © 2021 Orange
-# ============================================================================
-# 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 ==============================
-
-dependencies:
- - name: common
- version: ~9.x-0
- repository: '@local'
- - name: readinessCheck
- version: ~9.x-0
- repository: '@local'
- - name: repositoryGenerator
- version: ~9.x-0
- repository: '@local'
- - name: dcaegen2-services-common
- version: ~9.x-0
- repository: '@local'
- - name: serviceAccount
- version: ~9.x-0
- repository: '@local'
diff --git a/kubernetes/dcaegen2-services/components/dcae-son-handler/Chart.yaml b/kubernetes/dcaegen2-services/components/dcae-son-handler/Chart.yaml
index 707d31d0a4..895f642283 100644
--- a/kubernetes/dcaegen2-services/components/dcae-son-handler/Chart.yaml
+++ b/kubernetes/dcaegen2-services/components/dcae-son-handler/Chart.yaml
@@ -2,6 +2,7 @@
# ============================================================================
# Copyright (C) 2021 Wipro Limited.
# Modifications Copyright © 2021 Orange
+# Modifications Copyright © 2021 Nordix Foundation
# ============================================================================
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -16,8 +17,28 @@
# limitations under the License.
# ============= LICENSE_END ==================================================
-apiVersion: v1
-appVersion: "Honolulu"
+apiVersion: v2
+appVersion: "Jakarta"
description: DCAE Son-handler helm chart
name: dcae-son-handler
-version: 9.0.0
+version: 10.0.0
+
+dependencies:
+ - name: common
+ version: ~10.x-0
+ repository: '@local'
+ - name: postgres
+ version: ~10.x-0
+ repository: '@local'
+ - name: readinessCheck
+ version: ~10.x-0
+ repository: '@local'
+ - name: repositoryGenerator
+ version: ~10.x-0
+ repository: '@local'
+ - name: dcaegen2-services-common
+ version: ~10.x-0
+ repository: '@local'
+ - name: serviceAccount
+ version: ~10.x-0
+ repository: '@local'
diff --git a/kubernetes/dcaegen2-services/components/dcae-son-handler/requirements.yaml b/kubernetes/dcaegen2-services/components/dcae-son-handler/requirements.yaml
deleted file mode 100644
index 99f0fb70bc..0000000000
--- a/kubernetes/dcaegen2-services/components/dcae-son-handler/requirements.yaml
+++ /dev/null
@@ -1,37 +0,0 @@
-# ============= LICENSE_START ================================================
-# ============================================================================
-# Copyright (C) 2021 Wipro Limited.
-# Modifications Copyright © 2021 Orange
-# ============================================================================
-# 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 ==================================================
-
-dependencies:
- - name: common
- version: ~9.x-0
- repository: '@local'
- - name: postgres
- version: ~9.x-0
- repository: '@local'
- - name: readinessCheck
- version: ~9.x-0
- repository: '@local'
- - name: repositoryGenerator
- version: ~9.x-0
- repository: '@local'
- - name: dcaegen2-services-common
- version: ~9.x-0
- repository: '@local'
- - name: serviceAccount
- version: ~9.x-0
- repository: '@local'
diff --git a/kubernetes/dcaegen2-services/components/dcae-tcagen2/Chart.yaml b/kubernetes/dcaegen2-services/components/dcae-tcagen2/Chart.yaml
index 6b91fe35e4..c5f4efea11 100644
--- a/kubernetes/dcaegen2-services/components/dcae-tcagen2/Chart.yaml
+++ b/kubernetes/dcaegen2-services/components/dcae-tcagen2/Chart.yaml
@@ -2,6 +2,7 @@
# ================================================================================
# Copyright (c) 2021 J. F. Lucas. All rights reserved.
# Modifications Copyright © 2021 Orange
+# Modifications Copyright © 2021 Nordix Foundation
# ================================================================================
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -16,8 +17,31 @@
# limitations under the License.
# ============LICENSE_END=========================================================
-apiVersion: v1
-appVersion: "Honolulu"
+apiVersion: v2
+appVersion: "Jakarta"
description: DCAE TCA (Gen 2)
name: dcae-tcagen2
-version: 9.0.0
+version: 10.0.0
+
+dependencies:
+ - name: common
+ version: ~10.x-0
+ repository: '@local'
+ - name: repositoryGenerator
+ version: ~10.x-0
+ repository: '@local'
+ - name: readinessCheck
+ version: ~10.x-0
+ repository: '@local'
+ - name: dcaegen2-services-common
+ version: ~10.x-0
+ repository: '@local'
+ - name: serviceAccount
+ version: ~10.x-0
+ repository: '@local'
+ - name: serviceAccount
+ version: ~10.x-0
+ repository: '@local'
+ - name: mongo
+ version: ~10.x-0
+ repository: '@local' \ No newline at end of file
diff --git a/kubernetes/dcaegen2-services/components/dcae-tcagen2/requirements.yaml b/kubernetes/dcaegen2-services/components/dcae-tcagen2/requirements.yaml
deleted file mode 100644
index 48673feda4..0000000000
--- a/kubernetes/dcaegen2-services/components/dcae-tcagen2/requirements.yaml
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright (c) 2020 J. F. Lucas. All rights reserved.
-# Copyright (c) 2021 AT&T. All rights reserved.
-# Modifications Copyright © 2021 Orange
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-dependencies:
- - name: common
- version: ~9.x-0
- repository: '@local'
- - name: repositoryGenerator
- version: ~9.x-0
- repository: '@local'
- - name: readinessCheck
- version: ~9.x-0
- repository: '@local'
- - name: dcaegen2-services-common
- version: ~9.x-0
- repository: '@local'
- - name: serviceAccount
- version: ~9.x-0
- repository: '@local'
- - name: serviceAccount
- version: ~9.x-0
- repository: '@local'
diff --git a/kubernetes/dcaegen2-services/components/dcae-tcagen2/values.yaml b/kubernetes/dcaegen2-services/components/dcae-tcagen2/values.yaml
index e7707dcdb0..2ba8edbc68 100644
--- a/kubernetes/dcaegen2-services/components/dcae-tcagen2/values.yaml
+++ b/kubernetes/dcaegen2-services/components/dcae-tcagen2/values.yaml
@@ -86,6 +86,21 @@ service:
- port: 9091
name: http
+# mongoDB overrides
+mongo:
+ nameOverride: dcae-mongo
+ config:
+ dbName: dcaecommondb
+ service:
+ name: dcae-mongohost
+ internalPort: 27017
+ nfsprovisionerPrefix: dcaemongo
+ sdnctlPrefix: tcagen2
+ persistence:
+ mountSubPath: dcae/mongo/data
+ enabled: true
+ disableNfsProvisioner: true
+
# Policy configuraiton properties
# if enabled, policy-sync side car will be deployed
#dcaePolicySyncImage: onap/org.onap.dcaegen2.deployments.dcae-services-policy-sync:1.0.1
diff --git a/kubernetes/dcaegen2-services/components/dcae-ves-collector/Chart.yaml b/kubernetes/dcaegen2-services/components/dcae-ves-collector/Chart.yaml
index 43e893be70..8022b79365 100644
--- a/kubernetes/dcaegen2-services/components/dcae-ves-collector/Chart.yaml
+++ b/kubernetes/dcaegen2-services/components/dcae-ves-collector/Chart.yaml
@@ -2,6 +2,7 @@
# ================================================================================
# Copyright (c) 2021 J. F. Lucas. All rights reserved.
# Modifications Copyright © 2021 Orange
+# Modifications Copyright © 2021 Nordix Foundation
# ================================================================================
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -16,8 +17,28 @@
# limitations under the License.
# ============LICENSE_END=========================================================
-apiVersion: v1
-appVersion: "Honolulu"
+apiVersion: v2
+appVersion: "Jakarta"
description: DCAE VES Collector
name: dcae-ves-collector
-version: 9.0.0
+version: 10.0.0
+
+dependencies:
+ - name: common
+ version: ~10.x-0
+ repository: '@local'
+ - name: repositoryGenerator
+ version: ~10.x-0
+ repository: '@local'
+ - name: readinessCheck
+ version: ~10.x-0
+ repository: '@local'
+ - name: dcaegen2-services-common
+ version: ~10.x-0
+ repository: '@local'
+ - name: certManagerCertificate
+ version: ~10.x-0
+ repository: '@local'
+ - name: serviceAccount
+ version: ~10.x-0
+ repository: '@local'
diff --git a/kubernetes/dcaegen2-services/components/dcae-ves-collector/requirements.yaml b/kubernetes/dcaegen2-services/components/dcae-ves-collector/requirements.yaml
deleted file mode 100644
index a0878282e2..0000000000
--- a/kubernetes/dcaegen2-services/components/dcae-ves-collector/requirements.yaml
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright (c) 2021 J. F. Lucas. All rights reserved.
-# Copyright (c) 2021 Nokia. All rights reserved.
-# Copyright (c) 2021 AT&T. All rights reserved.
-# Modifications Copyright © 2021 Orange
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-dependencies:
- - name: common
- version: ~9.x-0
- repository: '@local'
- - name: repositoryGenerator
- version: ~9.x-0
- repository: '@local'
- - name: readinessCheck
- version: ~9.x-0
- repository: '@local'
- - name: dcaegen2-services-common
- version: ~9.x-0
- repository: '@local'
- - name: certManagerCertificate
- version: ~9.x-0
- repository: '@local'
- - name: serviceAccount
- version: ~9.x-0
- repository: '@local'
diff --git a/kubernetes/dcaegen2-services/components/dcae-ves-mapper/Chart.yaml b/kubernetes/dcaegen2-services/components/dcae-ves-mapper/Chart.yaml
index 92fdb21e87..2097a9723d 100644
--- a/kubernetes/dcaegen2-services/components/dcae-ves-mapper/Chart.yaml
+++ b/kubernetes/dcaegen2-services/components/dcae-ves-mapper/Chart.yaml
@@ -2,6 +2,7 @@
# ============================================================================
# Copyright (c) 2021 AT&T Intellectual Property
# Modifications Copyright © 2021 Orange
+# Modifications Copyright © 2021 Nordix Foundation
# ============================================================================
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -16,8 +17,25 @@
# limitations under the License.
# ================================= LICENSE_END ==============================
-apiVersion: v1
-appVersion: "Honolulu"
+apiVersion: v2
+appVersion: "Jakarta"
description: DCAE VES-Mapper Microservice
name: dcae-ves-mapper
-version: 9.0.0
+version: 10.0.0
+
+dependencies:
+ - name: common
+ version: ~10.x-0
+ repository: '@local'
+ - name: readinessCheck
+ version: ~10.x-0
+ repository: '@local'
+ - name: repositoryGenerator
+ version: ~10.x-0
+ repository: '@local'
+ - name: dcaegen2-services-common
+ version: ~10.x-0
+ repository: '@local'
+ - name: serviceAccount
+ version: ~10.x-0
+ repository: '@local'
diff --git a/kubernetes/dcaegen2-services/components/dcae-ves-mapper/requirements.yaml b/kubernetes/dcaegen2-services/components/dcae-ves-mapper/requirements.yaml
deleted file mode 100644
index b02251cc51..0000000000
--- a/kubernetes/dcaegen2-services/components/dcae-ves-mapper/requirements.yaml
+++ /dev/null
@@ -1,34 +0,0 @@
-# ================================ LICENSE_START =============================
-# ============================================================================
-# Copyright (c) 2021 AT&T Intellectual Property. All rights reserved.
-# Modifications Copyright © 2021 Orange
-# ============================================================================
-# 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 ==============================
-
-dependencies:
- - name: common
- version: ~9.x-0
- repository: '@local'
- - name: readinessCheck
- version: ~9.x-0
- repository: '@local'
- - name: repositoryGenerator
- version: ~9.x-0
- repository: '@local'
- - name: dcaegen2-services-common
- version: ~9.x-0
- repository: '@local'
- - name: serviceAccount
- version: ~9.x-0
- repository: '@local'
diff --git a/kubernetes/dcaegen2-services/requirements.yaml b/kubernetes/dcaegen2-services/requirements.yaml
deleted file mode 100644
index b3432d3e8a..0000000000
--- a/kubernetes/dcaegen2-services/requirements.yaml
+++ /dev/null
@@ -1,97 +0,0 @@
-# Copyright (c) 2021 J. F. Lucas. All rights reserved.
-# Copyright (c) 2021 AT&T. All rights reserved.
-# Modifications Copyright (C) 2021 Nordix Foundation.
-# Modifications Copyright © 2021 Orange
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-dependencies:
- - name: common
- version: ~9.x-0
- repository: '@local'
- - name: dcae-bbs-eventprocessor-ms
- version: ~9.x-0
- repository: '@local'
- condition: dcae-bbs-eventprocessor-ms.enabled
- - name: dcae-datafile-collector
- version: ~9.x-0
- repository: '@local'
- condition: dcae-datafile-collector.enabled
- - name: dcae-datalake-admin-ui
- version: ~9.x-0
- repository: '@local'
- condition: dcae-datalake-admin-ui.enabled
- - name: dcae-datalake-des
- version: ~9.x-0
- repository: '@local'
- condition: dcae-datalake-des.enabled
- - name: dcae-datalake-feeder
- version: ~9.x-0
- repository: '@local'
- condition: dcae-datalake-feeder.enabled
- - name: dcae-heartbeat
- version: ~9.x-0
- repository: '@local'
- condition: dcae-heartbeat.enabled
- - name: dcae-hv-ves-collector
- version: ~9.x-0
- repository: '@local'
- condition: dcae-hv-ves-collector.enabled
- - name: dcae-kpi-ms
- version: ~9.x-0
- repository: '@local'
- condition: dcae-kpi-ms.enabled
- - name: dcae-ms-healthcheck
- version: ~9.x-0
- repository: '@local'
- condition: dcae-ms-healthcheck.enabled
- - name: dcae-pm-mapper
- version: ~9.x-0
- repository: '@local'
- condition: dcae-pm-mapper.enabled
- - name: dcae-pmsh
- version: ~9.x-0
- repository: '@local'
- condition: dcae-pmsh.enabled
- - name: dcae-prh
- version: ~9.x-0
- repository: '@local'
- condition: dcae-prh.enabled
- - name: dcae-restconf-collector
- version: ~9.x-0
- repository: '@local'
- condition: dcae-restconf-collector.enabled
- - name: dcae-slice-analysis-ms
- version: ~9.x-0
- repository: '@local'
- condition: dcae-slice-analysis-ms.enabled
- - name: dcae-snmptrap-collector
- version: ~9.x-0
- repository: '@local'
- condition: dcae-snmptrap-collector.enabled
- - name: dcae-son-handler
- version: ~9.x-0
- repository: '@local'
- condition: dcae-son-handler.enabled
- - name: dcae-tcagen2
- version: ~9.x-0
- repository: '@local'
- condition: dcae-tcagen2.enabled
- - name: dcae-ves-collector
- version: ~9.x-0
- repository: '@local'
- condition: dcae-ves-collector.enabled
- - name: dcae-ves-mapper
- version: ~9.x-0
- repository: '@local'
- condition: dcae-ves-mapper.enabled
diff --git a/kubernetes/dcaegen2-services/resources/expected-components.json b/kubernetes/dcaegen2-services/resources/expected-components.json
index 948c479430..f654ac8dc3 100644
--- a/kubernetes/dcaegen2-services/resources/expected-components.json
+++ b/kubernetes/dcaegen2-services/resources/expected-components.json
@@ -1,28 +1,52 @@
{{/*
-#============LICENSE_START========================================================
-# ================================================================================
-# Copyright (c) 2021 J. F. Lucas. 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=========================================================
+ ============LICENSE_START========================================================
+ =================================================================================
+ Copyright (c) 2021 J. F. Lucas. 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=========================================================
*/}}
-[
-{{- $ctx := . }}
-{{- $components := tuple "dcae-hv-ves-collector" "dcae-prh" "dcae-tcagen2" "dcae-ves-collector" }}
-{{- range $i, $v := $components }}
-{{- if index $ctx.Values . "enabled" }}
-{{- if $i }},{{ end }}
-{{ $v | quote | indent 2 }}
+
+{{/*
+
+ This template generates a JSON file with an array containing the names of the
+ components that the healthcheck container always expects to see--that is, the
+ components that are enabled in the top-level values.yaml file.
+
+ The code loops through the list of components ($components) and checks each component's
+ entry in the values.yaml file is set to "enabled". It adds the name of each enabled
+ component to the list.
+
+ There is a bit of Helm trickery here--the code uses a dict ($enabled), because that's
+ apparently the only way to create a variable outside of a range loop that can be updated
+ from within the range loop. The code here generates a list of the components that are
+ enabled in values.yaml, and stores it into the list called "enabled" in the dictionary
+ $enabled.
+
+ Note also the assignment to an otherwise unused variable ($x) in the loop. Without that
+ assignment, the updated value of the $enabled.enabled list would be rendered into the
+ file each time an enabled component is found.
+
+*/}}
+
+{{- $ctx := . -}}
+{{- $components := list "dcae-hv-ves-collector" "dcae-prh" "dcae-tcagen2" "dcae-ves-collector" -}}
+{{- $enabled := dict "enabled" list -}}
+{{- range $components -}}
+ {{- if index $ctx.Values . "enabled" -}}
+ {{- $x:= . | append $enabled.enabled | set $enabled "enabled" -}}
+ {{- end -}}
{{- end -}}
-{{- end }}
-]
+{{- $enabled.enabled | toJson }}
+
+
diff --git a/kubernetes/dcaegen2/Chart.yaml b/kubernetes/dcaegen2/Chart.yaml
index 22c3c492e8..a14f9eef86 100644
--- a/kubernetes/dcaegen2/Chart.yaml
+++ b/kubernetes/dcaegen2/Chart.yaml
@@ -1,5 +1,6 @@
# Copyright © 2018 Amdocs, AT&T, Bell Canada
# Modifications Copyright © 2021 Orange
+# Modifications Copyright © 2021 Nordix Foundation
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -13,7 +14,52 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-apiVersion: v1
+apiVersion: v2
description: ONAP DCAE Gen2
name: dcaegen2
-version: 9.0.0
+version: 10.0.0
+
+dependencies:
+ - name: common
+ version: ~10.x-0
+ repository: '@local'
+ - name: dcae-bootstrap
+ version: ~10.x-0
+ repository: 'file://components/dcae-bootstrap'
+ condition: dcae-bootstrap.enabled
+ - name: dcae-cloudify-manager
+ version: ~10.x-0
+ repository: 'file://components/dcae-cloudify-manager'
+ condition: dcae-cloudify-manager.enabled
+ - name: dcae-config-binding-service
+ version: ~10.x-0
+ repository: 'file://components/dcae-config-binding-service'
+ condition: dcae-config-binding-service.enabled
+ - name: dcae-healthcheck
+ version: ~10.x-0
+ repository: 'file://components/dcae-healthcheck'
+ condition: dcae-healthcheck.enabled
+ - name: dcae-servicechange-handler
+ version: ~10.x-0
+ repository: 'file://components/dcae-servicechange-handler'
+ condition: dcae-servicechange-handler.enabled
+ - name: dcae-inventory-api
+ version: ~10.x-0
+ repository: 'file://components/dcae-inventory-api'
+ condition: dcae-inventory-api.enabled
+ - name: dcae-deployment-handler
+ version: ~10.x-0
+ repository: 'file://components/dcae-deployment-handler'
+ condition: dcae-deployment-handler.enabled
+ - name: dcae-policy-handler
+ version: ~10.x-0
+ repository: 'file://components/dcae-policy-handler'
+ condition: dcae-policy-handler.enabled
+ - name: dcae-dashboard
+ version: ~10.x-0
+ repository: 'file://components/dcae-dashboard'
+ condition: dcae-dashboard.enabled
+ - name: dcae-ves-openapi-manager
+ version: ~10.x-0
+ repository: 'file://components/dcae-ves-openapi-manager'
+ condition: dcae-ves-openapi-manager.enabled
diff --git a/kubernetes/dcaegen2/Makefile b/kubernetes/dcaegen2/Makefile
index fd059a9fad..d72ab60dc6 100644
--- a/kubernetes/dcaegen2/Makefile
+++ b/kubernetes/dcaegen2/Makefile
@@ -33,7 +33,7 @@ make-%:
@if [ -f $*/Makefile ]; then make -C $*; fi
dep-%: make-%
- @if [ -f $*/requirements.yaml ]; then $(HELM_BIN) dep up $*; fi
+ @if [ -f $*/Chart.yaml ]; then $(HELM_BIN) dep up $*; fi
lint-%: dep-%
@if [ -f $*/Chart.yaml ]; then $(HELM_BIN) lint $*; fi
@@ -44,7 +44,7 @@ package-%: lint-%
@$(HELM_BIN) repo index $(PACKAGE_DIR)
clean:
- @rm -f */requirements.lock
+ @rm -f */Chart.lock
@rm -f *tgz */charts/*tgz
@rm -rf $(PACKAGE_DIR)
%:
diff --git a/kubernetes/dcaegen2/components/Makefile b/kubernetes/dcaegen2/components/Makefile
index 4ffaa330b9..2681615221 100644
--- a/kubernetes/dcaegen2/components/Makefile
+++ b/kubernetes/dcaegen2/components/Makefile
@@ -33,7 +33,7 @@ make-%:
@if [ -f $*/Makefile ]; then make -C $*; fi
dep-%: make-%
- @if [ -f $*/requirements.yaml ]; then $(HELM_BIN) dep up $*; fi
+ @if [ -f $*/Chart.yaml ]; then $(HELM_BIN) dep up $*; fi
lint-%: dep-%
@if [ -f $*/Chart.yaml ]; then $(HELM_BIN) lint $*; fi
@@ -44,7 +44,7 @@ package-%: lint-%
@$(HELM_BIN) repo index $(PACKAGE_DIR)
clean:
- @rm -f */requirements.lock
+ @rm -f */Chart.lock
@rm -f *tgz */charts/*tgz
@rm -rf $(PACKAGE_DIR)
%:
diff --git a/kubernetes/dcaegen2/components/dcae-bootstrap/Chart.yaml b/kubernetes/dcaegen2/components/dcae-bootstrap/Chart.yaml
index f3127f7a0f..d4f797bcbc 100644
--- a/kubernetes/dcaegen2/components/dcae-bootstrap/Chart.yaml
+++ b/kubernetes/dcaegen2/components/dcae-bootstrap/Chart.yaml
@@ -3,6 +3,7 @@
# Copyright (c) 2018 AT&T Intellectual Property. All rights reserved.
# Modifications Copyright © 2018 Amdocs, Bell Canada
# Modifications Copyright © 2021 Orange
+# Modifications Copyright © 2021 Nordix Foundation
# ================================================================================
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -17,7 +18,22 @@
# limitations under the License.
# ============LICENSE_END=========================================================
-apiVersion: v1
+apiVersion: v2
description: ONAP DCAE Bootstrap
name: dcae-bootstrap
-version: 9.0.0
+version: 10.0.0
+
+dependencies:
+ - name: common
+ version: ~10.x-0
+ repository: '@local'
+ - name: postgres
+ version: ~10.x-0
+ repository: '@local'
+ alias: postgres
+ - name: repositoryGenerator
+ version: ~10.x-0
+ repository: '@local'
+ - name: serviceAccount
+ version: ~10.x-0
+ repository: '@local' \ No newline at end of file
diff --git a/kubernetes/dcaegen2/components/dcae-bootstrap/requirements.yaml b/kubernetes/dcaegen2/components/dcae-bootstrap/requirements.yaml
deleted file mode 100644
index 4dcaff6c1b..0000000000
--- a/kubernetes/dcaegen2/components/dcae-bootstrap/requirements.yaml
+++ /dev/null
@@ -1,38 +0,0 @@
-#============LICENSE_START========================================================
-#=================================================================================
-# Copyright (c) 2018 AT&T Intellectual Property. All rights reserved.
-# Modifications Copyright © 2018 Amdocs, Bell Canada
-# Modifications (c) 2020 Nokia. All rights reserved.
-# Copyright (c) 2021 J. F. Lucas. All rights reserved.
-# Modifications Copyright © 2021 Orange
-# ================================================================================
-# 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=========================================================
-
-dependencies:
- - name: common
- version: ~9.x-0
- repository: '@local'
- - name: postgres
- version: ~9.x-0
- repository: '@local'
- alias: postgres
- - name: mongo
- version: ~9.x-0
- repository: '@local'
- - name: repositoryGenerator
- version: ~9.x-0
- repository: '@local'
- - name: serviceAccount
- version: ~9.x-0
- repository: '@local'
diff --git a/kubernetes/dcaegen2/components/dcae-bootstrap/values.yaml b/kubernetes/dcaegen2/components/dcae-bootstrap/values.yaml
index b012ee4942..5b568c6088 100644
--- a/kubernetes/dcaegen2/components/dcae-bootstrap/values.yaml
+++ b/kubernetes/dcaegen2/components/dcae-bootstrap/values.yaml
@@ -89,20 +89,6 @@ postgres:
mountSubPath: dcae/data
mountInitPath: dcae
-mongo:
- nameOverride: dcae-mongo
- config:
- dbName: dcaecommondb
- service:
- name: dcae-mongohost
- internalPort: 27017
- nfsprovisionerPrefix: dcaemongo
- sdnctlPrefix: tcagen2
- persistence:
- mountSubPath: dcae/mongo/data
- enabled: true
- disableNfsProvisioner: true
-
# application image
image: onap/org.onap.dcaegen2.deployments.k8s-bootstrap-container:3.3.5
default_k8s_location: central
diff --git a/kubernetes/dcaegen2/components/dcae-cloudify-manager/Chart.yaml b/kubernetes/dcaegen2/components/dcae-cloudify-manager/Chart.yaml
index 400c6b186e..09b3684619 100644
--- a/kubernetes/dcaegen2/components/dcae-cloudify-manager/Chart.yaml
+++ b/kubernetes/dcaegen2/components/dcae-cloudify-manager/Chart.yaml
@@ -3,6 +3,7 @@
# Copyright (c) 2018 AT&T Intellectual Property. All rights reserved.
# Modifications Copyright © 2018 Amdocs, Bell Canada
# Modifications Copyright © 2021 Orange
+# Modifications Copyright © 2021 Nordix Foundation
# ================================================================================
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -17,7 +18,21 @@
# limitations under the License.
# ============LICENSE_END=========================================================
-apiVersion: v1
+apiVersion: v2
description: ONAP DCAE Cloudify Manager
name: dcae-cloudify-manager
-version: 9.0.0
+version: 10.0.0
+
+dependencies:
+ - name: common
+ version: ~10.x-0
+ repository: '@local'
+ - name: repositoryGenerator
+ version: ~10.x-0
+ repository: '@local'
+ - name: cmpv2Config
+ version: ~10.x-0
+ repository: '@local'
+ - name: serviceAccount
+ version: ~10.x-0
+ repository: '@local' \ No newline at end of file
diff --git a/kubernetes/dcaegen2/components/dcae-cloudify-manager/requirements.yaml b/kubernetes/dcaegen2/components/dcae-cloudify-manager/requirements.yaml
deleted file mode 100644
index 590db41a64..0000000000
--- a/kubernetes/dcaegen2/components/dcae-cloudify-manager/requirements.yaml
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright © 2017 Amdocs, Bell Canada
-# Modifications Copyright © 2018 AT&T
-# Copyright (c) 2021 J. F. Lucas. All rights reserved.
-# Modifications Copyright © 2021 Orange
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-dependencies:
- - name: common
- version: ~9.x-0
- repository: '@local'
- - name: repositoryGenerator
- version: ~9.x-0
- repository: '@local'
- - name: cmpv2Config
- version: ~9.x-0
- repository: '@local'
- - name: serviceAccount
- version: ~9.x-0
- repository: '@local'
diff --git a/kubernetes/dcaegen2/components/dcae-config-binding-service/Chart.yaml b/kubernetes/dcaegen2/components/dcae-config-binding-service/Chart.yaml
index 49838a7652..d5fb997a23 100644
--- a/kubernetes/dcaegen2/components/dcae-config-binding-service/Chart.yaml
+++ b/kubernetes/dcaegen2/components/dcae-config-binding-service/Chart.yaml
@@ -2,6 +2,7 @@
# ================================================================================
# Copyright (c) 2019 AT&T Intellectual Property. All rights reserved.
# Modifications Copyright © 2021 Orange
+# Modifications Copyright © 2021 Nordix Foundation
# ================================================================================
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -16,7 +17,18 @@
# limitations under the License.
# ============LICENSE_END=========================================================
-apiVersion: v1
+apiVersion: v2
description: ONAP DCAE Config Binding Service
name: dcae-config-binding-service
-version: 9.0.0
+version: 10.0.0
+
+dependencies:
+ - name: common
+ version: ~10.x-0
+ repository: '@local'
+ - name: repositoryGenerator
+ version: ~10.x-0
+ repository: '@local'
+ - name: serviceAccount
+ version: ~10.x-0
+ repository: '@local' \ No newline at end of file
diff --git a/kubernetes/dcaegen2/components/dcae-config-binding-service/requirements.yaml b/kubernetes/dcaegen2/components/dcae-config-binding-service/requirements.yaml
deleted file mode 100644
index 27373df61e..0000000000
--- a/kubernetes/dcaegen2/components/dcae-config-binding-service/requirements.yaml
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright © 2017 Amdocs, Bell Canada
-# Modifications Copyright © 2018 AT&T
-# Modifications Copyright © 2021 Orange
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-dependencies:
- - name: common
- version: ~9.x-0
- repository: '@local'
- - name: repositoryGenerator
- version: ~9.x-0
- repository: '@local'
- - name: serviceAccount
- version: ~9.x-0
- repository: '@local'
diff --git a/kubernetes/dcaegen2/components/dcae-config-binding-service/templates/deployment.yaml b/kubernetes/dcaegen2/components/dcae-config-binding-service/templates/deployment.yaml
index c7e1d70030..171fc7c807 100644
--- a/kubernetes/dcaegen2/components/dcae-config-binding-service/templates/deployment.yaml
+++ b/kubernetes/dcaegen2/components/dcae-config-binding-service/templates/deployment.yaml
@@ -2,6 +2,7 @@
#============LICENSE_START========================================================
# ================================================================================
# Copyright (c) 2019 AT&T Intellectual Property. All rights reserved.
+# Copyright (c) 2021 J. F. Lucas. 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.
@@ -106,7 +107,7 @@ spec:
mountPath: /opt/tls
env:
- name: CONSUL_HOST
- value: consul.{{ include "common.namespace" . }}
+ value: consul-server-ui.{{ include "common.namespace" . }}
- name: USE_HTTPS
value: "1"
- name: HTTPS_CERT_PATH
@@ -154,7 +155,7 @@ spec:
mountPath: /opt/logs
env:
- name: CONSUL_HOST
- value: consul.{{ include "common.namespace" . }}
+ value: consul-server-ui.{{ include "common.namespace" . }}
- name: {{ include "common.name" . }}-fb-onap-i
image: {{ include "repositoryGenerator.image.logging" . }}
imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
diff --git a/kubernetes/dcaegen2/components/dcae-dashboard/Chart.yaml b/kubernetes/dcaegen2/components/dcae-dashboard/Chart.yaml
index 7d1f13b93f..e0b2976e23 100644
--- a/kubernetes/dcaegen2/components/dcae-dashboard/Chart.yaml
+++ b/kubernetes/dcaegen2/components/dcae-dashboard/Chart.yaml
@@ -1,7 +1,7 @@
-#============LICENSE_START========================================================
#=================================================================================
# Copyright (c) 2019 AT&T Intellectual Property. All rights reserved.
# Modifications Copyright © 2021 Orange
+# Modifications Copyright © 2021 Nordix Foundation
# ================================================================================
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -16,8 +16,22 @@
# limitations under the License.
# ============LICENSE_END=========================================================
-apiVersion: v1
+apiVersion: v2
appVersion: "1.0"
description: DCAE Dashboard
name: dcae-dashboard
-version: 9.0.0
+version: 10.0.0
+
+dependencies:
+ - name: common
+ version: ~10.x-0
+ repository: '@local'
+ - name: postgres
+ version: ~10.x-0
+ repository: '@local'
+ - name: repositoryGenerator
+ version: ~10.x-0
+ repository: '@local'
+ - name: serviceAccount
+ version: ~10.x-0
+ repository: '@local'
diff --git a/kubernetes/dcaegen2/components/dcae-dashboard/requirements.yaml b/kubernetes/dcaegen2/components/dcae-dashboard/requirements.yaml
deleted file mode 100644
index ee687927ac..0000000000
--- a/kubernetes/dcaegen2/components/dcae-dashboard/requirements.yaml
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright © 2018 AT&T, Amdocs, Bell Canada Intellectual Property. All rights reserved.
-# Modifications Copyright © 2021 Orange
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-dependencies:
- - name: common
- version: ~9.x-0
- repository: '@local'
- - name: postgres
- version: ~9.x-0
- repository: '@local'
- - name: repositoryGenerator
- version: ~9.x-0
- repository: '@local'
- - name: serviceAccount
- version: ~9.x-0
- repository: '@local'
diff --git a/kubernetes/dcaegen2/components/dcae-deployment-handler/Chart.yaml b/kubernetes/dcaegen2/components/dcae-deployment-handler/Chart.yaml
index 5c3f7854dd..a11cdf95de 100644
--- a/kubernetes/dcaegen2/components/dcae-deployment-handler/Chart.yaml
+++ b/kubernetes/dcaegen2/components/dcae-deployment-handler/Chart.yaml
@@ -2,6 +2,7 @@
#=================================================================================
# Copyright (c) 2019 AT&T Intellectual Property. All rights reserved.
# Modifications Copyright © 2021 Orange
+# Modifications Copyright © 2021 Nordix Foundation
# ================================================================================
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -16,7 +17,18 @@
# limitations under the License.
# ============LICENSE_END=========================================================
-apiVersion: v1
+apiVersion: v2
description: ONAP DCAE Deployment Handler
name: dcae-deployment-handler
-version: 9.0.0
+version: 10.0.0
+
+dependencies:
+ - name: common
+ version: ~10.x-0
+ repository: '@local'
+ - name: repositoryGenerator
+ version: ~10.x-0
+ repository: '@local'
+ - name: serviceAccount
+ version: ~10.x-0
+ repository: '@local'
diff --git a/kubernetes/dcaegen2/components/dcae-deployment-handler/requirements.yaml b/kubernetes/dcaegen2/components/dcae-deployment-handler/requirements.yaml
deleted file mode 100644
index 8712aa9bcf..0000000000
--- a/kubernetes/dcaegen2/components/dcae-deployment-handler/requirements.yaml
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright © 2017 Amdocs, Bell Canada
-# Modifications Copyright © 2019 AT&T
-# Modifications Copyright © 2021 Orange
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-dependencies:
- - name: common
- version: ~9.x-0
- repository: '@local'
- - name: repositoryGenerator
- version: ~9.x-0
- repository: '@local'
- - name: serviceAccount
- version: ~9.x-0
- repository: '@local'
diff --git a/kubernetes/dcaegen2/components/dcae-healthcheck/Chart.yaml b/kubernetes/dcaegen2/components/dcae-healthcheck/Chart.yaml
index d1af032161..8954e72f1d 100644
--- a/kubernetes/dcaegen2/components/dcae-healthcheck/Chart.yaml
+++ b/kubernetes/dcaegen2/components/dcae-healthcheck/Chart.yaml
@@ -3,6 +3,7 @@
# Copyright (c) 2018 AT&T Intellectual Property. All rights reserved.
# Modifications Copyright © 2018 Amdocs, Bell Canada
# Modifications Copyright © 2021 Orange
+# Modifications Copyright © 2021 Nordix Foundation
# ================================================================================
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -17,7 +18,18 @@
# limitations under the License.
# ============LICENSE_END=========================================================
-apiVersion: v1
+apiVersion: v2
description: ONAP DCAE Health Check
name: dcae-healthcheck
-version: 9.0.0
+version: 10.0.0
+
+dependencies:
+ - name: common
+ version: ~10.x-0
+ repository: '@local'
+ - name: repositoryGenerator
+ version: ~10.x-0
+ repository: '@local'
+ - name: serviceAccount
+ version: ~10.x-0
+ repository: '@local'
diff --git a/kubernetes/dcaegen2/components/dcae-healthcheck/requirements.yaml b/kubernetes/dcaegen2/components/dcae-healthcheck/requirements.yaml
deleted file mode 100644
index 747117cfd2..0000000000
--- a/kubernetes/dcaegen2/components/dcae-healthcheck/requirements.yaml
+++ /dev/null
@@ -1,29 +0,0 @@
-#============LICENSE_START========================================================
-#=================================================================================
-# Copyright (c) 2018 AT&T Intellectual Property. All rights reserved.
-# Modifications Copyright © 2018 Amdocs, Bell Canada
-# Modifications Copyright © 2021 Orange
-# ================================================================================
-# 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=========================================================
-
-dependencies:
- - name: common
- version: ~9.x-0
- repository: '@local'
- - name: repositoryGenerator
- version: ~9.x-0
- repository: '@local'
- - name: serviceAccount
- version: ~9.x-0
- repository: '@local'
diff --git a/kubernetes/dcaegen2/components/dcae-healthcheck/values.yaml b/kubernetes/dcaegen2/components/dcae-healthcheck/values.yaml
index 1c6cff0657..8134e0df9d 100644
--- a/kubernetes/dcaegen2/components/dcae-healthcheck/values.yaml
+++ b/kubernetes/dcaegen2/components/dcae-healthcheck/values.yaml
@@ -42,7 +42,7 @@ readiness:
initialDelaySeconds: 10
periodSeconds: 10
# application image
-image: onap/org.onap.dcaegen2.deployments.healthcheck-container:2.2.0
+image: onap/org.onap.dcaegen2.deployments.healthcheck-container:2.3.0
# Resource Limit flavor -By Default using small
flavor: small
diff --git a/kubernetes/dcaegen2/components/dcae-inventory-api/Chart.yaml b/kubernetes/dcaegen2/components/dcae-inventory-api/Chart.yaml
index 5411fa7098..32ba74e640 100644
--- a/kubernetes/dcaegen2/components/dcae-inventory-api/Chart.yaml
+++ b/kubernetes/dcaegen2/components/dcae-inventory-api/Chart.yaml
@@ -2,6 +2,7 @@
# ================================================================================
# Copyright (c) 2019 AT&T Intellectual Property. All rights reserved.
# Modifications Copyright © 2021 Orange
+# Modifications Copyright © 2021 Nordix Foundation
# ================================================================================
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -16,7 +17,21 @@
# limitations under the License.
# ============LICENSE_END=========================================================
-apiVersion: v1
+apiVersion: v2
description: ONAP DCAE Inventory API Service
name: dcae-inventory-api
-version: 9.0.0
+version: 10.0.0
+
+dependencies:
+ - name: common
+ version: ~10.x-0
+ repository: '@local'
+ - name: postgres
+ version: ~10.x-0
+ repository: '@local'
+ - name: repositoryGenerator
+ version: ~10.x-0
+ repository: '@local'
+ - name: serviceAccount
+ version: ~10.x-0
+ repository: '@local'
diff --git a/kubernetes/dcaegen2/components/dcae-inventory-api/requirements.yaml b/kubernetes/dcaegen2/components/dcae-inventory-api/requirements.yaml
deleted file mode 100644
index 4138afb8d2..0000000000
--- a/kubernetes/dcaegen2/components/dcae-inventory-api/requirements.yaml
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright © 2017 Amdocs, Bell Canada
-# Modifications Copyright © 2018 AT&T
-# Modifications Copyright © 2021 Orange
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-dependencies:
- - name: common
- version: ~9.x-0
- repository: '@local'
- - name: postgres
- version: ~9.x-0
- repository: '@local'
- - name: repositoryGenerator
- version: ~9.x-0
- repository: '@local'
- - name: serviceAccount
- version: ~9.x-0
- repository: '@local'
diff --git a/kubernetes/dcaegen2/components/dcae-policy-handler/Chart.yaml b/kubernetes/dcaegen2/components/dcae-policy-handler/Chart.yaml
index ab42b43e39..4c3ababdea 100644
--- a/kubernetes/dcaegen2/components/dcae-policy-handler/Chart.yaml
+++ b/kubernetes/dcaegen2/components/dcae-policy-handler/Chart.yaml
@@ -2,6 +2,7 @@
#=================================================================================
# Copyright (c) 2019 AT&T Intellectual Property. All rights reserved.
# Modifications Copyright © 2021 Orange
+# Modifications Copyright © 2021 Nordix Foundation
# ================================================================================
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -16,7 +17,18 @@
# limitations under the License.
# ============LICENSE_END=========================================================
-apiVersion: v1
+apiVersion: v2
description: ONAP DCAE Policy Handler
name: dcae-policy-handler
-version: 9.0.0
+version: 10.0.0
+
+dependencies:
+ - name: common
+ version: ~10.x-0
+ repository: '@local'
+ - name: repositoryGenerator
+ version: ~10.x-0
+ repository: '@local'
+ - name: serviceAccount
+ version: ~10.x-0
+ repository: '@local'
diff --git a/kubernetes/dcaegen2/components/dcae-policy-handler/requirements.yaml b/kubernetes/dcaegen2/components/dcae-policy-handler/requirements.yaml
deleted file mode 100644
index 8712aa9bcf..0000000000
--- a/kubernetes/dcaegen2/components/dcae-policy-handler/requirements.yaml
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright © 2017 Amdocs, Bell Canada
-# Modifications Copyright © 2019 AT&T
-# Modifications Copyright © 2021 Orange
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-dependencies:
- - name: common
- version: ~9.x-0
- repository: '@local'
- - name: repositoryGenerator
- version: ~9.x-0
- repository: '@local'
- - name: serviceAccount
- version: ~9.x-0
- repository: '@local'
diff --git a/kubernetes/dcaegen2/components/dcae-servicechange-handler/Chart.yaml b/kubernetes/dcaegen2/components/dcae-servicechange-handler/Chart.yaml
index a0a4e74a12..af78d79445 100644
--- a/kubernetes/dcaegen2/components/dcae-servicechange-handler/Chart.yaml
+++ b/kubernetes/dcaegen2/components/dcae-servicechange-handler/Chart.yaml
@@ -2,6 +2,7 @@
# ================================================================================
# Copyright (c) 2019 AT&T Intellectual Property. All rights reserved.
# Modifications Copyright © 2021 Orange
+# Modifications Copyright © 2021 Nordix Foundation
# ================================================================================
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -16,7 +17,18 @@
# limitations under the License.
# ============LICENSE_END=========================================================
-apiVersion: v1
+apiVersion: v2
description: ONAP DCAE Service Change Handler
name: dcae-servicechange-handler
-version: 9.0.0
+version: 10.0.0
+
+dependencies:
+ - name: common
+ version: ~10.x-0
+ repository: '@local'
+ - name: repositoryGenerator
+ version: ~10.x-0
+ repository: '@local'
+ - name: serviceAccount
+ version: ~10.x-0
+ repository: '@local'
diff --git a/kubernetes/dcaegen2/components/dcae-servicechange-handler/requirements.yaml b/kubernetes/dcaegen2/components/dcae-servicechange-handler/requirements.yaml
deleted file mode 100644
index 27373df61e..0000000000
--- a/kubernetes/dcaegen2/components/dcae-servicechange-handler/requirements.yaml
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright © 2017 Amdocs, Bell Canada
-# Modifications Copyright © 2018 AT&T
-# Modifications Copyright © 2021 Orange
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-dependencies:
- - name: common
- version: ~9.x-0
- repository: '@local'
- - name: repositoryGenerator
- version: ~9.x-0
- repository: '@local'
- - name: serviceAccount
- version: ~9.x-0
- repository: '@local'
diff --git a/kubernetes/dcaegen2/components/dcae-ves-openapi-manager/Chart.yaml b/kubernetes/dcaegen2/components/dcae-ves-openapi-manager/Chart.yaml
index 4fc1ae2037..3065b57a85 100644
--- a/kubernetes/dcaegen2/components/dcae-ves-openapi-manager/Chart.yaml
+++ b/kubernetes/dcaegen2/components/dcae-ves-openapi-manager/Chart.yaml
@@ -2,6 +2,7 @@
# ================================================================================
# Copyright (c) 2021 Nokia. All rights reserved.
# Modifications Copyright © 2021 Orange
+# Modifications Copyright © 2021 Nordix Foundation
# ================================================================================
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -16,7 +17,21 @@
# limitations under the License.
# ============LICENSE_END=========================================================
-apiVersion: v1
+apiVersion: v2
description: ONAP DCAE VES OpenApi Manager
name: dcae-ves-openapi-manager
-version: 9.0.0
+version: 10.0.0
+
+dependencies:
+ - name: common
+ version: ~10.x-0
+ repository: '@local'
+ - name: repositoryGenerator
+ version: ~10.x-0
+ repository: '@local'
+ - name: readinessCheck
+ version: ~10.x-0
+ repository: '@local'
+ - name: serviceAccount
+ version: ~10.x-0
+ repository: '@local'
diff --git a/kubernetes/dcaegen2/components/dcae-ves-openapi-manager/requirements.yaml b/kubernetes/dcaegen2/components/dcae-ves-openapi-manager/requirements.yaml
deleted file mode 100644
index 3400a2401f..0000000000
--- a/kubernetes/dcaegen2/components/dcae-ves-openapi-manager/requirements.yaml
+++ /dev/null
@@ -1,30 +0,0 @@
-#============LICENSE_START========================================================
-# Copyright (c) 2021 Nokia. All rights reserved.
-# Modifications Copyright © 2021 Orange
-# ================================================================================
-# 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=========================================================
-
-dependencies:
- - name: common
- version: ~9.x-0
- repository: '@local'
- - name: repositoryGenerator
- version: ~9.x-0
- repository: '@local'
- - name: readinessCheck
- version: ~9.x-0
- repository: '@local'
- - name: serviceAccount
- version: ~9.x-0
- repository: '@local'
diff --git a/kubernetes/dcaegen2/requirements.yaml b/kubernetes/dcaegen2/requirements.yaml
deleted file mode 100644
index b9aaa3a74b..0000000000
--- a/kubernetes/dcaegen2/requirements.yaml
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright © 2018 AT&T, Amdocs, Bell Canada Intellectual Property. All rights reserved.
-# Modifications Copyright © 2021 Nokia
-# Modifications Copyright © 2021 Orange
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-dependencies:
- - name: common
- version: ~9.x-0
- repository: '@local'
- - name: dcae-bootstrap
- version: ~9.x-0
- repository: 'file://components/dcae-bootstrap'
- condition: dcae-bootstrap.enabled
- - name: dcae-cloudify-manager
- version: ~9.x-0
- repository: 'file://components/dcae-cloudify-manager'
- condition: dcae-cloudify-manager.enabled
- - name: dcae-config-binding-service
- version: ~9.x-0
- repository: 'file://components/dcae-config-binding-service'
- condition: dcae-config-binding-service.enabled
- - name: dcae-healthcheck
- version: ~9.x-0
- repository: 'file://components/dcae-healthcheck'
- condition: dcae-healthcheck.enabled
- - name: dcae-servicechange-handler
- version: ~9.x-0
- repository: 'file://components/dcae-servicechange-handler'
- condition: dcae-servicechange-handler.enabled
- - name: dcae-inventory-api
- version: ~9.x-0
- repository: 'file://components/dcae-inventory-api'
- condition: dcae-inventory-api.enabled
- - name: dcae-deployment-handler
- version: ~9.x-0
- repository: 'file://components/dcae-deployment-handler'
- condition: dcae-deployment-handler.enabled
- - name: dcae-policy-handler
- version: ~9.x-0
- repository: 'file://components/dcae-policy-handler'
- condition: dcae-policy-handler.enabled
- - name: dcae-dashboard
- version: ~9.x-0
- repository: 'file://components/dcae-dashboard'
- condition: dcae-dashboard.enabled
- - name: dcae-ves-openapi-manager
- version: ~9.x-0
- repository: 'file://components/dcae-ves-openapi-manager'
- condition: dcae-ves-openapi-manager.enabled
diff --git a/kubernetes/dcaegen2/resources/expected-components.json b/kubernetes/dcaegen2/resources/expected-components.json
index 6b3a221661..50c31845e1 100644
--- a/kubernetes/dcaegen2/resources/expected-components.json
+++ b/kubernetes/dcaegen2/resources/expected-components.json
@@ -1,10 +1,51 @@
-[
-{{- $ctx := . }}
-{{- $components := tuple "dcae-cloudify-manager" "dcae-config-binding-service" "dcae-dashboard" "dcae-deployment-handler" "dcae-inventory-api" "dcae-policy-handler" "dcae-servicechange-handler" "dcae-ves-openapi-manager" }}
-{{- range $i, $v := $components }}
-{{- if index $ctx.Values . "enabled" }}
-{{- if $i }},{{ end }}
-{{ $v | quote | indent 2 }}
+{{/*
+ ============LICENSE_START========================================================
+ =================================================================================
+ Copyright (c) 2021 J. F. Lucas. 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=========================================================
+*/}}
+
+{{/*
+
+ This template generates a JSON file with an array containing the names of the
+ components that the healthcheck container always expects to see--that is, the
+ components that are enabled in the top-level values.yaml file.
+
+ The code loops through the list of components ($components) and checks each component's
+ entry in the values.yaml file is set to "enabled". It adds the name of each enabled
+ component to the list.
+
+ There is a bit of Helm trickery here--the code uses a dict ($enabled), because that's
+ apparently the only way to create a variable outside of a range loop that can be updated
+ from within the range loop. The code here generates a list of the components that are
+ enabled in values.yaml, and stores it into the list called "enabled" in the dictionary
+ $enabled.
+
+ Note also the assignment to an otherwise unused variable ($x) in the loop. Without that
+ assignment, the updated value of the $enabled.enabled list would be rendered into the
+ file each time an enabled component is found.
+
+*/}}
+
+{{- $ctx := . -}}
+{{- $components := list "dcae-cloudify-manager" "dcae-config-binding-service" "dcae-dashboard" "dcae-deployment-handler" "dcae-inventory-api" "dcae-policy-handler" "dcae-servicechange-handler" "dcae-ves-openapi-manager" -}}
+{{- $enabled := dict "enabled" list -}}
+{{- range $components -}}
+ {{- if index $ctx.Values . "enabled" -}}
+ {{- $x:= . | append $enabled.enabled | set $enabled "enabled" -}}
+ {{- end -}}
{{- end -}}
-{{- end }}
-]
+{{- $enabled.enabled | toJson }}
+
diff --git a/kubernetes/dcaegen2/values.yaml b/kubernetes/dcaegen2/values.yaml
index 17b077b987..7ce58ba88b 100644
--- a/kubernetes/dcaegen2/values.yaml
+++ b/kubernetes/dcaegen2/values.yaml
@@ -40,32 +40,32 @@ passwordStrengthOverride: basic
# Enable all DCAE components by default
dcae-bootstrap:
- enabled: true
+ enabled: false
config:
cloudifyManagerPasswordExternalSecret: *cmPassSecretName
dcae-cloudify-manager:
- enabled: true
+ enabled: false
config:
cloudifyManagerPasswordExternalSecret: *cmPassSecretName
dcae-config-binding-service:
enabled: true
dcae-dashboard:
- enabled: true
+ enabled: false
config:
cloudifyManagerPasswordExternalSecret: *cmPassSecretName
dcae-deployment-handler:
- enabled: true
+ enabled: false
config:
cloudifyManagerPasswordExternalSecret: *cmPassSecretName
dcae-healthcheck:
enabled: true
dcae-inventory-api:
- enabled: true
+ enabled: false
dcae-policy-handler:
- enabled: true
+ enabled: false
config:
cloudifyManagerPasswordExternalSecret: *cmPassSecretName
dcae-servicechange-handler:
- enabled: true
+ enabled: false
dcae-ves-openapi-manager:
enabled: true
diff --git a/kubernetes/dcaemod/Chart.yaml b/kubernetes/dcaemod/Chart.yaml
index b198e4d8ff..8bf2ddfbc0 100644
--- a/kubernetes/dcaemod/Chart.yaml
+++ b/kubernetes/dcaemod/Chart.yaml
@@ -2,6 +2,7 @@
#=================================================================================
# Copyright (c) 2019-2020 AT&T Intellectual Property. All rights reserved.
# Modifications Copyright © 2021 Orange
+# Modifications Copyright © 2021 Nordix Foundation
# ================================================================================
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -16,7 +17,40 @@
# limitations under the License.
# ============LICENSE_END=========================================================
-apiVersion: v1
+apiVersion: v2
description: ONAP DCAE MOD
name: dcaemod
-version: 9.0.0
+version: 10.0.0
+
+dependencies:
+ - name: common
+ version: ~10.x-0
+ repository: '@local'
+ - name: dcaemod-genprocessor
+ version: ~10.x-0
+ repository: 'file://components/dcaemod-genprocessor'
+ condition: dcaemod-genprocessor.enabled
+ - name: dcaemod-distributor-api
+ version: ~10.x-0
+ repository: 'file://components/dcaemod-distributor-api'
+ condition: dcaemod-distributor-api.enabled
+ - name: dcaemod-designtool
+ version: ~10.x-0
+ repository: 'file://components/dcaemod-designtool'
+ condition: dcaemod-designtool.enabled
+ - name: dcaemod-onboarding-api
+ version: ~10.x-0
+ repository: 'file://components/dcaemod-onboarding-api'
+ condition: dcaemod-onboarding-api.enabled
+ - name: dcaemod-runtime-api
+ version: ~10.x-0
+ repository: 'file://components/dcaemod-runtime-api'
+ condition: dcaemod-runtime-api.enabled
+ - name: dcaemod-nifi-registry
+ version: ~10.x-0
+ repository: 'file://components/dcaemod-nifi-registry'
+ condition: dcaemod-nifi-registry.enabled
+ - name: dcaemod-healthcheck
+ version: ~10.x-0
+ repository: 'file://components/dcaemod-healthcheck'
+ condition: dcaemod-healthcheck.enabled
diff --git a/kubernetes/dcaemod/components/dcaemod-designtool/Chart.yaml b/kubernetes/dcaemod/components/dcaemod-designtool/Chart.yaml
index 09c894205d..cf27ca45ca 100644
--- a/kubernetes/dcaemod/components/dcaemod-designtool/Chart.yaml
+++ b/kubernetes/dcaemod/components/dcaemod-designtool/Chart.yaml
@@ -1,6 +1,7 @@
#============LICENSE_START========================================================
#=================================================================================
# Copyright (c) 2020 AT&T Intellectual Property. All rights reserved.
+# Modifications Copyright © 2021 Nordix Foundation
# ================================================================================
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -15,7 +16,18 @@
# limitations under the License.
# ============LICENSE_END=========================================================
-apiVersion: v1
+apiVersion: v2
description: ONAP DCAE MOD Design Tool
name: dcaemod-designtool
-version: 9.0.0
+version: 10.0.0
+
+dependencies:
+ - name: common
+ version: ~10.x-0
+ repository: '@local'
+ - name: repositoryGenerator
+ version: ~10.x-0
+ repository: '@local'
+ - name: serviceAccount
+ version: ~10.x-0
+ repository: '@local'
diff --git a/kubernetes/dcaemod/components/dcaemod-designtool/requirements.yaml b/kubernetes/dcaemod/components/dcaemod-designtool/requirements.yaml
deleted file mode 100644
index 31acb0bed0..0000000000
--- a/kubernetes/dcaemod/components/dcaemod-designtool/requirements.yaml
+++ /dev/null
@@ -1,28 +0,0 @@
-#============LICENSE_START========================================================
-#=================================================================================
-# Copyright (c) 2020 AT&T Intellectual Property. All rights reserved.
-# Modifications Copyright © 2021 Orange
-# ================================================================================
-# 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=========================================================
-
-dependencies:
- - name: common
- version: ~9.x-0
- repository: '@local'
- - name: repositoryGenerator
- version: ~9.x-0
- repository: '@local'
- - name: serviceAccount
- version: ~9.x-0
- repository: '@local'
diff --git a/kubernetes/dcaemod/components/dcaemod-distributor-api/Chart.yaml b/kubernetes/dcaemod/components/dcaemod-distributor-api/Chart.yaml
index 9c43059ccb..2cdab6b52e 100644
--- a/kubernetes/dcaemod/components/dcaemod-distributor-api/Chart.yaml
+++ b/kubernetes/dcaemod/components/dcaemod-distributor-api/Chart.yaml
@@ -2,6 +2,7 @@
#=================================================================================
# Copyright (c) 2019-2020 AT&T Intellectual Property. All rights reserved.
# Modifications Copyright © 2021 Orange
+# Modifications Copyright © 2021 Nordix Foundation
# ================================================================================
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -16,7 +17,18 @@
# limitations under the License.
# ============LICENSE_END=========================================================
-apiVersion: v1
+apiVersion: v2
description: ONAP DCAE MOD Distributor API
name: dcaemod-distributor-api
-version: 9.0.0
+version: 10.0.0
+
+dependencies:
+ - name: common
+ version: ~10.x-0
+ repository: '@local'
+ - name: repositoryGenerator
+ version: ~10.x-0
+ repository: '@local'
+ - name: serviceAccount
+ version: ~10.x-0
+ repository: '@local'
diff --git a/kubernetes/dcaemod/components/dcaemod-distributor-api/requirements.yaml b/kubernetes/dcaemod/components/dcaemod-distributor-api/requirements.yaml
deleted file mode 100644
index 1f777137a7..0000000000
--- a/kubernetes/dcaemod/components/dcaemod-distributor-api/requirements.yaml
+++ /dev/null
@@ -1,28 +0,0 @@
-#============LICENSE_START========================================================
-#=================================================================================
-# Copyright (c) 2019-2020 AT&T Intellectual Property. All rights reserved.
-# Modifications Copyright © 2021 Orange
-# ================================================================================
-# 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=========================================================
-
-dependencies:
- - name: common
- version: ~9.x-0
- repository: '@local'
- - name: repositoryGenerator
- version: ~9.x-0
- repository: '@local'
- - name: serviceAccount
- version: ~9.x-0
- repository: '@local'
diff --git a/kubernetes/dcaemod/components/dcaemod-genprocessor/Chart.yaml b/kubernetes/dcaemod/components/dcaemod-genprocessor/Chart.yaml
index acabde6dbe..7bb4a644bf 100644
--- a/kubernetes/dcaemod/components/dcaemod-genprocessor/Chart.yaml
+++ b/kubernetes/dcaemod/components/dcaemod-genprocessor/Chart.yaml
@@ -2,6 +2,7 @@
#=================================================================================
# Copyright (c) 2019-2020 AT&T Intellectual Property. All rights reserved.
# Modifications Copyright © 2021 Orange
+# Modifications Copyright © 2021 Nordix Foundation
# ================================================================================
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -16,7 +17,18 @@
# limitations under the License.
# ============LICENSE_END=========================================================
-apiVersion: v1
+apiVersion: v2
description: ONAP DCAE MOD Genprocessor
name: dcaemod-genprocessor
-version: 9.0.0
+version: 10.0.0
+
+dependencies:
+ - name: common
+ version: ~10.x-0
+ repository: '@local'
+ - name: repositoryGenerator
+ version: ~10.x-0
+ repository: '@local'
+ - name: serviceAccount
+ version: ~10.x-0
+ repository: '@local'
diff --git a/kubernetes/dcaemod/components/dcaemod-genprocessor/requirements.yaml b/kubernetes/dcaemod/components/dcaemod-genprocessor/requirements.yaml
deleted file mode 100644
index 1f777137a7..0000000000
--- a/kubernetes/dcaemod/components/dcaemod-genprocessor/requirements.yaml
+++ /dev/null
@@ -1,28 +0,0 @@
-#============LICENSE_START========================================================
-#=================================================================================
-# Copyright (c) 2019-2020 AT&T Intellectual Property. All rights reserved.
-# Modifications Copyright © 2021 Orange
-# ================================================================================
-# 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=========================================================
-
-dependencies:
- - name: common
- version: ~9.x-0
- repository: '@local'
- - name: repositoryGenerator
- version: ~9.x-0
- repository: '@local'
- - name: serviceAccount
- version: ~9.x-0
- repository: '@local'
diff --git a/kubernetes/dcaemod/components/dcaemod-healthcheck/Chart.yaml b/kubernetes/dcaemod/components/dcaemod-healthcheck/Chart.yaml
index 95f140a2e6..5363412f59 100644
--- a/kubernetes/dcaemod/components/dcaemod-healthcheck/Chart.yaml
+++ b/kubernetes/dcaemod/components/dcaemod-healthcheck/Chart.yaml
@@ -3,6 +3,7 @@
# Copyright (c) 2018 AT&T Intellectual Property. All rights reserved.
# Modifications Copyright © 2018 Amdocs, Bell Canada
# Modifications Copyright © 2021 Orange
+# Modifications Copyright © 2021 Nordix Foundation
# ================================================================================
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -17,7 +18,18 @@
# limitations under the License.
# ============LICENSE_END=========================================================
-apiVersion: v1
+apiVersion: v2
description: ONAP DCAE MOD Health Check
name: dcaemod-healthcheck
-version: 9.0.0
+version: 10.0.0
+
+dependencies:
+ - name: common
+ version: ~10.x-0
+ repository: '@local'
+ - name: repositoryGenerator
+ version: ~10.x-0
+ repository: '@local'
+ - name: serviceAccount
+ version: ~10.x-0
+ repository: '@local'
diff --git a/kubernetes/dcaemod/components/dcaemod-healthcheck/requirements.yaml b/kubernetes/dcaemod/components/dcaemod-healthcheck/requirements.yaml
deleted file mode 100644
index 747117cfd2..0000000000
--- a/kubernetes/dcaemod/components/dcaemod-healthcheck/requirements.yaml
+++ /dev/null
@@ -1,29 +0,0 @@
-#============LICENSE_START========================================================
-#=================================================================================
-# Copyright (c) 2018 AT&T Intellectual Property. All rights reserved.
-# Modifications Copyright © 2018 Amdocs, Bell Canada
-# Modifications Copyright © 2021 Orange
-# ================================================================================
-# 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=========================================================
-
-dependencies:
- - name: common
- version: ~9.x-0
- repository: '@local'
- - name: repositoryGenerator
- version: ~9.x-0
- repository: '@local'
- - name: serviceAccount
- version: ~9.x-0
- repository: '@local'
diff --git a/kubernetes/dcaemod/components/dcaemod-nifi-registry/Chart.yaml b/kubernetes/dcaemod/components/dcaemod-nifi-registry/Chart.yaml
index 6bd9046c31..bb717a54f9 100644
--- a/kubernetes/dcaemod/components/dcaemod-nifi-registry/Chart.yaml
+++ b/kubernetes/dcaemod/components/dcaemod-nifi-registry/Chart.yaml
@@ -2,6 +2,7 @@
#=================================================================================
# Copyright (c) 2019-2020 AT&T Intellectual Property. All rights reserved.
# Modifications Copyright © 2021 Orange
+# Modifications Copyright © 2021 Nordix Foundation
# ================================================================================
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -16,7 +17,18 @@
# limitations under the License.
# ============LICENSE_END=========================================================
-apiVersion: v1
+apiVersion: v2
description: ONAP DCAE MOD Nifi Registry
name: dcaemod-nifi-registry
-version: 9.0.0
+version: 10.0.0
+
+dependencies:
+ - name: common
+ version: ~10.x-0
+ repository: '@local'
+ - name: repositoryGenerator
+ version: ~10.x-0
+ repository: '@local'
+ - name: serviceAccount
+ version: ~10.x-0
+ repository: '@local'
diff --git a/kubernetes/dcaemod/components/dcaemod-nifi-registry/requirements.yaml b/kubernetes/dcaemod/components/dcaemod-nifi-registry/requirements.yaml
deleted file mode 100644
index 1f777137a7..0000000000
--- a/kubernetes/dcaemod/components/dcaemod-nifi-registry/requirements.yaml
+++ /dev/null
@@ -1,28 +0,0 @@
-#============LICENSE_START========================================================
-#=================================================================================
-# Copyright (c) 2019-2020 AT&T Intellectual Property. All rights reserved.
-# Modifications Copyright © 2021 Orange
-# ================================================================================
-# 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=========================================================
-
-dependencies:
- - name: common
- version: ~9.x-0
- repository: '@local'
- - name: repositoryGenerator
- version: ~9.x-0
- repository: '@local'
- - name: serviceAccount
- version: ~9.x-0
- repository: '@local'
diff --git a/kubernetes/dcaemod/components/dcaemod-onboarding-api/Chart.yaml b/kubernetes/dcaemod/components/dcaemod-onboarding-api/Chart.yaml
index 1595250baf..ae68dbe825 100644
--- a/kubernetes/dcaemod/components/dcaemod-onboarding-api/Chart.yaml
+++ b/kubernetes/dcaemod/components/dcaemod-onboarding-api/Chart.yaml
@@ -2,6 +2,7 @@
#=================================================================================
# Copyright (c) 2019-2020 AT&T Intellectual Property. All rights reserved.
# Modifications Copyright © 2021 Orange
+# Modifications Copyright © 2021 Nordix Foundation
# ================================================================================
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -16,7 +17,21 @@
# limitations under the License.
# ============LICENSE_END=========================================================
-apiVersion: v1
+apiVersion: v2
description: ONAP DCAE MOD Onboarding API
name: dcaemod-onboarding-api
-version: 9.0.0
+version: 10.0.0
+
+dependencies:
+ - name: common
+ version: ~10.x-0
+ repository: '@local'
+ - name: postgres
+ version: ~10.x-0
+ repository: '@local'
+ - name: repositoryGenerator
+ version: ~10.x-0
+ repository: '@local'
+ - name: serviceAccount
+ version: ~10.x-0
+ repository: '@local'
diff --git a/kubernetes/dcaemod/components/dcaemod-onboarding-api/requirements.yaml b/kubernetes/dcaemod/components/dcaemod-onboarding-api/requirements.yaml
deleted file mode 100644
index 396cf7ae48..0000000000
--- a/kubernetes/dcaemod/components/dcaemod-onboarding-api/requirements.yaml
+++ /dev/null
@@ -1,31 +0,0 @@
-#============LICENSE_START========================================================
-#=================================================================================
-# Copyright (c) 2019-2020 AT&T Intellectual Property. All rights reserved.
-# Modifications Copyright © 2021 Orange
-# ================================================================================
-# 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=========================================================
-
-dependencies:
- - name: common
- version: ~9.x-0
- repository: '@local'
- - name: postgres
- version: ~9.x-0
- repository: '@local'
- - name: repositoryGenerator
- version: ~9.x-0
- repository: '@local'
- - name: serviceAccount
- version: ~9.x-0
- repository: '@local'
diff --git a/kubernetes/dcaemod/components/dcaemod-onboarding-api/values.yaml b/kubernetes/dcaemod/components/dcaemod-onboarding-api/values.yaml
index c36e9b7129..2aefedbc86 100644
--- a/kubernetes/dcaemod/components/dcaemod-onboarding-api/values.yaml
+++ b/kubernetes/dcaemod/components/dcaemod-onboarding-api/values.yaml
@@ -92,7 +92,7 @@ postgres:
mountInitPath: dcaemod
# application image
-image: onap/org.onap.dcaegen2.platform.mod.onboardingapi:2.12.5
+image: onap/org.onap.dcaegen2.platform.mod.onboardingapi:2.13.0
# Resource Limit flavor -By Default using small
flavor: small
diff --git a/kubernetes/dcaemod/components/dcaemod-runtime-api/Chart.yaml b/kubernetes/dcaemod/components/dcaemod-runtime-api/Chart.yaml
index 814e1dfdd2..1714d77bff 100644
--- a/kubernetes/dcaemod/components/dcaemod-runtime-api/Chart.yaml
+++ b/kubernetes/dcaemod/components/dcaemod-runtime-api/Chart.yaml
@@ -2,6 +2,7 @@
#=================================================================================
# Copyright (c) 2019-2020 AT&T Intellectual Property. All rights reserved.
# Modifications Copyright © 2021 Orange
+# Modifications Copyright © 2021 Nordix Foundation
# ================================================================================
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -16,7 +17,21 @@
# limitations under the License.
# ============LICENSE_END=========================================================
-apiVersion: v1
+apiVersion: v2
description: ONAP DCAE MOD Runtime API
name: dcaemod-runtime-api
-version: 9.0.0
+version: 10.0.0
+
+dependencies:
+ - name: common
+ version: ~10.x-0
+ repository: '@local'
+ - name: repositoryGenerator
+ version: ~10.x-0
+ repository: '@local'
+ - name: serviceAccount
+ version: ~10.x-0
+ repository: '@local'
+ - name: readinessCheck
+ version: ~10.x-0
+ repository: '@local'
diff --git a/kubernetes/dcaemod/components/dcaemod-runtime-api/requirements.yaml b/kubernetes/dcaemod/components/dcaemod-runtime-api/requirements.yaml
deleted file mode 100644
index 1f777137a7..0000000000
--- a/kubernetes/dcaemod/components/dcaemod-runtime-api/requirements.yaml
+++ /dev/null
@@ -1,28 +0,0 @@
-#============LICENSE_START========================================================
-#=================================================================================
-# Copyright (c) 2019-2020 AT&T Intellectual Property. All rights reserved.
-# Modifications Copyright © 2021 Orange
-# ================================================================================
-# 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=========================================================
-
-dependencies:
- - name: common
- version: ~9.x-0
- repository: '@local'
- - name: repositoryGenerator
- version: ~9.x-0
- repository: '@local'
- - name: serviceAccount
- version: ~9.x-0
- repository: '@local'
diff --git a/kubernetes/dcaemod/components/dcaemod-runtime-api/resources/config/addons/templates/certificates.yaml b/kubernetes/dcaemod/components/dcaemod-runtime-api/resources/config/addons/templates/certificates.yaml
new file mode 100644
index 0000000000..8c964ecd02
--- /dev/null
+++ b/kubernetes/dcaemod/components/dcaemod-runtime-api/resources/config/addons/templates/certificates.yaml
@@ -0,0 +1,3 @@
+{{ if and .Values.certDirectory .Values.global.cmpv2Enabled .Values.global.CMPv2CertManagerIntegration }}
+{{ include "certManagerCertificate.certificate" . }}
+{{ end }} \ No newline at end of file
diff --git a/kubernetes/dcaegen2-services/components/dcae-slice-analysis-ms/requirements.yaml b/kubernetes/dcaemod/components/dcaemod-runtime-api/resources/config/base/Chart.yaml
index ed0ce49ae1..dee6adddc2 100644
--- a/kubernetes/dcaegen2-services/components/dcae-slice-analysis-ms/requirements.yaml
+++ b/kubernetes/dcaemod/components/dcaemod-runtime-api/resources/config/base/Chart.yaml
@@ -1,7 +1,6 @@
#============LICENSE_START========================================================
-# ================================================================================
-# Copyright (c) 2021 Wipro Limited.
-# Modifications Copyright © 2021 Orange
+#=================================================================================
+# Copyright (c) 2021 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.
@@ -16,22 +15,29 @@
# limitations under the License.
# ============LICENSE_END=========================================================
+apiVersion: v2
+appVersion: "Istanbul"
+description: TBD
+name: TBD
+version: TBD
+
dependencies:
- name: common
- version: ~9.x-0
- repository: '@local'
- - name: postgres
- version: ~9.x-0
+ version: ~10.x-0
repository: '@local'
- name: repositoryGenerator
- version: ~9.x-0
+ version: ~10.x-0
repository: '@local'
- name: readinessCheck
- version: ~9.x-0
+ version: ~10.x-0
repository: '@local'
- name: dcaegen2-services-common
- version: ~9.x-0
+ version: ~10.x-0
+ repository: '@local'
+ - name: postgres
+ version: ~10.x-0
repository: '@local'
+ condition: postgres.enabled
- name: serviceAccount
- version: ~9.x-0
+ version: ~10.x-0
repository: '@local'
diff --git a/kubernetes/dcaemod/components/dcaemod-runtime-api/resources/config/base/templates/configmap.yaml b/kubernetes/dcaemod/components/dcaemod-runtime-api/resources/config/base/templates/configmap.yaml
new file mode 100644
index 0000000000..866a9ad672
--- /dev/null
+++ b/kubernetes/dcaemod/components/dcaemod-runtime-api/resources/config/base/templates/configmap.yaml
@@ -0,0 +1 @@
+{{ include "dcaegen2-services-common.configMap" . }}
diff --git a/kubernetes/dcaemod/components/dcaemod-runtime-api/resources/config/base/templates/deployment.yaml b/kubernetes/dcaemod/components/dcaemod-runtime-api/resources/config/base/templates/deployment.yaml
new file mode 100644
index 0000000000..bef31a7a3a
--- /dev/null
+++ b/kubernetes/dcaemod/components/dcaemod-runtime-api/resources/config/base/templates/deployment.yaml
@@ -0,0 +1 @@
+{{ include "dcaegen2-services-common.microserviceDeployment" . }} \ No newline at end of file
diff --git a/kubernetes/dcaemod/components/dcaemod-runtime-api/resources/config/base/templates/secret.yaml b/kubernetes/dcaemod/components/dcaemod-runtime-api/resources/config/base/templates/secret.yaml
new file mode 100644
index 0000000000..6ee9297869
--- /dev/null
+++ b/kubernetes/dcaemod/components/dcaemod-runtime-api/resources/config/base/templates/secret.yaml
@@ -0,0 +1 @@
+{{ include "common.secretFast" . }}
diff --git a/kubernetes/dcaemod/components/dcaemod-runtime-api/resources/config/base/templates/service.yaml b/kubernetes/dcaemod/components/dcaemod-runtime-api/resources/config/base/templates/service.yaml
new file mode 100644
index 0000000000..f024c64864
--- /dev/null
+++ b/kubernetes/dcaemod/components/dcaemod-runtime-api/resources/config/base/templates/service.yaml
@@ -0,0 +1 @@
+{{ include "common.service" . }}
diff --git a/kubernetes/dcaemod/components/dcaemod-runtime-api/resources/config/base/values.yaml b/kubernetes/dcaemod/components/dcaemod-runtime-api/resources/config/base/values.yaml
new file mode 100644
index 0000000000..139e3d308f
--- /dev/null
+++ b/kubernetes/dcaemod/components/dcaemod-runtime-api/resources/config/base/values.yaml
@@ -0,0 +1,100 @@
+#============LICENSE_START========================================================
+#=================================================================================
+# Copyright (c) 2021 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=========================================================
+#################################################################
+# Global configuration defaults.
+#################################################################
+global:
+ nodePortPrefix: 302
+ nodePortPrefixExt: 304
+
+#################################################################
+# Filebeat configuration defaults.
+#################################################################
+filebeatConfig:
+ logstashServiceName: log-ls
+ logstashPort: 5044
+
+#################################################################
+# initContainer images.
+#################################################################
+tlsImage: onap/org.onap.dcaegen2.deployments.tls-init-container:2.1.0
+consulLoaderImage: onap/org.onap.dcaegen2.deployments.consul-loader-container:1.1.0
+
+#################################################################
+# Application configuration defaults.
+#################################################################
+# application image
+image: TBD #DONE
+pullPolicy: Always
+
+#policy sync image
+dcaePolicySyncImage: onap/org.onap.dcaegen2.deployments.dcae-services-policy-sync:1.0.1
+
+#postgres enable/disable
+postgres:
+ enabled: false
+
+# log directory where logging sidecar should look for log files
+# if absent, no sidecar will be deployed
+#logDirectory: TBD #/opt/app/VESCollector/logs #DONE
+
+# directory where TLS certs should be stored
+# if absent, no certs will be retrieved and stored
+#certDirectory: TBD #/opt/app/dcae-certificate #DONE
+
+# TLS role -- set to true if microservice acts as server
+# If true, an init container will retrieve a server cert
+# and key from AAF and mount them in certDirectory.
+#tlsServer: TBD #DONE
+
+# dependencies
+readinessCheck:
+ wait_for:
+ - dcae-config-binding-service
+ - aaf-cm
+
+# probe configuration #NEED DISCUSSION
+readiness:
+ initialDelaySeconds: TBD
+ periodSeconds: TBD
+ path: TBD
+ scheme: TBD
+ port: TBD
+
+# Resource Limit flavor -By Default using small
+flavor: small
+# Segregation for Different environment (Small and Large)
+resources:
+ small:
+ limits:
+ cpu: 2
+ memory: 2Gi
+ requests:
+ cpu: 1
+ memory: 1Gi
+ large:
+ limits:
+ cpu: 4
+ memory: 4Gi
+ requests:
+ cpu: 2
+ memory: 2Gi
+ unlimited: {}
+serviceAccount:
+ nameOverride: TBD
+ roles:
+ - read
diff --git a/kubernetes/dcaegen2-services/components/dcae-datalake-admin-ui/requirements.yaml b/kubernetes/dcaemod/components/dcaemod-runtime-api/templates/configmap.yaml
index af5b3bc1df..7d90f5812c 100644
--- a/kubernetes/dcaegen2-services/components/dcae-datalake-admin-ui/requirements.yaml
+++ b/kubernetes/dcaemod/components/dcaemod-runtime-api/templates/configmap.yaml
@@ -1,7 +1,7 @@
+{{/*
#============LICENSE_START========================================================
# ================================================================================
-# Copyright (c) 2021 Wipro Limited.
-# Modifications Copyright © 2021 Orange
+# Copyright (c) 2021 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.
@@ -15,20 +15,27 @@
# See the License for the specific language governing permissions and
# limitations under the License.
# ============LICENSE_END=========================================================
-
-dependencies:
- - name: common
- version: ~9.x-0
- repository: '@local'
- - name: repositoryGenerator
- version: ~9.x-0
- repository: '@local'
- - name: readinessCheck
- version: ~9.x-0
- repository: '@local'
- - name: dcaegen2-services-common
- version: ~9.x-0
- repository: '@local'
- - name: serviceAccount
- version: ~9.x-0
- repository: '@local'
+*/}}
+apiVersion: v1
+kind: ConfigMap
+metadata:
+ name: {{ include "common.fullname" . }}-dcae-helmgen-templates
+ namespace: {{ include "common.namespace" . }}
+data:
+{{ (.Files.Glob "resources/config/base/templates/*.yaml").AsConfig | indent 2 }}
+---
+apiVersion: v1
+kind: ConfigMap
+metadata:
+ name: {{ include "common.fullname" . }}-dcae-helmgen-base
+ namespace: {{ include "common.namespace" . }}
+data:
+{{ (.Files.Glob "resources/config/base/*.yaml").AsConfig | indent 2 }}
+---
+apiVersion: v1
+kind: ConfigMap
+metadata:
+ name: {{ include "common.fullname" . }}-dcae-helmgen-addons-templates
+ namespace: {{ include "common.namespace" . }}
+data:
+{{ (.Files.Glob "resources/config/addons/templates/*").AsConfig | indent 2 }} \ No newline at end of file
diff --git a/kubernetes/dcaemod/components/dcaemod-runtime-api/templates/deployment.yaml b/kubernetes/dcaemod/components/dcaemod-runtime-api/templates/deployment.yaml
index d5c37e9858..39044465dc 100644
--- a/kubernetes/dcaemod/components/dcaemod-runtime-api/templates/deployment.yaml
+++ b/kubernetes/dcaemod/components/dcaemod-runtime-api/templates/deployment.yaml
@@ -1,7 +1,7 @@
{{/*
#============LICENSE_START========================================================
# ================================================================================
-# Copyright (c) 2019-2020 AT&T Intellectual Property. All rights reserved.
+# Copyright (c) 2019-2021 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.
@@ -44,6 +44,17 @@ spec:
initialDelaySeconds: {{ .Values.readiness.initialDelaySeconds }}
periodSeconds: {{ .Values.readiness.periodSeconds }}
resources: {{ include "common.resources" . | nindent 12 }}
+ volumeMounts:
+ - mountPath: {{ .Values.config.basehelmchartlocation }}/base/values.yaml
+ subPath: values.yaml
+ name: dcae-helmgen-base
+ - mountPath: {{ .Values.config.basehelmchartlocation }}/base/Chart.yaml
+ subPath: Chart.yaml
+ name: dcae-helmgen-base
+ - mountPath: {{ .Values.config.basehelmchartlocation }}/base/templates
+ name: dcae-helmgen-templates
+ - mountPath: {{ .Values.config.basehelmchartlocation }}/addons/templates
+ name: dcae-helmgen-addon-templates
env:
- name: DASHBOARD_URL
value: {{ .Values.config.dashboardURL }}
@@ -71,7 +82,26 @@ spec:
value: {{ .Values.config.bpResourcesCpuLimit }}
- name: BP_RESOURCES_MEMORY_LIMIT
value: {{ .Values.config.bpResourcesMemoryLimit }}
+ - name: ARTIFACT_TYPE
+ value: {{ .Values.config.artifactType }}
+ - name: CHARTMUSEUM_BASEURL
+ value: {{ .Values.config.registryBaseurl }}
+ - name: HELM_BASE_CHART_TEMPLATE_LOCATION
+ value: {{ .Values.config.basehelmchartlocation }}
+ - name: CHARTMUSEUM_AUTH_BASIC_USERNAME
+ {{- include "common.secret.envFromSecretFast" (dict "global" . "uid" "registrycred" "key" "login") | indent 14 }}
+ - name: CHARTMUSEUM_AUTH_BASIC_PASSWORD
+ {{- include "common.secret.envFromSecretFast" (dict "global" . "uid" "registrycred" "key" "password") | indent 14 }}
serviceAccountName: {{ include "common.fullname" (dict "suffix" "read" "dot" . )}}
imagePullSecrets:
- name: "{{ include "common.namespace" . }}-docker-registry-key"
-
+ volumes:
+ - name: dcae-helmgen-templates
+ configMap:
+ name: {{ include "common.fullname" . }}-dcae-helmgen-templates
+ - name: dcae-helmgen-base
+ configMap:
+ name: {{ include "common.fullname" . }}-dcae-helmgen-base
+ - name: dcae-helmgen-addon-templates
+ configMap:
+ name: {{ include "common.fullname" . }}-dcae-helmgen-addons-templates \ No newline at end of file
diff --git a/kubernetes/dcaemod/components/dcaemod-runtime-api/values.yaml b/kubernetes/dcaemod/components/dcaemod-runtime-api/values.yaml
index e54608b30e..e7d3fa2fa2 100644
--- a/kubernetes/dcaemod/components/dcaemod-runtime-api/values.yaml
+++ b/kubernetes/dcaemod/components/dcaemod-runtime-api/values.yaml
@@ -1,6 +1,6 @@
#============LICENSE_START========================================================
#=================================================================================
-# Copyright (c) 2019-2020 AT&T Intellectual Property. All rights reserved.
+# Copyright (c) 2019-2021 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.
@@ -40,6 +40,10 @@ config:
useDmaapPlugin: false
bpResourcesCpuLimit: 250m
bpResourcesMemoryLimit: 128Mi
+ artifactType: "HELM"
+ registryBaseurl: http://chart-museum:80
+ basehelmchartlocation: /helm-gen/
+
secrets:
- uid: "dashsecret"
@@ -47,6 +51,18 @@ secrets:
login: '{{ .Values.config.dashboardUser }}'
password: '{{ .Values.config.dashboardPassword }}'
passwordPolicy: generate
+ - uid: registrycred
+ type: basicAuth
+ login: '{{ .Values.registryCred.username }}'
+ password: '{{ .Values.registryCred.password }}'
+ passwordPolicy: required
+
+# Below parameter should match setting in all clients
+# including oom\kubernetes\platform\components\chartmuseum
+# where ONAP registry is setup
+registryCred:
+ username: onapinitializer
+ password: demo123456!
service:
type: ClusterIP
@@ -70,8 +86,14 @@ readiness:
port: http
# Should have a proper readiness endpoint or script
+# dependencies
+#readinessCheck:
+# wait_for:
+# - chart-museum
+
+
# application image
-image: onap/org.onap.dcaegen2.platform.mod.runtime-web:1.2.3
+image: onap/org.onap.dcaegen2.platform.mod.runtime-web:1.3.1
# Resource Limit flavor -By Default using small
flavor: small
@@ -98,4 +120,3 @@ serviceAccount:
nameOverride: dcaemod-runtime-api
roles:
- read
-
diff --git a/kubernetes/dcaemod/requirements.yaml b/kubernetes/dcaemod/requirements.yaml
deleted file mode 100644
index 0ecbc55557..0000000000
--- a/kubernetes/dcaemod/requirements.yaml
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright (c) 2020 AT&T Intellectual Property. All rights reserved.
-# Modifications Copyright © 2021 Orange
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-dependencies:
- - name: common
- version: ~9.x-0
- repository: '@local'
- - name: dcaemod-genprocessor
- version: ~9.x-0
- repository: 'file://components/dcaemod-genprocessor'
- condition: dcaemod-genprocessor.enabled
- - name: dcaemod-distributor-api
- version: ~9.x-0
- repository: 'file://components/dcaemod-distributor-api'
- condition: dcaemod-distributor-api.enabled
- - name: dcaemod-designtool
- version: ~9.x-0
- repository: 'file://components/dcaemod-designtool'
- condition: dcaemod-designtool.enabled
- - name: dcaemod-onboarding-api
- version: ~9.x-0
- repository: 'file://components/dcaemod-onboarding-api'
- condition: dcaemod-onboarding-api.enabled
- - name: dcaemod-runtime-api
- version: ~9.x-0
- repository: 'file://components/dcaemod-runtime-api'
- condition: dcaemod-runtime-api.enabled
- - name: dcaemod-nifi-registry
- version: ~9.x-0
- repository: 'file://components/dcaemod-nifi-registry'
- condition: dcaemod-nifi-registry.enabled
- - name: dcaemod-healthcheck
- version: ~9.x-0
- repository: 'file://components/dcaemod-healthcheck'
- condition: dcaemod-healthcheck.enabled
diff --git a/kubernetes/dmaap/Chart.yaml b/kubernetes/dmaap/Chart.yaml
index e0b0c38712..7ae20adaf9 100644
--- a/kubernetes/dmaap/Chart.yaml
+++ b/kubernetes/dmaap/Chart.yaml
@@ -1,6 +1,7 @@
# Copyright © 2018 AT&T Intellectual Property. All rights reserved.
# Modifications Copyright © 2018 Amdocs,Bell Canada
# Modifications Copyright © 2021 Orange
+# Modifications Copyright © 2021 Nordix Foundation
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -14,7 +15,31 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-apiVersion: v1
+apiVersion: v2
description: ONAP DMaaP components
name: dmaap
-version: 9.0.0
+version: 10.0.0
+
+dependencies:
+ - name: common
+ version: ~10.x-0
+ repository: '@local'
+ - name: message-router
+ version: ~10.x-0
+ repository: 'file://components/message-router'
+ condition: message-router.enabled
+ - name: dmaap-bc
+ version: ~10.x-0
+ repository: 'file://components/dmaap-bc'
+ condition: dmaap-bc.enabled
+ - name: dmaap-dr-node
+ version: ~10.x-0
+ repository: 'file://components/dmaap-dr-node'
+ condition: dmaap-dr-node.enabled
+ - name: dmaap-dr-prov
+ version: ~10.x-0
+ repository: 'file://components/dmaap-dr-prov'
+ condition: dmaap-dr-prov.enabled
+ - name: serviceAccount
+ version: ~10.x-0
+ repository: '@local'
diff --git a/kubernetes/dmaap/Makefile b/kubernetes/dmaap/Makefile
index 4c79718d02..7f4318190f 100644
--- a/kubernetes/dmaap/Makefile
+++ b/kubernetes/dmaap/Makefile
@@ -33,7 +33,7 @@ make-%:
@if [ -f $*/Makefile ]; then make -C $*; fi
dep-%: make-%
- @if [ -f $*/requirements.yaml ]; then $(HELM_BIN) dep up $*; fi
+ @if [ -f $*/Chart.yaml ]; then $(HELM_BIN) dep up $*; fi
lint-%: dep-%
@if [ -f $*/Chart.yaml ]; then $(HELM_BIN) lint $*; fi
@@ -44,8 +44,9 @@ package-%: lint-%
@$(HELM_BIN) repo index $(PACKAGE_DIR)
clean:
- @rm -f */requirements.lock
+ @rm -f */Chart.lock
@rm -f *tgz */charts/*tgz
@rm -rf $(PACKAGE_DIR)
+ @rm -f */Chart.lock
%:
@:
diff --git a/kubernetes/dmaap/components/Makefile b/kubernetes/dmaap/components/Makefile
index bf267b7720..3253599dea 100644
--- a/kubernetes/dmaap/components/Makefile
+++ b/kubernetes/dmaap/components/Makefile
@@ -33,7 +33,7 @@ make-%:
@if [ -f $*/Makefile ]; then make -C $*; fi
dep-%: make-%
- @if [ -f $*/requirements.yaml ]; then $(HELM_BIN) dep up $*; fi
+ @if [ -f $*/Chart.yaml ]; then $(HELM_BIN) dep up $*; fi
lint-%: dep-%
@if [ -f $*/Chart.yaml ]; then $(HELM_BIN) lint $*; fi
@@ -44,8 +44,9 @@ package-%: lint-%
@$(HELM_BIN) repo index $(PACKAGE_DIR)
clean:
- @rm -f */requirements.lock
+ @rm -f */Chart.lock
@rm -f *tgz */charts/*tgz
@rm -rf $(PACKAGE_DIR)
+ @rm -f */Chart.lock
%:
@:
diff --git a/kubernetes/dmaap/components/dmaap-bc/Chart.yaml b/kubernetes/dmaap/components/dmaap-bc/Chart.yaml
index 433c065445..3903c5dbea 100644
--- a/kubernetes/dmaap/components/dmaap-bc/Chart.yaml
+++ b/kubernetes/dmaap/components/dmaap-bc/Chart.yaml
@@ -1,6 +1,7 @@
# Copyright © 2018 AT&T Intellectual Property. All rights reserved.
# Modifications Copyright © 2018 Amdocs,Bell Canada
# Modifications Copyright © 2021 Orange
+# Modifications Copyright © 2021 Nordix Foundation
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -14,7 +15,25 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-apiVersion: v1
+apiVersion: v2
description: a Helm chart to deploy ONAP DMaaP Bus Controller (aka dmaap-bc) in Kubernetes
name: dmaap-bc
-version: 9.0.0
+version: 10.0.0
+
+dependencies:
+ - name: common
+ version: ~10.x-0
+ repository: '@local'
+ - name: certInitializer
+ version: ~10.x-0
+ repository: '@local'
+ - name: postgres
+ version: ~10.x-0
+ repository: '@local'
+ condition: PG.enabled
+ - name: repositoryGenerator
+ version: ~10.x-0
+ repository: '@local'
+ - name: serviceAccount
+ version: ~10.x-0
+ repository: '@local'
diff --git a/kubernetes/dmaap/components/dmaap-bc/requirements.yaml b/kubernetes/dmaap/components/dmaap-bc/requirements.yaml
deleted file mode 100644
index 10a617d0c3..0000000000
--- a/kubernetes/dmaap/components/dmaap-bc/requirements.yaml
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright © 2018 AT&T Intellectual Property. All rights reserved.
-# Modifications Copyright © 2021 Orange
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-dependencies:
- - name: common
- version: ~9.x-0
- repository: '@local'
- - name: certInitializer
- version: ~9.x-0
- repository: '@local'
- - name: postgres
- version: ~9.x-0
- repository: '@local'
- condition: PG.enabled
- - name: repositoryGenerator
- version: ~9.x-0
- repository: '@local'
- - name: serviceAccount
- version: ~9.x-0
- repository: '@local'
diff --git a/kubernetes/dmaap/components/dmaap-dr-node/Chart.yaml b/kubernetes/dmaap/components/dmaap-dr-node/Chart.yaml
index 87b5fa1467..4c65198ecc 100644
--- a/kubernetes/dmaap/components/dmaap-dr-node/Chart.yaml
+++ b/kubernetes/dmaap/components/dmaap-dr-node/Chart.yaml
@@ -1,5 +1,6 @@
# Copyright © 2017 Amdocs, Bell Canada
# Modifications Copyright © 2021 Orange
+# Modifications Copyright © 2021 Nordix Foundation
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -13,7 +14,21 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-apiVersion: v1
+apiVersion: v2
description: ONAP DMaaP Data Router Node Server
name: dmaap-dr-node
-version: 9.0.0
+version: 10.0.0
+
+dependencies:
+ - name: common
+ version: ~10.x-0
+ repository: '@local'
+ - name: repositoryGenerator
+ version: ~10.x-0
+ repository: '@local'
+ - name: serviceAccount
+ version: ~10.x-0
+ repository: '@local'
+ - name: certInitializer
+ version: ~10.x-0
+ repository: '@local'
diff --git a/kubernetes/dmaap/components/dmaap-dr-node/requirements.yaml b/kubernetes/dmaap/components/dmaap-dr-node/requirements.yaml
deleted file mode 100644
index 4feb42de02..0000000000
--- a/kubernetes/dmaap/components/dmaap-dr-node/requirements.yaml
+++ /dev/null
@@ -1,34 +0,0 @@
-#
-# ============LICENSE_START=======================================================
-# Copyright (C) 2019 Nordix Foundation.
-# Modifications Copyright © 2021 Orange
-# ================================================================================
-# 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.
-#
-# SPDX-License-Identifier: Apache-2.0
-# ============LICENSE_END=========================================================
-#
-
-dependencies:
- - name: common
- version: ~9.x-0
- repository: '@local'
- - name: repositoryGenerator
- version: ~9.x-0
- repository: '@local'
- - name: serviceAccount
- version: ~9.x-0
- repository: '@local'
- - name: certInitializer
- version: ~9.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 94fc4430c3..74c984b7cf 100644
--- a/kubernetes/dmaap/components/dmaap-dr-prov/Chart.yaml
+++ b/kubernetes/dmaap/components/dmaap-dr-prov/Chart.yaml
@@ -13,7 +13,28 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-apiVersion: v1
+apiVersion: v2
description: ONAP DMaaP Data Router Provisioning Server
name: dmaap-dr-prov
-version: 9.0.0
+version: 10.0.0
+
+dependencies:
+ - name: common
+ version: ~10.x-0
+ repository: '@local'
+ - name: mariadb-galera
+ version: ~10.x-0
+ repository: '@local'
+ condition: global.mariadbGalera.localCluster
+ - name: mariadb-init
+ version: ~10.x-0
+ repository: '@local'
+ - name: certInitializer
+ version: ~10.x-0
+ repository: '@local'
+ - name: repositoryGenerator
+ version: ~10.x-0
+ repository: '@local'
+ - name: serviceAccount
+ version: ~10.x-0
+ repository: '@local'
diff --git a/kubernetes/dmaap/components/dmaap-dr-prov/requirements.yaml b/kubernetes/dmaap/components/dmaap-dr-prov/requirements.yaml
deleted file mode 100644
index 01d481aba2..0000000000
--- a/kubernetes/dmaap/components/dmaap-dr-prov/requirements.yaml
+++ /dev/null
@@ -1,41 +0,0 @@
-#
-# ============LICENSE_START=======================================================
-# Copyright (C) 2019 Nordix Foundation.
-# Modifications Copyright © 2021 Orange
-# ================================================================================
-# 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.
-#
-# SPDX-License-Identifier: Apache-2.0
-# ============LICENSE_END=========================================================
-#
-
-dependencies:
- - name: common
- version: ~9.x-0
- repository: '@local'
- - name: mariadb-galera
- version: ~9.x-0
- repository: '@local'
- condition: global.mariadbGalera.localCluster
- - name: mariadb-init
- version: ~9.x-0
- repository: '@local'
- - name: certInitializer
- version: ~9.x-0
- repository: '@local'
- - name: repositoryGenerator
- version: ~9.x-0
- repository: '@local'
- - name: serviceAccount
- version: ~9.x-0
- repository: '@local'
diff --git a/kubernetes/dmaap/components/message-router/Chart.yaml b/kubernetes/dmaap/components/message-router/Chart.yaml
index 7bd389eec7..7ecad8b222 100644
--- a/kubernetes/dmaap/components/message-router/Chart.yaml
+++ b/kubernetes/dmaap/components/message-router/Chart.yaml
@@ -1,6 +1,7 @@
# Copyright © 2017 Amdocs, Bell Canada
# Modifications Copyright © 2018 AT&T
# Modifications Copyright © 2021 Orange
+# Modifications Copyright © 2021 Nordix Foundation
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -14,7 +15,30 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-apiVersion: v1
+apiVersion: v2
description: ONAP Message Router
name: message-router
-version: 9.0.0
+version: 10.0.0
+
+dependencies:
+ - name: common
+ version: ~10.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: certInitializer
+ version: ~10.x-0
+ repository: '@local'
+ - name: repositoryGenerator
+ version: ~10.x-0
+ repository: '@local'
+ - name: message-router-kafka
+ version: ~10.x-0
+ repository: 'file://components/message-router-kafka'
+ - name: message-router-zookeeper
+ version: ~10.x-0
+ repository: 'file://components/message-router-zookeeper'
+ - name: serviceAccount
+ version: ~10.x-0
+ repository: '@local'
diff --git a/kubernetes/dmaap/components/message-router/Makefile b/kubernetes/dmaap/components/message-router/Makefile
index 4c79718d02..51d7de122c 100644
--- a/kubernetes/dmaap/components/message-router/Makefile
+++ b/kubernetes/dmaap/components/message-router/Makefile
@@ -33,7 +33,7 @@ make-%:
@if [ -f $*/Makefile ]; then make -C $*; fi
dep-%: make-%
- @if [ -f $*/requirements.yaml ]; then $(HELM_BIN) dep up $*; fi
+ @if [ -f $*/Chart.yaml ]; then $(HELM_BIN) dep up $*; fi
lint-%: dep-%
@if [ -f $*/Chart.yaml ]; then $(HELM_BIN) lint $*; fi
@@ -44,7 +44,7 @@ package-%: lint-%
@$(HELM_BIN) repo index $(PACKAGE_DIR)
clean:
- @rm -f */requirements.lock
+ @rm -f */Chart.lock
@rm -f *tgz */charts/*tgz
@rm -rf $(PACKAGE_DIR)
%:
diff --git a/kubernetes/dmaap/components/message-router/components/Makefile b/kubernetes/dmaap/components/message-router/components/Makefile
index bf267b7720..f4c9784bc4 100644
--- a/kubernetes/dmaap/components/message-router/components/Makefile
+++ b/kubernetes/dmaap/components/message-router/components/Makefile
@@ -33,7 +33,7 @@ make-%:
@if [ -f $*/Makefile ]; then make -C $*; fi
dep-%: make-%
- @if [ -f $*/requirements.yaml ]; then $(HELM_BIN) dep up $*; fi
+ @if [ -f $*/Chart.yaml ]; then $(HELM_BIN) dep up $*; fi
lint-%: dep-%
@if [ -f $*/Chart.yaml ]; then $(HELM_BIN) lint $*; fi
@@ -44,7 +44,7 @@ package-%: lint-%
@$(HELM_BIN) repo index $(PACKAGE_DIR)
clean:
- @rm -f */requirements.lock
+ @rm -f */Chart.lock
@rm -f *tgz */charts/*tgz
@rm -rf $(PACKAGE_DIR)
%:
diff --git a/kubernetes/dmaap/components/message-router/components/message-router-kafka/Chart.yaml b/kubernetes/dmaap/components/message-router/components/message-router-kafka/Chart.yaml
index 76a48839f3..2a24b7dbd9 100644
--- a/kubernetes/dmaap/components/message-router/components/message-router-kafka/Chart.yaml
+++ b/kubernetes/dmaap/components/message-router/components/message-router-kafka/Chart.yaml
@@ -1,6 +1,7 @@
# Copyright © 2017 Amdocs, Bell Canada
# Modifications Copyright © 2018 AT&T
# Modifications Copyright © 2021 Orange
+# Modifications Copyright © 2021 Nordix Foundation
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -14,7 +15,24 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-apiVersion: v1
+apiVersion: v2
description: ONAP Message Router Kafka Service
name: message-router-kafka
-version: 9.0.0
+version: 10.0.0
+
+dependencies:
+ - name: common
+ version: ~10.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: certInitializer
+ version: ~10.x-0
+ repository: '@local'
+ - name: repositoryGenerator
+ version: ~10.x-0
+ repository: '@local'
+ - name: serviceAccount
+ version: ~10.x-0
+ repository: '@local'
diff --git a/kubernetes/dmaap/components/message-router/components/message-router-kafka/requirements.yaml b/kubernetes/dmaap/components/message-router/components/message-router-kafka/requirements.yaml
deleted file mode 100644
index f85585d5b7..0000000000
--- a/kubernetes/dmaap/components/message-router/components/message-router-kafka/requirements.yaml
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright © 2017 Amdocs, Bell Canada
-# Modifications Copyright © 2018 AT&T
-# Modifications Copyright © 2021 Orange
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-dependencies:
- - name: common
- version: ~9.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: certInitializer
- version: ~9.x-0
- repository: '@local'
- - name: repositoryGenerator
- version: ~9.x-0
- repository: '@local'
- - name: serviceAccount
- version: ~9.x-0
- repository: '@local'
diff --git a/kubernetes/dmaap/components/message-router/components/message-router-zookeeper/Chart.yaml b/kubernetes/dmaap/components/message-router/components/message-router-zookeeper/Chart.yaml
index c3a128246a..699722c6e0 100644
--- a/kubernetes/dmaap/components/message-router/components/message-router-zookeeper/Chart.yaml
+++ b/kubernetes/dmaap/components/message-router/components/message-router-zookeeper/Chart.yaml
@@ -1,6 +1,7 @@
# Copyright © 2017 Amdocs, Bell Canada
# Modifications Copyright © 2018 AT&T
# Modifications Copyright © 2021 Orange
+# Modifications Copyright © 2021 Nordix Foundation
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -14,7 +15,21 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-apiVersion: v1
+apiVersion: v2
description: ONAP Dmaap Message Router Zookeeper Service
name: message-router-zookeeper
-version: 9.0.0
+version: 10.0.0
+
+dependencies:
+ - name: common
+ version: ~10.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: repositoryGenerator
+ version: ~10.x-0
+ repository: '@local'
+ - name: serviceAccount
+ version: ~10.x-0
+ repository: '@local'
diff --git a/kubernetes/dmaap/components/message-router/components/message-router-zookeeper/requirements.yaml b/kubernetes/dmaap/components/message-router/components/message-router-zookeeper/requirements.yaml
deleted file mode 100644
index 74c05f4b68..0000000000
--- a/kubernetes/dmaap/components/message-router/components/message-router-zookeeper/requirements.yaml
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright © 2017 Amdocs, Bell Canada
-# Modifications Copyright © 2018 AT&T
-# Modifications Copyright © 2021 Orange
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-dependencies:
- - name: common
- version: ~9.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: repositoryGenerator
- version: ~9.x-0
- repository: '@local'
- - name: serviceAccount
- version: ~9.x-0
- repository: '@local'
diff --git a/kubernetes/dmaap/components/message-router/requirements.yaml b/kubernetes/dmaap/components/message-router/requirements.yaml
deleted file mode 100644
index 4dfa82b92e..0000000000
--- a/kubernetes/dmaap/components/message-router/requirements.yaml
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright © 2017 Amdocs, Bell Canada
-# Modifications Copyright © 2018 AT&T
-# Modifications Copyright © 2021 Orange
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-dependencies:
- - name: common
- version: ~9.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: certInitializer
- version: ~9.x-0
- repository: '@local'
- - name: repositoryGenerator
- version: ~9.x-0
- repository: '@local'
- - name: message-router-kafka
- version: ~9.x-0
- repository: 'file://components/message-router-kafka'
- - name: message-router-zookeeper
- version: ~9.x-0
- repository: 'file://components/message-router-zookeeper'
- - name: serviceAccount
- version: ~9.x-0
- repository: '@local'
diff --git a/kubernetes/dmaap/components/message-router/templates/statefulset.yaml b/kubernetes/dmaap/components/message-router/templates/statefulset.yaml
index 9bad341792..f0832add80 100644
--- a/kubernetes/dmaap/components/message-router/templates/statefulset.yaml
+++ b/kubernetes/dmaap/components/message-router/templates/statefulset.yaml
@@ -103,13 +103,25 @@ spec:
initialDelaySeconds: {{ .Values.liveness.initialDelaySeconds }}
periodSeconds: {{ .Values.liveness.periodSeconds }}
timeoutSeconds: {{ .Values.liveness.timeoutSeconds }}
- {{ end -}}
+ successThreshold: {{ .Values.liveness.successThreshold }}
+ failureThreshold: {{ .Values.liveness.failureThreshold }}
+ {{ end }}
readinessProbe:
tcpSocket:
port: {{ .Values.readiness.port }}
initialDelaySeconds: {{ .Values.readiness.initialDelaySeconds }}
periodSeconds: {{ .Values.readiness.periodSeconds }}
timeoutSeconds: {{ .Values.readiness.timeoutSeconds }}
+ successThreshold: {{ .Values.readiness.successThreshold }}
+ failureThreshold: {{ .Values.readiness.failureThreshold }}
+ startupProbe:
+ tcpSocket:
+ port: {{ .Values.startup.port }}
+ initialDelaySeconds: {{ .Values.startup.initialDelaySeconds }}
+ periodSeconds: {{ .Values.startup.periodSeconds }}
+ timeoutSeconds: {{ .Values.startup.timeoutSeconds }}
+ successThreshold: {{ .Values.startup.successThreshold }}
+ failureThreshold: {{ .Values.startup.failureThreshold }}
env:
- name: enableCadi
value: "{{ .Values.global.aafEnabled }}"
diff --git a/kubernetes/dmaap/components/message-router/values.yaml b/kubernetes/dmaap/components/message-router/values.yaml
index 44697d7c92..7aa31769f4 100644
--- a/kubernetes/dmaap/components/message-router/values.yaml
+++ b/kubernetes/dmaap/components/message-router/values.yaml
@@ -85,18 +85,30 @@ affinity: {}
# probe configuration parameters
liveness:
- initialDelaySeconds: 70
+ initialDelaySeconds: 10
periodSeconds: 10
timeoutSeconds: 1
+ successThreshold: 1
+ failureThreshold: 3
# necessary to disable liveness probe when setting breakpoints
# in debugger so K8s doesn't restart unresponsive container
port: api
enabled: true
readiness:
- initialDelaySeconds: 70
+ initialDelaySeconds: 10
periodSeconds: 10
timeoutSeconds: 1
+ successThreshold: 1
+ failureThreshold: 3
+ port: api
+
+startup:
+ initialDelaySeconds: 10
+ periodSeconds: 10
+ timeoutSeconds: 1
+ successThreshold: 1
+ failureThreshold: 70
port: api
service:
diff --git a/kubernetes/dmaap/requirements.yaml b/kubernetes/dmaap/requirements.yaml
deleted file mode 100644
index b1a8f3a8bc..0000000000
--- a/kubernetes/dmaap/requirements.yaml
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright © 2018 AT&T Intellectual Property. All rights reserved.
-# Modifications Copyright © 2018 Amdocs,Bell Canada
-# Modifications Copyright © 2021 Orange
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-dependencies:
- - name: common
- version: ~9.x-0
- repository: '@local'
- - name: message-router
- version: ~9.x-0
- repository: 'file://components/message-router'
- condition: message-router.enabled
- - name: dmaap-bc
- version: ~9.x-0
- repository: 'file://components/dmaap-bc'
- condition: dmaap-bc.enabled
- - name: dmaap-dr-node
- version: ~9.x-0
- repository: 'file://components/dmaap-dr-node'
- condition: dmaap-dr-node.enabled
- - name: dmaap-dr-prov
- version: ~9.x-0
- repository: 'file://components/dmaap-dr-prov'
- condition: dmaap-dr-prov.enabled
- - name: serviceAccount
- version: ~9.x-0
- repository: '@local'
diff --git a/kubernetes/helm/plugins/deploy/deploy.sh b/kubernetes/helm/plugins/deploy/deploy.sh
index 5820e77521..13b0ed86e2 100755
--- a/kubernetes/helm/plugins/deploy/deploy.sh
+++ b/kubernetes/helm/plugins/deploy/deploy.sh
@@ -99,11 +99,8 @@ deploy() {
FLAGS=$(echo ${@} | sed 's/^ *[^ ]* *[^ ]* *//')
CHART_REPO="$(echo "$CHART_URL" | cut -d'/' -f1)"
CHART_NAME="$(echo "$CHART_URL" | cut -d'/' -f2)"
- if expr "$HELM_VER" : "v3\..*" ; then
- CACHE_DIR=~/.local/share/helm/plugins/deploy/cache
- else
- CACHE_DIR=~/.helm/plugins/deploy/cache
- fi
+
+ CACHE_DIR=~/.local/share/helm/plugins/deploy/cache
echo "Use cache dir: $CACHE_DIR"
CHART_DIR=$CACHE_DIR/$CHART_NAME
CACHE_SUBCHART_DIR=$CHART_DIR-subcharts
@@ -181,9 +178,11 @@ deploy() {
# temp hack - parent chart needs common subchart
mv $CACHE_SUBCHART_DIR/common $CHART_DIR/charts/
- # disable dependencies
- rm $CHART_DIR/requirements.lock
- mv $CHART_DIR/requirements.yaml $CHART_DIR/requirements.deploy
+ # disable dependencies
+ rm $CHART_DIR/Chart.lock
+ sed -n '1,/dependencies:/p;/description:/,$p' $CHART_DIR/Chart.yaml | grep -v dependencies > $CHART_DIR/deploy_Chart.yaml
+ mv $CHART_DIR/Chart.yaml $CHART_DIR/Chart.deploy
+ mv $CHART_DIR/deploy_Chart.yaml $CHART_DIR/Chart.yaml
# compute overrides for parent and all subcharts
COMPUTED_OVERRIDES=$CACHE_DIR/$CHART_NAME/computed-overrides.yaml
@@ -257,21 +256,13 @@ deploy() {
array=($(echo "$ALL_HELM_RELEASES" | grep "${RELEASE}-${subchart}"))
n=${#array[*]}
for i in $(seq $(($n-1)) -1 0); do
- if expr "$HELM_VER" : "v3\..*" ; then
- helm del "${array[i]}"
- else
- helm del "${array[i]}" --purge
- fi
+ helm del "${array[i]}"
done
fi
done
# report on success/failures of installs/upgrades
- if expr "$HELM_VER" : "v3\..*" ; then
- helm ls --all-namespaces | grep -i FAILED | grep $RELEASE
- else
- helm ls | grep FAILED | grep $RELEASE
- fi
+ helm ls --all-namespaces | grep -i FAILED | grep $RELEASE
}
HELM_VER=$(helm version --template "{{.Version}}")
echo $HELM_VER
diff --git a/kubernetes/helm/starters/onap-app/Chart.yaml b/kubernetes/helm/starters/onap-app/Chart.yaml
index 87a62ed77b..6782264007 100644
--- a/kubernetes/helm/starters/onap-app/Chart.yaml
+++ b/kubernetes/helm/starters/onap-app/Chart.yaml
@@ -1,5 +1,6 @@
# Copyright © 2017 Amdocs, Bell Canada
# Modifications Copyright © 2021 Orange
+# Modifications Copyright © 2021 Nordix Foundation
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -13,7 +14,15 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-apiVersion: v1
+apiVersion: v2
description: <Short application description - this is visible via 'helm search'>
name: <onap-app>
-version: 9.0.0
+version: 10.0.0
+
+dependencies:
+ - name: common
+ version: ~10.x-0
+ repository: '@local'
+ - name: repositoryGenerator
+ version: ~10.x-0
+ repository: '@local'
diff --git a/kubernetes/helm/starters/onap-app/requirements.yaml b/kubernetes/helm/starters/onap-app/requirements.yaml
deleted file mode 100644
index 4fecc22f0c..0000000000
--- a/kubernetes/helm/starters/onap-app/requirements.yaml
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright © 2017 Amdocs, Bell Canada
-# Modifications Copyright © 2021 Orange
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-dependencies:
- - name: common
- version: ~9.x-0
- repository: '@local'
- - name: repositoryGenerator
- version: ~9.x-0
- repository: '@local'
diff --git a/kubernetes/holmes/Chart.yaml b/kubernetes/holmes/Chart.yaml
index b636d38aea..5b80bf880a 100644
--- a/kubernetes/holmes/Chart.yaml
+++ b/kubernetes/holmes/Chart.yaml
@@ -1,6 +1,7 @@
# Copyright © 2017 Amdocs, Bell Canada
# Modifications Copyright © 2021 ZTE
# Modifications Copyright © 2021 Orange
+# Modifications Copyright © 2021 Nordix Foundation
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -14,7 +15,29 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-apiVersion: v1
+apiVersion: v2
description: ONAP DCAE HOLMES
name: holmes
-version: 9.0.0
+version: 10.0.0
+
+dependencies:
+ - name: common
+ version: ~10.x-0
+ repository: '@local'
+ - name: repositoryGenerator
+ version: ~10.x-0
+ repository: '@local'
+ - name: postgres
+ version: ~10.x-0
+ repository: '@local'
+ condition: global.postgres.localCluster
+ - name: postgres-init
+ version: ~10.x-0
+ repository: '@local'
+ condition: not global.postgres.localCluster
+ - name: holmes-rule-mgmt
+ version: ~10.x-0
+ repository: 'file://components/holmes-rule-mgmt'
+ - name: holmes-engine-mgmt
+ version: ~10.x-0
+ repository: 'file://components/holmes-engine-mgmt'
diff --git a/kubernetes/holmes/Makefile b/kubernetes/holmes/Makefile
index 4c79718d02..51d7de122c 100644
--- a/kubernetes/holmes/Makefile
+++ b/kubernetes/holmes/Makefile
@@ -33,7 +33,7 @@ make-%:
@if [ -f $*/Makefile ]; then make -C $*; fi
dep-%: make-%
- @if [ -f $*/requirements.yaml ]; then $(HELM_BIN) dep up $*; fi
+ @if [ -f $*/Chart.yaml ]; then $(HELM_BIN) dep up $*; fi
lint-%: dep-%
@if [ -f $*/Chart.yaml ]; then $(HELM_BIN) lint $*; fi
@@ -44,7 +44,7 @@ package-%: lint-%
@$(HELM_BIN) repo index $(PACKAGE_DIR)
clean:
- @rm -f */requirements.lock
+ @rm -f */Chart.lock
@rm -f *tgz */charts/*tgz
@rm -rf $(PACKAGE_DIR)
%:
diff --git a/kubernetes/holmes/components/Makefile b/kubernetes/holmes/components/Makefile
index bf267b7720..f4c9784bc4 100644
--- a/kubernetes/holmes/components/Makefile
+++ b/kubernetes/holmes/components/Makefile
@@ -33,7 +33,7 @@ make-%:
@if [ -f $*/Makefile ]; then make -C $*; fi
dep-%: make-%
- @if [ -f $*/requirements.yaml ]; then $(HELM_BIN) dep up $*; fi
+ @if [ -f $*/Chart.yaml ]; then $(HELM_BIN) dep up $*; fi
lint-%: dep-%
@if [ -f $*/Chart.yaml ]; then $(HELM_BIN) lint $*; fi
@@ -44,7 +44,7 @@ package-%: lint-%
@$(HELM_BIN) repo index $(PACKAGE_DIR)
clean:
- @rm -f */requirements.lock
+ @rm -f */Chart.lock
@rm -f *tgz */charts/*tgz
@rm -rf $(PACKAGE_DIR)
%:
diff --git a/kubernetes/holmes/components/holmes-engine-mgmt/Chart.yaml b/kubernetes/holmes/components/holmes-engine-mgmt/Chart.yaml
index 4df9ff0605..27b79fd7d1 100644
--- a/kubernetes/holmes/components/holmes-engine-mgmt/Chart.yaml
+++ b/kubernetes/holmes/components/holmes-engine-mgmt/Chart.yaml
@@ -1,6 +1,6 @@
-# Copyright © 2017 Amdocs, Bell Canada
# Modifications Copyright © 2021 ZTE
# Modifications Copyright © 2021 Orange
+# Modifications Copyright © 2021 Nordix Foundation
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -14,8 +14,22 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-apiVersion: v1
+apiVersion: v2
appVersion: "1.0"
description: Holmes Engine Management
name: holmes-engine-mgmt
-version: 9.0.0
+version: 10.0.0
+
+dependencies:
+ - name: common
+ version: ~10.x-0
+ repository: '@local'
+ - name: repositoryGenerator
+ version: ~10.x-0
+ repository: '@local'
+ - name: certInitializer
+ version: ~10.x-0
+ repository: '@local'
+ - name: serviceAccount
+ version: ~10.x-0
+ repository: '@local'
diff --git a/kubernetes/holmes/components/holmes-engine-mgmt/requirements.yaml b/kubernetes/holmes/components/holmes-engine-mgmt/requirements.yaml
deleted file mode 100644
index 2e9004a63b..0000000000
--- a/kubernetes/holmes/components/holmes-engine-mgmt/requirements.yaml
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright © 2018 AT&T, Amdocs, Bell Canada Intellectual Property. All rights reserved.
-# Modifications Copyright © 2021 Orange
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-dependencies:
- - name: common
- version: ~9.x-0
- repository: '@local'
- - name: repositoryGenerator
- version: ~9.x-0
- repository: '@local'
- - name: certInitializer
- version: ~9.x-0
- repository: '@local'
- - name: serviceAccount
- version: ~9.x-0
- repository: '@local'
diff --git a/kubernetes/holmes/components/holmes-engine-mgmt/templates/deployment.yaml b/kubernetes/holmes/components/holmes-engine-mgmt/templates/deployment.yaml
index 45c268c6b6..b625f6d72e 100644
--- a/kubernetes/holmes/components/holmes-engine-mgmt/templates/deployment.yaml
+++ b/kubernetes/holmes/components/holmes-engine-mgmt/templates/deployment.yaml
@@ -30,6 +30,9 @@ spec:
- name: init-consul
image: {{ include "repositoryGenerator.repository" . }}/{{ .Values.consulLoaderImage }}
imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
+ env:
+ - name: CONSUL_HOST
+ value: {{ .Values.consulHost | default "consul-server-ui" }}.{{ include "common.namespace" . }}
args:
- --key
- holmes-engine-mgmt|/hemconfig/cfy.json
diff --git a/kubernetes/holmes/components/holmes-rule-mgmt/Chart.yaml b/kubernetes/holmes/components/holmes-rule-mgmt/Chart.yaml
index f98c78b754..d224e94cb9 100644
--- a/kubernetes/holmes/components/holmes-rule-mgmt/Chart.yaml
+++ b/kubernetes/holmes/components/holmes-rule-mgmt/Chart.yaml
@@ -1,6 +1,6 @@
-# Copyright © 2017 Amdocs, Bell Canada
# Modifications Copyright © 2021 ZTE
# Modifications Copyright © 2021 Orange
+# Modifications Copyright © 2021 Nordix Foundation
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -14,8 +14,22 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-apiVersion: v1
+apiVersion: v2
appVersion: "1.0"
description: Holmes Rule Management
name: holmes-rule-mgmt
-version: 9.0.0
+version: 10.0.0
+
+dependencies:
+ - name: common
+ version: ~10.x-0
+ repository: '@local'
+ - name: repositoryGenerator
+ version: ~10.x-0
+ repository: '@local'
+ - name: certInitializer
+ version: ~10.x-0
+ repository: '@local'
+ - name: serviceAccount
+ version: ~10.x-0
+ repository: '@local'
diff --git a/kubernetes/holmes/components/holmes-rule-mgmt/requirements.yaml b/kubernetes/holmes/components/holmes-rule-mgmt/requirements.yaml
deleted file mode 100644
index 2e9004a63b..0000000000
--- a/kubernetes/holmes/components/holmes-rule-mgmt/requirements.yaml
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright © 2018 AT&T, Amdocs, Bell Canada Intellectual Property. All rights reserved.
-# Modifications Copyright © 2021 Orange
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-dependencies:
- - name: common
- version: ~9.x-0
- repository: '@local'
- - name: repositoryGenerator
- version: ~9.x-0
- repository: '@local'
- - name: certInitializer
- version: ~9.x-0
- repository: '@local'
- - name: serviceAccount
- version: ~9.x-0
- repository: '@local'
diff --git a/kubernetes/holmes/components/holmes-rule-mgmt/templates/deployment.yaml b/kubernetes/holmes/components/holmes-rule-mgmt/templates/deployment.yaml
index d757b75d68..19ccbc0cdc 100644
--- a/kubernetes/holmes/components/holmes-rule-mgmt/templates/deployment.yaml
+++ b/kubernetes/holmes/components/holmes-rule-mgmt/templates/deployment.yaml
@@ -30,6 +30,9 @@ spec:
- name: init-consul
image: {{ include "repositoryGenerator.repository" . }}/{{ .Values.consulLoaderImage }}
imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
+ env:
+ - name: CONSUL_HOST
+ value: {{ .Values.consulHost | default "consul-server-ui" }}.{{ include "common.namespace" . }}
args:
- --key
- holmes-rule-mgmt|/hrmconfigs/cfy.json
diff --git a/kubernetes/holmes/requirements.yaml b/kubernetes/holmes/requirements.yaml
deleted file mode 100644
index f881acdc97..0000000000
--- a/kubernetes/holmes/requirements.yaml
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright © 2018 Amdocs, Bell Canada , ZTE
-# Modifications Copyright © 2021 Orange
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-dependencies:
- - name: common
- version: ~9.x-0
- repository: '@local'
- - name: repositoryGenerator
- version: ~9.x-0
- repository: '@local'
- - name: postgres
- version: ~9.x-0
- repository: '@local'
- condition: global.postgres.localCluster
- - name: postgres-init
- version: ~9.x-0
- repository: '@local'
- condition: not global.postgres.localCluster
- - name: holmes-rule-mgmt
- version: ~9.x-0
- repository: 'file://components/holmes-rule-mgmt'
- - name: holmes-engine-mgmt
- version: ~9.x-0
- repository: 'file://components/holmes-engine-mgmt'
diff --git a/kubernetes/log/Chart.yaml b/kubernetes/log/Chart.yaml
index 0df747020a..7046188fbd 100644
--- a/kubernetes/log/Chart.yaml
+++ b/kubernetes/log/Chart.yaml
@@ -1,6 +1,7 @@
# Copyright © 2017 Amdocs, Bell Canada
# Modifications Copyright © 2018 AT&T
# Modifications Copyright © 2021 Orange
+# Modifications Copyright © 2021 Nordix Foundation
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -14,7 +15,24 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-apiVersion: v1
+apiVersion: v2
description: ONAP Logging ElasticStack
name: log
-version: 9.0.0
+version: 10.0.0
+
+dependencies:
+ - name: common
+ version: ~10.x-0
+ repository: '@local'
+ - name: repositoryGenerator
+ version: ~10.x-0
+ repository: '@local'
+ - name: log-elasticsearch
+ version: ~10.x-0
+ repository: 'file://components/log-elasticsearch'
+ - name: log-kibana
+ version: ~10.x-0
+ repository: 'file://components/log-kibana'
+ - name: log-logstash
+ version: ~10.x-0
+ repository: 'file://components/log-logstash'
diff --git a/kubernetes/log/Makefile b/kubernetes/log/Makefile
index 89b2f465ec..2f6c6fe47c 100644
--- a/kubernetes/log/Makefile
+++ b/kubernetes/log/Makefile
@@ -34,7 +34,7 @@ make-%:
@if [ -f $*/Makefile ]; then make -C $*; fi
dep-%: make-%
- @if [ -f $*/requirements.yaml ]; then $(HELM_BIN) dep up $*; fi
+ @if [ -f $*/Chart.yaml ]; then $(HELM_BIN) dep up $*; fi
lint-%: dep-%
@if [ -f $*/Chart.yaml ]; then $(HELM_BIN) lint $*; fi
@@ -49,7 +49,7 @@ endif
@$(HELM_BIN) repo index $(PACKAGE_DIR)
clean:
- @rm -f */requirements.lock
+ @rm -f */Chart.lock
@rm -f *tgz */charts/*tgz
@rm -rf $(PACKAGE_DIR)
%:
diff --git a/kubernetes/log/components/Makefile b/kubernetes/log/components/Makefile
index d62cb0b700..1688db2d44 100644
--- a/kubernetes/log/components/Makefile
+++ b/kubernetes/log/components/Makefile
@@ -34,7 +34,7 @@ make-%:
@if [ -f $*/Makefile ]; then make -C $*; fi
dep-%: make-%
- @if [ -f $*/requirements.yaml ]; then $(HELM_BIN) dep up $*; fi
+ @if [ -f $*/Chart.yaml ]; then $(HELM_BIN) dep up $*; fi
lint-%: dep-%
@if [ -f $*/Chart.yaml ]; then $(HELM_BIN) lint $*; fi
@@ -49,7 +49,7 @@ endif
@$(HELM_BIN) repo index $(PACKAGE_DIR)
clean:
- @rm -f */requirements.lock
+ @rm -f */Chart.lock
@rm -f *tgz */charts/*tgz
@rm -rf $(PACKAGE_DIR)
%:
diff --git a/kubernetes/log/components/log-elasticsearch/Chart.yaml b/kubernetes/log/components/log-elasticsearch/Chart.yaml
index 719f6ad0a6..39cd8ebfa5 100644
--- a/kubernetes/log/components/log-elasticsearch/Chart.yaml
+++ b/kubernetes/log/components/log-elasticsearch/Chart.yaml
@@ -1,6 +1,7 @@
# Copyright © 2017 Amdocs, Bell Canada
# Modifications Copyright © 2018 AT&T
# Modifications Copyright © 2021 Orange
+# Modifications Copyright © 2021 Nordix Foundation
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -14,7 +15,15 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-apiVersion: v1
+apiVersion: v2
description: ONAP Logging Elasticsearch
name: log-elasticsearch
-version: 9.0.0
+version: 10.0.0
+
+dependencies:
+ - name: common
+ version: ~10.x-0
+ repository: '@local'
+ - name: repositoryGenerator
+ version: ~10.x-0
+ repository: '@local'
diff --git a/kubernetes/log/components/log-elasticsearch/requirements.yaml b/kubernetes/log/components/log-elasticsearch/requirements.yaml
deleted file mode 100644
index c2d6f85118..0000000000
--- a/kubernetes/log/components/log-elasticsearch/requirements.yaml
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright © 2017 Amdocs, Bell Canada
-# Modifications Copyright © 2018 AT&T
-# Modifications Copyright © 2021 Orange
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-dependencies:
- - name: common
- version: ~9.x-0
- repository: '@local'
- - name: repositoryGenerator
- version: ~9.x-0
- repository: '@local'
diff --git a/kubernetes/log/components/log-kibana/Chart.yaml b/kubernetes/log/components/log-kibana/Chart.yaml
index cfa1c88eef..53233a0691 100644
--- a/kubernetes/log/components/log-kibana/Chart.yaml
+++ b/kubernetes/log/components/log-kibana/Chart.yaml
@@ -1,6 +1,7 @@
# Copyright © 2017 Amdocs, Bell Canada
# Modifications Copyright © 2018 AT&T
# Modifications Copyright © 2021 Orange
+# Modifications Copyright © 2021 Nordix Foundation
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -14,7 +15,15 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-apiVersion: v1
+apiVersion: v2
description: ONAP Logging Kibana
name: log-kibana
-version: 9.0.0
+version: 10.0.0
+
+dependencies:
+ - name: common
+ version: ~10.x-0
+ repository: '@local'
+ - name: repositoryGenerator
+ version: ~10.x-0
+ repository: '@local'
diff --git a/kubernetes/log/components/log-kibana/requirements.yaml b/kubernetes/log/components/log-kibana/requirements.yaml
deleted file mode 100644
index c2d6f85118..0000000000
--- a/kubernetes/log/components/log-kibana/requirements.yaml
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright © 2017 Amdocs, Bell Canada
-# Modifications Copyright © 2018 AT&T
-# Modifications Copyright © 2021 Orange
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-dependencies:
- - name: common
- version: ~9.x-0
- repository: '@local'
- - name: repositoryGenerator
- version: ~9.x-0
- repository: '@local'
diff --git a/kubernetes/log/components/log-logstash/Chart.yaml b/kubernetes/log/components/log-logstash/Chart.yaml
index aca2909c4e..143ee1adba 100644
--- a/kubernetes/log/components/log-logstash/Chart.yaml
+++ b/kubernetes/log/components/log-logstash/Chart.yaml
@@ -1,6 +1,7 @@
# Copyright © 2017 Amdocs, Bell Canada
# Modifications Copyright © 2018 AT&T
# Modifications Copyright © 2021 Orange
+# Modifications Copyright © 2021 Nordix Foundation
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -14,7 +15,15 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-apiVersion: v1
+apiVersion: v2
description: ONAP Logging Logstash
name: log-logstash
-version: 9.0.0
+version: 10.0.0
+
+dependencies:
+ - name: common
+ version: ~10.x-0
+ repository: '@local'
+ - name: repositoryGenerator
+ version: ~10.x-0
+ repository: '@local'
diff --git a/kubernetes/log/components/log-logstash/requirements.yaml b/kubernetes/log/components/log-logstash/requirements.yaml
deleted file mode 100644
index c2d6f85118..0000000000
--- a/kubernetes/log/components/log-logstash/requirements.yaml
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright © 2017 Amdocs, Bell Canada
-# Modifications Copyright © 2018 AT&T
-# Modifications Copyright © 2021 Orange
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-dependencies:
- - name: common
- version: ~9.x-0
- repository: '@local'
- - name: repositoryGenerator
- version: ~9.x-0
- repository: '@local'
diff --git a/kubernetes/log/requirements.yaml b/kubernetes/log/requirements.yaml
deleted file mode 100644
index ba744afdab..0000000000
--- a/kubernetes/log/requirements.yaml
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright © 2018 AT&T, Amdocs, Bell Canada Intellectual Property. All rights reserved.
-# Modifications Copyright © 2021 Orange
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-dependencies:
- - name: common
- version: ~9.x-0
- repository: '@local'
- - name: repositoryGenerator
- version: ~9.x-0
- repository: '@local'
- - name: log-elasticsearch
- version: ~9.x-0
- repository: 'file://components/log-elasticsearch'
- - name: log-kibana
- version: ~9.x-0
- repository: 'file://components/log-kibana'
- - name: log-logstash
- version: ~9.x-0
- repository: 'file://components/log-logstash'
diff --git a/kubernetes/modeling/Chart.yaml b/kubernetes/modeling/Chart.yaml
index 7e7be74827..13b398b97f 100644
--- a/kubernetes/modeling/Chart.yaml
+++ b/kubernetes/modeling/Chart.yaml
@@ -1,5 +1,6 @@
# Copyright © 2017 Amdocs, Bell Canada
# Modifications Copyright © 2021 Orange
+# Modifications Copyright © 2021 Nordix Foundation
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -13,7 +14,12 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-apiVersion: v1
+apiVersion: v2
description: ONAP Modeling (Modeling)
name: modeling
-version: 9.0.0
+version: 10.0.0
+
+dependencies:
+ - name: modeling-etsicatalog
+ version: ~10.x-0
+ repository: 'file://components/modeling-etsicatalog'
diff --git a/kubernetes/modeling/Makefile b/kubernetes/modeling/Makefile
index 4c79718d02..51d7de122c 100644
--- a/kubernetes/modeling/Makefile
+++ b/kubernetes/modeling/Makefile
@@ -33,7 +33,7 @@ make-%:
@if [ -f $*/Makefile ]; then make -C $*; fi
dep-%: make-%
- @if [ -f $*/requirements.yaml ]; then $(HELM_BIN) dep up $*; fi
+ @if [ -f $*/Chart.yaml ]; then $(HELM_BIN) dep up $*; fi
lint-%: dep-%
@if [ -f $*/Chart.yaml ]; then $(HELM_BIN) lint $*; fi
@@ -44,7 +44,7 @@ package-%: lint-%
@$(HELM_BIN) repo index $(PACKAGE_DIR)
clean:
- @rm -f */requirements.lock
+ @rm -f */Chart.lock
@rm -f *tgz */charts/*tgz
@rm -rf $(PACKAGE_DIR)
%:
diff --git a/kubernetes/modeling/components/Makefile b/kubernetes/modeling/components/Makefile
index bf267b7720..f4c9784bc4 100644
--- a/kubernetes/modeling/components/Makefile
+++ b/kubernetes/modeling/components/Makefile
@@ -33,7 +33,7 @@ make-%:
@if [ -f $*/Makefile ]; then make -C $*; fi
dep-%: make-%
- @if [ -f $*/requirements.yaml ]; then $(HELM_BIN) dep up $*; fi
+ @if [ -f $*/Chart.yaml ]; then $(HELM_BIN) dep up $*; fi
lint-%: dep-%
@if [ -f $*/Chart.yaml ]; then $(HELM_BIN) lint $*; fi
@@ -44,7 +44,7 @@ package-%: lint-%
@$(HELM_BIN) repo index $(PACKAGE_DIR)
clean:
- @rm -f */requirements.lock
+ @rm -f */Chart.lock
@rm -f *tgz */charts/*tgz
@rm -rf $(PACKAGE_DIR)
%:
diff --git a/kubernetes/modeling/components/modeling-etsicatalog/Chart.yaml b/kubernetes/modeling/components/modeling-etsicatalog/Chart.yaml
index 942915b54e..8825c6fe67 100644
--- a/kubernetes/modeling/components/modeling-etsicatalog/Chart.yaml
+++ b/kubernetes/modeling/components/modeling-etsicatalog/Chart.yaml
@@ -1,5 +1,6 @@
# Copyright © 2017 Amdocs, Bell Canada
# Modifications Copyright © 2021 Orange
+# Modifications Copyright © 2021 Nordix Foundation
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -13,7 +14,29 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-apiVersion: v1
+apiVersion: v2
description: ONAP Modeling - Etsicatalog
name: modeling-etsicatalog
-version: 9.0.0
+version: 10.0.0
+
+dependencies:
+ - name: common
+ version: ~10.x-0
+ repository: '@local'
+ - name: mariadb-galera
+ version: ~10.x-0
+ repository: '@local'
+ condition: global.mariadbGalera.localCluster
+ - name: mariadb-init
+ version: ~10.x-0
+ repository: '@local'
+ condition: not global.mariadbGalera.localCluster
+ - name: readinessCheck
+ version: ~10.x-0
+ repository: '@local'
+ - name: repositoryGenerator
+ version: ~10.x-0
+ repository: '@local'
+ - name: serviceAccount
+ version: ~10.x-0
+ repository: '@local'
diff --git a/kubernetes/modeling/components/modeling-etsicatalog/requirements.yaml b/kubernetes/modeling/components/modeling-etsicatalog/requirements.yaml
deleted file mode 100644
index 686d93619e..0000000000
--- a/kubernetes/modeling/components/modeling-etsicatalog/requirements.yaml
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright © 2020 Samung Electronics
-# Modifications Copyright © 2021 Orange
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-dependencies:
- - name: common
- version: ~9.x-0
- repository: '@local'
- - name: mariadb-galera
- version: ~9.x-0
- repository: '@local'
- condition: global.mariadbGalera.localCluster
- - name: mariadb-init
- version: ~9.x-0
- repository: '@local'
- condition: not global.mariadbGalera.localCluster
- - name: readinessCheck
- version: ~9.x-0
- repository: '@local'
- - name: repositoryGenerator
- version: ~9.x-0
- repository: '@local'
- - name: serviceAccount
- version: ~9.x-0
- repository: '@local'
diff --git a/kubernetes/modeling/requirements.yaml b/kubernetes/modeling/requirements.yaml
deleted file mode 100644
index af247fc556..0000000000
--- a/kubernetes/modeling/requirements.yaml
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright © 2017 Amdocs, Bell Canada
-# Modifications Copyright © 2021 Orange
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-dependencies:
- - name: modeling-etsicatalog
- version: ~9.x-0
- repository: 'file://components/modeling-etsicatalog'
diff --git a/kubernetes/msb/Chart.yaml b/kubernetes/msb/Chart.yaml
index 14eb4d36f9..d21fdf868c 100644
--- a/kubernetes/msb/Chart.yaml
+++ b/kubernetes/msb/Chart.yaml
@@ -1,6 +1,7 @@
# Copyright © 2017 Amdocs, Bell Canada
# Modifications Copyright © 2018 ZTE
# Modifications Copyright © 2021 Orange
+# Modifications Copyright © 2021 Nordix Foundation
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -14,7 +15,31 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-apiVersion: v1
+apiVersion: v2
description: ONAP MicroServices Bus
name: msb
-version: 9.0.0
+version: 10.0.0
+
+dependencies:
+ - name: common
+ version: ~10.x-0
+ repository: '@local'
+ - name: repositoryGenerator
+ version: ~10.x-0
+ repository: '@local'
+ - name: kube2msb
+ version: ~10.x-0
+ repository: 'file://components/kube2msb'
+ - name: msb-consul
+ version: ~10.x-0
+ repository: 'file://components/msb-consul'
+ - name: msb-discovery
+ version: ~10.x-0
+ repository: 'file://components/msb-discovery'
+ - name: msb-eag
+ version: ~10.x-0
+ repository: 'file://components/msb-eag'
+ - name: msb-iag
+ version: ~10.x-0
+ repository: 'file://components/msb-iag'
+
diff --git a/kubernetes/msb/Makefile b/kubernetes/msb/Makefile
index 4c79718d02..51d7de122c 100644
--- a/kubernetes/msb/Makefile
+++ b/kubernetes/msb/Makefile
@@ -33,7 +33,7 @@ make-%:
@if [ -f $*/Makefile ]; then make -C $*; fi
dep-%: make-%
- @if [ -f $*/requirements.yaml ]; then $(HELM_BIN) dep up $*; fi
+ @if [ -f $*/Chart.yaml ]; then $(HELM_BIN) dep up $*; fi
lint-%: dep-%
@if [ -f $*/Chart.yaml ]; then $(HELM_BIN) lint $*; fi
@@ -44,7 +44,7 @@ package-%: lint-%
@$(HELM_BIN) repo index $(PACKAGE_DIR)
clean:
- @rm -f */requirements.lock
+ @rm -f */Chart.lock
@rm -f *tgz */charts/*tgz
@rm -rf $(PACKAGE_DIR)
%:
diff --git a/kubernetes/msb/components/Makefile b/kubernetes/msb/components/Makefile
index bf267b7720..f4c9784bc4 100644
--- a/kubernetes/msb/components/Makefile
+++ b/kubernetes/msb/components/Makefile
@@ -33,7 +33,7 @@ make-%:
@if [ -f $*/Makefile ]; then make -C $*; fi
dep-%: make-%
- @if [ -f $*/requirements.yaml ]; then $(HELM_BIN) dep up $*; fi
+ @if [ -f $*/Chart.yaml ]; then $(HELM_BIN) dep up $*; fi
lint-%: dep-%
@if [ -f $*/Chart.yaml ]; then $(HELM_BIN) lint $*; fi
@@ -44,7 +44,7 @@ package-%: lint-%
@$(HELM_BIN) repo index $(PACKAGE_DIR)
clean:
- @rm -f */requirements.lock
+ @rm -f */Chart.lock
@rm -f *tgz */charts/*tgz
@rm -rf $(PACKAGE_DIR)
%:
diff --git a/kubernetes/msb/components/kube2msb/Chart.yaml b/kubernetes/msb/components/kube2msb/Chart.yaml
index dcafd0545a..c196848dab 100644
--- a/kubernetes/msb/components/kube2msb/Chart.yaml
+++ b/kubernetes/msb/components/kube2msb/Chart.yaml
@@ -1,5 +1,6 @@
# Copyright © 2018 Amdocs, Bell Canada , ZTE
# Modifications Copyright © 2021 Orange
+# Modifications Copyright © 2021 Nordix Foundation
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -12,7 +13,15 @@
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
-apiVersion: v1
+apiVersion: v2
description: ONAP MicroServices Bus Kube2MSB Registrator
name: kube2msb
-version: 9.0.0
+version: 10.0.0
+
+dependencies:
+ - name: common
+ version: ~10.x-0
+ repository: '@local'
+ - name: repositoryGenerator
+ version: ~10.x-0
+ repository: '@local'
diff --git a/kubernetes/msb/components/kube2msb/requirements.yaml b/kubernetes/msb/components/kube2msb/requirements.yaml
deleted file mode 100644
index dfda28d9c9..0000000000
--- a/kubernetes/msb/components/kube2msb/requirements.yaml
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright © 2018 Amdocs, Bell Canada , ZTE
-# Modifications Copyright © 2021 Orange
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-dependencies:
- - name: common
- version: ~9.x-0
- repository: '@local'
- - name: repositoryGenerator
- version: ~9.x-0
- repository: '@local'
-
diff --git a/kubernetes/msb/components/msb-consul/Chart.yaml b/kubernetes/msb/components/msb-consul/Chart.yaml
index 7f8ba44e98..487b5d989c 100644
--- a/kubernetes/msb/components/msb-consul/Chart.yaml
+++ b/kubernetes/msb/components/msb-consul/Chart.yaml
@@ -1,5 +1,6 @@
# Copyright © 2018 Amdocs, Bell Canada , ZTE
# Modifications Copyright © 2021 Orange
+# Modifications Copyright © 2021 Nordix Foundation
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -12,7 +13,18 @@
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
-apiVersion: v1
+apiVersion: v2
description: ONAP MicroServices Bus Consul
name: msb-consul
-version: 9.0.0
+version: 10.0.0
+
+dependencies:
+ - name: common
+ version: ~10.x-0
+ repository: '@local'
+ - name: repositoryGenerator
+ version: ~10.x-0
+ repository: '@local'
+ - name: serviceAccount
+ version: ~10.x-0
+ repository: '@local'
diff --git a/kubernetes/msb/components/msb-consul/requirements.yaml b/kubernetes/msb/components/msb-consul/requirements.yaml
deleted file mode 100644
index ca01ea6e9d..0000000000
--- a/kubernetes/msb/components/msb-consul/requirements.yaml
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright © 2018 Amdocs, Bell Canada , ZTE
-# Modifications Copyright © 2021 Orange
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-dependencies:
- - name: common
- version: ~9.x-0
- repository: '@local'
- - name: repositoryGenerator
- version: ~9.x-0
- repository: '@local'
- - name: serviceAccount
- version: ~9.x-0
- repository: '@local'
diff --git a/kubernetes/msb/components/msb-discovery/Chart.yaml b/kubernetes/msb/components/msb-discovery/Chart.yaml
index 4bb3e2b92f..cece1823d4 100644
--- a/kubernetes/msb/components/msb-discovery/Chart.yaml
+++ b/kubernetes/msb/components/msb-discovery/Chart.yaml
@@ -1,5 +1,6 @@
# Copyright © 2018 Amdocs, Bell Canada , ZTE
# Modifications Copyright © 2021 Orange
+# Modifications Copyright © 2021 Nordix Foundation
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -12,7 +13,18 @@
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
-apiVersion: v1
+apiVersion: v2
description: ONAP MicroServices Bus Discovery
name: msb-discovery
-version: 9.0.0
+version: 10.0.0
+
+dependencies:
+ - name: common
+ version: ~10.x-0
+ repository: '@local'
+ - name: repositoryGenerator
+ version: ~10.x-0
+ repository: '@local'
+ - name: serviceAccount
+ version: ~10.x-0
+ repository: '@local'
diff --git a/kubernetes/msb/components/msb-discovery/requirements.yaml b/kubernetes/msb/components/msb-discovery/requirements.yaml
deleted file mode 100644
index ca01ea6e9d..0000000000
--- a/kubernetes/msb/components/msb-discovery/requirements.yaml
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright © 2018 Amdocs, Bell Canada , ZTE
-# Modifications Copyright © 2021 Orange
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-dependencies:
- - name: common
- version: ~9.x-0
- repository: '@local'
- - name: repositoryGenerator
- version: ~9.x-0
- repository: '@local'
- - name: serviceAccount
- version: ~9.x-0
- repository: '@local'
diff --git a/kubernetes/msb/components/msb-discovery/templates/deployment.yaml b/kubernetes/msb/components/msb-discovery/templates/deployment.yaml
index 00d91fe646..d9f902be4d 100644
--- a/kubernetes/msb/components/msb-discovery/templates/deployment.yaml
+++ b/kubernetes/msb/components/msb-discovery/templates/deployment.yaml
@@ -92,30 +92,13 @@ spec:
{{- end }}
# Filebeat sidecar container
- - name: {{ include "common.name" . }}-filebeat-onap
- image: {{ include "repositoryGenerator.image.logging" . }}
- imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
- volumeMounts:
- - name: {{ include "common.fullname" . }}-filebeat-conf
- mountPath: /usr/share/filebeat/filebeat.yml
- subPath: filebeat.yml
- - name: {{ include "common.fullname" . }}-data-filebeat
- mountPath: /usr/share/filebeat/data
- - name: {{ include "common.fullname" . }}-logs
- mountPath: /var/log/onap/msb/msb-discovery
- - mountPath: /opt/ajsc/etc/config/logback.xml
- name: {{ include "common.fullname" . }}-log-conf
- subPath: logback.xml
+ {{ include "common.log.sidecar" . | nindent 8 }}
serviceAccountName: {{ include "common.fullname" (dict "suffix" "read" "dot" . )}}
volumes:
- name: {{ include "common.fullname" . }}-log-conf
configMap:
name: {{ include "common.fullname" . }}-log
- - name: {{ include "common.fullname" . }}-filebeat-conf
- configMap:
- name: {{ include "common.release" . }}-msb-filebeat-configmap
- - name: {{ include "common.fullname" . }}-data-filebeat
- emptyDir: {}
+ {{ include "common.log.volumes" (dict "dot" . "configMapNamePrefix" (tpl .Values.logConfigMapNamePrefix . )) | nindent 8 }}
- name: {{ include "common.fullname" . }}-logs
emptyDir: {}
- name: localtime
diff --git a/kubernetes/msb/components/msb-discovery/values.yaml b/kubernetes/msb/components/msb-discovery/values.yaml
index e9800233e3..2d18d14532 100644
--- a/kubernetes/msb/components/msb-discovery/values.yaml
+++ b/kubernetes/msb/components/msb-discovery/values.yaml
@@ -88,3 +88,8 @@ serviceAccount:
nameOverride: msb-discovery
roles:
- read
+
+#Logs configuration
+log:
+ path: /var/log/onap
+logConfigMapNamePrefix: '{{ include "common.fullname" . }}'
diff --git a/kubernetes/msb/components/msb-eag/Chart.yaml b/kubernetes/msb/components/msb-eag/Chart.yaml
index bdb7498098..7a8d65e651 100644
--- a/kubernetes/msb/components/msb-eag/Chart.yaml
+++ b/kubernetes/msb/components/msb-eag/Chart.yaml
@@ -1,5 +1,6 @@
# Copyright © 2018 Amdocs, Bell Canada , ZTE
# Modifications Copyright © 2021 Orange
+# Modifications Copyright © 2021 Nordix Foundation
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -12,7 +13,21 @@
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
-apiVersion: v1
+apiVersion: v2
description: ONAP MicroServices Bus Internal API Gateway
name: msb-eag
-version: 9.0.0
+version: 10.0.0
+
+dependencies:
+ - name: common
+ version: ~10.x-0
+ repository: '@local'
+ - name: repositoryGenerator
+ version: ~10.x-0
+ repository: '@local'
+ - name: certInitializer
+ version: ~10.x-0
+ repository: '@local'
+ - name: serviceAccount
+ version: ~10.x-0
+ repository: '@local'
diff --git a/kubernetes/msb/components/msb-eag/requirements.yaml b/kubernetes/msb/components/msb-eag/requirements.yaml
deleted file mode 100644
index a4fb34c5a6..0000000000
--- a/kubernetes/msb/components/msb-eag/requirements.yaml
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright © 2018 Amdocs, Bell Canada , ZTE
-# Copyright © 2021 Orange
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-dependencies:
- - name: common
- version: ~9.x-0
- repository: '@local'
- - name: repositoryGenerator
- version: ~9.x-0
- repository: '@local'
- - name: certInitializer
- version: ~9.x-0
- repository: '@local'
- - name: serviceAccount
- version: ~9.x-0
- repository: '@local'
diff --git a/kubernetes/msb/components/msb-eag/templates/deployment.yaml b/kubernetes/msb/components/msb-eag/templates/deployment.yaml
index c30fc343de..db24152026 100644
--- a/kubernetes/msb/components/msb-eag/templates/deployment.yaml
+++ b/kubernetes/msb/components/msb-eag/templates/deployment.yaml
@@ -104,20 +104,7 @@ spec:
{{ toYaml .Values.affinity | indent 10 }}
{{- end }}
# side car containers
- - name: filebeat-onap
- image: {{ include "repositoryGenerator.image.logging" . }}
- imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
- volumeMounts:
- - name: {{ include "common.fullname" . }}-filebeat-conf
- mountPath: /usr/share/filebeat/filebeat.yml
- subPath: filebeat.yml
- - name: {{ include "common.fullname" . }}-data-filebeat
- mountPath: /usr/share/filebeat/data
- - name: {{ include "common.fullname" . }}-logs
- mountPath: /var/log/onap/msb/msb-eag
- - mountPath: /opt/ajsc/etc/config/logback.xml
- name: {{ include "common.fullname" . }}-log-conf
- subPath: logback.xml
+ {{ include "common.log.sidecar" . | nindent 8 }}
serviceAccountName: {{ include "common.fullname" (dict "suffix" "read" "dot" . )}}
volumes:
{{ include "common.certInitializer.volumes" . | indent 8 | trim }}
@@ -127,11 +114,7 @@ spec:
- name: {{ include "common.fullname" . }}-nginx-conf
configMap:
name: {{ include "common.fullname" . }}-nginx
- - name: {{ include "common.fullname" . }}-filebeat-conf
- configMap:
- name: {{ include "common.release" . }}-msb-filebeat-configmap
- - name: {{ include "common.fullname" . }}-data-filebeat
- emptyDir: {}
+ {{ include "common.log.volumes" (dict "dot" . "configMapNamePrefix" (tpl .Values.logConfigMapNamePrefix . )) | nindent 8 }}
- name: {{ include "common.fullname" . }}-logs
emptyDir: {}
- name: localtime
diff --git a/kubernetes/msb/components/msb-eag/values.yaml b/kubernetes/msb/components/msb-eag/values.yaml
index 9345341437..565ff1fe3e 100644
--- a/kubernetes/msb/components/msb-eag/values.yaml
+++ b/kubernetes/msb/components/msb-eag/values.yaml
@@ -122,3 +122,8 @@ serviceAccount:
nameOverride: msb-eag
roles:
- read
+
+#Logs configuration
+log:
+ path: /var/log/onap
+logConfigMapNamePrefix: '{{ include "common.fullname" . }}'
diff --git a/kubernetes/msb/components/msb-iag/Chart.yaml b/kubernetes/msb/components/msb-iag/Chart.yaml
index 38872ab262..80f5794411 100644
--- a/kubernetes/msb/components/msb-iag/Chart.yaml
+++ b/kubernetes/msb/components/msb-iag/Chart.yaml
@@ -1,5 +1,6 @@
# Copyright © 2018 Amdocs, Bell Canada , ZTE
# Modifications Copyright © 2021 Orange
+# Modifications Copyright © 2021 Nordix Foundation
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -12,7 +13,21 @@
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
-apiVersion: v1
+apiVersion: v2
description: ONAP MicroServices Bus Internal API Gateway
name: msb-iag
-version: 9.0.0
+version: 10.0.0
+
+dependencies:
+ - name: common
+ version: ~10.x-0
+ repository: '@local'
+ - name: repositoryGenerator
+ version: ~10.x-0
+ repository: '@local'
+ - name: certInitializer
+ version: ~10.x-0
+ repository: '@local'
+ - name: serviceAccount
+ version: ~10.x-0
+ repository: '@local'
diff --git a/kubernetes/msb/components/msb-iag/requirements.yaml b/kubernetes/msb/components/msb-iag/requirements.yaml
deleted file mode 100644
index a4fb34c5a6..0000000000
--- a/kubernetes/msb/components/msb-iag/requirements.yaml
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright © 2018 Amdocs, Bell Canada , ZTE
-# Copyright © 2021 Orange
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-dependencies:
- - name: common
- version: ~9.x-0
- repository: '@local'
- - name: repositoryGenerator
- version: ~9.x-0
- repository: '@local'
- - name: certInitializer
- version: ~9.x-0
- repository: '@local'
- - name: serviceAccount
- version: ~9.x-0
- repository: '@local'
diff --git a/kubernetes/msb/components/msb-iag/templates/deployment.yaml b/kubernetes/msb/components/msb-iag/templates/deployment.yaml
index 2a855c713f..db24152026 100644
--- a/kubernetes/msb/components/msb-iag/templates/deployment.yaml
+++ b/kubernetes/msb/components/msb-iag/templates/deployment.yaml
@@ -104,20 +104,7 @@ spec:
{{ toYaml .Values.affinity | indent 10 }}
{{- end }}
# side car containers
- - name: filebeat-onap
- image: {{ include "repositoryGenerator.image.logging" . }}
- imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
- volumeMounts:
- - name: {{ include "common.fullname" . }}-filebeat-conf
- mountPath: /usr/share/filebeat/filebeat.yml
- subPath: filebeat.yml
- - name: {{ include "common.fullname" . }}-data-filebeat
- mountPath: /usr/share/filebeat/data
- - name: {{ include "common.fullname" . }}-logs
- mountPath: /var/log/onap/msb/msb-iag
- - mountPath: /opt/ajsc/etc/config/logback.xml
- name: {{ include "common.fullname" . }}-log-conf
- subPath: logback.xml
+ {{ include "common.log.sidecar" . | nindent 8 }}
serviceAccountName: {{ include "common.fullname" (dict "suffix" "read" "dot" . )}}
volumes:
{{ include "common.certInitializer.volumes" . | indent 8 | trim }}
@@ -127,11 +114,7 @@ spec:
- name: {{ include "common.fullname" . }}-nginx-conf
configMap:
name: {{ include "common.fullname" . }}-nginx
- - name: {{ include "common.fullname" . }}-filebeat-conf
- configMap:
- name: {{ include "common.release" . }}-msb-filebeat-configmap
- - name: {{ include "common.fullname" . }}-data-filebeat
- emptyDir: {}
+ {{ include "common.log.volumes" (dict "dot" . "configMapNamePrefix" (tpl .Values.logConfigMapNamePrefix . )) | nindent 8 }}
- name: {{ include "common.fullname" . }}-logs
emptyDir: {}
- name: localtime
diff --git a/kubernetes/msb/components/msb-iag/values.yaml b/kubernetes/msb/components/msb-iag/values.yaml
index 21f22dd3ac..ca4935e471 100644
--- a/kubernetes/msb/components/msb-iag/values.yaml
+++ b/kubernetes/msb/components/msb-iag/values.yaml
@@ -123,3 +123,8 @@ serviceAccount:
nameOverride: msb-iag
roles:
- read
+
+#Logs configuration
+log:
+ path: /var/log/onap
+logConfigMapNamePrefix: '{{ include "common.fullname" . }}'
diff --git a/kubernetes/msb/requirements.yaml b/kubernetes/msb/requirements.yaml
deleted file mode 100644
index 3adce0f987..0000000000
--- a/kubernetes/msb/requirements.yaml
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright © 2018 Amdocs, Bell Canada , ZTE
-# Copyright © 2020-2021 Orange
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-dependencies:
- - name: common
- version: ~9.x-0
- repository: '@local'
- - name: repositoryGenerator
- version: ~9.x-0
- repository: '@local'
- - name: kube2msb
- version: ~9.x-0
- repository: 'file://components/kube2msb'
- - name: msb-consul
- version: ~9.x-0
- repository: 'file://components/msb-consul'
- - name: msb-discovery
- version: ~9.x-0
- repository: 'file://components/msb-discovery'
- - name: msb-eag
- version: ~9.x-0
- repository: 'file://components/msb-eag'
- - name: msb-iag
- version: ~9.x-0
- repository: 'file://components/msb-iag'
diff --git a/kubernetes/msb/templates/configmap.yaml b/kubernetes/msb/templates/configmap.yaml
index 52714297fb..385a37f9ea 100644
--- a/kubernetes/msb/templates/configmap.yaml
+++ b/kubernetes/msb/templates/configmap.yaml
@@ -13,10 +13,4 @@
# See the License for the specific language governing permissions and
# limitations under the License.
*/}}
-apiVersion: v1
-kind: ConfigMap
-metadata:
- name: {{ include "common.release" . }}-msb-filebeat-configmap
- namespace: {{ include "common.namespace" . }}
-data:
-{{ tpl (.Files.Glob "resources/config/log/filebeat/filebeat.yml").AsConfig . | indent 2 }}
+{{ include "common.log.configMap" . }}
diff --git a/kubernetes/msb/values.yaml b/kubernetes/msb/values.yaml
index 5d3ffe0d6c..4f1b659f1e 100644
--- a/kubernetes/msb/values.yaml
+++ b/kubernetes/msb/values.yaml
@@ -18,8 +18,16 @@
#################################################################
global:
nodePortPrefix: 302
+ centralizedLoggingEnabled: true
# application configuration
config:
logstashServiceName: log-ls
logstashPort: 5044
+
+msb-discovery:
+ logConfigMapNamePrefix: '{{ include "common.release" . }}-msb'
+msb-eag:
+ logConfigMapNamePrefix: '{{ include "common.release" . }}-msb'
+msb-iag:
+ logConfigMapNamePrefix: '{{ include "common.release" . }}-msb'
diff --git a/kubernetes/multicloud/Chart.yaml b/kubernetes/multicloud/Chart.yaml
index ff43734f85..07fac6038e 100644
--- a/kubernetes/multicloud/Chart.yaml
+++ b/kubernetes/multicloud/Chart.yaml
@@ -1,6 +1,7 @@
# Copyright © 2017 Amdocs, Bell Canada
# Modifications Copyright © 2018 AT&T
# Modifications Copyright © 2021 Orange
+# Modifications Copyright © 2021 Nordix Foundation
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -14,7 +15,46 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-apiVersion: v1
+apiVersion: v2
description: ONAP multicloud broker
name: multicloud
-version: 9.0.0
+version: 10.0.0
+
+dependencies:
+ - name: common
+ version: ~10.x-0
+ repository: '@local'
+ - name: repositoryGenerator
+ version: ~10.x-0
+ repository: '@local'
+ - name: multicloud-fcaps
+ version: ~10.x-0
+ repository: 'file://components/multicloud-fcaps'
+ condition: multicloud-fcaps.enabled
+ - name: multicloud-k8s
+ version: ~10.x-0
+ repository: 'file://components/multicloud-k8s'
+ condition: multicloud-k8s.enabled
+ - name: multicloud-pike
+ version: ~10.x-0
+ repository: 'file://components/multicloud-pike'
+ condition: multicloud-pike.enabled
+ - name: multicloud-prometheus
+ version: ~10.x-0
+ repository: 'file://components/multicloud-prometheus'
+ condition: multicloud-prometheus.enabled
+ - name: multicloud-starlingx
+ version: ~10.x-0
+ repository: 'file://components/multicloud-starlingx'
+ condition: multicloud-starlingx.enabled
+ - name: multicloud-vio
+ version: ~10.x-0
+ repository: 'file://components/multicloud-vio'
+ condition: multicloud-vio.enabled
+ - name: multicloud-windriver
+ version: ~10.x-0
+ repository: 'file://components/multicloud-windriver'
+ condition: multicloud-windriver.enabled
+ - name: serviceAccount
+ version: ~10.x-0
+ repository: '@local'
diff --git a/kubernetes/multicloud/Makefile b/kubernetes/multicloud/Makefile
index 4c79718d02..51d7de122c 100644
--- a/kubernetes/multicloud/Makefile
+++ b/kubernetes/multicloud/Makefile
@@ -33,7 +33,7 @@ make-%:
@if [ -f $*/Makefile ]; then make -C $*; fi
dep-%: make-%
- @if [ -f $*/requirements.yaml ]; then $(HELM_BIN) dep up $*; fi
+ @if [ -f $*/Chart.yaml ]; then $(HELM_BIN) dep up $*; fi
lint-%: dep-%
@if [ -f $*/Chart.yaml ]; then $(HELM_BIN) lint $*; fi
@@ -44,7 +44,7 @@ package-%: lint-%
@$(HELM_BIN) repo index $(PACKAGE_DIR)
clean:
- @rm -f */requirements.lock
+ @rm -f */Chart.lock
@rm -f *tgz */charts/*tgz
@rm -rf $(PACKAGE_DIR)
%:
diff --git a/kubernetes/multicloud/components/Makefile b/kubernetes/multicloud/components/Makefile
index f2e7a1fb82..1ea8433a9c 100644
--- a/kubernetes/multicloud/components/Makefile
+++ b/kubernetes/multicloud/components/Makefile
@@ -33,7 +33,7 @@ make-%:
@if [ -f $*/Makefile ]; then make -C $*; fi
dep-%: make-%
- @if [ -f $*/requirements.yaml ]; then $(HELM_BIN) dep up $*; fi
+ @if [ -f $*/Chart.yaml ]; then $(HELM_BIN) dep up $*; fi
lint-%: dep-%
@if [ -f $*/Chart.yaml ]; then $(HELM_BIN) lint $*; fi
@@ -44,7 +44,7 @@ package-%: lint-%
@$(HELM_BIN) repo index $(PACKAGE_DIR)
clean:
- @rm -f */requirements.lock
+ @rm -f */Chart.lock
@rm -f *tgz */charts/*tgz
@rm -rf $(PACKAGE_DIR)
%:
diff --git a/kubernetes/multicloud/components/multicloud-fcaps/Chart.yaml b/kubernetes/multicloud/components/multicloud-fcaps/Chart.yaml
index 1b55afc74c..7a49ed33a7 100644
--- a/kubernetes/multicloud/components/multicloud-fcaps/Chart.yaml
+++ b/kubernetes/multicloud/components/multicloud-fcaps/Chart.yaml
@@ -13,7 +13,18 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-apiVersion: v1
+apiVersion: v2
description: ONAP multicloud OpenStack fcaps Plugin
name: multicloud-fcaps
-version: 9.0.0
+version: 10.0.0
+
+dependencies:
+ - name: common
+ version: ~10.x-0
+ repository: '@local'
+ - name: repositoryGenerator
+ version: ~10.x-0
+ repository: '@local'
+ - name: serviceAccount
+ version: ~10.x-0
+ repository: '@local'
diff --git a/kubernetes/multicloud/components/multicloud-fcaps/requirements.yaml b/kubernetes/multicloud/components/multicloud-fcaps/requirements.yaml
deleted file mode 100644
index 27373df61e..0000000000
--- a/kubernetes/multicloud/components/multicloud-fcaps/requirements.yaml
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright © 2017 Amdocs, Bell Canada
-# Modifications Copyright © 2018 AT&T
-# Modifications Copyright © 2021 Orange
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-dependencies:
- - name: common
- version: ~9.x-0
- repository: '@local'
- - name: repositoryGenerator
- version: ~9.x-0
- repository: '@local'
- - name: serviceAccount
- version: ~9.x-0
- repository: '@local'
diff --git a/kubernetes/multicloud/components/multicloud-fcaps/templates/deployment.yaml b/kubernetes/multicloud/components/multicloud-fcaps/templates/deployment.yaml
index b438bf0066..fc46a65052 100644
--- a/kubernetes/multicloud/components/multicloud-fcaps/templates/deployment.yaml
+++ b/kubernetes/multicloud/components/multicloud-fcaps/templates/deployment.yaml
@@ -60,7 +60,7 @@ spec:
value: "{{ .Values.config.ssl_enabled }}"
name: {{ include "common.name" . }}
volumeMounts:
- - mountPath: /var/log/onap
+ - mountPath: "{{ .Values.log.path }}"
name: fcaps-log
- mountPath: /opt/fcaps/fcaps/pub/config/log.yml
name: fcaps-logconfig
@@ -86,17 +86,7 @@ spec:
failureThreshold: {{ .Values.liveness.failureThreshold }}
{{ end }}
# side car containers
- - image: {{ include "repositoryGenerator.image.logging" . }}
- imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
- name: filebeat-onap
- volumeMounts:
- - mountPath: /usr/share/filebeat/filebeat.yml
- name: filebeat-conf
- subPath: filebeat.yml
- - mountPath: /var/log/onap
- name: fcaps-log
- - mountPath: /usr/share/filebeat/data
- name: fcaps-data-filebeat
+ {{ include "common.log.sidecar" . | nindent 5 }}
- image: {{ include "repositoryGenerator.repository" . }}/{{ .Values.rabbitmq }}
imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
name: rabbit-mq
@@ -104,11 +94,7 @@ spec:
volumes:
- name: fcaps-log
emptyDir: {}
- - name: fcaps-data-filebeat
- emptyDir: {}
- - name: filebeat-conf
- configMap:
- name: multicloud-filebeat-configmap
+ {{ include "common.log.volumes" (dict "dot" . "configMapNamePrefix" (tpl .Values.logConfigMapNamePrefix . )) | nindent 5 }}
- name: fcaps-logconfig
configMap:
name: {{ include "common.fullname" . }}-log-configmap
diff --git a/kubernetes/multicloud/components/multicloud-fcaps/values.yaml b/kubernetes/multicloud/components/multicloud-fcaps/values.yaml
index 39ddbae5b7..b664498eb8 100644
--- a/kubernetes/multicloud/components/multicloud-fcaps/values.yaml
+++ b/kubernetes/multicloud/components/multicloud-fcaps/values.yaml
@@ -95,3 +95,8 @@ serviceAccount:
nameOverride: multicloud-fcaps
roles:
- read
+
+#Log configuration
+log:
+ path: /var/log/onap
+logConfigMapNamePrefix: '{{ include "common.fullname" . }}'
diff --git a/kubernetes/multicloud/components/multicloud-k8s/Chart.yaml b/kubernetes/multicloud/components/multicloud-k8s/Chart.yaml
index 813ed1b474..278f9d05d3 100644
--- a/kubernetes/multicloud/components/multicloud-k8s/Chart.yaml
+++ b/kubernetes/multicloud/components/multicloud-k8s/Chart.yaml
@@ -1,5 +1,6 @@
# Copyright 2019 Intel Corporation, Inc
# Modifications Copyright © 2021 Orange
+# Modifications Copyright © 2021 Nordix Foundation
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -13,7 +14,27 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-apiVersion: v1
+apiVersion: v2
description: ONAP Multicloud Kubernetes Plugin
name: multicloud-k8s
-version: 9.0.0
+version: 10.0.0
+
+dependencies:
+ - name: common
+ version: ~10.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: ~10.x-0
+ repository: '@local'
+ - name: etcd
+ version: ~10.x-0
+ repository: '@local'
+ - name: repositoryGenerator
+ version: ~10.x-0
+ repository: '@local'
+ - name: serviceAccount
+ version: ~10.x-0
+ repository: '@local'
diff --git a/kubernetes/multicloud/components/multicloud-k8s/requirements.yaml b/kubernetes/multicloud/components/multicloud-k8s/requirements.yaml
deleted file mode 100644
index eebca63b29..0000000000
--- a/kubernetes/multicloud/components/multicloud-k8s/requirements.yaml
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 2019 Intel Corporation, Inc
-# Modifications Copyright © 2021 Orange
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-dependencies:
- - name: common
- version: ~9.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: ~9.x-0
- repository: '@local'
- - name: etcd
- version: ~9.x-0
- repository: '@local'
- - name: repositoryGenerator
- version: ~9.x-0
- repository: '@local'
- - name: serviceAccount
- version: ~9.x-0
- repository: '@local'
diff --git a/kubernetes/multicloud/components/multicloud-pike/Chart.yaml b/kubernetes/multicloud/components/multicloud-pike/Chart.yaml
index e150ef335b..3bf3a95c94 100644
--- a/kubernetes/multicloud/components/multicloud-pike/Chart.yaml
+++ b/kubernetes/multicloud/components/multicloud-pike/Chart.yaml
@@ -1,5 +1,6 @@
# Copyright (c) 2018 Intel Corporation.
# Modifications Copyright © 2021 Orange
+# Modifications Copyright © 2021 Nordix Foundation
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -13,7 +14,18 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-apiVersion: v1
+apiVersion: v2
description: ONAP multicloud OpenStack Pike Plugin
name: multicloud-pike
-version: 9.0.0
+version: 10.0.0
+
+dependencies:
+ - name: common
+ version: ~10.x-0
+ repository: '@local'
+ - name: repositoryGenerator
+ version: ~10.x-0
+ repository: '@local'
+ - name: serviceAccount
+ version: ~10.x-0
+ repository: '@local'
diff --git a/kubernetes/multicloud/components/multicloud-pike/requirements.yaml b/kubernetes/multicloud/components/multicloud-pike/requirements.yaml
deleted file mode 100644
index 27373df61e..0000000000
--- a/kubernetes/multicloud/components/multicloud-pike/requirements.yaml
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright © 2017 Amdocs, Bell Canada
-# Modifications Copyright © 2018 AT&T
-# Modifications Copyright © 2021 Orange
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-dependencies:
- - name: common
- version: ~9.x-0
- repository: '@local'
- - name: repositoryGenerator
- version: ~9.x-0
- repository: '@local'
- - name: serviceAccount
- version: ~9.x-0
- repository: '@local'
diff --git a/kubernetes/multicloud/components/multicloud-pike/templates/deployment.yaml b/kubernetes/multicloud/components/multicloud-pike/templates/deployment.yaml
index d12e663236..ebebaace3c 100644
--- a/kubernetes/multicloud/components/multicloud-pike/templates/deployment.yaml
+++ b/kubernetes/multicloud/components/multicloud-pike/templates/deployment.yaml
@@ -60,7 +60,7 @@ spec:
value: "{{ .Values.config.ssl_enabled }}"
name: {{ include "common.name" . }}
volumeMounts:
- - mountPath: /var/log/onap
+ - mountPath: "{{ .Values.log.path }}"
name: pike-log
- mountPath: /opt/pike/pike/pub/config/log.yml
name: pike-logconfig
@@ -88,26 +88,12 @@ spec:
failureThreshold: {{ .Values.liveness.failureThreshold }}
{{ end }}
# side car containers
- - image: {{ include "repositoryGenerator.image.logging" . }}
- imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
- name: filebeat-onap
- volumeMounts:
- - mountPath: /usr/share/filebeat/filebeat.yml
- name: filebeat-conf
- subPath: filebeat.yml
- - mountPath: /var/log/onap
- name: pike-log
- - mountPath: /usr/share/filebeat/data
- name: pike-data-filebeat
+ {{ include "common.log.sidecar" . | nindent 5 }}
serviceAccountName: {{ include "common.fullname" (dict "suffix" "read" "dot" . )}}
volumes:
- name: pike-log
emptyDir: {}
- - name: pike-data-filebeat
- emptyDir: {}
- - name: filebeat-conf
- configMap:
- name: multicloud-filebeat-configmap
+ {{ include "common.log.volumes" (dict "dot" . "configMapNamePrefix" (tpl .Values.logConfigMapNamePrefix .)) | nindent 5 }}
- name: pike-logconfig
configMap:
name: {{ include "common.fullname" . }}-log-configmap
diff --git a/kubernetes/multicloud/components/multicloud-pike/values.yaml b/kubernetes/multicloud/components/multicloud-pike/values.yaml
index 5ef87f46b6..45c73099dd 100644
--- a/kubernetes/multicloud/components/multicloud-pike/values.yaml
+++ b/kubernetes/multicloud/components/multicloud-pike/values.yaml
@@ -92,3 +92,8 @@ serviceAccount:
nameOverride: multicloud-pike
roles:
- read
+
+#Log configuration
+log:
+ path: /var/log/onap
+logConfigMapNamePrefix: '{{ include "common.fullname" . }}'
diff --git a/kubernetes/multicloud/components/multicloud-prometheus/Chart.yaml b/kubernetes/multicloud/components/multicloud-prometheus/Chart.yaml
index f1e00cdbeb..7af1a67d9a 100644
--- a/kubernetes/multicloud/components/multicloud-prometheus/Chart.yaml
+++ b/kubernetes/multicloud/components/multicloud-prometheus/Chart.yaml
@@ -1,5 +1,6 @@
# Copyright 2018 Intel Corporation, Inc
# Modifications Copyright © 2021 Orange
+# Modifications Copyright © 2021 Nordix Foundation
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -13,7 +14,24 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-apiVersion: v1
+apiVersion: v2
description: ONAP Multicloud Prometheus
name: multicloud-prometheus
-version: 9.0.0
+version: 10.0.0
+
+dependencies:
+ - name: common
+ version: ~10.x-0
+ repository: '@local'
+ - name: repositoryGenerator
+ version: ~10.x-0
+ repository: '@local'
+ - name: prometheus-alertmanager
+ version: ~10.x-0
+ repository: 'file://components/prometheus-alertmanager'
+ - name: prometheus-grafana
+ version: ~10.x-0
+ repository: 'file://components/prometheus-grafana'
+ - name: serviceAccount
+ version: ~10.x-0
+ repository: '@local'
diff --git a/kubernetes/multicloud/components/multicloud-prometheus/components/prometheus-alertmanager/Chart.yaml b/kubernetes/multicloud/components/multicloud-prometheus/components/prometheus-alertmanager/Chart.yaml
index 16a126acad..e2b3a265c7 100644
--- a/kubernetes/multicloud/components/multicloud-prometheus/components/prometheus-alertmanager/Chart.yaml
+++ b/kubernetes/multicloud/components/multicloud-prometheus/components/prometheus-alertmanager/Chart.yaml
@@ -13,7 +13,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-apiVersion: v1
+apiVersion: v2
description: ONAP Multicloud Prometheus Alert Manager
name: prometheus-alertmanager
-version: 9.0.0
+version: 10.0.0
diff --git a/kubernetes/multicloud/components/multicloud-prometheus/components/prometheus-grafana/Chart.yaml b/kubernetes/multicloud/components/multicloud-prometheus/components/prometheus-grafana/Chart.yaml
index a6df6e1002..cf8cfc5633 100644
--- a/kubernetes/multicloud/components/multicloud-prometheus/components/prometheus-grafana/Chart.yaml
+++ b/kubernetes/multicloud/components/multicloud-prometheus/components/prometheus-grafana/Chart.yaml
@@ -13,7 +13,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-apiVersion: v1
+apiVersion: v2
description: ONAP Multicloud Grafana for Prometheus
name: prometheus-grafana
-version: 9.0.0
+version: 10.0.0
diff --git a/kubernetes/multicloud/components/multicloud-prometheus/requirements.yaml b/kubernetes/multicloud/components/multicloud-prometheus/requirements.yaml
deleted file mode 100644
index eb40843bf1..0000000000
--- a/kubernetes/multicloud/components/multicloud-prometheus/requirements.yaml
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright © 2017 Amdocs, Bell Canada
-# Modifications Copyright © 2018 AT&T
-# Modifications Copyright © 2021 Orange
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-dependencies:
- - name: common
- version: ~9.x-0
- repository: '@local'
- - name: repositoryGenerator
- version: ~9.x-0
- repository: '@local'
- - name: prometheus-alertmanager
- version: ~9.x-0
- repository: 'file://components/prometheus-alertmanager'
- - name: prometheus-grafana
- version: ~9.x-0
- repository: 'file://components/prometheus-grafana'
- - name: serviceAccount
- version: ~9.x-0
- repository: '@local'
diff --git a/kubernetes/multicloud/components/multicloud-starlingx/Chart.yaml b/kubernetes/multicloud/components/multicloud-starlingx/Chart.yaml
index 17e33efd4c..9b49b71c63 100644
--- a/kubernetes/multicloud/components/multicloud-starlingx/Chart.yaml
+++ b/kubernetes/multicloud/components/multicloud-starlingx/Chart.yaml
@@ -1,5 +1,6 @@
# Copyright (c) 2019 Intel Corporation.
# Modifications Copyright © 2021 Orange
+# Modifications Copyright © 2021 Nordix Foundation
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -13,7 +14,18 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-apiVersion: v1
+apiVersion: v2
description: ONAP multicloud OpenStack Starlingx Plugin
name: multicloud-starlingx
-version: 9.0.0
+version: 10.0.0
+
+dependencies:
+ - name: common
+ version: ~10.x-0
+ repository: '@local'
+ - name: repositoryGenerator
+ version: ~10.x-0
+ repository: '@local'
+ - name: serviceAccount
+ version: ~10.x-0
+ repository: '@local'
diff --git a/kubernetes/multicloud/components/multicloud-starlingx/requirements.yaml b/kubernetes/multicloud/components/multicloud-starlingx/requirements.yaml
deleted file mode 100644
index 27373df61e..0000000000
--- a/kubernetes/multicloud/components/multicloud-starlingx/requirements.yaml
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright © 2017 Amdocs, Bell Canada
-# Modifications Copyright © 2018 AT&T
-# Modifications Copyright © 2021 Orange
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-dependencies:
- - name: common
- version: ~9.x-0
- repository: '@local'
- - name: repositoryGenerator
- version: ~9.x-0
- repository: '@local'
- - name: serviceAccount
- version: ~9.x-0
- repository: '@local'
diff --git a/kubernetes/multicloud/components/multicloud-starlingx/templates/deployment.yaml b/kubernetes/multicloud/components/multicloud-starlingx/templates/deployment.yaml
index 7c39bb7006..c9209a0c09 100644
--- a/kubernetes/multicloud/components/multicloud-starlingx/templates/deployment.yaml
+++ b/kubernetes/multicloud/components/multicloud-starlingx/templates/deployment.yaml
@@ -60,7 +60,7 @@ spec:
value: "{{ .Values.config.ssl_enabled }}"
name: {{ include "common.name" . }}
volumeMounts:
- - mountPath: /var/log/onap
+ - mountPath: "{{ .Values.log.path }}"
name: starlingx-log
- mountPath: /opt/starlingx/starlingx/pub/config/log.yml
name: starlingx-logconfig
@@ -87,17 +87,7 @@ spec:
failureThreshold: {{ .Values.liveness.failureThreshold }}
{{ end }}
# side car containers
- - image: {{ include "repositoryGenerator.image.logging" . }}
- imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
- name: filebeat-onap
- volumeMounts:
- - mountPath: /usr/share/filebeat/filebeat.yml
- name: filebeat-conf
- subPath: filebeat.yml
- - mountPath: /var/log/onap
- name: starlingx-log
- - mountPath: /usr/share/filebeat/data
- name: starlingx-data-filebeat
+ {{ include "common.log.sidecar" . | nindent 7 }}
- image: {{ include "repositoryGenerator.repository" . }}/{{ .Values.global.artifactImage }}
name: framework-artifactbroker
command: ["/opt/app/distribution/bin/artifact-dist.sh"]
@@ -115,11 +105,7 @@ spec:
volumes:
- name: starlingx-log
emptyDir: {}
- - name: starlingx-data-filebeat
- emptyDir: {}
- - name: filebeat-conf
- configMap:
- name: multicloud-filebeat-configmap
+ {{ include "common.log.volumes" (dict "dot" . "configMapNamePrefix" (tpl .Values.logConfigMapNamePrefix . )) | nindent 7 }}
- name: starlingx-logconfig
configMap:
name: {{ include "common.fullname" . }}-log-configmap
diff --git a/kubernetes/multicloud/components/multicloud-starlingx/values.yaml b/kubernetes/multicloud/components/multicloud-starlingx/values.yaml
index 69e4d943bd..f18a090dba 100644
--- a/kubernetes/multicloud/components/multicloud-starlingx/values.yaml
+++ b/kubernetes/multicloud/components/multicloud-starlingx/values.yaml
@@ -94,3 +94,8 @@ serviceAccount:
nameOverride: multicloud-starlingx
roles:
- read
+
+#Log configuration
+log:
+ path: /var/log/onap
+logConfigMapNamePrefix: '{{ include "common.fullname" . }}'
diff --git a/kubernetes/multicloud/components/multicloud-vio/Chart.yaml b/kubernetes/multicloud/components/multicloud-vio/Chart.yaml
index 2247c33d72..90a5c94757 100644
--- a/kubernetes/multicloud/components/multicloud-vio/Chart.yaml
+++ b/kubernetes/multicloud/components/multicloud-vio/Chart.yaml
@@ -1,6 +1,7 @@
# Copyright © 2017 Amdocs, Bell Canada
# Modifications Copyright © 2018 AT&T
# Modifications Copyright © 2021 Orange
+# Modifications Copyright © 2021 Nordix Foundation
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -14,7 +15,18 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-apiVersion: v1
+apiVersion: v2
description: ONAP multicloud VIO plugin
name: multicloud-vio
-version: 9.0.0
+version: 10.0.0
+
+dependencies:
+ - name: common
+ version: ~10.x-0
+ repository: '@local'
+ - name: repositoryGenerator
+ version: ~10.x-0
+ repository: '@local'
+ - name: serviceAccount
+ version: ~10.x-0
+ repository: '@local'
diff --git a/kubernetes/multicloud/components/multicloud-vio/requirements.yaml b/kubernetes/multicloud/components/multicloud-vio/requirements.yaml
deleted file mode 100644
index 27373df61e..0000000000
--- a/kubernetes/multicloud/components/multicloud-vio/requirements.yaml
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright © 2017 Amdocs, Bell Canada
-# Modifications Copyright © 2018 AT&T
-# Modifications Copyright © 2021 Orange
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-dependencies:
- - name: common
- version: ~9.x-0
- repository: '@local'
- - name: repositoryGenerator
- version: ~9.x-0
- repository: '@local'
- - name: serviceAccount
- version: ~9.x-0
- repository: '@local'
diff --git a/kubernetes/multicloud/components/multicloud-vio/templates/deployment.yaml b/kubernetes/multicloud/components/multicloud-vio/templates/deployment.yaml
index 5548359b12..1d27d6eb33 100644
--- a/kubernetes/multicloud/components/multicloud-vio/templates/deployment.yaml
+++ b/kubernetes/multicloud/components/multicloud-vio/templates/deployment.yaml
@@ -57,7 +57,7 @@ spec:
value: "{{ .Values.config.aai.password }}"
name: {{ include "common.name" . }}
volumeMounts:
- - mountPath: /var/log/onap
+ - mountPath: "{{ .Values.log.path }}"
name: vio-log
- mountPath: /opt/vio/vio/pub/config/log.yml
name: vio-logconfig
@@ -83,26 +83,12 @@ spec:
failureThreshold: {{ .Values.liveness.failureThreshold }}
{{ end -}}
# side car containers
- - image: {{ include "repositoryGenerator.image.logging" . }}
- imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
- name: filebeat-onap
- volumeMounts:
- - mountPath: /usr/share/filebeat/filebeat.yml
- name: filebeat-conf
- subPath: filebeat.yml
- - mountPath: /var/log/onap
- name: vio-log
- - mountPath: /usr/share/filebeat/data
- name: vio-data-filebeat
+ {{ include "common.log.sidecar" . | nindent 5 }}
serviceAccountName: {{ include "common.fullname" (dict "suffix" "read" "dot" . )}}
volumes:
- name: vio-log
emptyDir: {}
- - name: vio-data-filebeat
- emptyDir: {}
- - name: filebeat-conf
- configMap:
- name: multicloud-filebeat-configmap
+ {{ include "common.log.volumes" (dict "dot" . "configMapNamePrefix" (tpl .Values.logConfigMapNamePrefix . )) | nindent 5 }}
- name: vio-logconfig
configMap:
name: {{ include "common.fullname" . }}-log-configmap
diff --git a/kubernetes/multicloud/components/multicloud-vio/values.yaml b/kubernetes/multicloud/components/multicloud-vio/values.yaml
index 5b218f1e75..17643baffe 100644
--- a/kubernetes/multicloud/components/multicloud-vio/values.yaml
+++ b/kubernetes/multicloud/components/multicloud-vio/values.yaml
@@ -91,3 +91,8 @@ serviceAccount:
nameOverride: multicloud-vio
roles:
- read
+
+#Log configuration
+log:
+ path: /var/log/onap
+logConfigMapNamePrefix: '{{ include "common.fullname" . }}'
diff --git a/kubernetes/multicloud/components/multicloud-windriver/Chart.yaml b/kubernetes/multicloud/components/multicloud-windriver/Chart.yaml
index 3291c83ac3..79df2005c8 100644
--- a/kubernetes/multicloud/components/multicloud-windriver/Chart.yaml
+++ b/kubernetes/multicloud/components/multicloud-windriver/Chart.yaml
@@ -1,6 +1,7 @@
# Copyright © 2017 Amdocs, Bell Canada
# Modifications Copyright © 2018 AT&T
# Modifications Copyright © 2021 Orange
+# Modifications Copyright © 2021 Nordix Foundation
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -14,7 +15,18 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-apiVersion: v1
+apiVersion: v2
description: ONAP multicloud OpenStack WindRiver Plugin
name: multicloud-windriver
-version: 9.0.0
+version: 10.0.0
+
+dependencies:
+ - name: common
+ version: ~10.x-0
+ repository: '@local'
+ - name: repositoryGenerator
+ version: ~10.x-0
+ repository: '@local'
+ - name: serviceAccount
+ version: ~10.x-0
+ repository: '@local'
diff --git a/kubernetes/multicloud/components/multicloud-windriver/requirements.yaml b/kubernetes/multicloud/components/multicloud-windriver/requirements.yaml
deleted file mode 100644
index 27373df61e..0000000000
--- a/kubernetes/multicloud/components/multicloud-windriver/requirements.yaml
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright © 2017 Amdocs, Bell Canada
-# Modifications Copyright © 2018 AT&T
-# Modifications Copyright © 2021 Orange
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-dependencies:
- - name: common
- version: ~9.x-0
- repository: '@local'
- - name: repositoryGenerator
- version: ~9.x-0
- repository: '@local'
- - name: serviceAccount
- version: ~9.x-0
- repository: '@local'
diff --git a/kubernetes/multicloud/components/multicloud-windriver/templates/deployment.yaml b/kubernetes/multicloud/components/multicloud-windriver/templates/deployment.yaml
index f46e45017d..dfb4bbc98c 100644
--- a/kubernetes/multicloud/components/multicloud-windriver/templates/deployment.yaml
+++ b/kubernetes/multicloud/components/multicloud-windriver/templates/deployment.yaml
@@ -69,7 +69,7 @@ spec:
value: "{{ .Values.config.ssl_enabled }}"
name: {{ include "common.name" . }}
volumeMounts:
- - mountPath: /var/log/onap
+ - mountPath: "{{ .Values.log.path }}"
name: windriver-log
- mountPath: /opt/windriver/titanium_cloud/pub/config/log.yml
name: windriver-logconfig
@@ -96,17 +96,7 @@ spec:
failureThreshold: {{ .Values.liveness.failureThreshold }}
{{ end }}
# side car containers
- - image: {{ include "repositoryGenerator.image.logging" . }}
- imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
- name: filebeat-onap
- volumeMounts:
- - mountPath: /usr/share/filebeat/filebeat.yml
- name: filebeat-conf
- subPath: filebeat.yml
- - mountPath: /var/log/onap
- name: windriver-log
- - mountPath: /usr/share/filebeat/data
- name: windriver-data-filebeat
+ {{ include "common.log.sidecar" . | nindent 7 }}
- image: {{ include "repositoryGenerator.repository" . }}/{{ .Values.global.artifactImage }}
name: framework-artifactbroker
command: ["/opt/app/distribution/bin/artifact-dist.sh"]
@@ -124,11 +114,7 @@ spec:
volumes:
- name: windriver-log
emptyDir: {}
- - name: windriver-data-filebeat
- emptyDir: {}
- - name: filebeat-conf
- configMap:
- name: multicloud-filebeat-configmap
+ {{ include "common.log.volumes" (dict "dot" . "configMapNamePrefix" (tpl .Values.logConfigMapNamePrefix . )) | nindent 7 }}
- name: windriver-logconfig
configMap:
name: {{ include "common.fullname" . }}-log-configmap
diff --git a/kubernetes/multicloud/components/multicloud-windriver/values.yaml b/kubernetes/multicloud/components/multicloud-windriver/values.yaml
index d520a783b7..802659f2c0 100644
--- a/kubernetes/multicloud/components/multicloud-windriver/values.yaml
+++ b/kubernetes/multicloud/components/multicloud-windriver/values.yaml
@@ -103,3 +103,8 @@ serviceAccount:
nameOverride: multicloud-windriver
roles:
- read
+
+#Log configuration
+log:
+ path: /var/log/onap
+logConfigMapNamePrefix: '{{ include "common.fullname" . }}'
diff --git a/kubernetes/multicloud/requirements.yaml b/kubernetes/multicloud/requirements.yaml
deleted file mode 100644
index 84099b2171..0000000000
--- a/kubernetes/multicloud/requirements.yaml
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright © 2017 Amdocs, Bell Canada
-# Modifications Copyright © 2018 AT&T
-# Modifications Copyright © 2021 Orange
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-dependencies:
- - name: common
- version: ~9.x-0
- repository: '@local'
- - name: repositoryGenerator
- version: ~9.x-0
- repository: '@local'
- - name: multicloud-fcaps
- version: ~9.x-0
- repository: 'file://components/multicloud-fcaps'
- condition: multicloud-fcaps.enabled
- - name: multicloud-k8s
- version: ~9.x-0
- repository: 'file://components/multicloud-k8s'
- condition: multicloud-k8s.enabled
- - name: multicloud-pike
- version: ~9.x-0
- repository: 'file://components/multicloud-pike'
- condition: multicloud-pike.enabled
- - name: multicloud-prometheus
- version: ~9.x-0
- repository: 'file://components/multicloud-prometheus'
- condition: multicloud-prometheus.enabled
- - name: multicloud-starlingx
- version: ~9.x-0
- repository: 'file://components/multicloud-starlingx'
- condition: multicloud-starlingx.enabled
- - name: multicloud-vio
- version: ~9.x-0
- repository: 'file://components/multicloud-vio'
- condition: multicloud-vio.enabled
- - name: multicloud-windriver
- version: ~9.x-0
- repository: 'file://components/multicloud-windriver'
- condition: multicloud-windriver.enabled
- - name: serviceAccount
- version: ~9.x-0
- repository: '@local'
diff --git a/kubernetes/multicloud/templates/configmap.yaml b/kubernetes/multicloud/templates/configmap.yaml
index 0800fbeb13..c76f531ee6 100644
--- a/kubernetes/multicloud/templates/configmap.yaml
+++ b/kubernetes/multicloud/templates/configmap.yaml
@@ -15,18 +15,7 @@
# limitations under the License.
*/}}
-apiVersion: v1
-kind: ConfigMap
-metadata:
- name: multicloud-filebeat-configmap
- namespace: {{ include "common.namespace" . }}
- labels:
- app: {{ include "common.name" . }}
- chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
- release: {{ include "common.release" . }}
- heritage: {{ .Release.Service }}
-data:
-{{ tpl (.Files.Glob "resources/config/log/filebeat/*").AsConfig . | indent 2 }}
+{{ include "common.log.configMap" . }}
---
apiVersion: v1
kind: ConfigMap
diff --git a/kubernetes/multicloud/templates/deployment.yaml b/kubernetes/multicloud/templates/deployment.yaml
index 34fe6224bc..53716e5f44 100644
--- a/kubernetes/multicloud/templates/deployment.yaml
+++ b/kubernetes/multicloud/templates/deployment.yaml
@@ -63,7 +63,7 @@ spec:
imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
name: {{ include "common.name" . }}
volumeMounts:
- - mountPath: /var/log/onap
+ - mountPath: "{{ .Values.log.path }}"
name: framework-log
- mountPath: /opt/multivimbroker/multivimbroker/pub/config/log.yml
name: framework-logconfig
@@ -89,17 +89,7 @@ spec:
{{ end -}}
# side car containers
- - image: {{ include "repositoryGenerator.image.logging" . }}
- imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
- name: filebeat-onap
- volumeMounts:
- - mountPath: /usr/share/filebeat/filebeat.yml
- name: filebeat-conf
- subPath: filebeat.yml
- - mountPath: /var/log/onap
- name: framework-log
- - mountPath: /usr/share/filebeat/data
- name: framework-data-filebeat
+ {{ include "common.log.sidecar" . | nindent 5 }}
serviceAccountName: {{ include "common.fullname" (dict "suffix" "read" "dot" . )}}
volumes:
- name: framework-log
@@ -107,11 +97,7 @@ spec:
- name: provider-plugin
configMap:
name: {{ include "common.fullname" . }}-provider-plugin-configmap
- - name: framework-data-filebeat
- emptyDir: {}
- - name: filebeat-conf
- configMap:
- name: multicloud-filebeat-configmap
+ {{ include "common.log.volumes" . | nindent 5 }}
- name: framework-logconfig
configMap:
name: {{ include "common.fullname" . }}-log-configmap
diff --git a/kubernetes/multicloud/values.yaml b/kubernetes/multicloud/values.yaml
index 90e72be044..4f946a70c7 100644
--- a/kubernetes/multicloud/values.yaml
+++ b/kubernetes/multicloud/values.yaml
@@ -22,6 +22,7 @@ global:
prometheus:
enabled: false
persistence: {}
+ centralizedLoggingEnabled: true
#################################################################
# Application configuration defaults.
@@ -35,18 +36,23 @@ istioSidecar: true
multicloud-fcaps:
enabled: true
+ logConfigMapNamePrefix: '{{ include "common.release" . }}-multicloud'
multicloud-k8s:
enabled: true
multicloud-pike:
enabled: true
+ logConfigMapNamePrefix: '{{ include "common.release" . }}-multicloud'
multicloud-prometheus:
enabled: false
multicloud-starlingx:
enabled: false
+ logConfigMapNamePrefix: '{{ include "common.release" . }}-multicloud'
multicloud-vio:
enabled: false
+ logConfigMapNamePrefix: '{{ include "common.release" . }}-multicloud'
multicloud-windriver:
enabled: false
+ logConfigMapNamePrefix: '{{ include "common.release" . }}-multicloud'
# application configuration
config:
@@ -114,3 +120,7 @@ serviceAccount:
nameOverride: multicloud
roles:
- read
+
+#Log configuration
+log:
+ path: /var/log/onap
diff --git a/kubernetes/nbi/Chart.yaml b/kubernetes/nbi/Chart.yaml
index 78929b7bb3..fee022a491 100644
--- a/kubernetes/nbi/Chart.yaml
+++ b/kubernetes/nbi/Chart.yaml
@@ -1,5 +1,6 @@
# Copyright © 2017 Amdocs, Bell Canada
# Modifications Copyright © 2018,2021 Orange
+# Modifications Copyright © 2021 Nordix Foundation
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -13,7 +14,35 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-apiVersion: v1
+apiVersion: v2
description: ONAP Northbound Interface
name: nbi
-version: 9.0.0
+version: 10.0.0
+
+dependencies:
+ - name: common
+ version: ~10.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: certInitializer
+ version: ~10.x-0
+ repository: '@local'
+ - name: mongo
+ version: ~10.x-0
+ repository: '@local'
+ - name: mariadb-galera
+ version: ~10.x-0
+ repository: '@local'
+ condition: global.mariadbGalera.localCluster
+ - name: mariadb-init
+ version: ~10.x-0
+ repository: '@local'
+ condition: not global.mariadbGalera.localCluster
+ - name: repositoryGenerator
+ version: ~10.x-0
+ repository: '@local'
+ - name: serviceAccount
+ version: ~10.x-0
+ repository: '@local'
diff --git a/kubernetes/nbi/requirements.yaml b/kubernetes/nbi/requirements.yaml
deleted file mode 100644
index 69d6f51433..0000000000
--- a/kubernetes/nbi/requirements.yaml
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright © 2017 Amdocs, Bell Canada
-# Modifications Copyright © 2018,2020-2021 Orange
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-dependencies:
- - name: common
- version: ~9.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: certInitializer
- version: ~9.x-0
- repository: '@local'
- - name: mongo
- version: ~9.x-0
- repository: '@local'
- - name: mariadb-galera
- version: ~9.x-0
- repository: '@local'
- condition: global.mariadbGalera.localCluster
- - name: mariadb-init
- version: ~9.x-0
- repository: '@local'
- condition: not global.mariadbGalera.localCluster
- - name: repositoryGenerator
- version: ~9.x-0
- repository: '@local'
- - name: serviceAccount
- version: ~9.x-0
- repository: '@local'
diff --git a/kubernetes/onap/.helmignore b/kubernetes/onap/.helmignore
new file mode 100644
index 0000000000..7ddbad7ef4
--- /dev/null
+++ b/kubernetes/onap/.helmignore
@@ -0,0 +1,22 @@
+# Patterns to ignore when building packages.
+# This supports shell glob matching, relative path matching, and
+# negation (prefixed with !). Only one pattern per line.
+.DS_Store
+# Common VCS dirs
+.git/
+.gitignore
+.bzr/
+.bzrignore
+.hg/
+.hgignore
+.svn/
+# Common backup files
+*.swp
+*.bak
+*.tmp
+*~
+# Various IDEs
+.project
+.idea/
+*.tmproj
+components/
diff --git a/kubernetes/onap/Chart.yaml b/kubernetes/onap/Chart.yaml
index d9525c5750..4754f9fd2f 100644
--- a/kubernetes/onap/Chart.yaml
+++ b/kubernetes/onap/Chart.yaml
@@ -1,4 +1,5 @@
# Copyright © 2017 Amdocs, Bell Canada
+# Modifications Copyright © 2021 Nordix Foundation
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -12,13 +13,169 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-apiVersion: v1
+apiVersion: v2
name: onap
-version: 9.0.0
-appVersion: Istanbul
+version: 10.0.0
+appVersion: Jakarta
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
-kubeVersion: ">=1.19.0-0"
+kubeVersion: ">=1.19.11-0"
+
+dependencies:
+ - name: aaf
+ version: ~10.x-0
+ repository: '@local'
+ condition: aaf.enabled
+ - name: aai
+ version: ~10.x-0
+ repository: '@local'
+ condition: aai.enabled
+ - name: appc
+ version: ~10.x-0
+ repository: '@local'
+ condition: appc.enabled
+ - name: cassandra
+ version: ~10.x-0
+ repository: '@local'
+ condition: cassandra.enabled
+ - name: cds
+ version: ~10.x-0
+ repository: '@local'
+ condition: cds.enabled
+ - name: cli
+ version: ~10.x-0
+ repository: '@local'
+ condition: cli.enabled
+ - name: common
+ version: ~10.x-0
+ repository: '@local'
+ - name: consul
+ version: ~10.x-0
+ repository: '@local'
+ condition: consul.enabled
+ - name: contrib
+ version: ~10.x-0
+ repository: '@local'
+ condition: global.addTestingComponents
+ - name: cps
+ version: ~10.x-0
+ repository: '@local'
+ condition: cps.enabled
+ - name: dcaegen2
+ version: ~10.x-0
+ repository: '@local'
+ condition: dcaegen2.enabled
+ - name: dcaegen2-services
+ version: ~10.x-0
+ repository: '@local'
+ condition: dcaegen2-services.enabled
+ - name: dcaemod
+ version: ~10.x-0
+ repository: '@local'
+ condition: dcaemod.enabled
+ - name: holmes
+ version: ~10.x-0
+ repository: '@local'
+ condition: holmes.enabled
+ - name: dmaap
+ version: ~10.x-0
+ repository: '@local'
+ condition: dmaap.enabled
+ - name: log
+ version: ~10.x-0
+ repository: '@local'
+ condition: log.enabled
+ - name: sniro-emulator
+ version: ~10.x-0
+ repository: '@local'
+ condition: sniro-emulator.enabled
+ - name: mariadb-galera
+ version: ~10.x-0
+ repository: '@local'
+ condition: mariadb-galera.enabled
+ - name: msb
+ version: ~10.x-0
+ repository: '@local'
+ condition: msb.enabled
+ - name: multicloud
+ version: ~10.x-0
+ repository: '@local'
+ condition: multicloud.enabled
+ - name: nbi
+ version: ~10.x-0
+ repository: '@local'
+ condition: nbi.enabled
+ - name: policy
+ version: ~10.x-0
+ repository: '@local'
+ condition: policy.enabled
+ - name: portal
+ version: ~10.x-0
+ repository: '@local'
+ condition: portal.enabled
+ - name: postgres
+ version: ~10.x-0
+ repository: '@local'
+ condition: postgres.enabled
+ - name: oof
+ version: ~10.x-0
+ repository: '@local'
+ condition: oof.enabled
+ - name: repository-wrapper
+ version: ~10.x-0
+ repository: '@local'
+ - name: robot
+ version: ~10.x-0
+ repository: '@local'
+ condition: robot.enabled
+ - name: sdc
+ version: ~10.x-0
+ repository: '@local'
+ condition: sdc.enabled
+ - name: sdnc
+ version: ~10.x-0
+ repository: '@local'
+ condition: sdnc.enabled
+ - name: so
+ version: ~10.x-0
+ repository: '@local'
+ condition: so.enabled
+ - name: uui
+ version: ~10.x-0
+ repository: '@local'
+ condition: uui.enabled
+ - name: vfc
+ version: ~10.x-0
+ repository: '@local'
+ condition: vfc.enabled
+ - name: vid
+ version: ~10.x-0
+ repository: '@local'
+ condition: vid.enabled
+ - name: vnfsdk
+ version: ~10.x-0
+ repository: '@local'
+ condition: vnfsdk.enabled
+ - name: modeling
+ version: ~10.x-0
+ repository: '@local'
+ condition: modeling.enabled
+ - name: platform
+ version: ~10.x-0
+ repository: '@local'
+ condition: platform.enabled
+ - name: a1policymanagement
+ version: ~10.x-0
+ repository: '@local'
+ condition: a1policymanagement.enabled
+ - name: cert-wrapper
+ version: ~10.x-0
+ repository: '@local'
+ condition: cert-wrapper.enabled
+ - name: roles-wrapper
+ version: ~10.x-0
+ repository: '@local'
+ condition: roles-wrapper.enabled
diff --git a/kubernetes/onap/requirements.yaml b/kubernetes/onap/requirements.yaml
deleted file mode 100755
index 694546f23f..0000000000
--- a/kubernetes/onap/requirements.yaml
+++ /dev/null
@@ -1,180 +0,0 @@
-# Copyright © 2019 Amdocs, Bell Canada
-# Copyright (c) 2020 Nordix Foundation, Modifications
-# Modifications Copyright © 2020 Nokia
-# Modifications Copyright © 2020-2021 Orange
-#
-# 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.
-
-# Referencing a named repo called 'local'.
-# Can add this repo by running commands like:
-# > helm serve
-# > helm repo add local http://127.0.0.1:8879
-dependencies:
- - name: aaf
- version: ~9.x-0
- repository: '@local'
- condition: aaf.enabled
- - name: aai
- version: ~9.x-0
- repository: '@local'
- condition: aai.enabled
- - name: appc
- version: ~9.x-0
- repository: '@local'
- condition: appc.enabled
- - name: cassandra
- version: ~9.x-0
- repository: '@local'
- condition: cassandra.enabled
- - name: cds
- version: ~9.x-0
- repository: '@local'
- condition: cds.enabled
- - name: cli
- version: ~9.x-0
- repository: '@local'
- condition: cli.enabled
- - name: common
- version: ~9.x-0
- repository: '@local'
- - name: consul
- version: ~9.x-0
- repository: '@local'
- condition: consul.enabled
- - name: contrib
- version: ~9.x-0
- repository: '@local'
- condition: global.addTestingComponents
- - name: cps
- version: ~9.x-0
- repository: '@local'
- condition: cps.enabled
- - name: dcaegen2
- version: ~9.x-0
- repository: '@local'
- condition: dcaegen2.enabled
- - name: dcaegen2-services
- version: ~9.x-0
- repository: '@local'
- condition: dcaegen2-services.enabled
- - name: dcaemod
- version: ~9.x-0
- repository: '@local'
- condition: dcaemod.enabled
- - name: holmes
- version: ~9.x-0
- repository: '@local'
- condition: holmes.enabled
- - name: dmaap
- version: ~9.x-0
- repository: '@local'
- condition: dmaap.enabled
- - name: log
- version: ~9.x-0
- repository: '@local'
- condition: log.enabled
- - name: sniro-emulator
- version: ~9.x-0
- repository: '@local'
- condition: sniro-emulator.enabled
- - name: mariadb-galera
- version: ~9.x-0
- repository: '@local'
- condition: mariadb-galera.enabled
- - name: msb
- version: ~9.x-0
- repository: '@local'
- condition: msb.enabled
- - name: multicloud
- version: ~9.x-0
- repository: '@local'
- condition: multicloud.enabled
- - name: nbi
- version: ~9.x-0
- repository: '@local'
- condition: nbi.enabled
- - name: policy
- version: ~9.x-0
- repository: '@local'
- condition: policy.enabled
- - name: portal
- version: ~9.x-0
- repository: '@local'
- condition: portal.enabled
- - name: postgres
- version: ~9.x-0
- repository: '@local'
- condition: postgres.enabled
- - name: oof
- version: ~9.x-0
- repository: '@local'
- condition: oof.enabled
- - name: repository-wrapper
- version: ~9.x-0
- repository: '@local'
- - name: robot
- version: ~9.x-0
- repository: '@local'
- condition: robot.enabled
- - name: sdc
- version: ~9.x-0
- repository: '@local'
- condition: sdc.enabled
- - name: sdnc
- version: ~9.x-0
- repository: '@local'
- condition: sdnc.enabled
- - name: so
- version: ~9.x-0
- repository: '@local'
- condition: so.enabled
- - name: uui
- version: ~9.x-0
- repository: '@local'
- condition: uui.enabled
- - name: vfc
- version: ~9.x-0
- repository: '@local'
- condition: vfc.enabled
- - name: vid
- version: ~9.x-0
- repository: '@local'
- condition: vid.enabled
- - name: vnfsdk
- version: ~9.x-0
- repository: '@local'
- condition: vnfsdk.enabled
- - name: modeling
- version: ~9.x-0
- repository: '@local'
- condition: modeling.enabled
- - name: platform
- version: ~9.x-0
- repository: '@local'
- condition: platform.enabled
- - name: a1policymanagement
- version: ~9.x-0
- repository: '@local'
- condition: a1policymanagement.enabled
- - name: cert-wrapper
- version: ~9.x-0
- repository: '@local'
- condition: cert-wrapper.enabled
- - name: roles-wrapper
- version: ~9.x-0
- repository: '@local'
- condition: roles-wrapper.enabled
- - name: timescaledb
- version: ~9.x-0
- repository: '@local'
- condition: timescaledb.enabled
diff --git a/kubernetes/onap/resources/overrides/environment.yaml b/kubernetes/onap/resources/overrides/environment.yaml
index 278a2da156..50703fbf4a 100644
--- a/kubernetes/onap/resources/overrides/environment.yaml
+++ b/kubernetes/onap/resources/overrides/environment.yaml
@@ -82,10 +82,10 @@ appc:
periodSeconds: 60
cassandra:
liveness:
- initialDelaySeconds: 120
+ timeoutSeconds: 30
periodSeconds: 120
readiness:
- initialDelaySeconds: 120
+ timeoutSeconds: 30
periodSeconds: 60
clamp:
liveness:
@@ -120,11 +120,6 @@ dmaap:
initialDelaySeconds: 120
readiness:
initialDelaySeconds: 120
- message-router:
- liveness:
- initialDelaySeconds: 120
- readiness:
- initialDelaySeconds: 120
dmaap-dr-prov:
liveness:
initialDelaySeconds: 120
diff --git a/kubernetes/oof/Chart.yaml b/kubernetes/oof/Chart.yaml
index 8b436dac7d..0bc7dd9d59 100755
--- a/kubernetes/oof/Chart.yaml
+++ b/kubernetes/oof/Chart.yaml
@@ -1,6 +1,7 @@
# Copyright © 2017 Amdocs, Bell Canada
# Modifications Copyright © 2018 AT&T,VMware
# Modifications Copyright © 2021 Orange
+# Modifications Copyright © 2021 Nordix Foundation
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -14,7 +15,28 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-apiVersion: v1
+apiVersion: v2
description: ONAP Optimization Framework
name: oof
-version: 9.0.0
+version: 10.0.0
+
+dependencies:
+ - name: common
+ version: ~10.x-0
+ repository: '@local'
+ - name: certInitializer
+ version: ~10.x-0
+ repository: '@local'
+ - name: oof-has
+ version: ~10.x-0
+ repository: 'file://components/oof-has'
+ condition: oof-has.enabled
+ - name: oof-templates
+ version: ~10.x-0
+ repository: 'file://components/oof-templates'
+ - name: repositoryGenerator
+ version: ~10.x-0
+ repository: '@local'
+ - name: serviceAccount
+ version: ~10.x-0
+ repository: '@local'
diff --git a/kubernetes/oof/Makefile b/kubernetes/oof/Makefile
index ad7fad7bbd..2bb70a4f92 100644
--- a/kubernetes/oof/Makefile
+++ b/kubernetes/oof/Makefile
@@ -34,7 +34,7 @@ make-%:
@if [ -f $*/Makefile ]; then make -C $*; fi
dep-%: make-%
- @if [ -f $*/requirements.yaml ]; then $(HELM_BIN) dep up $*; fi
+ @if [ -f $*/Chart.yaml ]; then $(HELM_BIN) dep up $*; fi
lint-%: dep-%
@if [ -f $*/Chart.yaml ]; then $(HELM_BIN) lint $*; fi
@@ -50,7 +50,7 @@ endif
@$(HELM_BIN) repo index $(PACKAGE_DIR)
clean:
- @rm -f */requirements.lock
+ @rm -f */Chart.lock
@rm -f *tgz */charts/*tgz
@rm -rf $(PACKAGE_DIR)
%:
diff --git a/kubernetes/oof/components/Makefile b/kubernetes/oof/components/Makefile
index d62cb0b700..1688db2d44 100755
--- a/kubernetes/oof/components/Makefile
+++ b/kubernetes/oof/components/Makefile
@@ -34,7 +34,7 @@ make-%:
@if [ -f $*/Makefile ]; then make -C $*; fi
dep-%: make-%
- @if [ -f $*/requirements.yaml ]; then $(HELM_BIN) dep up $*; fi
+ @if [ -f $*/Chart.yaml ]; then $(HELM_BIN) dep up $*; fi
lint-%: dep-%
@if [ -f $*/Chart.yaml ]; then $(HELM_BIN) lint $*; fi
@@ -49,7 +49,7 @@ endif
@$(HELM_BIN) repo index $(PACKAGE_DIR)
clean:
- @rm -f */requirements.lock
+ @rm -f */Chart.lock
@rm -f *tgz */charts/*tgz
@rm -rf $(PACKAGE_DIR)
%:
diff --git a/kubernetes/oof/components/oof-has/Chart.yaml b/kubernetes/oof/components/oof-has/Chart.yaml
index 65b30e2a15..ad129e0cc2 100755
--- a/kubernetes/oof/components/oof-has/Chart.yaml
+++ b/kubernetes/oof/components/oof-has/Chart.yaml
@@ -1,6 +1,7 @@
# Copyright © 2017 Amdocs, Bell Canada
# Modifications Copyright © 2018 AT&T,VMware
# Modifications Copyright © 2021 Orange
+# Modifications Copyright © 2021 Nordix Foundation
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -14,7 +15,48 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-apiVersion: v1
+apiVersion: v2
description: ONAP Homing and Allocation Service
name: oof-has
-version: 9.0.0
+version: 10.0.0
+
+dependencies:
+ - name: common
+ version: ~10.x-0
+ repository: '@local'
+ - name: music
+ version: ~10.x-0
+ repository: '@local'
+ condition: music.enabled
+ - name: etcd
+ version: ~10.x-0
+ repository: '@local'
+ condition: etcd.enabled
+ - name: etcd-init
+ version: ~10.x-0
+ repository: '@local'
+ condition: etcd-init.enabled
+ - name: oof-has-api
+ version: ~10.x-0
+ repository: 'file://components/oof-has-api'
+ condition: oof-has-api.enabled
+ - name: oof-has-controller
+ version: ~10.x-0
+ repository: 'file://components/oof-has-controller'
+ condition: oof-has-controller.enabled
+ - name: oof-has-data
+ version: ~10.x-0
+ repository: 'file://components/oof-has-data'
+ condition: oof-has-data.enabled
+ - name: oof-has-reservation
+ version: ~10.x-0
+ repository: 'file://components/oof-has-reservation'
+ condition: oof-has-reservation.enabled
+ - name: oof-has-solver
+ version: ~10.x-0
+ repository: 'file://components/oof-has-solver'
+ condition: oof-has-solver.enabled
+ - name: repositoryGenerator
+ version: ~10.x-0
+ repository: '@local'
+
diff --git a/kubernetes/oof/components/oof-has/Makefile b/kubernetes/oof/components/oof-has/Makefile
index 33d61041cd..721f6025c0 100644
--- a/kubernetes/oof/components/oof-has/Makefile
+++ b/kubernetes/oof/components/oof-has/Makefile
@@ -34,7 +34,7 @@ make-%:
@if [ -f $*/Makefile ]; then make -C $*; fi
dep-%: make-%
- @if [ -f $*/requirements.yaml ]; then $(HELM_BIN) dep up $*; fi
+ @if [ -f $*/Chart.yaml ]; then $(HELM_BIN) dep up $*; fi
lint-%: dep-%
@if [ -f $*/Chart.yaml ]; then $(HELM_BIN) lint $*; fi
@@ -49,7 +49,7 @@ endif
@$(HELM_BIN) repo index $(PACKAGE_DIR)
clean:
- @rm -f */requirements.lock
+ @rm -f */Chart.lock
@rm -f *tgz */charts/*tgz
@rm -rf $(PACKAGE_DIR)
%:
diff --git a/kubernetes/oof/components/oof-has/components/Makefile b/kubernetes/oof/components/oof-has/components/Makefile
index 36ea7b6c2b..546fad1b74 100755
--- a/kubernetes/oof/components/oof-has/components/Makefile
+++ b/kubernetes/oof/components/oof-has/components/Makefile
@@ -34,7 +34,7 @@ make-%:
@if [ -f $*/Makefile ]; then make -C $*; fi
dep-%: make-%
- @if [ -f $*/requirements.yaml ]; then $(HELM_BIN) dep up $*; fi
+ @if [ -f $*/Chart.yaml ]; then $(HELM_BIN) dep up $*; fi
lint-%: dep-%
@if [ -f $*/Chart.yaml ]; then $(HELM_BIN) lint $*; fi
@@ -49,7 +49,7 @@ endif
@$(HELM_BIN) repo index $(PACKAGE_DIR)
clean:
- @rm -f */requirements.lock
+ @rm -f */Chart.lock
@rm -f *tgz */charts/*tgz
@rm -rf $(PACKAGE_DIR)
%:
diff --git a/kubernetes/oof/components/oof-has/components/oof-has-api/Chart.yaml b/kubernetes/oof/components/oof-has/components/oof-has-api/Chart.yaml
index b4f8a5f844..3026110fef 100755
--- a/kubernetes/oof/components/oof-has/components/oof-has-api/Chart.yaml
+++ b/kubernetes/oof/components/oof-has/components/oof-has-api/Chart.yaml
@@ -1,6 +1,7 @@
# Copyright © 2017 Amdocs, Bell Canada
# Modifications Copyright © 2018 AT&T,VMware
# Modifications Copyright © 2021 Orange
+# Modifications Copyright © 2021 Nordix Foundation
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -14,7 +15,24 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-apiVersion: v1
+apiVersion: v2
description: ONAP Homing and Allocation Servicei - API
name: oof-has-api
-version: 9.0.0
+version: 10.0.0
+
+dependencies:
+ - name: common
+ version: ~10.x-0
+ repository: '@local'
+ - name: certInitializer
+ version: ~10.x-0
+ repository: '@local'
+ - name: oof-templates
+ version: ~10.x-0
+ repository: 'file://../../../oof-templates'
+ - name: repositoryGenerator
+ version: ~10.x-0
+ repository: '@local'
+ - name: serviceAccount
+ version: ~10.x-0
+ repository: '@local'
diff --git a/kubernetes/oof/components/oof-has/components/oof-has-api/requirements.yaml b/kubernetes/oof/components/oof-has/components/oof-has-api/requirements.yaml
deleted file mode 100644
index 3e9b0a1c91..0000000000
--- a/kubernetes/oof/components/oof-has/components/oof-has-api/requirements.yaml
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright (C) 2020 Wipro Limited.
-# Modifications Copyright © 2021 Orange
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-dependencies:
- - name: common
- version: ~9.x-0
- repository: '@local'
- - name: certInitializer
- version: ~9.x-0
- repository: '@local'
- - name: oof-templates
- version: ~9.x-0
- repository: 'file://../../../oof-templates'
- - name: repositoryGenerator
- version: ~9.x-0
- repository: '@local'
- - name: serviceAccount
- version: ~9.x-0
- repository: '@local'
diff --git a/kubernetes/oof/components/oof-has/components/oof-has-controller/Chart.yaml b/kubernetes/oof/components/oof-has/components/oof-has-controller/Chart.yaml
index 2b0a2447c1..b59f49a054 100755
--- a/kubernetes/oof/components/oof-has/components/oof-has-controller/Chart.yaml
+++ b/kubernetes/oof/components/oof-has/components/oof-has-controller/Chart.yaml
@@ -1,6 +1,7 @@
# Copyright © 2017 Amdocs, Bell Canada
# Modifications Copyright © 2018 AT&T,VMware
# Modifications Copyright © 2021 Orange
+# Modifications Copyright © 2021 Nordix Foundation
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -14,7 +15,21 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-apiVersion: v1
+apiVersion: v2
description: ONAP Homing and Allocation Sservice - Controller
name: oof-has-controller
-version: 9.0.0
+version: 10.0.0
+
+dependencies:
+ - name: common
+ version: ~10.x-0
+ repository: '@local'
+ - name: oof-templates
+ version: ~10.x-0
+ repository: 'file://../../../oof-templates'
+ - name: repositoryGenerator
+ version: ~10.x-0
+ repository: '@local'
+ - name: serviceAccount
+ version: ~10.x-0
+ repository: '@local'
diff --git a/kubernetes/oof/components/oof-has/components/oof-has-controller/requirements.yaml b/kubernetes/oof/components/oof-has/components/oof-has-controller/requirements.yaml
deleted file mode 100644
index 03f20196b5..0000000000
--- a/kubernetes/oof/components/oof-has/components/oof-has-controller/requirements.yaml
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright (C) 2020 Wipro Limited.
-# Modifications Copyright © 2021 Orange
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-dependencies:
- - name: common
- version: ~9.x-0
- repository: '@local'
- - name: oof-templates
- version: ~9.x-0
- repository: 'file://../../../oof-templates'
- - name: repositoryGenerator
- version: ~9.x-0
- repository: '@local'
- - name: serviceAccount
- version: ~9.x-0
- repository: '@local'
diff --git a/kubernetes/oof/components/oof-has/components/oof-has-data/Chart.yaml b/kubernetes/oof/components/oof-has/components/oof-has-data/Chart.yaml
index 6413a0724e..f1757ecb6d 100755
--- a/kubernetes/oof/components/oof-has/components/oof-has-data/Chart.yaml
+++ b/kubernetes/oof/components/oof-has/components/oof-has-data/Chart.yaml
@@ -1,6 +1,7 @@
# Copyright © 2017 Amdocs, Bell Canada
# Modifications Copyright © 2018 AT&T,VMware
# Modifications Copyright © 2021 Orange
+# Modifications Copyright © 2021 Nordix Foundation
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -14,7 +15,21 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-apiVersion: v1
+apiVersion: v2
description: ONAP Homing and Allocation Service - Data Component
name: oof-has-data
-version: 9.0.0
+version: 10.0.0
+
+dependencies:
+ - name: common
+ version: ~10.x-0
+ repository: '@local'
+ - name: oof-templates
+ version: ~10.x-0
+ repository: 'file://../../../oof-templates'
+ - name: repositoryGenerator
+ version: ~10.x-0
+ repository: '@local'
+ - name: serviceAccount
+ version: ~10.x-0
+ repository: '@local'
diff --git a/kubernetes/oof/components/oof-has/components/oof-has-data/requirements.yaml b/kubernetes/oof/components/oof-has/components/oof-has-data/requirements.yaml
deleted file mode 100644
index 03f20196b5..0000000000
--- a/kubernetes/oof/components/oof-has/components/oof-has-data/requirements.yaml
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright (C) 2020 Wipro Limited.
-# Modifications Copyright © 2021 Orange
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-dependencies:
- - name: common
- version: ~9.x-0
- repository: '@local'
- - name: oof-templates
- version: ~9.x-0
- repository: 'file://../../../oof-templates'
- - name: repositoryGenerator
- version: ~9.x-0
- repository: '@local'
- - name: serviceAccount
- version: ~9.x-0
- repository: '@local'
diff --git a/kubernetes/oof/components/oof-has/components/oof-has-reservation/Chart.yaml b/kubernetes/oof/components/oof-has/components/oof-has-reservation/Chart.yaml
index 25bfb24740..87a2417810 100755
--- a/kubernetes/oof/components/oof-has/components/oof-has-reservation/Chart.yaml
+++ b/kubernetes/oof/components/oof-has/components/oof-has-reservation/Chart.yaml
@@ -1,6 +1,7 @@
# Copyright © 2017 Amdocs, Bell Canada
# Modifications Copyright © 2018 AT&T,VMware
# Modifications Copyright © 2021 Orange
+# Modifications Copyright © 2021 Nordix Foundation
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -14,7 +15,21 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-apiVersion: v1
+apiVersion: v2
description: ONAP Homing and Allocation Sevice - Reservation Component
name: oof-has-reservation
-version: 9.0.0
+version: 10.0.0
+
+dependencies:
+ - name: common
+ version: ~10.x-0
+ repository: '@local'
+ - name: oof-templates
+ version: ~10.x-0
+ repository: 'file://../../../oof-templates'
+ - name: repositoryGenerator
+ version: ~10.x-0
+ repository: '@local'
+ - name: serviceAccount
+ version: ~10.x-0
+ repository: '@local'
diff --git a/kubernetes/oof/components/oof-has/components/oof-has-reservation/requirements.yaml b/kubernetes/oof/components/oof-has/components/oof-has-reservation/requirements.yaml
deleted file mode 100644
index 03f20196b5..0000000000
--- a/kubernetes/oof/components/oof-has/components/oof-has-reservation/requirements.yaml
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright (C) 2020 Wipro Limited.
-# Modifications Copyright © 2021 Orange
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-dependencies:
- - name: common
- version: ~9.x-0
- repository: '@local'
- - name: oof-templates
- version: ~9.x-0
- repository: 'file://../../../oof-templates'
- - name: repositoryGenerator
- version: ~9.x-0
- repository: '@local'
- - name: serviceAccount
- version: ~9.x-0
- repository: '@local'
diff --git a/kubernetes/oof/components/oof-has/components/oof-has-solver/Chart.yaml b/kubernetes/oof/components/oof-has/components/oof-has-solver/Chart.yaml
index f60e6ae79e..663d863bfc 100755
--- a/kubernetes/oof/components/oof-has/components/oof-has-solver/Chart.yaml
+++ b/kubernetes/oof/components/oof-has/components/oof-has-solver/Chart.yaml
@@ -1,6 +1,7 @@
# Copyright © 2017 Amdocs, Bell Canada
# Modifications Copyright © 2018 AT&T,VMware
# Modifications Copyright © 2021 Orange
+# Modifications Copyright © 2021 Nordix Foundation
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -14,7 +15,21 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-apiVersion: v1
+apiVersion: v2
description: ONAP Homing and Allocation Service - Solver Component
name: oof-has-solver
-version: 9.0.0
+version: 10.0.0
+
+dependencies:
+ - name: common
+ version: ~10.x-0
+ repository: '@local'
+ - name: oof-templates
+ version: ~10.x-0
+ repository: 'file://../../../oof-templates'
+ - name: repositoryGenerator
+ version: ~10.x-0
+ repository: '@local'
+ - name: serviceAccount
+ version: ~10.x-0
+ repository: '@local'
diff --git a/kubernetes/oof/components/oof-has/components/oof-has-solver/requirements.yaml b/kubernetes/oof/components/oof-has/components/oof-has-solver/requirements.yaml
deleted file mode 100644
index 03f20196b5..0000000000
--- a/kubernetes/oof/components/oof-has/components/oof-has-solver/requirements.yaml
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright (C) 2020 Wipro Limited.
-# Modifications Copyright © 2021 Orange
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-dependencies:
- - name: common
- version: ~9.x-0
- repository: '@local'
- - name: oof-templates
- version: ~9.x-0
- repository: 'file://../../../oof-templates'
- - name: repositoryGenerator
- version: ~9.x-0
- repository: '@local'
- - name: serviceAccount
- version: ~9.x-0
- repository: '@local'
diff --git a/kubernetes/oof/components/oof-has/requirements.yaml b/kubernetes/oof/components/oof-has/requirements.yaml
deleted file mode 100755
index 33081ea3f6..0000000000
--- a/kubernetes/oof/components/oof-has/requirements.yaml
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright © 2017 Amdocs, Bell Canada
-# Modifications Copyright © 2018 AT&T,VMware
-# Modifications Copyright © 2021 Orange
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-dependencies:
- - name: common
- version: ~9.x-0
- repository: '@local'
- - name: music
- version: ~9.x-0
- repository: '@local'
- condition: music.enabled
- - name: etcd
- version: ~9.x-0
- repository: '@local'
- condition: etcd.enabled
- - name: etcd-init
- version: ~9.x-0
- repository: '@local'
- condition: etcd-init.enabled
- - name: oof-has-api
- version: ~9.x-0
- repository: 'file://components/oof-has-api'
- condition: oof-has-api.enabled
- - name: oof-has-controller
- version: ~9.x-0
- repository: 'file://components/oof-has-controller'
- condition: oof-has-controller.enabled
- - name: oof-has-data
- version: ~9.x-0
- repository: 'file://components/oof-has-data'
- condition: oof-has-data.enabled
- - name: oof-has-reservation
- version: ~9.x-0
- repository: 'file://components/oof-has-reservation'
- condition: oof-has-reservation.enabled
- - name: oof-has-solver
- version: ~9.x-0
- repository: 'file://components/oof-has-solver'
- condition: oof-has-solver.enabled
- - name: repositoryGenerator
- version: ~9.x-0
- repository: '@local'
diff --git a/kubernetes/oof/components/oof-templates/Chart.yaml b/kubernetes/oof/components/oof-templates/Chart.yaml
index 5bb0add9a9..18f233b75d 100755
--- a/kubernetes/oof/components/oof-templates/Chart.yaml
+++ b/kubernetes/oof/components/oof-templates/Chart.yaml
@@ -1,6 +1,7 @@
# Copyright © 2017 Amdocs, Bell Canada
# Modifications Copyright © 2018 AT&T,VMware
# Modifications Copyright © 2021 Orange
+# Modifications Copyright © 2021 Nordix Foundation
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -14,7 +15,13 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-apiVersion: v1
+apiVersion: v2
description: ONAP OOF helm templates
name: oof-templates
-version: 9.0.0
+version: 10.0.0
+
+dependencies:
+ - name: common
+ version: ~10.x-0
+ repository: '@local'
+
diff --git a/kubernetes/oof/components/oof-templates/requirements.yaml b/kubernetes/oof/components/oof-templates/requirements.yaml
deleted file mode 100755
index 73b49e83d2..0000000000
--- a/kubernetes/oof/components/oof-templates/requirements.yaml
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright © 2017 Amdocs, Bell Canada
-# Modifications Copyright © 2018 AT&T,VMware
-# Modifications Copyright © 2021 Orange
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-dependencies:
- - name: common
- version: ~9.x-0
- repository: '@local'
diff --git a/kubernetes/oof/requirements.yaml b/kubernetes/oof/requirements.yaml
deleted file mode 100755
index fbfb868bb0..0000000000
--- a/kubernetes/oof/requirements.yaml
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright © 2017 Amdocs, Bell Canada
-# Modifications Copyright © 2018 AT&T,VMware
-# Modifications Copyright © 2021 Orange
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-dependencies:
- - name: common
- version: ~9.x-0
- repository: '@local'
- - name: certInitializer
- version: ~9.x-0
- repository: '@local'
- - name: oof-has
- version: ~9.x-0
- repository: 'file://components/oof-has'
- condition: oof-has.enabled
- - name: oof-templates
- version: ~9.x-0
- repository: 'file://components/oof-templates'
- - name: repositoryGenerator
- version: ~9.x-0
- repository: '@local'
- - name: serviceAccount
- version: ~9.x-0
- repository: '@local'
diff --git a/kubernetes/oof/resources/config/conf/common_config.yaml b/kubernetes/oof/resources/config/conf/common_config.yaml
index b1bd0edea4..8f00ac72da 100644
--- a/kubernetes/oof/resources/config/conf/common_config.yaml
+++ b/kubernetes/oof/resources/config/conf/common_config.yaml
@@ -153,9 +153,13 @@ PCI:
ml_enabled: false
nxi_termination:
- query_templates:
- nsi: "service-instance*('service-instance-id','{{ printf "{{instance_id}}" }}') > service-instance*('service-role','e2eserviceprofile-service')"
- nsi_with_profile: "service-instance*('service-instance-id','{{ printf "{{instance_id}}" }}') > service-instance*('service-role','e2eserviceprofile-service')('service-instance-id','{{ printf "{{profile_id}}" }}')"
- nssi: "service-instance*('service-instance-id','{{ printf "{{instance_id}}" }}') > service-instance*('service-role','nsi')"
- nssi_with_nsi: "service-instance*('service-instance-id','{{ printf "{{instance_id}}" }}') > service-instance*('service-role','nsi')('service-instance-id','{{ printf "{{nsi_id}}" }}')"
-
+ query_templates:
+ nsi: "service-instance*('service-instance-id','{{ printf "{{instance_id}}" }}') > service-instance*('service-role','e2eserviceprofile-service')"
+ nsi_with_profile: "service-instance*('service-instance-id','{{ printf "{{instance_id}}" }}') > service-instance*('service-role','e2eserviceprofile-service')('service-instance-id','{{ printf "{{profile_id}}" }}')"
+ nssi:
+ - "service-instance*('service-instance-id','{{ printf "{{instance_id}}" }}')('workload-context', 'CN') > service-instance*('service-role','nsi')"
+ - "service-instance*('service-instance-id','{{ printf "{{instance_id}}" }}')('workload-context', 'TN_BH') > service-instance*('service-role','nsi')"
+ - "service-instance*('service-instance-id','{{ printf "{{instance_id}}" }}')('workload-context', 'AN') > service-instance*('service-role','nsi')"
+ - "service-instance*('service-instance-id','{{ printf "{{instance_id}}" }}')('workload-context', 'AN_NF') > service-instance*('workload-context','AN')"
+ - "service-instance*('service-instance-id','{{ printf "{{instance_id}}" }}')('workload-context', 'TN_MH') > service-instance*('workload-context','AN')"
+ - "service-instance*('service-instance-id','{{ printf "{{instance_id}}" }}')('workload-context', 'AN_NF') > service-instance*('workload-context','AN')"
diff --git a/kubernetes/platform/Chart.yaml b/kubernetes/platform/Chart.yaml
index 8f8d565faa..5869d7401c 100644
--- a/kubernetes/platform/Chart.yaml
+++ b/kubernetes/platform/Chart.yaml
@@ -2,6 +2,7 @@
# Modifications Copyright © 2018 AT&T, Amdocs, Bell Canada
# Modifications Copyright © 2020 Nokia
# Modifications Copyright © 2021 Orange
+# Modifications Copyright © 2021 Nordix Foundation
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -15,7 +16,18 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-apiVersion: v1
+apiVersion: v2
description: ONAP platform components
name: platform
-version: 9.0.0
+version: 10.0.0
+
+dependencies:
+ - name: oom-cert-service
+ version: ~10.x-0
+ repository: 'file://components/oom-cert-service'
+ - name: cmpv2-cert-provider
+ version: ~10.x-0
+ repository: 'file://components/cmpv2-cert-provider'
+ - name: chartmuseum
+ version: ~10.x-0
+ repository: 'file://components/chartmuseum'
diff --git a/kubernetes/platform/Makefile b/kubernetes/platform/Makefile
index c5dd3f2df5..2a2c131027 100644
--- a/kubernetes/platform/Makefile
+++ b/kubernetes/platform/Makefile
@@ -34,7 +34,7 @@ make-%:
@if [ -f $*/Makefile ]; then make -C $*; fi
dep-%: make-%
- @if [ -f $*/requirements.yaml ]; then $(HELM_BIN) dep up $*; fi
+ @if [ -f $*/Chart.yaml ]; then $(HELM_BIN) dep up $*; fi
lint-%: dep-%
@if [ -f $*/Chart.yaml ]; then $(HELM_BIN) lint $*; fi
@@ -49,7 +49,7 @@ endif
@$(HELM_BIN) repo index $(PACKAGE_DIR)
clean:
- @rm -f */requirements.lock
+ @rm -f */Chart.lock
@rm -f *tgz */charts/*tgz
@rm -rf $(PACKAGE_DIR)
%:
diff --git a/kubernetes/platform/components/Makefile b/kubernetes/platform/components/Makefile
index 2fd1980ed0..be8e79090f 100644
--- a/kubernetes/platform/components/Makefile
+++ b/kubernetes/platform/components/Makefile
@@ -35,7 +35,7 @@ make-%:
@if [ -f $*/Makefile ]; then make -C $*; fi
dep-%: make-%
- @if [ -f $*/requirements.yaml ]; then $(HELM_BIN) dep up $*; fi
+ @if [ -f $*/Chart.yaml ]; then $(HELM_BIN) dep up $*; fi
lint-%: dep-%
@if [ -f $*/Chart.yaml ]; then $(HELM_BIN) lint $*; fi
@@ -50,7 +50,7 @@ endif
@$(HELM_BIN) repo index $(PACKAGE_DIR)
clean:
- @rm -f */requirements.lock
+ @rm -f */Chart.lock
@rm -f *tgz */charts/*tgz
@rm -rf $(PACKAGE_DIR)
%:
diff --git a/kubernetes/platform/components/chartmuseum/Chart.yaml b/kubernetes/platform/components/chartmuseum/Chart.yaml
index eba65a2aaa..16b504b1c3 100644
--- a/kubernetes/platform/components/chartmuseum/Chart.yaml
+++ b/kubernetes/platform/components/chartmuseum/Chart.yaml
@@ -2,6 +2,7 @@
# ================================================================================
# Copyright (c) 2021 AT&T. All rights reserved.
# Modifications Copyright © 2021 Orange
+# Modifications Copyright © 2021 Nordix Foundation
# ================================================================================
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -16,7 +17,21 @@
# limitations under the License.
# ============LICENSE_END=========================================================
-apiVersion: v1
+apiVersion: v2
description: ONAP Chart Museum
name: chartmuseum
-version: 9.0.0
+version: 10.0.0
+
+dependencies:
+ - name: common
+ version: ~10.x-0
+ repository: '@local'
+ - name: repositoryGenerator
+ version: ~10.x-0
+ repository: '@local'
+ - name: readinessCheck
+ version: ~10.x-0
+ repository: '@local'
+ - name: serviceAccount
+ version: ~10.x-0
+ repository: '@local'
diff --git a/kubernetes/platform/components/chartmuseum/requirements.yaml b/kubernetes/platform/components/chartmuseum/requirements.yaml
deleted file mode 100644
index 1847e4e66f..0000000000
--- a/kubernetes/platform/components/chartmuseum/requirements.yaml
+++ /dev/null
@@ -1,30 +0,0 @@
-#============LICENSE_START========================================================
-# Copyright (c) 2021 AT&T. All rights reserved.
-# Modifications Copyright © 2021 Orange
-# ================================================================================
-# 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=========================================================
-
-dependencies:
- - name: common
- version: ~9.x-0
- repository: '@local'
- - name: repositoryGenerator
- version: ~9.x-0
- repository: '@local'
- - name: readinessCheck
- version: ~9.x-0
- repository: '@local'
- - name: serviceAccount
- version: ~9.x-0
- repository: '@local'
diff --git a/kubernetes/platform/components/cmpv2-cert-provider/Chart.yaml b/kubernetes/platform/components/cmpv2-cert-provider/Chart.yaml
index 549b1fd469..b468412e55 100644
--- a/kubernetes/platform/components/cmpv2-cert-provider/Chart.yaml
+++ b/kubernetes/platform/components/cmpv2-cert-provider/Chart.yaml
@@ -1,5 +1,6 @@
# Copyright © 2020 Nokia
# Modifications Copyright © 2021 Orange
+# Modifications Copyright © 2021 Nordix Foundation
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -13,7 +14,15 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-apiVersion: v1
+apiVersion: v2
description: ONAP CMPv2 certificate external provider for cert-manager
name: cmpv2-cert-provider
-version: 9.0.0
+version: 10.0.0
+
+dependencies:
+ - name: common
+ version: ~10.x-0
+ repository: '@local'
+ - name: readinessCheck
+ version: ~10.x-0
+ repository: '@local'
diff --git a/kubernetes/platform/components/cmpv2-cert-provider/requirements.yaml b/kubernetes/platform/components/cmpv2-cert-provider/requirements.yaml
deleted file mode 100644
index a4b3c3d0ee..0000000000
--- a/kubernetes/platform/components/cmpv2-cert-provider/requirements.yaml
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright © 2020 Nokia
-# Modifications Copyright © 2021 Orange
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
- dependencies:
- - name: common
- version: ~9.x-0
- repository: '@local'
- - name: readinessCheck
- version: ~9.x-0
- repository: '@local'
diff --git a/kubernetes/platform/components/oom-cert-service/Chart.yaml b/kubernetes/platform/components/oom-cert-service/Chart.yaml
index 52f8d37c3f..de3b9eb7a9 100644
--- a/kubernetes/platform/components/oom-cert-service/Chart.yaml
+++ b/kubernetes/platform/components/oom-cert-service/Chart.yaml
@@ -1,5 +1,6 @@
# Copyright © 2020 Nokia
# Modifications Copyright © 2021 Orange
+# Modifications Copyright © 2021 Nordix Foundation
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -13,7 +14,21 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-apiVersion: v1
+apiVersion: v2
description: ONAP Cert Service
name: oom-cert-service
-version: 9.0.0
+version: 10.0.0
+
+dependencies:
+ - name: common
+ version: ~10.x-0
+ repository: '@local'
+ - name: repositoryGenerator
+ version: ~10.x-0
+ repository: '@local'
+ - name: certManagerCertificate
+ version: ~10.x-0
+ repository: '@local'
+ - name: cmpv2Config
+ version: ~10.x-0
+ repository: '@local'
diff --git a/kubernetes/platform/components/oom-cert-service/requirements.yaml b/kubernetes/platform/components/oom-cert-service/requirements.yaml
deleted file mode 100644
index 6ddec4b2d0..0000000000
--- a/kubernetes/platform/components/oom-cert-service/requirements.yaml
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright © 2020 Orange
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-dependencies:
- - name: common
- version: ~9.x-0
- repository: '@local'
- - name: repositoryGenerator
- version: ~9.x-0
- repository: '@local'
- - name: certManagerCertificate
- version: ~9.x-0
- repository: '@local'
- - name: cmpv2Config
- version: ~9.x-0
- repository: '@local'
diff --git a/kubernetes/platform/requirements.yaml b/kubernetes/platform/requirements.yaml
deleted file mode 100644
index 96ab5d0c9e..0000000000
--- a/kubernetes/platform/requirements.yaml
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright © 2017 Amdocs, Bell Canada
-# Modifications Copyright © 2018 AT&T
-# Modifications Copyright © 2020-2021 Orange
-# Modifications Copyright © 2020 Nokia
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-dependencies:
- - name: oom-cert-service
- version: ~9.x-0
- repository: 'file://components/oom-cert-service'
- - name: cmpv2-cert-provider
- version: ~9.x-0
- repository: 'file://components/cmpv2-cert-provider'
- - name: chartmuseum
- version: ~9.x-0
- repository: 'file://components/chartmuseum'
diff --git a/kubernetes/policy/Chart.yaml b/kubernetes/policy/Chart.yaml
index f983344412..54e2103ce7 100755
--- a/kubernetes/policy/Chart.yaml
+++ b/kubernetes/policy/Chart.yaml
@@ -1,6 +1,7 @@
# Copyright © 2017 Amdocs, Bell Canada
# Modifications Copyright © 2018, 2020 AT&T
# Modifications Copyright © 2021 Orange
+# Modifications Copyright © 2021 Nordix Foundation
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -14,7 +15,69 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-apiVersion: v1
+apiVersion: v2
description: ONAP Policy
name: policy
-version: 9.0.0
+version: 10.0.0
+
+dependencies:
+ - name: common
+ version: ~10.x-0
+ repository: '@local'
+ - name: mariadb-galera
+ version: ~10.x-0
+ repository: '@local'
+ - name: policy-nexus
+ version: ~10.x-0
+ repository: 'file://components/policy-nexus'
+ condition: policy-nexus.enabled
+ - name: policy-api
+ version: ~10.x-0
+ repository: 'file://components/policy-api'
+ condition: policy-api.enabled
+ - name: policy-pap
+ version: ~10.x-0
+ repository: 'file://components/policy-pap'
+ condition: policy-pap.enabled
+ - name: policy-xacml-pdp
+ version: ~10.x-0
+ repository: 'file://components/policy-xacml-pdp'
+ condition: policy-xacml-pdp.enabled
+ - name: policy-apex-pdp
+ version: ~10.x-0
+ repository: 'file://components/policy-apex-pdp'
+ condition: policy-apex-pdp.enabled
+ - name: policy-drools-pdp
+ version: ~10.x-0
+ repository: 'file://components/policy-drools-pdp'
+ condition: policy-drools-pdp.enabled
+ - name: policy-distribution
+ version: ~10.x-0
+ repository: 'file://components/policy-distribution'
+ condition: policy-distribution.enabled
+ - name: policy-clamp-be
+ version: ~10.x-0
+ repository: 'file://components/policy-clamp-be'
+ condition: policy-clamp-be.enabled
+ - name: policy-clamp-fe
+ version: ~10.x-0
+ repository: 'file://components/policy-clamp-fe'
+ condition: policy-clamp-fe.enabled
+ - name: policy-clamp-cl-k8s-ppnt
+ version: ~10.x-0
+ repository: 'file://components/policy-clamp-cl-k8s-ppnt'
+ condition: policy-clamp-cl-k8s-ppnt.enabled
+ - name: policy-clamp-cl-runtime
+ version: ~10.x-0
+ repository: 'file://components/policy-clamp-cl-runtime'
+ condition: policy-clamp-cl-runtime.enabled
+ - name: policy-gui
+ version: ~10.x-0
+ repository: 'file://components/policy-gui'
+ condition: policy-gui.enabled
+ - name: repositoryGenerator
+ version: ~10.x-0
+ repository: '@local'
+ - name: serviceAccount
+ version: ~10.x-0
+ repository: '@local'
diff --git a/kubernetes/policy/Makefile b/kubernetes/policy/Makefile
index 4c79718d02..51d7de122c 100755
--- a/kubernetes/policy/Makefile
+++ b/kubernetes/policy/Makefile
@@ -33,7 +33,7 @@ make-%:
@if [ -f $*/Makefile ]; then make -C $*; fi
dep-%: make-%
- @if [ -f $*/requirements.yaml ]; then $(HELM_BIN) dep up $*; fi
+ @if [ -f $*/Chart.yaml ]; then $(HELM_BIN) dep up $*; fi
lint-%: dep-%
@if [ -f $*/Chart.yaml ]; then $(HELM_BIN) lint $*; fi
@@ -44,7 +44,7 @@ package-%: lint-%
@$(HELM_BIN) repo index $(PACKAGE_DIR)
clean:
- @rm -f */requirements.lock
+ @rm -f */Chart.lock
@rm -f *tgz */charts/*tgz
@rm -rf $(PACKAGE_DIR)
%:
diff --git a/kubernetes/policy/components/Makefile b/kubernetes/policy/components/Makefile
index bf267b7720..f4c9784bc4 100755
--- a/kubernetes/policy/components/Makefile
+++ b/kubernetes/policy/components/Makefile
@@ -33,7 +33,7 @@ make-%:
@if [ -f $*/Makefile ]; then make -C $*; fi
dep-%: make-%
- @if [ -f $*/requirements.yaml ]; then $(HELM_BIN) dep up $*; fi
+ @if [ -f $*/Chart.yaml ]; then $(HELM_BIN) dep up $*; fi
lint-%: dep-%
@if [ -f $*/Chart.yaml ]; then $(HELM_BIN) lint $*; fi
@@ -44,7 +44,7 @@ package-%: lint-%
@$(HELM_BIN) repo index $(PACKAGE_DIR)
clean:
- @rm -f */requirements.lock
+ @rm -f */Chart.lock
@rm -f *tgz */charts/*tgz
@rm -rf $(PACKAGE_DIR)
%:
diff --git a/kubernetes/policy/components/policy-apex-pdp/Chart.yaml b/kubernetes/policy/components/policy-apex-pdp/Chart.yaml
index 6f3e5174e5..7f22e9fd0e 100755
--- a/kubernetes/policy/components/policy-apex-pdp/Chart.yaml
+++ b/kubernetes/policy/components/policy-apex-pdp/Chart.yaml
@@ -1,6 +1,7 @@
# ============LICENSE_START=======================================================
# Copyright (C) 2018 Ericsson. All rights reserved.
# Modifications Copyright © 2021 Orange
+# Modifications Copyright © 2021 Nordix Foundation
# ================================================================================
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -17,7 +18,21 @@
# SPDX-License-Identifier: Apache-2.0
# ============LICENSE_END=========================================================
-apiVersion: v1
+apiVersion: v2
description: ONAP Policy APEX PDP
name: policy-apex-pdp
-version: 9.0.0
+version: 10.0.0
+
+dependencies:
+ - name: common
+ version: ~10.x-0
+ repository: '@local'
+ - name: certInitializer
+ version: ~10.x-0
+ repository: '@local'
+ - name: repositoryGenerator
+ version: ~10.x-0
+ repository: '@local'
+ - name: serviceAccount
+ version: ~10.x-0
+ repository: '@local'
diff --git a/kubernetes/policy/components/policy-apex-pdp/requirements.yaml b/kubernetes/policy/components/policy-apex-pdp/requirements.yaml
deleted file mode 100755
index 9a57a49b2d..0000000000
--- a/kubernetes/policy/components/policy-apex-pdp/requirements.yaml
+++ /dev/null
@@ -1,33 +0,0 @@
-# ============LICENSE_START=======================================================
-# Copyright (C) 2018 Ericsson. All rights reserved.
-# Modifications Copyright © 2020 AT&T. All rights reserved.
-# Modifications Copyright © 2021 Orange
-# ================================================================================
-# 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.
-#
-# SPDX-License-Identifier: Apache-2.0
-# ============LICENSE_END=========================================================
-
-dependencies:
- - name: common
- version: ~9.x-0
- repository: '@local'
- - name: certInitializer
- version: ~9.x-0
- repository: '@local'
- - name: repositoryGenerator
- version: ~9.x-0
- repository: '@local'
- - name: serviceAccount
- version: ~9.x-0
- repository: '@local'
diff --git a/kubernetes/policy/components/policy-api/Chart.yaml b/kubernetes/policy/components/policy-api/Chart.yaml
index 1c7fba4491..82a0f48240 100755
--- a/kubernetes/policy/components/policy-api/Chart.yaml
+++ b/kubernetes/policy/components/policy-api/Chart.yaml
@@ -1,6 +1,7 @@
# ============LICENSE_START=======================================================
# Copyright (C) 2019-2020 AT&T Intellectual Property. All rights reserved.
# Modifications Copyright © 2021 Orange
+# Modifications Copyright © 2021 Nordix Foundation
# ================================================================================
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -17,7 +18,21 @@
# SPDX-License-Identifier: Apache-2.0
# ============LICENSE_END=========================================================
-apiVersion: v1
+apiVersion: v2
description: ONAP Policy Design API
name: policy-api
-version: 9.0.0
+version: 10.0.0
+
+dependencies:
+ - name: common
+ version: ~10.x-0
+ repository: '@local'
+ - name: certInitializer
+ version: ~10.x-0
+ repository: '@local'
+ - name: repositoryGenerator
+ version: ~10.x-0
+ repository: '@local'
+ - name: serviceAccount
+ version: ~10.x-0
+ repository: '@local'
diff --git a/kubernetes/policy/components/policy-api/requirements.yaml b/kubernetes/policy/components/policy-api/requirements.yaml
deleted file mode 100755
index 09b6249807..0000000000
--- a/kubernetes/policy/components/policy-api/requirements.yaml
+++ /dev/null
@@ -1,32 +0,0 @@
-# ============LICENSE_START=======================================================
-# Copyright (C) 2019-2020 AT&T Intellectual Property. All rights reserved.
-# Modifications Copyright © 2021 Orange
-# ================================================================================
-# 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.
-#
-# SPDX-License-Identifier: Apache-2.0
-# ============LICENSE_END=========================================================
-
-dependencies:
- - name: common
- version: ~9.x-0
- repository: '@local'
- - name: certInitializer
- version: ~9.x-0
- repository: '@local'
- - name: repositoryGenerator
- version: ~9.x-0
- repository: '@local'
- - name: serviceAccount
- version: ~9.x-0
- repository: '@local'
diff --git a/kubernetes/policy/components/policy-clamp-be/Chart.yaml b/kubernetes/policy/components/policy-clamp-be/Chart.yaml
index 9c4f57335c..e52eb76020 100644
--- a/kubernetes/policy/components/policy-clamp-be/Chart.yaml
+++ b/kubernetes/policy/components/policy-clamp-be/Chart.yaml
@@ -1,6 +1,7 @@
# Copyright © 2017 Amdocs, Bell Canada
# Modifications Copyright © 2018 AT&T
# Modifications Copyright © 2021 Orange
+# Modifications Copyright © 2021 Nordix Foundation
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -14,7 +15,18 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-apiVersion: v1
+apiVersion: v2
description: ONAP Policy Clamp Backend
name: policy-clamp-be
-version: 9.0.0
+version: 10.0.0
+
+dependencies:
+ - name: certInitializer
+ version: ~10.x-0
+ repository: '@local'
+ - name: repositoryGenerator
+ version: ~10.x-0
+ repository: '@local'
+ - name: serviceAccount
+ version: ~10.x-0
+ repository: '@local'
diff --git a/kubernetes/policy/components/policy-clamp-be/requirements.yaml b/kubernetes/policy/components/policy-clamp-be/requirements.yaml
deleted file mode 100644
index c72d9fa7b7..0000000000
--- a/kubernetes/policy/components/policy-clamp-be/requirements.yaml
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright © 2017 Amdocs, Bell Canada
-# Modifications Copyright © 2018 AT&T
-# Modifications Copyright © 2021 Orange
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-dependencies:
- - name: certInitializer
- version: ~9.x-0
- repository: '@local'
- - name: repositoryGenerator
- version: ~9.x-0
- repository: '@local'
- - name: serviceAccount
- version: ~9.x-0
- repository: '@local'
diff --git a/kubernetes/policy/components/policy-clamp-cl-http-ppnt/Chart.yaml b/kubernetes/policy/components/policy-clamp-cl-http-ppnt/Chart.yaml
index 463e007d9f..4cf7c40590 100644
--- a/kubernetes/policy/components/policy-clamp-cl-http-ppnt/Chart.yaml
+++ b/kubernetes/policy/components/policy-clamp-cl-http-ppnt/Chart.yaml
@@ -1,5 +1,6 @@
# ============LICENSE_START=======================================================
# Copyright (C) 2021 Nordix Foundation.
+# Modifications Copyright © 2021 Nordix Foundation
# ================================================================================
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -16,7 +17,21 @@
# SPDX-License-Identifier: Apache-2.0
# ============LICENSE_END=========================================================
-apiVersion: v1
+apiVersion: v2
description: ONAP Policy Clamp Controlloop Http Participant
name: policy-clamp-cl-http-ppnt
-version: 9.0.0
+version: 10.0.0
+
+dependencies:
+ - name: common
+ version: ~10.x-0
+ repository: '@local'
+ - name: certInitializer
+ version: ~10.x-0
+ repository: '@local'
+ - name: repositoryGenerator
+ version: ~10.x-0
+ repository: '@local'
+ - name: serviceAccount
+ version: ~10.x-0
+ repository: '@local' \ No newline at end of file
diff --git a/kubernetes/policy/components/policy-clamp-cl-http-ppnt/requirements.yaml b/kubernetes/policy/components/policy-clamp-cl-http-ppnt/requirements.yaml
deleted file mode 100644
index 0139b52b25..0000000000
--- a/kubernetes/policy/components/policy-clamp-cl-http-ppnt/requirements.yaml
+++ /dev/null
@@ -1,31 +0,0 @@
-# ============LICENSE_START=======================================================
-# Copyright (C) 2021 Nordix Foundation.
-# ================================================================================
-# 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.
-#
-# SPDX-License-Identifier: Apache-2.0
-# ============LICENSE_END=========================================================
-
-dependencies:
- - name: common
- version: ~9.x-0
- repository: '@local'
- - name: certInitializer
- version: ~9.x-0
- repository: '@local'
- - name: repositoryGenerator
- version: ~9.x-0
- repository: '@local'
- - name: serviceAccount
- version: ~9.x-0
- repository: '@local'
diff --git a/kubernetes/policy/components/policy-clamp-cl-k8s-ppnt/Chart.yaml b/kubernetes/policy/components/policy-clamp-cl-k8s-ppnt/Chart.yaml
index e880ee376e..0427a423bc 100644
--- a/kubernetes/policy/components/policy-clamp-cl-k8s-ppnt/Chart.yaml
+++ b/kubernetes/policy/components/policy-clamp-cl-k8s-ppnt/Chart.yaml
@@ -1,6 +1,7 @@
# ============LICENSE_START=======================================================
# Copyright (C) 2021 Nordix Foundation. All rights reserved.
# Modifications Copyright © 2021 Orange
+# Modifications Copyright © 2021 Nordix Foundation
# ================================================================================
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -17,7 +18,21 @@
# SPDX-License-Identifier: Apache-2.0
# ============LICENSE_END=========================================================
-apiVersion: v1
+apiVersion: v2
description: ONAP Policy Clamp Controlloop K8s Participant
name: policy-clamp-cl-k8s-ppnt
-version: 9.0.0
+version: 10.0.0
+
+dependencies:
+ - name: common
+ version: ~10.x-0
+ repository: '@local'
+ - name: certInitializer
+ version: ~10.x-0
+ repository: '@local'
+ - name: repositoryGenerator
+ version: ~10.x-0
+ repository: '@local'
+ - name: serviceAccount
+ version: ~10.x-0
+ repository: '@local'
diff --git a/kubernetes/policy/components/policy-clamp-cl-k8s-ppnt/requirements.yaml b/kubernetes/policy/components/policy-clamp-cl-k8s-ppnt/requirements.yaml
deleted file mode 100644
index b4dba11494..0000000000
--- a/kubernetes/policy/components/policy-clamp-cl-k8s-ppnt/requirements.yaml
+++ /dev/null
@@ -1,32 +0,0 @@
-# ============LICENSE_START=======================================================
-# Copyright (C) 2021 Nordix Foundation. All rights reserved.
-# Modifications Copyright © 2021 Orange
-# ================================================================================
-# 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.
-#
-# SPDX-License-Identifier: Apache-2.0
-# ============LICENSE_END=========================================================
-
-dependencies:
- - name: common
- version: ~9.x-0
- repository: '@local'
- - name: certInitializer
- version: ~9.x-0
- repository: '@local'
- - name: repositoryGenerator
- version: ~9.x-0
- repository: '@local'
- - name: serviceAccount
- version: ~9.x-0
- repository: '@local'
diff --git a/kubernetes/policy/components/policy-clamp-cl-pf-ppnt/Chart.yaml b/kubernetes/policy/components/policy-clamp-cl-pf-ppnt/Chart.yaml
index bdca3aaf16..d80fa4d2da 100644
--- a/kubernetes/policy/components/policy-clamp-cl-pf-ppnt/Chart.yaml
+++ b/kubernetes/policy/components/policy-clamp-cl-pf-ppnt/Chart.yaml
@@ -1,5 +1,6 @@
# ============LICENSE_START=======================================================
# Copyright (C) 2021 Nordix Foundation. All rights reserved.
+# Modifications Copyright © 2021 Nordix Foundation
# ================================================================================
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -16,7 +17,21 @@
# SPDX-License-Identifier: Apache-2.0
# ============LICENSE_END=========================================================
-apiVersion: v1
+apiVersion: v2
description: ONAP Policy Clamp Controlloop Policy Participant
name: policy-clamp-cl-pf-ppnt
-version: 9.0.0
+version: 10.0.0
+
+dependencies:
+ - name: common
+ version: ~10.x-0
+ repository: '@local'
+ - name: certInitializer
+ version: ~10.x-0
+ repository: '@local'
+ - name: repositoryGenerator
+ version: ~10.x-0
+ repository: '@local'
+ - name: serviceAccount
+ version: ~10.x-0
+ repository: '@local' \ No newline at end of file
diff --git a/kubernetes/policy/components/policy-clamp-cl-pf-ppnt/requirements.yaml b/kubernetes/policy/components/policy-clamp-cl-pf-ppnt/requirements.yaml
deleted file mode 100644
index e6af3b046f..0000000000
--- a/kubernetes/policy/components/policy-clamp-cl-pf-ppnt/requirements.yaml
+++ /dev/null
@@ -1,31 +0,0 @@
-# ============LICENSE_START=======================================================
-# Copyright (C) 2021 Nordix Foundation. 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.
-#
-# SPDX-License-Identifier: Apache-2.0
-# ============LICENSE_END=========================================================
-
-dependencies:
- - name: common
- version: ~9.x-0
- repository: '@local'
- - name: certInitializer
- version: ~9.x-0
- repository: '@local'
- - name: repositoryGenerator
- version: ~9.x-0
- repository: '@local'
- - name: serviceAccount
- version: ~9.x-0
- repository: '@local'
diff --git a/kubernetes/policy/components/policy-clamp-cl-runtime/Chart.yaml b/kubernetes/policy/components/policy-clamp-cl-runtime/Chart.yaml
index bbcdb1f120..0adfd34a7c 100644
--- a/kubernetes/policy/components/policy-clamp-cl-runtime/Chart.yaml
+++ b/kubernetes/policy/components/policy-clamp-cl-runtime/Chart.yaml
@@ -1,6 +1,7 @@
# ============LICENSE_START=======================================================
# Copyright (C) 2021 Nordix Foundation. All rights reserved.
# Modifications Copyright © 2021 Orange
+# Modifications Copyright © 2021 Nordix Foundation
# ================================================================================
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -17,7 +18,21 @@
# SPDX-License-Identifier: Apache-2.0
# ============LICENSE_END=========================================================
-apiVersion: v1
+apiVersion: v2
description: ONAP Policy Clamp Controlloop Runtime
name: policy-clamp-cl-runtime
-version: 9.0.0
+version: 10.0.0
+
+dependencies:
+ - name: common
+ version: ~10.x-0
+ repository: '@local'
+ - name: certInitializer
+ version: ~10.x-0
+ repository: '@local'
+ - name: repositoryGenerator
+ version: ~10.x-0
+ repository: '@local'
+ - name: serviceAccount
+ version: ~10.x-0
+ repository: '@local'
diff --git a/kubernetes/policy/components/policy-clamp-cl-runtime/requirements.yaml b/kubernetes/policy/components/policy-clamp-cl-runtime/requirements.yaml
deleted file mode 100644
index b4dba11494..0000000000
--- a/kubernetes/policy/components/policy-clamp-cl-runtime/requirements.yaml
+++ /dev/null
@@ -1,32 +0,0 @@
-# ============LICENSE_START=======================================================
-# Copyright (C) 2021 Nordix Foundation. All rights reserved.
-# Modifications Copyright © 2021 Orange
-# ================================================================================
-# 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.
-#
-# SPDX-License-Identifier: Apache-2.0
-# ============LICENSE_END=========================================================
-
-dependencies:
- - name: common
- version: ~9.x-0
- repository: '@local'
- - name: certInitializer
- version: ~9.x-0
- repository: '@local'
- - name: repositoryGenerator
- version: ~9.x-0
- repository: '@local'
- - name: serviceAccount
- version: ~9.x-0
- repository: '@local'
diff --git a/kubernetes/policy/components/policy-clamp-fe/Chart.yaml b/kubernetes/policy/components/policy-clamp-fe/Chart.yaml
index c511c37d15..f703987a44 100644
--- a/kubernetes/policy/components/policy-clamp-fe/Chart.yaml
+++ b/kubernetes/policy/components/policy-clamp-fe/Chart.yaml
@@ -1,6 +1,7 @@
# Copyright © 2017 Amdocs, Bell Canada
# Modifications Copyright © 2018 AT&T
# Modifications Copyright © 2021 Orange
+# Modifications Copyright © 2021 Nordix Foundation
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -14,7 +15,18 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-apiVersion: v1
+apiVersion: v2
description: ONAP Policy Clamp Frontend
name: policy-clamp-fe
-version: 9.0.0
+version: 10.0.0
+
+dependencies:
+ - name: certInitializer
+ version: ~10.x-0
+ repository: '@local'
+ - name: repositoryGenerator
+ version: ~10.x-0
+ repository: '@local'
+ - name: serviceAccount
+ version: ~10.x-0
+ repository: '@local'
diff --git a/kubernetes/policy/components/policy-clamp-fe/requirements.yaml b/kubernetes/policy/components/policy-clamp-fe/requirements.yaml
deleted file mode 100644
index c72d9fa7b7..0000000000
--- a/kubernetes/policy/components/policy-clamp-fe/requirements.yaml
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright © 2017 Amdocs, Bell Canada
-# Modifications Copyright © 2018 AT&T
-# Modifications Copyright © 2021 Orange
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-dependencies:
- - name: certInitializer
- version: ~9.x-0
- repository: '@local'
- - name: repositoryGenerator
- version: ~9.x-0
- repository: '@local'
- - name: serviceAccount
- version: ~9.x-0
- repository: '@local'
diff --git a/kubernetes/policy/components/policy-distribution/Chart.yaml b/kubernetes/policy/components/policy-distribution/Chart.yaml
index b3ee15e947..b1758e53ba 100755
--- a/kubernetes/policy/components/policy-distribution/Chart.yaml
+++ b/kubernetes/policy/components/policy-distribution/Chart.yaml
@@ -1,6 +1,7 @@
# ============LICENSE_START=======================================================
# Copyright (C) 2018 Ericsson. All rights reserved.
# Modifications Copyright © 2021 Orange
+# Modifications Copyright © 2021 Nordix Foundation
# ================================================================================
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -17,7 +18,21 @@
# SPDX-License-Identifier: Apache-2.0
# ============LICENSE_END=========================================================
-apiVersion: v1
+apiVersion: v2
description: ONAP Policy Distribution
name: policy-distribution
-version: 9.0.0
+version: 10.0.0
+
+dependencies:
+ - name: common
+ version: ~10.x-0
+ repository: '@local'
+ - name: certInitializer
+ version: ~10.x-0
+ repository: '@local'
+ - name: repositoryGenerator
+ version: ~10.x-0
+ repository: '@local'
+ - name: serviceAccount
+ version: ~10.x-0
+ repository: '@local'
diff --git a/kubernetes/policy/components/policy-distribution/requirements.yaml b/kubernetes/policy/components/policy-distribution/requirements.yaml
deleted file mode 100755
index 1a3127bdbb..0000000000
--- a/kubernetes/policy/components/policy-distribution/requirements.yaml
+++ /dev/null
@@ -1,33 +0,0 @@
-# ============LICENSE_START=======================================================
-# Copyright (C) 2018 Ericsson. All rights reserved.
-# Modifications Copyright (C) 2020 AT&T. All rights reserved.
-# Modifications Copyright © 2021 Orange
-# ================================================================================
-# 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.
-#
-# SPDX-License-Identifier: Apache-2.0
-# ============LICENSE_END=========================================================
-
-dependencies:
- - name: common
- version: ~9.x-0
- repository: '@local'
- - name: certInitializer
- version: ~9.x-0
- repository: '@local'
- - name: repositoryGenerator
- version: ~9.x-0
- repository: '@local'
- - name: serviceAccount
- version: ~9.x-0
- repository: '@local'
diff --git a/kubernetes/policy/components/policy-drools-pdp/Chart.yaml b/kubernetes/policy/components/policy-drools-pdp/Chart.yaml
index 5ed9a70def..c8cc5523a4 100755
--- a/kubernetes/policy/components/policy-drools-pdp/Chart.yaml
+++ b/kubernetes/policy/components/policy-drools-pdp/Chart.yaml
@@ -1,6 +1,7 @@
# Copyright © 2017 Amdocs, Bell Canada
# Modifications Copyright © 2018, 2020 AT&T Intellectual Property
# Modifications Copyright © 2021 Orange
+# Modifications Copyright © 2021 Nordix Foundation
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -14,7 +15,21 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-apiVersion: v1
+apiVersion: v2
description: ONAP Drools Policy Engine (PDP-D)
name: policy-drools-pdp
-version: 9.0.0
+version: 10.0.0
+
+dependencies:
+ - name: common
+ version: ~10.x-0
+ repository: '@local'
+ - name: certInitializer
+ version: ~10.x-0
+ repository: '@local'
+ - name: repositoryGenerator
+ version: ~10.x-0
+ repository: '@local'
+ - name: serviceAccount
+ version: ~10.x-0
+ repository: '@local'
diff --git a/kubernetes/policy/components/policy-drools-pdp/requirements.yaml b/kubernetes/policy/components/policy-drools-pdp/requirements.yaml
deleted file mode 100755
index 68b10de6e9..0000000000
--- a/kubernetes/policy/components/policy-drools-pdp/requirements.yaml
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright © 2017 Amdocs, Bell Canada
-# Modifications Copyright © 2018, 2020 AT&T Intellectual Property
-# Modifications Copyright © 2021 Orange
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-dependencies:
- - name: common
- version: ~9.x-0
- repository: '@local'
- - name: certInitializer
- version: ~9.x-0
- repository: '@local'
- - name: repositoryGenerator
- version: ~9.x-0
- repository: '@local'
- - name: serviceAccount
- version: ~9.x-0
- repository: '@local'
diff --git a/kubernetes/policy/components/policy-gui/Chart.yaml b/kubernetes/policy/components/policy-gui/Chart.yaml
index a407ea9071..af1adbe3c7 100644
--- a/kubernetes/policy/components/policy-gui/Chart.yaml
+++ b/kubernetes/policy/components/policy-gui/Chart.yaml
@@ -1,6 +1,7 @@
# ============LICENSE_START=======================================================
# Copyright (C) 2021 Nordix Foundation.
# Modifications Copyright © 2021 Orange
+# Modifications Copyright © 2021 Nordix Foundation
# ================================================================================
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -17,7 +18,18 @@
# SPDX-License-Identifier: Apache-2.0
# ============LICENSE_END=========================================================
-apiVersion: v1
+apiVersion: v2
description: ONAP Policy GUI
name: policy-gui
-version: 9.0.0
+version: 10.0.0
+
+dependencies:
+ - name: certInitializer
+ version: ~10.x-0
+ repository: '@local'
+ - name: repositoryGenerator
+ version: ~10.x-0
+ repository: '@local'
+ - name: serviceAccount
+ version: ~10.x-0
+ repository: '@local'
diff --git a/kubernetes/policy/components/policy-gui/requirements.yaml b/kubernetes/policy/components/policy-gui/requirements.yaml
deleted file mode 100644
index acf19af888..0000000000
--- a/kubernetes/policy/components/policy-gui/requirements.yaml
+++ /dev/null
@@ -1,29 +0,0 @@
-# ============LICENSE_START=======================================================
-# Copyright (C) 2021 Nordix Foundation.
-# Modifications Copyright © 2021 Orange
-# ================================================================================
-# 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.
-#
-# SPDX-License-Identifier: Apache-2.0
-# ============LICENSE_END=========================================================
-
-dependencies:
- - name: certInitializer
- version: ~9.x-0
- repository: '@local'
- - name: repositoryGenerator
- version: ~9.x-0
- repository: '@local'
- - name: serviceAccount
- version: ~9.x-0
- repository: '@local'
diff --git a/kubernetes/policy/components/policy-nexus/Chart.yaml b/kubernetes/policy/components/policy-nexus/Chart.yaml
index 5f4276b6ac..48497f2c8d 100755
--- a/kubernetes/policy/components/policy-nexus/Chart.yaml
+++ b/kubernetes/policy/components/policy-nexus/Chart.yaml
@@ -1,6 +1,7 @@
# Copyright © 2017 Amdocs, Bell Canada
# Modifications Copyright © 2018-2020 AT&T
# Modifications Copyright © 2021 Orange
+# Modifications Copyright © 2021 Nordix Foundation
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -14,7 +15,21 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-apiVersion: v1
+apiVersion: v2
description: ONAP Policy Nexus
name: policy-nexus
-version: 9.0.0
+version: 10.0.0
+
+dependencies:
+ - name: common
+ version: ~10.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: repositoryGenerator
+ version: ~10.x-0
+ repository: '@local'
+ - name: serviceAccount
+ version: ~10.x-0
+ repository: '@local'
diff --git a/kubernetes/policy/components/policy-nexus/requirements.yaml b/kubernetes/policy/components/policy-nexus/requirements.yaml
deleted file mode 100755
index 74c05f4b68..0000000000
--- a/kubernetes/policy/components/policy-nexus/requirements.yaml
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright © 2017 Amdocs, Bell Canada
-# Modifications Copyright © 2018 AT&T
-# Modifications Copyright © 2021 Orange
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-dependencies:
- - name: common
- version: ~9.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: repositoryGenerator
- version: ~9.x-0
- repository: '@local'
- - name: serviceAccount
- version: ~9.x-0
- repository: '@local'
diff --git a/kubernetes/policy/components/policy-pap/Chart.yaml b/kubernetes/policy/components/policy-pap/Chart.yaml
index 8f02c837ac..c10d636a5d 100755
--- a/kubernetes/policy/components/policy-pap/Chart.yaml
+++ b/kubernetes/policy/components/policy-pap/Chart.yaml
@@ -2,6 +2,7 @@
# Copyright (C) 2019 Nordix Foundation.
# Modified Copyright (C) 2020 AT&T Intellectual Property.
# Modifications Copyright © 2021 Orange
+# Modifications Copyright © 2021 Nordix Foundation
# ================================================================================
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -18,7 +19,21 @@
# SPDX-License-Identifier: Apache-2.0
# ============LICENSE_END=========================================================
-apiVersion: v1
+apiVersion: v2
description: ONAP Policy Administration (PAP)
name: policy-pap
-version: 9.0.0
+version: 10.0.0
+
+dependencies:
+ - name: common
+ version: ~10.x-0
+ repository: '@local'
+ - name: certInitializer
+ version: ~10.x-0
+ repository: '@local'
+ - name: repositoryGenerator
+ version: ~10.x-0
+ repository: '@local'
+ - name: serviceAccount
+ version: ~10.x-0
+ repository: '@local'
diff --git a/kubernetes/policy/components/policy-pap/requirements.yaml b/kubernetes/policy/components/policy-pap/requirements.yaml
deleted file mode 100755
index c146e3ee24..0000000000
--- a/kubernetes/policy/components/policy-pap/requirements.yaml
+++ /dev/null
@@ -1,33 +0,0 @@
-# ============LICENSE_START=======================================================
-# Copyright (C) 2019 Nordix Foundation.
-# Modified Copyright (C) 2020 AT&T Intellectual Property.
-# Modifications Copyright © 2021 Orange
-# ================================================================================
-# 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.
-#
-# SPDX-License-Identifier: Apache-2.0
-# ============LICENSE_END=========================================================
-
-dependencies:
- - name: common
- version: ~9.x-0
- repository: '@local'
- - name: certInitializer
- version: ~9.x-0
- repository: '@local'
- - name: repositoryGenerator
- version: ~9.x-0
- repository: '@local'
- - name: serviceAccount
- version: ~9.x-0
- repository: '@local'
diff --git a/kubernetes/policy/components/policy-xacml-pdp/Chart.yaml b/kubernetes/policy/components/policy-xacml-pdp/Chart.yaml
index f04393931b..01bb146cd9 100755
--- a/kubernetes/policy/components/policy-xacml-pdp/Chart.yaml
+++ b/kubernetes/policy/components/policy-xacml-pdp/Chart.yaml
@@ -1,6 +1,7 @@
# ============LICENSE_START=======================================================
# Copyright (C) 2019-2020 AT&T Intellectual Property. All rights reserved.
# Modifications Copyright © 2021 Orange
+# Modifications Copyright © 2021 Nordix Foundation
# ================================================================================
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -17,7 +18,21 @@
# SPDX-License-Identifier: Apache-2.0
# ============LICENSE_END=========================================================
-apiVersion: v1
+apiVersion: v2
description: ONAP Policy XACML PDP (PDP-X)
name: policy-xacml-pdp
-version: 9.0.0
+version: 10.0.0
+
+dependencies:
+ - name: common
+ version: ~10.x-0
+ repository: '@local'
+ - name: certInitializer
+ version: ~10.x-0
+ repository: '@local'
+ - name: repositoryGenerator
+ version: ~10.x-0
+ repository: '@local'
+ - name: serviceAccount
+ version: ~10.x-0
+ repository: '@local'
diff --git a/kubernetes/policy/components/policy-xacml-pdp/requirements.yaml b/kubernetes/policy/components/policy-xacml-pdp/requirements.yaml
deleted file mode 100755
index 09b6249807..0000000000
--- a/kubernetes/policy/components/policy-xacml-pdp/requirements.yaml
+++ /dev/null
@@ -1,32 +0,0 @@
-# ============LICENSE_START=======================================================
-# Copyright (C) 2019-2020 AT&T Intellectual Property. All rights reserved.
-# Modifications Copyright © 2021 Orange
-# ================================================================================
-# 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.
-#
-# SPDX-License-Identifier: Apache-2.0
-# ============LICENSE_END=========================================================
-
-dependencies:
- - name: common
- version: ~9.x-0
- repository: '@local'
- - name: certInitializer
- version: ~9.x-0
- repository: '@local'
- - name: repositoryGenerator
- version: ~9.x-0
- repository: '@local'
- - name: serviceAccount
- version: ~9.x-0
- repository: '@local'
diff --git a/kubernetes/policy/requirements.yaml b/kubernetes/policy/requirements.yaml
deleted file mode 100755
index 949199aa81..0000000000
--- a/kubernetes/policy/requirements.yaml
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright © 2017 Amdocs, Bell Canada
-# Modifications Copyright © 2018, 2020 AT&T
-# Modifications Copyright (C) 2021 Nordix Foundation.
-# Modifications Copyright © 2021 Orange
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-dependencies:
- - name: common
- version: ~9.x-0
- repository: '@local'
- - name: mariadb-galera
- version: ~9.x-0
- repository: '@local'
- - name: policy-nexus
- version: ~9.x-0
- repository: 'file://components/policy-nexus'
- condition: policy-nexus.enabled
- - name: policy-api
- version: ~9.x-0
- repository: 'file://components/policy-api'
- condition: policy-api.enabled
- - name: policy-pap
- version: ~9.x-0
- repository: 'file://components/policy-pap'
- condition: policy-pap.enabled
- - name: policy-xacml-pdp
- version: ~9.x-0
- repository: 'file://components/policy-xacml-pdp'
- condition: policy-xacml-pdp.enabled
- - name: policy-apex-pdp
- version: ~9.x-0
- repository: 'file://components/policy-apex-pdp'
- condition: policy-apex-pdp.enabled
- - name: policy-drools-pdp
- version: ~9.x-0
- repository: 'file://components/policy-drools-pdp'
- condition: policy-drools-pdp.enabled
- - name: policy-distribution
- version: ~9.x-0
- repository: 'file://components/policy-distribution'
- condition: policy-distribution.enabled
- - name: policy-clamp-be
- version: ~9.x-0
- repository: 'file://components/policy-clamp-be'
- condition: policy-clamp-be.enabled
- - name: policy-clamp-fe
- version: ~9.x-0
- repository: 'file://components/policy-clamp-fe'
- condition: policy-clamp-fe.enabled
- - name: policy-clamp-cl-k8s-ppnt
- version: ~9.x-0
- repository: 'file://components/policy-clamp-cl-k8s-ppnt'
- condition: policy-clamp-cl-k8s-ppnt.enabled
- - name: policy-clamp-cl-runtime
- version: ~9.x-0
- repository: 'file://components/policy-clamp-cl-runtime'
- condition: policy-clamp-cl-runtime.enabled
- - name: policy-gui
- version: ~9.x-0
- repository: 'file://components/policy-gui'
- condition: policy-gui.enabled
- - name: policy-clamp-cl-pf-ppnt
- version: ~9.x-0
- repository: 'file://components/policy-clamp-cl-pf-ppnt'
- condition: policy-clamp-cl-pf-ppnt.enabled
- - name: policy-clamp-cl-http-ppnt
- version: ~9.x-0
- repository: 'file://components/policy-clamp-cl-http-ppnt'
- condition: policy-clamp-cl-http-ppnt.enabled
- - name: repositoryGenerator
- version: ~9.x-0
- repository: '@local'
- - name: serviceAccount
- version: ~9.x-0
- repository: '@local'
diff --git a/kubernetes/portal/Chart.yaml b/kubernetes/portal/Chart.yaml
index 16edb6d415..698847338f 100644
--- a/kubernetes/portal/Chart.yaml
+++ b/kubernetes/portal/Chart.yaml
@@ -1,6 +1,7 @@
# Copyright © 2017 Amdocs, Bell Canada
# Modifications Copyright © 2018 AT&T
# Modifications Copyright © 2021 Orange
+# Modifications Copyright © 2021 Nordix Foundation
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -14,7 +15,27 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-apiVersion: v1
+apiVersion: v2
description: ONAP Web Portal
name: portal
-version: 9.0.0
+version: 10.0.0
+
+dependencies:
+ - name: common
+ version: ~10.x-0
+ repository: '@local'
+ - name: portal-app
+ version: ~10.x-0
+ repository: 'file://components/portal-app'
+ - name: portal-cassandra
+ version: ~10.x-0
+ repository: 'file://components/portal-cassandra'
+ - name: portal-mariadb
+ version: ~10.x-0
+ repository: 'file://components/portal-mariadb'
+ - name: portal-sdk
+ version: ~10.x-0
+ repository: 'file://components/portal-sdk'
+ - name: portal-widget
+ version: ~10.x-0
+ repository: 'file://components/portal-widget'
diff --git a/kubernetes/portal/Makefile b/kubernetes/portal/Makefile
index 89b2f465ec..2f6c6fe47c 100644
--- a/kubernetes/portal/Makefile
+++ b/kubernetes/portal/Makefile
@@ -34,7 +34,7 @@ make-%:
@if [ -f $*/Makefile ]; then make -C $*; fi
dep-%: make-%
- @if [ -f $*/requirements.yaml ]; then $(HELM_BIN) dep up $*; fi
+ @if [ -f $*/Chart.yaml ]; then $(HELM_BIN) dep up $*; fi
lint-%: dep-%
@if [ -f $*/Chart.yaml ]; then $(HELM_BIN) lint $*; fi
@@ -49,7 +49,7 @@ endif
@$(HELM_BIN) repo index $(PACKAGE_DIR)
clean:
- @rm -f */requirements.lock
+ @rm -f */Chart.lock
@rm -f *tgz */charts/*tgz
@rm -rf $(PACKAGE_DIR)
%:
diff --git a/kubernetes/portal/components/Makefile b/kubernetes/portal/components/Makefile
index d62cb0b700..1688db2d44 100644
--- a/kubernetes/portal/components/Makefile
+++ b/kubernetes/portal/components/Makefile
@@ -34,7 +34,7 @@ make-%:
@if [ -f $*/Makefile ]; then make -C $*; fi
dep-%: make-%
- @if [ -f $*/requirements.yaml ]; then $(HELM_BIN) dep up $*; fi
+ @if [ -f $*/Chart.yaml ]; then $(HELM_BIN) dep up $*; fi
lint-%: dep-%
@if [ -f $*/Chart.yaml ]; then $(HELM_BIN) lint $*; fi
@@ -49,7 +49,7 @@ endif
@$(HELM_BIN) repo index $(PACKAGE_DIR)
clean:
- @rm -f */requirements.lock
+ @rm -f */Chart.lock
@rm -f *tgz */charts/*tgz
@rm -rf $(PACKAGE_DIR)
%:
diff --git a/kubernetes/portal/components/portal-app/Chart.yaml b/kubernetes/portal/components/portal-app/Chart.yaml
index 79449df8bb..a73fffed58 100644
--- a/kubernetes/portal/components/portal-app/Chart.yaml
+++ b/kubernetes/portal/components/portal-app/Chart.yaml
@@ -1,5 +1,6 @@
# Copyright © 2017 Amdocs, Bell Canada
# Modifications Copyright © 2021 Orange
+# Modifications Copyright © 2021 Nordix Foundation
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -13,7 +14,18 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-apiVersion: v1
+apiVersion: v2
description: ONAP Portal application
name: portal-app
-version: 9.0.0
+version: 10.0.0
+
+dependencies:
+ - name: common
+ version: ~10.x-0
+ repository: '@local'
+ - name: certInitializer
+ version: ~10.x-0
+ repository: '@local'
+ - name: repositoryGenerator
+ version: ~10.x-0
+ repository: '@local'
diff --git a/kubernetes/portal/components/portal-app/requirements.yaml b/kubernetes/portal/components/portal-app/requirements.yaml
deleted file mode 100644
index 8d18e7fdfe..0000000000
--- a/kubernetes/portal/components/portal-app/requirements.yaml
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright © 2020 Samsung Electronics
-# Modifications Copyright © 2021 Orange
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-dependencies:
- - name: common
- version: ~9.x-0
- repository: '@local'
- - name: certInitializer
- version: ~9.x-0
- repository: '@local'
- - name: repositoryGenerator
- version: ~9.x-0
- repository: '@local'
diff --git a/kubernetes/portal/components/portal-cassandra/Chart.yaml b/kubernetes/portal/components/portal-cassandra/Chart.yaml
index 0e8762b4b6..f65b413f19 100644
--- a/kubernetes/portal/components/portal-cassandra/Chart.yaml
+++ b/kubernetes/portal/components/portal-cassandra/Chart.yaml
@@ -1,6 +1,7 @@
# Copyright © 2017 Amdocs, Bell Canada
# Modifications Copyright © 2018 AT&T
# Modifications Copyright © 2021 Orange
+# Modifications Copyright © 2021 Nordix Foundation
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -14,7 +15,15 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-apiVersion: v1
+apiVersion: v2
description: Portal cassandra
name: portal-cassandra
-version: 9.0.0
+version: 10.0.0
+
+dependencies:
+ - name: common
+ version: ~10.x-0
+ repository: '@local'
+ - name: repositoryGenerator
+ version: ~10.x-0
+ repository: '@local'
diff --git a/kubernetes/portal/components/portal-cassandra/requirements.yaml b/kubernetes/portal/components/portal-cassandra/requirements.yaml
deleted file mode 100644
index 6e32e22dc0..0000000000
--- a/kubernetes/portal/components/portal-cassandra/requirements.yaml
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright © 2020 Samsung Electronics
-# Modifications Copyright © 2021 Orange
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-dependencies:
- - name: common
- version: ~9.x-0
- repository: '@local'
- - name: repositoryGenerator
- version: ~9.x-0
- repository: '@local'
diff --git a/kubernetes/portal/components/portal-mariadb/Chart.yaml b/kubernetes/portal/components/portal-mariadb/Chart.yaml
index a15f9e77c7..cef1b64e51 100644
--- a/kubernetes/portal/components/portal-mariadb/Chart.yaml
+++ b/kubernetes/portal/components/portal-mariadb/Chart.yaml
@@ -1,6 +1,7 @@
# Copyright © 2017 Amdocs, Bell Canada
# Modifications Copyright © 2018 AT&T
# Modifications Copyright © 2021 Orange
+# Modifications Copyright © 2021 Nordix Foundation
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -14,7 +15,15 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-apiVersion: v1
+apiVersion: v2
description: MariaDB Service
name: portal-mariadb
-version: 9.0.0
+version: 10.0.0
+
+dependencies:
+ - name: common
+ version: ~10.x-0
+ repository: '@local'
+ - name: repositoryGenerator
+ version: ~10.x-0
+ repository: '@local'
diff --git a/kubernetes/portal/components/portal-mariadb/requirements.yaml b/kubernetes/portal/components/portal-mariadb/requirements.yaml
deleted file mode 100644
index 6e32e22dc0..0000000000
--- a/kubernetes/portal/components/portal-mariadb/requirements.yaml
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright © 2020 Samsung Electronics
-# Modifications Copyright © 2021 Orange
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-dependencies:
- - name: common
- version: ~9.x-0
- repository: '@local'
- - name: repositoryGenerator
- version: ~9.x-0
- repository: '@local'
diff --git a/kubernetes/portal/components/portal-mariadb/resources/config/mariadb/docker-entrypoint.sh b/kubernetes/portal/components/portal-mariadb/resources/config/mariadb/docker-entrypoint.sh
index a363ab3bb0..fe496bc47d 100644
--- a/kubernetes/portal/components/portal-mariadb/resources/config/mariadb/docker-entrypoint.sh
+++ b/kubernetes/portal/components/portal-mariadb/resources/config/mariadb/docker-entrypoint.sh
@@ -5,7 +5,8 @@ shopt -s nullglob
# logging functions
mysql_log() {
- local type="$1"; shift
+ local type
+ type="$1"; shift
printf '%s [%s] [Entrypoint]: %s\n' "$(date --rfc-3339=seconds)" "$type" "$*"
}
mysql_note() {
@@ -24,13 +25,17 @@ mysql_error() {
# (will allow for "$XYZ_DB_PASSWORD_FILE" to fill in the value of
# "$XYZ_DB_PASSWORD" from a file, especially for Docker's secrets feature)
file_env() {
- local var="$1"
- local fileVar="${var}_FILE"
- local def="${2:-}"
+ local var
+ var="$1"
+ local fileVar
+ fileVar="${var}_FILE"
+ local def
+ def="${2:-}"
if [ "${!var:-}" ] && [ "${!fileVar:-}" ]; then
mysql_error "Both $var and $fileVar are set (but are exclusive)"
fi
- local val="$def"
+ local val
+ val="$def"
# val="${!var}"
# val="$(< "${!fileVar}")"
# eval replacement of the bashism equivalents above presents no security issue here
@@ -85,7 +90,9 @@ docker_process_init_files() {
}
mysql_check_config() {
- local toRun=( "$@" --verbose --help --log-bin-index="$(mktemp -u)" ) errors
+ local toRun
+ local errors
+ toRun=( "$@" --verbose --help --log-bin-index="$(mktemp -u)" )
if ! errors="$("${toRun[@]}" 2>&1 >/dev/null)"; then
mysql_error "$(printf 'mysqld failed while attempting to check config\n\tcommand was: ')${toRun[*]}$(printf'\n\t')$errors"
fi
@@ -95,7 +102,8 @@ mysql_check_config() {
# We use mysqld --verbose --help instead of my_print_defaults because the
# latter only show values present in config files, and not server defaults
mysql_get_config() {
- local conf="$1"; shift
+ local conf
+ conf="$1"; shift
"$@" --verbose --help --log-bin-index="$(mktemp -u)" 2>/dev/null \
| awk -v conf="$conf" '$1 == conf && /^[^ \t]/ { sub(/^[^ \t]+[ \t]+/, ""); print; exit }'
# match "datadir /some/path with/spaces in/it here" but not "--xyz=abc\n datadir (xyz)"
@@ -141,7 +149,8 @@ docker_verify_minimum_env() {
# creates folders for the database
# also ensures permission for user mysql of run as root
docker_create_db_directories() {
- local user; user="$(id -u)"
+ local user
+ user="$(id -u)"
# TODO other directories that are used by default? like /var/lib/mysql-files
# see https://github.com/docker-library/mysql/issues/562
@@ -216,7 +225,8 @@ docker_setup_db() {
# Aria in 10.4+ is slow due to "transactional" (crash safety)
# https://jira.mariadb.org/browse/MDEV-23326
# https://github.com/docker-library/mariadb/issues/262
- local tztables=( time_zone time_zone_leap_second time_zone_name time_zone_transition time_zone_transition_type )
+ local tztables
+ tztables=( time_zone time_zone_leap_second time_zone_name time_zone_transition time_zone_transition_type )
for table in "${tztables[@]}"; do
echo "/*!100400 ALTER TABLE $table TRANSACTIONAL=0 */;"
done
@@ -237,7 +247,8 @@ docker_setup_db() {
mysql_note "GENERATED ROOT PASSWORD: $MYSQL_ROOT_PASSWORD"
fi
# Sets root password and creates root users for non-localhost hosts
- local rootCreate=
+ local rootCreate
+ rootCreate=
# default root to listen for connections from anywhere
if [ -n "$MYSQL_ROOT_HOST" ] && [ "$MYSQL_ROOT_HOST" != 'localhost' ]; then
# no, we don't care if read finds a terminating character in this heredoc
diff --git a/kubernetes/portal/components/portal-sdk/Chart.yaml b/kubernetes/portal/components/portal-sdk/Chart.yaml
index 1119dac90e..6535998331 100644
--- a/kubernetes/portal/components/portal-sdk/Chart.yaml
+++ b/kubernetes/portal/components/portal-sdk/Chart.yaml
@@ -1,6 +1,7 @@
# Copyright © 2017 Amdocs, Bell Canada
# Modifications Copyright © 2018 AT&T
# Modifications Copyright © 2021 Orange
+# Modifications Copyright © 2021 Nordix Foundation
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -14,7 +15,18 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-apiVersion: v1
+apiVersion: v2
description: Portal software development kit
name: portal-sdk
-version: 9.0.0
+version: 10.0.0
+
+dependencies:
+ - name: common
+ version: ~10.x-0
+ repository: '@local'
+ - name: certInitializer
+ version: ~10.x-0
+ repository: '@local'
+ - name: repositoryGenerator
+ version: ~10.x-0
+ repository: '@local'
diff --git a/kubernetes/portal/components/portal-sdk/requirements.yaml b/kubernetes/portal/components/portal-sdk/requirements.yaml
deleted file mode 100644
index 8d18e7fdfe..0000000000
--- a/kubernetes/portal/components/portal-sdk/requirements.yaml
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright © 2020 Samsung Electronics
-# Modifications Copyright © 2021 Orange
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-dependencies:
- - name: common
- version: ~9.x-0
- repository: '@local'
- - name: certInitializer
- version: ~9.x-0
- repository: '@local'
- - name: repositoryGenerator
- version: ~9.x-0
- repository: '@local'
diff --git a/kubernetes/portal/components/portal-widget/Chart.yaml b/kubernetes/portal/components/portal-widget/Chart.yaml
index 7b0673ebb2..283009bfa0 100644
--- a/kubernetes/portal/components/portal-widget/Chart.yaml
+++ b/kubernetes/portal/components/portal-widget/Chart.yaml
@@ -1,6 +1,7 @@
# Copyright © 2017 Amdocs, Bell Canada
# Modifications Copyright © 2018 AT&T
# Modifications Copyright © 2021 Orange
+# Modifications Copyright © 2021 Nordix Foundation
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -14,7 +15,15 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-apiVersion: v1
+apiVersion: v2
description: Portal widgets micro service application
name: portal-widget
-version: 9.0.0
+version: 10.0.0
+
+dependencies:
+ - name: common
+ version: ~10.x-0
+ repository: '@local'
+ - name: repositoryGenerator
+ version: ~10.x-0
+ repository: '@local'
diff --git a/kubernetes/portal/components/portal-widget/requirements.yaml b/kubernetes/portal/components/portal-widget/requirements.yaml
deleted file mode 100644
index 6e32e22dc0..0000000000
--- a/kubernetes/portal/components/portal-widget/requirements.yaml
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright © 2020 Samsung Electronics
-# Modifications Copyright © 2021 Orange
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-dependencies:
- - name: common
- version: ~9.x-0
- repository: '@local'
- - name: repositoryGenerator
- version: ~9.x-0
- repository: '@local'
diff --git a/kubernetes/portal/requirements.yaml b/kubernetes/portal/requirements.yaml
deleted file mode 100644
index 2be01cf098..0000000000
--- a/kubernetes/portal/requirements.yaml
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright © 2017 Amdocs, Bell Canada
-# Modifications Copyright © 2018 AT&T
-# Modifications Copyright © 2021 Orange
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-dependencies:
- - name: common
- version: ~9.x-0
- repository: '@local'
- - name: portal-app
- version: ~9.x-0
- repository: 'file://components/portal-app'
- - name: portal-cassandra
- version: ~9.x-0
- repository: 'file://components/portal-cassandra'
- - name: portal-mariadb
- version: ~9.x-0
- repository: 'file://components/portal-mariadb'
- - name: portal-sdk
- version: ~9.x-0
- repository: 'file://components/portal-sdk'
- - name: portal-widget
- version: ~9.x-0
- repository: 'file://components/portal-widget'
diff --git a/kubernetes/robot/Chart.yaml b/kubernetes/robot/Chart.yaml
index 5e83d1edb4..d28b5ae0ff 100644
--- a/kubernetes/robot/Chart.yaml
+++ b/kubernetes/robot/Chart.yaml
@@ -1,5 +1,6 @@
# Copyright © 2017 Amdocs, Bell Canada
# Modifications Copyright © 2021 Orange
+# Modifications Copyright © 2021 Nordix Foundation
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -13,7 +14,18 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-apiVersion: v1
+apiVersion: v2
description: A helm Chart for kubernetes-ONAP Robot
name: robot
-version: 9.0.0
+version: 10.0.0
+
+dependencies:
+ - name: common
+ version: ~10.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: repositoryGenerator
+ version: ~10.x-0
+ repository: '@local'
diff --git a/kubernetes/robot/requirements.yaml b/kubernetes/robot/requirements.yaml
deleted file mode 100644
index 9f1af30ec0..0000000000
--- a/kubernetes/robot/requirements.yaml
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright © 2017 Amdocs, Bell Canada
-# Modifications Copyright © 2021 Orange
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-dependencies:
- - name: common
- version: ~9.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: repositoryGenerator
- version: ~9.x-0
- repository: '@local'
diff --git a/kubernetes/robot/resources/config/eteshare/config/robot_properties.py b/kubernetes/robot/resources/config/eteshare/config/robot_properties.py
index 824b96cdf6..9076a1f9f9 100644
--- a/kubernetes/robot/resources/config/eteshare/config/robot_properties.py
+++ b/kubernetes/robot/resources/config/eteshare/config/robot_properties.py
@@ -321,6 +321,8 @@ GLOBAL_POLICY_USERNAME = '{{ .Values.policyUsername }}'
GLOBAL_POLICY_PASSWORD = '{{ .Values.policyPassword }}'
GLOBAL_POLICY_HEALTHCHECK_USERNAME = '{{ .Values.policyComponentUsername }}'
GLOBAL_POLICY_HEALTHCHECK_PASSWORD = '{{ .Values.policyComponentPassword }}'
+GLOBAL_POLICY_ADMIN_USERNAME = '{{ .Values.policyAdminUsername }}'
+GLOBAL_POLICY_ADMIN_PASSWORD = '{{ .Values.policyAdminPassword }}'
# portal info - everything is from the private oam network (also called onap private network)
GLOBAL_PORTAL_SERVER_PROTOCOL = "https"
GLOBAL_PORTAL_SERVER_PORT = '{{include "robot.ingress.port" (dict "root" . "hostname" "portal-app" "port" 8443) }}'
diff --git a/kubernetes/robot/values.yaml b/kubernetes/robot/values.yaml
index ed4b5db106..89d83c85a3 100644
--- a/kubernetes/robot/values.yaml
+++ b/kubernetes/robot/values.yaml
@@ -340,6 +340,8 @@ policyUsername: "demo@people.osaaf.org"
policyPassword: "demo123456!"
policyComponentUsername: "healthcheck"
policyComponentPassword: "zb!XztG34"
+policyAdminUsername: "policyadmin"
+policyAdminPassword: "zb!XztG34"
# PORTAL
portalUsername: "demo"
portalPassword: "Kp8bJ4SXszM0WXlhak3eHlcse"
diff --git a/kubernetes/sdc/Chart.yaml b/kubernetes/sdc/Chart.yaml
index 1b606b826c..7647906d75 100644
--- a/kubernetes/sdc/Chart.yaml
+++ b/kubernetes/sdc/Chart.yaml
@@ -1,6 +1,7 @@
# Copyright © 2017 Amdocs, AT&T, Bell Canada
# Modifications Copyright © 2018 ZTE
# Modifications Copyright © 2021 Orange
+# Modifications Copyright © 2021 Nordix Foundation
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -14,7 +15,33 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-apiVersion: v1
+apiVersion: v2
description: Service Design and Creation Umbrella Helm charts
name: sdc
-version: 9.0.0
+version: 10.0.0
+
+dependencies:
+ - name: sdc-be
+ version: ~10.x-0
+ repository: 'file://components/sdc-be'
+ - name: sdc-cs
+ version: ~10.x-0
+ repository: 'file://components/sdc-cs'
+ - name: sdc-fe
+ version: ~10.x-0
+ repository: 'file://components/sdc-fe'
+ - name: sdc-onboarding-be
+ version: ~10.x-0
+ repository: 'file://components/sdc-onboarding-be'
+ - name: sdc-wfd-be
+ version: ~10.x-0
+ repository: 'file://components/sdc-wfd-be'
+ condition: sdc-wfd.enabled
+ - name: sdc-wfd-fe
+ version: ~10.x-0
+ repository: 'file://components/sdc-wfd-fe'
+ condition: sdc-wfd.enabled
+ - name: sdc-helm-validator
+ version: ~10.x-0
+ repository: 'file://components/sdc-helm-validator'
+ condition: sdcHelmValidator.enabled
diff --git a/kubernetes/sdc/Makefile b/kubernetes/sdc/Makefile
index 8737bd208e..192fc01a75 100644
--- a/kubernetes/sdc/Makefile
+++ b/kubernetes/sdc/Makefile
@@ -35,7 +35,7 @@ make-%:
@if [ -f $*/Makefile ]; then make -C $*; fi
dep-%: make-%
- @if [ -f $*/requirements.yaml ]; then $(HELM_BIN) dep up $*; fi
+ @if [ -f $*/Chart.yaml ]; then $(HELM_BIN) dep up $*; fi
lint-%: dep-%
@if [ -f $*/Chart.yaml ]; then $(HELM_BIN) lint $*; fi
@@ -51,7 +51,7 @@ endif
@$(HELM_BIN) repo index $(PACKAGE_DIR)
clean:
- @rm -f */requirements.lock
+ @rm -f */Chart.lock
@rm -f *tgz */charts/*tgz
@rm -rf $(PACKAGE_DIR)
%:
diff --git a/kubernetes/sdc/components/Makefile b/kubernetes/sdc/components/Makefile
index 577fd95b4c..7be14135bb 100644
--- a/kubernetes/sdc/components/Makefile
+++ b/kubernetes/sdc/components/Makefile
@@ -34,7 +34,7 @@ make-%:
@if [ -f $*/Makefile ]; then make -C $*; fi
dep-%: make-%
- @if [ -f $*/requirements.yaml ]; then $(HELM_BIN) dep up $*; fi
+ @if [ -f $*/Chart.yaml ]; then $(HELM_BIN) dep up $*; fi
lint-%: dep-%
@if [ -f $*/Chart.yaml ]; then $(HELM_BIN) lint $*; fi
@@ -49,7 +49,7 @@ endif
@$(HELM_BIN) repo index $(PACKAGE_DIR)
clean:
- @rm -f */requirements.lock
+ @rm -f */Chart.lock
@rm -f *tgz */charts/*tgz
@rm -rf $(PACKAGE_DIR)
%:
diff --git a/kubernetes/sdc/components/sdc-be/Chart.yaml b/kubernetes/sdc/components/sdc-be/Chart.yaml
index 03c63783eb..6c2254882d 100644
--- a/kubernetes/sdc/components/sdc-be/Chart.yaml
+++ b/kubernetes/sdc/components/sdc-be/Chart.yaml
@@ -1,6 +1,7 @@
# Copyright © 2017 Amdocs, Bell Canada
# Modifications Copyright © 2018 AT&T, ZTE
# Modifications Copyright © 2021 Orange
+# Modifications Copyright © 2021 Nordix Foundation
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -14,7 +15,18 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-apiVersion: v1
+apiVersion: v2
description: ONAP Service Design and Creation Backend API
name: sdc-be
-version: 9.0.0
+version: 10.0.0
+
+dependencies:
+ - name: certInitializer
+ version: ~10.x-0
+ repository: '@local'
+ - name: repositoryGenerator
+ version: ~10.x-0
+ repository: '@local'
+ - name: serviceAccount
+ version: ~10.x-0
+ repository: '@local'
diff --git a/kubernetes/sdc/components/sdc-be/requirements.yaml b/kubernetes/sdc/components/sdc-be/requirements.yaml
deleted file mode 100644
index dba5be9f29..0000000000
--- a/kubernetes/sdc/components/sdc-be/requirements.yaml
+++ /dev/null
@@ -1,30 +0,0 @@
-# ============LICENSE_START=======================================================
-# Copyright (C) 2018 Ericsson. All rights reserved.
-# Modifications Copyright © 2020 AT&T. All rights reserved.
-# Modifications Copyright © 2021 Orange
-# ================================================================================
-# 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.
-#
-# SPDX-License-Identifier: Apache-2.0
-# ============LICENSE_END=========================================================
-
-dependencies:
- - name: certInitializer
- version: ~9.x-0
- repository: '@local'
- - name: repositoryGenerator
- version: ~9.x-0
- repository: '@local'
- - name: serviceAccount
- version: ~9.x-0
- repository: '@local'
diff --git a/kubernetes/sdc/components/sdc-be/templates/deployment.yaml b/kubernetes/sdc/components/sdc-be/templates/deployment.yaml
index 2eb1aba21b..5a5fcd6f75 100644
--- a/kubernetes/sdc/components/sdc-be/templates/deployment.yaml
+++ b/kubernetes/sdc/components/sdc-be/templates/deployment.yaml
@@ -31,6 +31,8 @@ spec:
args:
- --container-name
- "sdc-onboarding-be"
+ - --container-name
+ - "message-router"
env:
- name: NAMESPACE
valueFrom:
diff --git a/kubernetes/sdc/components/sdc-be/values.yaml b/kubernetes/sdc/components/sdc-be/values.yaml
index eec198865f..0449648b27 100644
--- a/kubernetes/sdc/components/sdc-be/values.yaml
+++ b/kubernetes/sdc/components/sdc-be/values.yaml
@@ -35,8 +35,8 @@ global:
# Application configuration defaults.
#################################################################
# application image
-image: onap/sdc-backend-all-plugins:1.9.4
-backendInitImage: onap/sdc-backend-init:1.9.4
+image: onap/sdc-backend-all-plugins:1.9.5
+backendInitImage: onap/sdc-backend-init:1.9.5
pullPolicy: Always
diff --git a/kubernetes/sdc/components/sdc-cs/Chart.yaml b/kubernetes/sdc/components/sdc-cs/Chart.yaml
index a021f72c3f..5b4d631889 100644
--- a/kubernetes/sdc/components/sdc-cs/Chart.yaml
+++ b/kubernetes/sdc/components/sdc-cs/Chart.yaml
@@ -1,6 +1,7 @@
# Copyright © 2017 Amdocs, Bell Canada
# Modifications Copyright © 2018 AT&T, ZTE
# Modifications Copyright © 2021 Orange
+# Modifications Copyright © 2021 Nordix Foundation
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -14,7 +15,18 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-apiVersion: v1
+apiVersion: v2
description: ONAP Service Design and Creation Cassandra
name: sdc-cs
-version: 9.0.0
+version: 10.0.0
+
+dependencies:
+ - name: common
+ version: ~10.x-0
+ repository: '@local'
+ - name: repositoryGenerator
+ version: ~10.x-0
+ repository: '@local'
+ - name: serviceAccount
+ version: ~10.x-0
+ repository: '@local'
diff --git a/kubernetes/sdc/components/sdc-cs/requirements.yaml b/kubernetes/sdc/components/sdc-cs/requirements.yaml
deleted file mode 100644
index 30d0a2244a..0000000000
--- a/kubernetes/sdc/components/sdc-cs/requirements.yaml
+++ /dev/null
@@ -1,30 +0,0 @@
-# ============LICENSE_START=======================================================
-# Copyright (C) 2018 Ericsson. All rights reserved.
-# Modifications Copyright © 2020 AT&T. All rights reserved.
-# Modifications Copyright © 2021 Orange
-# ================================================================================
-# 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.
-#
-# SPDX-License-Identifier: Apache-2.0
-# ============LICENSE_END=========================================================
-
-dependencies:
- - name: common
- version: ~9.x-0
- repository: '@local'
- - name: repositoryGenerator
- version: ~9.x-0
- repository: '@local'
- - name: serviceAccount
- version: ~9.x-0
- repository: '@local'
diff --git a/kubernetes/sdc/components/sdc-cs/values.yaml b/kubernetes/sdc/components/sdc-cs/values.yaml
index a36fdb5c0d..e00475adc4 100644
--- a/kubernetes/sdc/components/sdc-cs/values.yaml
+++ b/kubernetes/sdc/components/sdc-cs/values.yaml
@@ -38,8 +38,8 @@ global:
#################################################################
# application image
repository: nexus3.onap.org:10001
-image: onap/sdc-cassandra:1.9.4
-cassandraInitImage: onap/sdc-cassandra-init:1.9.4
+image: onap/sdc-cassandra:1.9.5
+cassandraInitImage: onap/sdc-cassandra-init:1.9.5
pullPolicy: Always
config:
diff --git a/kubernetes/sdc/components/sdc-fe/Chart.yaml b/kubernetes/sdc/components/sdc-fe/Chart.yaml
index 1ea4e36157..3db6fc794d 100644
--- a/kubernetes/sdc/components/sdc-fe/Chart.yaml
+++ b/kubernetes/sdc/components/sdc-fe/Chart.yaml
@@ -1,6 +1,7 @@
# Copyright © 2017 Amdocs, Bell Canada
# Modifications Copyright © 2018 AT&T, ZTE
# Modifications Copyright © 2021 Orange
+# Modifications Copyright © 2021 Nordix Foundation
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -14,7 +15,18 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-apiVersion: v1
+apiVersion: v2
description: ONAP Service Design and Creation Front End
name: sdc-fe
-version: 9.0.0
+version: 10.0.0
+
+dependencies:
+ - name: certInitializer
+ version: ~10.x-0
+ repository: '@local'
+ - name: repositoryGenerator
+ version: ~10.x-0
+ repository: '@local'
+ - name: serviceAccount
+ version: ~10.x-0
+ repository: '@local'
diff --git a/kubernetes/sdc/components/sdc-fe/requirements.yaml b/kubernetes/sdc/components/sdc-fe/requirements.yaml
deleted file mode 100644
index dba5be9f29..0000000000
--- a/kubernetes/sdc/components/sdc-fe/requirements.yaml
+++ /dev/null
@@ -1,30 +0,0 @@
-# ============LICENSE_START=======================================================
-# Copyright (C) 2018 Ericsson. All rights reserved.
-# Modifications Copyright © 2020 AT&T. All rights reserved.
-# Modifications Copyright © 2021 Orange
-# ================================================================================
-# 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.
-#
-# SPDX-License-Identifier: Apache-2.0
-# ============LICENSE_END=========================================================
-
-dependencies:
- - name: certInitializer
- version: ~9.x-0
- repository: '@local'
- - name: repositoryGenerator
- version: ~9.x-0
- repository: '@local'
- - name: serviceAccount
- version: ~9.x-0
- repository: '@local'
diff --git a/kubernetes/sdc/components/sdc-fe/values.yaml b/kubernetes/sdc/components/sdc-fe/values.yaml
index bb68dd3610..a208226b76 100644
--- a/kubernetes/sdc/components/sdc-fe/values.yaml
+++ b/kubernetes/sdc/components/sdc-fe/values.yaml
@@ -47,7 +47,7 @@ certInitializer:
# Application configuration defaults.
#################################################################
# application image
-image: onap/sdc-frontend:1.9.4
+image: onap/sdc-frontend:1.9.5
pullPolicy: Always
config:
diff --git a/kubernetes/sdc/components/sdc-helm-validator/Chart.yaml b/kubernetes/sdc/components/sdc-helm-validator/Chart.yaml
index b8611a561d..5609083704 100644
--- a/kubernetes/sdc/components/sdc-helm-validator/Chart.yaml
+++ b/kubernetes/sdc/components/sdc-helm-validator/Chart.yaml
@@ -1,6 +1,7 @@
# ===========LICENSE_START========================================================
# Copyright (c) 2021 Nokia. All rights reserved.
# Modifications Copyright © 2021 Orange
+# Modifications Copyright © 2021 Nordix Foundation
# ================================================================================
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -15,7 +16,15 @@
# limitations under the License.
# ============LICENSE_END=========================================================
-apiVersion: v1
+apiVersion: v2
description: ONAP Service Design and Creation Helm Validator
name: sdc-helm-validator
-version: 9.0.0
+version: 10.0.0
+
+dependencies:
+ - name: repositoryGenerator
+ version: ~10.x-0
+ repository: '@local'
+ - name: common
+ version: ~10.x-0
+ repository: '@local'
diff --git a/kubernetes/sdc/components/sdc-helm-validator/requirements.yaml b/kubernetes/sdc/components/sdc-helm-validator/requirements.yaml
deleted file mode 100644
index a9350258bf..0000000000
--- a/kubernetes/sdc/components/sdc-helm-validator/requirements.yaml
+++ /dev/null
@@ -1,24 +0,0 @@
-# ===========LICENSE_START========================================================
-# Copyright (c) 2021 Nokia. All rights reserved.
-# Modifications Copyright © 2021 Orange
-# ================================================================================
-# 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=========================================================
-
-dependencies:
- - name: repositoryGenerator
- version: ~9.x-0
- repository: '@local'
- - name: common
- version: ~9.x-0
- repository: '@local'
diff --git a/kubernetes/sdc/components/sdc-onboarding-be/Chart.yaml b/kubernetes/sdc/components/sdc-onboarding-be/Chart.yaml
index e6090fca7b..5ed3131099 100644
--- a/kubernetes/sdc/components/sdc-onboarding-be/Chart.yaml
+++ b/kubernetes/sdc/components/sdc-onboarding-be/Chart.yaml
@@ -1,6 +1,7 @@
# Copyright © 2017 Amdocs, Bell Canada
# Modifications Copyright © 2018 AT&T, ZTE
# Modifications Copyright © 2021 Orange
+# Modifications Copyright © 2021 Nordix Foundation
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -14,7 +15,18 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-apiVersion: v1
+apiVersion: v2
description: ONAP Service Design and Creation Onboarding API
name: sdc-onboarding-be
-version: 9.0.0
+version: 10.0.0
+
+dependencies:
+ - name: certInitializer
+ version: ~10.x-0
+ repository: '@local'
+ - name: repositoryGenerator
+ version: ~10.x-0
+ repository: '@local'
+ - name: serviceAccount
+ version: ~10.x-0
+ repository: '@local'
diff --git a/kubernetes/sdc/components/sdc-onboarding-be/requirements.yaml b/kubernetes/sdc/components/sdc-onboarding-be/requirements.yaml
deleted file mode 100644
index dba5be9f29..0000000000
--- a/kubernetes/sdc/components/sdc-onboarding-be/requirements.yaml
+++ /dev/null
@@ -1,30 +0,0 @@
-# ============LICENSE_START=======================================================
-# Copyright (C) 2018 Ericsson. All rights reserved.
-# Modifications Copyright © 2020 AT&T. All rights reserved.
-# Modifications Copyright © 2021 Orange
-# ================================================================================
-# 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.
-#
-# SPDX-License-Identifier: Apache-2.0
-# ============LICENSE_END=========================================================
-
-dependencies:
- - name: certInitializer
- version: ~9.x-0
- repository: '@local'
- - name: repositoryGenerator
- version: ~9.x-0
- repository: '@local'
- - name: serviceAccount
- version: ~9.x-0
- repository: '@local'
diff --git a/kubernetes/sdc/components/sdc-onboarding-be/values.yaml b/kubernetes/sdc/components/sdc-onboarding-be/values.yaml
index ae6de7f6c3..d8cc670bdf 100644
--- a/kubernetes/sdc/components/sdc-onboarding-be/values.yaml
+++ b/kubernetes/sdc/components/sdc-onboarding-be/values.yaml
@@ -59,8 +59,8 @@ certInitializer:
# Application configuration defaults.
#################################################################
# application image
-image: onap/sdc-onboard-backend:1.9.4
-onboardingInitImage: onap/sdc-onboard-cassandra-init:1.9.4
+image: onap/sdc-onboard-backend:1.9.5
+onboardingInitImage: onap/sdc-onboard-cassandra-init:1.9.5
pullPolicy: Always
# flag to enable debugging - application support required
diff --git a/kubernetes/sdc/components/sdc-wfd-be/Chart.yaml b/kubernetes/sdc/components/sdc-wfd-be/Chart.yaml
index 9fc2249079..132c5d21ce 100644
--- a/kubernetes/sdc/components/sdc-wfd-be/Chart.yaml
+++ b/kubernetes/sdc/components/sdc-wfd-be/Chart.yaml
@@ -1,5 +1,6 @@
# Copyright © 2018 Amdocs, Bell Canada
# Modifications Copyright © 2021 Orange
+# Modifications Copyright © 2021 Nordix Foundation
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -13,7 +14,18 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-apiVersion: v1
+apiVersion: v2
description: ONAP Service Design and Creation Workflow Designer backend
name: sdc-wfd-be
-version: 9.0.0
+version: 10.0.0
+
+dependencies:
+ - name: certInitializer
+ version: ~10.x-0
+ repository: '@local'
+ - name: repositoryGenerator
+ version: ~10.x-0
+ repository: '@local'
+ - name: serviceAccount
+ version: ~10.x-0
+ repository: '@local'
diff --git a/kubernetes/sdc/components/sdc-wfd-be/requirements.yaml b/kubernetes/sdc/components/sdc-wfd-be/requirements.yaml
deleted file mode 100644
index dba5be9f29..0000000000
--- a/kubernetes/sdc/components/sdc-wfd-be/requirements.yaml
+++ /dev/null
@@ -1,30 +0,0 @@
-# ============LICENSE_START=======================================================
-# Copyright (C) 2018 Ericsson. All rights reserved.
-# Modifications Copyright © 2020 AT&T. All rights reserved.
-# Modifications Copyright © 2021 Orange
-# ================================================================================
-# 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.
-#
-# SPDX-License-Identifier: Apache-2.0
-# ============LICENSE_END=========================================================
-
-dependencies:
- - name: certInitializer
- version: ~9.x-0
- repository: '@local'
- - name: repositoryGenerator
- version: ~9.x-0
- repository: '@local'
- - name: serviceAccount
- version: ~9.x-0
- repository: '@local'
diff --git a/kubernetes/sdc/components/sdc-wfd-fe/Chart.yaml b/kubernetes/sdc/components/sdc-wfd-fe/Chart.yaml
index 84afef05a4..1b7aa773c9 100644
--- a/kubernetes/sdc/components/sdc-wfd-fe/Chart.yaml
+++ b/kubernetes/sdc/components/sdc-wfd-fe/Chart.yaml
@@ -1,5 +1,6 @@
# Copyright © 2018 Amdocs, Bell Canada
# Modifications Copyright © 2021 Orange
+# Modifications Copyright © 2021 Nordix Foundation
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -13,7 +14,18 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-apiVersion: v1
+apiVersion: v2
description: ONAP Service Design and Creation Workflow Designer frontend
name: sdc-wfd-fe
-version: 9.0.0
+version: 10.0.0
+
+dependencies:
+ - name: certInitializer
+ version: ~10.x-0
+ repository: '@local'
+ - name: repositoryGenerator
+ version: ~10.x-0
+ repository: '@local'
+ - name: serviceAccount
+ version: ~10.x-0
+ repository: '@local'
diff --git a/kubernetes/sdc/components/sdc-wfd-fe/requirements.yaml b/kubernetes/sdc/components/sdc-wfd-fe/requirements.yaml
deleted file mode 100644
index dba5be9f29..0000000000
--- a/kubernetes/sdc/components/sdc-wfd-fe/requirements.yaml
+++ /dev/null
@@ -1,30 +0,0 @@
-# ============LICENSE_START=======================================================
-# Copyright (C) 2018 Ericsson. All rights reserved.
-# Modifications Copyright © 2020 AT&T. All rights reserved.
-# Modifications Copyright © 2021 Orange
-# ================================================================================
-# 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.
-#
-# SPDX-License-Identifier: Apache-2.0
-# ============LICENSE_END=========================================================
-
-dependencies:
- - name: certInitializer
- version: ~9.x-0
- repository: '@local'
- - name: repositoryGenerator
- version: ~9.x-0
- repository: '@local'
- - name: serviceAccount
- version: ~9.x-0
- repository: '@local'
diff --git a/kubernetes/sdc/requirements.yaml b/kubernetes/sdc/requirements.yaml
deleted file mode 100644
index b9597c36fe..0000000000
--- a/kubernetes/sdc/requirements.yaml
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright © 2017 Amdocs, Bell Canada
-# Modifications Copyright © 2018 AT&T, ZTE
-# Modifications Copyright © 2021 Orange
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-dependencies:
- - name: sdc-be
- version: ~9.x-0
- repository: 'file://components/sdc-be'
- - name: sdc-cs
- version: ~9.x-0
- repository: 'file://components/sdc-cs'
- - name: sdc-fe
- version: ~9.x-0
- repository: 'file://components/sdc-fe'
- - name: sdc-onboarding-be
- version: ~9.x-0
- repository: 'file://components/sdc-onboarding-be'
- - name: sdc-wfd-be
- version: ~9.x-0
- repository: 'file://components/sdc-wfd-be'
- condition: sdc-wfd.enabled
- - name: sdc-wfd-fe
- version: ~9.x-0
- repository: 'file://components/sdc-wfd-fe'
- condition: sdc-wfd.enabled
- - name: sdc-helm-validator
- version: ~9.x-0
- repository: 'file://components/sdc-helm-validator'
- condition: sdcHelmValidator.enabled
diff --git a/kubernetes/sdnc/Chart.yaml b/kubernetes/sdnc/Chart.yaml
index c75a17c742..b30efc10c1 100644
--- a/kubernetes/sdnc/Chart.yaml
+++ b/kubernetes/sdnc/Chart.yaml
@@ -1,5 +1,6 @@
# Copyright © 2017 Amdocs, Bell Canada
# Modifications Copyright © 2021 Orange
+# Modifications Copyright © 2021 Nordix Foundation
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -13,7 +14,64 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-apiVersion: v1
+apiVersion: v2
description: SDN Controller
name: sdnc
-version: 9.0.0
+version: 10.0.0
+
+dependencies:
+ - name: common
+ version: ~10.x-0
+ repository: '@local'
+ - name: certInitializer
+ version: ~10.x-0
+ repository: '@local'
+ - name: certManagerCertificate
+ version: ~10.x-0
+ repository: '@local'
+ - name: logConfiguration
+ version: ~10.x-0
+ repository: '@local'
+ - name: network-name-gen
+ version: ~10.x-0
+ repository: '@local'
+ condition: network-name-gen.enabled
+ - name: dgbuilder
+ version: ~10.x-0
+ repository: '@local'
+ condition: dgbuilder.enabled
+ - name: sdnc-prom
+ version: ~10.x-0
+ repository: '@local'
+ condition: config.geoEnabled
+ - name: mariadb-galera
+ version: ~10.x-0
+ repository: '@local'
+ condition: global.mariadbGalera.localCluster
+ - name: elasticsearch
+ version: ~10.x-0
+ repository: '@local'
+ condition: config.sdnr.enabled
+ # conditions for sdnc-subcharts
+ - name: dmaap-listener
+ version: ~10.x-0
+ repository: 'file://components/dmaap-listener/'
+ condition: sdnc.dmaap-listener.enabled,dmaap-listener.enabled
+ - name: ueb-listener
+ version: ~10.x-0
+ repository: 'file://components/ueb-listener/'
+ condition: sdnc.ueb-listener.enabled,ueb-listener.enabled
+ - name: sdnc-ansible-server
+ version: ~10.x-0
+ repository: 'file://components/sdnc-ansible-server/'
+ condition: sdnc.sdnc-ansible-server.enabled,sdnc-ansible-server.enabled
+ - name: sdnc-web
+ version: ~10.x-0
+ repository: 'file://components/sdnc-web/'
+ condition: sdnc.sdnc-web.enabled,sdnc-web.enabled
+ - name: repositoryGenerator
+ version: ~10.x-0
+ repository: '@local'
+ - name: serviceAccount
+ version: ~10.x-0
+ repository: '@local'
diff --git a/kubernetes/sdnc/Makefile b/kubernetes/sdnc/Makefile
index 32b3b728d7..88bcb82057 100644
--- a/kubernetes/sdnc/Makefile
+++ b/kubernetes/sdnc/Makefile
@@ -35,7 +35,7 @@ make-%:
@if [ -f $*/Makefile ]; then make -C $*; fi
dep-%: make-%
- @if [ -f $*/requirements.yaml ]; then $(HELM_BIN) dep up $*; fi
+ @if [ -f $*/Chart.yaml ]; then $(HELM_BIN) dep up $*; fi
lint-%: dep-%
@if [ -f $*/Chart.yaml ]; then $(HELM_BIN) lint $*; fi
@@ -50,7 +50,7 @@ endif
@$(HELM_BIN) repo index $(PACKAGE_DIR)
clean:
- @rm -f */requirements.lock
+ @rm -f */Chart.lock
@rm -f *tgz */charts/*tgz
@rm -rf $(PACKAGE_DIR)
%:
diff --git a/kubernetes/sdnc/components/Makefile b/kubernetes/sdnc/components/Makefile
index 313cca8c27..7604b56342 100644
--- a/kubernetes/sdnc/components/Makefile
+++ b/kubernetes/sdnc/components/Makefile
@@ -35,7 +35,7 @@ make-%:
@if [ -f $*/Makefile ]; then make -C $*; fi
dep-%: make-%
- @if [ -f $*/requirements.yaml ]; then $(HELM_BIN) dep up $*; fi
+ @if [ -f $*/Chart.yaml ]; then $(HELM_BIN) dep up $*; fi
lint-%: dep-%
@if [ -f $*/Chart.yaml ]; then $(HELM_BIN) lint $*; fi
@@ -50,7 +50,7 @@ endif
@$(HELM_BIN) repo index $(PACKAGE_DIR)
clean:
- @rm -f */requirements.lock
+ @rm -f */Chart.lock
@rm -f *tgz */charts/*tgz
@rm -rf $(PACKAGE_DIR)
%:
diff --git a/kubernetes/sdnc/components/dmaap-listener/Chart.yaml b/kubernetes/sdnc/components/dmaap-listener/Chart.yaml
index 29161ae194..1d027ee089 100644
--- a/kubernetes/sdnc/components/dmaap-listener/Chart.yaml
+++ b/kubernetes/sdnc/components/dmaap-listener/Chart.yaml
@@ -13,7 +13,18 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-apiVersion: v1
+apiVersion: v2
description: SDNC DMaaP Listener
name: dmaap-listener
-version: 9.0.0
+version: 10.0.0
+
+dependencies:
+ - name: common
+ version: ~10.x-0
+ repository: '@local'
+ - name: repositoryGenerator
+ version: ~10.x-0
+ repository: '@local'
+ - name: serviceAccount
+ version: ~10.x-0
+ repository: '@local'
diff --git a/kubernetes/sdnc/components/dmaap-listener/requirements.yaml b/kubernetes/sdnc/components/dmaap-listener/requirements.yaml
deleted file mode 100644
index 6056f41181..0000000000
--- a/kubernetes/sdnc/components/dmaap-listener/requirements.yaml
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright © 2017 Amdocs, Bell Canada
-# Modifications Copyright © 2021 Orange
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-dependencies:
- - name: common
- version: ~9.x-0
- repository: '@local'
- - name: repositoryGenerator
- version: ~9.x-0
- repository: '@local'
- - name: serviceAccount
- version: ~9.x-0
- repository: '@local'
diff --git a/kubernetes/sdnc/components/sdnc-ansible-server/Chart.yaml b/kubernetes/sdnc/components/sdnc-ansible-server/Chart.yaml
index 02447f161e..c61b4e012d 100644
--- a/kubernetes/sdnc/components/sdnc-ansible-server/Chart.yaml
+++ b/kubernetes/sdnc/components/sdnc-ansible-server/Chart.yaml
@@ -1,5 +1,6 @@
# Copyright © 2017 Amdocs, Bell Canada
# Modifications Copyright © 2021 Orange
+# Modifications Copyright © 2021 Nordix Foundation
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -13,7 +14,18 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-apiVersion: v1
+apiVersion: v2
description: SDN-C Ansible Server
name: sdnc-ansible-server
-version: 9.0.0
+version: 10.0.0
+
+dependencies:
+ - name: common
+ version: ~10.x-0
+ repository: '@local'
+ - name: repositoryGenerator
+ version: ~10.x-0
+ repository: '@local'
+ - name: serviceAccount
+ version: ~10.x-0
+ repository: '@local'
diff --git a/kubernetes/sdnc/components/sdnc-ansible-server/requirements.yaml b/kubernetes/sdnc/components/sdnc-ansible-server/requirements.yaml
deleted file mode 100644
index 6056f41181..0000000000
--- a/kubernetes/sdnc/components/sdnc-ansible-server/requirements.yaml
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright © 2017 Amdocs, Bell Canada
-# Modifications Copyright © 2021 Orange
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-dependencies:
- - name: common
- version: ~9.x-0
- repository: '@local'
- - name: repositoryGenerator
- version: ~9.x-0
- repository: '@local'
- - name: serviceAccount
- version: ~9.x-0
- repository: '@local'
diff --git a/kubernetes/sdnc/components/sdnc-prom/Chart.yaml b/kubernetes/sdnc/components/sdnc-prom/Chart.yaml
index f49cbbe2b3..956c6073dc 100644
--- a/kubernetes/sdnc/components/sdnc-prom/Chart.yaml
+++ b/kubernetes/sdnc/components/sdnc-prom/Chart.yaml
@@ -1,5 +1,6 @@
# Copyright © 2018 Amdocs
# Modifications Copyright © 2021 Orange
+# Modifications Copyright © 2021 Nordix Foundation
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -13,7 +14,18 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-apiVersion: v1
+apiVersion: v2
description: ONAP SDNC Policy Driven Ownership Management
name: sdnc-prom
-version: 9.0.0
+version: 10.0.0
+
+dependencies:
+ - name: common
+ version: ~10.x-0
+ repository: '@local'
+ - name: repositoryGenerator
+ version: ~10.x-0
+ repository: '@local'
+ - name: serviceAccount
+ version: ~10.x-0
+ repository: '@local'
diff --git a/kubernetes/sdnc/components/sdnc-prom/requirements.yaml b/kubernetes/sdnc/components/sdnc-prom/requirements.yaml
deleted file mode 100644
index 0a47ac4fb8..0000000000
--- a/kubernetes/sdnc/components/sdnc-prom/requirements.yaml
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright © 2018 Amdocs
-# Modifications Copyright © 2021 Orange
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-dependencies:
- - name: common
- version: ~9.x-0
- repository: '@local'
- - name: repositoryGenerator
- version: ~9.x-0
- repository: '@local'
- - name: serviceAccount
- version: ~9.x-0
- repository: '@local'
diff --git a/kubernetes/sdnc/components/sdnc-prom/resources/bin/sdnc.failover b/kubernetes/sdnc/components/sdnc-prom/resources/bin/sdnc.failover
index d9133e8477..1a74c1edce 100755
--- a/kubernetes/sdnc/components/sdnc-prom/resources/bin/sdnc.failover
+++ b/kubernetes/sdnc/components/sdnc-prom/resources/bin/sdnc.failover
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
{{/*
# Copyright © 2018 Amdocs
@@ -30,7 +30,7 @@ fi
APP_BIN=/app/bin
debugLog(){
- if [ "$enableDebugLogging" == true ]; then
+ if [ "$enableDebugLogging" = true ]; then
if [ $# -eq 0 ]; then
echo "" >> $LOGFILE
else
@@ -41,7 +41,7 @@ debugLog(){
EXC_SIMPLE_FAILOVER=`${APP_BIN}/switchVoting.sh`
-if [ "$EXC_SIMPLE_FAILOVER" == "success" ]; then
+if [ "$EXC_SIMPLE_FAILOVER" = "success" ]; then
debugLog "Simple failover success. SDNC failover completed."
else
# Simple failover failed. Trying catastrophic failover ...
diff --git a/kubernetes/sdnc/components/sdnc-web/Chart.yaml b/kubernetes/sdnc/components/sdnc-web/Chart.yaml
index 1482c3b91c..fbb7ca0cb2 100644
--- a/kubernetes/sdnc/components/sdnc-web/Chart.yaml
+++ b/kubernetes/sdnc/components/sdnc-web/Chart.yaml
@@ -13,7 +13,21 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-apiVersion: v1
+apiVersion: v2
description: SDN-C Web Server
name: sdnc-web
-version: 9.0.0
+version: 10.0.0
+
+dependencies:
+ - name: common
+ version: ~10.x-0
+ repository: '@local'
+ - name: certInitializer
+ version: ~10.x-0
+ repository: '@local'
+ - name: repositoryGenerator
+ version: ~10.x-0
+ repository: '@local'
+ - name: serviceAccount
+ version: ~10.x-0
+ repository: '@local'
diff --git a/kubernetes/sdnc/components/sdnc-web/requirements.yaml b/kubernetes/sdnc/components/sdnc-web/requirements.yaml
deleted file mode 100644
index 96588e36bb..0000000000
--- a/kubernetes/sdnc/components/sdnc-web/requirements.yaml
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright © 2020 highstreet technologies GmbH
-# Copyright © 2017 Amdocs, Bell Canada
-# Modifications Copyright © 2021 Orange
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-dependencies:
- - name: common
- version: ~9.x-0
- repository: '@local'
- - name: certInitializer
- version: ~9.x-0
- repository: '@local'
- - name: repositoryGenerator
- version: ~9.x-0
- repository: '@local'
- - name: serviceAccount
- version: ~9.x-0
- repository: '@local'
diff --git a/kubernetes/sdnc/components/ueb-listener/Chart.yaml b/kubernetes/sdnc/components/ueb-listener/Chart.yaml
index 86407430ba..ffaa1b7cca 100644
--- a/kubernetes/sdnc/components/ueb-listener/Chart.yaml
+++ b/kubernetes/sdnc/components/ueb-listener/Chart.yaml
@@ -1,5 +1,6 @@
# Copyright © 2017 Amdocs, Bell Canada
# Modifications Copyright © 2021 Orange
+# Modifications Copyright © 2021 Nordix Foundation
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -13,7 +14,18 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-apiVersion: v1
+apiVersion: v2
description: SDNC UEB Listener
name: ueb-listener
-version: 9.0.0
+version: 10.0.0
+
+dependencies:
+ - name: common
+ version: ~10.x-0
+ repository: '@local'
+ - name: repositoryGenerator
+ version: ~10.x-0
+ repository: '@local'
+ - name: serviceAccount
+ version: ~10.x-0
+ repository: '@local'
diff --git a/kubernetes/sdnc/components/ueb-listener/requirements.yaml b/kubernetes/sdnc/components/ueb-listener/requirements.yaml
deleted file mode 100644
index 6056f41181..0000000000
--- a/kubernetes/sdnc/components/ueb-listener/requirements.yaml
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright © 2017 Amdocs, Bell Canada
-# Modifications Copyright © 2021 Orange
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-dependencies:
- - name: common
- version: ~9.x-0
- repository: '@local'
- - name: repositoryGenerator
- version: ~9.x-0
- repository: '@local'
- - name: serviceAccount
- version: ~9.x-0
- repository: '@local'
diff --git a/kubernetes/sdnc/requirements.yaml b/kubernetes/sdnc/requirements.yaml
deleted file mode 100644
index 58c8e60ae3..0000000000
--- a/kubernetes/sdnc/requirements.yaml
+++ /dev/null
@@ -1,73 +0,0 @@
-
-# Copyright © 2017 Amdocs, Bell Canada,
-# Copyright © 2020 highstreet technologies GmbH
-# Copyright © 2021 Nokia
-# Modifications Copyright © 2021 Orange
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-dependencies:
- - name: common
- version: ~9.x-0
- repository: '@local'
- - name: certInitializer
- version: ~9.x-0
- repository: '@local'
- - name: certManagerCertificate
- version: ~9.x-0
- repository: '@local'
- - name: logConfiguration
- version: ~9.x-0
- repository: '@local'
- - name: network-name-gen
- version: ~9.x-0
- repository: '@local'
- condition: network-name-gen.enabled
- - name: dgbuilder
- version: ~9.x-0
- repository: '@local'
- condition: dgbuilder.enabled
- - name: sdnc-prom
- version: ~9.x-0
- repository: '@local'
- condition: config.geoEnabled
- - name: mariadb-galera
- version: ~9.x-0
- repository: '@local'
- condition: global.mariadbGalera.localCluster
- - name: elasticsearch
- version: ~9.x-0
- repository: '@local'
- condition: config.sdnr.enabled
- # conditions for sdnc-subcharts
- - name: dmaap-listener
- version: ~9.x-0
- repository: 'file://components/dmaap-listener/'
- condition: sdnc.dmaap-listener.enabled,dmaap-listener.enabled
- - name: ueb-listener
- version: ~9.x-0
- repository: 'file://components/ueb-listener/'
- condition: sdnc.ueb-listener.enabled,ueb-listener.enabled
- - name: sdnc-ansible-server
- version: ~9.x-0
- repository: 'file://components/sdnc-ansible-server/'
- condition: sdnc.sdnc-ansible-server.enabled,sdnc-ansible-server.enabled
- - name: sdnc-web
- version: ~9.x-0
- repository: 'file://components/sdnc-web/'
- condition: sdnc.sdnc-web.enabled,sdnc-web.enabled
- - name: repositoryGenerator
- version: ~9.x-0
- repository: '@local'
- - name: serviceAccount
- version: ~9.x-0
- repository: '@local'
diff --git a/kubernetes/sdnc/templates/statefulset.yaml b/kubernetes/sdnc/templates/statefulset.yaml
index fc584d8e25..f53c41c0f5 100644
--- a/kubernetes/sdnc/templates/statefulset.yaml
+++ b/kubernetes/sdnc/templates/statefulset.yaml
@@ -121,7 +121,6 @@ spec:
value: "{{ .Values.config.sdnr.oauth.odluxRbac.enabled | default "true" }}"
{{ end }}
-
volumeMounts:
- mountPath: /config-input
name: config-input
@@ -311,6 +310,27 @@ spec:
value: "{{ .Values.config.sdnr.oauth.enabled | default "false" }}"
- name: SDNR_NETCONF_CALLHOME_ENABLED
value: "{{ .Values.config.sdnr.netconfCallHome.enabled | default "false" }}"
+ - name: SDNR_VES_COLLECTOR_ENABLED
+ value: "{{ .Values.config.sdnr.vesCollector.enabled }}"
+ - name: SDNR_VES_COLLECTOR_TLS_ENABLED
+ value: "{{ .Values.config.sdnr.vesCollector.tls.enabled }}"
+ - name: SDNR_VES_COLLECTOR_TRUST_ALL_CERTS
+ value: "{{ .Values.config.sdnr.vesCollector.trustAllCertificates }}"
+ - name: SDNR_VES_COLLECTOR_IP
+ value: "{{ .Values.config.sdnr.vesCollector.address }}"
+ - name: SDNR_VES_COLLECTOR_PORT
+ value: "{{ .Values.config.sdnr.vesCollector.port }}"
+ - name: SDNR_VES_COLLECTOR_VERSION
+ value: "{{ .Values.config.sdnr.vesCollector.version | default "v7" }}"
+ - name: SDNR_VES_COLLECTOR_REPORTING_ENTITY_NAME
+ value: "{{ .Values.config.sdnr.vesCollector.reportingEntityName | default "ONAP SDN-R" }}"
+ - name: SDNR_VES_COLLECTOR_EVENTLOG_MSG_DETAIL
+ value: "{{ .Values.config.sdnr.vesCollector.eventLogMsgDetail | default "SHORT" }}"
+ - name: SDNR_VES_COLLECTOR_USERNAME
+ {{- include "common.secret.envFromSecretFast" (dict "global" . "uid" "ves-collector-secret" "key" "login") | indent 12 }}
+ - name: SDNR_VES_COLLECTOR_PASSWORD
+ {{- include "common.secret.envFromSecretFast" (dict "global" . "uid" "ves-collector-secret" "key" "password") | indent 12 }}
+
volumeMounts:
{{ include "common.certInitializer.volumeMount" . | indent 10 }}
{{- if .Values.global.cmpv2Enabled }}
diff --git a/kubernetes/sdnc/values.yaml b/kubernetes/sdnc/values.yaml
index 15a8045d2f..cbf5678283 100644
--- a/kubernetes/sdnc/values.yaml
+++ b/kubernetes/sdnc/values.yaml
@@ -181,7 +181,10 @@ secrets:
externalSecret: '{{ ternary (tpl (default "" .Values.config.sdnr.oauth.providersSecrets.keycloakExternalSecret) .) "oauth-disabled" .Values.config.sdnr.oauth.enabled }}'
password: '{{ .Values.config.sdnr.oauth.providersSecrets.keycloak }}'
passwordPolicy: required
-
+ - uid: ves-collector-secret
+ type: basicAuth
+ login: '{{ .Values.config.sdnr.vesCollector.username }}'
+ password: '{{ .Values.config.sdnr.vesCollector.password }}'
#################################################################
# Certificates
#################################################################
@@ -261,6 +264,7 @@ config:
ansibleUser: sdnc
ansiblePassword: sdnc
# ansibleCredsExternalSecret: some secret
+
dbSdnctlDatabase: &sdncDbName sdnctl
enableClustering: true
sdncHome: /opt/onap/sdnc
@@ -354,6 +358,18 @@ config:
title: ONAP Keycloak Provider
roleMapping:
mykeycloak: admin
+ vesCollector:
+ enabled: false
+ tls:
+ enabled: true
+ trustAllCertificates: false
+ username: sample1
+ password: sample1
+ address: dcae-ves-collector.onap
+ port: 8443
+ version: v7
+ reportingEntityName: ONAP SDN-R
+ eventLogMsgDetail: SHORT
# dependency / sub-chart configuration
certInitializer:
@@ -501,6 +517,7 @@ elasticsearch:
dedicatednode: "no"
nameOverride: *elasticSearchName
cluster_name: sdnrdb-cluster
+
# enable
sdnc-web:
enabled: true
diff --git a/kubernetes/sniro-emulator/Chart.yaml b/kubernetes/sniro-emulator/Chart.yaml
index 4bbacabede..5366ed9a35 100644
--- a/kubernetes/sniro-emulator/Chart.yaml
+++ b/kubernetes/sniro-emulator/Chart.yaml
@@ -1,5 +1,6 @@
# Copyright © 2017 Amdocs, Bell Canada
# Modifications Copyright © 2021 Orange
+# Modifications Copyright © 2021 Nordix Foundation
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -13,7 +14,18 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-apiVersion: v1
+apiVersion: v2
description: ONAP Mock Sniro Emulator
name: sniro-emulator
-version: 9.0.0
+version: 10.0.0
+
+dependencies:
+ - name: common
+ version: ~10.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: repositoryGenerator
+ version: ~10.x-0
+ repository: '@local'
diff --git a/kubernetes/sniro-emulator/requirements.yaml b/kubernetes/sniro-emulator/requirements.yaml
deleted file mode 100644
index 9f1af30ec0..0000000000
--- a/kubernetes/sniro-emulator/requirements.yaml
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright © 2017 Amdocs, Bell Canada
-# Modifications Copyright © 2021 Orange
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-dependencies:
- - name: common
- version: ~9.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: repositoryGenerator
- version: ~9.x-0
- repository: '@local'
diff --git a/kubernetes/so/Chart.yaml b/kubernetes/so/Chart.yaml
index 94f916f184..d7466476de 100755
--- a/kubernetes/so/Chart.yaml
+++ b/kubernetes/so/Chart.yaml
@@ -1,5 +1,6 @@
# Copyright © 2017 Amdocs, Bell Canada
# Modifications Copyright © 2021 Orange
+# Modifications Copyright © 2021 Nordix Foundation
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -12,7 +13,94 @@
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
-apiVersion: v1
+apiVersion: v2
description: ONAP Service Orchestrator
name: so
-version: 9.0.0
+version: 10.0.0
+
+dependencies:
+ - name: common
+ version: ~10.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: certInitializer
+ version: ~10.x-0
+ repository: '@local'
+ - name: readinessCheck
+ version: ~10.x-0
+ repository: '@local'
+ - name: mariadb-galera
+ version: ~10.x-0
+ repository: '@local'
+ condition: global.mariadbGalera.localCluster
+ - name: repositoryGenerator
+ version: ~10.x-0
+ repository: '@local'
+ - name: soHelpers
+ version: ~10.x-0
+ repository: 'file://components/soHelpers'
+ - name: so-admin-cockpit
+ version: ~10.x-0
+ repository: 'file://components/so-admin-cockpit'
+ condition: so-admin-cockpit.enabled
+ - name: so-appc-orchestrator
+ version: ~10.x-0
+ repository: 'file://components/so-appc-orchestrator'
+ condition: so-appc-orchestrator.enabled
+ - name: so-bpmn-infra
+ version: ~10.x-0
+ repository: 'file://components/so-bpmn-infra'
+ - name: so-catalog-db-adapter
+ version: ~10.x-0
+ repository: 'file://components/so-catalog-db-adapter'
+ condition: so-catalog-db-adapter.enabled
+ - name: so-cnf-adapter
+ version: ~10.x-0
+ repository: "file://components/so-cnf-adapter"
+ condition: so-cnf-adapter.enabled
+ - name: so-etsi-nfvo-ns-lcm
+ version: ~10.x-0
+ repository: 'file://components/so-etsi-nfvo-ns-lcm'
+ condition: so-etsi-nfvo-ns-lcm.enabled
+ - name: so-etsi-sol003-adapter
+ version: ~10.x-0
+ repository: 'file://components/so-etsi-sol003-adapter'
+ condition: so-etsi-sol003-adapter.enabled
+ - name: so-mariadb
+ version: ~10.x-0
+ repository: 'file://components/so-mariadb'
+ - name: so-nssmf-adapter
+ version: ~10.x-0
+ repository: 'file://components/so-nssmf-adapter'
+ condition: so-nssmf-adapter.enabled
+ - name: so-oof-adapter
+ version: ~10.x-0
+ repository: 'file://components/so-oof-adapter'
+ condition: so-oof-adapter.enabled
+ - name: so-openstack-adapter
+ version: ~10.x-0
+ repository: 'file://components/so-openstack-adapter'
+ condition: so-openstack-adapter.enabled
+ - name: so-request-db-adapter
+ version: ~10.x-0
+ repository: 'file://components/so-request-db-adapter'
+ - name: so-sdc-controller
+ version: ~10.x-0
+ repository: 'file://components/so-sdc-controller'
+ - name: so-sdnc-adapter
+ version: ~10.x-0
+ repository: 'file://components/so-sdnc-adapter'
+ condition: so-sdnc-adapter.enabled
+ - name: so-ve-vnfm-adapter
+ version: ~10.x-0
+ repository: 'file://components/so-ve-vnfm-adapter'
+ condition: so-ve-vnfm-adapter.enabled
+ - name: so-etsi-sol005-adapter
+ version: ~10.x-0
+ repository: 'file://components/so-etsi-sol005-adapter'
+ condition: so-etsi-sol005-adapter.enabled
+ - name: serviceAccount
+ version: ~10.x-0
+ repository: '@local'
diff --git a/kubernetes/so/Makefile b/kubernetes/so/Makefile
index 4c79718d02..51d7de122c 100644
--- a/kubernetes/so/Makefile
+++ b/kubernetes/so/Makefile
@@ -33,7 +33,7 @@ make-%:
@if [ -f $*/Makefile ]; then make -C $*; fi
dep-%: make-%
- @if [ -f $*/requirements.yaml ]; then $(HELM_BIN) dep up $*; fi
+ @if [ -f $*/Chart.yaml ]; then $(HELM_BIN) dep up $*; fi
lint-%: dep-%
@if [ -f $*/Chart.yaml ]; then $(HELM_BIN) lint $*; fi
@@ -44,7 +44,7 @@ package-%: lint-%
@$(HELM_BIN) repo index $(PACKAGE_DIR)
clean:
- @rm -f */requirements.lock
+ @rm -f */Chart.lock
@rm -f *tgz */charts/*tgz
@rm -rf $(PACKAGE_DIR)
%:
diff --git a/kubernetes/so/components/Makefile b/kubernetes/so/components/Makefile
index f2e7a1fb82..1ea8433a9c 100644
--- a/kubernetes/so/components/Makefile
+++ b/kubernetes/so/components/Makefile
@@ -33,7 +33,7 @@ make-%:
@if [ -f $*/Makefile ]; then make -C $*; fi
dep-%: make-%
- @if [ -f $*/requirements.yaml ]; then $(HELM_BIN) dep up $*; fi
+ @if [ -f $*/Chart.yaml ]; then $(HELM_BIN) dep up $*; fi
lint-%: dep-%
@if [ -f $*/Chart.yaml ]; then $(HELM_BIN) lint $*; fi
@@ -44,7 +44,7 @@ package-%: lint-%
@$(HELM_BIN) repo index $(PACKAGE_DIR)
clean:
- @rm -f */requirements.lock
+ @rm -f */Chart.lock
@rm -f *tgz */charts/*tgz
@rm -rf $(PACKAGE_DIR)
%:
diff --git a/kubernetes/so/components/so-admin-cockpit/Chart.yaml b/kubernetes/so/components/so-admin-cockpit/Chart.yaml
index 79c5bb8b83..f916b5c7b7 100644
--- a/kubernetes/so/components/so-admin-cockpit/Chart.yaml
+++ b/kubernetes/so/components/so-admin-cockpit/Chart.yaml
@@ -1,6 +1,7 @@
# ============LICENSE_START=======================================================
# Copyright (C) 2018 Ericsson. All rights reserved.
# Modifications Copyright © 2021 Orange
+# Modifications Copyright © 2021 Nordix Foundation
# ================================================================================
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -17,7 +18,24 @@
# SPDX-License-Identifier: Apache-2.0
# ============LICENSE_END=========================================================
# @author: gareth.roper@ericsson.com
-apiVersion: v1
+apiVersion: v2
description: A Helm chart for ONAP Service Orchestration Monitoring
name: so-admin-cockpit
-version: 9.0.0
+version: 10.0.0
+
+dependencies:
+ - name: common
+ version: ~10.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: repositoryGenerator
+ version: ~10.x-0
+ repository: '@local'
+ - name: soHelpers
+ version: ~10.x-0
+ repository: 'file://../soHelpers'
+ - name: serviceAccount
+ version: ~10.x-0
+ repository: '@local'
diff --git a/kubernetes/so/components/so-admin-cockpit/requirements.yaml b/kubernetes/so/components/so-admin-cockpit/requirements.yaml
deleted file mode 100755
index 3120c0f684..0000000000
--- a/kubernetes/so/components/so-admin-cockpit/requirements.yaml
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright © 2017 Amdocs, Bell Canada
-# Modifications © 2020 Nokia
-# Modifications Copyright © 2021 Orange
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-dependencies:
- - name: common
- version: ~9.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: repositoryGenerator
- version: ~9.x-0
- repository: '@local'
- - name: soHelpers
- version: ~9.x-0
- repository: 'file://../soHelpers'
- - name: serviceAccount
- version: ~9.x-0
- repository: '@local'
diff --git a/kubernetes/so/components/so-appc-orchestrator/Chart.yaml b/kubernetes/so/components/so-appc-orchestrator/Chart.yaml
index 944b7decb7..eae024bc53 100644
--- a/kubernetes/so/components/so-appc-orchestrator/Chart.yaml
+++ b/kubernetes/so/components/so-appc-orchestrator/Chart.yaml
@@ -1,5 +1,6 @@
# Copyright © 2020 AT&T USA
# Modifications Copyright © 2021 Orange
+# Modifications Copyright © 2021 Nordix Foundation
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -13,7 +14,24 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-apiVersion: v1
+apiVersion: v2
description: A Helm chart for so appc orchestrator
name: so-appc-orchestrator
-version: 9.0.0
+version: 10.0.0
+
+dependencies:
+ - name: common
+ version: ~10.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: repositoryGenerator
+ version: ~10.x-0
+ repository: '@local'
+ - name: soHelpers
+ version: ~10.x-0
+ repository: 'file://../soHelpers'
+ - name: serviceAccount
+ version: ~10.x-0
+ repository: '@local'
diff --git a/kubernetes/so/components/so-appc-orchestrator/requirements.yaml b/kubernetes/so/components/so-appc-orchestrator/requirements.yaml
deleted file mode 100755
index 19d4cc7356..0000000000
--- a/kubernetes/so/components/so-appc-orchestrator/requirements.yaml
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright © 2017 Amdocs, Bell Canada
-# Modifications Copyright © 2021 Orange
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-dependencies:
- - name: common
- version: ~9.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: repositoryGenerator
- version: ~9.x-0
- repository: '@local'
- - name: soHelpers
- version: ~9.x-0
- repository: 'file://../soHelpers'
- - name: serviceAccount
- version: ~9.x-0
- repository: '@local'
diff --git a/kubernetes/so/components/so-bpmn-infra/Chart.yaml b/kubernetes/so/components/so-bpmn-infra/Chart.yaml
index 3b439b6eff..867f42956d 100755
--- a/kubernetes/so/components/so-bpmn-infra/Chart.yaml
+++ b/kubernetes/so/components/so-bpmn-infra/Chart.yaml
@@ -1,5 +1,6 @@
# Copyright © 2018 AT&T USA
# Modifications Copyright © 2021 Orange
+# Modifications Copyright © 2021 Nordix Foundation
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -12,8 +13,28 @@
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
-apiVersion: v1
+apiVersion: v2
appVersion: "1.0"
description: A Helm chart for SO Bpmn Infra
name: so-bpmn-infra
-version: 9.0.0
+version: 10.0.0
+
+dependencies:
+ - name: common
+ version: ~10.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: readinessCheck
+ version: ~10.x-0
+ repository: '@local'
+ - name: repositoryGenerator
+ version: ~10.x-0
+ repository: '@local'
+ - name: soHelpers
+ version: ~10.x-0
+ repository: 'file://../soHelpers'
+ - name: serviceAccount
+ version: ~10.x-0
+ repository: '@local'
diff --git a/kubernetes/so/components/so-bpmn-infra/requirements.yaml b/kubernetes/so/components/so-bpmn-infra/requirements.yaml
deleted file mode 100755
index ad2eb7623e..0000000000
--- a/kubernetes/so/components/so-bpmn-infra/requirements.yaml
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright © 2017 Amdocs, Bell Canada
-# Modifications Copyright © 2021 Orange
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-dependencies:
- - name: common
- version: ~9.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: readinessCheck
- version: ~9.x-0
- repository: '@local'
- - name: repositoryGenerator
- version: ~9.x-0
- repository: '@local'
- - name: soHelpers
- version: ~9.x-0
- repository: 'file://../soHelpers'
- - name: serviceAccount
- version: ~9.x-0
- repository: '@local'
diff --git a/kubernetes/so/components/so-catalog-db-adapter/Chart.yaml b/kubernetes/so/components/so-catalog-db-adapter/Chart.yaml
index ed640b1018..64b339331e 100755
--- a/kubernetes/so/components/so-catalog-db-adapter/Chart.yaml
+++ b/kubernetes/so/components/so-catalog-db-adapter/Chart.yaml
@@ -1,5 +1,6 @@
# Copyright © 2018 AT&T USA
# Modifications Copyright © 2021 Orange
+# Modifications Copyright © 2021 Nordix Foundation
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -12,7 +13,27 @@
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
-apiVersion: v1
+apiVersion: v2
description: A Helm chart for so-catalog-db-adapter
name: so-catalog-db-adapter
-version: 9.0.0
+version: 10.0.0
+
+dependencies:
+ - name: common
+ version: ~10.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: readinessCheck
+ version: ~10.x-0
+ repository: '@local'
+ - name: repositoryGenerator
+ version: ~10.x-0
+ repository: '@local'
+ - name: soHelpers
+ version: ~10.x-0
+ repository: 'file://../soHelpers'
+ - name: serviceAccount
+ version: ~10.x-0
+ repository: '@local'
diff --git a/kubernetes/so/components/so-catalog-db-adapter/requirements.yaml b/kubernetes/so/components/so-catalog-db-adapter/requirements.yaml
deleted file mode 100755
index ad2eb7623e..0000000000
--- a/kubernetes/so/components/so-catalog-db-adapter/requirements.yaml
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright © 2017 Amdocs, Bell Canada
-# Modifications Copyright © 2021 Orange
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-dependencies:
- - name: common
- version: ~9.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: readinessCheck
- version: ~9.x-0
- repository: '@local'
- - name: repositoryGenerator
- version: ~9.x-0
- repository: '@local'
- - name: soHelpers
- version: ~9.x-0
- repository: 'file://../soHelpers'
- - name: serviceAccount
- version: ~9.x-0
- repository: '@local'
diff --git a/kubernetes/so/components/so-cnf-adapter/Chart.yaml b/kubernetes/so/components/so-cnf-adapter/Chart.yaml
index 79028c0816..6155a93b2a 100755
--- a/kubernetes/so/components/so-cnf-adapter/Chart.yaml
+++ b/kubernetes/so/components/so-cnf-adapter/Chart.yaml
@@ -1,5 +1,6 @@
# Copyright © 2020 Huawei Technologies Co., Ltd.
# Modifications Copyright © 2021 Orange
+# Modifications Copyright © 2021 Nordix Foundation
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -13,8 +14,28 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-apiVersion: v1
+apiVersion: v2
appVersion: "1.7.1"
description: A Helm chart for Kubernetes
name: so-cnf-adapter
-version: 9.0.0
+version: 10.0.0
+
+dependencies:
+ - name: common
+ version: ~10.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: readinessCheck
+ version: ~10.x-0
+ repository: '@local'
+ - name: repositoryGenerator
+ version: ~10.x-0
+ repository: '@local'
+ - name: soHelpers
+ version: ~10.x-0
+ repository: 'file://../soHelpers'
+ - name: serviceAccount
+ version: ~10.x-0
+ repository: '@local'
diff --git a/kubernetes/so/components/so-cnf-adapter/requirements.yaml b/kubernetes/so/components/so-cnf-adapter/requirements.yaml
deleted file mode 100755
index 17634f30b8..0000000000
--- a/kubernetes/so/components/so-cnf-adapter/requirements.yaml
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright © 2017 Amdocs, Bell Canada
-# Modifications Copyright © 2021 Orange
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-dependencies:
- - name: common
- version: ~9.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: readinessCheck
- version: ~9.x-0
- repository: '@local'
- - name: repositoryGenerator
- version: ~9.x-0
- repository: '@local'
- - name: soHelpers
- version: ~9.x-0
- repository: 'file://../soHelpers'
- - name: serviceAccount
- version: ~9.x-0
- repository: '@local'
diff --git a/kubernetes/so/components/so-etsi-nfvo-ns-lcm/Chart.yaml b/kubernetes/so/components/so-etsi-nfvo-ns-lcm/Chart.yaml
index c321949338..0d1f03bfc8 100644
--- a/kubernetes/so/components/so-etsi-nfvo-ns-lcm/Chart.yaml
+++ b/kubernetes/so/components/so-etsi-nfvo-ns-lcm/Chart.yaml
@@ -1,5 +1,6 @@
# Copyright © 2020 Nordix Foundation
# Modifications Copyright © 2021 Orange
+# Modifications Copyright © 2021 Nordix Foundation
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -13,7 +14,24 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-apiVersion: v1
+apiVersion: v2
description: ONAP SO ETSI NFVO NS LCM
name: so-etsi-nfvo-ns-lcm
-version: 9.0.0
+version: 10.0.0
+
+dependencies:
+ - name: common
+ version: ~10.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: repositoryGenerator
+ version: ~10.x-0
+ repository: '@local'
+ - name: soHelpers
+ version: ~10.x-0
+ repository: 'file://../soHelpers'
+ - name: serviceAccount
+ version: ~10.x-0
+ repository: '@local'
diff --git a/kubernetes/so/components/so-etsi-nfvo-ns-lcm/requirements.yaml b/kubernetes/so/components/so-etsi-nfvo-ns-lcm/requirements.yaml
deleted file mode 100755
index 19d4cc7356..0000000000
--- a/kubernetes/so/components/so-etsi-nfvo-ns-lcm/requirements.yaml
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright © 2017 Amdocs, Bell Canada
-# Modifications Copyright © 2021 Orange
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-dependencies:
- - name: common
- version: ~9.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: repositoryGenerator
- version: ~9.x-0
- repository: '@local'
- - name: soHelpers
- version: ~9.x-0
- repository: 'file://../soHelpers'
- - name: serviceAccount
- version: ~9.x-0
- repository: '@local'
diff --git a/kubernetes/so/components/so-etsi-sol003-adapter/Chart.yaml b/kubernetes/so/components/so-etsi-sol003-adapter/Chart.yaml
index f3435e8561..8d67e41577 100755
--- a/kubernetes/so/components/so-etsi-sol003-adapter/Chart.yaml
+++ b/kubernetes/so/components/so-etsi-sol003-adapter/Chart.yaml
@@ -1,5 +1,6 @@
# Copyright © 2019 Nordix Foundation
# Modifications Copyright © 2021 Orange
+# Modifications Copyright © 2021 Nordix Foundation
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -12,7 +13,24 @@
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
-apiVersion: v1
+apiVersion: v2
description: ONAP SO ETSI SOL003 Adapter
name: so-etsi-sol003-adapter
-version: 9.0.0
+version: 10.0.0
+
+dependencies:
+ - name: common
+ version: ~10.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: repositoryGenerator
+ version: ~10.x-0
+ repository: '@local'
+ - name: soHelpers
+ version: ~10.x-0
+ repository: 'file://../soHelpers'
+ - name: serviceAccount
+ version: ~10.x-0
+ repository: '@local'
diff --git a/kubernetes/so/components/so-etsi-sol003-adapter/requirements.yaml b/kubernetes/so/components/so-etsi-sol003-adapter/requirements.yaml
deleted file mode 100755
index 19d4cc7356..0000000000
--- a/kubernetes/so/components/so-etsi-sol003-adapter/requirements.yaml
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright © 2017 Amdocs, Bell Canada
-# Modifications Copyright © 2021 Orange
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-dependencies:
- - name: common
- version: ~9.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: repositoryGenerator
- version: ~9.x-0
- repository: '@local'
- - name: soHelpers
- version: ~9.x-0
- repository: 'file://../soHelpers'
- - name: serviceAccount
- version: ~9.x-0
- repository: '@local'
diff --git a/kubernetes/so/components/so-etsi-sol005-adapter/Chart.yaml b/kubernetes/so/components/so-etsi-sol005-adapter/Chart.yaml
index 6c9d1f36e2..2a511c002f 100755
--- a/kubernetes/so/components/so-etsi-sol005-adapter/Chart.yaml
+++ b/kubernetes/so/components/so-etsi-sol005-adapter/Chart.yaml
@@ -1,5 +1,6 @@
# Copyright © 2018 AT&T USA
# Modifications Copyright © 2021 Orange
+# Modifications Copyright © 2021 Nordix Foundation
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -12,8 +13,28 @@
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
-apiVersion: v1
+apiVersion: v2
appVersion: "1.0"
description: A Helm chart for Kubernetes
name: so-etsi-sol005-adapter
-version: 9.0.0
+version: 10.0.0
+
+dependencies:
+ - name: common
+ version: ~10.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: readinessCheck
+ version: ~10.x-0
+ repository: '@local'
+ - name: repositoryGenerator
+ version: ~10.x-0
+ repository: '@local'
+ - name: soHelpers
+ version: ~10.x-0
+ repository: 'file://../soHelpers'
+ - name: serviceAccount
+ version: ~10.x-0
+ repository: '@local'
diff --git a/kubernetes/so/components/so-etsi-sol005-adapter/requirements.yaml b/kubernetes/so/components/so-etsi-sol005-adapter/requirements.yaml
deleted file mode 100755
index ad2eb7623e..0000000000
--- a/kubernetes/so/components/so-etsi-sol005-adapter/requirements.yaml
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright © 2017 Amdocs, Bell Canada
-# Modifications Copyright © 2021 Orange
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-dependencies:
- - name: common
- version: ~9.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: readinessCheck
- version: ~9.x-0
- repository: '@local'
- - name: repositoryGenerator
- version: ~9.x-0
- repository: '@local'
- - name: soHelpers
- version: ~9.x-0
- repository: 'file://../soHelpers'
- - name: serviceAccount
- version: ~9.x-0
- repository: '@local'
diff --git a/kubernetes/so/components/so-mariadb/Chart.yaml b/kubernetes/so/components/so-mariadb/Chart.yaml
index 4cc9ff61fc..1b8ce4acc0 100755
--- a/kubernetes/so/components/so-mariadb/Chart.yaml
+++ b/kubernetes/so/components/so-mariadb/Chart.yaml
@@ -1,5 +1,6 @@
# Copyright © 2017 Amdocs, Bell Canada
# Modifications Copyright © 2021 Orange
+# Modifications Copyright © 2021 Nordix Foundation
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -12,7 +13,24 @@
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
-apiVersion: v1
+apiVersion: v2
description: MariaDB Service
name: so-mariadb
-version: 9.0.0
+version: 10.0.0
+
+dependencies:
+ - name: common
+ version: ~10.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: repositoryGenerator
+ version: ~10.x-0
+ repository: '@local'
+ - name: readinessCheck
+ version: ~10.x-0
+ repository: '@local'
+ - name: serviceAccount
+ version: ~10.x-0
+ repository: '@local'
diff --git a/kubernetes/so/components/so-mariadb/requirements.yaml b/kubernetes/so/components/so-mariadb/requirements.yaml
deleted file mode 100755
index f5c8b4ffe5..0000000000
--- a/kubernetes/so/components/so-mariadb/requirements.yaml
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright © 2017 Amdocs, Bell Canada
-# Modifications Copyright © 2021 Orange
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-dependencies:
- - name: common
- version: ~9.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: repositoryGenerator
- version: ~9.x-0
- repository: '@local'
- - name: readinessCheck
- version: ~9.x-0
- repository: '@local'
- - name: serviceAccount
- version: ~9.x-0
- repository: '@local'
diff --git a/kubernetes/so/components/so-nssmf-adapter/Chart.yaml b/kubernetes/so/components/so-nssmf-adapter/Chart.yaml
index 42173b320c..525f54dfe7 100755
--- a/kubernetes/so/components/so-nssmf-adapter/Chart.yaml
+++ b/kubernetes/so/components/so-nssmf-adapter/Chart.yaml
@@ -1,5 +1,6 @@
# Copyright © 2020 Huawei Technologies Co., Ltd.
# Modifications Copyright © 2021 Orange
+# Modifications Copyright © 2021 Nordix Foundation
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -12,8 +13,28 @@
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
-apiVersion: v1
+apiVersion: v2
appVersion: "1.0"
description: A Helm chart for Kubernetes
name: so-nssmf-adapter
-version: 9.0.0
+version: 10.0.0
+
+dependencies:
+ - name: common
+ version: ~10.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: readinessCheck
+ version: ~10.x-0
+ repository: '@local'
+ - name: repositoryGenerator
+ version: ~10.x-0
+ repository: '@local'
+ - name: soHelpers
+ version: ~10.x-0
+ repository: 'file://../soHelpers'
+ - name: serviceAccount
+ version: ~10.x-0
+ repository: '@local'
diff --git a/kubernetes/so/components/so-nssmf-adapter/requirements.yaml b/kubernetes/so/components/so-nssmf-adapter/requirements.yaml
deleted file mode 100755
index ad2eb7623e..0000000000
--- a/kubernetes/so/components/so-nssmf-adapter/requirements.yaml
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright © 2017 Amdocs, Bell Canada
-# Modifications Copyright © 2021 Orange
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-dependencies:
- - name: common
- version: ~9.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: readinessCheck
- version: ~9.x-0
- repository: '@local'
- - name: repositoryGenerator
- version: ~9.x-0
- repository: '@local'
- - name: soHelpers
- version: ~9.x-0
- repository: 'file://../soHelpers'
- - name: serviceAccount
- version: ~9.x-0
- repository: '@local'
diff --git a/kubernetes/so/components/so-oof-adapter/Chart.yaml b/kubernetes/so/components/so-oof-adapter/Chart.yaml
index 807d8449a1..c411ef9830 100755
--- a/kubernetes/so/components/so-oof-adapter/Chart.yaml
+++ b/kubernetes/so/components/so-oof-adapter/Chart.yaml
@@ -1,5 +1,6 @@
# Copyright © 2020 Wipro Limited.
# Modifications Copyright © 2021 Orange
+# Modifications Copyright © 2021 Nordix Foundation
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -13,8 +14,25 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-apiVersion: v1
+apiVersion: v2
appVersion: "1.0"
description: A Helm chart for Kubernetes
name: so-oof-adapter
-version: 9.0.0
+version: 10.0.0
+
+dependencies:
+ - name: common
+ version: ~10.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: repositoryGenerator
+ version: ~10.x-0
+ repository: '@local'
+ - name: soHelpers
+ version: ~10.x-0
+ repository: 'file://../soHelpers'
+ - name: serviceAccount
+ version: ~10.x-0
+ repository: '@local'
diff --git a/kubernetes/so/components/so-oof-adapter/requirements.yaml b/kubernetes/so/components/so-oof-adapter/requirements.yaml
deleted file mode 100644
index dcff74b9a5..0000000000
--- a/kubernetes/so/components/so-oof-adapter/requirements.yaml
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright © 2020 Wipro Limited.
-# Modifications Copyright © 2021 Orange
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-dependencies:
- - name: common
- version: ~9.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: repositoryGenerator
- version: ~9.x-0
- repository: '@local'
- - name: soHelpers
- version: ~9.x-0
- repository: 'file://../soHelpers'
- - name: serviceAccount
- version: ~9.x-0
- repository: '@local'
diff --git a/kubernetes/so/components/so-openstack-adapter/Chart.yaml b/kubernetes/so/components/so-openstack-adapter/Chart.yaml
index 46fc42252f..cd128fa921 100755
--- a/kubernetes/so/components/so-openstack-adapter/Chart.yaml
+++ b/kubernetes/so/components/so-openstack-adapter/Chart.yaml
@@ -1,5 +1,6 @@
# Copyright © 2018 AT&T USA
# Modifications Copyright © 2021 Orange
+# Modifications Copyright © 2021 Nordix Foundation
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -12,8 +13,28 @@
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
-apiVersion: v1
+apiVersion: v2
appVersion: "1.0"
description: A Helm chart for Kubernetes
name: so-openstack-adapter
-version: 9.0.0
+version: 10.0.0
+
+dependencies:
+ - name: common
+ version: ~10.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: readinessCheck
+ version: ~10.x-0
+ repository: '@local'
+ - name: repositoryGenerator
+ version: ~10.x-0
+ repository: '@local'
+ - name: soHelpers
+ version: ~10.x-0
+ repository: 'file://../soHelpers'
+ - name: serviceAccount
+ version: ~10.x-0
+ repository: '@local'
diff --git a/kubernetes/so/components/so-openstack-adapter/requirements.yaml b/kubernetes/so/components/so-openstack-adapter/requirements.yaml
deleted file mode 100755
index ad2eb7623e..0000000000
--- a/kubernetes/so/components/so-openstack-adapter/requirements.yaml
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright © 2017 Amdocs, Bell Canada
-# Modifications Copyright © 2021 Orange
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-dependencies:
- - name: common
- version: ~9.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: readinessCheck
- version: ~9.x-0
- repository: '@local'
- - name: repositoryGenerator
- version: ~9.x-0
- repository: '@local'
- - name: soHelpers
- version: ~9.x-0
- repository: 'file://../soHelpers'
- - name: serviceAccount
- version: ~9.x-0
- repository: '@local'
diff --git a/kubernetes/so/components/so-request-db-adapter/Chart.yaml b/kubernetes/so/components/so-request-db-adapter/Chart.yaml
index c8d573e582..6e65cd7f53 100755
--- a/kubernetes/so/components/so-request-db-adapter/Chart.yaml
+++ b/kubernetes/so/components/so-request-db-adapter/Chart.yaml
@@ -1,5 +1,6 @@
# Copyright © 2018 AT&T USA
# Modifications Copyright © 2021 Orange
+# Modifications Copyright © 2021 Nordix Foundation
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -12,7 +13,27 @@
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
-apiVersion: v1
+apiVersion: v2
description: A Helm chart for request-db-adapter
name: so-request-db-adapter
-version: 9.0.0
+version: 10.0.0
+
+dependencies:
+ - name: common
+ version: ~10.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: readinessCheck
+ version: ~10.x-0
+ repository: '@local'
+ - name: repositoryGenerator
+ version: ~10.x-0
+ repository: '@local'
+ - name: soHelpers
+ version: ~10.x-0
+ repository: 'file://../soHelpers'
+ - name: serviceAccount
+ version: ~10.x-0
+ repository: '@local'
diff --git a/kubernetes/so/components/so-request-db-adapter/requirements.yaml b/kubernetes/so/components/so-request-db-adapter/requirements.yaml
deleted file mode 100755
index ad2eb7623e..0000000000
--- a/kubernetes/so/components/so-request-db-adapter/requirements.yaml
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright © 2017 Amdocs, Bell Canada
-# Modifications Copyright © 2021 Orange
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-dependencies:
- - name: common
- version: ~9.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: readinessCheck
- version: ~9.x-0
- repository: '@local'
- - name: repositoryGenerator
- version: ~9.x-0
- repository: '@local'
- - name: soHelpers
- version: ~9.x-0
- repository: 'file://../soHelpers'
- - name: serviceAccount
- version: ~9.x-0
- repository: '@local'
diff --git a/kubernetes/so/components/so-sdc-controller/Chart.yaml b/kubernetes/so/components/so-sdc-controller/Chart.yaml
index 82b16fb72c..a50e498d68 100755
--- a/kubernetes/so/components/so-sdc-controller/Chart.yaml
+++ b/kubernetes/so/components/so-sdc-controller/Chart.yaml
@@ -1,5 +1,6 @@
# Copyright © 2018 AT&T USA
# Modifications Copyright © 2021 Orange
+# Modifications Copyright © 2021 Nordix Foundation
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -12,8 +13,28 @@
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
-apiVersion: v1
+apiVersion: v2
appVersion: "1.0"
description: A Helm chart for Kubernetes
name: so-sdc-controller
-version: 9.0.0
+version: 10.0.0
+
+dependencies:
+ - name: common
+ version: ~10.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: readinessCheck
+ version: ~10.x-0
+ repository: '@local'
+ - name: repositoryGenerator
+ version: ~10.x-0
+ repository: '@local'
+ - name: soHelpers
+ version: ~10.x-0
+ repository: 'file://../soHelpers'
+ - name: serviceAccount
+ version: ~10.x-0
+ repository: '@local'
diff --git a/kubernetes/so/components/so-sdc-controller/requirements.yaml b/kubernetes/so/components/so-sdc-controller/requirements.yaml
deleted file mode 100755
index ad2eb7623e..0000000000
--- a/kubernetes/so/components/so-sdc-controller/requirements.yaml
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright © 2017 Amdocs, Bell Canada
-# Modifications Copyright © 2021 Orange
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-dependencies:
- - name: common
- version: ~9.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: readinessCheck
- version: ~9.x-0
- repository: '@local'
- - name: repositoryGenerator
- version: ~9.x-0
- repository: '@local'
- - name: soHelpers
- version: ~9.x-0
- repository: 'file://../soHelpers'
- - name: serviceAccount
- version: ~9.x-0
- repository: '@local'
diff --git a/kubernetes/so/components/so-sdnc-adapter/Chart.yaml b/kubernetes/so/components/so-sdnc-adapter/Chart.yaml
index e48406d5f1..01bb209726 100755
--- a/kubernetes/so/components/so-sdnc-adapter/Chart.yaml
+++ b/kubernetes/so/components/so-sdnc-adapter/Chart.yaml
@@ -1,5 +1,6 @@
# Copyright © 2018 AT&T USA
# Modifications Copyright © 2021 Orange
+# Modifications Copyright © 2021 Nordix Foundation
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -12,8 +13,25 @@
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
-apiVersion: v1
+apiVersion: v2
appVersion: "1.0"
description: A Helm chart for Kubernetes
name: so-sdnc-adapter
-version: 9.0.0
+version: 10.0.0
+
+dependencies:
+ - name: common
+ version: ~10.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: repositoryGenerator
+ version: ~10.x-0
+ repository: '@local'
+ - name: soHelpers
+ version: ~10.x-0
+ repository: 'file://../soHelpers'
+ - name: serviceAccount
+ version: ~10.x-0
+ repository: '@local'
diff --git a/kubernetes/so/components/so-sdnc-adapter/requirements.yaml b/kubernetes/so/components/so-sdnc-adapter/requirements.yaml
deleted file mode 100755
index 19d4cc7356..0000000000
--- a/kubernetes/so/components/so-sdnc-adapter/requirements.yaml
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright © 2017 Amdocs, Bell Canada
-# Modifications Copyright © 2021 Orange
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-dependencies:
- - name: common
- version: ~9.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: repositoryGenerator
- version: ~9.x-0
- repository: '@local'
- - name: soHelpers
- version: ~9.x-0
- repository: 'file://../soHelpers'
- - name: serviceAccount
- version: ~9.x-0
- repository: '@local'
diff --git a/kubernetes/so/components/so-ve-vnfm-adapter/Chart.yaml b/kubernetes/so/components/so-ve-vnfm-adapter/Chart.yaml
index 5e7f635998..6508ca41cf 100755
--- a/kubernetes/so/components/so-ve-vnfm-adapter/Chart.yaml
+++ b/kubernetes/so/components/so-ve-vnfm-adapter/Chart.yaml
@@ -1,5 +1,6 @@
# Copyright © 2020 Samsung
# Modifications Copyright © 2021 Orange
+# Modifications Copyright © 2021 Nordix Foundation
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -13,7 +14,27 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-apiVersion: v1
+apiVersion: v2
description: ONAP SO VE VNFM Adapter (SOL002)
name: so-ve-vnfm-adapter
-version: 9.0.0
+version: 10.0.0
+
+dependencies:
+ - name: common
+ version: ~10.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: readinessCheck
+ version: ~10.x-0
+ repository: '@local'
+ - name: repositoryGenerator
+ version: ~10.x-0
+ repository: '@local'
+ - name: soHelpers
+ version: ~10.x-0
+ repository: 'file://../soHelpers'
+ - name: serviceAccount
+ version: ~10.x-0
+ repository: '@local'
diff --git a/kubernetes/so/components/so-ve-vnfm-adapter/requirements.yaml b/kubernetes/so/components/so-ve-vnfm-adapter/requirements.yaml
deleted file mode 100755
index ad2eb7623e..0000000000
--- a/kubernetes/so/components/so-ve-vnfm-adapter/requirements.yaml
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright © 2017 Amdocs, Bell Canada
-# Modifications Copyright © 2021 Orange
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-dependencies:
- - name: common
- version: ~9.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: readinessCheck
- version: ~9.x-0
- repository: '@local'
- - name: repositoryGenerator
- version: ~9.x-0
- repository: '@local'
- - name: soHelpers
- version: ~9.x-0
- repository: 'file://../soHelpers'
- - name: serviceAccount
- version: ~9.x-0
- repository: '@local'
diff --git a/kubernetes/so/components/soHelpers/Chart.yaml b/kubernetes/so/components/soHelpers/Chart.yaml
index 3eb4a048d4..a8415a3542 100755
--- a/kubernetes/so/components/soHelpers/Chart.yaml
+++ b/kubernetes/so/components/soHelpers/Chart.yaml
@@ -1,5 +1,6 @@
# Copyright © 2018 AT&T USA
# Modifications Copyright © 2021 Orange
+# Modifications Copyright © 2021 Nordix Foundation
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -12,7 +13,18 @@
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
-apiVersion: v1
+apiVersion: v2
description: A Helm chart for SO helpers
name: soHelpers
-version: 9.0.0
+version: 10.0.0
+
+dependencies:
+ - name: common
+ version: ~10.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: certInitializer
+ version: ~10.x-0
+ repository: '@local'
diff --git a/kubernetes/so/components/soHelpers/requirements.yaml b/kubernetes/so/components/soHelpers/requirements.yaml
deleted file mode 100755
index 8bda2a1655..0000000000
--- a/kubernetes/so/components/soHelpers/requirements.yaml
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright © 2017 Amdocs, Bell Canada
-# Modifications Copyright © 2021 Orange
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-dependencies:
- - name: common
- version: ~9.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: certInitializer
- version: ~9.x-0
- repository: '@local'
diff --git a/kubernetes/so/requirements.yaml b/kubernetes/so/requirements.yaml
deleted file mode 100755
index 4c1986203c..0000000000
--- a/kubernetes/so/requirements.yaml
+++ /dev/null
@@ -1,100 +0,0 @@
-# Copyright © 2017 Amdocs, Bell Canada
-# Modifications Copyright © 2021 Orange
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-dependencies:
- - name: common
- version: ~9.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: certInitializer
- version: ~9.x-0
- repository: '@local'
- - name: readinessCheck
- version: ~9.x-0
- repository: '@local'
- - name: mariadb-galera
- version: ~9.x-0
- repository: '@local'
- condition: global.mariadbGalera.localCluster
- - name: repositoryGenerator
- version: ~9.x-0
- repository: '@local'
- - name: soHelpers
- version: ~9.x-0
- repository: 'file://components/soHelpers'
- - name: so-admin-cockpit
- version: ~9.x-0
- repository: 'file://components/so-admin-cockpit'
- condition: so-admin-cockpit.enabled
- - name: so-appc-orchestrator
- version: ~9.x-0
- repository: 'file://components/so-appc-orchestrator'
- condition: so-appc-orchestrator.enabled
- - name: so-bpmn-infra
- version: ~9.x-0
- repository: 'file://components/so-bpmn-infra'
- - name: so-catalog-db-adapter
- version: ~9.x-0
- repository: 'file://components/so-catalog-db-adapter'
- condition: so-catalog-db-adapter.enabled
- - name: so-cnf-adapter
- version: ~9.x-0
- repository: "file://components/so-cnf-adapter"
- condition: so-cnf-adapter.enabled
- - name: so-etsi-nfvo-ns-lcm
- version: ~9.x-0
- repository: 'file://components/so-etsi-nfvo-ns-lcm'
- condition: so-etsi-nfvo-ns-lcm.enabled
- - name: so-etsi-sol003-adapter
- version: ~9.x-0
- repository: 'file://components/so-etsi-sol003-adapter'
- condition: so-etsi-sol003-adapter.enabled
- - name: so-mariadb
- version: ~9.x-0
- repository: 'file://components/so-mariadb'
- - name: so-nssmf-adapter
- version: ~9.x-0
- repository: 'file://components/so-nssmf-adapter'
- condition: so-nssmf-adapter.enabled
- - name: so-oof-adapter
- version: ~9.x-0
- repository: 'file://components/so-oof-adapter'
- condition: so-oof-adapter.enabled
- - name: so-openstack-adapter
- version: ~9.x-0
- repository: 'file://components/so-openstack-adapter'
- condition: so-openstack-adapter.enabled
- - name: so-request-db-adapter
- version: ~9.x-0
- repository: 'file://components/so-request-db-adapter'
- - name: so-sdc-controller
- version: ~9.x-0
- repository: 'file://components/so-sdc-controller'
- - name: so-sdnc-adapter
- version: ~9.x-0
- repository: 'file://components/so-sdnc-adapter'
- condition: so-sdnc-adapter.enabled
- - name: so-ve-vnfm-adapter
- version: ~9.x-0
- repository: 'file://components/so-ve-vnfm-adapter'
- condition: so-ve-vnfm-adapter.enabled
- - name: so-etsi-sol005-adapter
- version: ~9.x-0
- repository: 'file://components/so-etsi-sol005-adapter'
- condition: so-etsi-sol005-adapter.enabled
- - name: serviceAccount
- version: ~9.x-0
- repository: '@local'
diff --git a/kubernetes/uui/Chart.yaml b/kubernetes/uui/Chart.yaml
index cd82001154..dab69dd3e3 100644
--- a/kubernetes/uui/Chart.yaml
+++ b/kubernetes/uui/Chart.yaml
@@ -1,5 +1,6 @@
# Copyright © 2017 Amdocs, Bell Canada
# Modifications Copyright © 2021 Orange
+# Modifications Copyright © 2021 Nordix Foundation
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -13,7 +14,27 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-apiVersion: v1
+apiVersion: v2
description: ONAP uui
name: uui
-version: 9.0.0
+version: 10.0.0
+
+dependencies:
+ - name: common
+ version: ~10.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: repositoryGenerator
+ version: ~10.x-0
+ repository: '@local'
+ - name: certInitializer
+ version: ~10.x-0
+ repository: '@local'
+ - name: uui-server
+ version: ~10.x-0
+ repository: 'file://components/uui-server'
+ - name: uui-nlp
+ version: ~10.x-0
+ repository: 'file://components/uui-nlp'
diff --git a/kubernetes/uui/Makefile b/kubernetes/uui/Makefile
index 4c79718d02..51d7de122c 100644
--- a/kubernetes/uui/Makefile
+++ b/kubernetes/uui/Makefile
@@ -33,7 +33,7 @@ make-%:
@if [ -f $*/Makefile ]; then make -C $*; fi
dep-%: make-%
- @if [ -f $*/requirements.yaml ]; then $(HELM_BIN) dep up $*; fi
+ @if [ -f $*/Chart.yaml ]; then $(HELM_BIN) dep up $*; fi
lint-%: dep-%
@if [ -f $*/Chart.yaml ]; then $(HELM_BIN) lint $*; fi
@@ -44,7 +44,7 @@ package-%: lint-%
@$(HELM_BIN) repo index $(PACKAGE_DIR)
clean:
- @rm -f */requirements.lock
+ @rm -f */Chart.lock
@rm -f *tgz */charts/*tgz
@rm -rf $(PACKAGE_DIR)
%:
diff --git a/kubernetes/uui/components/Makefile b/kubernetes/uui/components/Makefile
index bf267b7720..f4c9784bc4 100644
--- a/kubernetes/uui/components/Makefile
+++ b/kubernetes/uui/components/Makefile
@@ -33,7 +33,7 @@ make-%:
@if [ -f $*/Makefile ]; then make -C $*; fi
dep-%: make-%
- @if [ -f $*/requirements.yaml ]; then $(HELM_BIN) dep up $*; fi
+ @if [ -f $*/Chart.yaml ]; then $(HELM_BIN) dep up $*; fi
lint-%: dep-%
@if [ -f $*/Chart.yaml ]; then $(HELM_BIN) lint $*; fi
@@ -44,7 +44,7 @@ package-%: lint-%
@$(HELM_BIN) repo index $(PACKAGE_DIR)
clean:
- @rm -f */requirements.lock
+ @rm -f */Chart.lock
@rm -f *tgz */charts/*tgz
@rm -rf $(PACKAGE_DIR)
%:
diff --git a/kubernetes/uui/components/uui-nlp/Chart.yaml b/kubernetes/uui/components/uui-nlp/Chart.yaml
index 3f09b486aa..d748aad543 100644
--- a/kubernetes/uui/components/uui-nlp/Chart.yaml
+++ b/kubernetes/uui/components/uui-nlp/Chart.yaml
@@ -2,6 +2,7 @@
# ================================================================================
# Copyright (c) 2021 AT&T. All rights reserved.
# Modifications Copyright © 2021 Orange
+# Modifications Copyright © 2021 Nordix Foundation
# ================================================================================
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -16,7 +17,18 @@
# limitations under the License.
# ============LICENSE_END=========================================================
-apiVersion: v1
+apiVersion: v2
description: ONAP UUI NLP
name: uui-nlp
-version: 9.0.0
+version: 10.0.0
+
+dependencies:
+ - name: common
+ version: ~10.x-0
+ repository: '@local'
+ - name: repositoryGenerator
+ version: ~10.x-0
+ repository: '@local'
+ - name: serviceAccount
+ version: ~10.x-0
+ repository: '@local' \ No newline at end of file
diff --git a/kubernetes/uui/components/uui-nlp/requirements.yaml b/kubernetes/uui/components/uui-nlp/requirements.yaml
deleted file mode 100644
index 52fd1da64e..0000000000
--- a/kubernetes/uui/components/uui-nlp/requirements.yaml
+++ /dev/null
@@ -1,27 +0,0 @@
-#============LICENSE_START========================================================
-# Copyright (c) 2021 AT&T. All rights reserved.
-# Modifications Copyright © 2021 Orange
-# ================================================================================
-# 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=========================================================
-
-dependencies:
- - name: common
- version: ~9.x-0
- repository: '@local'
- - name: repositoryGenerator
- version: ~9.x-0
- repository: '@local'
- - name: serviceAccount
- version: ~9.x-0
- repository: '@local'
diff --git a/kubernetes/uui/components/uui-server/Chart.yaml b/kubernetes/uui/components/uui-server/Chart.yaml
index 493ff185be..d6cc6f0697 100644
--- a/kubernetes/uui/components/uui-server/Chart.yaml
+++ b/kubernetes/uui/components/uui-server/Chart.yaml
@@ -1,5 +1,6 @@
# Copyright © 2017 Amdocs, Bell Canada
# Modifications Copyright © 2021 Orange
+# Modifications Copyright © 2021 Nordix Foundation
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -13,7 +14,21 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-apiVersion: v1
+apiVersion: v2
description: ONAP uui server
name: uui-server
-version: 9.0.0
+version: 10.0.0
+
+dependencies:
+ - name: common
+ version: ~10.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: certInitializer
+ version: ~10.x-0
+ repository: '@local'
+ - name: repositoryGenerator
+ version: ~10.x-0
+ repository: '@local' \ No newline at end of file
diff --git a/kubernetes/uui/components/uui-server/requirements.yaml b/kubernetes/uui/components/uui-server/requirements.yaml
deleted file mode 100644
index 34cedc84cb..0000000000
--- a/kubernetes/uui/components/uui-server/requirements.yaml
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright © 2017 Amdocs, Bell Canada
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-dependencies:
- - name: common
- version: ~9.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: certInitializer
- version: ~9.x-0
- repository: '@local'
- - name: repositoryGenerator
- version: ~9.x-0
- repository: '@local'
diff --git a/kubernetes/uui/requirements.yaml b/kubernetes/uui/requirements.yaml
deleted file mode 100644
index d60dc43132..0000000000
--- a/kubernetes/uui/requirements.yaml
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright © 2017 Amdocs, Bell Canada
-# Modifications Copyright © 2021 Orange
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-dependencies:
- - name: common
- version: ~9.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: certInitializer
- version: ~9.x-0
- repository: '@local'
- - name: repositoryGenerator
- version: ~9.x-0
- repository: '@local'
- - name: uui-server
- version: ~9.x-0
- repository: 'file://components/uui-server'
- - name: uui-nlp
- version: ~9.x-0
- repository: 'file://components/uui-nlp'
- condition: uui-nlp.enabled
diff --git a/kubernetes/vfc/Chart.yaml b/kubernetes/vfc/Chart.yaml
index d1df26b9be..aecd278778 100644
--- a/kubernetes/vfc/Chart.yaml
+++ b/kubernetes/vfc/Chart.yaml
@@ -1,5 +1,6 @@
# Copyright © 2017 Amdocs, Bell Canada
# Modifications Copyright © 2021 Orange
+# Modifications Copyright © 2021 Nordix Foundation
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -13,7 +14,51 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-apiVersion: v1
+apiVersion: v2
description: ONAP Virtual Function Controller (VF-C)
name: vfc
-version: 9.0.0
+version: 10.0.0
+
+dependencies:
+ - name: common
+ version: ~10.x-0
+ repository: '@local'
+ - name: mariadb-galera
+ version: ~10.x-0
+ repository: '@local'
+ condition: global.mariadbGalera.localCluster
+ - name: repositoryGenerator
+ version: ~10.x-0
+ repository: '@local'
+ - name: vfc-generic-vnfm-driver
+ version: ~10.x-0
+ repository: 'file://components/vfc-generic-vnfm-driver'
+ condition: vfc-generic-vnfm-driver.enabled
+ - name: vfc-huawei-vnfm-driver
+ version: ~10.x-0
+ repository: 'file://components/vfc-huawei-vnfm-driver'
+ condition: vfc-huawei-vnfm-driver.enabled
+ - name: vfc-nslcm
+ version: ~10.x-0
+ repository: 'file://components/vfc-nslcm'
+ condition: vfc-nslcm.enabled
+ - name: vfc-redis
+ version: ~10.x-0
+ repository: 'file://components/vfc-redis'
+ condition: vfc-redis.enabled
+ - name: vfc-vnflcm
+ version: ~10.x-0
+ repository: 'file://components/vfc-vnflcm'
+ condition: vfc-vnflcm.enabled
+ - name: vfc-vnfmgr
+ version: ~10.x-0
+ repository: 'file://components/vfc-vnfmgr'
+ condition: vfc-vnfmgr.enabled
+ - name: vfc-vnfres
+ version: ~10.x-0
+ repository: 'file://components/vfc-vnfres'
+ condition: vfc-vnfres.enabled
+ - name: vfc-zte-vnfm-driver
+ version: ~10.x-0
+ repository: 'file://components/vfc-zte-vnfm-driver'
+ condition: vfc-zte-vnfm-driver.enabled
diff --git a/kubernetes/vfc/Makefile b/kubernetes/vfc/Makefile
index 4c79718d02..51d7de122c 100644
--- a/kubernetes/vfc/Makefile
+++ b/kubernetes/vfc/Makefile
@@ -33,7 +33,7 @@ make-%:
@if [ -f $*/Makefile ]; then make -C $*; fi
dep-%: make-%
- @if [ -f $*/requirements.yaml ]; then $(HELM_BIN) dep up $*; fi
+ @if [ -f $*/Chart.yaml ]; then $(HELM_BIN) dep up $*; fi
lint-%: dep-%
@if [ -f $*/Chart.yaml ]; then $(HELM_BIN) lint $*; fi
@@ -44,7 +44,7 @@ package-%: lint-%
@$(HELM_BIN) repo index $(PACKAGE_DIR)
clean:
- @rm -f */requirements.lock
+ @rm -f */Chart.lock
@rm -f *tgz */charts/*tgz
@rm -rf $(PACKAGE_DIR)
%:
diff --git a/kubernetes/vfc/components/Makefile b/kubernetes/vfc/components/Makefile
index bf267b7720..f4c9784bc4 100644
--- a/kubernetes/vfc/components/Makefile
+++ b/kubernetes/vfc/components/Makefile
@@ -33,7 +33,7 @@ make-%:
@if [ -f $*/Makefile ]; then make -C $*; fi
dep-%: make-%
- @if [ -f $*/requirements.yaml ]; then $(HELM_BIN) dep up $*; fi
+ @if [ -f $*/Chart.yaml ]; then $(HELM_BIN) dep up $*; fi
lint-%: dep-%
@if [ -f $*/Chart.yaml ]; then $(HELM_BIN) lint $*; fi
@@ -44,7 +44,7 @@ package-%: lint-%
@$(HELM_BIN) repo index $(PACKAGE_DIR)
clean:
- @rm -f */requirements.lock
+ @rm -f */Chart.lock
@rm -f *tgz */charts/*tgz
@rm -rf $(PACKAGE_DIR)
%:
diff --git a/kubernetes/vfc/components/vfc-generic-vnfm-driver/Chart.yaml b/kubernetes/vfc/components/vfc-generic-vnfm-driver/Chart.yaml
index 40e3402626..1e1bb3cc55 100644
--- a/kubernetes/vfc/components/vfc-generic-vnfm-driver/Chart.yaml
+++ b/kubernetes/vfc/components/vfc-generic-vnfm-driver/Chart.yaml
@@ -1,5 +1,6 @@
# Copyright © 2017 Amdocs, Bell Canada
# Modifications Copyright © 2021 Orange
+# Modifications Copyright © 2021 Nordix Foundation
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -13,7 +14,15 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-apiVersion: v1
+apiVersion: v2
description: ONAP VFC - Generic VNFM Driver
name: vfc-generic-vnfm-driver
-version: 9.0.0
+version: 10.0.0
+
+dependencies:
+ - name: common
+ version: ~10.x-0
+ repository: '@local'
+ - name: repositoryGenerator
+ version: ~10.x-0
+ repository: '@local'
diff --git a/kubernetes/vfc/components/vfc-generic-vnfm-driver/requirements.yaml b/kubernetes/vfc/components/vfc-generic-vnfm-driver/requirements.yaml
deleted file mode 100644
index 4fecc22f0c..0000000000
--- a/kubernetes/vfc/components/vfc-generic-vnfm-driver/requirements.yaml
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright © 2017 Amdocs, Bell Canada
-# Modifications Copyright © 2021 Orange
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-dependencies:
- - name: common
- version: ~9.x-0
- repository: '@local'
- - name: repositoryGenerator
- version: ~9.x-0
- repository: '@local'
diff --git a/kubernetes/vfc/components/vfc-generic-vnfm-driver/templates/deployment.yaml b/kubernetes/vfc/components/vfc-generic-vnfm-driver/templates/deployment.yaml
index c910f4786f..d5a043d533 100644
--- a/kubernetes/vfc/components/vfc-generic-vnfm-driver/templates/deployment.yaml
+++ b/kubernetes/vfc/components/vfc-generic-vnfm-driver/templates/deployment.yaml
@@ -69,7 +69,7 @@ spec:
mountPath: /etc/localtime
readOnly: true
- name: {{ include "common.fullname" . }}-logs
- mountPath: /var/log/onap
+ mountPath: "{{ .Values.log.path }}"
- name: {{ include "common.fullname" . }}-logconfig
mountPath: /opt/vfc/gvnfmdriver/config/log.yml
subPath: log.yml
@@ -85,18 +85,7 @@ spec:
{{- end }}
# side car containers
- - name: {{ include "common.name" . }}-filebeat-onap
- image: {{ include "repositoryGenerator.image.logging" . }}
- imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
- volumeMounts:
- - name: {{ include "common.fullname" . }}-filebeat-conf
- mountPath: /usr/share/filebeat/filebeat.yml
- subPath: filebeat.yml
- - name: {{ include "common.fullname" . }}-logs
- mountPath: /var/log/onap
- - name: {{ include "common.fullname" . }}-data-filebeat
- mountPath: /usr/share/filebeat/data
-
+ {{ include "common.log.sidecar" . | nindent 8 }}
volumes:
- name: {{ include "common.fullname" . }}-localtime
hostPath:
@@ -106,11 +95,6 @@ spec:
- name: {{ include "common.fullname" . }}-logconfig
configMap:
name : {{ include "common.fullname" . }}-logging-configmap
-
- - name: {{ include "common.fullname" . }}-filebeat-conf
- configMap:
- name: {{ include "common.release" . }}-vfc-filebeat-configmap
- - name: {{ include "common.fullname" . }}-data-filebeat
- emptyDir: {}
+ {{ include "common.log.volumes" (dict "dot" . "configMapNamePrefix" (tpl .Values.logConfigMapNamePrefix . )) | nindent 8 }}
imagePullSecrets:
- name: "{{ include "common.namespace" . }}-docker-registry-key"
diff --git a/kubernetes/vfc/components/vfc-generic-vnfm-driver/values.yaml b/kubernetes/vfc/components/vfc-generic-vnfm-driver/values.yaml
index dcdcef82ba..d92989dbcb 100644
--- a/kubernetes/vfc/components/vfc-generic-vnfm-driver/values.yaml
+++ b/kubernetes/vfc/components/vfc-generic-vnfm-driver/values.yaml
@@ -85,3 +85,8 @@ resources:
cpu: 200m
memory: 500Mi
unlimited: {}
+
+# Log configuration
+log:
+ path: /var/log/onap
+logConfigMapNamePrefix: '{{ include "common.fullname" . }}'
diff --git a/kubernetes/vfc/components/vfc-huawei-vnfm-driver/Chart.yaml b/kubernetes/vfc/components/vfc-huawei-vnfm-driver/Chart.yaml
index 305c2e0651..33698eacb2 100644
--- a/kubernetes/vfc/components/vfc-huawei-vnfm-driver/Chart.yaml
+++ b/kubernetes/vfc/components/vfc-huawei-vnfm-driver/Chart.yaml
@@ -1,5 +1,6 @@
# Copyright © 2017 Amdocs, Bell Canada
# Modifications Copyright © 2021 Orange
+# Modifications Copyright © 2021 Nordix Foundation
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -13,7 +14,15 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-apiVersion: v1
+apiVersion: v2
description: ONAP VFC - Huawei VNFM Driver
name: vfc-huawei-vnfm-driver
-version: 9.0.0
+version: 10.0.0
+
+dependencies:
+ - name: common
+ version: ~10.x-0
+ repository: '@local'
+ - name: repositoryGenerator
+ version: ~10.x-0
+ repository: '@local'
diff --git a/kubernetes/vfc/components/vfc-huawei-vnfm-driver/requirements.yaml b/kubernetes/vfc/components/vfc-huawei-vnfm-driver/requirements.yaml
deleted file mode 100644
index 4fecc22f0c..0000000000
--- a/kubernetes/vfc/components/vfc-huawei-vnfm-driver/requirements.yaml
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright © 2017 Amdocs, Bell Canada
-# Modifications Copyright © 2021 Orange
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-dependencies:
- - name: common
- version: ~9.x-0
- repository: '@local'
- - name: repositoryGenerator
- version: ~9.x-0
- repository: '@local'
diff --git a/kubernetes/vfc/components/vfc-huawei-vnfm-driver/templates/deployment.yaml b/kubernetes/vfc/components/vfc-huawei-vnfm-driver/templates/deployment.yaml
index 4f74d1ddd5..dd763b4f1e 100644
--- a/kubernetes/vfc/components/vfc-huawei-vnfm-driver/templates/deployment.yaml
+++ b/kubernetes/vfc/components/vfc-huawei-vnfm-driver/templates/deployment.yaml
@@ -72,7 +72,7 @@ spec:
mountPath: /etc/localtime
readOnly: true
- name: {{ include "common.fullname" . }}-logs
- mountPath: /var/log/onap
+ mountPath: {{ .Values.log.path }}
- name: {{ include "common.fullname" . }}-logconfig
mountPath: /opt/vfc/hwvnfmdriver/config/log4j.properties
subPath: log4j.properties
@@ -88,18 +88,7 @@ spec:
{{- end }}
# side car containers
- - name: {{ include "common.name" . }}-filebeat-onap
- image: {{ include "repositoryGenerator.image.logging" . }}
- imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
- volumeMounts:
- - name: {{ include "common.fullname" . }}-filebeat-conf
- mountPath: /usr/share/filebeat/filebeat.yml
- subPath: filebeat.yml
- - name: {{ include "common.fullname" . }}-logs
- mountPath: /var/log/onap
- - name: {{ include "common.fullname" . }}-data-filebeat
- mountPath: /usr/share/filebeat/data
-
+ {{ include "common.log.sidecar" . | nindent 8 }}
volumes:
- name: {{ include "common.fullname" . }}-localtime
hostPath:
@@ -109,11 +98,6 @@ spec:
- name: {{ include "common.fullname" . }}-logconfig
configMap:
name : {{ include "common.fullname" . }}-logging-configmap
-
- - name: {{ include "common.fullname" . }}-filebeat-conf
- configMap:
- name: {{ include "common.release" . }}-vfc-filebeat-configmap
- - name: {{ include "common.fullname" . }}-data-filebeat
- emptyDir: {}
+ {{ include "common.log.volumes" (dict "dot" . "configMapNamePrefix" (tpl .Values.logConfigMapNamePrefix . )) | nindent 8 }}
imagePullSecrets:
- name: "{{ include "common.namespace" . }}-docker-registry-key"
diff --git a/kubernetes/vfc/components/vfc-huawei-vnfm-driver/values.yaml b/kubernetes/vfc/components/vfc-huawei-vnfm-driver/values.yaml
index 548cab8d0f..596a1cf36d 100644
--- a/kubernetes/vfc/components/vfc-huawei-vnfm-driver/values.yaml
+++ b/kubernetes/vfc/components/vfc-huawei-vnfm-driver/values.yaml
@@ -86,4 +86,9 @@ resources:
requests:
cpu: 200m
memory: 2000Mi
- unlimited: {} \ No newline at end of file
+ unlimited: {}
+
+# Log configuration
+log:
+ path: /var/log/onap
+logConfigMapNamePrefix: '{{ include "common.fullname" . }}'
diff --git a/kubernetes/vfc/components/vfc-nslcm/Chart.yaml b/kubernetes/vfc/components/vfc-nslcm/Chart.yaml
index d10ff27c5e..24942d1ee0 100644
--- a/kubernetes/vfc/components/vfc-nslcm/Chart.yaml
+++ b/kubernetes/vfc/components/vfc-nslcm/Chart.yaml
@@ -1,5 +1,6 @@
# Copyright © 2017 Amdocs, Bell Canada
# Modifications Copyright © 2021 Orange
+# Modifications Copyright © 2021 Nordix Foundation
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -13,7 +14,15 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-apiVersion: v1
+apiVersion: v2
description: ONAP VFC - NS Life Cycle Management
name: vfc-nslcm
-version: 9.0.0
+version: 10.0.0
+
+dependencies:
+ - name: common
+ version: ~10.x-0
+ repository: '@local'
+ - name: repositoryGenerator
+ version: ~10.x-0
+ repository: '@local'
diff --git a/kubernetes/vfc/components/vfc-nslcm/requirements.yaml b/kubernetes/vfc/components/vfc-nslcm/requirements.yaml
deleted file mode 100644
index 4fecc22f0c..0000000000
--- a/kubernetes/vfc/components/vfc-nslcm/requirements.yaml
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright © 2017 Amdocs, Bell Canada
-# Modifications Copyright © 2021 Orange
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-dependencies:
- - name: common
- version: ~9.x-0
- repository: '@local'
- - name: repositoryGenerator
- version: ~9.x-0
- repository: '@local'
diff --git a/kubernetes/vfc/components/vfc-nslcm/templates/deployment.yaml b/kubernetes/vfc/components/vfc-nslcm/templates/deployment.yaml
index 17d8cc263e..13c17059f4 100644
--- a/kubernetes/vfc/components/vfc-nslcm/templates/deployment.yaml
+++ b/kubernetes/vfc/components/vfc-nslcm/templates/deployment.yaml
@@ -115,18 +115,7 @@ spec:
{{- end }}
# side car containers
- - name: {{ include "common.name" . }}-filebeat-onap
- image: {{ include "repositoryGenerator.image.logging" . }}
- imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
- volumeMounts:
- - name: {{ include "common.fullname" . }}-filebeat-conf
- mountPath: /usr/share/filebeat/filebeat.yml
- subPath: filebeat.yml
- - name: {{ include "common.fullname" . }}-logs
- mountPath: /var/log/onap
- - name: {{ include "common.fullname" . }}-data-filebeat
- mountPath: /usr/share/filebeat/data
-
+ {{ include "common.log.sidecar" . | nindent 8 }}
volumes:
- name: {{ include "common.fullname" . }}-localtime
hostPath:
@@ -136,11 +125,6 @@ spec:
- name: {{ include "common.fullname" . }}-logconfig
configMap:
name : {{ include "common.fullname" . }}-logging-configmap
-
- - name: {{ include "common.fullname" . }}-filebeat-conf
- configMap:
- name: {{ include "common.release" . }}-vfc-filebeat-configmap
- - name: {{ include "common.fullname" . }}-data-filebeat
- emptyDir: {}
+ {{ include "common.log.volumes" (dict "dot" . "configMapNamePrefix" (tpl .Values.logConfigMapNamePrefix . )) | nindent 8 }}
imagePullSecrets:
- name: "{{ include "common.namespace" . }}-docker-registry-key"
diff --git a/kubernetes/vfc/components/vfc-nslcm/values.yaml b/kubernetes/vfc/components/vfc-nslcm/values.yaml
index be7820006c..21ff189046 100644
--- a/kubernetes/vfc/components/vfc-nslcm/values.yaml
+++ b/kubernetes/vfc/components/vfc-nslcm/values.yaml
@@ -104,3 +104,8 @@ resources:
cpu: 200m
memory: 500Mi
unlimited: {}
+
+# Log configuration
+log:
+ path: /var/log/onap
+logConfigMapNamePrefix: '{{ include "common.fullname" . }}'
diff --git a/kubernetes/vfc/components/vfc-redis/Chart.yaml b/kubernetes/vfc/components/vfc-redis/Chart.yaml
index 633472901e..dac35a7984 100644
--- a/kubernetes/vfc/components/vfc-redis/Chart.yaml
+++ b/kubernetes/vfc/components/vfc-redis/Chart.yaml
@@ -1,5 +1,6 @@
# Copyright (C) 2018 Verizon. All Rights Reserved.
# Modifications Copyright © 2021 Orange
+# Modifications Copyright © 2021 Nordix Foundation
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -13,7 +14,15 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-apiVersion: v1
+apiVersion: v2
description: ONAP VFC - REDIS
name: vfc-redis
-version: 9.0.0
+version: 10.0.0
+
+dependencies:
+ - name: common
+ version: ~10.x-0
+ repository: '@local'
+ - name: repositoryGenerator
+ version: ~10.x-0
+ repository: '@local'
diff --git a/kubernetes/vfc/components/vfc-redis/requirements.yaml b/kubernetes/vfc/components/vfc-redis/requirements.yaml
deleted file mode 100644
index 4fecc22f0c..0000000000
--- a/kubernetes/vfc/components/vfc-redis/requirements.yaml
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright © 2017 Amdocs, Bell Canada
-# Modifications Copyright © 2021 Orange
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-dependencies:
- - name: common
- version: ~9.x-0
- repository: '@local'
- - name: repositoryGenerator
- version: ~9.x-0
- repository: '@local'
diff --git a/kubernetes/vfc/components/vfc-vnflcm/Chart.yaml b/kubernetes/vfc/components/vfc-vnflcm/Chart.yaml
index d1be70eb8e..a816c4ad94 100644
--- a/kubernetes/vfc/components/vfc-vnflcm/Chart.yaml
+++ b/kubernetes/vfc/components/vfc-vnflcm/Chart.yaml
@@ -1,5 +1,6 @@
# Copyright © 2017 Amdocs, Bell Canada
# Modifications Copyright © 2021 Orange
+# Modifications Copyright © 2021 Nordix Foundation
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -13,7 +14,15 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-apiVersion: v1
+apiVersion: v2
description: ONAP VFC - VNF Life Cycle Management
name: vfc-vnflcm
-version: 9.0.0
+version: 10.0.0
+
+dependencies:
+ - name: common
+ version: ~10.x-0
+ repository: '@local'
+ - name: repositoryGenerator
+ version: ~10.x-0
+ repository: '@local'
diff --git a/kubernetes/vfc/components/vfc-vnflcm/requirements.yaml b/kubernetes/vfc/components/vfc-vnflcm/requirements.yaml
deleted file mode 100644
index 4fecc22f0c..0000000000
--- a/kubernetes/vfc/components/vfc-vnflcm/requirements.yaml
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright © 2017 Amdocs, Bell Canada
-# Modifications Copyright © 2021 Orange
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-dependencies:
- - name: common
- version: ~9.x-0
- repository: '@local'
- - name: repositoryGenerator
- version: ~9.x-0
- repository: '@local'
diff --git a/kubernetes/vfc/components/vfc-vnflcm/templates/deployment.yaml b/kubernetes/vfc/components/vfc-vnflcm/templates/deployment.yaml
index 75968b2ffe..69de15c171 100644
--- a/kubernetes/vfc/components/vfc-vnflcm/templates/deployment.yaml
+++ b/kubernetes/vfc/components/vfc-vnflcm/templates/deployment.yaml
@@ -99,7 +99,7 @@ spec:
mountPath: /etc/localtime
readOnly: true
- name: {{ include "common.fullname" . }}-logs
- mountPath: /var/log/onap
+ mountPath: {{ .Values.log.path }}
- name: {{ include "common.fullname" . }}-logconfig
mountPath: /opt/vfc/gvnfm-vnflcm/config/log.yml
subPath: log.yml
@@ -115,18 +115,7 @@ spec:
{{- end }}
# side car containers
- - name: {{ include "common.name" . }}-filebeat-onap
- image: {{ include "repositoryGenerator.image.logging" . }}
- imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
- volumeMounts:
- - name: {{ include "common.fullname" . }}-filebeat-conf
- mountPath: /usr/share/filebeat/filebeat.yml
- subPath: filebeat.yml
- - name: {{ include "common.fullname" . }}-logs
- mountPath: /var/log/onap
- - name: {{ include "common.fullname" . }}-data-filebeat
- mountPath: /usr/share/filebeat/data
-
+ {{ include "common.log.sidecar" . | nindent 8 }}
volumes:
- name: {{ include "common.fullname" . }}-localtime
hostPath:
@@ -136,11 +125,6 @@ spec:
- name: {{ include "common.fullname" . }}-logconfig
configMap:
name : {{ include "common.fullname" . }}-logging-configmap
-
- - name: {{ include "common.fullname" . }}-filebeat-conf
- configMap:
- name: {{ include "common.release" . }}-vfc-filebeat-configmap
- - name: {{ include "common.fullname" . }}-data-filebeat
- emptyDir: {}
+ {{ include "common.log.volumes" (dict "dot" . "configMapNamePrefix" (tpl .Values.logConfigMapNamePrefix . )) | nindent 8 }}
imagePullSecrets:
- name: "{{ include "common.namespace" . }}-docker-registry-key"
diff --git a/kubernetes/vfc/components/vfc-vnflcm/values.yaml b/kubernetes/vfc/components/vfc-vnflcm/values.yaml
index 9098b4468b..e4ae447491 100644
--- a/kubernetes/vfc/components/vfc-vnflcm/values.yaml
+++ b/kubernetes/vfc/components/vfc-vnflcm/values.yaml
@@ -104,3 +104,8 @@ resources:
cpu: 200m
memory: 500Mi
unlimited: {}
+
+# Log configuration
+log:
+ path: /var/log/onap
+logConfigMapNamePrefix: '{{ include "common.fullname" . }}'
diff --git a/kubernetes/vfc/components/vfc-vnfmgr/Chart.yaml b/kubernetes/vfc/components/vfc-vnfmgr/Chart.yaml
index e5d4d1e083..49191effbf 100644
--- a/kubernetes/vfc/components/vfc-vnfmgr/Chart.yaml
+++ b/kubernetes/vfc/components/vfc-vnfmgr/Chart.yaml
@@ -1,5 +1,6 @@
# Copyright © 2017 Amdocs, Bell Canada
# Modifications Copyright © 2021 Orange
+# Modifications Copyright © 2021 Nordix Foundation
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -13,7 +14,15 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-apiVersion: v1
+apiVersion: v2
description: ONAP VFC - VNF Manager
name: vfc-vnfmgr
-version: 9.0.0
+version: 10.0.0
+
+dependencies:
+ - name: common
+ version: ~10.x-0
+ repository: '@local'
+ - name: repositoryGenerator
+ version: ~10.x-0
+ repository: '@local'
diff --git a/kubernetes/vfc/components/vfc-vnfmgr/requirements.yaml b/kubernetes/vfc/components/vfc-vnfmgr/requirements.yaml
deleted file mode 100644
index 4fecc22f0c..0000000000
--- a/kubernetes/vfc/components/vfc-vnfmgr/requirements.yaml
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright © 2017 Amdocs, Bell Canada
-# Modifications Copyright © 2021 Orange
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-dependencies:
- - name: common
- version: ~9.x-0
- repository: '@local'
- - name: repositoryGenerator
- version: ~9.x-0
- repository: '@local'
diff --git a/kubernetes/vfc/components/vfc-vnfmgr/templates/deployment.yaml b/kubernetes/vfc/components/vfc-vnfmgr/templates/deployment.yaml
index f9a8ba71f2..0ee0b931b2 100644
--- a/kubernetes/vfc/components/vfc-vnfmgr/templates/deployment.yaml
+++ b/kubernetes/vfc/components/vfc-vnfmgr/templates/deployment.yaml
@@ -99,7 +99,7 @@ spec:
mountPath: /etc/localtime
readOnly: true
- name: {{ include "common.fullname" . }}-logs
- mountPath: /var/log/onap
+ mountPath: {{ .Values.log.path }}
- name: {{ include "common.fullname" . }}-logconfig
mountPath: /opt/vfc/gvnfm-vnfmgr/config/log.yml
subPath: log.yml
@@ -115,18 +115,7 @@ spec:
{{- end }}
# side car containers
- - name: {{ include "common.name" . }}-filebeat-onap
- image: {{ include "repositoryGenerator.image.logging" . }}
- imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
- volumeMounts:
- - name: {{ include "common.fullname" . }}-filebeat-conf
- mountPath: /usr/share/filebeat/filebeat.yml
- subPath: filebeat.yml
- - name: {{ include "common.fullname" . }}-logs
- mountPath: /var/log/onap
- - name: {{ include "common.fullname" . }}-data-filebeat
- mountPath: /usr/share/filebeat/data
-
+ {{ include "common.log.sidecar" . | nindent 8 }}
volumes:
- name: {{ include "common.fullname" . }}-localtime
hostPath:
@@ -137,10 +126,6 @@ spec:
configMap:
name : {{ include "common.fullname" . }}-logging-configmap
- - name: {{ include "common.fullname" . }}-filebeat-conf
- configMap:
- name: {{ include "common.release" . }}-vfc-filebeat-configmap
- - name: {{ include "common.fullname" . }}-data-filebeat
- emptyDir: {}
+ {{ include "common.log.volumes" (dict "dot" . "configMapNamePrefix" (tpl .Values.logConfigMapNamePrefix . )) | nindent 8 }}
imagePullSecrets:
- name: "{{ include "common.namespace" . }}-docker-registry-key"
diff --git a/kubernetes/vfc/components/vfc-vnfmgr/values.yaml b/kubernetes/vfc/components/vfc-vnfmgr/values.yaml
index f8a5b28065..cc2becc576 100644
--- a/kubernetes/vfc/components/vfc-vnfmgr/values.yaml
+++ b/kubernetes/vfc/components/vfc-vnfmgr/values.yaml
@@ -103,3 +103,8 @@ resources:
cpu: 200m
memory: 500Mi
unlimited: {}
+
+# Log configuration
+log:
+ path: /var/log/onap
+logConfigMapNamePrefix: '{{ include "common.fullname" . }}'
diff --git a/kubernetes/vfc/components/vfc-vnfres/Chart.yaml b/kubernetes/vfc/components/vfc-vnfres/Chart.yaml
index 61e9d660dc..383b34a585 100644
--- a/kubernetes/vfc/components/vfc-vnfres/Chart.yaml
+++ b/kubernetes/vfc/components/vfc-vnfres/Chart.yaml
@@ -1,5 +1,6 @@
# Copyright © 2017 Amdocs, Bell Canada
# Modifications Copyright © 2021 Orange
+# Modifications Copyright © 2021 Nordix Foundation
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -13,7 +14,15 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-apiVersion: v1
+apiVersion: v2
description: ONAP VFC - VNF Resource Manager
name: vfc-vnfres
-version: 9.0.0
+version: 10.0.0
+
+dependencies:
+ - name: common
+ version: ~10.x-0
+ repository: '@local'
+ - name: repositoryGenerator
+ version: ~10.x-0
+ repository: '@local'
diff --git a/kubernetes/vfc/components/vfc-vnfres/requirements.yaml b/kubernetes/vfc/components/vfc-vnfres/requirements.yaml
deleted file mode 100644
index 4fecc22f0c..0000000000
--- a/kubernetes/vfc/components/vfc-vnfres/requirements.yaml
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright © 2017 Amdocs, Bell Canada
-# Modifications Copyright © 2021 Orange
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-dependencies:
- - name: common
- version: ~9.x-0
- repository: '@local'
- - name: repositoryGenerator
- version: ~9.x-0
- repository: '@local'
diff --git a/kubernetes/vfc/components/vfc-vnfres/templates/deployment.yaml b/kubernetes/vfc/components/vfc-vnfres/templates/deployment.yaml
index 06258a0d7e..a0178151d4 100644
--- a/kubernetes/vfc/components/vfc-vnfres/templates/deployment.yaml
+++ b/kubernetes/vfc/components/vfc-vnfres/templates/deployment.yaml
@@ -115,18 +115,7 @@ spec:
{{- end }}
# side car containers
- - name: {{ include "common.name" . }}-filebeat-onap
- image: {{ include "repositoryGenerator.image.logging" . }}
- imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
- volumeMounts:
- - name: {{ include "common.fullname" . }}-filebeat-conf
- mountPath: /usr/share/filebeat/filebeat.yml
- subPath: filebeat.yml
- - name: {{ include "common.fullname" . }}-logs
- mountPath: /var/log/onap
- - name: {{ include "common.fullname" . }}-data-filebeat
- mountPath: /usr/share/filebeat/data
-
+ {{ include "common.log.sidecar" . | nindent 8 }}
volumes:
- name: {{ include "common.fullname" . }}-localtime
hostPath:
@@ -136,11 +125,6 @@ spec:
- name: {{ include "common.fullname" . }}-logconfig
configMap:
name : {{ include "common.fullname" . }}-logging-configmap
-
- - name: {{ include "common.fullname" . }}-filebeat-conf
- configMap:
- name: {{ include "common.release" . }}-vfc-filebeat-configmap
- - name: {{ include "common.fullname" . }}-data-filebeat
- emptyDir: {}
+ {{ include "common.log.volumes" (dict "dot" . "configMapNamePrefix" (tpl .Values.logConfigMapNamePrefix . )) | nindent 8 }}
imagePullSecrets:
- name: "{{ include "common.namespace" . }}-docker-registry-key"
diff --git a/kubernetes/vfc/components/vfc-vnfres/values.yaml b/kubernetes/vfc/components/vfc-vnfres/values.yaml
index 74e5b21faf..68d66a6558 100644
--- a/kubernetes/vfc/components/vfc-vnfres/values.yaml
+++ b/kubernetes/vfc/components/vfc-vnfres/values.yaml
@@ -104,3 +104,8 @@ resources:
cpu: 200m
memory: 500Mi
unlimited: {}
+
+# Log configuration
+log:
+ path: /var/log/onap
+logConfigMapNamePrefix: '{{ include "common.fullname" . }}'
diff --git a/kubernetes/vfc/components/vfc-zte-vnfm-driver/Chart.yaml b/kubernetes/vfc/components/vfc-zte-vnfm-driver/Chart.yaml
index ca717c2043..f4c5d397ed 100644
--- a/kubernetes/vfc/components/vfc-zte-vnfm-driver/Chart.yaml
+++ b/kubernetes/vfc/components/vfc-zte-vnfm-driver/Chart.yaml
@@ -1,5 +1,6 @@
# Copyright © 2017 Amdocs, Bell Canada
# Modifications Copyright © 2021 Orange
+# Modifications Copyright © 2021 Nordix Foundation
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -13,7 +14,15 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-apiVersion: v1
+apiVersion: v2
description: ONAP VFC - ZTE VNFM Driver
name: vfc-zte-vnfm-driver
-version: 9.0.0
+version: 10.0.0
+
+dependencies:
+ - name: common
+ version: ~10.x-0
+ repository: '@local'
+ - name: repositoryGenerator
+ version: ~10.x-0
+ repository: '@local'
diff --git a/kubernetes/vfc/components/vfc-zte-vnfm-driver/requirements.yaml b/kubernetes/vfc/components/vfc-zte-vnfm-driver/requirements.yaml
deleted file mode 100644
index 4fecc22f0c..0000000000
--- a/kubernetes/vfc/components/vfc-zte-vnfm-driver/requirements.yaml
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright © 2017 Amdocs, Bell Canada
-# Modifications Copyright © 2021 Orange
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-dependencies:
- - name: common
- version: ~9.x-0
- repository: '@local'
- - name: repositoryGenerator
- version: ~9.x-0
- repository: '@local'
diff --git a/kubernetes/vfc/components/vfc-zte-vnfm-driver/templates/deployment.yaml b/kubernetes/vfc/components/vfc-zte-vnfm-driver/templates/deployment.yaml
index 8c24dd6c45..9dcba3bf9b 100644
--- a/kubernetes/vfc/components/vfc-zte-vnfm-driver/templates/deployment.yaml
+++ b/kubernetes/vfc/components/vfc-zte-vnfm-driver/templates/deployment.yaml
@@ -69,7 +69,7 @@ spec:
mountPath: /etc/localtime
readOnly: true
- name: {{ include "common.fullname" . }}-logs
- mountPath: /var/log/onap
+ mountPath: {{ .Values.log.path }}
- name: {{ include "common.fullname" . }}-logconfig
mountPath: /opt/vfc/ztevnfmdriver/config/log.yml
subPath: log.yml
@@ -85,18 +85,7 @@ spec:
{{- end }}
# side car containers
- - name: {{ include "common.name" . }}-filebeat-onap
- image: {{ include "repositoryGenerator.image.logging" . }}
- imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
- volumeMounts:
- - name: {{ include "common.fullname" . }}-filebeat-conf
- mountPath: /usr/share/filebeat/filebeat.yml
- subPath: filebeat.yml
- - name: {{ include "common.fullname" . }}-logs
- mountPath: /var/log/onap
- - name: {{ include "common.fullname" . }}-data-filebeat
- mountPath: /usr/share/filebeat/data
-
+ {{ include "common.log.sidecar" . | nindent 8 }}
volumes:
- name: {{ include "common.fullname" . }}-localtime
hostPath:
@@ -106,11 +95,6 @@ spec:
- name: {{ include "common.fullname" . }}-logconfig
configMap:
name : {{ include "common.fullname" . }}-logging-configmap
-
- - name: {{ include "common.fullname" . }}-filebeat-conf
- configMap:
- name: {{ include "common.release" . }}-vfc-filebeat-configmap
- - name: {{ include "common.fullname" . }}-data-filebeat
- emptyDir: {}
+ {{ include "common.log.volumes" (dict "dot" . "configMapNamePrefix" (tpl .Values.logConfigMapNamePrefix . )) | nindent 8 }}
imagePullSecrets:
- name: "{{ include "common.namespace" . }}-docker-registry-key"
diff --git a/kubernetes/vfc/components/vfc-zte-vnfm-driver/values.yaml b/kubernetes/vfc/components/vfc-zte-vnfm-driver/values.yaml
index 643c3fbd84..c6db92a7a4 100644
--- a/kubernetes/vfc/components/vfc-zte-vnfm-driver/values.yaml
+++ b/kubernetes/vfc/components/vfc-zte-vnfm-driver/values.yaml
@@ -84,4 +84,9 @@ resources:
requests:
cpu: 100m
memory: 500Mi
- unlimited: {} \ No newline at end of file
+ unlimited: {}
+
+# Log configuration
+log:
+ path: /var/log/onap
+logConfigMapNamePrefix: '{{ include "common.fullname" . }}'
diff --git a/kubernetes/vfc/requirements.yaml b/kubernetes/vfc/requirements.yaml
deleted file mode 100644
index e404715c7e..0000000000
--- a/kubernetes/vfc/requirements.yaml
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright © 2017 Amdocs, Bell Canada
-# Modifications Copyright © 2021 Orange
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-dependencies:
- - name: common
- version: ~9.x-0
- repository: '@local'
- - name: mariadb-galera
- version: ~9.x-0
- repository: '@local'
- condition: global.mariadbGalera.localCluster
- - name: repositoryGenerator
- version: ~9.x-0
- repository: '@local'
- - name: vfc-generic-vnfm-driver
- version: ~9.x-0
- repository: 'file://components/vfc-generic-vnfm-driver'
- condition: vfc-generic-vnfm-driver.enabled
- - name: vfc-huawei-vnfm-driver
- version: ~9.x-0
- repository: 'file://components/vfc-huawei-vnfm-driver'
- condition: vfc-huawei-vnfm-driver.enabled
- - name: vfc-nslcm
- version: ~9.x-0
- repository: 'file://components/vfc-nslcm'
- condition: vfc-nslcm.enabled
- - name: vfc-redis
- version: ~9.x-0
- repository: 'file://components/vfc-redis'
- condition: vfc-redis.enabled
- - name: vfc-vnflcm
- version: ~9.x-0
- repository: 'file://components/vfc-vnflcm'
- condition: vfc-vnflcm.enabled
- - name: vfc-vnfmgr
- version: ~9.x-0
- repository: 'file://components/vfc-vnfmgr'
- condition: vfc-vnfmgr.enabled
- - name: vfc-vnfres
- version: ~9.x-0
- repository: 'file://components/vfc-vnfres'
- condition: vfc-vnfres.enabled
- - name: vfc-zte-vnfm-driver
- version: ~9.x-0
- repository: 'file://components/vfc-zte-vnfm-driver'
- condition: vfc-zte-vnfm-driver.enabled
diff --git a/kubernetes/vfc/resources/config/logging/filebeat/filebeat.yml b/kubernetes/vfc/resources/config/log/filebeat/filebeat.yml
index 0bc14ea908..0bc14ea908 100644
--- a/kubernetes/vfc/resources/config/logging/filebeat/filebeat.yml
+++ b/kubernetes/vfc/resources/config/log/filebeat/filebeat.yml
diff --git a/kubernetes/vfc/templates/configmap.yaml b/kubernetes/vfc/templates/configmap.yaml
index 88fda224ee..e890b8d957 100644
--- a/kubernetes/vfc/templates/configmap.yaml
+++ b/kubernetes/vfc/templates/configmap.yaml
@@ -14,10 +14,4 @@
# limitations under the License.
*/}}
-apiVersion: v1
-kind: ConfigMap
-metadata:
- name: {{ include "common.release" . }}-vfc-filebeat-configmap
- namespace: {{ include "common.namespace" . }}
-data:
-{{ tpl (.Files.Glob "resources/config/logging/filebeat/*").AsConfig . | indent 2 }} \ No newline at end of file
+{{ include "common.log.configMap" . }}
diff --git a/kubernetes/vfc/values.yaml b/kubernetes/vfc/values.yaml
index 64bd029bd1..01d9eefd67 100644
--- a/kubernetes/vfc/values.yaml
+++ b/kubernetes/vfc/values.yaml
@@ -35,6 +35,7 @@ global:
service: mariadb-galera
internalPort: 3306
nameOverride: mariadb-galera
+ centralizedLoggingEnabled: true
#################################################################
# Secrets metaconfig
@@ -69,13 +70,16 @@ mariadb-galera: &localMariadb
vfc-generic-vnfm-driver:
enabled: true
+ logConfigMapNamePrefix: '{{ include "common.release" . }}-vfc'
vfc-huawei-vnfm-driver:
enabled: true
+ logConfigMapNamePrefix: '{{ include "common.release" . }}-vfc'
vfc-nslcm:
enabled: true
mariadb-galera: *localMariadb
+ logConfigMapNamePrefix: '{{ include "common.release" . }}-vfc'
vfc-redis:
enabled: true
@@ -83,14 +87,17 @@ vfc-redis:
vfc-vnflcm:
enabled: true
mariadb-galera: *localMariadb
+ logConfigMapNamePrefix: '{{ include "common.release" . }}-vfc'
vfc-vnfmgr:
enabled: true
mariadb-galera: *localMariadb
+ logConfigMapNamePrefix: '{{ include "common.release" . }}-vfc'
vfc-vnfres:
enabled: true
mariadb-galera: *localMariadb
+ logConfigMapNamePrefix: '{{ include "common.release" . }}-vfc'
# sub-chart configuration
vfc-workflow:
@@ -103,3 +110,4 @@ vfc-workflow-engine:
vfc-zte-vnfm-driver:
enabled: true
+ logConfigMapNamePrefix: '{{ include "common.release" . }}-vfc'
diff --git a/kubernetes/vid/Chart.yaml b/kubernetes/vid/Chart.yaml
index 4791266461..aea0849d08 100644
--- a/kubernetes/vid/Chart.yaml
+++ b/kubernetes/vid/Chart.yaml
@@ -1,5 +1,6 @@
# Copyright © 2017 Amdocs, Bell Canada
# Modifications Copyright © 2021 Orange
+# Modifications Copyright © 2021 Nordix Foundation
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -13,7 +14,29 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-apiVersion: v1
+apiVersion: v2
description: ONAP Virtual Infrastructure Deployment
name: vid
-version: 9.0.0
+version: 10.0.0
+
+dependencies:
+ - name: common
+ version: ~10.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: certInitializer
+ version: ~10.x-0
+ repository: '@local'
+ - name: mariadb-galera
+ version: ~10.x-0
+ repository: '@local'
+ condition: global.mariadbGalera.localCluster
+ - name: mariadb-init
+ version: ~10.x-0
+ repository: '@local'
+ condition: not global.mariadbGalera.localCluster
+ - name: repositoryGenerator
+ version: ~10.x-0
+ repository: '@local'
diff --git a/kubernetes/vid/requirements.yaml b/kubernetes/vid/requirements.yaml
deleted file mode 100644
index 53d8d6988e..0000000000
--- a/kubernetes/vid/requirements.yaml
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright © 2017 Amdocs, Bell Canada
-# Copyright © 2021 Orange
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-dependencies:
- - name: common
- version: ~9.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: certInitializer
- version: ~9.x-0
- repository: '@local'
- - name: mariadb-galera
- version: ~9.x-0
- repository: '@local'
- condition: global.mariadbGalera.localCluster
- - name: mariadb-init
- version: ~9.x-0
- repository: '@local'
- condition: not global.mariadbGalera.localCluster
- - name: repositoryGenerator
- version: ~9.x-0
- repository: '@local'
diff --git a/kubernetes/vnfsdk/Chart.yaml b/kubernetes/vnfsdk/Chart.yaml
index e73fb162b1..59522b842d 100644
--- a/kubernetes/vnfsdk/Chart.yaml
+++ b/kubernetes/vnfsdk/Chart.yaml
@@ -1,5 +1,6 @@
# Copyright © 2017 Amdocs, Bell Canada
# Modifications Copyright © 2021 Orange
+# Modifications Copyright © 2021 Nordix Foundation
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -13,7 +14,21 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-apiVersion: v1
+apiVersion: v2
description: ONAP VNF SDK
name: vnfsdk
-version: 9.0.0
+version: 10.0.0
+
+dependencies:
+ - name: common
+ version: ~10.x-0
+ repository: '@local'
+ - name: certInitializer
+ version: ~10.x-0
+ repository: '@local'
+ - name: postgres
+ version: ~10.x-0
+ repository: '@local'
+ - name: repositoryGenerator
+ version: ~10.x-0
+ repository: '@local'
diff --git a/kubernetes/vnfsdk/requirements.yaml b/kubernetes/vnfsdk/requirements.yaml
deleted file mode 100644
index bcdbe2f167..0000000000
--- a/kubernetes/vnfsdk/requirements.yaml
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright © 2017 Amdocs, Bell Canada
-# Modifications Copyright © 2021 Orange
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-dependencies:
- - name: common
- version: ~9.x-0
- repository: '@local'
- - name: certInitializer
- version: ~9.x-0
- repository: '@local'
- - name: postgres
- version: ~9.x-0
- repository: '@local'
- - name: repositoryGenerator
- version: ~9.x-0
- repository: '@local'
diff --git a/tox.ini b/tox.ini
index bbd00f85c4..dee4f3accf 100644
--- a/tox.ini
+++ b/tox.ini
@@ -65,6 +65,9 @@ commands =
|| (echo "checkbashisms command not found - please install it (e.g. sudo apt-get install devscripts | \
yum install devscripts-minimal )" >&2 && exit 1)'
find . -not -path '*/\.*' -name *.sh -exec checkbashisms \{\} +
+ find . -not -path '*/\.*' -name *.failover -exec checkbashisms -f \{\} +
+ sh -c "! find . -not -path '*/\.*' -name *.sh -exec grep 'local .*=' \{\} + || exit 2"
+ sh -c "! find . -not -path '*/\.*' -name *.failover -exec grep 'local .*=' \{\} + || exit 2"
[testenv:autopep8]
deps =