Merge "[UUI] Service Mesh Compliance for UUI"
authorFiachra Corcoran <fiachra.corcoran@est.tech>
Thu, 1 Dec 2022 08:16:27 +0000 (08:16 +0000)
committerGerrit Code Review <gerrit@onap.org>
Thu, 1 Dec 2022 08:16:27 +0000 (08:16 +0000)
455 files changed:
.readthedocs.yaml
docs/_static/css/ribbon.css
docs/archived/certs/hardcoded_certificates.csv [moved from docs/certs/hardcoded_certificates.csv with 100% similarity]
docs/archived/images/consul/consulHealth.png [moved from docs/images/consul/consulHealth.png with 100% similarity]
docs/archived/images/cp_vms/control_plane_1.png [moved from docs/images/cp_vms/control_plane_1.png with 100% similarity]
docs/archived/images/cp_vms/control_plane_2.png [moved from docs/images/cp_vms/control_plane_2.png with 100% similarity]
docs/archived/images/cp_vms/control_plane_3.png [moved from docs/images/cp_vms/control_plane_3.png with 100% similarity]
docs/archived/images/cp_vms/control_plane_4.png [moved from docs/images/cp_vms/control_plane_4.png with 100% similarity]
docs/archived/images/cp_vms/control_plane_5.png [moved from docs/images/cp_vms/control_plane_5.png with 100% similarity]
docs/archived/images/cp_vms/control_plane_6.png [moved from docs/images/cp_vms/control_plane_6.png with 100% similarity]
docs/archived/images/cp_vms/control_plane_7.png [moved from docs/images/cp_vms/control_plane_7.png with 100% similarity]
docs/archived/images/cp_vms/control_plane_8.png [moved from docs/images/cp_vms/control_plane_8.png with 100% similarity]
docs/archived/images/floating_ips/floating_1.png [moved from docs/images/floating_ips/floating_1.png with 100% similarity]
docs/archived/images/floating_ips/floating_2.png [moved from docs/images/floating_ips/floating_2.png with 100% similarity]
docs/archived/images/k8s/kubernetes_objects.png [moved from docs/images/k8s/kubernetes_objects.png with 100% similarity]
docs/archived/images/keys/key_pair_1.png [moved from docs/images/keys/key_pair_1.png with 100% similarity]
docs/archived/images/keys/key_pair_2.png [moved from docs/images/keys/key_pair_2.png with 100% similarity]
docs/archived/images/keys/key_pair_3.png [moved from docs/images/keys/key_pair_3.png with 100% similarity]
docs/archived/images/keys/key_pair_4.png [moved from docs/images/keys/key_pair_4.png with 100% similarity]
docs/archived/images/msb/MSB-OOM-Diagram.png [moved from docs/images/msb/MSB-OOM-Diagram.png with 100% similarity]
docs/archived/images/network/network_1.png [moved from docs/images/network/network_1.png with 100% similarity]
docs/archived/images/network/network_2.png [moved from docs/images/network/network_2.png with 100% similarity]
docs/archived/images/network/network_3.png [moved from docs/images/network/network_3.png with 100% similarity]
docs/archived/images/network/network_4.png [moved from docs/images/network/network_4.png with 100% similarity]
docs/archived/images/nfs_server/nfs_server_1.png [moved from docs/images/nfs_server/nfs_server_1.png with 100% similarity]
docs/archived/images/nfs_server/nfs_server_10.png [moved from docs/images/nfs_server/nfs_server_10.png with 100% similarity]
docs/archived/images/nfs_server/nfs_server_2.png [moved from docs/images/nfs_server/nfs_server_2.png with 100% similarity]
docs/archived/images/nfs_server/nfs_server_3.png [moved from docs/images/nfs_server/nfs_server_3.png with 100% similarity]
docs/archived/images/nfs_server/nfs_server_4.png [moved from docs/images/nfs_server/nfs_server_4.png with 100% similarity]
docs/archived/images/nfs_server/nfs_server_5.png [moved from docs/images/nfs_server/nfs_server_5.png with 100% similarity]
docs/archived/images/nfs_server/nfs_server_6.png [moved from docs/images/nfs_server/nfs_server_6.png with 100% similarity]
docs/archived/images/nfs_server/nfs_server_7.png [moved from docs/images/nfs_server/nfs_server_7.png with 100% similarity]
docs/archived/images/nfs_server/nfs_server_8.png [moved from docs/images/nfs_server/nfs_server_8.png with 100% similarity]
docs/archived/images/nfs_server/nfs_server_9.png [moved from docs/images/nfs_server/nfs_server_9.png with 100% similarity]
docs/archived/images/oom_logo/oomLogoV2-Configure.png [moved from docs/images/oom_logo/oomLogoV2-Configure.png with 100% similarity]
docs/archived/images/oom_logo/oomLogoV2-Delete.png [moved from docs/images/oom_logo/oomLogoV2-Delete.png with 100% similarity]
docs/archived/images/oom_logo/oomLogoV2-Deploy.png [moved from docs/images/oom_logo/oomLogoV2-Deploy.png with 100% similarity]
docs/archived/images/oom_logo/oomLogoV2-Heal.png [moved from docs/images/oom_logo/oomLogoV2-Heal.png with 100% similarity]
docs/archived/images/oom_logo/oomLogoV2-Monitor.png [moved from docs/images/oom_logo/oomLogoV2-Monitor.png with 100% similarity]
docs/archived/images/oom_logo/oomLogoV2-Scale.png [moved from docs/images/oom_logo/oomLogoV2-Scale.png with 100% similarity]
docs/archived/images/oom_logo/oomLogoV2-Upgrade.png [moved from docs/images/oom_logo/oomLogoV2-Upgrade.png with 100% similarity]
docs/archived/images/oom_logo/oomLogoV2-medium.png [moved from docs/images/oom_logo/oomLogoV2-medium.png with 100% similarity]
docs/archived/images/rke/rke_1.png [moved from docs/images/rke/rke_1.png with 100% similarity]
docs/archived/images/sg/sg_1.png [moved from docs/images/sg/sg_1.png with 100% similarity]
docs/archived/images/sg/sg_2.png [moved from docs/images/sg/sg_2.png with 100% similarity]
docs/archived/images/wk_vms/worker_1.png [moved from docs/images/wk_vms/worker_1.png with 100% similarity]
docs/archived/images/wk_vms/worker_2.png [moved from docs/images/wk_vms/worker_2.png with 100% similarity]
docs/archived/images/wk_vms/worker_3.png [moved from docs/images/wk_vms/worker_3.png with 100% similarity]
docs/archived/images/wk_vms/worker_4.png [moved from docs/images/wk_vms/worker_4.png with 100% similarity]
docs/archived/images/wk_vms/worker_5.png [moved from docs/images/wk_vms/worker_5.png with 100% similarity]
docs/archived/images/wk_vms/worker_6.png [moved from docs/images/wk_vms/worker_6.png with 100% similarity]
docs/archived/images/wk_vms/worker_7.png [moved from docs/images/wk_vms/worker_7.png with 100% similarity]
docs/archived/oom_developer_guide.rst [moved from docs/oom_developer_guide.rst with 99% similarity]
docs/archived/oom_hardcoded_certificates.rst [moved from docs/oom_hardcoded_certificates.rst with 100% similarity]
docs/archived/oom_quickstart_guide.rst [moved from docs/oom_quickstart_guide.rst with 99% similarity]
docs/archived/oom_setup_kubernetes_rancher.rst [moved from docs/oom_setup_kubernetes_rancher.rst with 100% similarity]
docs/archived/oom_setup_paas.rst [moved from docs/oom_setup_paas.rst with 100% similarity]
docs/archived/oom_user_guide.rst [moved from docs/oom_user_guide.rst with 100% similarity]
docs/archived/shell/master_nfs_node.sh [moved from docs/shell/master_nfs_node.sh with 100% similarity]
docs/archived/shell/openstack-k8s-controlnode.sh [moved from docs/shell/openstack-k8s-controlnode.sh with 100% similarity]
docs/archived/shell/openstack-k8s-workernode.sh [moved from docs/shell/openstack-k8s-workernode.sh with 100% similarity]
docs/archived/shell/openstack-nfs-server.sh [moved from docs/shell/openstack-nfs-server.sh with 100% similarity]
docs/archived/shell/slave_nfs_node.sh [moved from docs/shell/slave_nfs_node.sh with 100% similarity]
docs/archived/yaml/cluster.yml [moved from docs/yaml/cluster.yml with 100% similarity]
docs/archived/yaml/example-integration-override-v3.yaml [moved from docs/yaml/example-integration-override-v3.yaml with 100% similarity]
docs/archived/yaml/example-integration-override.yaml [moved from docs/yaml/example-integration-override.yaml with 100% similarity]
docs/conf.py
docs/conf.yaml
docs/index.rst
docs/oom_cloud_setup_guide.rst [deleted file]
docs/requirements-docs.txt [new file with mode: 0644]
docs/sections/guides/access_guides/oom_access_info.rst [new file with mode: 0644]
docs/sections/guides/deployment_guides/oom_customize_overrides.rst [new file with mode: 0644]
docs/sections/guides/deployment_guides/oom_deployment.rst [new file with mode: 0644]
docs/sections/guides/deployment_guides/oom_dev_testing_local_deploy.rst [new file with mode: 0644]
docs/sections/guides/deployment_guides/oom_helm_release_repo_deploy.rst [new file with mode: 0644]
docs/sections/guides/deployment_guides/oom_helm_testing_repo_deploy.rst [new file with mode: 0644]
docs/sections/guides/development_guides/oom_dev_config_management.rst [new file with mode: 0644]
docs/sections/guides/development_guides/oom_dev_container_orchestration.rst [new file with mode: 0644]
docs/sections/guides/development_guides/oom_dev_helm_chart_info.rst [new file with mode: 0644]
docs/sections/guides/development_guides/oom_development.rst [new file with mode: 0644]
docs/sections/guides/infra_guides/oom_base_config_setup.rst [new file with mode: 0644]
docs/sections/guides/infra_guides/oom_base_optional_addons.rst [new file with mode: 0644]
docs/sections/guides/infra_guides/oom_infra_setup.rst [new file with mode: 0644]
docs/sections/guides/infra_guides/oom_setup_ingress_controller.rst [moved from docs/oom_setup_ingress_controller.rst with 80% similarity]
docs/sections/guides/user_guides/oom_user_guide.rst [new file with mode: 0644]
docs/sections/oom_project_description.rst [moved from docs/oom_project_description.rst with 86% similarity]
docs/sections/release_notes/release-notes-amsterdam.rst [moved from docs/release_notes/release-notes-amsterdam.rst with 100% similarity]
docs/sections/release_notes/release-notes-beijing.rst [moved from docs/release_notes/release-notes-beijing.rst with 100% similarity]
docs/sections/release_notes/release-notes-casablanca.rst [moved from docs/release_notes/release-notes-casablanca.rst with 100% similarity]
docs/sections/release_notes/release-notes-dublin.rst [moved from docs/release_notes/release-notes-dublin.rst with 100% similarity]
docs/sections/release_notes/release-notes-elalto.rst [moved from docs/release_notes/release-notes-elalto.rst with 100% similarity]
docs/sections/release_notes/release-notes-frankfurt.rst [moved from docs/release_notes/release-notes-frankfurt.rst with 89% similarity]
docs/sections/release_notes/release-notes-guilin.rst [moved from docs/release_notes/release-notes-guilin.rst with 90% similarity]
docs/sections/release_notes/release-notes-honolulu.rst [moved from docs/release_notes/release-notes-honolulu.rst with 91% similarity]
docs/sections/release_notes/release-notes-istanbul.rst [moved from docs/release_notes/release-notes-isntanbul.rst with 85% similarity]
docs/sections/release_notes/release-notes-jakarta.rst [moved from docs/release_notes/release-notes.rst with 85% similarity]
docs/sections/release_notes/release-notes.rst [new file with mode: 0644]
docs/sections/resources/csv/nodeports.csv [new file with mode: 0644]
docs/sections/resources/helm/helm-search.txt [moved from docs/helm/helm-search.txt with 100% similarity]
docs/sections/resources/images/consul/consulHealth.png [new file with mode: 0644]
docs/sections/resources/images/k8s/kubernetes_objects.png [new file with mode: 0644]
docs/sections/resources/images/msb/MSB-OOM-Diagram.png [new file with mode: 0644]
docs/sections/resources/images/oom_logo/oomLogoV2-Configure.png [new file with mode: 0644]
docs/sections/resources/images/oom_logo/oomLogoV2-Delete.png [new file with mode: 0644]
docs/sections/resources/images/oom_logo/oomLogoV2-Deploy.png [new file with mode: 0644]
docs/sections/resources/images/oom_logo/oomLogoV2-Heal.png [new file with mode: 0644]
docs/sections/resources/images/oom_logo/oomLogoV2-Monitor.png [new file with mode: 0644]
docs/sections/resources/images/oom_logo/oomLogoV2-Scale.png [new file with mode: 0644]
docs/sections/resources/images/oom_logo/oomLogoV2-Upgrade.png [new file with mode: 0644]
docs/sections/resources/images/oom_logo/oomLogoV2-medium.png [new file with mode: 0644]
docs/sections/resources/images/servicemesh/ServiceMesh.png [new file with mode: 0644]
docs/sections/resources/yaml/environments_onap_demo.yaml [moved from docs/yaml/environments_onap_demo.yaml with 100% similarity]
docs/sections/resources/yaml/envoyfilter-case.yaml [new file with mode: 0644]
docs/sections/resources/yaml/kiali-ingress.yaml [new file with mode: 0644]
docs/sections/resources/yaml/kiali.yaml [new file with mode: 0644]
docs/tox.ini [new file with mode: 0644]
kubernetes/README.md
kubernetes/a1policymanagement/Chart.yaml
kubernetes/aaf/Chart.yaml
kubernetes/aaf/components/aaf-cass/Chart.yaml
kubernetes/aaf/components/aaf-cm/Chart.yaml
kubernetes/aaf/components/aaf-fs/Chart.yaml
kubernetes/aaf/components/aaf-gui/Chart.yaml
kubernetes/aaf/components/aaf-locate/Chart.yaml
kubernetes/aaf/components/aaf-oauth/Chart.yaml
kubernetes/aaf/components/aaf-service/Chart.yaml
kubernetes/aaf/components/aaf-sms/Chart.yaml
kubernetes/aaf/components/aaf-sms/components/aaf-sms-quorumclient/Chart.yaml
kubernetes/aaf/components/aaf-sms/components/aaf-sms-vault/Chart.yaml
kubernetes/aaf/components/aaf-sshsm/Chart.yaml
kubernetes/aaf/components/aaf-sshsm/components/aaf-sshsm-abrmd/Chart.yaml
kubernetes/aaf/components/aaf-sshsm/components/aaf-sshsm-distcenter/Chart.yaml
kubernetes/aaf/components/aaf-sshsm/components/aaf-sshsm-testca/Chart.yaml
kubernetes/aaf/components/aaf-templates/Chart.yaml
kubernetes/aai/Chart.yaml
kubernetes/aai/components/aai-babel/Chart.yaml
kubernetes/aai/components/aai-babel/templates/deployment.yaml
kubernetes/aai/components/aai-babel/values.yaml
kubernetes/aai/components/aai-graphadmin/Chart.yaml
kubernetes/aai/components/aai-graphadmin/resources/config/application.properties
kubernetes/aai/components/aai-graphadmin/resources/config/localhost-access-logback.xml
kubernetes/aai/components/aai-graphadmin/resources/config/logback.xml
kubernetes/aai/components/aai-graphadmin/templates/deployment.yaml
kubernetes/aai/components/aai-graphadmin/templates/service.yaml
kubernetes/aai/components/aai-graphadmin/templates/servicemonitor.yaml [new file with mode: 0644]
kubernetes/aai/components/aai-graphadmin/values.yaml
kubernetes/aai/components/aai-modelloader/Chart.yaml
kubernetes/aai/components/aai-modelloader/resources/config/model-loader.properties
kubernetes/aai/components/aai-modelloader/templates/aai-sdc-list-kafka-user.yaml [new file with mode: 0644]
kubernetes/aai/components/aai-modelloader/templates/deployment.yaml
kubernetes/aai/components/aai-modelloader/templates/secret.yaml
kubernetes/aai/components/aai-modelloader/values.yaml
kubernetes/aai/components/aai-resources/Chart.yaml
kubernetes/aai/components/aai-resources/resources/config/application.properties
kubernetes/aai/components/aai-resources/templates/deployment.yaml
kubernetes/aai/components/aai-resources/templates/service.yaml
kubernetes/aai/components/aai-resources/templates/servicemonitor.yaml [new file with mode: 0644]
kubernetes/aai/components/aai-resources/values.yaml
kubernetes/aai/components/aai-schema-service/Chart.yaml
kubernetes/aai/components/aai-schema-service/templates/deployment.yaml
kubernetes/aai/components/aai-schema-service/values.yaml
kubernetes/aai/components/aai-sparky-be/Chart.yaml
kubernetes/aai/components/aai-sparky-be/resources/config/application/application-resources.properties
kubernetes/aai/components/aai-sparky-be/templates/deployment.yaml
kubernetes/aai/components/aai-sparky-be/templates/service.yaml
kubernetes/aai/components/aai-sparky-be/values.yaml
kubernetes/aai/components/aai-traversal/Chart.yaml
kubernetes/aai/components/aai-traversal/resources/config/application.properties
kubernetes/aai/components/aai-traversal/resources/config/localhost-access-logback.xml
kubernetes/aai/components/aai-traversal/resources/config/logback.xml
kubernetes/aai/components/aai-traversal/templates/deployment.yaml
kubernetes/aai/components/aai-traversal/templates/service.yaml
kubernetes/aai/components/aai-traversal/templates/servicemonitor.yaml [new file with mode: 0644]
kubernetes/aai/components/aai-traversal/values.yaml
kubernetes/aai/resources/config/haproxy/haproxy-pluggable-security.cfg
kubernetes/aai/resources/config/haproxy/haproxy.cfg
kubernetes/aai/templates/deployment.yaml
kubernetes/aai/templates/service.yaml
kubernetes/aai/templates/servicemonitor.yaml [new file with mode: 0644]
kubernetes/aai/values.yaml
kubernetes/appc/Chart.yaml
kubernetes/appc/components/appc-ansible-server/Chart.yaml
kubernetes/appc/components/appc-cdt/Chart.yaml
kubernetes/cds/Chart.yaml
kubernetes/cds/components/cds-blueprints-processor/Chart.yaml
kubernetes/cds/components/cds-command-executor/Chart.yaml
kubernetes/cds/components/cds-py-executor/Chart.yaml
kubernetes/cds/components/cds-sdc-listener/Chart.yaml
kubernetes/cds/components/cds-ui/Chart.yaml
kubernetes/cli/Chart.yaml
kubernetes/common/cassandra/Chart.yaml
kubernetes/common/cert-wrapper/Chart.yaml
kubernetes/common/certInitializer/Chart.yaml
kubernetes/common/certManagerCertificate/Chart.yaml
kubernetes/common/cmpv2Config/Chart.yaml
kubernetes/common/common/Chart.yaml
kubernetes/common/common/templates/_ingress.tpl
kubernetes/common/common/templates/_service.tpl
kubernetes/common/dgbuilder/Chart.yaml
kubernetes/common/elasticsearch/Chart.yaml
kubernetes/common/elasticsearch/components/curator/Chart.yaml
kubernetes/common/elasticsearch/components/data/Chart.yaml
kubernetes/common/elasticsearch/components/master/Chart.yaml
kubernetes/common/etcd-init/Chart.yaml
kubernetes/common/etcd/Chart.yaml
kubernetes/common/logConfiguration/Chart.yaml
kubernetes/common/mariadb-galera/Chart.yaml
kubernetes/common/mariadb-init/Chart.yaml
kubernetes/common/mongo/Chart.yaml
kubernetes/common/music/Chart.yaml
kubernetes/common/music/components/music-cassandra/Chart.yaml
kubernetes/common/network-name-gen/Chart.yaml
kubernetes/common/postgres-init/Chart.yaml
kubernetes/common/postgres/Chart.yaml
kubernetes/common/readinessCheck/Chart.yaml
kubernetes/common/repository-wrapper/Chart.yaml
kubernetes/common/repositoryGenerator/Chart.yaml
kubernetes/common/roles-wrapper/Chart.yaml
kubernetes/common/serviceAccount/Chart.yaml
kubernetes/common/timescaledb/Chart.yaml
kubernetes/consul/Chart.yaml
kubernetes/consul/components/consul-server/Chart.yaml
kubernetes/contrib/Chart.yaml
kubernetes/contrib/components/awx/Chart.yaml
kubernetes/contrib/components/awx/components/awx-postgres/Chart.yaml
kubernetes/contrib/components/ejbca/Chart.yaml
kubernetes/contrib/components/netbox/Chart.yaml
kubernetes/contrib/components/netbox/components/netbox-app/Chart.yaml
kubernetes/contrib/components/netbox/components/netbox-nginx/Chart.yaml
kubernetes/contrib/components/netbox/components/netbox-postgres/Chart.yaml
kubernetes/cps/Chart.yaml
kubernetes/cps/components/cps-core/Chart.yaml
kubernetes/cps/components/cps-temporal/Chart.yaml
kubernetes/cps/components/ncmp-dmi-plugin/Chart.yaml
kubernetes/dcaegen2-services/Chart.yaml
kubernetes/dcaegen2-services/common/dcaegen2-services-common/Chart.yaml
kubernetes/dcaegen2-services/common/dcaegen2-services-common/templates/_deployment.tpl
kubernetes/dcaegen2-services/components/dcae-datafile-collector/Chart.yaml
kubernetes/dcaegen2-services/components/dcae-datafile-collector/values.yaml
kubernetes/dcaegen2-services/components/dcae-datalake-admin-ui/Chart.yaml
kubernetes/dcaegen2-services/components/dcae-datalake-admin-ui/values.yaml
kubernetes/dcaegen2-services/components/dcae-datalake-des/Chart.yaml
kubernetes/dcaegen2-services/components/dcae-datalake-des/values.yaml
kubernetes/dcaegen2-services/components/dcae-datalake-feeder/Chart.yaml
kubernetes/dcaegen2-services/components/dcae-datalake-feeder/values.yaml
kubernetes/dcaegen2-services/components/dcae-heartbeat/Chart.yaml
kubernetes/dcaegen2-services/components/dcae-heartbeat/values.yaml
kubernetes/dcaegen2-services/components/dcae-hv-ves-collector/Chart.yaml
kubernetes/dcaegen2-services/components/dcae-hv-ves-collector/values.yaml
kubernetes/dcaegen2-services/components/dcae-kpi-ms/Chart.yaml
kubernetes/dcaegen2-services/components/dcae-kpi-ms/values.yaml
kubernetes/dcaegen2-services/components/dcae-ms-healthcheck/Chart.yaml
kubernetes/dcaegen2-services/components/dcae-pm-mapper/Chart.yaml
kubernetes/dcaegen2-services/components/dcae-pm-mapper/values.yaml
kubernetes/dcaegen2-services/components/dcae-pmsh/Chart.yaml
kubernetes/dcaegen2-services/components/dcae-pmsh/values.yaml
kubernetes/dcaegen2-services/components/dcae-prh/Chart.yaml
kubernetes/dcaegen2-services/components/dcae-prh/values.yaml
kubernetes/dcaegen2-services/components/dcae-restconf-collector/Chart.yaml
kubernetes/dcaegen2-services/components/dcae-restconf-collector/values.yaml
kubernetes/dcaegen2-services/components/dcae-slice-analysis-ms/Chart.yaml
kubernetes/dcaegen2-services/components/dcae-slice-analysis-ms/values.yaml
kubernetes/dcaegen2-services/components/dcae-snmptrap-collector/Chart.yaml
kubernetes/dcaegen2-services/components/dcae-snmptrap-collector/values.yaml
kubernetes/dcaegen2-services/components/dcae-son-handler/Chart.yaml
kubernetes/dcaegen2-services/components/dcae-son-handler/values.yaml
kubernetes/dcaegen2-services/components/dcae-tcagen2/Chart.yaml
kubernetes/dcaegen2-services/components/dcae-tcagen2/values.yaml
kubernetes/dcaegen2-services/components/dcae-ves-collector/Chart.yaml
kubernetes/dcaegen2-services/components/dcae-ves-collector/values.yaml
kubernetes/dcaegen2-services/components/dcae-ves-mapper/Chart.yaml
kubernetes/dcaegen2-services/components/dcae-ves-mapper/values.yaml
kubernetes/dcaegen2-services/components/dcae-ves-openapi-manager/Chart.yaml
kubernetes/dcaemod/Chart.yaml
kubernetes/dcaemod/components/dcaemod-designtool/Chart.yaml
kubernetes/dcaemod/components/dcaemod-distributor-api/Chart.yaml
kubernetes/dcaemod/components/dcaemod-genprocessor/Chart.yaml
kubernetes/dcaemod/components/dcaemod-healthcheck/Chart.yaml
kubernetes/dcaemod/components/dcaemod-nifi-registry/Chart.yaml
kubernetes/dcaemod/components/dcaemod-onboarding-api/Chart.yaml
kubernetes/dcaemod/components/dcaemod-runtime-api/Chart.yaml
kubernetes/dcaemod/components/dcaemod-runtime-api/resources/config/base/Chart.yaml
kubernetes/dmaap/Chart.yaml
kubernetes/dmaap/components/dmaap-bc/Chart.yaml
kubernetes/dmaap/components/dmaap-dr-node/Chart.yaml
kubernetes/dmaap/components/dmaap-dr-prov/Chart.yaml
kubernetes/dmaap/components/message-router/Chart.yaml
kubernetes/dmaap/components/message-router/resources/config/dmaap/MsgRtrApi.properties
kubernetes/dmaap/components/message-router/templates/statefulset.yaml
kubernetes/dmaap/components/message-router/values.yaml
kubernetes/dmaap/values.yaml
kubernetes/helm/starters/onap-app/Chart.yaml
kubernetes/holmes/Chart.yaml
kubernetes/holmes/components/holmes-engine-mgmt/Chart.yaml
kubernetes/holmes/components/holmes-rule-mgmt/Chart.yaml
kubernetes/log/Chart.yaml
kubernetes/log/components/log-elasticsearch/Chart.yaml
kubernetes/log/components/log-kibana/Chart.yaml
kubernetes/log/components/log-logstash/Chart.yaml
kubernetes/modeling/Chart.yaml
kubernetes/modeling/components/modeling-etsicatalog/Chart.yaml
kubernetes/msb/Chart.yaml
kubernetes/msb/components/kube2msb/Chart.yaml
kubernetes/msb/components/msb-consul/Chart.yaml
kubernetes/msb/components/msb-discovery/Chart.yaml
kubernetes/msb/components/msb-eag/Chart.yaml
kubernetes/msb/components/msb-iag/Chart.yaml
kubernetes/multicloud/Chart.yaml
kubernetes/multicloud/components/multicloud-fcaps/Chart.yaml
kubernetes/multicloud/components/multicloud-k8s/Chart.yaml
kubernetes/multicloud/components/multicloud-k8s/resources/config/config.json
kubernetes/multicloud/components/multicloud-k8s/templates/deployment.yaml
kubernetes/multicloud/components/multicloud-k8s/templates/multicloud-k8s-sdc-list-kafka-user.yaml [new file with mode: 0644]
kubernetes/multicloud/components/multicloud-k8s/templates/secret.yaml [new file with mode: 0644]
kubernetes/multicloud/components/multicloud-k8s/values.yaml
kubernetes/multicloud/components/multicloud-pike/Chart.yaml
kubernetes/multicloud/components/multicloud-prometheus/Chart.yaml
kubernetes/multicloud/components/multicloud-prometheus/components/prometheus-alertmanager/Chart.yaml
kubernetes/multicloud/components/multicloud-prometheus/components/prometheus-grafana/Chart.yaml
kubernetes/multicloud/components/multicloud-starlingx/Chart.yaml
kubernetes/multicloud/components/multicloud-starlingx/values.yaml
kubernetes/multicloud/components/multicloud-vio/Chart.yaml
kubernetes/multicloud/components/multicloud-windriver/Chart.yaml
kubernetes/multicloud/components/multicloud-windriver/values.yaml
kubernetes/multicloud/templates/deployment.yaml
kubernetes/multicloud/values.yaml
kubernetes/nbi/Chart.yaml
kubernetes/onap/Chart.yaml
kubernetes/onap/resources/environments/core-onap.yaml
kubernetes/onap/resources/environments/dev.yaml
kubernetes/onap/resources/environments/disable-allcharts.yaml
kubernetes/onap/resources/environments/minimal-onap.yaml
kubernetes/onap/resources/overrides/onap-5g-network-slicing.yaml
kubernetes/onap/resources/overrides/onap-all-ingress-istio.yaml
kubernetes/onap/resources/overrides/onap-all-ingress-nginx-vhost.yaml
kubernetes/onap/resources/overrides/onap-all.yaml
kubernetes/onap/resources/overrides/onap-vfw.yaml
kubernetes/onap/resources/overrides/sm-onap.yaml
kubernetes/onap/values.yaml
kubernetes/oof/Chart.yaml
kubernetes/oof/components/oof-has/Chart.yaml
kubernetes/oof/components/oof-has/components/oof-has-api/Chart.yaml
kubernetes/oof/components/oof-has/components/oof-has-controller/Chart.yaml
kubernetes/oof/components/oof-has/components/oof-has-data/Chart.yaml
kubernetes/oof/components/oof-has/components/oof-has-reservation/Chart.yaml
kubernetes/oof/components/oof-has/components/oof-has-solver/Chart.yaml
kubernetes/oof/components/oof-templates/Chart.yaml
kubernetes/platform/Chart.yaml
kubernetes/platform/components/chartmuseum/Chart.yaml
kubernetes/platform/components/cmpv2-cert-provider/Chart.yaml
kubernetes/platform/components/oom-cert-service/Chart.yaml
kubernetes/policy/Chart.yaml
kubernetes/policy/components/policy-apex-pdp/Chart.yaml
kubernetes/policy/components/policy-api/Chart.yaml
kubernetes/policy/components/policy-clamp-ac-http-ppnt/Chart.yaml
kubernetes/policy/components/policy-clamp-ac-k8s-ppnt/Chart.yaml
kubernetes/policy/components/policy-clamp-ac-pf-ppnt/Chart.yaml
kubernetes/policy/components/policy-clamp-runtime-acm/Chart.yaml
kubernetes/policy/components/policy-distribution/Chart.yaml
kubernetes/policy/components/policy-drools-pdp/Chart.yaml
kubernetes/policy/components/policy-gui/Chart.yaml
kubernetes/policy/components/policy-nexus/Chart.yaml
kubernetes/policy/components/policy-pap/Chart.yaml
kubernetes/policy/components/policy-xacml-pdp/Chart.yaml
kubernetes/portal/Chart.yaml
kubernetes/portal/components/portal-app/Chart.yaml
kubernetes/portal/components/portal-cassandra/Chart.yaml
kubernetes/portal/components/portal-mariadb/Chart.yaml
kubernetes/portal/components/portal-sdk/Chart.yaml
kubernetes/portal/components/portal-widget/Chart.yaml
kubernetes/robot/Chart.yaml
kubernetes/robot/values.yaml
kubernetes/sdc/Chart.yaml
kubernetes/sdc/components/sdc-be/Chart.yaml
kubernetes/sdc/components/sdc-be/templates/configmap.yaml
kubernetes/sdc/components/sdc-be/templates/deployment.yaml
kubernetes/sdc/components/sdc-be/templates/sdc-be-kafka-user.yaml [new file with mode: 0644]
kubernetes/sdc/components/sdc-be/templates/sdc-distro-topics.yaml [new file with mode: 0644]
kubernetes/sdc/components/sdc-be/templates/secret.yaml [new file with mode: 0644]
kubernetes/sdc/components/sdc-be/values.yaml
kubernetes/sdc/components/sdc-cs/Chart.yaml
kubernetes/sdc/components/sdc-cs/values.yaml
kubernetes/sdc/components/sdc-fe/Chart.yaml
kubernetes/sdc/components/sdc-fe/values.yaml
kubernetes/sdc/components/sdc-helm-validator/Chart.yaml
kubernetes/sdc/components/sdc-onboarding-be/Chart.yaml
kubernetes/sdc/components/sdc-onboarding-be/values.yaml
kubernetes/sdc/components/sdc-wfd-be/Chart.yaml
kubernetes/sdc/components/sdc-wfd-fe/Chart.yaml
kubernetes/sdc/resources/config/environments/AUTO.json
kubernetes/sdc/values.yaml
kubernetes/sdnc/Chart.yaml
kubernetes/sdnc/components/dmaap-listener/Chart.yaml
kubernetes/sdnc/components/sdnc-ansible-server/Chart.yaml
kubernetes/sdnc/components/sdnc-prom/Chart.yaml
kubernetes/sdnc/components/sdnc-web/Chart.yaml
kubernetes/sdnc/components/ueb-listener/Chart.yaml
kubernetes/sniro-emulator/Chart.yaml
kubernetes/so/Chart.yaml
kubernetes/so/components/so-admin-cockpit/Chart.yaml
kubernetes/so/components/so-admin-cockpit/resources/config/overrides/override.yaml
kubernetes/so/components/so-appc-orchestrator/Chart.yaml
kubernetes/so/components/so-bpmn-infra/Chart.yaml
kubernetes/so/components/so-catalog-db-adapter/Chart.yaml
kubernetes/so/components/so-cnf-adapter/Chart.yaml
kubernetes/so/components/so-etsi-nfvo-ns-lcm/Chart.yaml
kubernetes/so/components/so-etsi-sol003-adapter/Chart.yaml
kubernetes/so/components/so-etsi-sol005-adapter/Chart.yaml
kubernetes/so/components/so-mariadb/Chart.yaml
kubernetes/so/components/so-nssmf-adapter/Chart.yaml
kubernetes/so/components/so-oof-adapter/Chart.yaml
kubernetes/so/components/so-openstack-adapter/Chart.yaml
kubernetes/so/components/so-request-db-adapter/Chart.yaml
kubernetes/so/components/so-sdc-controller/Chart.yaml
kubernetes/so/components/so-sdnc-adapter/Chart.yaml
kubernetes/so/components/so-ve-vnfm-adapter/Chart.yaml
kubernetes/so/components/soHelpers/Chart.yaml
kubernetes/strimzi/Chart.yaml
kubernetes/strimzi/components/strimzi-kafka-bridge/.helmignore [moved from kubernetes/dmaap/components/dmaap-strimzi/.helmignore with 100% similarity]
kubernetes/strimzi/components/strimzi-kafka-bridge/Chart.yaml [new file with mode: 0644]
kubernetes/strimzi/components/strimzi-kafka-bridge/Makefile [moved from kubernetes/dmaap/components/dmaap-strimzi/Makefile with 100% similarity]
kubernetes/strimzi/components/strimzi-kafka-bridge/templates/strimzi-kb.yaml [moved from kubernetes/dmaap/components/dmaap-strimzi/templates/dmaap-strimzi-kb.yaml with 50% similarity]
kubernetes/strimzi/components/strimzi-kafka-bridge/values.yaml [moved from kubernetes/dmaap/components/dmaap-strimzi/values.yaml with 70% similarity]
kubernetes/strimzi/templates/pv-kafka.yaml
kubernetes/strimzi/templates/pv-zk.yaml
kubernetes/strimzi/templates/strimzi-kafka-admin-user.yaml
kubernetes/strimzi/templates/strimzi-kafka.yaml
kubernetes/strimzi/values.yaml
kubernetes/uui/Chart.yaml
kubernetes/uui/components/uui-intent-analysis/.helmignore [new file with mode: 0644]
kubernetes/uui/components/uui-intent-analysis/Chart.yaml [moved from kubernetes/dmaap/components/dmaap-strimzi/Chart.yaml with 68% similarity]
kubernetes/uui/components/uui-intent-analysis/resources/config/intent-analysis-init.sql [new file with mode: 0644]
kubernetes/uui/components/uui-intent-analysis/resources/entrypoint/run.sh [new file with mode: 0644]
kubernetes/uui/components/uui-intent-analysis/templates/configmap.yaml [new file with mode: 0644]
kubernetes/uui/components/uui-intent-analysis/templates/deployment.yaml [new file with mode: 0644]
kubernetes/uui/components/uui-intent-analysis/templates/job.yaml [new file with mode: 0644]
kubernetes/uui/components/uui-intent-analysis/templates/secrets.yaml [new file with mode: 0644]
kubernetes/uui/components/uui-intent-analysis/templates/service.yaml [new file with mode: 0644]
kubernetes/uui/components/uui-intent-analysis/values.yaml [new file with mode: 0644]
kubernetes/uui/components/uui-nlp/Chart.yaml
kubernetes/uui/components/uui-server/Chart.yaml
kubernetes/uui/components/uui-server/values.yaml
kubernetes/vfc/Chart.yaml
kubernetes/vfc/components/vfc-generic-vnfm-driver/Chart.yaml
kubernetes/vfc/components/vfc-huawei-vnfm-driver/Chart.yaml
kubernetes/vfc/components/vfc-nslcm/Chart.yaml
kubernetes/vfc/components/vfc-redis/Chart.yaml
kubernetes/vfc/components/vfc-vnflcm/Chart.yaml
kubernetes/vfc/components/vfc-vnfmgr/Chart.yaml
kubernetes/vfc/components/vfc-vnfres/Chart.yaml
kubernetes/vfc/components/vfc-zte-vnfm-driver/Chart.yaml
kubernetes/vid/Chart.yaml
kubernetes/vnfsdk/Chart.yaml
requirements.txt

index f724264..40e9e99 100644 (file)
@@ -3,18 +3,19 @@
 # Read the Docs configuration file
 # See https://docs.readthedocs.io/en/stable/config-file/v2.html for details
 # Required
+#
 version: 2
 
-formats:
-  - htmlzip
-
 build:
-  image: latest
+   image: latest
 
 python:
-  version: 3.7
-  install:
-    - requirements: requirements.txt
+   version: 3.7
+   install:
+      - requirements: docs/requirements-docs.txt
+
+submodules:
+   include: all
 
 sphinx:
-  configuration: docs/conf.py
+   configuration: docs/conf.py
\ No newline at end of file
index 6008cb1..afb9480 100644 (file)
@@ -59,5 +59,5 @@
 /* fix width of the screen */
 
 .wy-nav-content {
-    max-width: none;
+    max-width: 800px;
 }
similarity index 99%
rename from docs/oom_developer_guide.rst
rename to docs/archived/oom_developer_guide.rst
index 8df8e74..f6513bd 100644 (file)
@@ -2,6 +2,7 @@
 .. International License.
 .. http://creativecommons.org/licenses/by/4.0
 .. Copyright 2018-2020 Amdocs, Bell Canada, Orange, Samsung
+.. Modification copyright (C) 2022 Nordix Foundation
 
 .. Links
 .. _Helm: https://docs.helm.sh/
@@ -22,7 +23,7 @@
 OOM Developer Guide
 ###################
 
-.. figure:: images/oom_logo/oomLogoV2-medium.png
+.. figure:: ../../resources/images/oom_logo/oomLogoV2-medium.png
    :align: right
 
 ONAP consists of a large number of components, each of which are substantial
@@ -687,7 +688,7 @@ The relationship between these objects is shown in the following figure:
 ..   database PV
 ..   @enduml
 
-.. figure:: images/k8s/kubernetes_objects.png
+.. figure:: ../../resources/images/k8s/kubernetes_objects.png
 
 OOM uses these Kubernetes objects as described in the following sections.
 
@@ -1074,7 +1075,7 @@ MSB Integration with OOM
 ------------------------
 A preliminary view of the OOM-MSB integration is as follows:
 
-.. figure:: images/msb/MSB-OOM-Diagram.png
+.. figure:: ../../resources/images/msb/MSB-OOM-Diagram.png
 
 A message sequence chart of the registration process:
 
similarity index 99%
rename from docs/oom_quickstart_guide.rst
rename to docs/archived/oom_quickstart_guide.rst
index b7749b1..4727a3e 100644 (file)
@@ -30,6 +30,7 @@ where <BRANCH> can be an official release tag, such as
 * 9.0.0 for Istanbul
 * 10.0.0 for Jakarta
 * 11.0.0 for Kohn
+* 12.0.0 for London
 
 **Step 2.** Install Helm Plugins required to deploy ONAP::
 
index 3b28eb7..29c57e6 100644 (file)
@@ -1,15 +1,59 @@
-from docs_conf.conf import *
+project = "onap"
+release = "kohn"
+version = "kohn"
 
-branch = 'latest'
-master_doc = 'index'
+author = "Open Network Automation Platform"
+# yamllint disable-line rule:line-length
+copyright = "ONAP. Licensed under Creative Commons Attribution 4.0 International License"
 
-linkcheck_ignore = [
-    'http://localhost',
+pygments_style = "sphinx"
+html_theme = "sphinx_rtd_theme"
+html_theme_options = {
+  "style_nav_header_background": "white",
+  "sticky_navigation": "False" }
+html_logo = "_static/logo_onap_2017.png"
+html_favicon = "_static/favicon.ico"
+html_static_path = ["_static"]
+html_show_sphinx = False
+
+extensions = [
+    'sphinx.ext.intersphinx',
+    'sphinx.ext.graphviz',
+    'sphinxcontrib.blockdiag',
+    'sphinxcontrib.seqdiag',
+    'sphinxcontrib.swaggerdoc',
+    'sphinxcontrib.plantuml',
+    'sphinx_toolbox.collapse'
 ]
 
+exclude_patterns = ['archived/*.rst', '.tox']
+#
+# Map to 'latest' if this file is used in 'latest' (master) 'doc' branch.
+# Change to {releasename} after you have created the new 'doc' branch.
+#
+
+branch = 'kohn'
+
 intersphinx_mapping = {}
+doc_url = 'https://docs.onap.org/projects'
+master_doc = 'index'
+
+spelling_word_list_filename='spelling_wordlist.txt'
+spelling_lang = "en_GB"
+
+#
+# Example:
+# intersphinx_mapping['onap-aai-aai-common'] = ('{}/onap-aai-aai-common/en/%s'.format(doc_url) % branch, None)
+#
 
 html_last_updated_fmt = '%d-%b-%y %H:%M'
 
+
 def setup(app):
-    app.add_css_file("css/ribbon_onap.css")
+    app.add_css_file("css/ribbon.css")
+
+
+linkcheck_ignore = [
+  "https://istio-release.storage.googleapis.com/charts",
+  r'http://localhost:\d+/'
+]
index ab59281..11eaff6 100644 (file)
@@ -3,5 +3,5 @@ project_cfg: onap
 project: onap
 
 # Change this to ReleaseBranchName to modify the header
-default-version: latest
+default-version: kohn
 #
index 94a4bf0..7a1d52b 100644 (file)
@@ -2,20 +2,20 @@
 .. International License.
 .. http://creativecommons.org/licenses/by/4.0
 .. Copyright 2018-2021 Amdocs, Bell Canada, Orange, Samsung, Nokia
-.. _master_index:
+.. Modification copyright (C) 2022 Nordix Foundation
 
+.. _master_index:
 
 OOM Documentation Repository
 ----------------------------
 .. toctree::
   :maxdepth: 2
 
-  oom_project_description.rst
-  oom_quickstart_guide.rst
-  oom_user_guide.rst
-  oom_setup_paas.rst
-  oom_developer_guide.rst
-  oom_cloud_setup_guide.rst
-  release_notes/release-notes.rst
-  oom_setup_kubernetes_rancher.rst
-  oom_setup_ingress_controller.rst
+  sections/oom_project_description.rst
+  sections/guides/development_guides/oom_development.rst
+  sections/guides/infra_guides/oom_infra_setup.rst
+  sections/guides/deployment_guides/oom_deployment.rst
+  sections/guides/user_guides/oom_user_guide.rst
+  sections/guides/access_guides/oom_access_info.rst
+  sections/release_notes/release-notes.rst
+
diff --git a/docs/oom_cloud_setup_guide.rst b/docs/oom_cloud_setup_guide.rst
deleted file mode 100644 (file)
index 6906289..0000000
+++ /dev/null
@@ -1,113 +0,0 @@
-.. This work is licensed under a Creative Commons Attribution 4.0
-.. International License.
-.. http://creativecommons.org/licenses/by/4.0
-.. Copyright 2019-2020 Amdocs, Bell Canada, Orange, Samsung
-.. _oom_cloud_setup_guide:
-
-.. Links
-.. _Microsoft Azure: https://wiki.onap.org/display/DW/Cloud+Native+Deployment#CloudNativeDeployment-MicrosoftAzure
-.. _Amazon AWS: https://wiki.onap.org/display/DW/Cloud+Native+Deployment#CloudNativeDeployment-AmazonAWS
-.. _Google GCE: https://wiki.onap.org/display/DW/Cloud+Native+Deployment#CloudNativeDeployment-GoogleGCE
-.. _VMware VIO: https://wiki.onap.org/display/DW/ONAP+on+VMware+Integrated+OpenStack+-+Container+Orchestration
-.. _OpenStack: https://wiki.onap.org/display/DW/ONAP+on+Kubernetes+on+OpenStack?src=contextnavpagetreemode
-.. _Setting Up Kubernetes with Rancher: https://wiki.onap.org/display/DW/Cloud+Native+Deployment
-.. _Setting Up Kubernetes with Kubeadm: https://wiki.onap.org/display/DW/Deploying+Kubernetes+Cluster+with+kubeadm
-.. _Cloud Native Deployment Wiki: https://wiki.onap.org/display/DW/Cloud+Native+Deployment
-.. _ONAP Development - 110 pod limit Wiki: https://wiki.onap.org/display/DW/ONAP+Development#ONAPDevelopment-Changemax-podsfromdefault110podlimit
-
-.. figure:: images/oom_logo/oomLogoV2-medium.png
-   :align: right
-
-.. _cloud-setup-guide-label:
-
-OOM Cloud Setup Guide
-#####################
-
-OOM deploys and manages ONAP on a pre-established Kubernetes_ cluster - the
-creation of this cluster is outside of the scope of the OOM project as there
-are many options including public clouds with pre-established environments.
-However, this guide includes instructions for how to create and use some of the
-more popular environments which could be used to host ONAP. If creation of a
-Kubernetes cluster is required, the life-cycle of this cluster is independent
-of the life-cycle of the ONAP components themselves. Much like an OpenStack
-environment, the Kubernetes environment may be used for an extended period of
-time, possibly spanning multiple ONAP releases.
-
-.. note::
-  Inclusion of a cloud technology or provider in this guide does not imply an
-  endorsement.
-
-.. _Kubernetes: https://kubernetes.io/
-
-Software Requirements
-=====================
-
-The versions of Kubernetes that are supported by OOM are as follows:
-
-.. table:: OOM Software Requirements
-
-  ==============     ===========  =======  ========  ======== ============
-  Release            Kubernetes   Helm     kubectl   Docker   Cert-Manager
-  ==============     ===========  =======  ========  ======== ============
-  amsterdam          1.7.x        2.3.x    1.7.x     1.12.x
-  beijing            1.8.10       2.8.2    1.8.10    17.03.x
-  casablanca         1.11.5       2.9.1    1.11.5    17.03.x
-  dublin             1.13.5       2.12.3   1.13.5    18.09.5
-  el alto            1.15.2       2.14.2   1.15.2    18.09.x
-  frankfurt          1.15.9       2.16.6   1.15.11   18.09.x
-  guilin             1.15.11      2.16.10  1.15.11   18.09.x
-  honolulu           1.19.9       3.5.2    1.19.9    19.03.x   1.2.0
-  Istanbul           1.19.11      3.6.3    1.19.11   19.03.x   1.5.4
-  Jakarta            1.22.4       3.6.3    1.22.4    20.10.x   1.5.4
-  ==============     ===========  =======  ========  ======== ============
-
-Minimum Hardware Configuration
-==============================
-
-The hardware requirements are provided below. Note that this is for a
-full ONAP deployment (all components). Customizing ONAP to deploy only
-components that are needed will drastically reduce the requirements.
-
-.. table:: OOM Hardware Requirements
-
-  =====  =====  ======  ====================
-  RAM    HD     vCores  Ports
-  =====  =====  ======  ====================
-  224GB  160GB  112     0.0.0.0/0 (all open)
-  =====  =====  ======  ====================
-
-.. note::
-  Kubernetes supports a maximum of 110 pods per node - configurable in the
-  --max-pods=n setting off the "additional kubelet flags" box in the kubernetes
-  template window described in 'ONAP Development - 110 pod limit Wiki'
-  - this limit does not need to be modified . The use of many small nodes is
-  preferred over a few larger nodes (for example 14x16GB - 8 vCores each).
-  Subsets of ONAP may still be deployed on a single node.
-
-Cloud Installation
-==================
-
-.. #. OOM supports deployment on major public clouds. The following guides
-..    provide instructions on how to deploy ONAP on these clouds:
-..
-..    - `Microsoft Azure`_,
-..    - `Amazon AWS`_,
-..    - `Google GCE`_,
-..    - `VMware VIO`_,
-..    - IBM, and
-..    - `Openstack`_.
-..
-.. #. Alternatively, OOM can be deployed on a private set of physical hosts or
-..    VMs (or even a combination of the two). The following guides describe how
-..    to create a Kubernetes cluster with popular tools:
-..
-..    - `Setting up Kubernetes with Rancher`_ (recommended)
-..    - `Setting up Kubernetes with Kubeadm`_
-..    - `Setting up Kubernetes with Cloudify`_
-
-OOM can be deployed on a private set of physical hosts or VMs (or even a
-combination of the two). The following guide describe the recommended method to
-setup a Kubernetes cluster: :ref:`onap-on-kubernetes-with-rancher`.
-
-There are alternative deployment methods described on the
-`Cloud Native Deployment Wiki`_
diff --git a/docs/requirements-docs.txt b/docs/requirements-docs.txt
new file mode 100644 (file)
index 0000000..9c104de
--- /dev/null
@@ -0,0 +1,8 @@
+sphinx>=4.2.0  # BSD
+sphinx-rtd-theme>=1.0.0  # MIT
+sphinxcontrib-blockdiag  # BSD
+sphinxcontrib-seqdiag # BSD
+sphinxcontrib-swaggerdoc
+sphinxcontrib-spelling
+sphinxcontrib-plantuml
+sphinx_toolbox>=3.2.0
diff --git a/docs/sections/guides/access_guides/oom_access_info.rst b/docs/sections/guides/access_guides/oom_access_info.rst
new file mode 100644 (file)
index 0000000..4e98667
--- /dev/null
@@ -0,0 +1,176 @@
+.. This work is licensed under a Creative Commons Attribution 4.0
+.. International License.
+.. http://creativecommons.org/licenses/by/4.0
+.. Copyright (C) 2022 Nordix Foundation
+
+.. Links
+.. _Kubernetes LoadBalancer: https://kubernetes.io/docs/concepts/services-networking/service/#loadbalancer
+.. _Kubernetes NodePort: https://kubernetes.io/docs/concepts/services-networking/service/#type-nodeport
+
+.. _oom_access_info_guide:
+
+OOM Access Info
+###############
+
+.. figure:: ../../resources/images/oom_logo/oomLogoV2-medium.png
+   :align: right
+
+Access via NodePort/Loadbalancer
+********************************
+
+The ONAP deployment created by OOM operates in a private IP network that isn't
+publicly accessible (i.e. OpenStack VMs with private internal network) which
+blocks access to the ONAP User Interfaces.
+To enable direct access to a service from a user's own environment (a laptop etc.)
+the application's internal port is exposed through a `Kubernetes NodePort`_ or
+`Kubernetes LoadBalancer`_ object.
+
+Typically, to be able to access the Kubernetes nodes publicly a public address
+is assigned. In OpenStack this is a floating IP address.
+
+Most ONAP applications use the `NodePort` as predefined `service:type`,
+which opens allows access to the service through the the IP address of each
+Kubernetes node.
+When using  the `Loadbalancer` as `service:type` `Kubernetes LoadBalancer`_ object
+which gets a separate IP address.
+
+.. note::
+  The following example uses the `ONAP Portal`, which is not actively maintained
+  in Kohn and will be replaced in the future
+
+When e.g. the `portal-app` chart is deployed a Kubernetes service is created that
+instantiates a load balancer.  The LB chooses the private interface of one of
+the nodes as in the example below (10.0.0.4 is private to the K8s cluster only).
+Then to be able to access the portal on port 8989 from outside the K8s &
+OpenStack environment, the user needs to assign/get the floating IP address that
+corresponds to the private IP as follows::
+
+  > kubectl -n onap get services|grep "portal-app"
+  portal-app  LoadBalancer   10.43.142.201   10.0.0.4   8989:30215/TCP,8006:30213/TCP,8010:30214/TCP   1d   app=portal-app,release=dev
+
+
+In this example, use the 11.0.0.4 private address as a key find the
+corresponding public address which in this example is 10.12.6.155. If you're
+using OpenStack you'll do the lookup with the horizon GUI or the OpenStack CLI
+for your tenant (openstack server list).  That IP is then used in your
+`/etc/hosts` to map the fixed DNS aliases required by the ONAP Portal as shown
+below::
+
+  10.12.6.155 portal.api.simpledemo.onap.org
+  10.12.6.155 vid.api.simpledemo.onap.org
+  10.12.6.155 sdc.api.fe.simpledemo.onap.org
+  10.12.6.155 sdc.workflow.plugin.simpledemo.onap.org
+  10.12.6.155 sdc.dcae.plugin.simpledemo.onap.org
+  10.12.6.155 portal-sdk.simpledemo.onap.org
+  10.12.6.155 policy.api.simpledemo.onap.org
+  10.12.6.155 aai.api.sparky.simpledemo.onap.org
+  10.12.6.155 cli.api.simpledemo.onap.org
+  10.12.6.155 msb.api.discovery.simpledemo.onap.org
+  10.12.6.155 msb.api.simpledemo.onap.org
+  10.12.6.155 clamp.api.simpledemo.onap.org
+  10.12.6.155 so.api.simpledemo.onap.org
+  10.12.6.155 sdc.workflow.plugin.simpledemo.onap.org
+
+Ensure you've disabled any proxy settings the browser you are using to access
+the portal and then simply access now the new ssl-encrypted URL:
+``https://portal.api.simpledemo.onap.org:30225/ONAPPORTAL/login.htm``
+
+.. note::
+  Using the HTTPS based Portal URL the Browser needs to be configured to accept
+  unsecure credentials.
+  Additionally when opening an Application inside the Portal, the Browser
+  might block the content, which requires to disable the blocking and reloading
+  of the page
+
+.. note::
+  Besides the ONAP Portal the Components can deliver additional user interfaces,
+  please check the Component specific documentation.
+
+.. note::
+
+   | Alternatives Considered:
+
+   -  Kubernetes port forwarding was considered but discarded as it would
+      require the end user to run a script that opens up port forwarding tunnels
+      to each of the pods that provides a portal application widget.
+
+   -  Reverting to a VNC server similar to what was deployed in the Amsterdam
+      release was also considered but there were many issues with resolution,
+      lack of volume mount, /etc/hosts dynamic update, file upload that were
+      a tall order to solve in time for the Beijing release.
+
+   Observations:
+
+   -  If you are not using floating IPs in your Kubernetes deployment and
+      directly attaching a public IP address (i.e. by using your public provider
+      network) to your K8S Node VMs' network interface, then the output of
+      'kubectl -n onap get services | grep "portal-app"'
+      will show your public IP instead of the private network's IP. Therefore,
+      you can grab this public IP directly (as compared to trying to find the
+      floating IP first) and map this IP in /etc/hosts.
+
+Some relevant information regarding accessing OOM from outside the cluster etc
+
+ONAP Nodeports
+==============
+
+NodePorts are used to allow client applications, that run outside of
+Kubernetes, access to ONAP components deployed by OOM.
+A NodePort maps an externally reachable port to an internal port of an ONAP
+microservice.
+It should be noted that the use of NodePorts is temporary.
+An alternative solution based on Ingress Controller, which initial support is
+already in place. It is planned to become a default deployment option in the
+London release.
+
+More information from official Kubernetes documentation about
+`Kubernetes NodePort`_.
+
+The following table lists all the NodePorts used by ONAP.
+
+.. csv-table:: NodePorts table
+   :file: ../../resources/csv/nodeports.csv
+   :widths: 20,20,20,20,20
+   :header-rows: 1
+
+
+This table retrieves information from the ONAP deployment using the following
+Kubernetes command:
+
+.. code-block:: bash
+
+  kubectl get svc -n onap -o go-template='{{range .items}}{{range.spec.ports}}{{if .nodePort}}{{.nodePort}}{{.}}{{"\n"}}{{end}}{{end}}{{end}}'
+
+
+(Optional) Access via Ingress
+*****************************
+
+Using Ingress as access method requires the installation of an Ingress
+controller and the configuration of the ONAP deployment to use it.
+
+For "ONAP on ServiceMesh" you can find the instructions in:
+
+- :ref:`oom_base_optional_addons`
+- :ref:`oom_customize_overrides`
+
+In the ServiceMesh deployment the Istio IngressGateway is the only access point
+for ONAP component interfaces.
+Usually the Ingress is accessed via a LoadBalancer IP (<ingress-IP>),
+which is used as central address.
+All APIs/UIs are provided via separate URLs which are routed to the component service.
+To use these URLs they need to be resolvable via DNS or via /etc/hosts.
+
+The domain name is usually defined in the `global` section of the ONAP helm-charts,
+`virtualhost.baseurl` (here "simpledemo.onap.org") whereas the hostname of
+the service (e.g. "sdc-fe-ui") is defined in the component's chart.
+
+.. code-block:: none
+
+  <ingress-IP> kiali.simpledemo.onap.org
+  <ingress-IP> cds-ui.simpledemo.onap.org
+  <ingress-IP> sdc-fe-ui.simpledemo.onap.org
+  ...
+
+To access e.g. the SDC UI now the new ssl-encrypted URL:
+
+``https://sdc-fe-ui.simpledemo.onap.org/sdc1``
diff --git a/docs/sections/guides/deployment_guides/oom_customize_overrides.rst b/docs/sections/guides/deployment_guides/oom_customize_overrides.rst
new file mode 100644 (file)
index 0000000..a49543c
--- /dev/null
@@ -0,0 +1,110 @@
+.. This work is licensed under a Creative Commons Attribution 4.0
+.. International License.
+.. http://creativecommons.org/licenses/by/4.0
+.. Copyright (C) 2022 Nordix Foundation
+
+.. Links
+.. _helm deploy: https://github.com/onap/oom/blob/master/kubernetes/helm/plugins/deploy/deploy.sh
+
+.. _oom_customize_overrides:
+
+OOM Custom Overrides
+####################
+
+The OOM `helm deploy`_ plugin requires deployment configuration as input, usually in the form of override yaml files.
+These input files determine what ONAP components get deployed, and the configuration of the OOM deployment.
+
+Other helm config options like `--set log.enabled=true|false` are available.
+
+See the `helm deploy`_ plugin usage section for more detail, or it the plugin has already been installed, execute the following::
+
+    > helm deploy --help
+
+Users can customize the override files to suit their required deployment.
+
+.. note::
+  Standard and example override files (e.g. `onap-all.yaml`, `onap-all-ingress-istio.yaml`)
+  can be found in the `oom/kubernetes/onap/resources/overrides/` directory.
+
+ * Users can selectively enable or disable ONAP components by changing the ``enabled: true/false`` flags.
+
+ * Add to the command line a value for the global master password (ie. --set global.masterPassword=My_superPassw0rd).
+
+
+Enabling/Disabling Components
+*****************************
+Here is an example of the nominal entries that need to be provided.
+Different values files are available for different contexts.
+
+.. collapse:: Default ONAP values.yaml
+
+    .. include:: ../../../../kubernetes/onap/values.yaml
+       :code: yaml
+
+|
+
+(Optional) "ONAP on Service Mesh"
+*********************************
+
+To enable "ONAP on Service Mesh" both "ServiceMesh" and "Ingress"
+configuration entries need to be configured before deployment.
+
+Global settings relevant for ServiceMesh:
+
+.. code-block:: yaml
+
+  global:
+    ingress:
+      # generally enable ingress for ONAP components
+      enabled: false
+      # enable all component's Ingress interfaces
+      enable_all: false
+      # default Ingress base URL
+      # can be overwritten in component by setting ingress.baseurlOverride
+      virtualhost:
+        baseurl: "simpledemo.onap.org"
+      # All http requests via ingress will be redirected on Ingress controller
+      # only valid for Istio Gateway (ServiceMesh enabled)
+      config:
+        ssl: "redirect"
+      # you can set an own Secret containing a certificate
+      # only valid for Istio Gateway (ServiceMesh enabled)
+      #  tls:
+      #    secret: 'my-ingress-cert'
+      # optional: Namespace of the Istio IngressGateway
+      # only valid for Istio Gateway (ServiceMesh enabled)
+      namespace: istio-ingress
+  ...
+    serviceMesh:
+      enabled: true
+      tls: true
+      # be aware that linkerd is not well tested
+      engine: "istio" # valid value: istio or linkerd
+    aafEnabled: false
+    cmpv2Enabled: false
+    tlsEnabled: false
+    msbEnabled: false
+
+ServiceMesh settings:
+
+- enabled: true â†’ enables ServiceMesh functionality in the ONAP Namespace (Istio: enables Sidecar deployment)
+- tls: true â†’ enables mTLS encryption in Sidecar communication
+- engine: istio â†’ sets the SM engine (currently only Istio is supported)
+- aafEnabled: false â†’ disables AAF usage for TLS interfaces
+- tlsEnabled: false â†’ disables creation of TLS in component services
+- cmpv2Enabled: false â†’ disable cmpv2 feature
+- msbEnabled: false â†’ MSB is not used in Istio setup (Open, if all components are MSB independend)
+
+Ingress settings:
+
+- enabled: true â†’ enables Ingress using: Nginx (when SM disabled), Istio IngressGateway (when SM enabled)
+- enable_all: true â†’ enables Ingress configuration in each component
+- virtualhost.baseurl: "simpledemo.onap.org" â†’ sets globally the URL for all Interfaces set by the components,
+    resulting in e.g. "aai-api.simpledemo.onap.org", can be overwritten in the component via: ingress.baseurlOverride
+- config.ssl: redirect â†’ sets in the Ingress globally the redirection of all Interfaces from http (port 80) to https (port 443)
+- config.tls.secret: "..." â†’ (optional) overrides the default selfsigned SSL certificate with a certificate stored in the specified secret
+- namespace: istio-ingress â†’ (optional) overrides the namespace of the ingress gateway which is used for the created SSL certificate
+
+.. note::
+  For "ONAP on Istio" an example override file (`onap-all-ingress-istio.yaml`)
+  can be found in the `oom/kubernetes/onap/resources/overrides/` directory.
diff --git a/docs/sections/guides/deployment_guides/oom_deployment.rst b/docs/sections/guides/deployment_guides/oom_deployment.rst
new file mode 100644 (file)
index 0000000..1107369
--- /dev/null
@@ -0,0 +1,42 @@
+.. This work is licensed under a Creative Commons Attribution 4.0
+.. International License.
+.. http://creativecommons.org/licenses/by/4.0
+.. Copyright (C) 2022 Nordix Foundation
+
+.. Links
+.. _ONAP Release Long Term Roadmap: https://wiki.onap.org/display/DW/Long+Term+Roadmap
+
+.. _oom_deploy_guide:
+
+OOM Deployment Guide
+--------------------
+
+.. figure:: ../../resources/images/oom_logo/oomLogoV2-medium.png
+   :align: right
+
+ONAP OOM supports several options for the deployment of ONAP using it's helm charts.
+
+    * :ref:`oom_helm_release_repo_deploy`
+    * :ref:`oom_helm_testing_repo_deploy`
+    * :ref:`oom_dev_testing_local_deploy`
+
+.. warning::
+    | **Pre-requisites**
+    | The following sections must be completed before continuing with deployment:
+
+        | :ref:`Set up your base platform<oom_base_setup_guide>`
+
+
+Each deployment method can be customized to deploy a subset of ONAP component applications.
+See the :ref:`oom_customize_overrides` section for more details.
+
+
+.. toctree::
+  :hidden:
+
+  oom_customize_overrides.rst
+  oom_helm_release_repo_deploy.rst
+  oom_helm_testing_repo_deploy.rst
+  oom_dev_testing_local_deploy.rst
+
+
diff --git a/docs/sections/guides/deployment_guides/oom_dev_testing_local_deploy.rst b/docs/sections/guides/deployment_guides/oom_dev_testing_local_deploy.rst
new file mode 100644 (file)
index 0000000..50701dd
--- /dev/null
@@ -0,0 +1,87 @@
+.. This work is licensed under a Creative Commons Attribution 4.0
+.. International License.
+.. http://creativecommons.org/licenses/by/4.0
+.. Copyright (C) 2022 Nordix Foundation
+
+.. Links
+
+.. _oom_dev_testing_local_deploy:
+
+OOM Developer Testing Deployment
+================================
+
+Developing and testing changes to the existing OOM project can be done locally by setting up some additional
+tools to host the updated helm charts.
+
+**Step 1.** Clone the OOM repository from ONAP gerrit::
+
+  > git clone http://gerrit.onap.org/r/oom
+
+  > cd oom/kubernetes
+
+
+**Step 2.** Install Helm Plugin required to push helm charts to local repo::
+
+  > helm plugin install https://github.com/chartmuseum/helm-push.git --version 0.9.0
+
+.. note::
+  The ``--version 0.9.0`` is required as new version of helm (3.7.0 and up) is
+  now using ``push`` directly and helm-push is using ``cm-push`` starting
+  version ``0.10.0`` and up.
+
+**Step 3.** Install Chartmuseum
+
+Chart museum is required to host the helm charts locally when deploying in a development environment::
+
+  > curl -LO https://s3.amazonaws.com/chartmuseum/release/latest/bin/linux/amd64/chartmuseum
+
+  > chmod +x ./chartmuseum
+
+  > mv ./chartmuseum /usr/local/bin
+
+**Step 4.** To setup a local Helm server to store the ONAP charts::
+
+  > mkdir -p ~/helm3-storage
+
+  > chartmuseum --storage local --storage-local-rootdir ~/helm3-storage -port 8879 &
+
+Note the port number that is listed and use it in the Helm repo add as follows::
+
+  > helm repo add local http://127.0.0.1:8879
+
+**Step 5.** Verify your Helm repository setup with::
+
+  > helm repo list
+  NAME   URL
+  local  http://127.0.0.1:8879
+
+**Step 6.** Build a local Helm repository (from the kubernetes directory)::
+
+  > make SKIP_LINT=TRUE [HELM_BIN=<HELM_PATH>] all
+
+`HELM_BIN`
+  Sets the helm binary to be used. The default value use helm from PATH
+
+
+**Step 7.** Display the onap charts that are available to be deployed::
+
+  > helm repo update
+
+  > helm search repo local
+
+
+.. collapse:: Helm search repo output
+
+    .. include:: ../../resources/helm/helm-search.txt
+       :code: yaml
+
+|
+
+.. note::
+  The setup of the Helm repository is a one time activity. If you make changes
+  to your deployment charts or values be sure to use ``make`` to update your
+  local Helm repository.
+
+
+
+
diff --git a/docs/sections/guides/deployment_guides/oom_helm_release_repo_deploy.rst b/docs/sections/guides/deployment_guides/oom_helm_release_repo_deploy.rst
new file mode 100644 (file)
index 0000000..f932360
--- /dev/null
@@ -0,0 +1,44 @@
+.. This work is licensed under a Creative Commons Attribution 4.0
+.. International License.
+.. http://creativecommons.org/licenses/by/4.0
+.. Copyright (C) 2022 Nordix Foundation
+
+.. Links
+.. _ONAP helm release repository: https://nexus3.onap.org/service/rest/repository/browse/onap-helm-release/
+.. _ONAP Release Long Term Roadmap: https://wiki.onap.org/display/DW/Long+Term+Roadmap
+
+.. _oom_helm_release_repo_deploy:
+
+OOM Helm Release Deployment
+===========================
+
+ONAP hosts the OOM release helm charts in it's `ONAP helm release repository`_.
+
+This is the officially supported repository for the deployment of OOM.
+
+.. note::
+    ONAP supports up to N-1 releases. See `ONAP Release Long Term Roadmap`_ for more details.
+
+Add the OOM release repo & Deploy
+---------------------------------
+Add the repository:
+
+- To add the onap release helm repo, execute the following::
+
+    > helm repo add onap-release https://nexus3.onap.org/repository/onap-helm-release/
+
+.. note::
+    The following helm command will deploy ONAP charts, with `all` OOM components enabled as per the onap-all.yml overrides file provided to the `-f` flag.
+
+    To customize what applications are deployed, see the :ref:`oom_customize_overrides` section for more details, to provide your own custom overrides yaml file.
+
+- To deploy a release, execute the following, substituting the <version> tag with your preferred release (ie. 11.0.0)::
+
+    >  helm deploy dev onap-release/onap --namespace onap --create-namespace --set global.masterPassword=myAwesomePasswordThatINeedToChange --version <version> -f oom/kubernetes/onap/resources/overrides/onap-all.yaml
+
+
+
+
+
+
+
diff --git a/docs/sections/guides/deployment_guides/oom_helm_testing_repo_deploy.rst b/docs/sections/guides/deployment_guides/oom_helm_testing_repo_deploy.rst
new file mode 100644 (file)
index 0000000..a0dafce
--- /dev/null
@@ -0,0 +1,46 @@
+.. This work is licensed under a Creative Commons Attribution 4.0
+.. International License.
+.. http://creativecommons.org/licenses/by/4.0
+.. Copyright (C) 2022 Nordix Foundation
+
+.. Links
+.. _ONAP helm testing repository: https://nexus3.onap.org/service/rest/repository/browse/onap-helm-testing/
+.. _OOM: https://github.com/onap/oom
+
+.. _oom_helm_testing_repo_deploy:
+
+OOM Helm Testing Deployment
+===========================
+
+ONAP hosts the OOM `testing` helm charts in it's `ONAP helm testing repository`_.
+
+This is helm repo contains:
+
+    * The `latest` charts built from the head of the `OOM`_ project's master
+      branch, tagged with the version number of the current development cycle (ie. 11.0.0).
+
+
+Add the OOM testing repo & Deploy
+---------------------------------
+.. note::
+   The testing helm charts for earlier releases are not fully supported. Test at your own risk.
+
+Add the repository:
+
+- To add the onap testing helm repo, execute the following::
+
+    > helm repo add onap-testing https://nexus3.onap.org/repository/onap-helm-testing/
+
+.. note::
+    The following helm command will deploy ONAP charts, with `all` OOM components enabled as per the onap-all.yml overrides file provided to the `-f` flag.
+
+    To customize what applications are deployed, see the :ref:`oom_customize_overrides` section for more details, to provide your own custom overrides yaml file.
+
+- To deploy the latest charts, we need to target the repo added previously::
+
+    >  helm deploy dev onap-testing/onap --namespace onap --create-namespace --set global.masterPassword=myAwesomePasswordThatINeedToChange -f oom/kubernetes/onap/resources/overrides/onap-all.yaml
+
+This will deploy the latest testing version of the OOM helm charts.
+
+
+
diff --git a/docs/sections/guides/development_guides/oom_dev_config_management.rst b/docs/sections/guides/development_guides/oom_dev_config_management.rst
new file mode 100644 (file)
index 0000000..36a02dc
--- /dev/null
@@ -0,0 +1,444 @@
+.. 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
+.. Modification copyright (C) 2022 Nordix Foundation
+
+.. Links
+
+.. _oom_dev_config_management:
+
+
+Configuration Management
+########################
+
+ONAP is a large system composed of many components - each of which are complex
+systems in themselves - that needs to be deployed in a number of different
+ways.  For example, within a single operator's network there may be R&D
+deployments under active development, pre-production versions undergoing system
+testing and production systems that are operating live networks.  Each of these
+deployments will differ in significant ways, such as the version of the
+software images deployed.  In addition, there may be a number of application
+specific configuration differences, such as operating system environment
+variables.  The following describes how the Helm configuration management
+system is used within the OOM project to manage both ONAP infrastructure
+configuration as well as ONAP components configuration.
+
+One of the artifacts that OOM/Kubernetes uses to deploy ONAP components is the
+deployment specification, yet another yaml file.  Within these deployment specs
+are a number of parameters as shown in the following example:
+
+.. code-block:: yaml
+
+  apiVersion: apps/v1
+  kind: StatefulSet
+  metadata:
+    labels:
+      app.kubernetes.io/name: zookeeper
+      helm.sh/chart: zookeeper
+      app.kubernetes.io/component: server
+      app.kubernetes.io/managed-by: Tiller
+      app.kubernetes.io/instance: onap-oof
+    name: onap-oof-zookeeper
+    namespace: onap
+  spec:
+    <...>
+    replicas: 3
+    selector:
+      matchLabels:
+        app.kubernetes.io/name: zookeeper
+        app.kubernetes.io/component: server
+        app.kubernetes.io/instance: onap-oof
+    serviceName: onap-oof-zookeeper-headless
+    template:
+      metadata:
+        labels:
+          app.kubernetes.io/name: zookeeper
+          helm.sh/chart: zookeeper
+          app.kubernetes.io/component: server
+          app.kubernetes.io/managed-by: Tiller
+          app.kubernetes.io/instance: onap-oof
+      spec:
+        <...>
+        affinity:
+        containers:
+        - name: zookeeper
+          <...>
+          image: gcr.io/google_samples/k8szk:v3
+          imagePullPolicy: Always
+          <...>
+          ports:
+          - containerPort: 2181
+            name: client
+            protocol: TCP
+          - containerPort: 3888
+            name: election
+            protocol: TCP
+          - containerPort: 2888
+            name: server
+            protocol: TCP
+          <...>
+
+Note that within the statefulset specification, one of the container arguments
+is the key/value pair image: gcr.io/google_samples/k8szk:v3 which
+specifies the version of the zookeeper software to deploy.  Although the
+statefulset specifications greatly simplify statefulset, maintenance of the
+statefulset specifications themselves become problematic as software versions
+change over time or as different versions are required for different
+statefulsets.  For example, if the R&D team needs to deploy a newer version of
+mariadb than what is currently used in the production environment, they would
+need to clone the statefulset specification and change this value.  Fortunately,
+this problem has been solved with the templating capabilities of Helm.
+
+The following example shows how the statefulset specifications are modified to
+incorporate Helm templates such that key/value pairs can be defined outside of
+the statefulset specifications and passed during instantiation of the component.
+
+.. code-block:: yaml
+
+  apiVersion: apps/v1
+  kind: StatefulSet
+  metadata:
+    name: {{ include "common.fullname" . }}
+    namespace: {{ include "common.namespace" . }}
+    labels: {{- include "common.labels" . | nindent 4 }}
+  spec:
+    replicas: {{ .Values.replicaCount }}
+    selector:
+      matchLabels: {{- include "common.matchLabels" . | nindent 6 }}
+    # serviceName is only needed for StatefulSet
+    # put the postfix part only if you have add a postfix on the service name
+    serviceName: {{ include "common.servicename" . }}-{{ .Values.service.postfix }}
+    <...>
+    template:
+      metadata:
+        labels: {{- include "common.labels" . | nindent 8 }}
+        annotations: {{- include "common.tplValue" (dict "value" .Values.podAnnotations "context" $) | nindent 8 }}
+        name: {{ include "common.name" . }}
+      spec:
+        <...>
+        containers:
+          - name: {{ include "common.name" . }}
+            image: {{ .Values.image }}
+            imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
+            ports:
+            {{- range $index, $port := .Values.service.ports }}
+              - containerPort: {{ $port.port }}
+                name: {{ $port.name }}
+            {{- end }}
+            {{- range $index, $port := .Values.service.headlessPorts }}
+              - containerPort: {{ $port.port }}
+                name: {{ $port.name }}
+            {{- end }}
+            <...>
+
+This version of the statefulset specification has gone through the process of
+templating values that are likely to change between statefulsets. Note that the
+image is now specified as: image: {{ .Values.image }} instead of a
+string used previously.  During the statefulset phase, Helm (actually the Helm
+sub-component Tiller) substitutes the {{ .. }} entries with a variable defined
+in a values.yaml file.  The content of this file is as follows:
+
+.. code-block:: yaml
+
+  <...>
+  image: gcr.io/google_samples/k8szk:v3
+  replicaCount: 3
+  <...>
+
+
+Within the values.yaml file there is an image key with the value
+`gcr.io/google_samples/k8szk:v3` which is the same value used in
+the non-templated version.  Once all of the substitutions are complete, the
+resulting statefulset specification ready to be used by Kubernetes.
+
+When creating a template consider the use of default values if appropriate.
+Helm templating has built in support for DEFAULT values, here is
+an example:
+
+.. code-block:: yaml
+
+  imagePullSecrets:
+  - name: "{{ .Values.nsPrefix | default "onap" }}-docker-registry-key"
+
+The pipeline operator ("|") used here hints at that power of Helm templates in
+that much like an operating system command line the pipeline operator allow
+over 60 Helm functions to be embedded directly into the template (note that the
+Helm template language is a superset of the Go template language).  These
+functions include simple string operations like upper and more complex flow
+control operations like if/else.
+
+OOM is mainly helm templating. In order to have consistent deployment of the
+different components of ONAP, some rules must be followed.
+
+Templates are provided in order to create Kubernetes resources (Secrets,
+Ingress, Services, ...) or part of Kubernetes resources (names, labels,
+resources requests and limits, ...).
+
+a full list and simple description is done in
+`kubernetes/common/common/documentation.rst`.
+
+Service template
+----------------
+
+In order to create a Service for a component, you have to create a file (with
+`service` in the name.
+For normal service, just put the following line:
+
+.. code-block:: yaml
+
+  {{ include "common.service" . }}
+
+For headless service, the line to put is the following:
+
+.. code-block:: yaml
+
+  {{ include "common.headlessService" . }}
+
+The configuration of the service is done in component `values.yaml`:
+
+.. code-block:: yaml
+
+  service:
+   name: NAME-OF-THE-SERVICE
+   postfix: MY-POSTFIX
+   type: NodePort
+   annotations:
+     someAnnotationsKey: value
+   ports:
+   - name: tcp-MyPort
+     port: 5432
+     nodePort: 88
+   - name: http-api
+     port: 8080
+     nodePort: 89
+   - name: https-api
+     port: 9443
+     nodePort: 90
+
+`annotations` and `postfix` keys are optional.
+if `service.type` is `NodePort`, then you have to give `nodePort` value for your
+service ports (which is the end of the computed nodePort, see example).
+
+It would render the following Service Resource (for a component named
+`name-of-my-component`, with version `x.y.z`, helm deployment name
+`my-deployment` and `global.nodePortPrefix` `302`):
+
+.. code-block:: yaml
+
+  apiVersion: v1
+  kind: Service
+  metadata:
+    annotations:
+      someAnnotationsKey: value
+    name: NAME-OF-THE-SERVICE-MY-POSTFIX
+    labels:
+      app.kubernetes.io/name: name-of-my-component
+      helm.sh/chart: name-of-my-component-x.y.z
+      app.kubernetes.io/instance: my-deployment-name-of-my-component
+      app.kubernetes.io/managed-by: Tiller
+  spec:
+    ports:
+      - port: 5432
+        targetPort: tcp-MyPort
+        nodePort: 30288
+      - port: 8080
+        targetPort: http-api
+        nodePort: 30289
+      - port: 9443
+        targetPort: https-api
+        nodePort: 30290
+    selector:
+      app.kubernetes.io/name: name-of-my-component
+      app.kubernetes.io/instance:  my-deployment-name-of-my-component
+    type: NodePort
+
+In the deployment or statefulSet file, you needs to set the good labels in
+order for the service to match the pods.
+
+here's an example to be sure it matches (for a statefulSet):
+
+.. code-block:: yaml
+
+  apiVersion: apps/v1
+  kind: StatefulSet
+  metadata:
+    name: {{ include "common.fullname" . }}
+    namespace: {{ include "common.namespace" . }}
+    labels: {{- include "common.labels" . | nindent 4 }}
+  spec:
+    selector:
+      matchLabels: {{- include "common.matchLabels" . | nindent 6 }}
+    # serviceName is only needed for StatefulSet
+    # put the postfix part only if you have add a postfix on the service name
+    serviceName: {{ include "common.servicename" . }}-{{ .Values.service.postfix }}
+    <...>
+    template:
+      metadata:
+        labels: {{- include "common.labels" . | nindent 8 }}
+        annotations: {{- include "common.tplValue" (dict "value" .Values.podAnnotations "context" $) | nindent 8 }}
+        name: {{ include "common.name" . }}
+      spec:
+       <...>
+       containers:
+         - name: {{ include "common.name" . }}
+           ports:
+           {{- range $index, $port := .Values.service.ports }}
+           - containerPort: {{ $port.port }}
+             name: {{ $port.name }}
+           {{- end }}
+           {{- range $index, $port := .Values.service.headlessPorts }}
+           - containerPort: {{ $port.port }}
+             name: {{ $port.name }}
+           {{- end }}
+           <...>
+
+The configuration of the service is done in component `values.yaml`:
+
+.. code-block:: yaml
+
+  service:
+   name: NAME-OF-THE-SERVICE
+   headless:
+     postfix: NONE
+     annotations:
+       anotherAnnotationsKey : value
+     publishNotReadyAddresses: true
+   headlessPorts:
+   - name: tcp-MyPort
+     port: 5432
+   - name: http-api
+     port: 8080
+   - name: https-api
+     port: 9443
+
+`headless.annotations`, `headless.postfix` and
+`headless.publishNotReadyAddresses` keys are optional.
+
+If `headless.postfix` is not set, then we'll add `-headless` at the end of the
+service name.
+
+If it set to `NONE`, there will be not postfix.
+
+And if set to something, it will add `-something` at the end of the service
+name.
+
+It would render the following Service Resource (for a component named
+`name-of-my-component`, with version `x.y.z`, helm deployment name
+`my-deployment` and `global.nodePortPrefix` `302`):
+
+.. code-block:: yaml
+
+  apiVersion: v1
+  kind: Service
+  metadata:
+    annotations:
+      anotherAnnotationsKey: value
+    name: NAME-OF-THE-SERVICE
+    labels:
+      app.kubernetes.io/name: name-of-my-component
+      helm.sh/chart: name-of-my-component-x.y.z
+      app.kubernetes.io/instance: my-deployment-name-of-my-component
+      app.kubernetes.io/managed-by: Tiller
+  spec:
+    clusterIP: None
+    ports:
+      - port: 5432
+        targetPort: tcp-MyPort
+        nodePort: 30288
+      - port: 8080
+        targetPort: http-api
+        nodePort: 30289
+      - port: 9443
+        targetPort: https-api
+        nodePort: 30290
+    publishNotReadyAddresses: true
+    selector:
+      app.kubernetes.io/name: name-of-my-component
+      app.kubernetes.io/instance:  my-deployment-name-of-my-component
+    type: ClusterIP
+
+Previous example of StatefulSet would also match (except for the `postfix` part
+obviously).
+
+Creating Deployment or StatefulSet
+----------------------------------
+
+Deployment and StatefulSet should use the `apps/v1` (which has appeared in
+v1.9).
+As seen on the service part, the following parts are mandatory:
+
+.. code-block:: yaml
+
+  apiVersion: apps/v1
+  kind: StatefulSet
+  metadata:
+    name: {{ include "common.fullname" . }}
+    namespace: {{ include "common.namespace" . }}
+    labels: {{- include "common.labels" . | nindent 4 }}
+  spec:
+    selector:
+      matchLabels: {{- include "common.matchLabels" . | nindent 6 }}
+    # serviceName is only needed for StatefulSet
+    # put the postfix part only if you have add a postfix on the service name
+    serviceName: {{ include "common.servicename" . }}-{{ .Values.service.postfix }}
+    <...>
+    template:
+      metadata:
+        labels: {{- include "common.labels" . | nindent 8 }}
+        annotations: {{- include "common.tplValue" (dict "value" .Values.podAnnotations "context" $) | nindent 8 }}
+        name: {{ include "common.name" . }}
+      spec:
+        <...>
+        containers:
+          - name: {{ include "common.name" . }}
+
+Dependency Management
+---------------------
+These Helm charts describe the desired state
+of an ONAP deployment and instruct the Kubernetes container manager as to how
+to maintain the deployment in this state.  These dependencies dictate the order
+in-which the containers are started for the first time such that such
+dependencies are always met without arbitrary sleep times between container
+startups.  For example, the SDC back-end container requires the Elastic-Search,
+Cassandra and Kibana containers within SDC to be ready and is also dependent on
+DMaaP (or the message-router) to be ready - where ready implies the built-in
+"readiness" probes succeeded - before becoming fully operational.  When an
+initial deployment of ONAP is requested the current state of the system is NULL
+so ONAP is deployed by the Kubernetes manager as a set of Docker containers on
+one or more predetermined hosts.  The hosts could be physical machines or
+virtual machines.  When deploying on virtual machines the resulting system will
+be very similar to "Heat" based deployments, i.e. Docker containers running
+within a set of VMs, the primary difference being that the allocation of
+containers to VMs is done dynamically with OOM and statically with "Heat".
+Example SO deployment descriptor file shows SO's dependency on its mariadb
+data-base component:
+
+SO deployment specification excerpt:
+
+.. code-block:: yaml
+
+  apiVersion: apps/v1
+  kind: Deployment
+  metadata:
+    name: {{ include "common.fullname" . }}
+    namespace: {{ include "common.namespace" . }}
+    labels: {{- include "common.labels" . | nindent 4 }}
+  spec:
+    replicas: {{ .Values.replicaCount }}
+    selector:
+      matchLabels: {{- include "common.matchLabels" . | nindent 6 }}
+    template:
+      metadata:
+        labels:
+          app: {{ include "common.name" . }}
+          release: {{ .Release.Name }}
+      spec:
+        initContainers:
+        - command:
+          - /app/ready.py
+          args:
+          - --container-name
+          - so-mariadb
+          env:
+  ...
\ No newline at end of file
diff --git a/docs/sections/guides/development_guides/oom_dev_container_orchestration.rst b/docs/sections/guides/development_guides/oom_dev_container_orchestration.rst
new file mode 100644 (file)
index 0000000..b137bff
--- /dev/null
@@ -0,0 +1,366 @@
+.. 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
+.. Modification copyright (C) 2022 Nordix Foundation
+
+.. Links
+.. _Kubernetes: https://Kubernetes.io/
+.. _AWS Elastic Block Store: https://aws.amazon.com/ebs/
+.. _Azure File: https://docs.microsoft.com/en-us/azure/storage/files/storage-files-introduction
+.. _GCE Persistent Disk: https://cloud.google.com/compute/docs/disks/
+.. _Gluster FS: https://www.gluster.org/
+.. _Kubernetes Storage Class: https://Kubernetes.io/docs/concepts/storage/storage-classes/
+.. _Assigning Pods to Nodes: https://Kubernetes.io/docs/concepts/configuration/assign-pod-node/
+
+
+.. _oom_dev_container_orch:
+
+Kubernetes Container Orchestration
+##################################
+
+The ONAP components are managed by the Kubernetes_ container management system
+which maintains the desired state of the container system as described by one
+or more deployment descriptors - similar in concept to OpenStack HEAT
+Orchestration Templates. The following sections describe the fundamental
+objects managed by Kubernetes, the network these components use to communicate
+with each other and other entities outside of ONAP and the templates that
+describe the configuration and desired state of the ONAP components.
+
+**Name Spaces**
+
+Within the namespaces are Kubernetes services that provide external
+connectivity to pods that host Docker containers.
+
+ONAP Components to Kubernetes Object Relationships
+--------------------------------------------------
+Kubernetes deployments consist of multiple objects:
+
+- **nodes** - a worker machine - either physical or virtual - that hosts
+  multiple containers managed by Kubernetes.
+- **services** - an abstraction of a logical set of pods that provide a
+  micro-service.
+- **pods** - one or more (but typically one) container(s) that provide specific
+  application functionality.
+- **persistent volumes** - One or more permanent volumes need to be established
+  to hold non-ephemeral configuration and state data.
+
+The relationship between these objects is shown in the following figure:
+
+.. .. uml::
+..
+..   @startuml
+..   node PH {
+..      component Service {
+..         component Pod0
+..         component Pod1
+..      }
+..   }
+..
+..   database PV
+..   @enduml
+
+.. figure:: ../../resources/images/k8s/kubernetes_objects.png
+
+OOM uses these Kubernetes objects as described in the following sections.
+
+Nodes
+~~~~~
+OOM works with both physical and virtual worker machines.
+
+* Virtual Machine Deployments - If ONAP is to be deployed onto a set of virtual
+  machines, the creation of the VMs is outside of the scope of OOM and could be
+  done in many ways, such as
+
+  * manually, for example by a user using the OpenStack Horizon dashboard or
+    AWS EC2, or
+  * automatically, for example with the use of a OpenStack Heat Orchestration
+    Template which builds an ONAP stack, Azure ARM template, AWS CloudFormation
+    Template, or
+  * orchestrated, for example with Cloudify creating the VMs from a TOSCA
+    template and controlling their life cycle for the life of the ONAP
+    deployment.
+
+* Physical Machine Deployments - If ONAP is to be deployed onto physical
+  machines there are several options but the recommendation is to use Rancher
+  along with Helm to associate hosts with a Kubernetes cluster.
+
+Pods
+~~~~
+A group of containers with shared storage and networking can be grouped
+together into a Kubernetes pod.  All of the containers within a pod are
+co-located and co-scheduled so they operate as a single unit.  Within ONAP
+Amsterdam release, pods are mapped one-to-one to docker containers although
+this may change in the future.  As explained in the Services section below the
+use of Pods within each ONAP component is abstracted from other ONAP
+components.
+
+Services
+~~~~~~~~
+OOM uses the Kubernetes service abstraction to provide a consistent access
+point for each of the ONAP components independent of the pod or container
+architecture of that component.  For example, the SDNC component may introduce
+OpenDaylight clustering as some point and change the number of pods in this
+component to three or more but this change will be isolated from the other ONAP
+components by the service abstraction.  A service can include a load balancer
+on its ingress to distribute traffic between the pods and even react to dynamic
+changes in the number of pods if they are part of a replica set.
+
+Persistent Volumes
+~~~~~~~~~~~~~~~~~~
+To enable ONAP to be deployed into a wide variety of cloud infrastructures a
+flexible persistent storage architecture, built on Kubernetes persistent
+volumes, provides the ability to define the physical storage in a central
+location and have all ONAP components securely store their data.
+
+When deploying ONAP into a public cloud, available storage services such as
+`AWS Elastic Block Store`_, `Azure File`_, or `GCE Persistent Disk`_ are
+options.  Alternatively, when deploying into a private cloud the storage
+architecture might consist of Fiber Channel, `Gluster FS`_, or iSCSI. Many
+other storage options existing, refer to the `Kubernetes Storage Class`_
+documentation for a full list of the options. The storage architecture may vary
+from deployment to deployment but in all cases a reliable, redundant storage
+system must be provided to ONAP with which the state information of all ONAP
+components will be securely stored. The Storage Class for a given deployment is
+a single parameter listed in the ONAP values.yaml file and therefore is easily
+customized. Operation of this storage system is outside the scope of the OOM.
+
+.. code-block:: yaml
+
+  Insert values.yaml code block with storage block here
+
+Once the storage class is selected and the physical storage is provided, the
+ONAP deployment step creates a pool of persistent volumes within the given
+physical storage that is used by all of the ONAP components. ONAP components
+simply make a claim on these persistent volumes (PV), with a persistent volume
+claim (PVC), to gain access to their storage.
+
+The following figure illustrates the relationships between the persistent
+volume claims, the persistent volumes, the storage class, and the physical
+storage.
+
+.. graphviz::
+
+   digraph PV {
+      label = "Persistance Volume Claim to Physical Storage Mapping"
+      {
+         node [shape=cylinder]
+         D0 [label="Drive0"]
+         D1 [label="Drive1"]
+         Dx [label="Drivex"]
+      }
+      {
+         node [shape=Mrecord label="StorageClass:ceph"]
+         sc
+      }
+      {
+         node [shape=point]
+         p0 p1 p2
+         p3 p4 p5
+      }
+      subgraph clusterSDC {
+         label="SDC"
+         PVC0
+         PVC1
+      }
+      subgraph clusterSDNC {
+         label="SDNC"
+         PVC2
+      }
+      subgraph clusterSO {
+         label="SO"
+         PVCn
+      }
+      PV0 -> sc
+      PV1 -> sc
+      PV2 -> sc
+      PVn -> sc
+
+      sc -> {D0 D1 Dx}
+      PVC0 -> PV0
+      PVC1 -> PV1
+      PVC2 -> PV2
+      PVCn -> PVn
+
+      # force all of these nodes to the same line in the given order
+      subgraph {
+         rank = same; PV0;PV1;PV2;PVn;p0;p1;p2
+         PV0->PV1->PV2->p0->p1->p2->PVn [style=invis]
+      }
+
+      subgraph {
+         rank = same; D0;D1;Dx;p3;p4;p5
+         D0->D1->p3->p4->p5->Dx [style=invis]
+      }
+
+   }
+
+In-order for an ONAP component to use a persistent volume it must make a claim
+against a specific persistent volume defined in the ONAP common charts.  Note
+that there is a one-to-one relationship between a PVC and PV.  The following is
+an excerpt from a component chart that defines a PVC:
+
+.. code-block:: yaml
+
+  Insert PVC example here
+
+OOM Networking with Kubernetes
+------------------------------
+
+- DNS
+- Ports - Flattening the containers also expose port conflicts between the
+  containers which need to be resolved.
+
+
+Pod Placement Rules
+-------------------
+OOM will use the rich set of Kubernetes node and pod affinity /
+anti-affinity rules to minimize the chance of a single failure resulting in a
+loss of ONAP service. Node affinity / anti-affinity is used to guide the
+Kubernetes orchestrator in the placement of pods on nodes (physical or virtual
+machines).  For example:
+
+- if a container used Intel DPDK technology the pod may state that it as
+  affinity to an Intel processor based node, or
+- geographical based node labels (such as the Kubernetes standard zone or
+  region labels) may be used to ensure placement of a DCAE complex close to the
+  VNFs generating high volumes of traffic thus minimizing networking cost.
+  Specifically, if nodes were pre-assigned labels East and West, the pod
+  deployment spec to distribute pods to these nodes would be:
+
+.. code-block:: yaml
+
+  nodeSelector:
+    failure-domain.beta.Kubernetes.io/region: {{ .Values.location }}
+
+- "location: West" is specified in the `values.yaml` file used to deploy
+  one DCAE cluster and  "location: East" is specified in a second `values.yaml`
+  file (see OOM Configuration Management for more information about
+  configuration files like the `values.yaml` file).
+
+Node affinity can also be used to achieve geographic redundancy if pods are
+assigned to multiple failure domains. For more information refer to `Assigning
+Pods to Nodes`_.
+
+.. note::
+   One could use Pod to Node assignment to totally constrain Kubernetes when
+   doing initial container assignment to replicate the Amsterdam release
+   OpenStack Heat based deployment. Should one wish to do this, each VM would
+   need a unique node name which would be used to specify a node constaint
+   for every component.  These assignment could be specified in an environment
+   specific values.yaml file. Constraining Kubernetes in this way is not
+   recommended.
+
+Kubernetes has a comprehensive system called Taints and Tolerations that can be
+used to force the container orchestrator to repel pods from nodes based on
+static events (an administrator assigning a taint to a node) or dynamic events
+(such as a node becoming unreachable or running out of disk space). There are
+no plans to use taints or tolerations in the ONAP Beijing release.  Pod
+affinity / anti-affinity is the concept of creating a spacial relationship
+between pods when the Kubernetes orchestrator does assignment (both initially
+an in operation) to nodes as explained in Inter-pod affinity and anti-affinity.
+For example, one might choose to co-located all of the ONAP SDC containers on a
+single node as they are not critical runtime components and co-location
+minimizes overhead. On the other hand, one might choose to ensure that all of
+the containers in an ODL cluster (SDNC and APPC) are placed on separate nodes
+such that a node failure has minimal impact to the operation of the cluster.
+An example of how pod affinity / anti-affinity is shown below:
+
+Pod Affinity / Anti-Affinity
+
+.. code-block:: yaml
+
+  apiVersion: v1
+  kind: Pod
+  metadata:
+    name: with-pod-affinity
+  spec:
+    affinity:
+      podAffinity:
+        requiredDuringSchedulingIgnoredDuringExecution:
+        - labelSelector:
+            matchExpressions:
+        - key: security
+          operator: In
+          values:
+          - S1
+          topologyKey: failure-domain.beta.Kubernetes.io/zone
+      podAntiAffinity:
+        preferredDuringSchedulingIgnoredDuringExecution:
+        - weight: 100
+          podAffinityTerm:
+            labelSelector:
+              matchExpressions:
+              - key: security
+                operator: In
+                values:
+                - S2
+            topologyKey: Kubernetes.io/hostname
+       containers:
+       - name: with-pod-affinity
+         image: gcr.io/google_containers/pause:2.0
+
+This example contains both podAffinity and podAntiAffinity rules, the first
+rule is is a must (requiredDuringSchedulingIgnoredDuringExecution) while the
+second will be met pending other considerations
+(preferredDuringSchedulingIgnoredDuringExecution).  Preemption Another feature
+that may assist in achieving a repeatable deployment in the presence of faults
+that may have reduced the capacity of the cloud is assigning priority to the
+containers such that mission critical components have the ability to evict less
+critical components.  Kubernetes provides this capability with Pod Priority and
+Preemption.  Prior to having more advanced production grade features available,
+the ability to at least be able to re-deploy ONAP (or a subset of) reliably
+provides a level of confidence that should an outage occur the system can be
+brought back on-line predictably.
+
+Health Checks
+-------------
+
+Monitoring of ONAP components is configured in the agents within JSON files and
+stored in gerrit under the consul-agent-config, here is an example from the AAI
+model loader (aai-model-loader-health.json):
+
+.. code-block:: json
+
+  {
+    "service": {
+      "name": "A&AI Model Loader",
+      "checks": [
+        {
+          "id": "model-loader-process",
+          "name": "Model Loader Presence",
+          "script": "/consul/config/scripts/model-loader-script.sh",
+          "interval": "15s",
+          "timeout": "1s"
+        }
+      ]
+    }
+  }
+
+Liveness Probes
+---------------
+
+These liveness probes can simply check that a port is available, that a
+built-in health check is reporting good health, or that the Consul health check
+is positive.  For example, to monitor the SDNC component has following liveness
+probe can be found in the SDNC DB deployment specification:
+
+.. code-block:: yaml
+
+  sdnc db liveness probe
+
+  livenessProbe:
+    exec:
+      command: ["mysqladmin", "ping"]
+      initialDelaySeconds: 30 periodSeconds: 10
+      timeoutSeconds: 5
+
+The 'initialDelaySeconds' control the period of time between the readiness
+probe succeeding and the liveness probe starting. 'periodSeconds' and
+'timeoutSeconds' control the actual operation of the probe.  Note that
+containers are inherently ephemeral so the healing action destroys failed
+containers and any state information within it.  To avoid a loss of state, a
+persistent volume should be used to store all data that needs to be persisted
+over the re-creation of a container.  Persistent volumes have been created for
+the database components of each of the projects and the same technique can be
+used for all persistent state information.
\ No newline at end of file
diff --git a/docs/sections/guides/development_guides/oom_dev_helm_chart_info.rst b/docs/sections/guides/development_guides/oom_dev_helm_chart_info.rst
new file mode 100644 (file)
index 0000000..533f60e
--- /dev/null
@@ -0,0 +1,172 @@
+.. 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
+.. Modification copyright (C) 2022 Nordix Foundation
+
+.. Links
+.. _Helm Charts: https://artifacthub.io/packages/search
+.. _aai: https://github.com/onap/oom/tree/master/kubernetes/aai
+.. _name.tpl: https://github.com/onap/oom/blob/master/kubernetes/common/common/templates/_name.tpl
+.. _namespace.tpl: https://github.com/onap/oom/blob/master/kubernetes/common/common/templates/_namespace.tpl
+
+.. _oom_helm_chart_info:
+
+Helm Charts
+###########
+
+A Helm chart is a collection of files that describe a related set of Kubernetes
+resources. A simple chart might be used to deploy something simple, like a
+memcached pod, while a complex chart might contain many micro-service arranged
+in a hierarchy as found in the `aai`_ ONAP component.
+
+Charts are created as files laid out in a particular directory tree, then they
+can be packaged into versioned archives to be deployed. There is a public
+archive of `Helm Charts`_ on ArtifactHUB that includes many technologies applicable
+to ONAP. Some of these charts have been used in ONAP and all of the ONAP charts
+have been created following the guidelines provided.
+
+An example structure of the OOM common helm charts is shown below:
+
+.. code-block:: bash
+
+  common
+  â”œâ”€â”€ cassandra
+  â”‚   â”œâ”€â”€ Chart.yaml
+  â”‚   â”œâ”€â”€ resources
+  â”‚   â”‚   â”œâ”€â”€ config
+  â”‚   â”‚   â”‚   â””── docker-entrypoint.sh
+  â”‚   â”‚   â”œâ”€â”€ exec.py
+  â”‚   â”‚   â””── restore.sh
+  â”‚   â”œâ”€â”€ templates
+  â”‚   â”‚   â”œâ”€â”€ backup
+  â”‚   â”‚   â”‚   â”œâ”€â”€ configmap.yaml
+  â”‚   â”‚   â”‚   â”œâ”€â”€ cronjob.yaml
+  â”‚   â”‚   â”‚   â”œâ”€â”€ pv.yaml
+  â”‚   â”‚   â”‚   â””── pvc.yaml
+  â”‚   â”‚   â”œâ”€â”€ configmap.yaml
+  â”‚   â”‚   â”œâ”€â”€ pv.yaml
+  â”‚   â”‚   â”œâ”€â”€ service.yaml
+  â”‚   â”‚   â””── statefulset.yaml
+  â”‚   â””── values.yaml
+  â”œâ”€â”€ common
+  â”‚   â”œâ”€â”€ Chart.yaml
+  â”‚   â”œâ”€â”€ templates
+  â”‚   â”‚   â”œâ”€â”€ _createPassword.tpl
+  â”‚   â”‚   â”œâ”€â”€ _ingress.tpl
+  â”‚   â”‚   â”œâ”€â”€ _labels.tpl
+  â”‚   â”‚   â”œâ”€â”€ _mariadb.tpl
+  â”‚   â”‚   â”œâ”€â”€ _name.tpl
+  â”‚   â”‚   â”œâ”€â”€ _namespace.tpl
+  â”‚   â”‚   â”œâ”€â”€ _repository.tpl
+  â”‚   â”‚   â”œâ”€â”€ _resources.tpl
+  â”‚   â”‚   â”œâ”€â”€ _secret.yaml
+  â”‚   â”‚   â”œâ”€â”€ _service.tpl
+  â”‚   â”‚   â”œâ”€â”€ _storage.tpl
+  â”‚   â”‚   â””── _tplValue.tpl
+  â”‚   â””── values.yaml
+  â”œâ”€â”€ ...
+  â””── postgres-legacy
+   Â Â  â”œâ”€â”€ Chart.yaml
+      â”œâ”€â”€ charts
+      â””── configs
+
+The common section of charts consists of a set of templates that assist with
+parameter substitution (`name.tpl`_, `namespace.tpl`_, etc) and a set of
+charts for components used throughout ONAP.  When the common components are used
+by other charts they are instantiated each time or we can deploy a shared
+instances for several components.
+
+All of the ONAP components have charts that follow the pattern shown below:
+
+.. code-block:: bash
+
+  name-of-my-component
+  â”œâ”€â”€ Chart.yaml
+  â”œâ”€â”€ component
+  â”‚   â””── subcomponent-folder
+  â”œâ”€â”€ charts
+  â”‚   â””── subchart-folder
+  â”œâ”€â”€ resources
+  â”‚   â”œâ”€â”€ folder1
+  â”‚   â”‚   â”œâ”€â”€ file1
+  â”‚   â”‚   â””── file2
+  â”‚   â””── folder1
+  â”‚       â”œâ”€â”€ file3
+  â”‚       â””── folder3
+  â”‚        Â Â  â””── file4
+  â”œâ”€â”€ templates
+  â”‚   â”œâ”€â”€ NOTES.txt
+  â”‚   â”œâ”€â”€ configmap.yaml
+  â”‚   â”œâ”€â”€ deployment.yaml
+  â”‚   â”œâ”€â”€ ingress.yaml
+  â”‚   â”œâ”€â”€ job.yaml
+  â”‚   â”œâ”€â”€ secrets.yaml
+  â”‚   â””── service.yaml
+  â””── values.yaml
+
+Note that the /components sub dir may include a hierarchy of sub
+components and in themselves can be quite complex.
+
+You can use either `charts` or `components` folder for your subcomponents.
+`charts` folder means that the subcomponent will always been deployed.
+
+`components` folders means we can choose if we want to deploy the subcomponent.
+
+This choice is done in root `values.yaml`:
+
+.. code-block:: yaml
+
+  ---
+  global:
+    key: value
+
+  component1:
+    enabled: true
+  component2:
+    enabled: true
+
+Then in `Chart.yaml` dependencies section, you'll use these values:
+
+.. code-block:: yaml
+
+  ---
+  dependencies:
+    - name: common
+      version: ~x.y-0
+      repository: '@local'
+    - name: component1
+      version: ~x.y-0
+      repository: 'file://components/component1'
+      condition: component1.enabled
+    - name: component2
+      version: ~x.y-0
+      repository: 'file://components/component2'
+      condition: component2.enabled
+
+Configuration of the components varies somewhat from component to component but
+generally follows the pattern of one or more `configmap.yaml` files which can
+directly provide configuration to the containers in addition to processing
+configuration files stored in the `config` directory.  It is the responsibility
+of each ONAP component team to update these configuration files when changes
+are made to the project containers that impact configuration.
+
+The following section describes how the hierarchical ONAP configuration system
+is key to management of such a large system.
+
+
+.. MISC
+.. ====
+.. Note that although OOM uses Kubernetes facilities to minimize the effort
+.. required of the ONAP component owners to implement a successful rolling
+.. upgrade strategy there are other considerations that must be taken into
+.. consideration.
+.. For example, external APIs - both internal and external to ONAP - should be
+.. designed to gracefully accept transactions from a peer at a different
+.. software version to avoid deadlock situations. Embedded version codes in
+.. messages may facilitate such capabilities.
+..
+.. Within each of the projects a new configuration repository contains all of
+.. the project specific configuration artifacts.  As changes are made within
+.. the project, it's the responsibility of the project team to make appropriate
+.. changes to the configuration data.
diff --git a/docs/sections/guides/development_guides/oom_development.rst b/docs/sections/guides/development_guides/oom_development.rst
new file mode 100644 (file)
index 0000000..169e211
--- /dev/null
@@ -0,0 +1,64 @@
+.. This work is licensed under a Creative Commons Attribution 4.0
+.. International License.
+.. http://creativecommons.org/licenses/by/4.0
+.. Copyright (C) 2022 Nordix Foundation
+
+.. Links
+.. _Helm: https://docs.helm.sh/
+.. _Helm Charts: https://github.com/kubernetes/charts
+.. _Kubernetes: https://Kubernetes.io/
+.. _Docker: https://www.docker.com/
+.. _Nexus: https://nexus.onap.org/
+
+.. _oom_dev_guide:
+
+OOM Developer Guide
+###################
+
+.. figure:: ../../resources/images/oom_logo/oomLogoV2-medium.png
+   :align: right
+
+ONAP consists of a large number of components, each of which are substantial
+projects within themselves, which results in a high degree of complexity in
+deployment and management. To cope with this complexity the ONAP Operations
+Manager (OOM) uses a Helm_ model of ONAP - Helm being the primary management
+system for Kubernetes_ container systems - to drive all user driven life-cycle
+management operations. The Helm model of ONAP is composed of a set of
+hierarchical Helm charts that define the structure of the ONAP components and
+the configuration of these components.  These charts are fully parameterized
+such that a single environment file defines all of the parameters needed to
+deploy ONAP.  A user of ONAP may maintain several such environment files to
+control the deployment of ONAP in multiple environments such as development,
+pre-production, and production.
+
+
+
+.. rubric:: Container Background
+
+Linux containers allow for an application and all of its operating system
+dependencies to be packaged and deployed as a single unit without including a
+guest operating system as done with virtual machines. The most popular
+container solution is Docker_ which provides tools for container management
+like the Docker Host (dockerd) which can create, run, stop, move, or delete a
+container. Docker has a very popular registry of containers images that can be
+used by any Docker system; however, in the ONAP context, Docker images are
+built by the standard CI/CD flow and stored in Nexus_ repositories. OOM uses
+the "standard" ONAP docker containers and three new ones specifically created
+for OOM.
+
+Containers are isolated from each other primarily via name spaces within the
+Linux kernel without the need for multiple guest operating systems. As such,
+multiple containers can be deployed with little overhead such as all of ONAP
+can be deployed on a single host. With some optimization of the ONAP components
+(e.g. elimination of redundant database instances) it may be possible to deploy
+ONAP on a single laptop computer.
+
+The following sections describe how the ONAP Helm charts are constructed.
+
+.. toctree::
+  :maxdepth: 1
+
+  oom_dev_helm_chart_info.rst
+  oom_dev_config_management.rst
+  oom_dev_container_orchestration.rst
+
diff --git a/docs/sections/guides/infra_guides/oom_base_config_setup.rst b/docs/sections/guides/infra_guides/oom_base_config_setup.rst
new file mode 100644 (file)
index 0000000..d228f5d
--- /dev/null
@@ -0,0 +1,187 @@
+.. This work is licensed under a Creative Commons Attribution 4.0
+.. International License.
+.. http://creativecommons.org/licenses/by/4.0
+.. Copyright (C) 2022 Nordix Foundation
+
+.. Links
+.. _HELM Best Practices Guide: https://docs.helm.sh/chart_best_practices/#requirements
+.. _helm installation guide: https://helm.sh/docs/intro/install/
+.. _kubectl installation guide: https://kubernetes.io/docs/tasks/tools/install-kubectl-linux/
+.. _Curated applications for Kubernetes: https://github.com/kubernetes/charts
+.. _Cert-Manager Installation documentation: https://cert-manager.io/docs/installation/kubernetes/
+.. _Cert-Manager kubectl plugin documentation: https://cert-manager.io/docs/usage/kubectl-plugin/
+.. _Strimzi Apache Kafka Operator helm Installation documentation: https://strimzi.io/docs/operators/in-development/deploying.html#deploying-cluster-operator-helm-chart-str
+
+.. _oom_base_setup_guide:
+
+OOM Base Platform
+#################
+
+As part of the initial base setup of the host Kubernetes cluster,
+the following mandatory installation and configuration steps must be completed.
+
+.. contents::
+   :backlinks: top
+   :depth: 1
+   :local:
+..
+
+For additional platform add-ons, see the :ref:`oom_base_optional_addons` section.
+
+Install & configure kubectl
+***************************
+The Kubernetes command line interface used to manage a Kubernetes cluster needs to be installed
+and configured to run as non root.
+
+For additional information regarding kubectl installation and configuration see the `kubectl installation guide`_
+
+To install kubectl, execute the following, replacing the <recommended-kubectl-version> with the version defined
+in the :ref:`versions_table` table::
+
+    > curl -LO https://dl.k8s.io/release/v<recommended-kubectl-version>/bin/linux/amd64/kubectl
+
+    > chmod +x ./kubectl
+
+    > sudo mv ./kubectl /usr/local/bin/kubectl
+
+    > mkdir ~/.kube
+
+    > cp kube_config_cluster.yml ~/.kube/config.onap
+
+    > export KUBECONFIG=~/.kube/config.onap
+
+    > kubectl config use-context onap
+
+Validate the installation::
+
+    > kubectl get nodes
+
+::
+
+  NAME             STATUS   ROLES               AGE     VERSION
+  onap-control-1   Ready    controlplane,etcd   3h53m   v1.23.8
+  onap-control-2   Ready    controlplane,etcd   3h53m   v1.23.8
+  onap-k8s-1       Ready    worker              3h53m   v1.23.8
+  onap-k8s-2       Ready    worker              3h53m   v1.23.8
+  onap-k8s-3       Ready    worker              3h53m   v1.23.8
+  onap-k8s-4       Ready    worker              3h53m   v1.23.8
+  onap-k8s-5       Ready    worker              3h53m   v1.23.8
+  onap-k8s-6       Ready    worker              3h53m   v1.23.8
+
+
+Install & configure helm
+************************
+Helm is used for package and configuration management of the relevant helm charts.
+For additional information, see the `helm installation guide`_
+
+To install helm, execute the following, replacing the <recommended-helm-version> with the version defined
+in the :ref:`versions_table` table::
+
+    > wget https://get.helm.sh/helm-v<recommended-helm-version>-linux-amd64.tar.gz
+
+    > tar -zxvf helm-v<recommended-helm-version>-linux-amd64.tar.gz
+
+    > sudo mv linux-amd64/helm /usr/local/bin/helm
+
+Verify the helm version with::
+
+    > helm version
+
+Helm's default CNCF provided `Curated applications for Kubernetes`_ repository called
+*stable* can be removed to avoid confusion::
+
+    > helm repo remove stable
+
+Install the additional OOM plugins required to un/deploy the OOM helm charts::
+
+    > git clone http://gerrit.onap.org/r/oom
+
+    > cp -R ~/oom/kubernetes/helm/plugins/ /usr/local/bin/helm/plugins
+
+Verify the plugins are installed::
+
+    > helm plugin ls
+
+::
+
+    NAME        VERSION   DESCRIPTION
+    deploy      1.0.0     install (upgrade if release exists) parent charty and all subcharts as separate but related releases
+    undeploy    1.0.0     delete parent chart and subcharts that were deployed as separate releases
+
+
+Install the strimzi kafka operator
+**********************************
+Strimzi Apache Kafka provides a way to run an Apache Kafka cluster on Kubernetes
+in various deployment configurations by using kubernetes operators.
+Operators are a method of packaging, deploying, and managing Kubernetes applications.
+
+Strimzi Operators extend the Kubernetes functionality, automating common
+and complex tasks related to a Kafka deployment. By implementing
+knowledge of Kafka operations in code, the Kafka administration
+tasks are simplified and require less manual intervention.
+
+The Strimzi cluster operator is deployed using helm to install the parent chart
+containing all of the required custom resource definitions. This should be done
+by a kubernetes administrator to allow for deployment of custom resources in to
+any kubernetes namespace within the cluster.
+
+Full installation instructions can be found in the
+`Strimzi Apache Kafka Operator helm Installation documentation`_.
+
+To add the required helm repository, execute the following::
+
+    > helm repo add strimzi https://strimzi.io/charts/
+
+To install the strimzi kafka operator, execute the following, replacing the <recommended-strimzi-version> with the version defined
+in the :ref:`versions_table` table::
+
+    > helm install strimzi-kafka-operator strimzi/strimzi-kafka-operator --namespace strimzi-system --version <recommended-strimzi-version> --set watchAnyNamespace=true --create-namespace
+
+Verify the installation::
+
+    > kubectl get po -n strimzi-system
+
+::
+
+    NAME                                        READY   STATUS    RESTARTS       AGE
+    strimzi-cluster-operator-7f7d6b46cf-mnpjr   1/1     Running   0              2m
+
+
+Install Cert-Manager
+********************
+
+Cert-Manager is a native Kubernetes certificate management controller.
+It can help with issuing certificates from a variety of sources, such as
+Let’s Encrypt, HashiCorp Vault, Venafi, a simple signing key pair, self
+signed or external issuers. It ensures certificates are valid and up to
+date, and attempt to renew certificates at a configured time before expiry.
+
+Cert-Manager is deployed using regular YAML manifests which include all
+the needed resources (the CustomResourceDefinitions, cert-manager,
+namespace, and the webhook component).
+
+Full installation instructions, including details on how to configure extra
+functionality in Cert-Manager can be found in the
+`Cert-Manager Installation documentation`_.
+
+There is also a kubectl plugin (kubectl cert-manager) that can help you
+to manage cert-manager resources inside your cluster. For installation
+steps, please refer to `Cert-Manager kubectl plugin documentation`_.
+
+
+To install cert-manager, execute the following, replacing the <recommended-cm-version> with the version defined
+in the :ref:`versions_table` table::
+
+    > kubectl apply -f https://github.com/jetstack/cert-manager/releases/download/v<recommended-cm-version>/cert-manager.yaml
+
+Verify the installation::
+
+    > kubectl get po -n cert-manager
+
+::
+
+    NAME                                       READY   STATUS    RESTARTS      AGE
+    cert-manager-776c4cfcb6-vgnpw              1/1     Running   0             2m
+    cert-manager-cainjector-7d9668978d-hdxf7   1/1     Running   0             2m
+    cert-manager-webhook-66c8f6c75-dxmtz       1/1     Running   0             2m
+
diff --git a/docs/sections/guides/infra_guides/oom_base_optional_addons.rst b/docs/sections/guides/infra_guides/oom_base_optional_addons.rst
new file mode 100644 (file)
index 0000000..5f81a36
--- /dev/null
@@ -0,0 +1,182 @@
+.. This work is licensed under a Creative Commons Attribution 4.0
+.. International License.
+.. http://creativecommons.org/licenses/by/4.0
+.. Copyright (C) 2022 Nordix Foundation
+
+.. Links
+.. _Prometheus stack README: https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus-stack#readme
+.. _ONAP Next Generation Security & Logging Structure: https://wiki.onap.org/pages/viewpage.action?pageId=103417456
+.. _Istio best practices: https://docs.solo.io/gloo-mesh-enterprise/latest/setup/prod/namespaces/
+.. _Istio setup guide: https://istio.io/latest/docs/setup/install/helm/
+.. _Kiali setup guide: https://kiali.io/docs/installation/installation-guide/example-install/
+
+.. _oom_base_optional_addons:
+
+OOM Optional Addons
+###################
+
+The following optional applications can be added to your kubernetes environment.
+
+Install Prometheus Stack
+************************
+
+Prometheus is an open-source systems monitoring and alerting toolkit with
+an active ecosystem.
+
+Kube Prometheus Stack is a collection of Kubernetes manifests, Grafana
+dashboards, and Prometheus rules combined with documentation and scripts to
+provide easy to operate end-to-end Kubernetes cluster monitoring with
+Prometheus using the Prometheus Operator. As it includes both Prometheus
+Operator and Grafana dashboards, there is no need to set up them separately.
+See the `Prometheus stack README`_ for more information.
+
+To install the prometheus stack, execute the following:
+
+- Add the prometheus-community Helm repository::
+
+    > helm repo add prometheus-community https://prometheus-community.github.io/helm-charts
+
+- Update your local Helm chart repository cache::
+
+    > helm repo update
+
+- To install prometheus, execute the following, replacing the <recommended-pm-version> with the version defined in the :ref:`versions_table` table::
+
+    > helm install prometheus prometheus-community/kube-prometheus-stack --namespace=prometheus --create-namespace --version=<recommended-pm-version>
+
+ONAP on Service Mesh
+********************
+
+.. warning::
+    "ONAP on Service Mesh" is not fully supported in "Kohn". Full support is
+    planned for London release to support the
+    `ONAP Next Generation Security & Logging Structure`_
+
+.. figure:: ../../resources/images/servicemesh/ServiceMesh.png
+   :align: center
+
+ONAP is currenty planned to support Istio as default ServiceMesh platform.
+Therefor the following instructions describe the setup of Istio and required tools.
+Used `Istio best practices`_ and `Istio setup guide`_
+
+Istio Platform Installation
+===========================
+
+Install Istio Basic Platform
+----------------------------
+
+- Configure the Helm repository::
+
+    > helm repo add istio https://istio-release.storage.googleapis.com/charts
+
+    > helm repo update
+
+- Create a namespace for "mesh-level" configurations::
+
+    > kubectl create namespace istio-config
+
+- Create a namespace istio-system for Istio components::
+
+    > kubectl create namespace istio-system
+
+- Install the Istio Base chart which contains cluster-wide resources used by the
+  Istio control plane, replacing the <recommended-istio-version> with the version
+  defined in the :ref:`versions_table` table::
+
+    > helm upgrade -i istio-base istio/base -n istio-system --version <recommended-istio-version>
+
+- Install the Istio Base Istio Discovery chart which deploys the istiod service, replacing the
+  <recommended-istio-version> with the version defined in the :ref:`versions_table` table
+  (enable the variable to enforce the (sidecar) proxy startup before the container start)::
+
+    > helm upgrade -i istiod istio/istiod -n istio-system --version <recommended-istio-version>
+    --wait --set global.proxy.holdApplicationUntilProxyStarts=true --set meshConfig.rootNamespace=istio-config
+
+Add an EnvoyFilter for HTTP header case
+---------------------------------------
+
+When handling HTTP/1.1, Envoy will normalize the header keys to be all lowercase.
+While this is compliant with the HTTP/1.1 spec, in practice this can result in issues
+when migrating existing systems that might rely on specific header casing.
+In our case a problem was detected in the SDC client implementation, which relies on
+uppercase header values. To solve this problem in general we add a EnvoyFilter to keep
+the uppercase header in the istio-config namespace to apply for all namespaces, but
+set the context to SIDECAR_INBOUND to avoid problems in the connection between Istio-Gateway and Services
+
+- Create a EnvoyFilter file (e.g. envoyfilter-case.yaml)
+
+    .. collapse:: envoyfilter-case.yaml
+
+      .. include:: ../../resources/yaml/envoyfilter-case.yaml
+         :code: yaml
+
+- Apply the change to Istio::
+
+    > kubectl apply -f envoyfilter-case.yaml
+
+Install Istio Gateway
+---------------------
+
+- Create a namespace istio-ingress for the Istio Ingress gateway
+  and enable istio-injection::
+
+    > kubectl create namespace istio-ingress
+
+    > kubectl label namespace istio-ingress istio-injection=enabled
+
+- Install the Istio Gateway chart,replacing the
+  <recommended-istio-version> with the version defined in
+  the :ref:`versions_table` table::
+
+    > helm upgrade -i istio-ingressgateway istio/gateway -n istio-ingress
+    --version <recommended-istio-version> --wait
+
+Kiali Installation
+==================
+
+Kiali is used to visualize the Network traffic in a ServiceMesh enabled cluster
+For setup the kiali operator is used, see `Kiali setup guide`_
+
+- Install kiali-operator namespace::
+
+    > kubectl create namespace kiali-operator
+
+    > kubectl label namespace kiali-operator istio-injection=enabled
+
+- Install the kiali-operator::
+
+    > helm repo add kiali https://kiali.org/helm-charts
+
+    > helm repo update kiali
+
+    > helm install --namespace kiali-operator kiali/kiali-operator
+
+- Create Kiali CR file (e.g. kiali.yaml)
+
+    .. collapse:: kiali.yaml
+
+      .. include:: ../../resources/yaml/kiali.yaml
+         :code: yaml
+
+- Install kiali::
+
+    > kubectl apply -f kiali.yaml
+
+- Create Ingress gateway entry for the kiali web interface
+  using the configured Ingress <base-url> (here "simpledemo.onap.org")
+  as described in :ref:`oom_customize_overrides`
+
+    .. collapse:: kiali-ingress.yaml
+
+      .. include:: ../../resources/yaml/kiali-ingress.yaml
+         :code: yaml
+
+- Add the Ingress entry for Kiali::
+
+    > kubectl -n istio-system apply -f kiali-ingress.yaml
+
+
+Jaeger Installation
+===================
+
+To be done...
\ No newline at end of file
diff --git a/docs/sections/guides/infra_guides/oom_infra_setup.rst b/docs/sections/guides/infra_guides/oom_infra_setup.rst
new file mode 100644 (file)
index 0000000..ed7b05a
--- /dev/null
@@ -0,0 +1,81 @@
+.. This work is licensed under a Creative Commons Attribution 4.0
+.. International License.
+.. http://creativecommons.org/licenses/by/4.0
+.. Copyright (C) 2022 Nordix Foundation
+
+.. Links
+.. _Kubernetes: https://kubernetes.io/
+.. _Kubernetes best practices: https://kubernetes.io/docs/setup/best-practices/cluster-large/
+.. _kubelet confg guide: https://kubernetes.io/docs/reference/command-line-tools-reference/kubelet/
+
+.. _oom_infra_setup_guide:
+
+OOM Infrastructure Guide
+########################
+
+.. figure:: ../../resources/images/oom_logo/oomLogoV2-medium.png
+   :align: right
+
+OOM deploys and manages ONAP on a pre-established Kubernetes_ cluster - the
+creation of this cluster is outside of the scope of the OOM project as there
+are many options including public clouds with pre-established environments.
+If creation of a Kubernetes cluster is required, the life-cycle of this
+cluster is independent of the life-cycle of the ONAP components themselves.
+
+.. rubric::  Minimum Hardware Configuration
+
+Some recommended hardware requirements are provided below. Note that this is for a
+full ONAP deployment (all components).
+
+.. table:: OOM Hardware Requirements
+
+  =====  =====  ======  ====================
+  RAM    HD     vCores  Ports
+  =====  =====  ======  ====================
+  224GB  160GB  112     0.0.0.0/0 (all open)
+  =====  =====  ======  ====================
+
+Customizing ONAP to deploy only components that are needed will drastically reduce these requirements.
+See the :ref:`OOM customized deployment<oom_customize_overrides>` section for more details.
+
+.. note::
+    | Kubernetes supports a maximum of 110 pods per node - this can be overcome by modifying your kubelet config.
+    | See the `kubelet confg guide`_ for more information.
+
+    | The use of many small nodes is preferred over a few larger nodes (for example 14 x 16GB - 8 vCores each).
+
+    | OOM can be deployed on a private set of physical hosts or VMs (or even a combination of the two).
+
+.. rubric:: Software Requirements
+
+The versions of software that are supported by OOM are as follows:
+
+.. _versions_table:
+
+.. table:: OOM Software Requirements (base)
+
+  ==============     ===========  =======  ========  ========  ============  =======
+  Release            Kubernetes   Helm     kubectl   Docker    Cert-Manager  Strimzi
+  ==============     ===========  =======  ========  ========  ============  =======
+  Jakarta            1.22.4       3.6.3    1.22.4    20.10.x   1.8.0         0.28.0
+  Kohn               1.23.8       3.8.2    1.23.8    20.10.x   1.8.0         0.32.0
+  ==============     ===========  =======  ========  ========  ============  =======
+
+.. table:: OOM Software Requirements (optional)
+
+  ==============     =================  ======
+  Release            Prometheus Stack   Istio
+  ==============     =================  ======
+  Jakarta            35.x               ---
+  Kohn               35.x               1.15.1
+  ==============     =================  ======
+
+
+.. toctree::
+  :hidden:
+
+  oom_base_config_setup.rst
+  oom_base_optional_addons.rst
+  oom_setup_ingress_controller.rst
+
+
@@ -2,31 +2,26 @@
 .. International License.
 .. http://creativecommons.org/licenses/by/4.0
 .. Copyright 2020, Samsung Electronics
+.. Modification copyright (C) 2022 Nordix Foundation
 
 .. Links
-.. _HELM Best Practices Guide: https://docs.helm.sh/chart_best_practices/#requirements
-.. _kubectl Cheat Sheet: https://kubernetes.io/docs/reference/kubectl/cheatsheet/
-.. _Kubernetes documentation for emptyDir: https://kubernetes.io/docs/concepts/storage/volumes/#emptydir
 .. _metallb Metal Load Balancer installation: https://metallb.universe.tf/installation/
-.. _http://cd.onap.info:30223/mso/logging/debug: http://cd.onap.info:30223/mso/logging/debug
-.. _Onboarding and Distributing a Vendor Software Product: https://wiki.onap.org/pages/viewpage.action?pageId=1018474
-.. _README.md: https://gerrit.onap.org/r/gitweb?p=oom.git;a=blob;f=kubernetes/README.md
-
-.. figure:: images/oom_logo/oomLogoV2-medium.png
-   :align: right
 
 .. _oom_setup_ingress_controller:
 
+OOM Ingress controller setup
+############################
 
-Ingress controller setup on HA Kubernetes Cluster
-#################################################
+.. warning::
+    This guide should prob go in the Optional addons section
 
-This guide provides instruction how to setup experimental ingress controller
+This optional guide provides instruction how to setup experimental ingress controller
 feature. For this, we are hosting our cluster on OpenStack VMs and using the
 Rancher Kubernetes Engine (RKE) to deploy and manage our Kubernetes Cluster and
 ingress controller
 
 .. contents::
+   :backlinks: top
    :depth: 1
    :local:
 ..
@@ -47,7 +42,7 @@ The result at the end of this tutorial will be:
    controller
 
 Customize cluster.yml file
-==========================
+**************************
 Before setup cluster for ingress purposes DNS cluster IP and ingress provider
 should be configured and following:
 
@@ -91,7 +86,7 @@ is internal node IP address if it is required.
 
 
 DNS server configuration and installation
-=========================================
+*****************************************
 DNS server deployed on the Kubernetes cluster makes it easy to use services
 exposed through ingress controller because it resolves all subdomain related to
 the ONAP cluster to the load balancer IP. Testing ONAP cluster requires a lot
@@ -125,7 +120,7 @@ Example output depends on the IP address and example output looks like bellow::
 
 
 MetalLB Load Balancer installation and configuration
-====================================================
+****************************************************
 
 By default pure Kubernetes cluster requires external load balancer if we want
 to expose external port using LoadBalancer settings. For this purpose MetalLB
@@ -139,10 +134,10 @@ MetalLB Load balancer can be easily installed using automatic install script::
   > ./install-metallb-on-cluster.sh
 
 
-Configuration Nginx ingress controller
-======================================
+Configuration of the Nginx ingress controller
+*********************************************
 
-After installation DNS server and ingress controller we can install and
+After installation of the DNS server and ingress controller, we can install and
 configure ingress controller.
 It can be done using the following commands::
 
@@ -152,8 +147,8 @@ It can be done using the following commands::
 
   > kubectl apply -f nginx_ingress_enable_optional_load_balacer_service.yaml
 
-After deploy NGINX ingress controller you can ensure that the ingress port is
-exposed as load balancer service with external IP address::
+After deploying the NGINX ingress controller, you can ensure that the ingress port is
+exposed as load balancer service with an external IP address::
 
   > kubectl get svc -n ingress-nginx
   NAME                   TYPE           CLUSTER-IP      EXTERNAL-IP      PORT(S)                      AGE
@@ -162,9 +157,9 @@ exposed as load balancer service with external IP address::
 
 
 ONAP with ingress exposed services
-==================================
+**********************************
 If you want to deploy onap with services exposed through ingress controller you
-can use full onap deploy script::
+can use full onap deploy yaml::
 
   > onap/resources/overrides/onap-all-ingress-nginx-vhost.yaml
 
diff --git a/docs/sections/guides/user_guides/oom_user_guide.rst b/docs/sections/guides/user_guides/oom_user_guide.rst
new file mode 100644 (file)
index 0000000..449d5de
--- /dev/null
@@ -0,0 +1,569 @@
+.. This work is licensed under a Creative Commons Attribution 4.0
+.. International License.
+.. http://creativecommons.org/licenses/by/4.0
+.. Copyright (C) 2022 Nordix Foundation
+
+.. Links
+.. _Curated applications for Kubernetes: https://github.com/kubernetes/charts
+.. _Services: https://kubernetes.io/docs/concepts/services-networking/service/
+.. _ReplicaSet: https://kubernetes.io/docs/concepts/workloads/controllers/replicaset/
+.. _StatefulSet: https://kubernetes.io/docs/concepts/workloads/controllers/statefulset/
+.. _Helm Documentation: https://docs.helm.sh/helm/
+.. _Helm: https://docs.helm.sh/
+.. _Kubernetes: https://Kubernetes.io/
+.. _Kubernetes LoadBalancer: https://kubernetes.io/docs/concepts/services-networking/service/#loadbalancer
+.. _user-guide-label:
+
+
+.. _oom_user_guide:
+
+
+OOM User Guide
+##############
+
+.. warning::
+
+    **THIS PAGE NEEDS TO BE EITHER REWRITTEN OR SOMETING AS SOME INFO IS NO LONGER RELEVANT**
+
+The ONAP Operations Manager (OOM) provide the ability to manage the entire
+life-cycle of an ONAP installation, from the initial deployment to final
+decommissioning. This guide provides instructions for users of ONAP to
+use the Kubernetes_/Helm_ system as a complete ONAP management system.
+
+This guide provides many examples of Helm command line operations.  For a
+complete description of these commands please refer to the `Helm
+Documentation`_.
+
+.. figure:: ../../resources/images/oom_logo/oomLogoV2-medium.png
+   :align: right
+
+The following sections describe the life-cycle operations:
+
+- Deploy_ - with built-in component dependency management
+- Configure_ - unified configuration across all ONAP components
+- Monitor_ - real-time health monitoring feeding to a Consul UI and Kubernetes
+- Heal_- failed ONAP containers are recreated automatically
+- Scale_ - cluster ONAP services to enable seamless scaling
+- Upgrade_ - change-out containers or configuration with little or no service impact
+- Delete_ - cleanup individual containers or entire deployments
+
+.. figure:: ../../resources/images/oom_logo/oomLogoV2-Deploy.png
+   :align: right
+
+Deploy
+======
+
+The OOM team with assistance from the ONAP project teams, have built a
+comprehensive set of Helm charts, yaml files very similar to TOSCA files, that
+describe the composition of each of the ONAP components and the relationship
+within and between components. Using this model Helm is able to deploy all of
+ONAP with a few simple commands.
+
+Please refer to the :ref:`oom_deploy_guide` for deployment pre-requisites and options
+
+.. note::
+  Refer to the :ref:`oom_customize_overrides` section on how to update overrides.yaml and values.yaml
+
+.. figure:: ../../resources/images/oom_logo/oomLogoV2-Configure.png
+   :align: right
+
+Configure
+=========
+
+Each project within ONAP has its own configuration data generally consisting
+of: environment variables, configuration files, and database initial values.
+Many technologies are used across the projects resulting in significant
+operational complexity and an inability to apply global parameters across the
+entire ONAP deployment. OOM solves this problem by introducing a common
+configuration technology, Helm charts, that provide a hierarchical
+configuration with the ability to override values with higher
+level charts or command line options.
+
+The structure of the configuration of ONAP is shown in the following diagram.
+Note that key/value pairs of a parent will always take precedence over those
+of a child. Also note that values set on the command line have the highest
+precedence of all.
+
+.. graphviz::
+
+   digraph config {
+      {
+         node     [shape=folder]
+         oValues  [label="values.yaml"]
+         demo     [label="onap-demo.yaml"]
+         prod     [label="onap-production.yaml"]
+         oReq     [label="Chart.yaml"]
+         soValues [label="values.yaml"]
+         soReq    [label="Chart.yaml"]
+         mdValues [label="values.yaml"]
+      }
+      {
+         oResources  [label="resources"]
+      }
+      onap -> oResources
+      onap -> oValues
+      oResources -> environments
+      oResources -> oReq
+      oReq -> so
+      environments -> demo
+      environments -> prod
+      so -> soValues
+      so -> soReq
+      so -> charts
+      charts -> mariadb
+      mariadb -> mdValues
+
+   }
+
+The top level onap/values.yaml file contains the values required to be set
+before deploying ONAP.  Here is the contents of this file:
+
+.. collapse:: Default ONAP values.yaml
+
+    .. include:: ../../../../kubernetes/onap/values.yaml
+       :code: yaml
+
+|
+
+
+One may wish to create a value file that is specific to a given deployment such
+that it can be differentiated from other deployments.  For example, a
+onap-development.yaml file may create a minimal environment for development
+while onap-production.yaml might describe a production deployment that operates
+independently of the developer version.
+
+For example, if the production OpenStack instance was different from a
+developer's instance, the onap-production.yaml file may contain a different
+value for the vnfDeployment/openstack/oam_network_cidr key as shown below.
+
+.. code-block:: yaml
+
+  nsPrefix: onap
+  nodePortPrefix: 302
+  apps: consul msb mso message-router sdnc vid robot portal policy appc aai
+  sdc dcaegen2 log cli multicloud clamp vnfsdk aaf kube2msb
+  dataRootDir: /dockerdata-nfs
+
+  # docker repositories
+  repository:
+    onap: nexus3.onap.org:10001
+    oom: oomk8s
+    aai: aaionap
+    filebeat: docker.elastic.co
+
+  image:
+    pullPolicy: Never
+
+  # vnf deployment environment
+  vnfDeployment:
+    openstack:
+      ubuntu_14_image: "Ubuntu_14.04.5_LTS"
+      public_net_id: "e8f51956-00dd-4425-af36-045716781ffc"
+      oam_network_id: "d4769dfb-c9e4-4f72-b3d6-1d18f4ac4ee6"
+      oam_subnet_id: "191f7580-acf6-4c2b-8ec0-ba7d99b3bc4e"
+      oam_network_cidr: "192.168.30.0/24"
+  <...>
+
+
+To deploy ONAP with this environment file, enter::
+
+  > helm deploy local/onap -n onap -f onap/resources/environments/onap-production.yaml --set global.masterPassword=password
+
+
+.. collapse:: Default ONAP values.yaml
+
+    .. include:: ../../resources/yaml/environments_onap_demo.yaml
+       :code: yaml
+
+|
+
+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
+
+  dependencies:
+  <...>
+    - name: so
+      version: ~11.0.0
+      repository: '@local'
+      condition: so.enabled
+  <...>
+
+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 10.0.1 will be installed
+in this case.
+
+The onap/resources/environment/dev.yaml (see the excerpt below) enables
+for fine grained control on what components are included as part of this
+deployment. By changing this `so` line to `enabled: false` the `so` component
+will not be deployed.  If this change is part of an upgrade the existing `so`
+component will be shut down. Other `so` parameters and even `so` child values
+can be modified, for example the `so`'s `liveness` probe could be disabled
+(which is not recommended as this change would disable auto-healing of `so`).
+
+.. code-block:: yaml
+
+  #################################################################
+  # Global configuration overrides.
+  #
+  # These overrides will affect all helm charts (ie. applications)
+  # that are listed below and are 'enabled'.
+  #################################################################
+  global:
+  <...>
+
+  #################################################################
+  # Enable/disable and configure helm charts (ie. applications)
+  # to customize the ONAP deployment.
+  #################################################################
+  aaf:
+    enabled: false
+  <...>
+  so: # Service Orchestrator
+    enabled: true
+
+    replicaCount: 1
+
+    liveness:
+      # necessary to disable liveness probe when setting breakpoints
+      # in debugger so K8s doesn't restart unresponsive container
+      enabled: true
+
+  <...>
+
+
+.. figure:: ../../resources/images/oom_logo/oomLogoV2-Monitor.png
+   :align: right
+
+Monitor
+=======
+
+All highly available systems include at least one facility to monitor the
+health of components within the system.  Such health monitors are often used as
+inputs to distributed coordination systems (such as etcd, Zookeeper, or Consul)
+and monitoring systems (such as Nagios or Zabbix). OOM provides two mechanisms
+to monitor the real-time health of an ONAP deployment:
+
+- a Consul GUI for a human operator or downstream monitoring systems and
+  Kubernetes liveness probes that enable automatic healing of failed
+  containers, and
+- a set of liveness probes which feed into the Kubernetes manager which
+  are described in the Heal section.
+
+Within ONAP, Consul is the monitoring system of choice and deployed by OOM in
+two parts:
+
+- a three-way, centralized Consul server cluster is deployed as a highly
+  available monitor of all of the ONAP components, and
+- a number of Consul agents.
+
+The Consul server provides a user interface that allows a user to graphically
+view the current health status of all of the ONAP components for which agents
+have been created - a sample from the ONAP Integration labs follows:
+
+.. figure:: ../../resources/images/consul/consulHealth.png
+   :align: center
+
+To see the real-time health of a deployment go to: ``http://<kubernetes IP>:30270/ui/``
+where a GUI much like the following will be found:
+
+.. note::
+  If Consul GUI is not accessible, you can refer this
+  `kubectl port-forward <https://kubernetes.io/docs/tasks/access-application-cluster/port-forward-access-application-cluster/>`_ method to access an application
+
+.. figure:: ../../resources/images/oom_logo/oomLogoV2-Heal.png
+   :align: right
+
+Heal
+====
+
+The ONAP deployment is defined by Helm charts as mentioned earlier.  These Helm
+charts are also used to implement automatic recoverability of ONAP components
+when individual components fail. Once ONAP is deployed, a "liveness" probe
+starts checking the health of the components after a specified startup time.
+
+Should a liveness probe indicate a failed container it will be terminated and a
+replacement will be started in its place - containers are ephemeral. Should the
+deployment specification indicate that there are one or more dependencies to
+this container or component (for example a dependency on a database) the
+dependency will be satisfied before the replacement container/component is
+started. This mechanism ensures that, after a failure, all of the ONAP
+components restart successfully.
+
+To test healing, the following command can be used to delete a pod::
+
+  > kubectl delete pod [pod name] -n [pod namespace]
+
+One could then use the following command to monitor the pods and observe the
+pod being terminated and the service being automatically healed with the
+creation of a replacement pod::
+
+  > kubectl get pods --all-namespaces -o=wide
+
+.. figure:: ../../resources/images/oom_logo/oomLogoV2-Scale.png
+   :align: right
+
+Scale
+=====
+
+Many of the ONAP components are horizontally scalable which allows them to
+adapt to expected offered load.  During the Beijing release scaling is static,
+that is during deployment or upgrade a cluster size is defined and this cluster
+will be maintained even in the presence of faults. The parameter that controls
+the cluster size of a given component is found in the values.yaml file for that
+component.  Here is an excerpt that shows this parameter:
+
+.. code-block:: yaml
+
+  # default number of instances
+  replicaCount: 1
+
+In order to change the size of a cluster, an operator could use a helm upgrade
+(described in detail in the next section) as follows::
+
+   > helm upgrade [RELEASE] [CHART] [flags]
+
+The RELEASE argument can be obtained from the following command::
+
+   > helm list
+
+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-11.0.0             Kohn          onap
+    dev-cassandra           5               Thu Oct 15 14:45:34 2020        DEPLOYED        cassandra-11.0.0                         onap
+    dev-contrib             1               Wed Oct 14 13:52:53 2020        DEPLOYED        contrib-11.0.0                           onap
+    dev-mariadb-galera      1               Wed Oct 14 13:55:56 2020        DEPLOYED        mariadb-galera-11.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.
+
+Now we need to obtain the chart name for cassandra. Use the below
+command to get the chart name::
+
+  > helm search cassandra
+
+Below is the example for the same::
+
+  > helm search cassandra
+    NAME                    CHART VERSION   APP VERSION     DESCRIPTION
+    local/cassandra         11.0.0                          ONAP cassandra
+    local/portal-cassandra  11.0.0                          Portal cassandra
+    local/aaf-cass          11.0.0                          ONAP AAF cassandra
+    local/sdc-cs            11.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
+
+
+Now we have both the command's arguments, thus we can perform the
+scale operation for cassandra as follows::
+
+  > helm upgrade dev-cassandra local/cassandra --set replicaCount=3
+
+Using this command we can scale up or scale down the cassandra db instances.
+
+
+The ONAP components use Kubernetes provided facilities to build clustered,
+highly available systems including: Services_ with load-balancers, ReplicaSet_,
+and StatefulSet_.  Some of the open-source projects used by the ONAP components
+directly support clustered configurations, for example ODL and MariaDB Galera.
+
+The Kubernetes Services_ abstraction to provide a consistent access point for
+each of the ONAP components, independent of the pod or container architecture
+of that component.  For example, SDN-C uses OpenDaylight clustering with a
+default cluster size of three but uses a Kubernetes service to and change the
+number of pods in this abstract this cluster from the other ONAP components
+such that the cluster could change size and this change is isolated from the
+other ONAP components by the load-balancer implemented in the ODL service
+abstraction.
+
+A ReplicaSet_ is a construct that is used to describe the desired state of the
+cluster.  For example 'replicas: 3' indicates to Kubernetes that a cluster of 3
+instances is the desired state.  Should one of the members of the cluster fail,
+a new member will be automatically started to replace it.
+
+Some of the ONAP components many need a more deterministic deployment; for
+example to enable intra-cluster communication. For these applications the
+component can be deployed as a Kubernetes StatefulSet_ which will maintain a
+persistent identifier for the pods and thus a stable network id for the pods.
+For example: the pod names might be web-0, web-1, web-{N-1} for N 'web' pods
+with corresponding DNS entries such that intra service communication is simple
+even if the pods are physically distributed across multiple nodes. An example
+of how these capabilities can be used is described in the Running Consul on
+Kubernetes tutorial.
+
+.. figure:: ../../resources/images/oom_logo/oomLogoV2-Upgrade.png
+   :align: right
+
+Upgrade
+=======
+
+Helm has built-in capabilities to enable the upgrade of pods without causing a
+loss of the service being provided by that pod or pods (if configured as a
+cluster).  As described in the OOM Developer's Guide, ONAP components provide
+an abstracted 'service' end point with the pods or containers providing this
+service hidden from other ONAP components by a load balancer. This capability
+is used during upgrades to allow a pod with a new image to be added to the
+service before removing the pod with the old image. This 'make before break'
+capability ensures minimal downtime.
+
+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-11.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
+in the cluster.  For example, SNDC configured as a 3-way ODL cluster might
+require that during the upgrade no fewer than 2 pods are available at all times
+to provide service while no more than 5 pods are ever deployed across the two
+versions at any one time to avoid depleting the cluster of resources. In this
+scenario, the SDNC cluster would start with 3 old pods then Kubernetes may add
+a new pod (3 old, 1 new), delete one old (2 old, 1 new), add two new pods (2
+old, 3 new) and finally delete the 2 old pods (3 new).  During this sequence
+the constraints of the minimum of two pods and maximum of five would be
+maintained while providing service the whole time.
+
+Initiation of an upgrade is triggered by changes in the Helm charts.  For
+example, if the image specified for one of the pods in the SDNC deployment
+specification were to change (i.e. point to a new Docker image in the nexus3
+repository - commonly through the change of a deployment variable), the
+sequence of events described in the previous paragraph would be initiated.
+
+For example, to upgrade a container by changing configuration, specifically an
+environment value::
+
+  > helm upgrade so onap/so --version 11.0.1 --set enableDebug=true
+
+Issuing this command will result in the appropriate container being stopped by
+Kubernetes and replaced with a new container with the new environment value.
+
+To upgrade a component to a new version with a new configuration file enter::
+
+  > helm upgrade so onap/so --version 11.0.1 -f environments/demo.yaml
+
+To fetch release history enter::
+
+  > helm history so
+  REVISION UPDATED                  STATUS     CHART     DESCRIPTION
+  1        Mon Jul 5 10:05:22 2022  SUPERSEDED so-11.0.0 Install complete
+  2        Mon Jul 5 10:10:55 2022  DEPLOYED   so-11.0.1 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
+may force the ONAP deployment back to the previously tagged configuration or to
+a specific configuration, say to jump back two steps if an incompatibility
+between two ONAP components is discovered after the two individual upgrades
+succeeded.
+
+This rollback functionality gives the administrator confidence that in the
+unfortunate circumstance of a failed upgrade the system can be rapidly brought
+back to a known good state.  This process of rolling upgrades while under
+service is illustrated in this short YouTube video showing a Zero Downtime
+Upgrade of a web application while under a 10 million transaction per second
+load.
+
+For example, to roll-back back to previous system revision enter::
+
+  > helm rollback so 1
+
+  > helm history so
+  REVISION UPDATED                  STATUS     CHART     DESCRIPTION
+  1        Mon Jul 5 10:05:22 2022  SUPERSEDED so-11.0.0 Install complete
+  2        Mon Jul 5 10:10:55 2022  SUPERSEDED so-11.0.1 Upgrade complete
+  3        Mon Jul 5 10:14:32 2022  DEPLOYED   so-11.0.0 Rollback to 1
+
+.. note::
+
+  The description field can be overridden to document actions taken or include
+  tracking numbers.
+
+Many of the ONAP components contain their own databases which are used to
+record configuration or state information.  The schemas of these databases may
+change from version to version in such a way that data stored within the
+database needs to be migrated between versions. If such a migration script is
+available it can be invoked during the upgrade (or rollback) by Container
+Lifecycle Hooks. Two such hooks are available, PostStart and PreStop, which
+containers can access by registering a handler against one or both. Note that
+it is the responsibility of the ONAP component owners to implement the hook
+handlers - which could be a shell script or a call to a specific container HTTP
+endpoint - following the guidelines listed on the Kubernetes site. Lifecycle
+hooks are not restricted to database migration or even upgrades but can be used
+anywhere specific operations need to be taken during lifecycle operations.
+
+OOM uses Helm K8S package manager to deploy ONAP components. Each component is
+arranged in a packaging format called a chart - a collection of files that
+describe a set of k8s resources. Helm allows for rolling upgrades of the ONAP
+component deployed. To upgrade a component Helm release you will need an
+updated Helm chart. The chart might have modified, deleted or added values,
+deployment yamls, and more.  To get the release name use::
+
+  > helm ls
+
+To easily upgrade the release use::
+
+  > helm upgrade [RELEASE] [CHART]
+
+To roll back to a previous release version use::
+
+  > helm rollback [flags] [RELEASE] [REVISION]
+
+For example, to upgrade the onap-so helm release to the latest SO container
+release v1.1.2:
+
+- Edit so values.yaml which is part of the chart
+- Change "so: nexus3.onap.org:10001/openecomp/so:v1.1.1" to
+  "so: nexus3.onap.org:10001/openecomp/so:v1.1.2"
+- From the chart location run::
+
+  > helm upgrade onap-so
+
+The previous so pod will be terminated and a new so pod with an updated so
+container will be created.
+
+.. figure:: ../../resources/images/oom_logo/oomLogoV2-Delete.png
+   :align: right
+
+Delete
+======
+
+Existing deployments can be partially or fully removed once they are no longer
+needed.  To minimize errors it is recommended that before deleting components
+from a running deployment the operator perform a 'dry-run' to display exactly
+what will happen with a given command prior to actually deleting anything.
+For example::
+
+  > helm undeploy onap --dry-run
+
+will display the outcome of deleting the 'onap' release from the
+deployment.
+To completely delete a release and remove it from the internal store enter::
+
+  > helm undeploy onap
+
+Once complete undeploy is done then delete the namespace as well
+using following command::
+
+  >  kubectl delete namespace <name of namespace>
+
+.. note::
+   You need to provide the namespace name which you used during deployment,
+   below is the example::
+
+   >  kubectl delete namespace onap
+
+One can also remove individual components from a deployment by changing the
+ONAP configuration values.  For example, to remove `so` from a running
+deployment enter::
+
+  > helm undeploy onap-so
+
+will remove `so` as the configuration indicates it's no longer part of the
+deployment. This might be useful if a one wanted to replace just `so` by
+installing a custom version.
similarity index 86%
rename from docs/oom_project_description.rst
rename to docs/sections/oom_project_description.rst
index b672c48..404a410 100644 (file)
@@ -2,11 +2,17 @@
 .. International License.
 .. http://creativecommons.org/licenses/by/4.0
 .. Copyright 2018-2020 Amdocs, Bell Canada, Orange, Samsung
+.. Modification copyright (C) 2022 Nordix Foundation
+
 .. _oom_project_description:
 
 ONAP Operations Manager Project
 ###############################
 
+.. warning::
+
+    THIS PAGE PROB NEEDS A REWRITE ALSO
+
 The ONAP Operations Manager (OOM) is responsible for life-cycle management of
 the ONAP platform itself; components such as SO, SDNC, etc. It is not
 responsible for the management of services, VNFs or infrastructure instantiated
@@ -17,7 +23,7 @@ bare-metal servers or on VMs hosted by a 3rd party management system. OOM
 ensures that ONAP is easily deployable and maintainable throughout its life
 cycle while using hardware resources efficiently.
 
-.. figure:: images/oom_logo/oomLogoV2-medium.png
+.. figure:: resources/images/oom_logo/oomLogoV2-medium.png
    :align: right
 
 In summary OOM provides the following capabilities:
@@ -39,13 +45,13 @@ Azure, Amazon AWS, Google GCD, VMware VIO, and OpenStack.
 The OOM documentation is broken into four different areas each targeted at a
 different user:
 
-- :ref:`quick-start-label` - deploy ONAP on an existing cloud
-- :ref:`user-guide-label` - a guide for operators of an ONAP instance
-- :ref:`developer-guide-label` - a guide for developers of OOM and ONAP
-- :ref:`cloud-setup-guide-label` - a guide for those setting up cloud
-  environments that ONAP will use
-- :ref:`hardcoded-certificates-label` - the list of all hardcoded certificates
-  set in ONAP installation
+- :ref:`oom_dev_guide` - a guide for developers of OOM
+- :ref:`oom_infra_setup_guide` - a guide for those setting up the environments that OOM will use
+- :ref:`oom_deploy_guide` - a guide for those deploying OOM on an existing cloud
+- :ref:`oom_user_guide` - a guide for operators of an OOM instance
+- :ref:`oom_access_info_guide` - a guide for operators who require access to OOM applications
+
+
 
 The :ref:`release_notes` for OOM describe the incremental features per release.
 
@@ -94,30 +94,16 @@ Deliverables
 Software Deliverables
 ~~~~~~~~~~~~~~~~~~~~~
 
-OOM provides `Helm charts <https://git.onap.org/oom/>`_ that needs to be
-"compiled" into Helm package. see step 6 in
-:doc:`quickstart guide <../oom_quickstart_guide>`.
 
 Documentation Deliverables
 ~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-- :doc:`Project Description <../oom_project_description>`
-- :doc:`Cloud Setup Guide <../oom_cloud_setup_guide>`
-- :doc:`Quick Start Guide <../oom_quickstart_guide>`
-- :doc:`Setup Ingress Controller <../oom_setup_ingress_controller>`
-- :doc:`Developer Guide <../oom_developer_guide>`
-- :doc:`Hardcoded Certificates <../oom_hardcoded_certificates>`
-
 Known Limitations, Issues and Workarounds
 =========================================
 
 Known Vulnerabilities
 ---------------------
 
-- Hard coded password used for all OOM deployments
-  [`OJSI-188 <https://jira.onap.org/browse/OJSI-188>`_]
-- :doc:`Hard coded certificates <../oom_hardcoded_certificates>` in Helm packages
-
 Workarounds
 -----------
 
@@ -91,18 +91,11 @@ Software Deliverables
 ~~~~~~~~~~~~~~~~~~~~~
 
 OOM provides `Helm charts <https://git.onap.org/oom/>`_ that needs to be
-"compiled" into Helm package. see step 6 in
-:doc:`quickstart guide <../oom_quickstart_guide>`.
+"compiled".
 
 Documentation Deliverables
 ~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-- :doc:`Project Description <../oom_project_description>`
-- :doc:`Cloud Setup Guide <../oom_cloud_setup_guide>`
-- :doc:`Quick Start Guide <../oom_quickstart_guide>`
-- :doc:`Setup Ingress Controller <../oom_setup_ingress_controller>`
-- :doc:`Developer Guide <../oom_developer_guide>`
-- :doc:`Hardcoded Certificates <../oom_hardcoded_certificates>`
 
 Known Limitations, Issues and Workarounds
 =========================================
@@ -112,7 +105,6 @@ Known Vulnerabilities
 
 - Hard coded password used for all OOM deployments
   [`OJSI-188 <https://jira.onap.org/browse/OJSI-188>`_]
-- :doc:`Hard coded certificates <../oom_hardcoded_certificates>` in Helm packages
 
 Workarounds
 -----------
@@ -109,18 +109,11 @@ Software Deliverables
 ~~~~~~~~~~~~~~~~~~~~~
 
 OOM provides `Helm charts <https://git.onap.org/oom/>`_ that needs to be
-"compiled" into Helm package. see step 6 in
-:doc:`quickstart guide <../oom_quickstart_guide>`.
+"compiled".
 
 Documentation Deliverables
 ~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-- :doc:`Project Description <../oom_project_description>`
-- :doc:`Cloud Setup Guide <../oom_cloud_setup_guide>`
-- :doc:`Quick Start Guide <../oom_quickstart_guide>`
-- :doc:`Setup Ingress Controller <../oom_setup_ingress_controller>`
-- :doc:`Developer Guide <../oom_developer_guide>`
-- :doc:`Hardcoded Certificates <../oom_hardcoded_certificates>`
 
 Known Limitations, Issues and Workarounds
 =========================================
@@ -130,7 +123,7 @@ Known Vulnerabilities
 
 - Hard coded password used for all OOM deployments
   [`OJSI-188 <https://jira.onap.org/browse/OJSI-188>`_]
-- :doc:`Hard coded certificates <../oom_hardcoded_certificates>` in Helm packages
+- `Hard coded certificates <../oom_hardcoded_certificates>` in Helm packages
 
 Workarounds
 -----------
@@ -45,7 +45,7 @@ Release Data
 | **Release designation**              | Istanbul                             |
 |                                      |                                      |
 +--------------------------------------+--------------------------------------+
-| **Release date**                     |                                      |
+| **Release date**                     | 2021/11/04                           |
 |                                      |                                      |
 +--------------------------------------+--------------------------------------+
 
@@ -68,20 +68,12 @@ Deliverables
 Software Deliverables
 ~~~~~~~~~~~~~~~~~~~~~
 
-OOM provides `Helm charts <https://git.onap.org/oom/>`_ that needs to be
-"compiled" into Helm package. see step 6 in
-:doc:`quickstart guide <../oom_quickstart_guide>`.
+OOM provides `Helm charts <https://nexus3.onap.org/service/rest/repository/browse/onap-helm-release/>`_
+
 
 Documentation Deliverables
 ~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-- :doc:`Project Description <../oom_project_description>`
-- :doc:`Cloud Setup Guide <../oom_cloud_setup_guide>`
-- :doc:`Quick Start Guide <../oom_quickstart_guide>`
-- :doc:`Setup Ingress Controller <../oom_setup_ingress_controller>`
-- :doc:`Developer Guide <../oom_developer_guide>`
-- :doc:`Hardcoded Certificates <../oom_hardcoded_certificates>`
-
 Known Limitations, Issues and Workarounds
 =========================================
 
similarity index 85%
rename from docs/release_notes/release-notes.rst
rename to docs/sections/release_notes/release-notes-jakarta.rst
index 1ab2173..cfc5788 100644 (file)
@@ -2,7 +2,9 @@
    International License.
 .. http://creativecommons.org/licenses/by/4.0
 .. (c) ONAP Project and its contributors
-.. _release_notes:
+.. _release_notes_jakarta:
+
+:orphan:
 
 *************************************
 ONAP Operations Manager Release Notes
@@ -44,7 +46,7 @@ Release Data
 | **Release designation**              | Jakarta                              |
 |                                      |                                      |
 +--------------------------------------+--------------------------------------+
-| **Release date**                     |                                      |
+| **Release date**                     | 2022/06/23                           |
 |                                      |                                      |
 +--------------------------------------+--------------------------------------+
 
@@ -67,20 +69,11 @@ Deliverables
 Software Deliverables
 ~~~~~~~~~~~~~~~~~~~~~
 
-OOM provides `Helm charts <https://git.onap.org/oom/>`_ that needs to be
-"compiled" into Helm package. see step 6 in
-:doc:`quickstart guide <../oom_quickstart_guide>`.
+OOM provides `Helm charts <https://nexus3.onap.org/service/rest/repository/browse/onap-helm-release/>`_
 
 Documentation Deliverables
 ~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-- :doc:`Project Description <../oom_project_description>`
-- :doc:`Cloud Setup Guide <../oom_cloud_setup_guide>`
-- :doc:`Quick Start Guide <../oom_quickstart_guide>`
-- :doc:`Setup Ingress Controller <../oom_setup_ingress_controller>`
-- :doc:`Developer Guide <../oom_developer_guide>`
-- :doc:`Hardcoded Certificates <../oom_hardcoded_certificates>`
-
 Known Limitations, Issues and Workarounds
 =========================================
 
diff --git a/docs/sections/release_notes/release-notes.rst b/docs/sections/release_notes/release-notes.rst
new file mode 100644 (file)
index 0000000..4b1552d
--- /dev/null
@@ -0,0 +1,126 @@
+.. This work is licensed under a Creative Commons Attribution 4.0
+   International License.
+.. http://creativecommons.org/licenses/by/4.0
+.. (c) ONAP Project and its contributors
+.. _release_notes:
+
+*************************************
+ONAP Operations Manager Release Notes
+*************************************
+
+Previous Release Notes
+======================
+
+- :ref:`Jakarta <release_notes_jakarta>`
+- :ref:`Istanbul <release_notes_istanbul>`
+- :ref:`Honolulu <release_notes_honolulu>`
+- :ref:`Guilin <release_notes_guilin>`
+- :ref:`Frankfurt <release_notes_frankfurt>`
+- :ref:`El Alto <release_notes_elalto>`
+- :ref:`Dublin <release_notes_dublin>`
+- :ref:`Casablanca <release_notes_casablanca>`
+- :ref:`Beijing <release_notes_beijing>`
+- :ref:`Amsterdam <release_notes_amsterdam>`
+
+Abstract
+========
+
+This document provides the release notes for the Kohn release.
+
+Summary
+=======
+
+
+
+Release Data
+============
+
++--------------------------------------+--------------------------------------+
+| **Project**                          | OOM                                  |
+|                                      |                                      |
++--------------------------------------+--------------------------------------+
+| **Docker images**                    | N/A                                  |
+|                                      |                                      |
++--------------------------------------+--------------------------------------+
+| **Release designation**              | Kohn                                 |
+|                                      |                                      |
++--------------------------------------+--------------------------------------+
+| **Release date**                     |                                      |
+|                                      |                                      |
++--------------------------------------+--------------------------------------+
+
+New features
+------------
+
+* Kubernetes support for version up to 1.23.8
+* Helm support for version up to Helm: 3.8.2
+* Kubespray version used for automated deployment 2.19 (used for automated deployment)
+* Initial Setup for "ONAP on ServiceMesh" deployment
+
+  * using Istio 1.14.1 as SM platform
+  * including Istio Ingress Gateway for external access
+  * modify 90% of ONAP component charts to support SeviceMesh
+
+**Bug fixes**
+
+A list of issues resolved in this release can be found here:
+https://jira.onap.org/projects/OOM/versions/11499
+
+
+**Known Issues**
+
+
+Deliverables
+------------
+
+Software Deliverables
+~~~~~~~~~~~~~~~~~~~~~
+
+OOM provides `Helm charts <https://nexus3.onap.org/service/rest/repository/browse/onap-helm-release/>`_
+
+Documentation Deliverables
+~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+- :ref:`Project Description <oom_project_description>` - a guide for developers of OOM
+- :ref:`oom_dev_guide` - a guide for developers of OOM
+- :ref:`oom_infra_setup_guide` - a guide for those setting up the environments that OOM will use
+- :ref:`oom_deploy_guide` - a guide for those deploying OOM on an existing cloud
+- :ref:`oom_user_guide` - a guide for operators of an OOM instance
+- :ref:`oom_access_info_guide` - a guide for operators who require access to OOM applications
+
+Known Limitations, Issues and Workarounds
+=========================================
+
+Known Vulnerabilities
+---------------------
+
+* Cassandra version needs to be updated to support new Python version
+  see `OOM-2900 <https://jira.onap.org/browse/OOM-2900>`_
+
+Workarounds
+-----------
+
+
+Security Notes
+--------------
+
+**Fixed Security Issues**
+
+* Fixed vulnerabilities for oom-platform-cert-service
+  see `Fixes <https://wiki.onap.org/pages/viewpage.action?spaceKey=SV&title=Kohn+OOM>`_
+
+References
+==========
+
+For more information on the ONAP Istanbul release, please see:
+
+#. `ONAP Home Page`_
+#. `ONAP Documentation`_
+#. `ONAP Release Downloads`_
+#. `ONAP Wiki Page`_
+
+
+.. _`ONAP Home Page`: https://www.onap.org
+.. _`ONAP Wiki Page`: https://wiki.onap.org
+.. _`ONAP Documentation`: https://docs.onap.org
+.. _`ONAP Release Downloads`: https://git.onap.org
diff --git a/docs/sections/resources/csv/nodeports.csv b/docs/sections/resources/csv/nodeports.csv
new file mode 100644 (file)
index 0000000..b1c6fb5
--- /dev/null
@@ -0,0 +1,62 @@
+NodePort,Component,Service name,targetPort,Port
+30200,VID,vid,8443,8443
+30201,SDNC,sdnc-portal,8443,8443
+30203,SDNC,sdnc-dgbuilder,3100,3000
+30204,SDC,sdc-be-external,8443,8443
+30207,SDC,sdc-fe,9443,9443
+30209,ROBOT,robot,443,443
+30210,AAI,aai-modelloader,8080,8080
+30211,APPC,appc,9191,9090
+30212,PORTAL,portal-sdk,8443,8443
+30218,POLICY,pap,9091,9091
+30219,POLICY,pap,8443,8443
+30220,AAI,aai-sparky-be,8000,8000
+30222,DCAE,xdcae-hv-ves-collector,6061,6061
+30225,PORTAL,portal-app,8443,8443
+30226,DMAAP,message-router-external,3905,3905
+30228,APPC,appc-dgbuilder,3100,3000
+30229,AAI,aai-modelloader,8443,8443
+30230,APPC,appc,8443,8443
+30231,APPC,appc,1830,1830
+30233,AAI,aai,8443,8443
+30234,POMBA*),pomba-kibana,5601,5601
+30242,DMAAP,dmaap-bc,8443,8443
+30248,OOF,oof-osdf,8699,8698
+30249,POMBA*),pomba-data-router,9502,9502
+30251,AAF,aaf-gui,8200,8200
+30253,LOG*),log-kibana,5601,5601
+30254,LOG*),log-es,9200,9200
+30255,LOG*),log-ls,5044,5044
+30256,SDC,sdc-wfd-fe,8443,8443
+30257,SDC,sdc-wfd-be,8443,8443
+30258,CLAMP,clamp-external,2443,2443
+30260,CLI,cli,443,443
+30264,DCAE,sdc-dcae-fe,9444,9444
+30266,DCAE,sdc-dcae-dt,9446,9446
+30267,SDNC,sdnc,8443,8443
+30269,DMAAP,dmaapr-prov,443,8443
+30271,CLI,cli,9090,9090
+30274,EXTAPI,nbi,8443,8443
+30275,OOF,oof-has-api,8091,8091
+30277,SO,so,8080,8080
+30279,AAI,aai-babel,9516,9516
+30283,MSB,msb-iag,443,443
+30284,MSB,msb-eag,443,443
+30288,SNIRO*),sniro-emulator,9999,80
+30289,APPC,appc-cdt,18080,18080
+30290,CLAMP,cdash-kibana,5601,5601
+30297,VNFSDK,refrepo,8703,8703
+30299,POMBA*),pomba-networkdiscovery,8443,9531
+30398,UUI,uui,8443,8443
+30399,UUI,uui-server,8082,8082
+30406,SO,so-vnfm-adapter,9092,9092
+30407,MUSIC,music,8443,8443
+30417,DCAE,xdcae-ves-collector,8443,8443
+30418,DCAE,dashboard,8443,8443
+30420,NETBOX,netbox-nginx,8080,8080
+30478,AWX,awx-web,8080,80
+30490,DMAAP,message-router-kafka-0,9091,9091
+30491,DMAAP,message-router-kafka-1,9091,9091
+30492,DMAAP,message-router-kafka-2,9091,9091
+30494,DMAAP,dmaap-dr-node-external,8443,8443
+30497,CDS,cds-ui,3000,3000
\ No newline at end of file
diff --git a/docs/sections/resources/images/consul/consulHealth.png b/docs/sections/resources/images/consul/consulHealth.png
new file mode 100644 (file)
index 0000000..cd7e730
Binary files /dev/null and b/docs/sections/resources/images/consul/consulHealth.png differ
diff --git a/docs/sections/resources/images/k8s/kubernetes_objects.png b/docs/sections/resources/images/k8s/kubernetes_objects.png
new file mode 100644 (file)
index 0000000..768a3ad
Binary files /dev/null and b/docs/sections/resources/images/k8s/kubernetes_objects.png differ
diff --git a/docs/sections/resources/images/msb/MSB-OOM-Diagram.png b/docs/sections/resources/images/msb/MSB-OOM-Diagram.png
new file mode 100644 (file)
index 0000000..4ee878d
Binary files /dev/null and b/docs/sections/resources/images/msb/MSB-OOM-Diagram.png differ
diff --git a/docs/sections/resources/images/oom_logo/oomLogoV2-Configure.png b/docs/sections/resources/images/oom_logo/oomLogoV2-Configure.png
new file mode 100644 (file)
index 0000000..bdb1ece
Binary files /dev/null and b/docs/sections/resources/images/oom_logo/oomLogoV2-Configure.png differ
diff --git a/docs/sections/resources/images/oom_logo/oomLogoV2-Delete.png b/docs/sections/resources/images/oom_logo/oomLogoV2-Delete.png
new file mode 100644 (file)
index 0000000..10c43d2
Binary files /dev/null and b/docs/sections/resources/images/oom_logo/oomLogoV2-Delete.png differ
diff --git a/docs/sections/resources/images/oom_logo/oomLogoV2-Deploy.png b/docs/sections/resources/images/oom_logo/oomLogoV2-Deploy.png
new file mode 100644 (file)
index 0000000..706097c
Binary files /dev/null and b/docs/sections/resources/images/oom_logo/oomLogoV2-Deploy.png differ
diff --git a/docs/sections/resources/images/oom_logo/oomLogoV2-Heal.png b/docs/sections/resources/images/oom_logo/oomLogoV2-Heal.png
new file mode 100644 (file)
index 0000000..97ac58e
Binary files /dev/null and b/docs/sections/resources/images/oom_logo/oomLogoV2-Heal.png differ
diff --git a/docs/sections/resources/images/oom_logo/oomLogoV2-Monitor.png b/docs/sections/resources/images/oom_logo/oomLogoV2-Monitor.png
new file mode 100644 (file)
index 0000000..c9a184a
Binary files /dev/null and b/docs/sections/resources/images/oom_logo/oomLogoV2-Monitor.png differ
diff --git a/docs/sections/resources/images/oom_logo/oomLogoV2-Scale.png b/docs/sections/resources/images/oom_logo/oomLogoV2-Scale.png
new file mode 100644 (file)
index 0000000..140e5ca
Binary files /dev/null and b/docs/sections/resources/images/oom_logo/oomLogoV2-Scale.png differ
diff --git a/docs/sections/resources/images/oom_logo/oomLogoV2-Upgrade.png b/docs/sections/resources/images/oom_logo/oomLogoV2-Upgrade.png
new file mode 100644 (file)
index 0000000..d51f6cf
Binary files /dev/null and b/docs/sections/resources/images/oom_logo/oomLogoV2-Upgrade.png differ
diff --git a/docs/sections/resources/images/oom_logo/oomLogoV2-medium.png b/docs/sections/resources/images/oom_logo/oomLogoV2-medium.png
new file mode 100644 (file)
index 0000000..20aea69
Binary files /dev/null and b/docs/sections/resources/images/oom_logo/oomLogoV2-medium.png differ
diff --git a/docs/sections/resources/images/servicemesh/ServiceMesh.png b/docs/sections/resources/images/servicemesh/ServiceMesh.png
new file mode 100644 (file)
index 0000000..7448ff0
Binary files /dev/null and b/docs/sections/resources/images/servicemesh/ServiceMesh.png differ
diff --git a/docs/sections/resources/yaml/envoyfilter-case.yaml b/docs/sections/resources/yaml/envoyfilter-case.yaml
new file mode 100644 (file)
index 0000000..c919319
--- /dev/null
@@ -0,0 +1,40 @@
+apiVersion: networking.istio.io/v1alpha3
+kind: EnvoyFilter
+metadata:
+  name: header-casing
+  namespace: istio-config
+spec:
+  configPatches:
+  - applyTo: CLUSTER
+    match:
+      context: SIDECAR_INBOUND
+    patch:
+      operation: MERGE
+      value:
+        typed_extension_protocol_options:
+          envoy.extensions.upstreams.http.v3.HttpProtocolOptions:
+            '@type': type.googleapis.com/envoy.extensions.upstreams.http.v3.HttpProtocolOptions
+            use_downstream_protocol_config:
+              http_protocol_options:
+                header_key_format:
+                  stateful_formatter:
+                    name: preserve_case
+                    typed_config:
+                      '@type': type.googleapis.com/envoy.extensions.http.header_formatters.preserve_case.v3.PreserveCaseFormatterConfig
+  - applyTo: NETWORK_FILTER
+    match:
+      listener:
+        filterChain:
+          filter:
+            name: envoy.filters.network.http_connection_manager
+    patch:
+      operation: MERGE
+      value:
+        typed_config:
+          '@type': type.googleapis.com/envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager
+          http_protocol_options:
+            header_key_format:
+              stateful_formatter:
+                name: preserve_case
+                typed_config:
+                  '@type': type.googleapis.com/envoy.extensions.http.header_formatters.preserve_case.v3.PreserveCaseFormatterConfig
\ No newline at end of file
diff --git a/docs/sections/resources/yaml/kiali-ingress.yaml b/docs/sections/resources/yaml/kiali-ingress.yaml
new file mode 100644 (file)
index 0000000..44f8062
--- /dev/null
@@ -0,0 +1,30 @@
+apiVersion: networking.istio.io/v1beta1
+kind: Gateway
+metadata:
+  name: kiali-gateway
+spec:
+  selector:
+    istio: ingressgateway
+  servers:
+    - hosts:
+        - kiali.simpledemo.onap.org
+      port:
+        name: http
+        number: 80
+        protocol: HTTP
+---
+apiVersion: networking.istio.io/v1beta1
+kind: VirtualService
+metadata:
+  name: kiali-service
+spec:
+  hosts:
+    - kiali.simpledemo.onap.org
+  gateways:
+    - kiali-gateway
+  http:
+    - route:
+      - destination:
+          port:
+            number: 20001
+          host: kiali
\ No newline at end of file
diff --git a/docs/sections/resources/yaml/kiali.yaml b/docs/sections/resources/yaml/kiali.yaml
new file mode 100644 (file)
index 0000000..71d86ce
--- /dev/null
@@ -0,0 +1,24 @@
+apiVersion: kiali.io/v1alpha1
+kind: Kiali
+metadata:
+  name: kiali
+  namespace: istio-system
+  annotations:
+    ansible.operator-sdk/verbosity: "1"
+spec:
+  auth:
+    strategy: anonymous
+  istio_component_namespaces:
+    prometheus: monitoring
+  external_services:
+    grafana:
+      in_cluster_url: http://prometheus-stack-grafana.monitoring
+    prometheus:
+      url: http://prometheus-stack-kube-prom-prometheus.monitoring:9090
+    tracing:
+      in_cluster_url: http://istio-query.observability:16686
+  deployment:
+    accessible_namespaces: ["**"]
+    view_only_mode: false
+  server:
+    web_root: "/kiali"
\ No newline at end of file
diff --git a/docs/tox.ini b/docs/tox.ini
new file mode 100644 (file)
index 0000000..8bec1b5
--- /dev/null
@@ -0,0 +1,32 @@
+[tox]
+minversion = 1.6
+envlist = docs,docs-linkcheck,docs-spellcheck
+skipsdist = true
+
+[testenv:docs]
+basepython = python3.8
+deps =
+    -r{toxinidir}/requirements-docs.txt
+    -chttps://raw.githubusercontent.com/openstack/requirements/stable/yoga/upper-constraints.txt
+    -chttps://git.onap.org/doc/plain/etc/upper-constraints.onap.txt?h=master
+commands =
+    sphinx-build -W -q -b html -n -d {envtmpdir}/doctrees {toxinidir} {toxinidir}/_build/html
+
+[testenv:docs-linkcheck]
+basepython = python3.8
+deps =
+    -r{toxinidir}/requirements-docs.txt
+    -chttps://raw.githubusercontent.com/openstack/requirements/stable/yoga/upper-constraints.txt
+    -chttps://git.onap.org/doc/plain/etc/upper-constraints.onap.txt?h=master
+commands =
+    sphinx-build -W -q -b linkcheck -d {envtmpdir}/doctrees {toxinidir} {toxinidir}/_build/linkcheck
+
+[testenv:docs-spellcheck]
+basepython = python3.8
+deps =
+    -r{toxinidir}/requirements-docs.txt
+    -chttps://raw.githubusercontent.com/openstack/requirements/stable/yoga/upper-constraints.txt
+    -chttps://git.onap.org/doc/plain/etc/upper-constraints.onap.txt?h=master
+commands =
+    sphinx-build -b spelling -d {envtmpdir}/doctrees {toxinidir} {toxinidir}/_build/spellcheck
+
index 9d8d4cc..696ede7 100644 (file)
@@ -1,5 +1,8 @@
 ## **Quick Start Guide**
 
+> **WARNING**: This README is no longer maintained and will be deprecated.
+> Please refer to the official OOM guide here - [OOM Guide](https://docs.onap.org/projects/onap-oom/en/latest/sections/oom_project_description.html)
+
 
 This is a quick start guide describing how to deploy ONAP on Kubernetes using Helm.
 
index 563ee20..1fa512a 100644 (file)
@@ -20,18 +20,18 @@ apiVersion: v2
 appVersion: "1.0.0"
 description: A Helm chart for A1 Policy Management Service
 name: a1policymanagement
-version: 11.0.0
+version: 12.0.0
 
 dependencies:
   - name: common
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
   - name: certInitializer
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
   - name: repositoryGenerator
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
   - name: serviceAccount
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
index 9c0aa89..ef46ad6 100644 (file)
 apiVersion: v2
 description: ONAP Application Authorization Framework
 name: aaf
-version: 11.0.0
+version: 12.0.0
 
 dependencies:
   - name: aaf-cass
-    version: ~11.x-0
+    version: ~12.x-0
     repository: 'file://components/aaf-cass'
     condition: aaf-authz.enabled
   - name: aaf-cm
-    version: ~11.x-0
+    version: ~12.x-0
     repository: 'file://components/aaf-cm'
     condition: aaf-authz.enabled
   - name: aaf-fs
-    version: ~11.x-0
+    version: ~12.x-0
     repository: 'file://components/aaf-fs'
     condition: aaf-authz.enabled
   - name: aaf-gui
-    version: ~11.x-0
+    version: ~12.x-0
     repository: 'file://components/aaf-gui'
     condition: aaf-authz.enabled
   - name: aaf-locate
-    version: ~11.x-0
+    version: ~12.x-0
     repository: 'file://components/aaf-locate'
     condition: aaf-authz.enabled
   - name: aaf-oauth
-    version: ~11.x-0
+    version: ~12.x-0
     repository: 'file://components/aaf-oauth'
     condition: aaf-authz.enabled
   - name: aaf-service
-    version: ~11.x-0
+    version: ~12.x-0
     repository: 'file://components/aaf-service'
     condition: aaf-authz.enabled
   - name: aaf-sms
-    version: ~11.x-0
+    version: ~12.x-0
     repository: 'file://components/aaf-sms'
     condition: aaf-sms.enabled
   - name: aaf-sshsm
-    version: ~11.x-0
+    version: ~12.x-0
     repository: 'file://components/aaf-sshsm'
     condition: aaf-sshsm.enabled
index 0006c9b..86dba6c 100644 (file)
 apiVersion: v2
 description: ONAP AAF cassandra
 name: aaf-cass
-version: 11.0.0
+version: 12.0.0
 
 dependencies:
   - name: common
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
   - name: repositoryGenerator
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
index d2d0b5e..094d210 100644 (file)
 apiVersion: v2
 description: ONAP AAF Certificate Manager
 name: aaf-cm
-version: 11.0.0
+version: 12.0.0
 
 dependencies:
   - name: common
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
   - name: repositoryGenerator
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
   - name: aaf-templates
-    version: ~11.x-0
+    version: ~12.x-0
     repository: 'file://../aaf-templates'
index 660b8d6..4573a51 100644 (file)
 apiVersion: v2
 description: ONAP AAF File Server
 name: aaf-fs
-version: 11.0.0
+version: 12.0.0
 
 dependencies:
   - name: common
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
   - name: repositoryGenerator
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
   - name: aaf-templates
-    version: ~11.x-0
+    version: ~12.x-0
     repository: 'file://../aaf-templates'
index 1527051..4e49314 100644 (file)
 apiVersion: v2
 description: ONAP AAF GUI
 name: aaf-gui
-version: 11.0.0
+version: 12.0.0
 
 dependencies:
   - name: common
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
   - name: repositoryGenerator
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
   - name: aaf-templates
-    version: ~11.x-0
+    version: ~12.x-0
     repository: 'file://../aaf-templates'
index 629b2e0..8cb2cf6 100644 (file)
 apiVersion: v2
 description: ONAP AAF Locate
 name: aaf-locate
-version: 11.0.0
+version: 12.0.0
 
 dependencies:
   - name: common
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
   - name: repositoryGenerator
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
   - name: aaf-templates
-    version: ~11.x-0
+    version: ~12.x-0
     repository: 'file://../aaf-templates'
index b22deca..edd932d 100644 (file)
 apiVersion: v2
 description: ONAP AAF OAuth
 name: aaf-oauth
-version: 11.0.0
+version: 12.0.0
 
 dependencies:
   - name: common
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
   - name: repositoryGenerator
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
   - name: aaf-templates
-    version: ~11.x-0
+    version: ~12.x-0
     repository: 'file://../aaf-templates'
index 18813fc..3aafca3 100644 (file)
 apiVersion: v2
 description: ONAP AAF Service
 name: aaf-service
-version: 11.0.0
+version: 12.0.0
 
 dependencies:
   - name: common
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
   - name: repositoryGenerator
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
   - name: aaf-templates
-    version: ~11.x-0
+    version: ~12.x-0
     repository: 'file://../aaf-templates'
\ No newline at end of file
index 769a4df..ef34888 100644 (file)
 apiVersion: v2
 description: ONAP Secret Management Service
 name: aaf-sms
-version: 11.0.0
+version: 12.0.0
 
 dependencies:
   - name: common
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
   - name: repositoryGenerator
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
   - name: certInitializer
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
   - name: aaf-sms-quorumclient
-    version: ~11.x-0
+    version: ~12.x-0
     repository: 'file://components/aaf-sms-quorumclient'
   - name: aaf-sms-vault
-    version: ~11.x-0
+    version: ~12.x-0
     repository: 'file://components/aaf-sms-vault'
index 96cf7a1..5af948e 100644 (file)
 apiVersion: v2
 description: ONAP Secret Management Service Quorum Client
 name: aaf-sms-quorumclient
-version: 11.0.0
+version: 12.0.0
 
 dependencies:
   - name: common
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
   - name: repositoryGenerator
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
index 9f06ec1..44554e3 100644 (file)
@@ -18,12 +18,12 @@ apiVersion: v2
 description: Chart to launch Vault as SMS backend
 name: aaf-sms-vault
 appVersion: 0.9.5
-version: 11.0.0
+version: 12.0.0
 
 dependencies:
   - name: common
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
   - name: repositoryGenerator
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
index 2cd0cf4..b30fd76 100644 (file)
 apiVersion: v2
 description: ONAP Hardware Security Components
 name: aaf-sshsm
-version: 11.0.0
+version: 12.0.0
 
 dependencies:
   - name: common
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
   - name: repositoryGenerator
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
   - name: aaf-sshsm-abrmd
-    version: ~11.x-0
+    version: ~12.x-0
     repository: 'file://components/aaf-sshsm-abrmd'
     condition: aaf-sshsm-abrmd.enabled
   - name: aaf-sshsm-distcenter
-    version: ~11.x-0
+    version: ~12.x-0
     repository: 'file://components/aaf-sshsm-distcenter'
     condition: aaf-sshsm-distcenter.enabled
   - name: aaf-sshsm-testca
-    version: ~11.x-0
+    version: ~12.x-0
     repository: 'file://components/aaf-sshsm-testca'
     condition: aaf-sshsm-testca.testca.enabled
index 2149739..e6d6d66 100644 (file)
 apiVersion: v2
 description: ONAP Trusted Platform Module Resource Manager
 name: aaf-sshsm-abrmd
-version: 11.0.0
+version: 12.0.0
 
 dependencies:
   - name: common
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
   - name: repositoryGenerator
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
index b0a9b9a..0d57836 100644 (file)
 apiVersion: v2
 description: ONAP Trusted Platform Module Distribution Center
 name: aaf-sshsm-distcenter
-version: 11.0.0
+version: 12.0.0
 
 dependencies:
   - name: common
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
   - name: repositoryGenerator
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
index 617c742..ec513a0 100644 (file)
 apiVersion: v2
 description: ONAP Trusted Platform Module Test CA Service
 name: aaf-sshsm-testca
-version: 11.0.0
+version: 12.0.0
 
 dependencies:
   - name: common
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
   - name: repositoryGenerator
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
index b4b01b0..301f65c 100644 (file)
@@ -16,9 +16,9 @@
 apiVersion: v2
 description: ONAP Application Authorization Framework Templates
 name: aaf-templates
-version: 11.0.0
+version: 12.0.0
 
 dependencies:
   - name: common
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
index 9bab1ee..e02c624 100644 (file)
 apiVersion: v2
 description: ONAP Active and Available Inventory
 name: aai
-version: 11.0.0
+version: 12.0.0
 
 dependencies:
   - name: common
-    version: ~11.x-0
+    version: ~12.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: ~11.x-0
+    version: ~12.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: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
   - name: repositoryGenerator
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
   - name: aai-babel
-    version: ~11.x-0
+    version: ~12.x-0
     repository: 'file://components/aai-babel'
     condition: aai-babel.enabled
   - name: aai-graphadmin
-    version: ~11.x-0
+    version: ~12.x-0
     repository: 'file://components/aai-graphadmin'
     condition: aai-graphadmin.enabled
   - name: aai-modelloader
-    version: ~11.x-0
+    version: ~12.x-0
     repository: 'file://components/aai-modelloader'
     condition: aai-modelloader.enabled
   - name: aai-resources
-    version: ~11.x-0
+    version: ~12.x-0
     repository: 'file://components/aai-resources'
     condition: aai-resources.enabled
   - name: aai-schema-service
-    version: ~11.x-0
+    version: ~12.x-0
     repository: 'file://components/aai-schema-service'
     condition: aai-schema-service.enabled
   - name: aai-sparky-be
-    version: ~11.x-0
+    version: ~12.x-0
     repository: 'file://components/aai-sparky-be'
     condition: aai-sparky-be.enabled
   - name: aai-traversal
-    version: ~11.x-0
+    version: ~12.x-0
     repository: 'file://components/aai-traversal'
     condition: aai-traversal.enabled
   - name: serviceAccount
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
index 5f36a0e..11b561c 100644 (file)
 apiVersion: v2
 description: Babel microservice
 name: aai-babel
-version: 11.0.0
+version: 12.0.0
 
 dependencies:
   - name: common
-    version: ~11.x-0
+    version: ~12.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: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
   - name: repositoryGenerator
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
   - name: serviceAccount
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
index 38a4e48..e52ac7a 100644 (file)
@@ -31,6 +31,13 @@ spec:
     matchLabels:
       app: {{ include "common.name" . }}
   replicas: {{ .Values.replicaCount }}
+  strategy:
+    type: {{ .Values.updateStrategy.type }}
+    {{- if (eq "RollingUpdate" .Values.updateStrategy.type) }}
+    rollingUpdate:
+      maxUnavailable: {{ .Values.updateStrategy.maxUnavailable }}
+      maxSurge: {{ .Values.updateStrategy.maxSurge }}
+    {{- end }}
   template:
     metadata:
       labels:
index 3cfc818..ca23bc9 100644 (file)
@@ -67,6 +67,11 @@ flavorOverride: small
 # default number of instances
 replicaCount: 1
 
+updateStrategy:
+  type: RollingUpdate
+  maxUnavailable: 0
+  maxSurge: 1
+
 nodeSelector: {}
 
 affinity: {}
index d5d0851..239bcad 100644 (file)
 apiVersion: v2
 description: ONAP AAI GraphAdmin
 name: aai-graphadmin
-version: 11.0.0
+version: 12.0.0
 
 dependencies:
   - name: common
-    version: ~11.x-0
+    version: ~12.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: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
   - name: repositoryGenerator
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
   - name: serviceAccount
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
index 2760602..6e64fd8 100644 (file)
@@ -122,3 +122,8 @@ aperture.service.ssl.key-store-password=password(${KEYSTORE_JKS_PASSWORD})
 aperture.service.ssl.trust-store-password=password(${TRUSTSTORE_PASSWORD})
 {{ end }}
 aperture.service.timeout-in-milliseconds=300000
+
+#To Expose the Prometheus scraping endpoint
+management.port=8448
+endpoints.enabled=false
+management.security.enabled=false
\ No newline at end of file
index 449ea30..8e1bf21 100644 (file)
     ============LICENSE_END=========================================================
 */}}
 -->
-<configuration>
+<configuration scan="true" scanPeriod="60 seconds" debug="false">
     <property name="AJSC_HOME" value="${AJSC_HOME:-.}" />
-    <appender name="ACCESS"
-        class="ch.qos.logback.core.rolling.RollingFileAppender">
-        <file>${AJSC_HOME}/logs/ajsc-jetty/localhost_access.log</file>
-        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-            <fileNamePattern>${AJSC_HOME}/logs/ajsc-jetty/localhost_access.log.%d{yyyy-MM-dd}
-            </fileNamePattern>
-        </rollingPolicy>
+    <property name="maxHistory" value='{{.Values.accessLogback.maxHistory}}' />
+    <property name="totalSizeCap" value='{{.Values.accessLogback.totalSizeCap}}' />
+    <property name="logToFileEnabled" value='{{.Values.accessLogback.logToFileEnabled}}'/>
+    <if condition='property("logToFileEnabled").contains("true")'>
+        <then>
+            <appender name="ACCESS"
+                class="ch.qos.logback.core.rolling.RollingFileAppender">
+                <file>${AJSC_HOME}/logs/ajsc-jetty/localhost_access.log</file>
+                <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+                    <fileNamePattern>${AJSC_HOME}/logs/ajsc-jetty/localhost_access.log.%d{yyyy-MM-dd}
+                    </fileNamePattern>
+                    <maxHistory>${maxHistory}</maxHistory>
+                    <totalSizeCap>${totalSizeCap}</totalSizeCap>
+                </rollingPolicy>
+                <encoder class="org.onap.aai.logging.CustomLogPatternLayoutEncoder">
+                    <Pattern>%a %u %z [%t] "%m %U%q" %s %b %y %i{X-TransactionId} %i{X-FromAppId} %i{X-Forwarded-For} %i{X-AAI-SSL-Client-CN} %i{X-AAI-SSL-Client-OU} %i{X-AAI-SSL-Client-O} %i{X-AAI-SSL-Client-L} %i{X-AAI-SSL-Client-ST} %i{X-AAI-SSL-Client-C} %i{X-AAI-SSL-Client-NotBefore} %i{X-AAI-SSL-Client-NotAfter} %i{X-AAI-SSL-Client-DN} %D</Pattern>
+                </encoder>
+            </appender>
+            <appender-ref ref="ACCESS" />
+        </then>
+    </if>
+
+    <appender name="STDOUTACCESS" class="ch.qos.logback.core.ConsoleAppender">
         <encoder class="org.onap.aai.logging.CustomLogPatternLayoutEncoder">
-            <Pattern>%a %u %z [%t] "%m %U%q" %s %b %y %i{X-TransactionId} %i{X-FromAppId} %i{X-Forwarded-For} %i{X-AAI-SSL-Client-CN} %i{X-AAI-SSL-Client-OU} %i{X-AAI-SSL-Client-O} %i{X-AAI-SSL-Client-L} %i{X-AAI-SSL-Client-ST} %i{X-AAI-SSL-Client-C} %i{X-AAI-SSL-Client-NotBefore} %i{X-AAI-SSL-Client-NotAfter} %i{X-AAI-SSL-Client-DN} %D</Pattern>
+            <Pattern>%a %u %z [%t] "%m %U%q" %s %b %y %i{X-TransactionId} %i{X-FromAppId} %i{X-Forwarded-For} %i{X-AAI-SSL-Client-CN} %i{X-AAI-SSL-Client-OU} %i{X-AAI-SSL-Client-O} %i{X-AAI-SSL-Client-L} %i{X-AAI-SSL-Client-ST} %i{X-AAI-SSL-Client-C} %i{X-AAI-SSL-Client-NotBefore} %i{X-AAI-SSL-Client-NotAfter} %i{X-AAI-SSL-Client-DN} %D - "logType": "access"</Pattern>
         </encoder>
     </appender>
-    <appender-ref ref="ACCESS" />
+    <appender-ref ref="STDOUTACCESS" />
 </configuration>
 
 <!--
index 243acd2..fd79f70 100644 (file)
   <property name="namespace" value="graph-admin"/>
   <property name="AJSC_HOME" value="${AJSC_HOME:-.}"/>
   <property name="logDirectory" value="${AJSC_HOME}/logs"/>
+  <property name="maxHistory" value='{{.Values.logback.maxHistory}}' />
+  <property name="totalSizeCap" value='{{.Values.logback.totalSizeCap}}' />
+  <property name="queueSize" value='{{.Values.logback.queueSize}}'/>
+  <property name="logToFileEnabled" value='{{.Values.logback.logToFileEnabled}}'/>
   <!-- Old patterns
     <property name="eelfLogPattern" value="%ecompStartTime|%date{yyyy-MM-dd'T'HH:mm:ss.SSSZ, UTC}|%X{requestId}|%X{serviceInstanceId}|%-10t|%X{serverName}|%X{serviceName}|%X{partnerName}|%ecompStatusCode|%X{responseCode}|%replace(%replace(%X{responseDescription}){'\\|', '!'}){'\r|\n', '^'}|%X{instanceUUID}|%level|%X{severity}|%X{serverIpAddress}|%ecompElapsedTime|%X{server}|%X{clientIpAddress}|%eelfClassOfCaller|%X{unused}|%X{processKey}|%X{customField1}|%X{customField2}|%X{customField3}|%X{customField4}|co=%X{component}:%replace(%replace(%m){'\\|', '!'}){'\r|\n', '^'}%n"/>
     <property name="eelfAuditLogPattern" value="%ecompStartTime|%date{yyyy-MM-dd'T'HH:mm:ss.SSSZ, UTC}|%X{requestId}|%X{serviceInstanceId}|%-10t|%X{serverName}|%X{serviceName}|%X{partnerName}|%ecompStatusCode|%X{responseCode}|%replace(%replace(%X{responseDescription}){'\\|', '!'}){'\r|\n|\r\n', '^'}|%X{instanceUUID}|%level|%X{severity}|%X{serverIpAddress}|%ecompElapsedTime|%X{server}|%X{clientIpAddress}|%eelfClassOfCaller|%X{unused}|%X{processKey}|%X{customField1}|%X{customField2}|%X{customField3}|%X{customField4}|co=%X{component}:%replace(%replace(%m){'\\|', '!'}){'\r|\n', '^'}%n"/>
   <conversionRule conversionWord="clr" converterClass="org.springframework.boot.logging.logback.ColorConverter"/>
   <conversionRule conversionWord="wex" converterClass="org.springframework.boot.logging.logback.WhitespaceThrowableProxyConverter"/>
   <conversionRule conversionWord="wEx" converterClass="org.springframework.boot.logging.logback.ExtendedWhitespaceThrowableProxyConverter"/>
+
   <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
-    <encoder>
-      <pattern>
-                %clr(%d{yyyy-MM-dd HH:mm:ss.SSS}){faint} %clr(${LOG_LEVEL_PATTERN:-%5p}) %clr(${PID:- }){magenta} %clr(---){faint} %clr([%15.15t]){faint} %clr(%-40.40logger{39}){cyan} %clr(:){faint} %m%n${LOG_EXCEPTION_CONVERSION_WORD:-%wEx}
-      </pattern>
-    </encoder>
-  </appender>
-  <appender name="SANE" class="ch.qos.logback.core.rolling.RollingFileAppender">
-    <file>${logDirectory}/rest/sane.log</file>
-    <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-      <fileNamePattern>${logDirectory}/rest/sane.log.%d{yyyy-MM-dd}</fileNamePattern>
-    </rollingPolicy>
-    <encoder>
-      <pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{1024} - %msg%n</pattern>
-    </encoder>
-  </appender>
-  <appender name="asyncSANE" class="ch.qos.logback.classic.AsyncAppender">
-    <queueSize>1000</queueSize>
-    <includeCallerData>true</includeCallerData>
-    <appender-ref ref="SANE"/>
-  </appender>
-  <appender name="METRIC" class="ch.qos.logback.core.rolling.RollingFileAppender">
-    <file>${logDirectory}/rest/metrics.log</file>
-    <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-      <fileNamePattern>${logDirectory}/rest/metrics.log.%d{yyyy-MM-dd}</fileNamePattern>
-    </rollingPolicy>
-    <encoder>
-      <pattern>${metricPattern}</pattern>
-    </encoder>
-  </appender>
-  <appender name="asyncMETRIC" class="ch.qos.logback.classic.AsyncAppender">
-    <queueSize>1000</queueSize>
-    <includeCallerData>true</includeCallerData>
-    <appender-ref ref="METRIC"/>
-  </appender>
-  <appender name="DEBUG" class="ch.qos.logback.core.rolling.RollingFileAppender">
-    <filter class="ch.qos.logback.classic.filter.LevelFilter">
-      <level>DEBUG</level>
-      <onMatch>ACCEPT</onMatch>
-      <onMismatch>DENY</onMismatch>
-    </filter>
-    <file>${logDirectory}/rest/debug.log</file>
-    <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-      <fileNamePattern>${logDirectory}/rest/debug.log.%d{yyyy-MM-dd}</fileNamePattern>
-    </rollingPolicy>
-    <encoder>
-      <pattern>${debugPattern}</pattern>
-    </encoder>
-  </appender>
-  <appender name="asyncDEBUG" class="ch.qos.logback.classic.AsyncAppender">
-    <queueSize>1000</queueSize>
-    <appender-ref ref="DEBUG"/>
-    <includeCallerData>true</includeCallerData>
-  </appender>
-  <appender name="ERROR" class="ch.qos.logback.core.rolling.RollingFileAppender">
-    <file>${logDirectory}/rest/error.log</file>
-    <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-      <fileNamePattern>${logDirectory}/rest/error.log.%d{yyyy-MM-dd}</fileNamePattern>
-    </rollingPolicy>
-    <filter class="ch.qos.logback.classic.filter.ThresholdFilter">
-      <level>WARN</level>
-    </filter>
-    <encoder>
-      <pattern>${errorPattern}</pattern>
-    </encoder>
-  </appender>
-  <appender name="asyncERROR" class="ch.qos.logback.classic.AsyncAppender">
-    <queueSize>1000</queueSize>
-    <appender-ref ref="ERROR"/>
-  </appender>
-  <appender name="AUDIT" class="ch.qos.logback.core.rolling.RollingFileAppender">
-    <file>${logDirectory}/rest/audit.log</file>
-    <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-      <fileNamePattern>${logDirectory}/rest/audit.log.%d{yyyy-MM-dd}
-            </fileNamePattern>
-    </rollingPolicy>
-    <encoder>
-      <pattern>${auditPattern}</pattern>
-    </encoder>
-  </appender>
-  <appender name="asyncAUDIT" class="ch.qos.logback.classic.AsyncAppender">
-    <queueSize>1000</queueSize>
-    <includeCallerData>true</includeCallerData>
-    <appender-ref ref="AUDIT"/>
-  </appender>
-  <appender name="translog" class="ch.qos.logback.core.rolling.RollingFileAppender">
-    <filter class="ch.qos.logback.classic.filter.LevelFilter">
-      <level>DEBUG</level>
-      <onMatch>ACCEPT</onMatch>
-      <onMismatch>DENY</onMismatch>
-    </filter>
-    <file>${logDirectory}/rest/translog.log</file>
-    <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-      <fileNamePattern>${logDirectory}/rest/translog.log.%d{yyyy-MM-dd}</fileNamePattern>
-    </rollingPolicy>
-    <encoder>
-      <pattern>${transLogPattern}</pattern>
-    </encoder>
-  </appender>
-  <appender name="asynctranslog" class="ch.qos.logback.classic.AsyncAppender">
-    <queueSize>1000</queueSize>
-    <includeCallerData>true</includeCallerData>
-    <appender-ref ref="translog"/>
-  </appender>
-  <appender name="dmaapAAIEventConsumer" class="ch.qos.logback.core.rolling.RollingFileAppender">
-    <filter class="ch.qos.logback.classic.filter.ThresholdFilter">
-      <level>WARN</level>
-    </filter>
-    <File>${logDirectory}/dmaapAAIEventConsumer/error.log</File>
-    <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-      <fileNamePattern>${logDirectory}/dmaapAAIEventConsumer/error.log.%d{yyyy-MM-dd}</fileNamePattern>
-    </rollingPolicy>
-    <encoder>
-      <pattern>${"errorPattern"}</pattern>
+    <encoder class="net.logstash.logback.encoder.LoggingEventCompositeJsonEncoder">
+      <providers>
+        <timestamp><fieldName>timestamp</fieldName></timestamp>
+        <message/>
+        <mdc>
+          <fieldName>context</fieldName>
+          <excludeMdcKeyName>ServerIPAddress</excludeMdcKeyName>
+          <excludeMdcKeyName>EntryTimestamp</excludeMdcKeyName>
+          <excludeMdcKeyName>InvokeTimestamp</excludeMdcKeyName>
+          <excludeMdcKeyName>ErrorCode</excludeMdcKeyName>
+          <excludeMdcKeyName>ErrorDesc</excludeMdcKeyName>
+        </mdc>
+        <stackTrace>
+          <fieldName>exception</fieldName>
+          <throwableConverter class="net.logstash.logback.stacktrace.ShortenedThrowableConverter">
+            <exclude>^sun\.reflect\..*\.invoke</exclude>
+            <exclude>^net\.sf\.cglib\.proxy\.MethodProxy\.invoke</exclude>
+            <rootCauseFirst>true</rootCauseFirst>
+          </throwableConverter>
+        </stackTrace>
+        <threadName><fieldName>thread</fieldName></threadName>
+        <loggerName>
+          <fieldName>logger</fieldName>
+          <shortenedLoggerNameLength>36</shortenedLoggerNameLength>
+        </loggerName>
+        <logLevel/>
+        <pattern>
+          <pattern>{"logType":"app"}</pattern>
+        </pattern>
+      </providers>
     </encoder>
   </appender>
-  <appender name="dmaapAAIEventConsumerInfo" class="ch.qos.logback.core.rolling.RollingFileAppender">
-    <filter class="ch.qos.logback.classic.filter.LevelFilter">
-      <level>INFO</level>
-      <onMatch>ACCEPT</onMatch>
-      <onMismatch>DENY</onMismatch>
-    </filter>
-    <File>${logDirectory}/dmaapAAIEventConsumer/dmaap-transaction.log</File>
-    <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-      <fileNamePattern>${logDirectory}/dmaapAAIEventConsumer/dmaap-transaction.log.%d{yyyy-MM-dd}
-            </fileNamePattern>
-    </rollingPolicy>
-    <encoder>
-      <pattern>${debugPattern}</pattern>
-    </encoder>
-  </appender>
-  <appender name="dmaapAAIEventConsumerDebug" class="ch.qos.logback.core.rolling.RollingFileAppender">
-    <filter class="ch.qos.logback.classic.filter.LevelFilter">
-      <level>DEBUG</level>
-      <onMatch>ACCEPT</onMatch>
-      <onMismatch>DENY</onMismatch>
-    </filter>
-    <File>${logDirectory}/dmaapAAIEventConsumer/debug.log</File>
-    <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-      <fileNamePattern>${logDirectory}/dmaapAAIEventConsumer/debug.log.%d{yyyy-MM-dd}</fileNamePattern>
-    </rollingPolicy>
-    <encoder>
-      <pattern>${debugPattern}</pattern>
-    </encoder>
-  </appender>
-  <appender name="dmaapAAIEventConsumerMetric" class="ch.qos.logback.core.rolling.RollingFileAppender">
-    <filter class="ch.qos.logback.classic.filter.LevelFilter">
-      <level>INFO</level>
-      <onMatch>ACCEPT</onMatch>
-      <onMismatch>DENY</onMismatch>
-    </filter>
-    <File>${logDirectory}/dmaapAAIEventConsumer/metrics.log</File>
-    <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-      <fileNamePattern>${logDirectory}/dmaapAAIEventConsumer/metrics.log.%d{yyyy-MM-dd}
+
+  <if condition='property("logToFileEnabled").contains("true")'>
+    <then>
+        <appender name="SANE" class="ch.qos.logback.core.rolling.RollingFileAppender">
+          <file>${logDirectory}/rest/sane.log</file>
+          <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+            <fileNamePattern>${logDirectory}/rest/sane.log.%d{yyyy-MM-dd}</fileNamePattern>
+            <maxHistory>${maxHistory}</maxHistory>
+            <totalSizeCap>${totalSizeCap}</totalSizeCap>
+          </rollingPolicy>
+          <encoder>
+            <pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{1024} - %msg%n</pattern>
+          </encoder>
+        </appender>
+        <appender name="asyncSANE" class="ch.qos.logback.classic.AsyncAppender">
+          <queueSize>${queueSize}</queueSize>
+          <includeCallerData>true</includeCallerData>
+          <appender-ref ref="SANE"/>
+        </appender>
+        <appender name="METRIC" class="ch.qos.logback.core.rolling.RollingFileAppender">
+          <file>${logDirectory}/rest/metrics.log</file>
+          <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+            <fileNamePattern>${logDirectory}/rest/metrics.log.%d{yyyy-MM-dd}</fileNamePattern>
+            <maxHistory>${maxHistory}</maxHistory>
+            <totalSizeCap>${totalSizeCap}</totalSizeCap>
+          </rollingPolicy>
+          <encoder>
+            <pattern>${metricPattern}</pattern>
+          </encoder>
+        </appender>
+        <appender name="asyncMETRIC" class="ch.qos.logback.classic.AsyncAppender">
+          <queueSize>${queueSize}</queueSize>
+          <includeCallerData>true</includeCallerData>
+          <appender-ref ref="METRIC"/>
+        </appender>
+        <appender name="DEBUG" class="ch.qos.logback.core.rolling.RollingFileAppender">
+          <filter class="ch.qos.logback.classic.filter.LevelFilter">
+            <level>DEBUG</level>
+            <onMatch>ACCEPT</onMatch>
+            <onMismatch>DENY</onMismatch>
+          </filter>
+          <file>${logDirectory}/rest/debug.log</file>
+          <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+            <fileNamePattern>${logDirectory}/rest/debug.log.%d{yyyy-MM-dd}</fileNamePattern>
+            <maxHistory>${maxHistory}</maxHistory>
+            <totalSizeCap>${totalSizeCap}</totalSizeCap>
+          </rollingPolicy>
+          <encoder>
+            <pattern>${debugPattern}</pattern>
+          </encoder>
+        </appender>
+        <appender name="asyncDEBUG" class="ch.qos.logback.classic.AsyncAppender">
+          <queueSize>${queueSize}</queueSize>
+          <appender-ref ref="DEBUG"/>
+          <includeCallerData>true</includeCallerData>
+        </appender>
+        <appender name="ERROR" class="ch.qos.logback.core.rolling.RollingFileAppender">
+          <file>${logDirectory}/rest/error.log</file>
+          <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+            <fileNamePattern>${logDirectory}/rest/error.log.%d{yyyy-MM-dd}</fileNamePattern>
+            <maxHistory>${maxHistory}</maxHistory>
+            <totalSizeCap>${totalSizeCap}</totalSizeCap>
+          </rollingPolicy>
+          <filter class="ch.qos.logback.classic.filter.ThresholdFilter">
+            <level>WARN</level>
+          </filter>
+          <encoder>
+            <pattern>${errorPattern}</pattern>
+          </encoder>
+        </appender>
+        <appender name="asyncERROR" class="ch.qos.logback.classic.AsyncAppender">
+          <queueSize>${queueSize}</queueSize>
+          <appender-ref ref="ERROR"/>
+        </appender>
+        <appender name="AUDIT" class="ch.qos.logback.core.rolling.RollingFileAppender">
+          <file>${logDirectory}/rest/audit.log</file>
+          <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+            <fileNamePattern>${logDirectory}/rest/audit.log.%d{yyyy-MM-dd}</fileNamePattern>
+            <maxHistory>${maxHistory}</maxHistory>
+            <totalSizeCap>${totalSizeCap}</totalSizeCap>
+          </rollingPolicy>
+          <encoder>
+            <pattern>${auditPattern}</pattern>
+          </encoder>
+        </appender>
+        <appender name="asyncAUDIT" class="ch.qos.logback.classic.AsyncAppender">
+          <queueSize>${queueSize}</queueSize>
+          <includeCallerData>true</includeCallerData>
+          <appender-ref ref="AUDIT"/>
+        </appender>
+        <appender name="translog" class="ch.qos.logback.core.rolling.RollingFileAppender">
+          <filter class="ch.qos.logback.classic.filter.LevelFilter">
+            <level>DEBUG</level>
+            <onMatch>ACCEPT</onMatch>
+            <onMismatch>DENY</onMismatch>
+          </filter>
+          <file>${logDirectory}/rest/translog.log</file>
+          <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+            <fileNamePattern>${logDirectory}/rest/translog.log.%d{yyyy-MM-dd}</fileNamePattern>
+            <maxHistory>${maxHistory}</maxHistory>
+            <totalSizeCap>${totalSizeCap}</totalSizeCap>
+          </rollingPolicy>
+          <encoder>
+            <pattern>${transLogPattern}</pattern>
+          </encoder>
+        </appender>
+        <appender name="asynctranslog" class="ch.qos.logback.classic.AsyncAppender">
+          <queueSize>${queueSize}</queueSize>
+          <includeCallerData>true</includeCallerData>
+          <appender-ref ref="translog"/>
+        </appender>
+        <appender name="dmaapAAIEventConsumer" class="ch.qos.logback.core.rolling.RollingFileAppender">
+          <filter class="ch.qos.logback.classic.filter.ThresholdFilter">
+            <level>WARN</level>
+          </filter>
+          <File>${logDirectory}/dmaapAAIEventConsumer/error.log</File>
+          <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+            <fileNamePattern>${logDirectory}/dmaapAAIEventConsumer/error.log.%d{yyyy-MM-dd}</fileNamePattern>
+            <maxHistory>${maxHistory}</maxHistory>
+            <totalSizeCap>${totalSizeCap}</totalSizeCap>
+          </rollingPolicy>
+          <encoder>
+            <pattern>${"errorPattern"}</pattern>
+          </encoder>
+        </appender>
+        <appender name="dmaapAAIEventConsumerInfo" class="ch.qos.logback.core.rolling.RollingFileAppender">
+          <filter class="ch.qos.logback.classic.filter.LevelFilter">
+            <level>INFO</level>
+            <onMatch>ACCEPT</onMatch>
+            <onMismatch>DENY</onMismatch>
+          </filter>
+          <File>${logDirectory}/dmaapAAIEventConsumer/dmaap-transaction.log</File>
+          <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+            <fileNamePattern>${logDirectory}/dmaapAAIEventConsumer/dmaap-transaction.log.%d{yyyy-MM-dd}
             </fileNamePattern>
-    </rollingPolicy>
-    <encoder>
-      <pattern>${metricPattern}</pattern>
-    </encoder>
-  </appender>
-  <appender name="external" class="ch.qos.logback.core.rolling.RollingFileAppender">
-    <filter class="ch.qos.logback.classic.filter.ThresholdFilter">
-      <level>WARN</level>
-    </filter>
-    <file>${logDirectory}/external/external.log</file>
-    <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-      <fileNamePattern>${logDirectory}/external/external.log.%d{yyyy-MM-dd}
+            <maxHistory>${maxHistory}</maxHistory>
+            <totalSizeCap>${totalSizeCap}</totalSizeCap>
+          </rollingPolicy>
+          <encoder>
+            <pattern>${debugPattern}</pattern>
+          </encoder>
+        </appender>
+        <appender name="dmaapAAIEventConsumerDebug" class="ch.qos.logback.core.rolling.RollingFileAppender">
+          <filter class="ch.qos.logback.classic.filter.LevelFilter">
+            <level>DEBUG</level>
+            <onMatch>ACCEPT</onMatch>
+            <onMismatch>DENY</onMismatch>
+          </filter>
+          <File>${logDirectory}/dmaapAAIEventConsumer/debug.log</File>
+          <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+            <fileNamePattern>${logDirectory}/dmaapAAIEventConsumer/debug.log.%d{yyyy-MM-dd}</fileNamePattern>
+            <maxHistory>${maxHistory}</maxHistory>
+            <totalSizeCap>${totalSizeCap}</totalSizeCap>
+          </rollingPolicy>
+          <encoder>
+            <pattern>${debugPattern}</pattern>
+          </encoder>
+        </appender>
+        <appender name="dmaapAAIEventConsumerMetric" class="ch.qos.logback.core.rolling.RollingFileAppender">
+          <filter class="ch.qos.logback.classic.filter.LevelFilter">
+            <level>INFO</level>
+            <onMatch>ACCEPT</onMatch>
+            <onMismatch>DENY</onMismatch>
+          </filter>
+          <File>${logDirectory}/dmaapAAIEventConsumer/metrics.log</File>
+          <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+            <fileNamePattern>${logDirectory}/dmaapAAIEventConsumer/metrics.log.%d{yyyy-MM-dd}</fileNamePattern>
+            <maxHistory>${maxHistory}</maxHistory>
+            <totalSizeCap>${totalSizeCap}</totalSizeCap>
+          </rollingPolicy>
+          <encoder>
+            <pattern>${metricPattern}</pattern>
+          </encoder>
+        </appender>
+        <appender name="external" class="ch.qos.logback.core.rolling.RollingFileAppender">
+          <filter class="ch.qos.logback.classic.filter.ThresholdFilter">
+            <level>WARN</level>
+          </filter>
+          <file>${logDirectory}/external/external.log</file>
+          <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+            <fileNamePattern>${logDirectory}/external/external.log.%d{yyyy-MM-dd}
             </fileNamePattern>
-    </rollingPolicy>
-    <encoder>
-      <pattern>${debugPattern}</pattern>
-    </encoder>
-  </appender>
-  <!-- DataGrooming logs started -->
-  <appender name="dataGrooming" class="ch.qos.logback.core.rolling.RollingFileAppender">
-    <filter class="ch.qos.logback.classic.filter.ThresholdFilter">
-      <level>WARN</level>
-    </filter>
-    <File>${logDirectory}/dataGrooming/error.log</File>
-    <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-      <fileNamePattern>${logDirectory}/dataGrooming/error.log.%d{yyyy-MM-dd}</fileNamePattern>
-    </rollingPolicy>
-    <encoder>
-      <pattern>${errorPattern}</pattern>
-    </encoder>
-  </appender>
-  <appender name="dataGroomingdebug" class="ch.qos.logback.core.rolling.RollingFileAppender">
-    <filter class="ch.qos.logback.classic.filter.LevelFilter">
-      <level>DEBUG</level>
-      <onMatch>ACCEPT</onMatch>
-      <onMismatch>DENY</onMismatch>
-    </filter>
-    <File>${logDirectory}/dataGrooming/debug.log</File>
-    <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-      <fileNamePattern>${logDirectory}/dataGrooming/debug.log.%d{yyyy-MM-dd}</fileNamePattern>
-    </rollingPolicy>
-    <encoder>
-      <pattern>${debugPattern}</pattern>
-    </encoder>
-  </appender>
-  <appender name="dataGroomingaudit" class="ch.qos.logback.core.rolling.RollingFileAppender">
-    <filter class="ch.qos.logback.classic.filter.LevelFilter">
-      <level>INFO</level>
-      <onMatch>ACCEPT</onMatch>
-      <onMismatch>DENY</onMismatch>
-    </filter>
-    <File>${logDirectory}/dataGrooming/audit.log</File>
-    <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-      <fileNamePattern>${logDirectory}/dataGrooming/audit.log.%d{yyyy-MM-dd}</fileNamePattern>
-    </rollingPolicy>
-    <encoder>
-      <pattern>${auditPattern}</pattern>
-    </encoder>
-  </appender>
-  <!-- DataGrooming logs ended -->
-  <!-- DataSnapshot logs started -->
-  <appender name="dataSnapshot" class="ch.qos.logback.core.rolling.RollingFileAppender">
-    <filter class="ch.qos.logback.classic.filter.ThresholdFilter">
-      <level>WARN</level>
-    </filter>
-    <File>${logDirectory}/dataSnapshot/error.log</File>
-    <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-      <fileNamePattern>${logDirectory}/dataSnapshot/error.log.%d{yyyy-MM-dd}</fileNamePattern>
-    </rollingPolicy>
-    <encoder>
-      <pattern>${errorPattern}</pattern>
-    </encoder>
-  </appender>
-  <appender name="dataSnapshotdebug" class="ch.qos.logback.core.rolling.RollingFileAppender">
-    <filter class="ch.qos.logback.classic.filter.LevelFilter">
-      <level>DEBUG</level>
-      <onMatch>ACCEPT</onMatch>
-      <onMismatch>DENY</onMismatch>
-    </filter>
-    <File>${logDirectory}/dataSnapshot/debug.log</File>
-    <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-      <fileNamePattern>${logDirectory}/dataSnapshot/debug.log.%d{yyyy-MM-dd}</fileNamePattern>
-    </rollingPolicy>
-    <encoder>
-      <pattern>${debugPattern}</pattern>
-    </encoder>
-  </appender>
-  <appender name="dataSnapshotaudit" class="ch.qos.logback.core.rolling.RollingFileAppender">
-    <filter class="ch.qos.logback.classic.filter.LevelFilter">
-      <level>INFO</level>
-      <onMatch>ACCEPT</onMatch>
-      <onMismatch>DENY</onMismatch>
-    </filter>
-    <File>${logDirectory}/dataSnapshot/audit.log</File>
-    <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-      <fileNamePattern>${logDirectory}/dataSnapshot/audit.log.%d{yyyy-MM-dd}</fileNamePattern>
-    </rollingPolicy>
-    <encoder>
-      <pattern>${auditPattern}</pattern>
-    </encoder>
-  </appender>
-  <!-- DataSnapshot logs ended -->
-  <!-- HistoryTruncate logs started -->
-  <appender name="historyTruncate" class="ch.qos.logback.core.rolling.RollingFileAppender">
-    <filter class="ch.qos.logback.classic.filter.ThresholdFilter">
-      <level>WARN</level>
-    </filter>
-    <File>${logDirectory}/historyTruncate/error.log</File>
-    <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-      <fileNamePattern>${logDirectory}/historyTruncate/error.log.%d{yyyy-MM-dd}</fileNamePattern>
-    </rollingPolicy>
-    <encoder>
-      <pattern>${errorPattern}</pattern>
-    </encoder>
-  </appender>
-  <appender name="historyTruncatedebug" class="ch.qos.logback.core.rolling.RollingFileAppender">
-    <filter class="ch.qos.logback.classic.filter.LevelFilter">
-      <level>DEBUG</level>
-      <onMatch>ACCEPT</onMatch>
-      <onMismatch>DENY</onMismatch>
-    </filter>
-    <File>${logDirectory}/historyTruncate/debug.log</File>
-    <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-      <fileNamePattern>${logDirectory}/historyTruncate/debug.log.%d{yyyy-MM-dd}</fileNamePattern>
-    </rollingPolicy>
-    <encoder>
-      <pattern>${debugPattern}</pattern>
-    </encoder>
-  </appender>
-  <appender name="historyTruncateaudit" class="ch.qos.logback.core.rolling.RollingFileAppender">
-    <filter class="ch.qos.logback.classic.filter.LevelFilter">
-      <level>INFO</level>
-      <onMatch>ACCEPT</onMatch>
-      <onMismatch>DENY</onMismatch>
-    </filter>
-    <File>${logDirectory}/historyTruncate/audit.log</File>
-    <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-      <fileNamePattern>${logDirectory}/historyTruncate/audit.log.%d{yyyy-MM-dd}</fileNamePattern>
-    </rollingPolicy>
-    <encoder>
-      <pattern>${auditPattern}</pattern>
-    </encoder>
-  </appender>
-  <!-- historyTruncate logs ended -->
-  <!-- CreateDBSchema logs started  -->
-  <appender name="createDBSchema" class="ch.qos.logback.core.rolling.RollingFileAppender">
-    <filter class="ch.qos.logback.classic.filter.ThresholdFilter">
-      <level>WARN</level>
-    </filter>
-    <File>${logDirectory}/createDBSchema/error.log</File>
-    <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-      <fileNamePattern>${logDirectory}/createDBSchema/error.log.%d{yyyy-MM-dd}</fileNamePattern>
-    </rollingPolicy>
-    <encoder>
-      <pattern>${"errorPattern"}</pattern>
-    </encoder>
-  </appender>
-  <appender name="createDBSchemadebug" class="ch.qos.logback.core.rolling.RollingFileAppender">
-    <filter class="ch.qos.logback.classic.filter.LevelFilter">
-      <level>DEBUG</level>
-      <onMatch>ACCEPT</onMatch>
-      <onMismatch>DENY</onMismatch>
-    </filter>
-    <File>${logDirectory}/createDBSchema/debug.log</File>
-    <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-      <fileNamePattern>${logDirectory}/createDBSchema/debug.log.%d{yyyy-MM-dd}</fileNamePattern>
-    </rollingPolicy>
-    <encoder>
-      <pattern>${debugPattern}</pattern>
-    </encoder>
-  </appender>
-  <appender name="createDBSchemametric" class="ch.qos.logback.core.rolling.RollingFileAppender">
-    <filter class="ch.qos.logback.classic.filter.LevelFilter">
-      <level>INFO</level>
-      <onMatch>ACCEPT</onMatch>
-      <onMismatch>DENY</onMismatch>
-    </filter>
-    <File>${logDirectory}/createDBSchema/metrics.log</File>
-    <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-      <fileNamePattern>${logDirectory}/createDBSchema/metrics.log.%d{yyyy-MM-dd}</fileNamePattern>
-    </rollingPolicy>
-    <encoder>
-      <pattern>${metricPattern}</pattern>
-    </encoder>
-  </appender>
-  <!-- CreateDBSchema logs ended  -->
-  <!-- DataCleanupTasks logs started  -->
-  <appender name="dataCleanuperror" class="ch.qos.logback.core.rolling.RollingFileAppender">
-    <filter class="ch.qos.logback.classic.filter.ThresholdFilter">
-      <level>WARN</level>
-    </filter>
-    <File>${logDirectory}/misc/error.log</File>
-    <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-      <fileNamePattern>${logDirectory}/misc/error.log.%d{yyyy-MM-dd}</fileNamePattern>
-    </rollingPolicy>
-    <encoder>
-      <pattern>${"errorPattern"}</pattern>
-    </encoder>
-  </appender>
-  <appender name="dataCleanupdebug" class="ch.qos.logback.core.rolling.RollingFileAppender">
-    <filter class="ch.qos.logback.classic.filter.LevelFilter">
-      <level>DEBUG</level>
-      <onMatch>ACCEPT</onMatch>
-      <onMismatch>DENY</onMismatch>
-    </filter>
-    <File>${logDirectory}/misc/debug.log</File>
-    <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-      <fileNamePattern>${logDirectory}/misc/debug.log.%d{yyyy-MM-dd}</fileNamePattern>
-    </rollingPolicy>
-    <encoder>
-      <pattern>${debugPattern}</pattern>
-    </encoder>
-  </appender>
-  <appender name="dataCleanupaudit" class="ch.qos.logback.core.rolling.RollingFileAppender">
-    <filter class="ch.qos.logback.classic.filter.LevelFilter">
-      <level>INFO</level>
-      <onMatch>ACCEPT</onMatch>
-      <onMismatch>DENY</onMismatch>
-    </filter>
-    <File>${logDirectory}/misc/audit.log</File>
-    <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-      <fileNamePattern>${logDirectory}/misc/audit.log.%d{yyyy-MM-dd}</fileNamePattern>
-    </rollingPolicy>
-    <encoder>
-      <pattern>${auditPattern}</pattern>
-    </encoder>
-  </appender>
-  <!-- DataCleanupTasks logs ended  -->
-  <!-- dupeTool logs started -->
-  <appender name="dupeTooldebug" class="ch.qos.logback.core.rolling.RollingFileAppender">
-    <filter class="ch.qos.logback.classic.filter.LevelFilter">
-      <level>DEBUG</level>
-      <onMatch>ACCEPT</onMatch>
-      <onMismatch>DENY</onMismatch>
-    </filter>
-    <File>${logDirectory}/dupetool/debug.log</File>
-    <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-      <fileNamePattern>${logDirectory}/dupetool/debug.log.%d{yyyy-MM-dd}</fileNamePattern>
-    </rollingPolicy>
-    <encoder>
-      <pattern>${debugPattern}</pattern>
-    </encoder>
-  </appender>
-  <appender name="dupeToolerror" class="ch.qos.logback.core.rolling.RollingFileAppender">
-    <filter class="ch.qos.logback.classic.filter.LevelFilter">
-      <level>WARN</level>
-      <onMatch>ACCEPT</onMatch>
-      <onMismatch>DENY</onMismatch>
-    </filter>
-    <File>${logDirectory}/dupeTool/error.log</File>
-    <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-      <fileNamePattern>${logDirectory}/dupeTool/error.log.%d{yyyy-MM-dd}</fileNamePattern>
-    </rollingPolicy>
-    <encoder>
-      <pattern>${errorPattern}</pattern>
-    </encoder>
-  </appender>
-  <!-- dupeTool logs ended -->
-  <!-- dynamicPayloadGenerator log starts here -->
-  <appender name="dynamicPayloadGeneratorError" class="ch.qos.logback.core.rolling.RollingFileAppender">
-    <filter class="ch.qos.logback.classic.filter.ThresholdFilter">
-      <level>WARN</level>
-    </filter>
-    <File>${logDirectory}/dynamicPayloadGenerator/error.log</File>
-    <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-      <fileNamePattern>${logDirectory}/dynamicPayloadGenerator/error.log.%d{yyyy-MM-dd}</fileNamePattern>
-    </rollingPolicy>
-    <encoder>
-      <pattern>${errorPattern}</pattern>
-    </encoder>
-  </appender>
-  <appender name="dynamicPayloadGeneratorDebug" class="ch.qos.logback.core.rolling.RollingFileAppender">
-    <filter class="ch.qos.logback.classic.filter.LevelFilter">
-      <level>DEBUG</level>
-      <onMatch>ACCEPT</onMatch>
-      <onMismatch>DENY</onMismatch>
-    </filter>
-    <File>${logDirectory}/dynamicPayloadGenerator/debug.log</File>
-    <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-      <fileNamePattern>${logDirectory}/dynamicPayloadGenerator/debug.log.%d{yyyy-MM-dd}</fileNamePattern>
-    </rollingPolicy>
-    <encoder>
-      <pattern>${debugPattern}</pattern>
-    </encoder>
-  </appender>
-  <appender name="dynamicPayloadGeneratorAudit" class="ch.qos.logback.core.rolling.RollingFileAppender">
-    <filter class="ch.qos.logback.classic.filter.LevelFilter">
-      <level>INFO</level>
-      <onMatch>ACCEPT</onMatch>
-      <onMismatch>DENY</onMismatch>
-    </filter>
-    <File>${logDirectory}/dataExport/audit.log</File>
-    <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-      <fileNamePattern>${logDirectory}/dynamicPayloadGenerator/audit.log.%d{yyyy-MM-dd}</fileNamePattern>
-    </rollingPolicy>
-    <encoder>
-      <pattern>${auditPattern}</pattern>
-    </encoder>
-  </appender>
-  <!-- dynamicPayloadGenerator log ends here -->
-  <!-- forceDelete logs started -->
-  <appender name="forceDeletedebug" class="ch.qos.logback.core.rolling.RollingFileAppender">
-    <filter class="ch.qos.logback.classic.filter.LevelFilter">
-      <level>DEBUG</level>
-      <onMatch>ACCEPT</onMatch>
-      <onMismatch>DENY</onMismatch>
-    </filter>
-    <File>${logDirectory}/forceDelete/debug.log</File>
-    <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-      <fileNamePattern>${logDirectory}/forceDelete/debug.log.%d{yyyy-MM-dd}</fileNamePattern>
-    </rollingPolicy>
-    <encoder>
-      <pattern>${debugPattern}</pattern>
-    </encoder>
-  </appender>
-  <appender name="forceDeleteerror" class="ch.qos.logback.core.rolling.RollingFileAppender">
-    <filter class="ch.qos.logback.classic.filter.LevelFilter">
-      <level>WARN</level>
-      <onMatch>ACCEPT</onMatch>
-      <onMismatch>DENY</onMismatch>
-    </filter>
-    <File>${logDirectory}/forceDelete/error.log</File>
-    <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-      <fileNamePattern>${logDirectory}/forceDelete/error.log.%d{yyyy-MM-dd}</fileNamePattern>
-    </rollingPolicy>
-    <encoder>
-      <pattern>${errorPattern}</pattern>
-    </encoder>
-  </appender>
-  <!-- forceDelete logs ended -->
-  <!-- migration logs started -->
-  <appender name="migrationdebug" class="ch.qos.logback.core.rolling.RollingFileAppender">
-    <filter class="ch.qos.logback.classic.filter.LevelFilter">
-      <level>DEBUG</level>
-      <onMatch>ACCEPT</onMatch>
-      <onMismatch>DENY</onMismatch>
-    </filter>
-    <File>${logDirectory}/migration/debug.log</File>
-    <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-      <fileNamePattern>${logDirectory}/migration/debug.log.%d{yyyy-MM-dd}</fileNamePattern>
-    </rollingPolicy>
-    <encoder>
-      <pattern>${debugPattern}</pattern>
-    </encoder>
-  </appender>
-  <appender name="migrationerror" class="ch.qos.logback.core.rolling.RollingFileAppender">
-    <filter class="ch.qos.logback.classic.filter.LevelFilter">
-      <level>WARN</level>
-      <onMatch>ACCEPT</onMatch>
-      <onMismatch>DENY</onMismatch>
-    </filter>
-    <File>${logDirectory}/migration/error.log</File>
-    <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-      <fileNamePattern>${logDirectory}/migration/error.log.%d{yyyy-MM-dd}</fileNamePattern>
-    </rollingPolicy>
-    <encoder>
-      <pattern>${errorPattern}</pattern>
-    </encoder>
-  </appender>
-  <!-- migration logs ended -->
-  <!-- DataGrooming logs started -->
-  <appender name="dataExportError" class="ch.qos.logback.core.rolling.RollingFileAppender">
-    <filter class="ch.qos.logback.classic.filter.ThresholdFilter">
-      <level>WARN</level>
-    </filter>
-    <File>${logDirectory}/dataExport/error.log</File>
-    <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-      <fileNamePattern>${logDirectory}/dataExport/error.log.%d{yyyy-MM-dd}</fileNamePattern>
-    </rollingPolicy>
-    <encoder>
-      <pattern>${errorPattern}</pattern>
-    </encoder>
-  </appender>
-  <appender name="dataExportDebug" class="ch.qos.logback.core.rolling.RollingFileAppender">
-    <filter class="ch.qos.logback.classic.filter.LevelFilter">
-      <level>DEBUG</level>
-      <onMatch>ACCEPT</onMatch>
-      <onMismatch>DENY</onMismatch>
-    </filter>
-    <File>${logDirectory}/dataExport/debug.log</File>
-    <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-      <fileNamePattern>${logDirectory}/dataExport/debug.log.%d{yyyy-MM-dd}</fileNamePattern>
-    </rollingPolicy>
-    <encoder>
-      <pattern>${debugPattern}</pattern>
-    </encoder>
-  </appender>
-  <appender name="dataExportAudit" class="ch.qos.logback.core.rolling.RollingFileAppender">
-    <filter class="ch.qos.logback.classic.filter.LevelFilter">
-      <level>INFO</level>
-      <onMatch>ACCEPT</onMatch>
-      <onMismatch>DENY</onMismatch>
-    </filter>
-    <File>${logDirectory}/dataExport/audit.log</File>
-    <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-      <fileNamePattern>${logDirectory}/dataExport/audit.log.%d{yyyy-MM-dd}</fileNamePattern>
-    </rollingPolicy>
-    <encoder>
-      <pattern>${auditPattern}</pattern>
-    </encoder>
-  </appender>
-  <!-- schemaMod log starts -->
-  <appender name="schemaModdebug" class="ch.qos.logback.core.rolling.RollingFileAppender">
-    <filter class="ch.qos.logback.classic.filter.LevelFilter">
-      <level>DEBUG</level>
-      <onMatch>ACCEPT</onMatch>
-      <onMismatch>DENY</onMismatch>
-    </filter>
-    <File>${logDirectory}/schemaMod/debug.log</File>
-    <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-      <fileNamePattern>${logDirectory}/schemaMod/debug.log.%d{yyyy-MM-dd}</fileNamePattern>
-    </rollingPolicy>
-    <encoder>
-      <pattern>${debugPattern}</pattern>
-    </encoder>
-  </appender>
-  <appender name="schemaModerror" class="ch.qos.logback.core.rolling.RollingFileAppender">
-    <filter class="ch.qos.logback.classic.filter.LevelFilter">
-      <level>WARN</level>
-      <onMatch>ACCEPT</onMatch>
-      <onMismatch>DENY</onMismatch>
-    </filter>
-    <File>${logDirectory}/schemaMod/error.log</File>
-    <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-      <fileNamePattern>${logDirectory}/schemaMod/error.log.%d{yyyy-MM-dd}</fileNamePattern>
-    </rollingPolicy>
-    <encoder>
-      <pattern>${errorPattern}</pattern>
-    </encoder>
-  </appender>
-  <!-- schemaMod log ends -->
-  <!-- uniquePropertyCheck log starts here -->
-  <appender name="uniquePropertyCheckdebug" class="ch.qos.logback.core.rolling.RollingFileAppender">
-    <filter class="ch.qos.logback.classic.filter.LevelFilter">
-      <level>DEBUG</level>
-      <onMatch>ACCEPT</onMatch>
-      <onMismatch>DENY</onMismatch>
-    </filter>
-    <File>${logDirectory}/uniquePropertyCheck/debug.log</File>
-    <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-      <fileNamePattern>${logDirectory}/uniquePropertyCheck/debug.log.%d{yyyy-MM-dd}</fileNamePattern>
-    </rollingPolicy>
-    <encoder>
-      <pattern>${debugPattern}</pattern>
-    </encoder>
-  </appender>
-  <appender name="uniquePropertyCheckmetric" class="ch.qos.logback.core.rolling.RollingFileAppender">
-    <filter class="ch.qos.logback.classic.filter.LevelFilter">
-      <level>INFO</level>
-      <onMatch>ACCEPT</onMatch>
-      <onMismatch>DENY</onMismatch>
-    </filter>
-    <File>${logDirectory}/uniquePropertyCheck/metrics.log</File>
-    <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-      <fileNamePattern>${logDirectory}/uniquePropertyCheck/metrics.log.%d{yyyy-MM-dd}</fileNamePattern>
-    </rollingPolicy>
-    <encoder>
-      <pattern>${metricPattern}</pattern>
-    </encoder>
-  </appender>
-  <appender name="uniquePropertyCheckerror" class="ch.qos.logback.core.rolling.RollingFileAppender">
-    <filter class="ch.qos.logback.classic.filter.LevelFilter">
-      <level>WARN</level>
-      <onMatch>ACCEPT</onMatch>
-      <onMismatch>DENY</onMismatch>
-    </filter>
-    <File>${logDirectory}/uniquePropertyCheck/error.log</File>
-    <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-      <fileNamePattern>${logDirectory}/uniquePropertyCheck/error.log.%d{yyyy-MM-dd}</fileNamePattern>
-    </rollingPolicy>
-    <encoder>
-      <pattern>${errorPattern}</pattern>
-    </encoder>
-  </appender>
-  <!-- uniquePropertyCheck log ends here -->
-  <!-- dynamicPayloadGenerator log starts here -->
-  <appender name="dynamicPayloadGeneratorError" class="ch.qos.logback.core.rolling.RollingFileAppender">
-    <filter class="ch.qos.logback.classic.filter.ThresholdFilter">
-      <level>WARN</level>
-    </filter>
-    <File>${logDirectory}/dynamicPayloadGenerator/error.log</File>
-    <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-      <fileNamePattern>${logDirectory}/dynamicPayloadGenerator/error.log.%d{yyyy-MM-dd}</fileNamePattern>
-    </rollingPolicy>
-    <encoder>
-      <pattern>${errorPattern}</pattern>
-    </encoder>
-  </appender>
-  <appender name="dynamicPayloadGeneratorDebug" class="ch.qos.logback.core.rolling.RollingFileAppender">
-    <filter class="ch.qos.logback.classic.filter.LevelFilter">
-      <level>DEBUG</level>
-      <onMatch>ACCEPT</onMatch>
-      <onMismatch>DENY</onMismatch>
-    </filter>
-    <File>${logDirectory}/dynamicPayloadGenerator/debug.log</File>
-    <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-      <fileNamePattern>${logDirectory}/dynamicPayloadGenerator/debug.log.%d{yyyy-MM-dd}</fileNamePattern>
-    </rollingPolicy>
-    <encoder>
-      <pattern>${debugPattern}</pattern>
-    </encoder>
-  </appender>
-  <appender name="dynamicPayloadGeneratorAudit" class="ch.qos.logback.core.rolling.RollingFileAppender">
-    <filter class="ch.qos.logback.classic.filter.LevelFilter">
-      <level>INFO</level>
-      <onMatch>ACCEPT</onMatch>
-      <onMismatch>DENY</onMismatch>
-    </filter>
-    <File>${logDirectory}/dataExport/audit.log</File>
-    <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-      <fileNamePattern>${logDirectory}/dynamicPayloadGenerator/audit.log.%d{yyyy-MM-dd}</fileNamePattern>
-    </rollingPolicy>
-    <encoder>
-      <pattern>${auditPattern}</pattern>
-    </encoder>
-  </appender>
-  <!-- dynamicPayloadGenerator log ends here -->
+            <maxHistory>${maxHistory}</maxHistory>
+            <totalSizeCap>${totalSizeCap}</totalSizeCap>
+          </rollingPolicy>
+          <encoder>
+            <pattern>${debugPattern}</pattern>
+          </encoder>
+        </appender>
+        <!-- DataGrooming logs started -->
+        <appender name="dataGrooming" class="ch.qos.logback.core.rolling.RollingFileAppender">
+          <filter class="ch.qos.logback.classic.filter.ThresholdFilter">
+            <level>WARN</level>
+          </filter>
+          <File>${logDirectory}/dataGrooming/error.log</File>
+          <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+            <fileNamePattern>${logDirectory}/dataGrooming/error.log.%d{yyyy-MM-dd}</fileNamePattern>
+            <maxHistory>${maxHistory}</maxHistory>
+            <totalSizeCap>${totalSizeCap}</totalSizeCap>
+          </rollingPolicy>
+          <encoder>
+            <pattern>${errorPattern}</pattern>
+          </encoder>
+        </appender>
+        <appender name="dataGroomingdebug" class="ch.qos.logback.core.rolling.RollingFileAppender">
+          <filter class="ch.qos.logback.classic.filter.LevelFilter">
+            <level>DEBUG</level>
+            <onMatch>ACCEPT</onMatch>
+            <onMismatch>DENY</onMismatch>
+          </filter>
+          <File>${logDirectory}/dataGrooming/debug.log</File>
+          <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+            <fileNamePattern>${logDirectory}/dataGrooming/debug.log.%d{yyyy-MM-dd}</fileNamePattern>
+            <maxHistory>${maxHistory}</maxHistory>
+            <totalSizeCap>${totalSizeCap}</totalSizeCap>
+          </rollingPolicy>
+          <encoder>
+            <pattern>${debugPattern}</pattern>
+          </encoder>
+        </appender>
+        <appender name="dataGroomingaudit" class="ch.qos.logback.core.rolling.RollingFileAppender">
+          <filter class="ch.qos.logback.classic.filter.LevelFilter">
+            <level>INFO</level>
+            <onMatch>ACCEPT</onMatch>
+            <onMismatch>DENY</onMismatch>
+          </filter>
+          <File>${logDirectory}/dataGrooming/audit.log</File>
+          <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+            <fileNamePattern>${logDirectory}/dataGrooming/audit.log.%d{yyyy-MM-dd}</fileNamePattern>
+            <maxHistory>${maxHistory}</maxHistory>
+            <totalSizeCap>${totalSizeCap}</totalSizeCap>
+          </rollingPolicy>
+          <encoder>
+            <pattern>${auditPattern}</pattern>
+          </encoder>
+        </appender>
+        <!-- DataGrooming logs ended -->
+        <!-- DataSnapshot logs started -->
+        <appender name="dataSnapshot" class="ch.qos.logback.core.rolling.RollingFileAppender">
+          <filter class="ch.qos.logback.classic.filter.ThresholdFilter">
+            <level>WARN</level>
+          </filter>
+          <File>${logDirectory}/dataSnapshot/error.log</File>
+          <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+            <fileNamePattern>${logDirectory}/dataSnapshot/error.log.%d{yyyy-MM-dd}</fileNamePattern>
+            <maxHistory>${maxHistory}</maxHistory>
+            <totalSizeCap>${totalSizeCap}</totalSizeCap>
+          </rollingPolicy>
+          <encoder>
+            <pattern>${errorPattern}</pattern>
+          </encoder>
+        </appender>
+        <appender name="dataSnapshotdebug" class="ch.qos.logback.core.rolling.RollingFileAppender">
+          <filter class="ch.qos.logback.classic.filter.LevelFilter">
+            <level>DEBUG</level>
+            <onMatch>ACCEPT</onMatch>
+            <onMismatch>DENY</onMismatch>
+          </filter>
+          <File>${logDirectory}/dataSnapshot/debug.log</File>
+          <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+            <fileNamePattern>${logDirectory}/dataSnapshot/debug.log.%d{yyyy-MM-dd}</fileNamePattern>
+            <maxHistory>${maxHistory}</maxHistory>
+            <totalSizeCap>${totalSizeCap}</totalSizeCap>
+          </rollingPolicy>
+          <encoder>
+            <pattern>${debugPattern}</pattern>
+          </encoder>
+        </appender>
+        <appender name="dataSnapshotaudit" class="ch.qos.logback.core.rolling.RollingFileAppender">
+          <filter class="ch.qos.logback.classic.filter.LevelFilter">
+            <level>INFO</level>
+            <onMatch>ACCEPT</onMatch>
+            <onMismatch>DENY</onMismatch>
+          </filter>
+          <File>${logDirectory}/dataSnapshot/audit.log</File>
+          <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+            <fileNamePattern>${logDirectory}/dataSnapshot/audit.log.%d{yyyy-MM-dd}</fileNamePattern>
+            <maxHistory>${maxHistory}</maxHistory>
+            <totalSizeCap>${totalSizeCap}</totalSizeCap>
+          </rollingPolicy>
+          <encoder>
+            <pattern>${auditPattern}</pattern>
+          </encoder>
+        </appender>
+        <!-- DataSnapshot logs ended -->
+        <!-- HistoryTruncate logs started -->
+        <appender name="historyTruncate" class="ch.qos.logback.core.rolling.RollingFileAppender">
+          <filter class="ch.qos.logback.classic.filter.ThresholdFilter">
+            <level>WARN</level>
+          </filter>
+          <File>${logDirectory}/historyTruncate/error.log</File>
+          <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+            <fileNamePattern>${logDirectory}/historyTruncate/error.log.%d{yyyy-MM-dd}</fileNamePattern>
+            <maxHistory>${maxHistory}</maxHistory>
+            <totalSizeCap>${totalSizeCap}</totalSizeCap>
+          </rollingPolicy>
+          <encoder>
+            <pattern>${errorPattern}</pattern>
+          </encoder>
+        </appender>
+        <appender name="historyTruncatedebug" class="ch.qos.logback.core.rolling.RollingFileAppender">
+          <filter class="ch.qos.logback.classic.filter.LevelFilter">
+            <level>DEBUG</level>
+            <onMatch>ACCEPT</onMatch>
+            <onMismatch>DENY</onMismatch>
+          </filter>
+          <File>${logDirectory}/historyTruncate/debug.log</File>
+          <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+            <fileNamePattern>${logDirectory}/historyTruncate/debug.log.%d{yyyy-MM-dd}</fileNamePattern>
+            <maxHistory>${maxHistory}</maxHistory>
+            <totalSizeCap>${totalSizeCap}</totalSizeCap>
+          </rollingPolicy>
+          <encoder>
+            <pattern>${debugPattern}</pattern>
+          </encoder>
+        </appender>
+        <appender name="historyTruncateaudit" class="ch.qos.logback.core.rolling.RollingFileAppender">
+          <filter class="ch.qos.logback.classic.filter.LevelFilter">
+            <level>INFO</level>
+            <onMatch>ACCEPT</onMatch>
+            <onMismatch>DENY</onMismatch>
+          </filter>
+          <File>${logDirectory}/historyTruncate/audit.log</File>
+          <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+            <fileNamePattern>${logDirectory}/historyTruncate/audit.log.%d{yyyy-MM-dd}</fileNamePattern>
+            <maxHistory>${maxHistory}</maxHistory>
+            <totalSizeCap>${totalSizeCap}</totalSizeCap>
+          </rollingPolicy>
+          <encoder>
+            <pattern>${auditPattern}</pattern>
+          </encoder>
+        </appender>
+        <!-- historyTruncate logs ended -->
+        <!-- CreateDBSchema logs started  -->
+        <appender name="createDBSchema" class="ch.qos.logback.core.rolling.RollingFileAppender">
+          <filter class="ch.qos.logback.classic.filter.ThresholdFilter">
+            <level>WARN</level>
+          </filter>
+          <File>${logDirectory}/createDBSchema/error.log</File>
+          <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+            <fileNamePattern>${logDirectory}/createDBSchema/error.log.%d{yyyy-MM-dd}</fileNamePattern>
+            <maxHistory>${maxHistory}</maxHistory>
+            <totalSizeCap>${totalSizeCap}</totalSizeCap>
+          </rollingPolicy>
+          <encoder>
+            <pattern>${"errorPattern"}</pattern>
+          </encoder>
+        </appender>
+        <appender name="createDBSchemadebug" class="ch.qos.logback.core.rolling.RollingFileAppender">
+          <filter class="ch.qos.logback.classic.filter.LevelFilter">
+            <level>DEBUG</level>
+            <onMatch>ACCEPT</onMatch>
+            <onMismatch>DENY</onMismatch>
+          </filter>
+          <File>${logDirectory}/createDBSchema/debug.log</File>
+          <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+            <fileNamePattern>${logDirectory}/createDBSchema/debug.log.%d{yyyy-MM-dd}</fileNamePattern>
+            <maxHistory>${maxHistory}</maxHistory>
+            <totalSizeCap>${totalSizeCap}</totalSizeCap>
+          </rollingPolicy>
+          <encoder>
+            <pattern>${debugPattern}</pattern>
+          </encoder>
+        </appender>
+        <appender name="createDBSchemametric" class="ch.qos.logback.core.rolling.RollingFileAppender">
+          <filter class="ch.qos.logback.classic.filter.LevelFilter">
+            <level>INFO</level>
+            <onMatch>ACCEPT</onMatch>
+            <onMismatch>DENY</onMismatch>
+          </filter>
+          <File>${logDirectory}/createDBSchema/metrics.log</File>
+          <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+            <fileNamePattern>${logDirectory}/createDBSchema/metrics.log.%d{yyyy-MM-dd}</fileNamePattern>
+            <maxHistory>${maxHistory}</maxHistory>
+            <totalSizeCap>${totalSizeCap}</totalSizeCap>
+          </rollingPolicy>
+          <encoder>
+            <pattern>${metricPattern}</pattern>
+          </encoder>
+        </appender>
+        <!-- CreateDBSchema logs ended  -->
+        <!-- DataCleanupTasks logs started  -->
+        <appender name="dataCleanuperror" class="ch.qos.logback.core.rolling.RollingFileAppender">
+          <filter class="ch.qos.logback.classic.filter.ThresholdFilter">
+            <level>WARN</level>
+          </filter>
+          <File>${logDirectory}/misc/error.log</File>
+          <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+            <fileNamePattern>${logDirectory}/misc/error.log.%d{yyyy-MM-dd}</fileNamePattern>
+            <maxHistory>${maxHistory}</maxHistory>
+            <totalSizeCap>${totalSizeCap}</totalSizeCap>
+          </rollingPolicy>
+          <encoder>
+            <pattern>${"errorPattern"}</pattern>
+          </encoder>
+        </appender>
+        <appender name="dataCleanupdebug" class="ch.qos.logback.core.rolling.RollingFileAppender">
+          <filter class="ch.qos.logback.classic.filter.LevelFilter">
+            <level>DEBUG</level>
+            <onMatch>ACCEPT</onMatch>
+            <onMismatch>DENY</onMismatch>
+          </filter>
+          <File>${logDirectory}/misc/debug.log</File>
+          <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+            <fileNamePattern>${logDirectory}/misc/debug.log.%d{yyyy-MM-dd}</fileNamePattern>
+            <maxHistory>${maxHistory}</maxHistory>
+            <totalSizeCap>${totalSizeCap}</totalSizeCap>
+          </rollingPolicy>
+          <encoder>
+            <pattern>${debugPattern}</pattern>
+          </encoder>
+        </appender>
+        <appender name="dataCleanupaudit" class="ch.qos.logback.core.rolling.RollingFileAppender">
+          <filter class="ch.qos.logback.classic.filter.LevelFilter">
+            <level>INFO</level>
+            <onMatch>ACCEPT</onMatch>
+            <onMismatch>DENY</onMismatch>
+          </filter>
+          <File>${logDirectory}/misc/audit.log</File>
+          <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+            <fileNamePattern>${logDirectory}/misc/audit.log.%d{yyyy-MM-dd}</fileNamePattern>
+            <maxHistory>${maxHistory}</maxHistory>
+            <totalSizeCap>${totalSizeCap}</totalSizeCap>
+          </rollingPolicy>
+          <encoder>
+            <pattern>${auditPattern}</pattern>
+          </encoder>
+        </appender>
+        <!-- DataCleanupTasks logs ended  -->
+        <!-- dupeTool logs started -->
+        <appender name="dupeTooldebug" class="ch.qos.logback.core.rolling.RollingFileAppender">
+          <filter class="ch.qos.logback.classic.filter.LevelFilter">
+            <level>DEBUG</level>
+            <onMatch>ACCEPT</onMatch>
+            <onMismatch>DENY</onMismatch>
+          </filter>
+          <File>${logDirectory}/dupetool/debug.log</File>
+          <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+            <fileNamePattern>${logDirectory}/dupetool/debug.log.%d{yyyy-MM-dd}</fileNamePattern>
+            <maxHistory>${maxHistory}</maxHistory>
+            <totalSizeCap>${totalSizeCap}</totalSizeCap>
+          </rollingPolicy>
+          <encoder>
+            <pattern>${debugPattern}</pattern>
+          </encoder>
+        </appender>
+        <appender name="dupeToolerror" class="ch.qos.logback.core.rolling.RollingFileAppender">
+          <filter class="ch.qos.logback.classic.filter.LevelFilter">
+            <level>WARN</level>
+            <onMatch>ACCEPT</onMatch>
+            <onMismatch>DENY</onMismatch>
+          </filter>
+          <File>${logDirectory}/dupeTool/error.log</File>
+          <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+            <fileNamePattern>${logDirectory}/dupeTool/error.log.%d{yyyy-MM-dd}</fileNamePattern>
+            <maxHistory>${maxHistory}</maxHistory>
+            <totalSizeCap>${totalSizeCap}</totalSizeCap>
+          </rollingPolicy>
+          <encoder>
+            <pattern>${errorPattern}</pattern>
+          </encoder>
+        </appender>
+        <!-- dupeTool logs ended -->
+        <!-- dynamicPayloadGenerator log starts here -->
+        <appender name="dynamicPayloadGeneratorError" class="ch.qos.logback.core.rolling.RollingFileAppender">
+          <filter class="ch.qos.logback.classic.filter.ThresholdFilter">
+            <level>WARN</level>
+          </filter>
+          <File>${logDirectory}/dynamicPayloadGenerator/error.log</File>
+          <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+            <fileNamePattern>${logDirectory}/dynamicPayloadGenerator/error.log.%d{yyyy-MM-dd}</fileNamePattern>
+            <maxHistory>${maxHistory}</maxHistory>
+            <totalSizeCap>${totalSizeCap}</totalSizeCap>
+          </rollingPolicy>
+          <encoder>
+            <pattern>${errorPattern}</pattern>
+          </encoder>
+        </appender>
+        <appender name="dynamicPayloadGeneratorDebug" class="ch.qos.logback.core.rolling.RollingFileAppender">
+          <filter class="ch.qos.logback.classic.filter.LevelFilter">
+            <level>DEBUG</level>
+            <onMatch>ACCEPT</onMatch>
+            <onMismatch>DENY</onMismatch>
+          </filter>
+          <File>${logDirectory}/dynamicPayloadGenerator/debug.log</File>
+          <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+            <fileNamePattern>${logDirectory}/dynamicPayloadGenerator/debug.log.%d{yyyy-MM-dd}</fileNamePattern>
+            <maxHistory>${maxHistory}</maxHistory>
+            <totalSizeCap>${totalSizeCap}</totalSizeCap>
+          </rollingPolicy>
+          <encoder>
+            <pattern>${debugPattern}</pattern>
+          </encoder>
+        </appender>
+        <appender name="dynamicPayloadGeneratorAudit" class="ch.qos.logback.core.rolling.RollingFileAppender">
+          <filter class="ch.qos.logback.classic.filter.LevelFilter">
+            <level>INFO</level>
+            <onMatch>ACCEPT</onMatch>
+            <onMismatch>DENY</onMismatch>
+          </filter>
+          <File>${logDirectory}/dataExport/audit.log</File>
+          <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+            <fileNamePattern>${logDirectory}/dynamicPayloadGenerator/audit.log.%d{yyyy-MM-dd}</fileNamePattern>
+            <maxHistory>${maxHistory}</maxHistory>
+            <totalSizeCap>${totalSizeCap}</totalSizeCap>
+          </rollingPolicy>
+          <encoder>
+            <pattern>${auditPattern}</pattern>
+          </encoder>
+        </appender>
+        <!-- dynamicPayloadGenerator log ends here -->
+        <!-- forceDelete logs started -->
+        <appender name="forceDeletedebug" class="ch.qos.logback.core.rolling.RollingFileAppender">
+          <filter class="ch.qos.logback.classic.filter.LevelFilter">
+            <level>DEBUG</level>
+            <onMatch>ACCEPT</onMatch>
+            <onMismatch>DENY</onMismatch>
+          </filter>
+          <File>${logDirectory}/forceDelete/debug.log</File>
+          <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+            <fileNamePattern>${logDirectory}/forceDelete/debug.log.%d{yyyy-MM-dd}</fileNamePattern>
+            <maxHistory>${maxHistory}</maxHistory>
+            <totalSizeCap>${totalSizeCap}</totalSizeCap>
+          </rollingPolicy>
+          <encoder>
+            <pattern>${debugPattern}</pattern>
+          </encoder>
+        </appender>
+        <appender name="forceDeleteerror" class="ch.qos.logback.core.rolling.RollingFileAppender">
+          <filter class="ch.qos.logback.classic.filter.LevelFilter">
+            <level>WARN</level>
+            <onMatch>ACCEPT</onMatch>
+            <onMismatch>DENY</onMismatch>
+          </filter>
+          <File>${logDirectory}/forceDelete/error.log</File>
+          <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+            <fileNamePattern>${logDirectory}/forceDelete/error.log.%d{yyyy-MM-dd}</fileNamePattern>
+            <maxHistory>${maxHistory}</maxHistory>
+            <totalSizeCap>${totalSizeCap}</totalSizeCap>
+          </rollingPolicy>
+          <encoder>
+            <pattern>${errorPattern}</pattern>
+          </encoder>
+        </appender>
+        <!-- forceDelete logs ended -->
+        <!-- migration logs started -->
+        <appender name="migrationdebug" class="ch.qos.logback.core.rolling.RollingFileAppender">
+          <filter class="ch.qos.logback.classic.filter.LevelFilter">
+            <level>DEBUG</level>
+            <onMatch>ACCEPT</onMatch>
+            <onMismatch>DENY</onMismatch>
+          </filter>
+          <File>${logDirectory}/migration/debug.log</File>
+          <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+            <fileNamePattern>${logDirectory}/migration/debug.log.%d{yyyy-MM-dd}</fileNamePattern>
+            <maxHistory>${maxHistory}</maxHistory>
+            <totalSizeCap>${totalSizeCap}</totalSizeCap>
+          </rollingPolicy>
+          <encoder>
+            <pattern>${debugPattern}</pattern>
+          </encoder>
+        </appender>
+        <appender name="migrationerror" class="ch.qos.logback.core.rolling.RollingFileAppender">
+          <filter class="ch.qos.logback.classic.filter.LevelFilter">
+            <level>WARN</level>
+            <onMatch>ACCEPT</onMatch>
+            <onMismatch>DENY</onMismatch>
+          </filter>
+          <File>${logDirectory}/migration/error.log</File>
+          <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+            <fileNamePattern>${logDirectory}/migration/error.log.%d{yyyy-MM-dd}</fileNamePattern>
+            <maxHistory>${maxHistory}</maxHistory>
+            <totalSizeCap>${totalSizeCap}</totalSizeCap>
+          </rollingPolicy>
+          <encoder>
+            <pattern>${errorPattern}</pattern>
+          </encoder>
+        </appender>
+        <!-- migration logs ended -->
+        <!-- DataGrooming logs started -->
+        <appender name="dataExportError" class="ch.qos.logback.core.rolling.RollingFileAppender">
+          <filter class="ch.qos.logback.classic.filter.ThresholdFilter">
+            <level>WARN</level>
+          </filter>
+          <File>${logDirectory}/dataExport/error.log</File>
+          <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+            <fileNamePattern>${logDirectory}/dataExport/error.log.%d{yyyy-MM-dd}</fileNamePattern>
+            <maxHistory>${maxHistory}</maxHistory>
+            <totalSizeCap>${totalSizeCap}</totalSizeCap>
+          </rollingPolicy>
+          <encoder>
+            <pattern>${errorPattern}</pattern>
+          </encoder>
+        </appender>
+        <appender name="dataExportDebug" class="ch.qos.logback.core.rolling.RollingFileAppender">
+          <filter class="ch.qos.logback.classic.filter.LevelFilter">
+            <level>DEBUG</level>
+            <onMatch>ACCEPT</onMatch>
+            <onMismatch>DENY</onMismatch>
+          </filter>
+          <File>${logDirectory}/dataExport/debug.log</File>
+          <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+            <fileNamePattern>${logDirectory}/dataExport/debug.log.%d{yyyy-MM-dd}</fileNamePattern>
+            <maxHistory>${maxHistory}</maxHistory>
+            <totalSizeCap>${totalSizeCap}</totalSizeCap>
+          </rollingPolicy>
+          <encoder>
+            <pattern>${debugPattern}</pattern>
+          </encoder>
+        </appender>
+        <appender name="dataExportAudit" class="ch.qos.logback.core.rolling.RollingFileAppender">
+          <filter class="ch.qos.logback.classic.filter.LevelFilter">
+            <level>INFO</level>
+            <onMatch>ACCEPT</onMatch>
+            <onMismatch>DENY</onMismatch>
+          </filter>
+          <File>${logDirectory}/dataExport/audit.log</File>
+          <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+            <fileNamePattern>${logDirectory}/dataExport/audit.log.%d{yyyy-MM-dd}</fileNamePattern>
+            <maxHistory>${maxHistory}</maxHistory>
+            <totalSizeCap>${totalSizeCap}</totalSizeCap>
+          </rollingPolicy>
+          <encoder>
+            <pattern>${auditPattern}</pattern>
+          </encoder>
+        </appender>
+        <!-- schemaMod log starts -->
+        <appender name="schemaModdebug" class="ch.qos.logback.core.rolling.RollingFileAppender">
+          <filter class="ch.qos.logback.classic.filter.LevelFilter">
+            <level>DEBUG</level>
+            <onMatch>ACCEPT</onMatch>
+            <onMismatch>DENY</onMismatch>
+          </filter>
+          <File>${logDirectory}/schemaMod/debug.log</File>
+          <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+            <fileNamePattern>${logDirectory}/schemaMod/debug.log.%d{yyyy-MM-dd}</fileNamePattern>
+            <maxHistory>${maxHistory}</maxHistory>
+            <totalSizeCap>${totalSizeCap}</totalSizeCap>
+          </rollingPolicy>
+          <encoder>
+            <pattern>${debugPattern}</pattern>
+          </encoder>
+        </appender>
+        <appender name="schemaModerror" class="ch.qos.logback.core.rolling.RollingFileAppender">
+          <filter class="ch.qos.logback.classic.filter.LevelFilter">
+            <level>WARN</level>
+            <onMatch>ACCEPT</onMatch>
+            <onMismatch>DENY</onMismatch>
+          </filter>
+          <File>${logDirectory}/schemaMod/error.log</File>
+          <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+            <fileNamePattern>${logDirectory}/schemaMod/error.log.%d{yyyy-MM-dd}</fileNamePattern>
+            <maxHistory>${maxHistory}</maxHistory>
+            <totalSizeCap>${totalSizeCap}</totalSizeCap>
+          </rollingPolicy>
+          <encoder>
+            <pattern>${errorPattern}</pattern>
+          </encoder>
+        </appender>
+        <!-- schemaMod log ends -->
+        <!-- uniquePropertyCheck log starts here -->
+        <appender name="uniquePropertyCheckdebug" class="ch.qos.logback.core.rolling.RollingFileAppender">
+          <filter class="ch.qos.logback.classic.filter.LevelFilter">
+            <level>DEBUG</level>
+            <onMatch>ACCEPT</onMatch>
+            <onMismatch>DENY</onMismatch>
+          </filter>
+          <File>${logDirectory}/uniquePropertyCheck/debug.log</File>
+          <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+            <fileNamePattern>${logDirectory}/uniquePropertyCheck/debug.log.%d{yyyy-MM-dd}</fileNamePattern>
+            <maxHistory>${maxHistory}</maxHistory>
+            <totalSizeCap>${totalSizeCap}</totalSizeCap>
+          </rollingPolicy>
+          <encoder>
+            <pattern>${debugPattern}</pattern>
+          </encoder>
+        </appender>
+        <appender name="uniquePropertyCheckmetric" class="ch.qos.logback.core.rolling.RollingFileAppender">
+          <filter class="ch.qos.logback.classic.filter.LevelFilter">
+            <level>INFO</level>
+            <onMatch>ACCEPT</onMatch>
+            <onMismatch>DENY</onMismatch>
+          </filter>
+          <File>${logDirectory}/uniquePropertyCheck/metrics.log</File>
+          <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+            <fileNamePattern>${logDirectory}/uniquePropertyCheck/metrics.log.%d{yyyy-MM-dd}</fileNamePattern>
+            <maxHistory>${maxHistory}</maxHistory>
+            <totalSizeCap>${totalSizeCap}</totalSizeCap>
+          </rollingPolicy>
+          <encoder>
+            <pattern>${metricPattern}</pattern>
+          </encoder>
+        </appender>
+        <appender name="uniquePropertyCheckerror" class="ch.qos.logback.core.rolling.RollingFileAppender">
+          <filter class="ch.qos.logback.classic.filter.LevelFilter">
+            <level>WARN</level>
+            <onMatch>ACCEPT</onMatch>
+            <onMismatch>DENY</onMismatch>
+          </filter>
+          <File>${logDirectory}/uniquePropertyCheck/error.log</File>
+          <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+            <fileNamePattern>${logDirectory}/uniquePropertyCheck/error.log.%d{yyyy-MM-dd}</fileNamePattern>
+            <maxHistory>${maxHistory}</maxHistory>
+            <totalSizeCap>${totalSizeCap}</totalSizeCap>
+          </rollingPolicy>
+          <encoder>
+            <pattern>${errorPattern}</pattern>
+          </encoder>
+        </appender>
+        <!-- uniquePropertyCheck log ends here -->
+        <!-- dynamicPayloadGenerator log starts here -->
+        <appender name="dynamicPayloadGeneratorError" class="ch.qos.logback.core.rolling.RollingFileAppender">
+          <filter class="ch.qos.logback.classic.filter.ThresholdFilter">
+            <level>WARN</level>
+          </filter>
+          <File>${logDirectory}/dynamicPayloadGenerator/error.log</File>
+          <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+            <fileNamePattern>${logDirectory}/dynamicPayloadGenerator/error.log.%d{yyyy-MM-dd}</fileNamePattern>
+            <maxHistory>${maxHistory}</maxHistory>
+            <totalSizeCap>${totalSizeCap}</totalSizeCap>
+          </rollingPolicy>
+          <encoder>
+            <pattern>${errorPattern}</pattern>
+          </encoder>
+        </appender>
+        <appender name="dynamicPayloadGeneratorDebug" class="ch.qos.logback.core.rolling.RollingFileAppender">
+          <filter class="ch.qos.logback.classic.filter.LevelFilter">
+            <level>DEBUG</level>
+            <onMatch>ACCEPT</onMatch>
+            <onMismatch>DENY</onMismatch>
+          </filter>
+          <File>${logDirectory}/dynamicPayloadGenerator/debug.log</File>
+          <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+            <fileNamePattern>${logDirectory}/dynamicPayloadGenerator/debug.log.%d{yyyy-MM-dd}</fileNamePattern>
+            <maxHistory>${maxHistory}</maxHistory>
+            <totalSizeCap>${totalSizeCap}</totalSizeCap>
+          </rollingPolicy>
+          <encoder>
+            <pattern>${debugPattern}</pattern>
+          </encoder>
+        </appender>
+        <appender name="dynamicPayloadGeneratorAudit" class="ch.qos.logback.core.rolling.RollingFileAppender">
+          <filter class="ch.qos.logback.classic.filter.LevelFilter">
+            <level>INFO</level>
+            <onMatch>ACCEPT</onMatch>
+            <onMismatch>DENY</onMismatch>
+          </filter>
+          <File>${logDirectory}/dataExport/audit.log</File>
+          <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+            <fileNamePattern>${logDirectory}/dynamicPayloadGenerator/audit.log.%d{yyyy-MM-dd}</fileNamePattern>
+            <maxHistory>${maxHistory}</maxHistory>
+            <totalSizeCap>${totalSizeCap}</totalSizeCap>
+          </rollingPolicy>
+          <encoder>
+            <pattern>${auditPattern}</pattern>
+          </encoder>
+        </appender>
+        <!-- dynamicPayloadGenerator log ends here -->
+    </then>
+  </if>
+
   <logger name="org.onap.aai" level="DEBUG" additivity="false">
-    <appender-ref ref="asyncDEBUG"/>
-    <appender-ref ref="asyncSANE"/>
+    <if condition='property("logToFileEnabled").contains("true")'>
+      <then>
+        <appender-ref ref="asyncDEBUG"/>
+        <appender-ref ref="asyncSANE"/>
+      </then>
+    </if>
     <appender-ref ref="STDOUT"/>
   </logger>
   <!-- Spring related loggers -->
   <logger name="ch.qos.logback.core" level="WARN"/>
   <logger name="org.eclipse.jetty" level="WARN"/>
   <!-- logback jms appenders & loggers definition starts here -->
-  <appender name="auditLogs" class="ch.qos.logback.core.rolling.RollingFileAppender">
-    <filter class="ch.qos.logback.classic.filter.ThresholdFilter"/>
-    <file>${logDirectory}/perf-audit/Audit-${lrmRVer}-${lrmRO}-${Pid}.log</file>
-    <rollingPolicy class="ch.qos.logback.core.rolling.FixedWindowRollingPolicy">
-      <fileNamePattern>${logDirectory}/perf-audit/Audit-${lrmRVer}-${lrmRO}-${Pid}.%i.log.zip</fileNamePattern>
-      <minIndex>1</minIndex>
-      <maxIndex>9</maxIndex>
-    </rollingPolicy>
-    <triggeringPolicy class="ch.qos.logback.core.rolling.SizeBasedTriggeringPolicy">
-      <maxFileSize>5MB</maxFileSize>
-    </triggeringPolicy>
-    <encoder>
-      <pattern>auditPattern</pattern>
-    </encoder>
-  </appender>
-  <appender name="perfLogs" class="ch.qos.logback.core.rolling.RollingFileAppender">
-    <filter class="ch.qos.logback.classic.filter.ThresholdFilter"/>
-    <file>${logDirectory}/perf-audit/Perform-${lrmRVer}-${lrmRO}-${Pid}.log</file>
-    <rollingPolicy class="ch.qos.logback.core.rolling.FixedWindowRollingPolicy">
-      <fileNamePattern>${logDirectory}/perf-audit/Perform-${lrmRVer}-${lrmRO}-${Pid}.%i.log.zip</fileNamePattern>
-      <minIndex>1</minIndex>
-      <maxIndex>9</maxIndex>
-    </rollingPolicy>
-    <triggeringPolicy class="ch.qos.logback.core.rolling.SizeBasedTriggeringPolicy">
-      <maxFileSize>5MB</maxFileSize>
-    </triggeringPolicy>
-    <encoder>
-      <pattern>"%d [%thread] %-5level %logger{1024} - %msg%n"</pattern>
-    </encoder>
-  </appender>
-  <appender name="auth" class="ch.qos.logback.core.rolling.RollingFileAppender">
-    <filter class="ch.qos.logback.classic.filter.ThresholdFilter">
-      <level>DEBUG</level>
-    </filter>
-    <file>${logDirectory}/auth/auth.log</file>
-    <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-      <fileNamePattern>${logDirectory}/auth/auth.log.%d{yyyy-MM-dd}</fileNamePattern>
-    </rollingPolicy>
-    <encoder>
-      <pattern>%d{yyyy-MM-dd'T'HH:mm:ss.SSSZ, UTC}[%thread] %-5level %logger{1024} - %msg%n</pattern>
-    </encoder>
-  </appender>
-  <appender name="asyncAUTH" class="ch.qos.logback.classic.AsyncAppender">
-    <queueSize>1000</queueSize>
-    <includeCallerData>true</includeCallerData>
-    <appender-ref ref="auth"/>
-  </appender>
+  <if condition='property("logToFileEnabled").contains("true")'>
+    <then>
+      <appender name="auditLogs" class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <filter class="ch.qos.logback.classic.filter.ThresholdFilter"/>
+        <file>${logDirectory}/perf-audit/Audit-${lrmRVer}-${lrmRO}-${Pid}.log</file>
+        <rollingPolicy class="ch.qos.logback.core.rolling.FixedWindowRollingPolicy">
+          <fileNamePattern>${logDirectory}/perf-audit/Audit-${lrmRVer}-${lrmRO}-${Pid}.%i.log.zip</fileNamePattern>
+          <minIndex>1</minIndex>
+          <maxIndex>9</maxIndex>
+        </rollingPolicy>
+        <triggeringPolicy class="ch.qos.logback.core.rolling.SizeBasedTriggeringPolicy">
+          <maxFileSize>5MB</maxFileSize>
+        </triggeringPolicy>
+        <encoder>
+          <pattern>auditPattern</pattern>
+        </encoder>
+      </appender>
+      <appender name="perfLogs" class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <filter class="ch.qos.logback.classic.filter.ThresholdFilter"/>
+        <file>${logDirectory}/perf-audit/Perform-${lrmRVer}-${lrmRO}-${Pid}.log</file>
+        <rollingPolicy class="ch.qos.logback.core.rolling.FixedWindowRollingPolicy">
+          <fileNamePattern>${logDirectory}/perf-audit/Perform-${lrmRVer}-${lrmRO}-${Pid}.%i.log.zip</fileNamePattern>
+          <minIndex>1</minIndex>
+          <maxIndex>9</maxIndex>
+        </rollingPolicy>
+        <triggeringPolicy class="ch.qos.logback.core.rolling.SizeBasedTriggeringPolicy">
+          <maxFileSize>5MB</maxFileSize>
+        </triggeringPolicy>
+        <encoder>
+          <pattern>"%d [%thread] %-5level %logger{1024} - %msg%n"</pattern>
+        </encoder>
+      </appender>
+      <appender name="auth" class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <filter class="ch.qos.logback.classic.filter.ThresholdFilter">
+          <level>DEBUG</level>
+        </filter>
+        <file>${logDirectory}/auth/auth.log</file>
+        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+          <fileNamePattern>${logDirectory}/auth/auth.log.%d{yyyy-MM-dd}</fileNamePattern>
+          <maxHistory>${maxHistory}</maxHistory>
+          <totalSizeCap>${totalSizeCap}</totalSizeCap>
+        </rollingPolicy>
+        <encoder>
+          <pattern>%d{yyyy-MM-dd'T'HH:mm:ss.SSSZ, UTC}[%thread] %-5level %logger{1024} - %msg%n</pattern>
+        </encoder>
+      </appender>
+      <appender name="asyncAUTH" class="ch.qos.logback.classic.AsyncAppender">
+        <queueSize>${queueSize}</queueSize>
+        <includeCallerData>true</includeCallerData>
+        <appender-ref ref="auth"/>
+      </appender>
+    </then>
+  </if>
+
   <logger name="AuditRecord" level="INFO" additivity="false">
-    <appender-ref ref="auditLogs"/>
+    <if condition='property("logToFileEnabled").contains("true")'>
+      <then>
+        <appender-ref ref="auditLogs"/>
+      </then>
+    </if>
+    <appender-ref ref="STDOUT"/>
   </logger>
   <logger name="AuditRecord_DirectCall" level="INFO" additivity="false">
-    <appender-ref ref="auditLogs"/>
+    <if condition='property("logToFileEnabled").contains("true")'>
+      <then>
+        <appender-ref ref="auditLogs"/>
+      </then>
+    </if>
+    <appender-ref ref="STDOUT"/>
   </logger>
   <logger name="PerfTrackerRecord" level="INFO" additivity="false">
-    <appender-ref ref="perfLogs"/>
+    <if condition='property("logToFileEnabled").contains("true")'>
+      <then>
+        <appender-ref ref="perfLogs"/>
+      </then>
+    </if>
+    <appender-ref ref="STDOUT"/>
   </logger>
   <!-- logback jms appenders & loggers definition ends here -->
   <logger name="org.onap.aai.aaf" level="DEBUG" additivity="false">
-    <appender-ref ref="asyncAUTH"/>
-    <appender-ref ref="STDOUT"/>
-  </logger>
-  <logger name="org.onap.aai.aailog.filter.RestClientLoggingInterceptor" level="INFO">
-    <appender-ref ref="asyncMETRIC"/>
-    <appender-ref ref="STDOUT"/>
-  </logger>
-  <logger name="org.onap.logging.filter.base.AbstractMetricLogFilter" level="INFO">
-    <appender-ref ref="asyncMETRIC"/>
-    <appender-ref ref="STDOUT"/>
-  </logger>
-  <logger name="org.onap.aai.aailog.logs.AaiScheduledTaskAuditLog" level="INFO">
-    <appender-ref ref="asyncAUDIT"/>
+    <if condition='property("logToFileEnabled").contains("true")'>
+      <then>
+        <appender-ref ref="asyncAUTH"/>
+      </then>
+    </if>
     <appender-ref ref="STDOUT"/>
   </logger>
+
+  <if condition='property("logToFileEnabled").contains("true")'>
+    <then>
+      <logger name="org.onap.aai.aailog.filter.RestClientLoggingInterceptor" level="INFO">
+        <appender-ref ref="asyncMETRIC"/>
+      </logger>
+      <logger name="org.onap.logging.filter.base.AbstractMetricLogFilter" level="INFO">
+        <appender-ref ref="asyncMETRIC"/>
+      </logger>
+      <logger name="org.onap.aai.aailog.logs.AaiScheduledTaskAuditLog" level="INFO">
+        <appender-ref ref="asyncAUDIT"/>
+      </logger>
+      <logger name="org.onap.aai.aailog.logs.AaiDBMetricLog" level="INFO">
+        <appender-ref ref="asyncMETRIC"/>
+      </logger>
+      <logger name="org.onap.aai.logging.ErrorLogHelper" level="WARN">
+        <appender-ref ref="asyncERROR"/>
+      </logger>
+    </then>
+  </if>
+
   <logger name="org.onap.logging.filter.base.AbstractAuditLogFilter" level="INFO">
-    <appender-ref ref="asyncAUDIT"/>
-    <appender-ref ref="STDOUT"/>
-  </logger>
-  <logger name="org.onap.aai.aailog.logs.AaiDBMetricLog" level="INFO">
-    <appender-ref ref="asyncMETRIC"/>
-    <appender-ref ref="STDOUT"/>
-  </logger>
-  <logger name="org.onap.aai.logging.ErrorLogHelper" level="WARN">
-    <appender-ref ref="asyncERROR"/>
+    <if condition='property("logToFileEnabled").contains("true")'>
+      <then>
+        <appender-ref ref="asyncAUDIT"/>
+      </then>
+    </if>
     <appender-ref ref="STDOUT"/>
   </logger>
   <logger name="org.onap.aai.interceptors.post" level="DEBUG" additivity="false">
-    <appender-ref ref="asynctranslog"/>
+    <if condition='property("logToFileEnabled").contains("true")'>
+      <then>
+        <appender-ref ref="asynctranslog"/>
+      </then>
+    </if>
     <appender-ref ref="STDOUT"/>
   </logger>
   <logger name="org.onap.aai.dmaap" level="DEBUG" additivity="false">
-    <appender-ref ref="dmaapAAIEventConsumer"/>
-    <appender-ref ref="dmaapAAIEventConsumerDebug"/>
-    <appender-ref ref="dmaapAAIEventConsumerMetric"/>
+    <if condition='property("logToFileEnabled").contains("true")'>
+      <then>
+        <appender-ref ref="dmaapAAIEventConsumer"/>
+        <appender-ref ref="dmaapAAIEventConsumerDebug"/>
+        <appender-ref ref="dmaapAAIEventConsumerMetric"/>
+      </then>
+    </if>
     <appender-ref ref="STDOUT"/>
   </logger>
   <logger name="org.onap.aai.datasnapshot" level="DEBUG" additivity="false">
-    <appender-ref ref="dataSnapshot"/>
-    <appender-ref ref="dataSnapshotdebug"/>
-    <appender-ref ref="dataSnapshotaudit"/>
+    <if condition='property("logToFileEnabled").contains("true")'>
+      <then>
+        <appender-ref ref="dataSnapshot"/>
+        <appender-ref ref="dataSnapshotdebug"/>
+        <appender-ref ref="dataSnapshotaudit"/>
+      </then>
+    </if>
     <appender-ref ref="STDOUT"/>
   </logger>
   <logger name="org.onap.aai.historytruncate" level="DEBUG" additivity="false">
-    <appender-ref ref="historyTruncate"/>
-    <appender-ref ref="historyTruncatedebug"/>
-    <appender-ref ref="historyTruncateaudit"/>
+    <if condition='property("logToFileEnabled").contains("true")'>
+      <then>
+        <appender-ref ref="historyTruncate"/>
+        <appender-ref ref="historyTruncatedebug"/>
+        <appender-ref ref="historyTruncateaudit"/>
+      </then>
+    </if>
+    <appender-ref ref="STDOUT"/>
   </logger>
   <logger name="org.onap.aai.datagrooming" level="DEBUG" additivity="false">
-    <appender-ref ref="dataGrooming"/>
-    <appender-ref ref="dataGroomingdebug"/>
-    <appender-ref ref="dataGroomingaudit"/>
+    <if condition='property("logToFileEnabled").contains("true")'>
+      <then>
+        <appender-ref ref="dataGrooming"/>
+        <appender-ref ref="dataGroomingdebug"/>
+        <appender-ref ref="dataGroomingaudit"/>
+      </then>
+    </if>
     <appender-ref ref="STDOUT"/>
   </logger>
   <logger name="org.onap.aai.schema" level="DEBUG" additivity="false">
-    <appender-ref ref="createDBSchema"/>
-    <appender-ref ref="createDBSchemadebug"/>
-    <appender-ref ref="createDBSchemametric"/>
+    <if condition='property("logToFileEnabled").contains("true")'>
+      <then>
+        <appender-ref ref="createDBSchema"/>
+        <appender-ref ref="createDBSchemadebug"/>
+        <appender-ref ref="createDBSchemametric"/>
+      </then>
+    </if>
+    <appender-ref ref="STDOUT"/>
   </logger>
   <logger name="org.onap.aai.dbgen.DupeTool" level="DEBUG" additivity="false">
-    <appender-ref ref="dupeTooldebug"/>
-    <appender-ref ref="dupeToolerror"/>
+    <if condition='property("logToFileEnabled").contains("true")'>
+      <then>
+        <appender-ref ref="dupeTooldebug"/>
+        <appender-ref ref="dupeToolerror"/>
+      </then>
+    </if>
+    <appender-ref ref="STDOUT"/>
   </logger>
   <logger name="org.onap.aai.dbgen.DynamicPayloadGenerator" level="DEBUG" additivity="false">
-    <appender-ref ref="dynamicPayloadGeneratorAudit"/>
-    <appender-ref ref="dynamicPayloadGeneratorError"/>
-    <appender-ref ref="dynamicPayloadGeneratorDebug"/>
+    <if condition='property("logToFileEnabled").contains("true")'>
+      <then>
+        <appender-ref ref="dynamicPayloadGeneratorAudit"/>
+        <appender-ref ref="dynamicPayloadGeneratorError"/>
+        <appender-ref ref="dynamicPayloadGeneratorDebug"/>
+      </then>
+    </if>
+    <appender-ref ref="STDOUT"/>
   </logger>
   <logger name="org.onap.aai.dbgen" level="DEBUG" additivity="false">
-    <appender-ref ref="createDBSchema"/>
-    <appender-ref ref="createDBSchemadebug"/>
-    <appender-ref ref="createDBSchemametric"/>
+    <if condition='property("logToFileEnabled").contains("true")'>
+      <then>
+        <appender-ref ref="createDBSchema"/>
+        <appender-ref ref="createDBSchemadebug"/>
+        <appender-ref ref="createDBSchemametric"/>
+      </then>
+    </if>
+    <appender-ref ref="STDOUT"/>
   </logger>
   <logger name="org.onap.aai.datacleanup" level="DEBUG" additivity="false">
-    <appender-ref ref="dataCleanuperror"/>
-    <appender-ref ref="dataCleanupdebug"/>
-    <appender-ref ref="dataCleanupaudit"/>
+    <if condition='property("logToFileEnabled").contains("true")'>
+      <then>
+        <appender-ref ref="dataCleanuperror"/>
+        <appender-ref ref="dataCleanupdebug"/>
+        <appender-ref ref="dataCleanupaudit"/>
+      </then>
+    </if>
     <appender-ref ref="STDOUT"/>
   </logger>
   <logger name="org.onap.aai.migration" level="DEBUG" additivity="false">
-    <appender-ref ref="migrationdebug"/>
-    <appender-ref ref="migrationerror"/>
+    <if condition='property("logToFileEnabled").contains("true")'>
+      <then>
+        <appender-ref ref="migrationdebug"/>
+        <appender-ref ref="migrationerror"/>
+      </then>
+    </if>
+    <appender-ref ref="STDOUT"/>
   </logger>
   <logger name="org.onap.aai.util.SendMigrationNotifications" level="DEBUG" additivity="false">
-    <appender-ref ref="migrationdebug"/>
-    <appender-ref ref="migrationerror"/>
+    <if condition='property("logToFileEnabled").contains("true")'>
+      <then>
+        <appender-ref ref="migrationdebug"/>
+        <appender-ref ref="migrationerror"/>
+      </then>
+    </if>
+    <appender-ref ref="STDOUT"/>
   </logger>
   <logger name="org.onap.aai.util.SendDeleteMigrationNotifications" level="DEBUG" additivity="false">
-    <appender-ref ref="migrationdebug"/>
-    <appender-ref ref="migrationerror"/>
+    <if condition='property("logToFileEnabled").contains("true")'>
+      <then>
+        <appender-ref ref="migrationdebug"/>
+        <appender-ref ref="migrationerror"/>
+      </then>
+    </if>
+    <appender-ref ref="STDOUT"/>
   </logger>
   <logger name="org.onap.aai.dataexport" level="DEBUG" additivity="false">
-    <appender-ref ref="dataExportError"/>
-    <appender-ref ref="dataExportDebug"/>
-    <appender-ref ref="dataExportAudit"/>
+    <if condition='property("logToFileEnabled").contains("true")'>
+      <then>
+        <appender-ref ref="dataExportError"/>
+        <appender-ref ref="dataExportDebug"/>
+      </then>
+    </if>
     <appender-ref ref="STDOUT"/>
   </logger>
+  <if condition='property("logToFileEnabled").contains("true")'>
+    <then>
+      <logger name="org.onap.aai.dataexport" level="DEBUG" additivity="false">
+        <appender-ref ref="dataExportAudit"/>
+      </logger>
+    </then>
+  </if>
   <logger name="org.apache" level="WARN"/>
   <logger name="org.zookeeper" level="WARN"/>
   <logger name="com.netflix" level="WARN"/>
   <!-- General EELF logger -->
   <!-- ============================================================================ -->
   <logger name="com.att.eelf" level="WARN" additivity="false">
-    <appender-ref ref="asyncDEBUG"/>
-    <appender-ref ref="asyncERROR"/>
-    <appender-ref ref="asyncMETRIC"/>
+    <if condition='property("logToFileEnabled").contains("true")'>
+      <then>
+        <appender-ref ref="asyncDEBUG"/>
+        <appender-ref ref="asyncERROR"/>
+        <appender-ref ref="asyncMETRIC"/>
+      </then>
+    </if>
     <appender-ref ref="STDOUT"/>
   </logger>
   <root level="DEBUG">
-    <appender-ref ref="external"/>
+    <if condition='property("logToFileEnabled").contains("true")'>
+      <then>
+        <appender-ref ref="external"/>
+      </then>
+    </if>
     <appender-ref ref="STDOUT"/>
   </root>
 </configuration>
index 5241c6e..3e1479e 100644 (file)
@@ -143,6 +143,8 @@ spec:
           value: {{ .Values.service.internalPort | quote }}
         - name: INTERNAL_PORT_2
           value: {{ .Values.service.internalPort2 | quote }}
+        - name: INTERNAL_PORT_3
+          value: {{ .Values.service.internalPort3 | quote }}
         volumeMounts: {{ include "common.certInitializer.volumeMount" . | nindent 8 }}
         - mountPath: /etc/localtime
           name: localtime
@@ -173,6 +175,7 @@ spec:
         ports:
         - containerPort: {{ .Values.service.internalPort }}
         - containerPort: {{ .Values.service.internalPort2 }}
+        - containerPort: {{ .Values.service.internalPort3 }}
         lifecycle:
           # wait for active requests (long-running tasks) to be finished
           # Before the SIGTERM is invoked, Kubernetes exposes a preStop hook in the Pod.
index cf46553..6350f85 100644 (file)
@@ -40,11 +40,16 @@ spec:
   - port: {{ .Values.service.internalPort2 }}
     nodePort: {{ .Values.global.nodePortPrefix | default .Values.nodePortPrefix }}{{ .Values.service.nodePort2 }}
     name: {{ .Values.service.portName2 }}
+  - port: {{ .Values.service.internalPort3 }}
+    nodePort: {{ .Values.global.nodePortPrefix | default .Values.nodePortPrefix }}{{ .Values.service.nodePort3 }}
+    name: {{ .Values.service.portName3 }}
   {{- else -}}
   - port: {{ .Values.service.internalPort }}
     name: {{ .Values.service.portName }}{{ (eq "true" (include "common.needTLS" .)) | ternary "s" "" }}
   - port: {{ .Values.service.internalPort2 }}
     name: {{ .Values.service.portName2 }}
+  - port: {{ .Values.service.internalPort3 }}
+    name: {{ .Values.service.portName3 }}
   {{- end}}
   selector:
     app: {{ include "common.name" . }}
diff --git a/kubernetes/aai/components/aai-graphadmin/templates/servicemonitor.yaml b/kubernetes/aai/components/aai-graphadmin/templates/servicemonitor.yaml
new file mode 100644 (file)
index 0000000..c0d9f21
--- /dev/null
@@ -0,0 +1,3 @@
+{{- if .Values.metrics.serviceMonitor.enabled }}
+{{  include "common.serviceMonitor" . }}
+{{- end }}
\ No newline at end of file
index 170223c..2ac5545 100644 (file)
@@ -96,7 +96,7 @@ global: # global defaults
 
     # Specifies which clients should always default to realtime graph connection
     realtime:
-      clients: SDNC,MSO,SO,robot-ete
+      clients: SDNC,-1|MSO,-1|SO,-1|robot-ete,-1
 
 #################################################################
 # Certificate configuration
@@ -144,7 +144,7 @@ certInitializer:
     chown -R {{ .Values.user_id }}:{{ .Values.group_id }} {{ .Values.credsPath }}
 
 # application image
-image: onap/aai-graphadmin:1.11.0
+image: onap/aai-graphadmin:1.11.1
 pullPolicy: Always
 restartPolicy: Always
 flavor: small
@@ -240,6 +240,8 @@ service:
   internalPort: 8449
   portName2: tcp-5005
   internalPort2: 5005
+  portName3: aai-graphadmin-8448
+  internalPort3: 8448
   terminationGracePeriodSeconds: 120
 
 ingress:
@@ -267,6 +269,18 @@ persistence:
   mountSubPath: aai/aai-graphadmin
   mountSubPath1: aai/migration
 
+# To make logback capping values configurable
+logback:
+  logToFileEnabled: true
+  maxHistory: 7
+  totalSizeCap: 6GB
+  queueSize: 1000
+
+accessLogback:
+  logToFileEnabled: true
+  maxHistory: 7
+  totalSizeCap: 6GB
+
 resources:
   small:
     limits:
@@ -284,6 +298,24 @@ resources:
       memory: 2Gi
   unlimited: {}
 
+metrics:
+  serviceMonitor:
+    enabled: false
+    targetPort: 8448
+    path: /prometheus
+    basicAuth:
+      enabled: false
+
+    selector:
+      app: '{{ include "common.name" . }}'
+      chart: '{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}'
+      release: '{{ include "common.release" . }}'
+      heritage: '{{ .Release.Service }}'
+
+    relabelings: []
+
+    metricRelabelings: []
+
 # Not fully used for now
 securityContext:
   user_id: *user_id
index 468b41b..56aad3e 100644 (file)
 apiVersion: v2
 description: ONAP AAI modelloader
 name: aai-modelloader
-version: 11.0.0
+version: 12.0.0
 
 dependencies:
   - name: common
-    version: ~11.x-0
+    version: ~12.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: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
   - name: repositoryGenerator
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
   - name: serviceAccount
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
index 681da5d..bc53b4b 100644 (file)
@@ -30,14 +30,13 @@ ml.distribution.KEYSTORE_PASSWORD=
 ml.distribution.KEYSTORE_FILE=
 ml.distribution.PASSWORD=OBF:1ks51l8d1o3i1pcc1r2r1e211r391kls1pyj1z7u1njf1lx51go21hnj1y0k1mli1sop1k8o1j651vu91mxw1vun1mze1vv11j8x1k5i1sp11mjc1y161hlr1gm41m111nkj1z781pw31kku1r4p1e391r571pbm1o741l4x1ksp
 {{ end }}
-ml.distribution.CONSUMER_GROUP=aai-ml-group
-ml.distribution.CONSUMER_ID=aai-ml
+ml.distribution.CONSUMER_GROUP={{ .Values.config.kafka.sdcTopic.consumerGroup }}
+ml.distribution.CONSUMER_ID={{ .Values.config.kafka.sdcTopic.clientId }}
 ml.distribution.ENVIRONMENT_NAME=AUTO
 ml.distribution.POLLING_INTERVAL=30
 ml.distribution.POLLING_TIMEOUT=20
 ml.distribution.USER=aai
 ml.distribution.ARTIFACT_TYPES=MODEL_QUERY_SPEC,TOSCA_CSAR
-ml.distribution.MSG_BUS_ADDRESSES=message-router.{{.Release.Namespace}}
 
 # Model Loader AAI REST Client Configuration
 {{ if ( include "common.needTLS" .) }}
diff --git a/kubernetes/aai/components/aai-modelloader/templates/aai-sdc-list-kafka-user.yaml b/kubernetes/aai/components/aai-modelloader/templates/aai-sdc-list-kafka-user.yaml
new file mode 100644 (file)
index 0000000..d7e37e2
--- /dev/null
@@ -0,0 +1,37 @@
+{{/*
+  # Copyright Â© 2022 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.
+  */}}
+
+apiVersion: kafka.strimzi.io/v1beta2
+kind: KafkaUser
+metadata:
+  name: {{ include "common.release" . }}-{{ .Values.global.aaiSdcListenerKafkaUser }}
+  labels:
+    strimzi.io/cluster: {{ include "common.release" . }}-strimzi
+spec:
+  authentication:
+    type: {{ .Values.config.kafka.saslMechanism | lower }}
+  authorization:
+    type: {{ .Values.config.kafka.authType }}
+    acls:
+      - resource:
+          type: group
+          name: {{ .Values.config.kafka.sdcTopic.consumerGroup }}
+        operation: All
+      - resource:
+          type: topic
+          patternType: prefix
+          name: {{ .Values.config.kafka.sdcTopic.pattern }}
+        operation: All
index 47c13af..d3136d8 100644 (file)
@@ -28,6 +28,13 @@ metadata:
     heritage: {{ .Release.Service }}
 spec:
   replicas: {{ .Values.replicaCount }}
+  strategy:
+    type: {{ .Values.updateStrategy.type }}
+    {{- if (eq "RollingUpdate" .Values.updateStrategy.type) }}
+    rollingUpdate:
+      maxUnavailable: {{ .Values.updateStrategy.maxUnavailable }}
+      maxSurge: {{ .Values.updateStrategy.maxSurge }}
+    {{- end }}
   selector:
     matchLabels:
       app: {{ include "common.name" . }}
@@ -95,6 +102,12 @@ spec:
         env:
         - name: CONFIG_HOME
           value: /opt/app/model-loader/config/
+        - name: SECURITY_PROTOCOL
+          value: {{ .Values.config.kafka.securityProtocol }}
+        - name: SASL_MECHANISM
+          value: {{ .Values.config.kafka.saslMechanism }}
+        - name: SASL_JAAS_CONFIG
+          value: {{- include "common.secret.envFromSecretFast" (dict "global" . "uid" "aai-sdc-kafka-secret" "key" "sasl.jaas.config") | indent 10 }}
         volumeMounts: {{ include "common.certInitializer.volumeMount" . | nindent 8 }}
         - mountPath: /etc/localtime
           name: localtime
index d6013c8..70b0857 100644 (file)
@@ -27,3 +27,5 @@ metadata:
 type: Opaque
 data:
 {{ tpl (.Files.Glob "resources/config/auth/*").AsSecrets . | indent 2 }}
+---
+{{ include "common.secretFast" . }}
\ No newline at end of file
index 7857f6b..09bb32d 100644 (file)
 # Declare variables to be passed into your templates.
 global: # global defaults
   nodePortPrefix: 302
+  aaiSdcListenerKafkaUser: aai-sdc-list-user
+#################################################################
+# Secrets metaconfig
+#################################################################
+secrets:
+  - uid: aai-sdc-kafka-secret
+    externalSecret: '{{ tpl (default "" .Values.config.jaasConfExternalSecret) . }}'
+    type: genericKV
+    envs:
+      - name: sasl.jaas.config
+        value: '{{ .Values.config.someConfig }}'
+        policy: generate
 
 #################################################################
 # Certificate configuration
@@ -56,17 +68,32 @@ certInitializer:
     chown -R {{ .Values.user_id }}:{{ .Values.group_id }} {{ .Values.credsPath }}
 
 # application image
-image: onap/model-loader:1.11.0
+image: onap/model-loader:1.12.0
 pullPolicy: Always
 restartPolicy: Always
 flavor: small
 flavorOverride: small
+
 # application configuration
-config: {}
+config:
+  someConfig: blah
+  kafka:
+    securityProtocol: SASL_PLAINTEXT
+    saslMechanism: SCRAM-SHA-512
+    authType: simple
+    sdcTopic:
+      pattern: SDC-DIST
+      consumerGroup: aai
+      clientId: aai-model-loader
 
 # default number of instances
 replicaCount: 1
 
+updateStrategy:
+  type: RollingUpdate
+  maxUnavailable: 0
+  maxSurge: 1
+
 nodeSelector: {}
 
 affinity: {}
index 729d808..fc8ad97 100644 (file)
 apiVersion: v2
 description: ONAP AAI resources
 name: aai-resources
-version: 11.0.0
+version: 12.0.0
 
 dependencies:
   - name: common
-    version: ~11.x-0
+    version: ~12.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: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
   - name: repositoryGenerator
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
   - name: serviceAccount
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
index 7258b7b..b5b64be 100644 (file)
@@ -106,5 +106,17 @@ schema.service.ssl.trust-store-password=${TRUSTSTORE_PASSWORD}
 {{ end }}
 
 #to expose the Prometheus scraping endpoint
+management.port=8448
+management.endpoints.enabled-by-default=false
+management.security.enabled=false
+endpoints.enabled=false
+endpoints.info.enabled=false
+endpoints.prometheus.enabled=false
+endpoints.health.enabled=false
+management.metrics.web.server.auto-time-requests=false
 management.metrics.distribution.percentiles-histogram[http.server.requests]=true
-management.metrics.distribution.sla[http.server.requests]=20ms, 30ms, 40ms, 50ms, 60ms, 70ms, 80ms, 90ms, 100ms, 500ms, 1000ms, 5000ms, 7000ms
\ No newline at end of file
+management.metrics.distribution.sla[http.server.requests]=20ms, 30ms, 40ms, 50ms, 60ms, 70ms, 80ms, 90ms, 100ms, 500ms, 1000ms, 5000ms, 7000ms
+#Add common tag for grouping all aai related metrics
+management.metrics.tags.group_id=aai
+#It is not advisable to use labels to store dimensions with high cardinality. Enable this option only for debug purposes. For more information: https://github.com/micrometer-metrics/micrometer/issues/1584
+scrape.uri.metrics=false
\ No newline at end of file
index 74c58ff..33aa971 100644 (file)
@@ -136,6 +136,8 @@ spec:
           value: {{ .Values.service.internalPort | quote }}
         - name: INTERNAL_PORT_2
           value: {{ .Values.service.internalPort2 | quote }}
+        - name: INTERNAL_PORT_3
+          value: {{ .Values.service.internalPort3 | quote }}
         volumeMounts: {{ include "common.certInitializer.volumeMount" . | nindent 8 }}
         - mountPath: /etc/localtime
           name: localtime
@@ -184,6 +186,7 @@ spec:
         ports:
         - containerPort: {{ .Values.service.internalPort }}
         - containerPort: {{ .Values.service.internalPort2 }}
+        - containerPort: {{ .Values.service.internalPort3 }}
         lifecycle:
           # wait for active requests (long-running tasks) to be finished
           # Before the SIGTERM is invoked, Kubernetes exposes a preStop hook in the Pod.
index 4611846..8feb071 100644 (file)
@@ -34,12 +34,19 @@ spec:
   - port: {{ .Values.service.internalPort2 }}
     nodePort: {{ .Values.global.nodePortPrefix | default .Values.nodePortPrefix }}{{ .Values.service.nodePort2 }}
     name: {{ .Values.service.portName2 }}
+  - port: {{ .Values.service.internalPort3 }}
+    nodePort: {{ .Values.global.nodePortPrefix | default .Values.nodePortPrefix }}{{ .Values.service.nodePort3 }}
+    name: {{ .Values.service.portName3 }}
   {{- else -}}
   - port: {{ .Values.service.internalPort }}
     name: {{ .Values.service.portName }}{{ (eq "true" (include "common.needTLS" .)) | ternary "s" "" }}
   - port: {{ .Values.service.internalPort2 }}
     name: {{ .Values.service.portName2 }}
+  - port: {{ .Values.service.internalPort3 }}
+    name: {{ .Values.service.portName3 }}
   {{- end }}
   selector:
     app: {{ include "common.name" . }}
     release: {{ include "common.release" . }}
+  clusterIP: None
+  sessionAffinity: {{ .Values.service.sessionAffinity }}
diff --git a/kubernetes/aai/components/aai-resources/templates/servicemonitor.yaml b/kubernetes/aai/components/aai-resources/templates/servicemonitor.yaml
new file mode 100644 (file)
index 0000000..c0d9f21
--- /dev/null
@@ -0,0 +1,3 @@
+{{- if .Values.metrics.serviceMonitor.enabled }}
+{{  include "common.serviceMonitor" . }}
+{{- end }}
\ No newline at end of file
index 2dfbfee..de7bf2d 100644 (file)
@@ -231,7 +231,10 @@ service:
   internalPort: 8447
   portName2: tcp-5005
   internalPort2: 5005
+  portName3: aai-resources-8448
+  internalPort3: 8448
   terminationGracePeriodSeconds: 120
+  sessionAffinity: None
 
 ingress:
   enabled: false
@@ -270,6 +273,58 @@ resources:
       memory: 4Gi
   unlimited: {}
 
+metrics:
+  serviceMonitor:
+    enabled: false
+    targetPort: 8448
+    path: /prometheus
+    basicAuth:
+      enabled: false
+      externalSecretName: mysecretname
+      externalSecretUserKey: login
+      externalSecretPasswordKey: password
+
+    ## Namespace in which Prometheus is running
+    ##
+    # namespace: monitoring
+
+    ## Interval at which metrics should be scraped.
+    ## ref: https://github.com/coreos/prometheus-operator/blob/master/Documentation/api.md#endpoint
+    ##
+    #interval: 30s
+
+    ## Timeout after which the scrape is ended
+    ## ref: https://github.com/coreos/prometheus-operator/blob/master/Documentation/api.md#endpoint
+    ##
+    # scrapeTimeout: 10s
+
+    ## ServiceMonitor selector labels
+    ## ref: https://github.com/bitnami/charts/tree/master/bitnami/prometheus-operator#prometheus-configuration
+    ##
+    selector:
+      app: '{{ include "common.name" . }}'
+      chart: '{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}'
+      release: '{{ include "common.release" . }}'
+      heritage: '{{ .Release.Service }}'
+
+    ## RelabelConfigs to apply to samples before scraping
+    ## ref: https://github.com/coreos/prometheus-operator/blob/master/Documentation/api.md#relabelconfig
+    ## Value is evalued as a template
+    ##
+    relabelings: []
+
+    ## MetricRelabelConfigs to apply to samples before ingestion
+    ## ref: https://github.com/coreos/prometheus-operator/blob/master/Documentation/api.md#relabelconfig
+    ## Value is evalued as a template
+    ##
+    metricRelabelings: []
+    #  - sourceLabels:
+    #      - "__name__"
+    #    targetLabel: "__name__"
+    #    action: replace
+    #    regex: '(.*)'
+    #    replacement: 'example_prefix_$1'
+
 #Pods Service Account
 serviceAccount:
   nameOverride: aai-resources
index f608b75..c04342f 100644 (file)
 apiVersion: v2
 description: ONAP AAI Schema Service
 name: aai-schema-service
-version: 11.0.0
+version: 12.0.0
 
 dependencies:
   - name: common
-    version: ~11.x-0
+    version: ~12.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: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
   - name: repositoryGenerator
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
   - name: serviceAccount
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
index cd58b95..8a7c43f 100644 (file)
@@ -28,6 +28,13 @@ metadata:
     heritage: {{ .Release.Service }}
 spec:
   replicas: {{ .Values.replicaCount }}
+  strategy:
+    type: {{ .Values.updateStrategy.type }}
+    {{- if (eq "RollingUpdate" .Values.updateStrategy.type) }}
+    rollingUpdate:
+      maxUnavailable: {{ .Values.updateStrategy.maxUnavailable }}
+      maxSurge: {{ .Values.updateStrategy.maxSurge }}
+    {{- end }}
   selector:
     matchLabels:
       app: {{ include "common.name" . }}
index a72b1d9..50e12e8 100644 (file)
@@ -101,6 +101,11 @@ flavorOverride: small
 # default number of instances
 replicaCount: 1
 
+updateStrategy:
+  type: RollingUpdate
+  maxUnavailable: 0
+  maxSurge: 1
+
 nodeSelector: {}
 
 affinity: {}
index 0a2c028..2bfb7f2 100644 (file)
 apiVersion: v2
 description: ONAP AAI sparky-be
 name: aai-sparky-be
-version: 11.0.0
+version: 12.0.0
 
 dependencies:
   - name: common
-    version: ~11.x-0
+    version: ~12.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: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
   - name: repositoryGenerator
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
   - name: serviceAccount
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
index 8bd4494..7c82d1f 100644 (file)
@@ -25,6 +25,6 @@ resources.trust-store-password=${TRUSTSTORE_PASSWORD}
 resources.client-cert={{ .Values.certInitializer.credsPath }}/{{ .Values.certInitializer.fqi_namespace }}.p12
 resources.client-cert-password=${KEYSTORE_PASSWORD}
 {{ else }}
-resources.port=8080
+resources.port=80
 resources.authType=HTTP_NOAUTH
 {{ end }}
index d23d9cf..31ea946 100644 (file)
@@ -28,6 +28,13 @@ metadata:
     heritage: {{ .Release.Service }}
 spec:
   replicas: {{ .Values.replicaCount }}
+  strategy:
+    type: {{ .Values.updateStrategy.type }}
+    {{- if (eq "RollingUpdate" .Values.updateStrategy.type) }}
+    rollingUpdate:
+      maxUnavailable: {{ .Values.updateStrategy.maxUnavailable }}
+      maxSurge: {{ .Values.updateStrategy.maxSurge }}
+    {{- end }}
   selector:
     matchLabels:
       app: {{ include "common.name" . }}
@@ -140,18 +147,19 @@ spec:
           subPath: logback.xml
         ports:
         - containerPort: {{ .Values.service.internalPort }}
+        - containerPort: {{ .Values.service.internalPlainPort }}
         # disable liveness probe when breakpoints set in debugger
         # so K8s doesn't restart unresponsive container
         {{- if eq .Values.liveness.enabled true }}
         livenessProbe:
           tcpSocket:
-            port: {{ .Values.service.internalPort }}
+            port: {{ (eq "true" (include "common.needTLS" .)) | ternary .Values.service.internalPort .Values.service.internalPlainPort }}
           initialDelaySeconds: {{ .Values.liveness.initialDelaySeconds }}
           periodSeconds: {{ .Values.liveness.periodSeconds }}
         {{ end -}}
         readinessProbe:
           tcpSocket:
-            port: {{ .Values.service.internalPort }}
+            port: {{ (eq "true" (include "common.needTLS" .)) | ternary .Values.service.internalPort .Values.service.internalPlainPort }}
           initialDelaySeconds: {{ .Values.readiness.initialDelaySeconds }}
           periodSeconds: {{ .Values.readiness.periodSeconds }}
         resources:
index 457b357..9e3ffd6 100644 (file)
@@ -25,16 +25,13 @@ metadata:
     release: {{ include "common.release" . }}
     heritage: {{ .Release.Service }}
 spec:
-  type: {{ .Values.service.type }}
   ports:
-  {{if eq .Values.service.type "NodePort" -}}
-  - port: {{ .Values.service.internalPort }}
+  - name: {{ .Values.service.portName }}{{ if (include "common.needTLS" .) }}s{{ end }}
+    port: {{ .Values.service.externalPort }}
+    targetPort: {{ (eq "true" (include "common.needTLS" .)) | ternary .Values.service.internalPort .Values.service.internalPlainPort }}
+    {{- if eq .Values.service.type "NodePort" }}
     nodePort: {{ .Values.global.nodePortPrefix | default .Values.nodePortPrefix }}{{ .Values.service.nodePort }}
-    name: {{ .Values.service.portName }}{{ (eq "true" (include "common.needTLS" .)) | ternary "s" "" }}
-  {{- else -}}
-  - port: {{ .Values.service.internalPort }}
-    name: {{ .Values.service.portName }}{{ ternary "s" "" (eq "true" (include "common.needTLS" .)) }}
-  {{- end }}
+    {{- end }}
+  type: {{ .Values.service.type }}
   selector:
     app: {{ include "common.name" . }}
-    release: {{ include "common.release" . }}
index b4cea4c..29953b4 100644 (file)
@@ -95,6 +95,11 @@ nsSuffix: aai
 # default number of instances
 replicaCount: 1
 
+updateStrategy:
+  type: RollingUpdate
+  maxUnavailable: 0
+  maxSurge: 1
+
 nodeSelector: {}
 
 affinity: {}
@@ -114,7 +119,9 @@ readiness:
 service:
   type: NodePort
   portName: http
+  externalPort: 8000
   internalPort: 8000
+  internalPlainPort: 9517
   nodePort: 20
 
 ingress:
index 13cda28..f5a6a92 100644 (file)
 apiVersion: v2
 description: ONAP AAI traversal
 name: aai-traversal
-version: 11.0.0
+version: 12.0.0
 
 dependencies:
   - name: common
-    version: ~11.x-0
+    version: ~12.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: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
   - name: repositoryGenerator
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
   - name: serviceAccount
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
index 24a5241..3022b17 100644 (file)
@@ -106,3 +106,19 @@ schema.service.ssl.trust-store={{ .Values.certInitializer.credsPath }}/{{ .Value
 schema.service.ssl.key-store-password=${KEYSTORE_PASSWORD}
 schema.service.ssl.trust-store-password=${TRUSTSTORE_PASSWORD}
 {{ end }}
+
+#to expose the Prometheus scraping endpoint
+management.port=8448
+management.endpoints.enabled-by-default=false
+management.security.enabled=false
+endpoints.enabled=false
+endpoints.info.enabled=false
+endpoints.prometheus.enabled=false
+endpoints.health.enabled=false
+management.metrics.web.server.auto-time-requests=false
+management.metrics.distribution.percentiles-histogram[http.server.requests]=true
+management.metrics.distribution.sla[http.server.requests]=20ms, 30ms, 40ms, 50ms, 60ms, 70ms, 80ms, 90ms, 100ms, 500ms, 1000ms, 5000ms, 7000ms
+#Add common tag for grouping all aai related metrics
+management.metrics.tags.group_id=aai
+#It is not advisable to use labels to store dimensions with high cardinality. Enable this option only for debug purposes. For more information: https://github.com/micrometer-metrics/micrometer/issues/1584
+scrape.uri.metrics=false
\ No newline at end of file
index b801a7a..1d32a52 100644 (file)
     limitations under the License.\r
     ============LICENSE_END=========================================================\r
 -->\r
-*/}}<configuration>\r
+*/}}\r
+<configuration scan="true" scanPeriod="60 seconds" debug="false">\r
     <property name="AJSC_HOME" value="${AJSC_HOME:-.}" />\r
-    <appender name="ACCESS" class="ch.qos.logback.core.rolling.RollingFileAppender">\r
-        <file>${AJSC_HOME}/logs/ajsc-jetty/localhost_access.log</file>\r
-        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">\r
-            <fileNamePattern>${AJSC_HOME}/logs/ajsc-jetty/localhost_access.log.%d{yyyy-MM-dd}\r
-</fileNamePattern>\r
-        </rollingPolicy>\r
+    <property name="maxHistory" value='{{.Values.accessLogback.maxHistory}}' />\r
+    <property name="totalSizeCap" value='{{.Values.accessLogback.totalSizeCap}}' />\r
+    <property name="logToFileEnabled" value='{{.Values.accessLogback.logToFileEnabled}}'/>\r
+\r
+    <if condition='property("logToFileEnabled").contains("true")'>\r
+        <then>\r
+            <appender name="ACCESS" class="ch.qos.logback.core.rolling.RollingFileAppender">\r
+                <file>${AJSC_HOME}/logs/ajsc-jetty/localhost_access.log</file>\r
+                <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">\r
+                    <fileNamePattern>${AJSC_HOME}/logs/ajsc-jetty/localhost_access.log.%d{yyyy-MM-dd}\r
+                    </fileNamePattern>\r
+                    <maxHistory>${maxHistory}</maxHistory>\r
+                    <totalSizeCap>${totalSizeCap}</totalSizeCap>\r
+                </rollingPolicy>\r
+                <encoder class="org.onap.aai.logging.CustomLogPatternLayoutEncoder">\r
+                    <Pattern>%a %u %z [%t] "%m %U%q" %s %b %y %i{X-TransactionId} %i{X-FromAppId} %i{X-Forwarded-For} %i{X-AAI-SSL-Client-CN} %i{X-AAI-SSL-Client-OU} %i{X-AAI-SSL-Client-O} %i{X-AAI-SSL-Client-L} %i{X-AAI-SSL-Client-ST} %i{X-AAI-SSL-Client-C} %i{X-AAI-SSL-Client-NotBefore} %i{X-AAI-SSL-Client-NotAfter} %i{X-AAI-SSL-Client-DN} %D</Pattern>\r
+                </encoder>\r
+            </appender>\r
+            <appender-ref ref="ACCESS" />\r
+        </then>\r
+    </if>\r
+\r
+    <appender name="STDOUTACCESS" class="ch.qos.logback.core.ConsoleAppender">\r
         <encoder class="org.onap.aai.logging.CustomLogPatternLayoutEncoder">\r
-            <Pattern>%a %u %z [%t] "%m %U%q" %s %b %y %i{X-TransactionId} %i{X-FromAppId} %i{X-Forwarded-For} %i{X-AAI-SSL-Client-CN} %i{X-AAI-SSL-Client-OU} %i{X-AAI-SSL-Client-O} %i{X-AAI-SSL-Client-L} %i{X-AAI-SSL-Client-ST} %i{X-AAI-SSL-Client-C} %i{X-AAI-SSL-Client-NotBefore} %i{X-AAI-SSL-Client-NotAfter} %i{X-AAI-SSL-Client-DN} %D</Pattern>\r
+            <Pattern>%a %u %z [%t] "%m %U%q" %s %b %y %i{X-TransactionId} %i{X-FromAppId} %i{X-Forwarded-For} %i{X-AAI-SSL-Client-CN} %i{X-AAI-SSL-Client-OU} %i{X-AAI-SSL-Client-O} %i{X-AAI-SSL-Client-L} %i{X-AAI-SSL-Client-ST} %i{X-AAI-SSL-Client-C} %i{X-AAI-SSL-Client-NotBefore} %i{X-AAI-SSL-Client-NotAfter} %i{X-AAI-SSL-Client-DN} %D - "logType": "access"</Pattern>\r
         </encoder>\r
     </appender>\r
-    <appender-ref ref="ACCESS" />\r
-</configuration>{{/*<!--\r
+    <appender-ref ref="STDOUTACCESS" />\r
+</configuration>\r
+{{/*<!--\r
 %a - Remote IP address\r
 %A - Local IP address\r
 %b - Bytes sent, excluding HTTP headers, or '-' if no bytes were sent\r
index ca9d35b..3dc4867 100644 (file)
     limitations under the License.
     ============LICENSE_END=========================================================
 -->
-*/}}<configuration scan="true" scanPeriod="60 seconds" debug="false">
+*/}}
+<configuration scan="true" scanPeriod="60 seconds" debug="false">
   <statusListener class="ch.qos.logback.core.status.NopStatusListener" />
 
   <property resource="application.properties" />
 
-  <property name="namespace" value="aai-resources" />
+  <property name="maxHistory" value='{{.Values.logback.maxHistory}}' />
+  <property name="totalSizeCap" value='{{.Values.logback.totalSizeCap}}' />
+  <property name="queueSize" value='{{.Values.logback.queueSize}}'/>
+  <property name="logToFileEnabled" value='{{.Values.logback.logToFileEnabled}}'/>
+
+  <property name="namespace" value="aai-traversal" />
 
   <property name="AJSC_HOME" value="${AJSC_HOME:-.}" />
   <jmxConfigurator />
   <conversionRule conversionWord="clr" converterClass="org.springframework.boot.logging.logback.ColorConverter" />
   <conversionRule conversionWord="wex" converterClass="org.springframework.boot.logging.logback.WhitespaceThrowableProxyConverter" />
   <conversionRule conversionWord="wEx" converterClass="org.springframework.boot.logging.logback.ExtendedWhitespaceThrowableProxyConverter" />
-  <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
-    <encoder>
-      <pattern>
-                %clr(%d{yyyy-MM-dd HH:mm:ss.SSS}){faint} %clr(${LOG_LEVEL_PATTERN:-%5p}) %clr(${PID:- }){magenta} %clr(---){faint} %clr([%15.15t]){faint} %clr(%-40.40logger{39}){cyan} %clr(:){faint} %m%n${LOG_EXCEPTION_CONVERSION_WORD:-%wEx}
-</pattern>
-    </encoder>
-  </appender>
-
-  <appender name="SANE" class="ch.qos.logback.core.rolling.RollingFileAppender">
-    <file>${logDirectory}/rest/sane.log</file>
-    <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-      <fileNamePattern>${logDirectory}/rest/sane.log.%d{yyyy-MM-dd}</fileNamePattern>
-    </rollingPolicy>
-    <encoder>
-      <pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{1024} - %msg%n
-</pattern>
-    </encoder>
-  </appender>
-
-  <appender name="asyncSANE" class="ch.qos.logback.classic.AsyncAppender">
-    <queueSize>1000</queueSize>
-    <includeCallerData>true</includeCallerData>
-    <appender-ref ref="SANE" />
-  </appender>
-  <appender name="METRIC" class="ch.qos.logback.core.rolling.RollingFileAppender">
-    <file>${logDirectory}/rest/metrics.log</file>
-    <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-      <fileNamePattern>${logDirectory}/rest/metrics.log.%d{yyyy-MM-dd}</fileNamePattern>
-    </rollingPolicy>
-    <encoder>
-      <pattern>${metricPattern}</pattern>
-    </encoder>
-  </appender>
-
-  <appender name="asyncMETRIC" class="ch.qos.logback.classic.AsyncAppender">
-    <queueSize>1000</queueSize>
-    <includeCallerData>true</includeCallerData>
-    <appender-ref ref="METRIC" />
-  </appender>
-
-  <appender name="DEBUG" class="ch.qos.logback.core.rolling.RollingFileAppender">
-    <filter class="ch.qos.logback.classic.filter.LevelFilter">
-      <level>DEBUG</level>
-      <onMatch>ACCEPT</onMatch>
-      <onMismatch>DENY</onMismatch>
-    </filter>
-    <file>${logDirectory}/rest/debug.log</file>
-    <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-      <fileNamePattern>${logDirectory}/rest/debug.log.%d{yyyy-MM-dd}</fileNamePattern>
-    </rollingPolicy>
-    <encoder>
-      <pattern>${debugPattern}</pattern>
-    </encoder>
-  </appender>
-
-  <appender name="asyncDEBUG" class="ch.qos.logback.classic.AsyncAppender">
-    <queueSize>1000</queueSize>
-    <appender-ref ref="DEBUG" />
-    <includeCallerData>true</includeCallerData>
-  </appender>
-  <appender name="ERROR" class="ch.qos.logback.core.rolling.RollingFileAppender">
-    <file>${logDirectory}/rest/error.log</file>
-    <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-      <fileNamePattern>${logDirectory}/rest/error.log.%d{yyyy-MM-dd}</fileNamePattern>
-    </rollingPolicy>
-    <filter class="ch.qos.logback.classic.filter.ThresholdFilter">
-      <level>WARN</level>
-    </filter>
-    <encoder>
-      <pattern>${errorPattern}</pattern>
-    </encoder>
-  </appender>
-
-  <appender name="asyncERROR" class="ch.qos.logback.classic.AsyncAppender">
-    <queueSize>1000</queueSize>
-    <appender-ref ref="ERROR" />
-  </appender>
 
-  <appender name="AUDIT" class="ch.qos.logback.core.rolling.RollingFileAppender">
-    <file>${logDirectory}/rest/audit.log</file>
-    <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-      <fileNamePattern>${logDirectory}/rest/audit.log.%d{yyyy-MM-dd}
-</fileNamePattern>
-    </rollingPolicy>
-    <encoder>
-      <pattern>${auditPattern}</pattern>
-    </encoder>
-  </appender>
-
-  <appender name="asyncAUDIT" class="ch.qos.logback.classic.AsyncAppender">
-    <queueSize>1000</queueSize>
-    <includeCallerData>true</includeCallerData>
-    <appender-ref ref="AUDIT" />
-  </appender>
-
-  <appender name="translog" class="ch.qos.logback.core.rolling.RollingFileAppender">
-    <filter class="ch.qos.logback.classic.filter.LevelFilter">
-      <level>DEBUG</level>
-      <onMatch>ACCEPT</onMatch>
-      <onMismatch>DENY</onMismatch>
-    </filter>
-    <file>${logDirectory}/rest/translog.log</file>
-    <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-      <fileNamePattern>${logDirectory}/rest/translog.log.%d{yyyy-MM-dd}
-</fileNamePattern>
-    </rollingPolicy>
-    <encoder>
-      <pattern>${transLogPattern}</pattern>
+  <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+    <encoder class="net.logstash.logback.encoder.LoggingEventCompositeJsonEncoder">
+      <providers>
+        <timestamp><fieldName>timestamp</fieldName></timestamp>
+        <message/>
+        <mdc>
+          <fieldName>context</fieldName>
+          <excludeMdcKeyName>ServerIPAddress</excludeMdcKeyName>
+          <excludeMdcKeyName>EntryTimestamp</excludeMdcKeyName>
+          <excludeMdcKeyName>InvokeTimestamp</excludeMdcKeyName>
+          <excludeMdcKeyName>ErrorCode</excludeMdcKeyName>
+          <excludeMdcKeyName>ErrorDesc</excludeMdcKeyName>
+        </mdc>
+        <stackTrace>
+          <fieldName>exception</fieldName>
+          <throwableConverter class="net.logstash.logback.stacktrace.ShortenedThrowableConverter">
+            <exclude>^sun\.reflect\..*\.invoke</exclude>
+            <exclude>^net\.sf\.cglib\.proxy\.MethodProxy\.invoke</exclude>
+            <rootCauseFirst>true</rootCauseFirst>
+          </throwableConverter>
+        </stackTrace>
+        <threadName><fieldName>thread</fieldName></threadName>
+        <loggerName>
+          <fieldName>logger</fieldName>
+          <shortenedLoggerNameLength>36</shortenedLoggerNameLength>
+        </loggerName>
+        <logLevel/>
+        <pattern>
+          <pattern>{"logType":"app"}</pattern>
+        </pattern>
+      </providers>
     </encoder>
   </appender>
 
-  <appender name="asynctranslog" class="ch.qos.logback.classic.AsyncAppender">
-    <queueSize>1000</queueSize>
-    <includeCallerData>true</includeCallerData>
-    <appender-ref ref="translog" />
-  </appender>
+  <if condition='property("logToFileEnabled").contains("true")'>
+    <then>
+      <appender name="SANE" class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <file>${logDirectory}/rest/sane.log</file>
+        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+          <fileNamePattern>${logDirectory}/rest/sane.log.%d{yyyy-MM-dd}</fileNamePattern>
+          <maxHistory>${maxHistory}</maxHistory>
+          <totalSizeCap>${totalSizeCap}</totalSizeCap>
+        </rollingPolicy>
+        <encoder>
+          <pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{1024} - %msg%n
+          </pattern>
+        </encoder>
+      </appender>
+      <appender name="asyncSANE" class="ch.qos.logback.classic.AsyncAppender">
+        <queueSize>${queueSize}</queueSize>
+        <includeCallerData>true</includeCallerData>
+        <appender-ref ref="SANE" />
+      </appender>
+      <appender name="METRIC" class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <file>${logDirectory}/rest/metrics.log</file>
+        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+          <fileNamePattern>${logDirectory}/rest/metrics.log.%d{yyyy-MM-dd}</fileNamePattern>
+          <maxHistory>${maxHistory}</maxHistory>
+          <totalSizeCap>${totalSizeCap}</totalSizeCap>
+        </rollingPolicy>
+        <encoder>
+          <pattern>${metricPattern}</pattern>
+        </encoder>
+      </appender>
+      <appender name="asyncMETRIC" class="ch.qos.logback.classic.AsyncAppender">
+        <queueSize>${queueSize}</queueSize>
+        <includeCallerData>true</includeCallerData>
+        <appender-ref ref="METRIC" />
+      </appender>
+      <appender name="DEBUG" class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <filter class="ch.qos.logback.classic.filter.LevelFilter">
+          <level>DEBUG</level>
+          <onMatch>ACCEPT</onMatch>
+          <onMismatch>DENY</onMismatch>
+        </filter>
+        <file>${logDirectory}/rest/debug.log</file>
+        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+          <fileNamePattern>${logDirectory}/rest/debug.log.%d{yyyy-MM-dd}</fileNamePattern>
+          <maxHistory>${maxHistory}</maxHistory>
+          <totalSizeCap>${totalSizeCap}</totalSizeCap>
+        </rollingPolicy>
+        <encoder>
+          <pattern>${debugPattern}</pattern>
+        </encoder>
+      </appender>
+      <appender name="asyncDEBUG" class="ch.qos.logback.classic.AsyncAppender">
+        <queueSize>${queueSize}</queueSize>
+        <appender-ref ref="DEBUG" />
+        <includeCallerData>true</includeCallerData>
+      </appender>
+      <appender name="ERROR" class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <file>${logDirectory}/rest/error.log</file>
+        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+          <fileNamePattern>${logDirectory}/rest/error.log.%d{yyyy-MM-dd}</fileNamePattern>
+          <maxHistory>${maxHistory}</maxHistory>
+          <totalSizeCap>${totalSizeCap}</totalSizeCap>
+        </rollingPolicy>
+        <filter class="ch.qos.logback.classic.filter.ThresholdFilter">
+          <level>WARN</level>
+        </filter>
+        <encoder>
+          <pattern>${errorPattern}</pattern>
+        </encoder>
+      </appender>
+      <appender name="asyncERROR" class="ch.qos.logback.classic.AsyncAppender">
+        <queueSize>${queueSize}</queueSize>
+        <appender-ref ref="ERROR" />
+      </appender>
+      <appender name="AUDIT" class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <file>${logDirectory}/rest/audit.log</file>
+        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+          <fileNamePattern>${logDirectory}/rest/audit.log.%d{yyyy-MM-dd}
+          </fileNamePattern>
+          <maxHistory>${maxHistory}</maxHistory>
+          <totalSizeCap>${totalSizeCap}</totalSizeCap>
+        </rollingPolicy>
+        <encoder>
+          <pattern>${auditPattern}</pattern>
+        </encoder>
+      </appender>
+      <appender name="asyncAUDIT" class="ch.qos.logback.classic.AsyncAppender">
+        <queueSize>${queueSize}</queueSize>
+        <includeCallerData>true</includeCallerData>
+        <appender-ref ref="AUDIT" />
+      </appender>
+      <appender name="translog" class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <filter class="ch.qos.logback.classic.filter.LevelFilter">
+          <level>DEBUG</level>
+          <onMatch>ACCEPT</onMatch>
+          <onMismatch>DENY</onMismatch>
+        </filter>
+        <file>${logDirectory}/rest/translog.log</file>
+        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+          <fileNamePattern>${logDirectory}/rest/translog.log.%d{yyyy-MM-dd}
+          </fileNamePattern>
+          <maxHistory>${maxHistory}</maxHistory>
+          <totalSizeCap>${totalSizeCap}</totalSizeCap>
+        </rollingPolicy>
+        <encoder>
+          <pattern>${transLogPattern}</pattern>
+        </encoder>
+      </appender>
+      <appender name="asynctranslog" class="ch.qos.logback.classic.AsyncAppender">
+        <queueSize>${queueSize}</queueSize>
+        <includeCallerData>true</includeCallerData>
+        <appender-ref ref="translog" />
+      </appender>
+      <appender name="dmaapAAIEventConsumer" class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <filter class="ch.qos.logback.classic.filter.ThresholdFilter">
+          <level>WARN</level>
+        </filter>
+        <File>${logDirectory}/dmaapAAIEventConsumer/error.log</File>
+        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+          <fileNamePattern>${logDirectory}/dmaapAAIEventConsumer/error.log.%d{yyyy-MM-dd}
+          </fileNamePattern>
+          <maxHistory>${maxHistory}</maxHistory>
+          <totalSizeCap>${totalSizeCap}</totalSizeCap>
+        </rollingPolicy>
+        <encoder>
+          <pattern>${errorPattern}</pattern>
+        </encoder>
+      </appender>
+      <appender name="dmaapAAIEventConsumerDebug" class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <filter class="ch.qos.logback.classic.filter.LevelFilter">
+          <level>DEBUG</level>
+          <onMatch>ACCEPT</onMatch>
+          <onMismatch>DENY</onMismatch>
+        </filter>
+        <File>${logDirectory}/dmaapAAIEventConsumer/debug.log</File>
+        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+          <fileNamePattern>${logDirectory}/dmaapAAIEventConsumer/debug.log.%d{yyyy-MM-dd}
+          </fileNamePattern>
+          <maxHistory>${maxHistory}</maxHistory>
+          <totalSizeCap>${totalSizeCap}</totalSizeCap>
+        </rollingPolicy>
+        <encoder>
+          <pattern>${debugPattern}</pattern>
+        </encoder>
+      </appender>
+      <appender name="dmaapAAIEventConsumerInfo" class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <filter class="ch.qos.logback.classic.filter.LevelFilter">
+          <level>INFO</level>
+          <onMatch>ACCEPT</onMatch>
+          <onMismatch>DENY</onMismatch>
+        </filter>
+        <File>${logDirectory}/dmaapAAIEventConsumer/dmaap-transaction.log</File>
+        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+          <fileNamePattern>${logDirectory}/dmaapAAIEventConsumer/dmaap-transaction.log.%d{yyyy-MM-dd}
+          </fileNamePattern>
+          <maxHistory>${maxHistory}</maxHistory>
+          <totalSizeCap>${totalSizeCap}</totalSizeCap>
+        </rollingPolicy>
+        <encoder>
+          <pattern>${auditPattern}</pattern>
+        </encoder>
+      </appender>
+      <appender name="dmaapAAIEventConsumerMetric" class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <filter class="ch.qos.logback.classic.filter.LevelFilter">
+          <level>INFO</level>
+          <onMatch>ACCEPT</onMatch>
+          <onMismatch>DENY</onMismatch>
+        </filter>
+        <File>${logDirectory}/dmaapAAIEventConsumer/metrics.log</File>
+        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+          <fileNamePattern>${logDirectory}/dmaapAAIEventConsumer/metrics.log.%d{yyyy-MM-dd}
+          </fileNamePattern>
+          <maxHistory>${maxHistory}</maxHistory>
+          <totalSizeCap>${totalSizeCap}</totalSizeCap>
+        </rollingPolicy>
+        <encoder>
+          <pattern>${metricPattern}</pattern>
+        </encoder>
+      </appender>
+      <appender name="external" class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <filter class="ch.qos.logback.classic.filter.ThresholdFilter">
+          <level>WARN</level>
+        </filter>
+        <file>${logDirectory}/external/external.log</file>
+        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+          <fileNamePattern>${logDirectory}/external/external.log.%d{yyyy-MM-dd}
+          </fileNamePattern>
+          <maxHistory>${maxHistory}</maxHistory>
+          <totalSizeCap>${totalSizeCap}</totalSizeCap>
+        </rollingPolicy>
+        <encoder>
+          <pattern>${debugPattern}</pattern>
+        </encoder>
+      </appender>
+      <appender name="auth" class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <filter class="ch.qos.logback.classic.filter.ThresholdFilter">
+          <level>DEBUG</level>
+        </filter>
+        <file>${logDirectory}/auth/auth.log</file>
+        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+          <fileNamePattern>${logDirectory}/auth/auth.log.%d{yyyy-MM-dd}
+          </fileNamePattern>
+          <maxHistory>${maxHistory}</maxHistory>
+          <totalSizeCap>${totalSizeCap}</totalSizeCap>
+        </rollingPolicy>
+        <encoder>
+          <pattern>%d{yyyy-MM-dd'T'HH:mm:ss.SSSZ, UTC}[%thread] %-5level %logger{1024} - %msg%n</pattern>
+        </encoder>
+      </appender>
+      <appender name="asyncAUTH" class="ch.qos.logback.classic.AsyncAppender">
+        <queueSize>${queueSize}</queueSize>
+        <includeCallerData>true</includeCallerData>
+        <appender-ref ref="auth" />
+      </appender>
+    </then>
+  </if>
 
-  <appender name="dmaapAAIEventConsumer" class="ch.qos.logback.core.rolling.RollingFileAppender">
-    <filter class="ch.qos.logback.classic.filter.ThresholdFilter">
-      <level>WARN</level>
-    </filter>
-    <File>${logDirectory}/dmaapAAIEventConsumer/error.log</File>
-    <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-      <fileNamePattern>${logDirectory}/dmaapAAIEventConsumer/error.log.%d{yyyy-MM-dd}
-</fileNamePattern>
-    </rollingPolicy>
-    <encoder>
-      <pattern>${errorPattern}</pattern>
-    </encoder>
-
-  </appender>
-
-  <appender name="dmaapAAIEventConsumerDebug" class="ch.qos.logback.core.rolling.RollingFileAppender">
-    <filter class="ch.qos.logback.classic.filter.LevelFilter">
-      <level>DEBUG</level>
-      <onMatch>ACCEPT</onMatch>
-      <onMismatch>DENY</onMismatch>
-    </filter>
-    <File>${logDirectory}/dmaapAAIEventConsumer/debug.log</File>
-    <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-      <fileNamePattern>${logDirectory}/dmaapAAIEventConsumer/debug.log.%d{yyyy-MM-dd}
-</fileNamePattern>
-    </rollingPolicy>
-    <encoder>
-      <pattern>${debugPattern}</pattern>
-    </encoder>
-  </appender>
-  <appender name="dmaapAAIEventConsumerInfo" class="ch.qos.logback.core.rolling.RollingFileAppender">
-    <filter class="ch.qos.logback.classic.filter.LevelFilter">
-      <level>INFO</level>
-      <onMatch>ACCEPT</onMatch>
-      <onMismatch>DENY</onMismatch>
-    </filter>
-    <File>${logDirectory}/dmaapAAIEventConsumer/dmaap-transaction.log</File>
-    <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-      <fileNamePattern>${logDirectory}/dmaapAAIEventConsumer/dmaap-transaction.log.%d{yyyy-MM-dd}
-</fileNamePattern>
-    </rollingPolicy>
-    <encoder>
-      <pattern>${auditPattern}</pattern>
-    </encoder>
-  </appender>
-  <appender name="dmaapAAIEventConsumerMetric" class="ch.qos.logback.core.rolling.RollingFileAppender">
-    <filter class="ch.qos.logback.classic.filter.LevelFilter">
-      <level>INFO</level>
-      <onMatch>ACCEPT</onMatch>
-      <onMismatch>DENY</onMismatch>
-    </filter>
-    <File>${logDirectory}/dmaapAAIEventConsumer/metrics.log</File>
-    <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-      <fileNamePattern>${logDirectory}/dmaapAAIEventConsumer/metrics.log.%d{yyyy-MM-dd}
-</fileNamePattern>
-    </rollingPolicy>
-    <encoder>
-      <pattern>${metricPattern}</pattern>
-    </encoder>
-  </appender>
-  <appender name="external" class="ch.qos.logback.core.rolling.RollingFileAppender">
-    <filter class="ch.qos.logback.classic.filter.ThresholdFilter">
-      <level>WARN</level>
-    </filter>
-    <file>${logDirectory}/external/external.log</file>
-    <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-      <fileNamePattern>${logDirectory}/external/external.log.%d{yyyy-MM-dd}
-</fileNamePattern>
-    </rollingPolicy>
-    <encoder>
-      <pattern>${debugPattern}</pattern>
-    </encoder>
-  </appender>
-  <appender name="auth" class="ch.qos.logback.core.rolling.RollingFileAppender">
-    <filter class="ch.qos.logback.classic.filter.ThresholdFilter">
-      <level>DEBUG</level>
-    </filter>
-    <file>${logDirectory}/auth/auth.log</file>
-    <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-      <fileNamePattern>${logDirectory}/auth/auth.log.%d{yyyy-MM-dd}
-</fileNamePattern>
-    </rollingPolicy>
-    <encoder>
-      <pattern>%d{yyyy-MM-dd'T'HH:mm:ss.SSSZ, UTC}[%thread] %-5level %logger{1024} - %msg%n</pattern>
-    </encoder>
-  </appender>
-  <appender name="asyncAUTH" class="ch.qos.logback.classic.AsyncAppender">
-    <queueSize>1000</queueSize>
-    <includeCallerData>true</includeCallerData>
-    <appender-ref ref="auth" />
-  </appender>
   <!-- logback internals logging -->
-
   <logger name="ch.qos.logback.classic" level="WARN" />
   <logger name="ch.qos.logback.core" level="WARN" />
 
 
 
   <logger name="org.onap.aai" level="DEBUG" additivity="false">
-    <appender-ref ref="asyncDEBUG" />
-    <appender-ref ref="asyncSANE" />
+    <if condition='property("logToFileEnabled").contains("true")'>
+      <then>
+        <appender-ref ref="asyncDEBUG" />
+        <appender-ref ref="asyncSANE" />
+      </then>
+    </if>
     <appender-ref ref="STDOUT" />
   </logger>
+
   <logger name="org.onap.aai.aaf.auth" level="DEBUG" additivity="false">
-    <appender-ref ref="asyncAUTH" />
+    <if condition='property("logToFileEnabled").contains("true")'>
+      <then>
+        <appender-ref ref="asyncAUTH" />
+      </then>
+    </if>
     <appender-ref ref="STDOUT" />
   </logger>
-  <logger name="org.onap.aai.aailog.logs.AaiScheduledTaskAuditLog" level="INFO">
-    <appender-ref ref="asyncAUDIT" />
+
+  <logger name="org.onap.aai.aailog.logs.AaiScheduledTaskAuditLog" level="INFO" additivity="false">
+    <if condition='property("logToFileEnabled").contains("true")'>
+      <then>
+        <appender-ref ref="asyncAUDIT" />
+      </then>
+    </if>
+    <appender-ref ref="STDOUT" />
   </logger>
-  <logger name="org.onap.logging.filter.base.AbstractAuditLogFilter" level="INFO">
-    <appender-ref ref="asyncAUDIT" />
+
+  <logger name="org.onap.logging.filter.base.AbstractAuditLogFilter" level="INFO" additivity="false">
+    <if condition='property("logToFileEnabled").contains("true")'>
+      <then>
+        <appender-ref ref="asyncAUDIT" />
+      </then>
+    </if>
+    <appender-ref ref="STDOUT" />
   </logger>
-  <logger name="org.onap.aai.aailog.logs.AaiDBMetricLog" level="INFO">
-    <appender-ref ref="asyncMETRIC" />
+
+  <logger name="org.onap.aai.aailog.logs.AaiDBMetricLog" level="INFO" additivity="false">
+    <if condition='property("logToFileEnabled").contains("true")'>
+      <then>
+        <appender-ref ref="asyncMETRIC" />
+      </then>
+    </if>
+    <appender-ref ref="STDOUT" />
   </logger>
-  <logger name="org.onap.aai.aailog.logs.AaiDmaapMetricLog" level="INFO">
-    <appender-ref ref="dmaapAAIEventConsumerMetric" />
+
+  <logger name="org.onap.aai.aailog.logs.AaiDmaapMetricLog" level="INFO" additivity="false">
+    <if condition='property("logToFileEnabled").contains("true")'>
+      <then>
+        <appender-ref ref="dmaapAAIEventConsumerMetric" />
+      </then>
+    </if>
+    <appender-ref ref="STDOUT" />
   </logger>
-  <logger name="org.onap.aai.logging.ErrorLogHelper" level="WARN">
-    <appender-ref ref="asyncERROR" />
+
+  <logger name="org.onap.aai.logging.ErrorLogHelper" level="WARN" additivity="false">
+    <if condition='property("logToFileEnabled").contains("true")'>
+      <then>
+        <appender-ref ref="asyncERROR" />
+      </then>
+    </if>
+    <appender-ref ref="STDOUT" />
   </logger>
+
   <logger name="org.onap.aai.interceptors.post" level="DEBUG" additivity="false">
-    <appender-ref ref="asynctranslog" />
+    <if condition='property("logToFileEnabled").contains("true")'>
+      <then>
+        <appender-ref ref="asynctranslog" />
+      </then>
+    </if>
     <appender-ref ref="STDOUT" />
   </logger>
 
   <logger name="org.onap.aai.dmaap" level="DEBUG" additivity="false">
-    <appender-ref ref="dmaapAAIEventConsumer" />
-    <appender-ref ref="dmaapAAIEventConsumerDebug" />
+    <if condition='property("logToFileEnabled").contains("true")'>
+      <then>
+        <appender-ref ref="dmaapAAIEventConsumer" />
+        <appender-ref ref="dmaapAAIEventConsumerDebug" />
+      </then>
+    </if>
+    <appender-ref ref="STDOUT" />
   </logger>
 
   <logger name="com.att.nsa.mr" level="INFO">
-    <appender-ref ref="dmaapAAIEventConsumerInfo" />
+    <if condition='property("logToFileEnabled").contains("true")'>
+      <then>
+        <appender-ref ref="dmaapAAIEventConsumerInfo" />
+      </then>
+    </if>
+    <appender-ref ref="STDOUT" />
   </logger>
 
   <root level="DEBUG">
-    <appender-ref ref="external" />
+    <if condition='property("logToFileEnabled").contains("true")'>
+      <then>
+        <appender-ref ref="external" />
+      </then>
+    </if>
     <appender-ref ref="STDOUT" />
   </root>
 </configuration>
\ No newline at end of file
index b9f2a80..0932771 100644 (file)
@@ -155,6 +155,8 @@ spec:
           value: {{ .Values.service.internalPort | quote }}
         - name: INTERNAL_PORT_2
           value: {{ .Values.service.internalPort2 | quote }}
+        - name: INTERNAL_PORT_3
+          value: {{ .Values.service.internalPort3 | quote }}
         volumeMounts: {{ include "common.certInitializer.volumeMount" . | nindent 8 }}
         - mountPath: /etc/localtime
           name: localtime
@@ -205,6 +207,7 @@ spec:
         ports:
         - containerPort: {{ .Values.service.internalPort }}
         - containerPort: {{ .Values.service.internalPort2 }}
+        - containerPort: {{ .Values.service.internalPort3 }}
         lifecycle:
           # wait for active requests (long-running tasks) to be finished
           # Before the SIGTERM is invoked, Kubernetes exposes a preStop hook in the Pod.
index b54b6be..daf1758 100644 (file)
@@ -34,12 +34,19 @@ spec:
   - port: {{ .Values.service.internalPort2 }}
     nodePort: {{ .Values.global.nodePortPrefix | default .Values.nodePortPrefix }}{{ .Values.service.nodePort2 }}
     name: {{ .Values.service.portName2 }}
+  - port: {{ .Values.service.internalPort3 }}
+    nodePort: {{ .Values.global.nodePortPrefix | default .Values.nodePortPrefix }}{{ .Values.service.nodePort3 }}
+    name: {{ .Values.service.portName3 }}
   {{- else -}}
   - port: {{ .Values.service.internalPort }}
     name: {{ .Values.service.portName }}{{ (eq "true" (include "common.needTLS" .)) | ternary "s" "" }}
   - port: {{ .Values.service.internalPort2 }}
     name: {{ .Values.service.portName2 }}
+  - port: {{ .Values.service.internalPort3 }}
+    name: {{ .Values.service.portName3 }}
   {{- end }}
   selector:
     app: {{ include "common.name" . }}
     release: {{ include "common.release" . }}
+  clusterIP: None
+  sessionAffinity: {{ .Values.service.sessionAffinity }}
diff --git a/kubernetes/aai/components/aai-traversal/templates/servicemonitor.yaml b/kubernetes/aai/components/aai-traversal/templates/servicemonitor.yaml
new file mode 100644 (file)
index 0000000..c0d9f21
--- /dev/null
@@ -0,0 +1,3 @@
+{{- if .Values.metrics.serviceMonitor.enabled }}
+{{  include "common.serviceMonitor" . }}
+{{- end }}
\ No newline at end of file
index 81d372a..b5d99fd 100644 (file)
@@ -140,7 +140,7 @@ certInitializer:
     chown -R 1000 {{ .Values.credsPath }}
 
 # application image
-image: onap/aai-traversal:1.11.0
+image: onap/aai-traversal:1.11.1
 pullPolicy: Always
 restartPolicy: Always
 flavor: small
@@ -231,6 +231,12 @@ persistence:
 # default number of instances
 replicaCount: 1
 
+minReadySeconds: 10
+updateStrategy:
+  type: RollingUpdate
+  maxUnavailable: 0
+  maxSurge: 1
+
 nodeSelector: {}
 
 affinity: {}
@@ -253,11 +259,26 @@ service:
   internalPort: 8446
   portName2: tcp-5005
   internalPort2: 5005
+  portName3: aai-traversal-8448
+  internalPort3: 8448
   terminationGracePeriodSeconds: 120
+  sessionAffinity: None
 
 ingress:
   enabled: false
 
+# To make logback capping values configurable
+logback:
+  logToFileEnabled: true
+  maxHistory: 7
+  totalSizeCap: 6GB
+  queueSize: 1000
+
+accessLogback:
+  logToFileEnabled: true
+  maxHistory: 7
+  totalSizeCap: 6GB
+
 # Configure resource requests and limits
 # ref: http://kubernetes.io/docs/user-guide/compute-resources/
 resources:
@@ -277,6 +298,58 @@ resources:
       memory: 4Gi
   unlimited: {}
 
+metrics:
+  serviceMonitor:
+    enabled: false
+    targetPort: 8448
+    path: /prometheus
+    basicAuth:
+      enabled: false
+      externalSecretName: mysecretname
+      externalSecretUserKey: login
+      externalSecretPasswordKey: password
+
+    ## Namespace in which Prometheus is running
+    ##
+    # namespace: monitoring
+
+    ## Interval at which metrics should be scraped.
+    ## ref: https://github.com/coreos/prometheus-operator/blob/master/Documentation/api.md#endpoint
+    ##
+    #interval: 30s
+
+    ## Timeout after which the scrape is ended
+    ## ref: https://github.com/coreos/prometheus-operator/blob/master/Documentation/api.md#endpoint
+    ##
+    # scrapeTimeout: 10s
+
+    ## ServiceMonitor selector labels
+    ## ref: https://github.com/bitnami/charts/tree/master/bitnami/prometheus-operator#prometheus-configuration
+    ##
+    selector:
+      app: '{{ include "common.name" . }}'
+      chart: '{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}'
+      release: '{{ include "common.release" . }}'
+      heritage: '{{ .Release.Service }}'
+
+    ## RelabelConfigs to apply to samples before scraping
+    ## ref: https://github.com/coreos/prometheus-operator/blob/master/Documentation/api.md#relabelconfig
+    ## Value is evalued as a template
+    ##
+    relabelings: []
+
+    ## MetricRelabelConfigs to apply to samples before ingestion
+    ## ref: https://github.com/coreos/prometheus-operator/blob/master/Documentation/api.md#relabelconfig
+    ## Value is evalued as a template
+    ##
+    metricRelabelings: []
+    #  - sourceLabels:
+    #      - "__name__"
+    #    targetLabel: "__name__"
+    #    action: replace
+    #    regex: '(.*)'
+    #    replacement: 'example_prefix_$1'
+
 #Pods Service Account
 serviceAccount:
   nameOverride: aai-traversal
index 6e7acef..03212b9 100644 (file)
@@ -17,8 +17,10 @@ global
         log /dev/log    local0
         stats socket /usr/local/etc/haproxy/haproxy.socket mode 660 level admin
         stats timeout 30s
-        user root
-        group root
+        # it is required else pod will not come up
+        maxconn 50000
+        user haproxy
+        group haproxy
         daemon
         #################################
         # Default SSL material locations#
@@ -38,7 +40,8 @@ defaults
         mode    http
         option  httplog
         option  ssl-hello-chk
-        option  httpchk GET /aai/util/echo HTTP/1.1\r\nHost:\ aai\r\nX-TransactionId:\ haproxy-0111\r\nX-FromAppId:\ haproxy\r\nAccept:\ application/json\r\nAuthorization:\ Basic\ YWFpQGFhaS5vbmFwLm9yZzpkZW1vMTIzNDU2IQ==
+        option  httpchk
+        http-check send meth GET uri /aai/util/echo ver HTTP/1.1 hdr Host aai hdr X-TransactionId  haproxy-0111 hdr X-FromAppId haproxy hdr Accept application/json hdr Authorization 'Basic QUFJOkFBSQ=='
         default-server init-addr none
 #       option  dontlognull
 #       errorfile 400 /etc/haproxy/errors/400.http
@@ -59,6 +62,12 @@ defaults
         timeout server  480000
         timeout http-keep-alive 30000
 
+frontend stats
+       bind *:8448
+       http-request use-service prometheus-exporter if { path /metrics }
+       stats enable
+       stats uri /stats
+       stats refresh 10s
 
 frontend IST_8443
         mode http
@@ -73,6 +82,10 @@ frontend IST_8443
         capture response header Host len 100
         option log-separate-errors
         option forwardfor
+
+        http-request set-header X-Forwarded-Proto https
+        http-request add-header X-Forwarded-Port 8443
+
         http-request set-header X-Forwarded-Proto https if { ssl_fc }
         http-request set-header X-AAI-Client-SSL TRUE if { ssl_c_used }
         http-request set-header X-AAI-SSL                       %[ssl_fc]
@@ -97,9 +110,6 @@ frontend IST_8443
         {{- end }}
         {{- end }}
 
-        reqadd X-Forwarded-Proto:\ https
-        reqadd X-Forwarded-Port:\ 8443
-
 #######################
 #ACLS FOR PORT 8446####
 #######################
@@ -107,9 +117,10 @@ frontend IST_8443
         acl is_Port_8446_generic path_reg -i ^/aai/v[0-9]+/search/generic-query$
         acl is_Port_8446_nodes path_reg -i ^/aai/v[0-9]+/search/nodes-query$
         acl is_Port_8446_version path_reg -i ^/aai/v[0-9]+/query$
+        acl is_dsl path_reg -i ^/aai/v[0-9]+/dsl$
         acl is_named-query path_beg -i /aai/search/named-query
         acl is_search-model path_beg -i /aai/search/model
-        use_backend IST_AAI_8446 if is_Port_8446_generic or is_Port_8446_nodes or is_Port_8446_version or is_named-query or is_search-model
+        use_backend IST_AAI_8446 if is_Port_8446_generic or is_Port_8446_nodes or is_Port_8446_version or is_named-query or is_search-model or is_dsl
 
         default_backend IST_Default_8447
 
@@ -120,9 +131,11 @@ frontend IST_8443
 
 backend IST_Default_8447
         balance roundrobin
+        stick-table type string len 100 size 200k expire 2m
+        stick on path
         http-request set-header X-Forwarded-Port %[src_port]
         http-response set-header Strict-Transport-Security max-age=16000000;\ includeSubDomains;\ preload;
-        server aai-resources.{{.Release.Namespace}} aai-resources.{{.Release.Namespace}}.svc.cluster.local:8447 resolvers kubernetes check check-ssl port 8447 ssl verify none
+        server-template aai-resources.{{.Release.Namespace}} {{$.Values.haproxy.replicas.aaiResources}} aai-resources.{{.Release.Namespace}}.svc.cluster.local:8447 resolvers kubernetes check check-ssl port 8447 ssl verify none
 
 
 #######################
@@ -131,9 +144,11 @@ backend IST_Default_8447
 
 backend IST_AAI_8446
         balance roundrobin
+        stick-table type string len 100 size 200k expire 2m
+        stick on path
         http-request set-header X-Forwarded-Port %[src_port]
         http-response set-header Strict-Transport-Security max-age=16000000;\ includeSubDomains;\ preload;
-        server aai-traversal.{{.Release.Namespace}} aai-traversal.{{.Release.Namespace}}.svc.cluster.local:8446 resolvers kubernetes check check-ssl port 8446 ssl verify none
+        server-template aai-traversal.{{.Release.Namespace}} {{$.Values.haproxy.replicas.aaiTraversal}} aai-traversal.{{.Release.Namespace}}.svc.cluster.local:8446 resolvers kubernetes check check-ssl port 8446 ssl verify none
 
 listen IST_AAI_STATS
         mode http
index 1accff9..8c2554e 100644 (file)
@@ -17,6 +17,10 @@ global
         log /dev/log    local0
         stats socket /usr/local/etc/haproxy/haproxy.socket mode 660 level admin
         stats timeout 30s
+        # it is required else pod will not come up
+        maxconn 50000
+        user haproxy
+        group haproxy
         daemon
         #################################
         # Default SSL material locations#
@@ -38,7 +42,8 @@ defaults
 {{- if ( include "common.needTLS" .) }}
         option  ssl-hello-chk
 {{- end }}
-        option  httpchk GET /aai/util/echo HTTP/1.1\r\nHost:\ aai\r\nX-TransactionId:\ haproxy-0111\r\nX-FromAppId:\ haproxy\r\nAccept:\ application/json\r\nAuthorization:\ Basic\ QUFJOkFBSQ==
+        option  httpchk
+        http-check send meth GET uri /aai/util/echo ver HTTP/1.1 hdr Host aai hdr X-TransactionId  haproxy-0111 hdr X-FromAppId haproxy hdr Accept application/json hdr Authorization 'Basic QUFJOkFBSQ=='
         default-server init-addr none
 #       option  dontlognull
 #       errorfile 400 /etc/haproxy/errors/400.http
@@ -59,6 +64,12 @@ defaults
         timeout server  480000
         timeout http-keep-alive 30000
 
+frontend stats
+       bind *:8448
+       http-request use-service prometheus-exporter if { path /metrics }
+       stats enable
+       stats uri /stats
+       stats refresh 10s
 
 frontend IST_8080
         mode http
@@ -73,8 +84,8 @@ frontend IST_8080
         option log-separate-errors
         option forwardfor
         http-request set-header X-Forwarded-Proto http
-        reqadd X-Forwarded-Proto:\ http
-        reqadd X-Forwarded-Port:\ 8080
+        http-request set-header X-Forwarded-Proto http
+        http-request add-header X-Forwarded-Port 8080
 
 #######################
 #ACLS FOR PORT 8446####
@@ -104,6 +115,10 @@ frontend IST_8443
         capture response header Host len 100
         option log-separate-errors
         option forwardfor
+
+        http-request set-header X-Forwarded-Proto https
+        http-request add-header X-Forwarded-Port 8443
+
         http-request set-header X-Forwarded-Proto https if { ssl_fc }
         http-request set-header X-AAI-Client-SSL TRUE if { ssl_c_used }
         http-request set-header X-AAI-SSL                       %[ssl_fc]
@@ -128,8 +143,6 @@ frontend IST_8443
         {{- end }}
         {{- end }}
 
-        reqadd X-Forwarded-Proto:\ https
-        reqadd X-Forwarded-Port:\ 8443
 {{- end }}
 
 #######################
@@ -152,12 +165,14 @@ frontend IST_8443
 
 backend IST_Default_8447
         balance roundrobin
+        stick-table type string len 100 size 200k expire 2m
+        stick on path
         http-request set-header X-Forwarded-Port %[src_port]
         http-response set-header Strict-Transport-Security max-age=16000000;\ includeSubDomains;\ preload;
 {{- if ( include "common.needTLS" .) }}
-        server aai-resources.{{.Release.Namespace}} aai-resources.{{.Release.Namespace}}.svc.cluster.local:8447 resolvers kubernetes check check-ssl port 8447 ssl verify none
+        server-template aai-resources.{{.Release.Namespace}} {{$.Values.haproxy.replicas.aaiResources}} aai-resources.{{.Release.Namespace}}.svc.cluster.local:8447 resolvers kubernetes check check-ssl port 8447 ssl verify none
 {{- else }}
-        server aai-resources.{{.Release.Namespace}} aai-resources.{{.Release.Namespace}}.svc.cluster.local:8447 resolvers kubernetes check port 8447
+        server-template aai-resources.{{.Release.Namespace}} {{$.Values.haproxy.replicas.aaiResources}} aai-resources.{{.Release.Namespace}}.svc.cluster.local:8447 resolvers kubernetes check port 8447
 {{- end }}
 
 #######################
@@ -166,10 +181,12 @@ backend IST_Default_8447
 
 backend IST_AAI_8446
         balance roundrobin
+        stick-table type string len 100 size 200k expire 2m
+        stick on path
         http-request set-header X-Forwarded-Port %[src_port]
         http-response set-header Strict-Transport-Security max-age=16000000;\ includeSubDomains;\ preload;
 {{- if ( include "common.needTLS" .) }}
-        server aai-traversal.{{.Release.Namespace}} aai-traversal.{{.Release.Namespace}}.svc.cluster.local:8446 resolvers kubernetes check check-ssl port 8446 ssl verify none
+        server-template aai-traversal.{{.Release.Namespace}} {{$.Values.haproxy.replicas.aaiTraversal}} aai-traversal.{{.Release.Namespace}}.svc.cluster.local:8446 resolvers kubernetes check check-ssl port 8446 ssl verify none
 {{- else }}
-        server aai-traversal.{{.Release.Namespace}} aai-traversal.{{.Release.Namespace}}.svc.cluster.local:8446 resolvers kubernetes check port 8446
+        server-template aai-traversal.{{.Release.Namespace}} {{$.Values.haproxy.replicas.aaiTraversal}} aai-traversal.{{.Release.Namespace}}.svc.cluster.local:8446 resolvers kubernetes check port 8446
 {{- end }}
index 80fcebb..f1d10e2 100644 (file)
@@ -30,6 +30,13 @@ spec:
     matchLabels:
       app: {{ include "common.name" . }}
   replicas: {{ .Values.replicaCount }}
+  strategy:
+    type: {{ .Values.updateStrategy.type }}
+    {{- if (eq "RollingUpdate" .Values.updateStrategy.type) }}
+    rollingUpdate:
+      maxUnavailable: {{ .Values.updateStrategy.maxUnavailable }}
+      maxSurge: {{ .Values.updateStrategy.maxSurge }}
+    {{- end }}
   template:
     metadata:
       labels:
@@ -39,6 +46,7 @@ spec:
       annotations:
         checksum/config: {{ include (print $.Template.BasePath "/configmap.yaml") . | sha256sum }}
     spec:
+      terminationGracePeriodSeconds: {{ .Values.service.terminationGracePeriodSeconds }}
       initContainers: {{ include "common.certInitializer.initContainer" . | nindent 6 }}
       - command:
         - /app/ready.py
@@ -58,6 +66,13 @@ spec:
         image: {{ include "repositoryGenerator.image.readiness" . }}
         imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
         name: {{ include "common.name" . }}-readiness
+        resources:
+          requests:
+            memory: {{ .Values.haproxy.initContainers.resources.memory }}
+            cpu: {{ .Values.haproxy.initContainers.resources.cpu }}
+          limits:
+            memory: {{ .Values.haproxy.initContainers.resources.memory }}
+            cpu: {{ .Values.haproxy.initContainers.resources.cpu }}
       containers:
       - name: {{ include "common.name" . }}
         image: "{{ include "repositoryGenerator.dockerHubRepository" . }}/{{ .Values.image }}"
@@ -79,6 +94,7 @@ spec:
         ports:
         - containerPort: {{ .Values.service.internalPort }}
         - containerPort: {{ .Values.service.internalPlainPort }}
+        - containerPort: {{ .Values.metricsService.internalPort }}
         # disable liveness probe when breakpoints set in debugger
         # so K8s doesn't restart unresponsive container
         {{- if eq .Values.liveness.enabled true }}
index 4a6dc8e..a8c3c39 100644 (file)
@@ -35,6 +35,8 @@ spec:
   type: {{ .Values.service.type }}
   selector:
     app: {{ include "common.name" . }}
+  clusterIP: {{ .Values.service.aaiServiceClusterIp }}
+  sessionAffinity: {{ .Values.service.sessionAffinity }}
 ---
 apiVersion: v1
 kind: Service
@@ -54,4 +56,23 @@ spec:
   type: ClusterIP
   selector:
     app: {{ include "common.name" . }}
-
+---
+apiVersion: v1
+kind: Service
+metadata:
+  name: {{ include "common.servicename" . }}-metrics
+  namespace: {{ include "common.namespace" . }}
+  labels:
+    app: {{ include "common.name" . }}-metrics
+    chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
+    release: {{ include "common.release" . }}
+    heritage: {{ .Release.Service }}
+spec:
+  ports:
+    - port: {{ .Values.metricsService.externalPort }}
+      targetPort: {{ .Values.metricsService.internalPort }}
+      name: {{ .Values.metricsService.portName }}
+  type: {{ .Values.metricsService.type }}
+  selector:
+    app: {{ include "common.name" . }}
+  clusterIP: None
\ No newline at end of file
diff --git a/kubernetes/aai/templates/servicemonitor.yaml b/kubernetes/aai/templates/servicemonitor.yaml
new file mode 100644 (file)
index 0000000..c0d9f21
--- /dev/null
@@ -0,0 +1,3 @@
+{{- if .Values.metrics.serviceMonitor.enabled }}
+{{  include "common.serviceMonitor" . }}
+{{- end }}
\ No newline at end of file
index 247c58b..d382b80 100644 (file)
@@ -277,12 +277,16 @@ global: # global defaults
         # since when this is enabled, it prints a lot of information to console
         enabled: false
 
+  aaiSdcListenerKafkaUser: aai-sdc-list-user
+
 aai-babel:
   logConfigMapNamePrefix: '{{ include "common.release" . }}-aai'
 aai-graphadmin:
   logConfigMapNamePrefix: '{{ include "common.release" . }}-aai'
 aai-modelloader:
   logConfigMapNamePrefix: '{{ include "common.release" . }}-aai'
+  config:
+    jaasConfExternalSecret: '{{ include "common.release" . }}-{{ .Values.global.aaiSdcListenerKafkaUser }}'
 aai-resources:
   logConfigMapNamePrefix: '{{ include "common.release" . }}-aai'
 aai-schema-service:
@@ -328,7 +332,7 @@ certInitializer:
 
 # application image
 dockerhubRepository: registry.hub.docker.com
-image: aaionap/haproxy:1.4.2
+image: onap/aai-haproxy:1.9.5
 pullPolicy: Always
 
 flavor: small
@@ -345,15 +349,27 @@ config:
 # default number of instances
 replicaCount: 1
 
+updateStrategy:
+  type: RollingUpdate
+  maxUnavailable: 0
+  maxSurge: 1
+
 nodeSelector: {}
 
 affinity: {}
 
 # HAProxy configuration to block HTTP requests to AAI based on configurable URL patterns
 haproxy:
+  initContainers:
+    resources:
+      memory: 100Mi
+      cpu: 50m
   requestBlocking:
     enabled: false
     customConfigs: []
+  replicas:
+    aaiResources: 1
+    aaiTraversal: 1
 
 # probe configuration parameters
 liveness:
@@ -392,6 +408,32 @@ service:
   externalPlainPort: 80
   internalPlainPort: 8080
   nodeport: 33
+  aaiServiceClusterIp:
+  sessionAffinity: None
+
+metricsService:
+  type: ClusterIP
+  portName: prometheus
+  externalPort: 8448
+  internalPort: 8448
+
+metrics:
+  serviceMonitor:
+    enabled: false
+    targetPort: 8448
+    path: /metrics
+    basicAuth:
+      enabled: false
+
+    selector:
+      app: '{{ include "common.name" . }}-metrics'
+      chart: '{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}'
+      release: '{{ include "common.release" . }}'
+      heritage: '{{ .Release.Service }}'
+
+    relabelings: []
+
+    metricRelabelings: []
 
 ingress:
   enabled: false
index d65bbfb..782a5c6 100644 (file)
 apiVersion: v2
 description: Application Controller
 name: appc
-version: 11.0.0
+version: 12.0.0
 
 dependencies:
   - name: common
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
   - name: mariadb-galera
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
   - name: dgbuilder
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
   - name: repositoryGenerator
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
   - name: appc-ansible-server
-    version: ~11.x-0
+    version: ~12.x-0
     repository: 'file://components/appc-ansible-server'
     condition: appc-ansible-server.enabled
   - name: appc-cdt
-    version: ~11.x-0
+    version: ~12.x-0
     repository: 'file://components/appc-cdt'
     condition: appc-cdt.enabled
index 6daa29c..1929d38 100644 (file)
 apiVersion: v2
 description: ONAP APPC Ansible Server
 name: appc-ansible-server
-version: 11.0.0
+version: 12.0.0
 
 dependencies:
   - name: common
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
   - name: repositoryGenerator
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
index faabb71..917bfab 100644 (file)
 apiVersion: v2
 description: ONAP APPC Self Service Controller Design Tool
 name: appc-cdt
-version: 11.0.0
+version: 12.0.0
 
 dependencies:
   - name: common
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
   - name: certInitializer
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
   - name: repositoryGenerator
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
index 7115e9e..578899f 100644 (file)
 apiVersion: v2
 description: ONAP Controller Design Studio (CDS)
 name: cds
-version: 11.0.0
+version: 12.0.0
 
 dependencies:
   - name: common
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
   - name: mariadb-galera
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
   - name: cds-blueprints-processor
-    version: ~11.x-0
+    version: ~12.x-0
     repository: 'file://components/cds-blueprints-processor'
     condition: cds-blueprints-processor.enabled
   - name: cds-command-executor
-    version: ~11.x-0
+    version: ~12.x-0
     repository: 'file://components/cds-command-executor'
     condition: cds-command-executor.enabled
   - name: cds-py-executor
-    version: ~11.x-0
+    version: ~12.x-0
     repository: 'file://components/cds-py-executor'
     condition: cds-py-executor.enabled
   - name: cds-sdc-listener
-    version: ~11.x-0
+    version: ~12.x-0
     repository: 'file://components/cds-sdc-listener'
     condition: cds-sdc-listener.enabled
   - name: cds-ui
-    version: ~11.x-0
+    version: ~12.x-0
     repository: 'file://components/cds-ui'
     condition: cds-ui.enabled
index 2002e56..3ef9519 100755 (executable)
 apiVersion: v2
 description: ONAP CDS Blueprints Processor
 name: cds-blueprints-processor
-version: 11.0.0
+version: 12.0.0
 
 dependencies:
   - name: common
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
   - name: repositoryGenerator
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
   - name: serviceAccount
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
   - name: certInitializer
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
index 6749d8d..d896159 100755 (executable)
 apiVersion: v2
 description: ONAP CDS Command Executor
 name: cds-command-executor
-version: 11.0.0
+version: 12.0.0
 
 dependencies:
   - name: common
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
   - name: repositoryGenerator
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
   - name: serviceAccount
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
\ No newline at end of file
index cf09b56..7fb96f9 100755 (executable)
 apiVersion: v2
 description: ONAP CDS Py Executor
 name: cds-py-executor
-version: 11.0.0
+version: 12.0.0
 
 dependencies:
   - name: common
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
   - name: repositoryGenerator
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
   - name: serviceAccount
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
index 14cd147..39d0e6c 100755 (executable)
 apiVersion: v2
 description: ONAP CDS SDC listener microservice
 name: cds-sdc-listener
-version: 11.0.0
+version: 12.0.0
 
 dependencies:
   - name: common
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
   - name: repositoryGenerator
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
   - name: serviceAccount
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
\ No newline at end of file
index c356a0f..2bf7c58 100644 (file)
 apiVersion: v2
 description: ONAP CDS UI
 name: cds-ui
-version: 11.0.0
+version: 12.0.0
 
 dependencies:
   - name: common
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
   - name: certInitializer
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
   - name: repositoryGenerator
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
   - name: serviceAccount
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
index 1432f75..16885d9 100644 (file)
 apiVersion: v2
 description: ONAP Command Line Interface
 name: cli
-version: 11.0.0
+version: 12.0.0
 
 dependencies:
   - name: common
-    version: ~11.x-0
+    version: ~12.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: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
   - name: repositoryGenerator
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
   - name: serviceAccount
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
index 8095acb..bb4c5b4 100644 (file)
 apiVersion: v2
 description: ONAP cassandra
 name: cassandra
-version: 11.0.0
+version: 12.0.0
 
 dependencies:
   - name: common
-    version: ~11.x-0
+    version: ~12.x-0
     repository: 'file://../common'
   - name: repositoryGenerator
-    version: ~11.x-0
+    version: ~12.x-0
     repository: 'file://../repositoryGenerator'
   - name: serviceAccount
-    version: ~11.x-0
+    version: ~12.x-0
     repository: 'file://../serviceAccount'
index fbafd9a..c42a319 100644 (file)
@@ -17,9 +17,9 @@
 apiVersion: v2
 description: Wrapper chart to allow truststore to be shared among cert-initializer instances
 name: cert-wrapper
-version: 11.0.0
+version: 12.0.0
 
 dependencies:
   - name: certInitializer
-    version: ~11.x-0
+    version: ~12.x-0
     repository: 'file://../certInitializer'
index f083bf8..6b4e0df 100644 (file)
 apiVersion: v2
 description: Template used to obtain certificates in onap
 name: certInitializer
-version: 11.0.0
+version: 12.0.0
 
 dependencies:
   - name: common
-    version: ~11.x-0
+    version: ~12.x-0
     repository: 'file://../common'
   - name: readinessCheck
-    version: ~11.x-0
+    version: ~12.x-0
     repository: 'file://../readinessCheck'
   - name: repositoryGenerator
-    version: ~11.x-0
+    version: ~12.x-0
     repository: 'file://../repositoryGenerator'
index b65f9f3..4854a62 100644 (file)
 apiVersion: v2
 name: certManagerCertificate
 description: A Helm chart for Cert-Manager Certificate CRD template
-version: 11.0.0
+version: 12.0.0
 
 dependencies:
   - name: common
-    version: ~11.x-0
+    version: ~12.x-0
     repository: 'file://../common'
   - name: cmpv2Config
-    version: ~11.x-0
+    version: ~12.x-0
     repository: 'file://../cmpv2Config'
index 7689e08..c076c99 100644 (file)
@@ -17,9 +17,9 @@
 apiVersion: v2
 description: Template used to store cmpv2 configuration in onap
 name: cmpv2Config
-version: 11.0.0
+version: 12.0.0
 
 dependencies:
   - name: common
-    version: ~11.x-0
+    version: ~12.x-0
     repository: 'file://../common'
index aeb07ee..f041511 100644 (file)
@@ -16,4 +16,4 @@
 apiVersion: v2
 description: Common templates for inclusion in other charts
 name: common
-version: 11.0.0
+version: 12.0.0
index 4fc2e4b..d8a9447 100644 (file)
 # See the License for the specific language governing permissions and
 # limitations under the License.
 */}}
+{{/*
+  Create the hostname as concatination <baseaddr>.<baseurl>
+  - baseaddr: from component values: ingress.service.baseaddr
+  - baseurl: from values: global.ingress.virtualhost.baseurl
+    which van be overwritten in the component via: ingress.baseurlOverride
+*/}}
 {{- define "ingress.config.host" -}}
 {{-   $dot := default . .dot -}}
 {{-   $baseaddr := (required "'baseaddr' param, set to the specific part of the fqdn, is required." .baseaddr) -}}
 {{-   $burl := (required "'baseurl' param, set to the generic part of the fqdn, is required." $dot.Values.global.ingress.virtualhost.baseurl) -}}
+{{-   $burl := include "common.ingress._overrideIfDefined" (dict "currVal" $burl "parent" (default (dict) $dot.Values.ingress) "var" "baseurlOverride") -}}
 {{ printf "%s.%s" $baseaddr $burl }}
 {{- end -}}
 
+{{/*
+  Helper function to add the tls route
+*/}}
+{{- define "ingress.config.tls" -}}
+{{-   $dot := default . .dot -}}
+{{-   $baseaddr := (required "'baseaddr' param, set to the specific part of the fqdn, is required." .baseaddr) -}}
+{{-   if $dot.Values.global.ingress.config }}
+{{-     if $dot.Values.global.ingress.config.ssl }}
+{{-       if eq $dot.Values.global.ingress.config.ssl "redirect" }}
+    tls:
+      httpsRedirect: true
+  - port:
+      number: 443
+      name: https
+      protocol: HTTPS
+    tls:
+{{-         if $dot.Values.global.ingress.config }}
+{{-           if $dot.Values.global.ingress.config.tls }}
+      credentialName: {{ default "ingress-tls-secret" $dot.Values.global.ingress.config.tls.secret }}
+{{-           else }}
+      credentialName: "ingress-tls-secret"
+{{-           end }}
+{{-         else }}
+      credentialName: "ingress-tls-secret"
+{{-         end }}
+      mode: SIMPLE
+    hosts:
+    - {{ include "ingress.config.host" (dict "dot" $dot "baseaddr" $baseaddr) }}
+{{-       end }}
+{{-     end }}
+{{-   end }}
+{{- end -}}
+
+{{/*
+  Helper function to add the route to the service
+*/}}
 {{- define "ingress.config.port" -}}
 {{-   $dot := default . .dot -}}
 {{ range .Values.ingress.service }}
 {{- end }}
 {{- end -}}
 
+{{/*
+  Helper function to add the route to the service
+*/}}
 {{- define "istio.config.route" -}}
 {{-   $dot := default . .dot -}}
-{{ range .Values.ingress.service }}
   http:
   - route:
     - destination:
         {{- end }}
         host: {{ .name }}
 {{- end -}}
-{{- end -}}
 
+{{/*
+  Helper function to add ssl annotations
+*/}}
 {{- define "ingress.config.annotations.ssl" -}}
 {{- if .Values.ingress.config -}}
 {{- if .Values.ingress.config.ssl -}}
@@ -85,6 +132,9 @@ nginx.ingress.kubernetes.io/ssl-redirect: "false"
 {{- end -}}
 
 
+{{/*
+  Helper function to add annotations
+*/}}
 {{- define "ingress.config.annotations" -}}
 {{- if .Values.ingress -}}
 {{- if .Values.ingress.annotations -}}
@@ -94,6 +144,9 @@ nginx.ingress.kubernetes.io/ssl-redirect: "false"
 {{ include "ingress.config.annotations.ssl" . | indent 4 | trim }}
 {{- end -}}
 
+{{/*
+  Helper function to check the existance of an override value
+*/}}
 {{- define "common.ingress._overrideIfDefined" -}}
   {{- $currValue := .currVal }}
   {{- $parent := .parent }}
@@ -109,20 +162,38 @@ nginx.ingress.kubernetes.io/ssl-redirect: "false"
   {{- end -}}
 {{- end -}}
 
-{{- define "common.ingress" -}}
+{{/*
+  Helper function to check, if Ingress is enabled
+*/}}
+{{- define "common.ingress._enabled" -}}
 {{-   $dot := default . .dot -}}
-{{- if .Values.ingress -}}
-  {{- $ingressEnabled := default false .Values.ingress.enabled -}}
-  {{- $ingressEnabled := include "common.ingress._overrideIfDefined" (dict "currVal" $ingressEnabled "parent" (default (dict) .Values.global.ingress) "var" "enabled") }}
-  {{- $ingressEnabled := include "common.ingress._overrideIfDefined" (dict "currVal" $ingressEnabled "parent" .Values.ingress "var" "enabledOverride") }}
-{{- if $ingressEnabled }}
-{{- if (include "common.onServiceMesh" .) }}
-{{- if eq (default "istio" .Values.global.serviceMesh.engine) "istio" }}
-      {{-   $dot := default . .dot -}}
+{{-   if $dot.Values.ingress -}}
+{{-     if $dot.Values.global.ingress -}}
+{{-       if (default false $dot.Values.global.ingress.enabled) -}}
+{{-         if (default false $dot.Values.global.ingress.enable_all) -}}
+true
+{{-         else -}}
+{{-           if $dot.Values.ingress.enabled -}}
+true
+{{-           end -}}
+{{-         end -}}
+{{-       end -}}
+{{-     end -}}
+{{-   end -}}
+{{- end -}}
+
+{{/*
+  Create Istio Ingress resources per defined service
+*/}}
+{{- define "common.istioIngress" -}}
+{{-   $dot := default . .dot -}}
+{{    range $dot.Values.ingress.service }}
+{{-     $baseaddr := (required "'baseaddr' param, set to the specific part of the fqdn, is required." .baseaddr) }}
+---
 apiVersion: networking.istio.io/v1beta1
 kind: Gateway
 metadata:
-  name: {{ include "common.fullname" . }}-gateway
+  name: {{ $baseaddr }}-gateway
 spec:
   selector:
     istio: ingressgateway # use Istio default gateway implementation
@@ -132,80 +203,87 @@ spec:
       name: http
       protocol: HTTP
     hosts:
-    {{- range .Values.ingress.service }}{{ $baseaddr := required "baseaddr" .baseaddr }}
-    - {{ include "ingress.config.host" (dict "dot" $dot "baseaddr" $baseaddr) }}
-    {{- end }}
-{{- if .Values.global.ingress.config }}
-{{- if .Values.global.ingress.config.ssl }}
-{{- if eq .Values.global.ingress.config.ssl "redirect" }}
-    tls:
-      httpsRedirect: true
-  - port:
-      number: 443
-      name: https
-      protocol: HTTPS
-    tls:
-{{- if .Values.global.ingress.config }}
-{{- if .Values.global.ingress.config.tls }}
-      credentialName: {{ default "ingress-tls-secret" .Values.global.ingress.config.tls.secret }}
-{{- else }}
-      credentialName: "ingress-tls-secret"
-{{- end }}
-{{- else }}
-      credentialName: "ingress-tls-secret"
-{{- end }}
-      mode: SIMPLE
-    hosts:
-    {{- range .Values.ingress.service }}{{ $baseaddr := required "baseaddr" .baseaddr }}
     - {{ include "ingress.config.host" (dict "dot" $dot "baseaddr" $baseaddr) }}
-    {{- end }}
-{{- end }}
-{{- end }}
-{{- end }}
+    {{ include "ingress.config.tls" (dict "dot" $dot "baseaddr" $baseaddr) }}
 ---
 apiVersion: networking.istio.io/v1beta1
 kind: VirtualService
 metadata:
-  name: {{ include "common.fullname" . }}-service
+  name: {{ $baseaddr }}-service
 spec:
   hosts:
-  {{- range .Values.ingress.service }}{{ $baseaddr := required "baseaddr" .baseaddr }}
     - {{ include "ingress.config.host" (dict "dot" $dot "baseaddr" $baseaddr) }}
-  {{- end }}
   gateways:
-  - {{ include "common.fullname" . }}-gateway
+  - {{ $baseaddr }}-gateway
   {{ include "istio.config.route" . | trim }}
+{{-   end -}}
 {{- end -}}
-{{- else -}}
+
+{{/*
+  Create default Ingress resource
+*/}}
+{{- define "common.nginxIngress" -}}
+{{- $dot := default . .dot -}}
 apiVersion: networking.k8s.io/v1
 kind: Ingress
 metadata:
-  name: {{ include "common.fullname" . }}-ingress
+  name: {{ include "common.fullname" $dot }}-ingress
   annotations:
-    {{ include "ingress.config.annotations" . }}
+    {{ include "ingress.config.annotations" $dot }}
   labels:
-    app: {{ .Chart.Name }}
-    chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
-    release: {{ include "common.release" . }}
-    heritage: {{ .Release.Service }}
+    app: {{ $dot.Chart.Name }}
+    chart: {{ $dot.Chart.Name }}-{{ $dot.Chart.Version | replace "+" "_" }}
+    release: {{ include "common.release" $dot }}
+    heritage: {{ $dot.Release.Service }}
 spec:
   rules:
-  {{ include "ingress.config.port" . | trim }}
-{{- if .Values.ingress.tls }}
+  {{ include "ingress.config.port" $dot | trim }}
+{{- if $dot.Values.ingress.tls }}
   tls:
-{{ toYaml .Values.ingress.tls | indent 4 }}
+{{ toYaml $dot.Values.ingress.tls | indent 4 }}
 {{- end -}}
-{{- if .Values.ingress.config -}}
-{{- if .Values.ingress.config.tls -}}
+{{- if $dot.Values.ingress.config -}}
+{{-   if $dot.Values.ingress.config.tls -}}
   tls:
   - hosts:
-  {{- range .Values.ingress.service }}{{ $baseaddr := required "baseaddr" .baseaddr }}
+  {{-   range $dot.Values.ingress.service }}{{ $baseaddr := required "baseaddr" .baseaddr }}
     - {{ include "ingress.config.host" (dict "dot" $dot "baseaddr" $baseaddr) }}
-  {{- end }}
-    secretName: {{ required "secret" (tpl (default "" .Values.ingress.config.tls.secret) $dot) }}
-{{- end -}}
-{{- end -}}
-{{- end -}}
+  {{-   end }}
+    secretName: {{ required "secret" (tpl (default "" $dot.Values.ingress.config.tls.secret) $dot) }}
+{{-   end -}}
 {{- end -}}
 {{- end -}}
+
+{{/*
+  Create ingress template
+    Will create ingress template depending on the following values:
+    - .Values.global.ingress.enabled     : enables Ingress globally
+    - .Values.global.ingress.enable_all  : override default Ingress for all charts
+    - .Values.ingress.enabled            : sets Ingress per chart basis
+
+    | global.ingress.enabled | global.ingress.enable_all |ingress.enabled | result     |
+    |------------------------|---------------------------|----------------|------------|
+    | false                  | any                       | any            | no ingress |
+    | true                   | false                     | false          | no ingress |
+    | true                   | true                      | any            | ingress    |
+    | true                   | false                     | true           | ingress    |
+
+    If ServiceMesh (Istio) is enabled the respective resources are created:
+    - Gateway
+    - VirtualService
+
+    If ServiceMesh is disabled the standard Ingress resource is creates:
+    - Ingress
+*/}}
+{{- define "common.ingress" -}}
+{{-   $dot := default . .dot -}}
+{{-   if (include "common.ingress._enabled" (dict "dot" $dot)) }}
+{{-     if (include "common.onServiceMesh" .) }}
+{{-       if eq (default "istio" .Values.global.serviceMesh.engine) "istio" }}
+{{          include "common.istioIngress" (dict "dot" $dot) }}
+{{-       end -}}
+{{-     else -}}
+{{        include "common.nginxIngress" (dict "dot" $dot) }}
+{{-     end -}}
+{{-   end -}}
 {{- end -}}
index 379992e..7b88af0 100644 (file)
@@ -242,7 +242,7 @@ spec:
 {{-   $labels := default (dict) .labels -}}
 {{-   $matchLabels := default (dict) .matchLabels -}}
 {{-   if and (include "common.onServiceMesh" $dot) (eq $serviceType "NodePort") }}
-{{-   $serviceType = "ClusterIP" }}
+{{-     $serviceType = "ClusterIP" }}
 {{-   end }}
 
 {{-   if (and (include "common.needTLS" $dot) $both_tls_and_plain) }}
index 1a1b8e2..5884211 100644 (file)
 apiVersion: v2
 description: D.G. Builder application
 name: dgbuilder
-version: 11.0.0
+version: 12.0.0
 
 dependencies:
   - name: common
-    version: ~11.x-0
+    version: ~12.x-0
     repository: 'file://../common'
   - name: certInitializer
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
   - name: repositoryGenerator
-    version: ~11.x-0
+    version: ~12.x-0
     repository: 'file://../repositoryGenerator'
   - name: serviceAccount
-    version: ~11.x-0
+    version: ~12.x-0
     repository: 'file://../serviceAccount'
index cd187ff..cc02711 100644 (file)
 apiVersion: v2
 description: ONAP elasticsearch
 name: elasticsearch
-version: 11.0.0
+version: 12.0.0
 
 dependencies:
   - name: common
-    version: ~11.x-0
+    version: ~12.x-0
     repository: 'file://../common'
   - name: master
-    version: ~11.x-0
+    version: ~12.x-0
     repository: 'file://components/master'
   - name: data
-    version: ~11.x-0
+    version: ~12.x-0
     repository: 'file://components/data'
     condition: elasticsearch.data.enabled,data.enabled
   - name: curator
-    version: ~11.x-0
+    version: ~12.x-0
     repository: 'file://components/curator'
     condition: elasticsearch.curator.enabled,curator.enabled
   - name: certInitializer
-    version: ~11.x-0
+    version: ~12.x-0
     repository: 'file://../certInitializer'
   - name: repositoryGenerator
-    version: ~11.x-0
+    version: ~12.x-0
     repository: 'file://../repositoryGenerator'
index 21017c4..96f75a1 100644 (file)
 apiVersion: v2
 description: ONAP elasticsearch curator
 name: curator
-version: 11.0.0
+version: 12.0.0
 
 dependencies:
   - name: common
-    version: ~11.x-0
+    version: ~12.x-0
     repository: 'file://../../../common'
   - name: repositoryGenerator
-    version: ~11.x-0
+    version: ~12.x-0
     repository: 'file://../../../repositoryGenerator'
\ No newline at end of file
index fc89071..1b42a19 100644 (file)
 apiVersion: v2
 description: ONAP elasticsearch data
 name: data
-version: 11.0.0
+version: 12.0.0
 
 dependencies:
   - name: common
-    version: ~11.x-0
+    version: ~12.x-0
     repository: 'file://../../../common'
   - name: repositoryGenerator
-    version: ~11.x-0
+    version: ~12.x-0
     repository: 'file://../../../repositoryGenerator'
index 43fe42f..5ff277d 100644 (file)
 apiVersion: v2
 description: ONAP elasticsearch master
 name: master
-version: 11.0.0
+version: 12.0.0
 
 dependencies:
   - name: common
-    version: ~11.x-0
+    version: ~12.x-0
     repository: 'file://../../../common'
   - name: repositoryGenerator
-    version: ~11.x-0
+    version: ~12.x-0
     repository: 'file://../../../repositoryGenerator'
index b4c36c3..a76d534 100644 (file)
 apiVersion: v2
 description: Chart for etcd init job
 name: etcd-init
-version: 11.0.0
+version: 12.0.0
 
 dependencies:
   - name: common
-    version: ~11.x-0
+    version: ~12.x-0
     repository: 'file://../common'
   - name: repositoryGenerator
-    version: ~11.x-0
+    version: ~12.x-0
     repository: 'file://../repositoryGenerator'
\ No newline at end of file
index 4464919..e038e26 100644 (file)
@@ -17,7 +17,7 @@
 apiVersion: v2
 name: etcd
 home: https://github.com/coreos/etcd
-version: 11.0.0
+version: 12.0.0
 appVersion: 2.2.5
 description: Distributed reliable key-value store for the most critical data of a
   distributed system.
@@ -27,8 +27,8 @@ sources:
 
 dependencies:
   - name: common
-    version: ~11.x-0
+    version: ~12.x-0
     repository: 'file://../common'
   - name: repositoryGenerator
-    version: ~11.x-0
+    version: ~12.x-0
     repository: 'file://../repositoryGenerator'
index 5b9286d..8207803 100644 (file)
@@ -17,9 +17,9 @@
 apiVersion: v2
 description: Template used to create same STDOUT log configuration
 name: logConfiguration
-version: 11.0.0
+version: 12.0.0
 
 dependencies:
   - name: common
-    version: ~11.x-0
+    version: ~12.x-0
     repository: 'file://../common'
index ddbaacc..587fa38 100644 (file)
@@ -18,7 +18,7 @@
 apiVersion: v2
 description: Chart for MariaDB Galera cluster
 name: mariadb-galera
-version: 11.0.0
+version: 12.0.0
 keywords:
   - mariadb
   - mysql
@@ -29,14 +29,14 @@ keywords:
 
 dependencies:
   - name: common
-    version: ~11.x-0
+    version: ~12.x-0
     repository: 'file://../common'
   - name: readinessCheck
-    version: ~11.x-0
+    version: ~12.x-0
     repository: 'file://../readinessCheck'
   - name: repositoryGenerator
-    version: ~11.x-0
+    version: ~12.x-0
     repository: 'file://../repositoryGenerator'
   - name: serviceAccount
-    version: ~11.x-0
+    version: ~12.x-0
     repository: 'file://../serviceAccount'
\ No newline at end of file
index b9fa78f..32e6762 100644 (file)
 apiVersion: v2
 description: Chart for MariaDB Galera init job
 name: mariadb-init
-version: 11.0.0
+version: 12.0.0
 
 dependencies:
   - name: common
-    version: ~11.x-0
+    version: ~12.x-0
     repository: 'file://../common'
   - name: repositoryGenerator
-    version: ~11.x-0
+    version: ~12.x-0
     repository: 'file://../repositoryGenerator'
\ No newline at end of file
index 229da35..180af14 100644 (file)
 apiVersion: v2
 description: MongoDB Server
 name: mongo
-version: 11.0.0
+version: 12.0.0
 
 dependencies:
   - name: common
-    version: ~11.x-0
+    version: ~12.x-0
     repository: 'file://../common'
   - name: repositoryGenerator
-    version: ~11.x-0
+    version: ~12.x-0
     repository: 'file://../repositoryGenerator'
\ No newline at end of file
index f275168..c41eff4 100644 (file)
 apiVersion: v2
 description: MUSIC - Multi-site State Coordination Service
 name: music
-version: 11.0.0
+version: 12.0.0
 
 dependencies:
   - name: music-cassandra
-    version: ~11.x-0
+    version: ~12.x-0
     repository: 'file://components/music-cassandra'
   - name: common
-    version: ~11.x-0
+    version: ~12.x-0
     repository: 'file://../common'
   - name: repositoryGenerator
-    version: ~11.x-0
+    version: ~12.x-0
     repository: 'file://../repositoryGenerator'
   - name: certInitializer
-    version: ~11.x-0
+    version: ~12.x-0
     repository: 'file://../certInitializer'
\ No newline at end of file
index 8a575c7..6c68082 100644 (file)
 apiVersion: v2
 description: ONAP - Cassandra Database
 name: music-cassandra
-version: 11.0.0
+version: 12.0.0
 
 dependencies:
   - name: common
-    version: ~11.x-0
+    version: ~12.x-0
     repository: 'file://../../../common'
   - name: repositoryGenerator
-    version: ~11.x-0
+    version: ~12.x-0
     repository: 'file://../../../repositoryGenerator'
\ No newline at end of file
index 2c4ed9e..17eaa68 100644 (file)
 apiVersion: v2\r
 description: Name Generation Micro Service\r
 name: network-name-gen\r
-version: 11.0.0\r
+version: 12.0.0\r
 \r
 dependencies:\r
   - name: common\r
-    version: ~11.x-0\r
+    version: ~12.x-0\r
     repository: 'file://../common'\r
   - name: repositoryGenerator\r
-    version: ~11.x-0\r
+    version: ~12.x-0\r
     repository: 'file://../repositoryGenerator'\r
   - name: mariadb-galera\r
-    version: ~11.x-0\r
+    version: ~12.x-0\r
     repository: 'file://../mariadb-galera'\r
     condition: global.mariadbGalera.localCluster\r
   - name: mariadb-init\r
-    version: ~11.x-0\r
+    version: ~12.x-0\r
     repository: 'file://../mariadb-init'\r
     condition: not global.mariadbGalera.localCluster
\ No newline at end of file
index ff8c98c..9fe2eae 100644 (file)
 apiVersion: v2
 description: Chart for Postgres init job
 name: postgres-init
-version: 11.0.0
+version: 12.0.0
 
 
 dependencies:
   - name: common
-    version: ~11.x-0
+    version: ~12.x-0
     repository: 'file://../common'
   - name: repositoryGenerator
-    version: ~11.x-0
+    version: ~12.x-0
     repository: 'file://../repositoryGenerator'
\ No newline at end of file
index 8644bcf..d09f412 100644 (file)
 apiVersion: v2
 description: ONAP Postgres Server
 name: postgres
-version: 11.0.0
+version: 12.0.0
 
 dependencies:
   - name: common
-    version: ~11.x-0
+    version: ~12.x-0
     repository: 'file://../common'
   - name: repositoryGenerator
-    version: ~11.x-0
+    version: ~12.x-0
     repository: 'file://../repositoryGenerator'
\ No newline at end of file
index 3997aeb..6caea5f 100644 (file)
 apiVersion: v2
 description: Template used to wait for other deployment/sts/jobs in onap
 name: readinessCheck
-version: 11.0.0
+version: 12.0.0
 
 dependencies:
   - name: common
-    version: ~11.x-0
+    version: ~12.x-0
     repository: 'file://../common'
   - name: repositoryGenerator
-    version: ~11.x-0
+    version: ~12.x-0
     repository: 'file://../repositoryGenerator'
\ No newline at end of file
index c385a3b..3823e64 100644 (file)
 apiVersion: v2
 description: Wrapper chart to allow docker secret to be shared all instances
 name: repository-wrapper
-version: 11.0.0
+version: 12.0.0
 
 dependencies:
   - name: common
-    version: ~11.x-0
+    version: ~12.x-0
     repository: 'file://../common'
   - name: repositoryGenerator
-    version: ~11.x-0
+    version: ~12.x-0
     repository: 'file://../repositoryGenerator'
\ No newline at end of file
index fe710e1..52a2793 100644 (file)
@@ -16,4 +16,4 @@
 apiVersion: v2
 description: Template used to generate the right repository link
 name: repositoryGenerator
-version: 11.0.0
+version: 12.0.0
index 8024aba..717d12a 100644 (file)
@@ -16,9 +16,9 @@
 apiVersion: v2
 description: Wrapper chart to allow default roles to be shared among onap instances
 name: roles-wrapper
-version: 11.0.0
+version: 12.0.0
 
 dependencies:
   - name: common
-    version: ~11.x-0
+    version: ~12.x-0
     repository: 'file://../common'
\ No newline at end of file
index 3309753..2de9036 100644 (file)
@@ -17,9 +17,9 @@
 apiVersion: v2
 description: Template used to create the right Service Accounts / Role / RoleBinding
 name: serviceAccount
-version: 11.0.0
+version: 12.0.0
 
 dependencies:
   - name: common
-    version: ~11.x-0
+    version: ~12.x-0
     repository: 'file://../common'
\ No newline at end of file
index 5e84be1..cb9965f 100644 (file)
@@ -22,15 +22,15 @@ apiVersion: v2
 appVersion: "1.0"
 description: ONAP timescaledb
 name: timescaledb
-version: 11.0.0
+version: 12.0.0
 
 dependencies:
   - name: common
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
   - name: serviceAccount
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
   - name: repositoryGenerator
-    version: ~11.x-0
+    version: ~12.x-0
     repository: 'file://../repositoryGenerator'
\ No newline at end of file
index c180bc1..0000463 100644 (file)
 apiVersion: v2
 description: ONAP Consul Agent
 name: consul
-version: 11.0.0
+version: 12.0.0
 
 dependencies:
   - name: common
-    version: ~11.x-0
+    version: ~12.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: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
   - name: consul-server
-    version: ~11.x-0
+    version: ~12.x-0
     repository: 'file://components/consul-server'
     condition: consul-server.enabled
   - name: serviceAccount
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
\ No newline at end of file
index e1f8381..8eb28ce 100644 (file)
 apiVersion: v2
 description: ONAP Consul Server
 name: consul-server
-version: 11.0.0
+version: 12.0.0
 
 dependencies:
   - name: common
-    version: ~11.x-0
+    version: ~12.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: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
   - name: repositoryGenerator
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
\ No newline at end of file
index 0d366ff..b8e3f69 100755 (executable)
 apiVersion: v2
 description: ONAP optional tools
 name: contrib
-version: 11.0.0
+version: 12.0.0
 
 dependencies:
   - name: common
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
   - name: awx
-    version: ~11.x-0
+    version: ~12.x-0
     repository: 'file://components/awx'
     condition: awx.enabled
   - name: ejbca
-    version: ~11.x-0
+    version: ~12.x-0
     repository: 'file://components/ejbca'
     condition: global.cmpv2Enabled
   - name: netbox
-    version: ~11.x-0
+    version: ~12.x-0
     repository: 'file://components/netbox'
     condition: netbox.enabled
   - name: repositoryGenerator
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
\ No newline at end of file
index 3eea511..38689de 100755 (executable)
@@ -19,18 +19,18 @@ description: Ansible AWX
 name: awx
 sources:
   - https://github.com/ansible/awx
-version: 11.0.0
+version: 12.0.0
 
 dependencies:
   - name: common
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
   - name: repositoryGenerator
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
   - name: awx-postgres
-    version: ~11.x-0
+    version: ~12.x-0
     repository: 'file://components/awx-postgres'
   - name: serviceAccount
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
\ No newline at end of file
index be7254a..7d60456 100755 (executable)
 apiVersion: v2
 description: Ansible AWX database
 name: awx-postgres
-version: 11.0.0
+version: 12.0.0
 
 dependencies:
   - name: common
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
   - name: repositoryGenerator
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
   - name: serviceAccount
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
index 9b675c8..e8a0134 100644 (file)
 apiVersion: v2
 description: ONAP EJBCA test server
 name: ejbca
-version: 11.0.0
+version: 12.0.0
 
 dependencies:
   - name: common
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
   - name: mariadb-galera
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
     condition: global.mariadbGalera.localCluster
   - name: mariadb-init
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
     condition: not global.mariadbGalera.localCluster
   - name: repositoryGenerator
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
   - name: cmpv2Config
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
   - name: serviceAccount
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
\ No newline at end of file
index a0a8cdc..2454db2 100755 (executable)
 apiVersion: v2
 description: Netbox IPAM
 name: netbox
-version: 11.0.0
+version: 12.0.0
 
 dependencies:
   - name: common
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
   - name: repositoryGenerator
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
   - name: netbox-app
-    version: ~11.x-0
+    version: ~12.x-0
     repository: 'file://components/netbox-app'
   - name: netbox-nginx
-    version: ~11.x-0
+    version: ~12.x-0
     repository: 'file://components/netbox-nginx'
   - name: netbox-postgres
-    version: ~11.x-0
+    version: ~12.x-0
     repository: 'file://components/netbox-postgres'
\ No newline at end of file
index d820ee4..0bbe2d2 100755 (executable)
 apiVersion: v2
 description: Netbox - Application (WSGI + Gunicorn)
 name: netbox-app
-version: 11.0.0
+version: 12.0.0
 
 dependencies:
   - name: common
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
   - name: repositoryGenerator
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
   - name: serviceAccount
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
index bad4be1..3d59879 100755 (executable)
 apiVersion: v2
 description: Netbox - Nginx web server
 name: netbox-nginx
-version: 11.0.0
+version: 12.0.0
 
 dependencies:
   - name: common
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
   - name: repositoryGenerator
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
   - name: serviceAccount
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
index 8aca215..e0bf081 100755 (executable)
 apiVersion: v2
 description: Netbox Posgres database
 name: netbox-postgres
-version: 11.0.0
+version: 12.0.0
 
 dependencies:
   - name: common
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
   - name: repositoryGenerator
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
   - name: serviceAccount
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
index 7b60d63..63f65a5 100644 (file)
 apiVersion: v2
 description: ONAP Configuration Persistance Service (CPS)
 name: cps
-version: 11.0.0
+version: 12.0.0
 
 dependencies:
   - name: common
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
   - name: roles-wrapper
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
     condition: standaloneDeployment
   - name: cps-core
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
     condition: cps-core.enabled
   - name: cps-temporal
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
     condition: cps-temporal.enabled
   - name: ncmp-dmi-plugin
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
     condition: ncmp-dmi-plugin.enabled
index fcaee60..c9638b2 100644 (file)
 apiVersion: v2
 description: ONAP Configuration Persistance Service (CPS) - Core
 name: cps-core
-version: 11.0.0
+version: 12.0.0
 
 dependencies:
   - name: common
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
   - name: postgres
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
     condition: global.postgres.localCluster
   - name: postgres-init
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
     condition: postgres.postgresInit
   - name: readinessCheck
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
   - name: repositoryGenerator
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
   - name: serviceAccount
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
\ No newline at end of file
index cbda117..39347a9 100644 (file)
 apiVersion: v2
 description: ONAP Configuration Persistance Service (CPS) - Temporal
 name: cps-temporal
-version: 11.0.0
+version: 12.0.0
 
 dependencies:
   - name: common
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
   - name: repositoryGenerator
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
   - name: timescaledb
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
   - name: readinessCheck
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
   - name: serviceAccount
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
\ No newline at end of file
index 669be9e..b75bbb3 100644 (file)
 apiVersion: v2
 description: ONAP Configuration Persistance Service (CPS) - NCMP-DMI-Plugin
 name: ncmp-dmi-plugin
-version: 11.0.0
+version: 12.0.0
 
 dependencies:
   - name: common
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
   - name: readinessCheck
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
   - name: repositoryGenerator
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
   - name: serviceAccount
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
\ No newline at end of file
index 23d0bbd..a112fa6 100644 (file)
@@ -21,85 +21,85 @@ apiVersion: v2
 appVersion: "Kohn"
 description: DCAE Microservices
 name: dcaegen2-services
-version: 11.0.0
+version: 12.0.0
 
 dependencies:
   - name: common
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
   - name: dcae-datafile-collector
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
     condition: dcae-datafile-collector.enabled
   - name: dcae-datalake-admin-ui
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
     condition: dcae-datalake-admin-ui.enabled
   - name: dcae-datalake-des
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
     condition: dcae-datalake-des.enabled
   - name: dcae-datalake-feeder
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
     condition: dcae-datalake-feeder.enabled
   - name: dcae-heartbeat
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
     condition: dcae-heartbeat.enabled
   - name: dcae-hv-ves-collector
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
     condition: dcae-hv-ves-collector.enabled
   - name: dcae-kpi-ms
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
     condition: dcae-kpi-ms.enabled
   - name: dcae-ms-healthcheck
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
     condition: dcae-ms-healthcheck.enabled
   - name: dcae-pm-mapper
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
     condition: dcae-pm-mapper.enabled
   - name: dcae-pmsh
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
     condition: dcae-pmsh.enabled
   - name: dcae-prh
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
     condition: dcae-prh.enabled
   - name: dcae-restconf-collector
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
     condition: dcae-restconf-collector.enabled
   - name: dcae-slice-analysis-ms
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
     condition: dcae-slice-analysis-ms.enabled
   - name: dcae-snmptrap-collector
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
     condition: dcae-snmptrap-collector.enabled
   - name: dcae-son-handler
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
     condition: dcae-son-handler.enabled
   - name: dcae-tcagen2
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
     condition: dcae-tcagen2.enabled
   - name: dcae-ves-collector
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
     condition: dcae-ves-collector.enabled
   - name: dcae-ves-mapper
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
     condition: dcae-ves-mapper.enabled
   - name: dcae-ves-openapi-manager
-    version: ~11.x-0
+    version: ~12.x-0
     repository: 'file://components/dcae-ves-openapi-manager'
     condition: dcae-ves-openapi-manager.enabled
index 25fa92b..518e782 100644 (file)
@@ -21,9 +21,9 @@ apiVersion: v2
 appVersion: "Kohn"
 description: DCAE Microservices Common templates
 name: dcaegen2-services-common
-version: 11.0.0
+version: 12.0.0
 
 dependencies:
   - name: common
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
index 0b076ad..93efe98 100644 (file)
@@ -238,7 +238,7 @@ post-processing.
 {{- define "dcaegen2-services-common.microserviceDeployment" -}}
 {{- $log := default dict .Values.log -}}
 {{- $logDir :=  default "" $log.path -}}
-{{- $certDir := default "" .Values.certDirectory . -}}
+{{- $certDir := (eq "true" (include "common.needTLS" .)) | ternary (default "" .Values.certDirectory . ) "" -}}
 {{- $tlsServer := default "" .Values.tlsServer -}}
 {{- $commonRelease :=  print (include "common.release" .) -}}
 {{- $policy := default dict .Values.policies -}}
@@ -257,9 +257,32 @@ spec:
     metadata: {{- include "common.templateMetadata" . | nindent 6 }}
     spec:
       initContainers:
+      {{- if .Values.readinessCheck }}
       {{ include "common.readinessCheck.waitFor" . | indent 6 | trim }}
+      {{- end }}
       {{- include "common.dmaap.provisioning.initContainer" . | nindent 6 }}
       {{- if $certDir }}
+      - name: {{ include "common.name" . }}-aaf-init-readiness
+        image: {{ include "repositoryGenerator.image.readiness" . }}
+        imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
+        command:
+        - /app/ready.py
+        args:
+        - --container-name
+        - aaf-cm
+        env:
+        - name: NAMESPACE
+          valueFrom:
+            fieldRef:
+              apiVersion: v1
+              fieldPath: metadata.namespace
+        resources:
+          limits:
+            cpu: 100m
+            memory: 100Mi
+          requests:
+            cpu: 3m
+            memory: 20Mi
       - name: init-tls
         image: {{ include "repositoryGenerator.repository" . }}/{{ .Values.tlsImage }}
         imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
index c51c222..eaabfa3 100644 (file)
@@ -21,24 +21,24 @@ apiVersion: v2
 appVersion: "Kohn"
 description: DCAE DataFile Collector Helm charts
 name: dcae-datafile-collector
-version: 11.0.0
+version: 12.0.0
 
 dependencies:
   - name: common
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
   - name: readinessCheck
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
   - name: repositoryGenerator
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
   - name: certManagerCertificate
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
   - name: dcaegen2-services-common
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
   - name: serviceAccount
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
index 5b0eea6..cbe02a1 100644 (file)
@@ -100,6 +100,7 @@ readinessCheck:
       - aaf-cm
       - dmaap-bc
       - dmaap-provisioning-job
+      - message-router
 
 # Probe Configuration
 readiness:
@@ -115,7 +116,7 @@ service:
   type: ClusterIP
   name: datafile-collector
   ports:
-    - name: https
+    - name: http
       port: 8443
       plain_port: 8100
       port_protocol: http
@@ -173,7 +174,7 @@ applicationConfig:
   streams_subscribes:
     dmaap_subscriber:
       dmaap_info:
-        topic_url: "https://message-router:3905/events/unauthenticated.VES_NOTIFICATION_OUTPUT"
+        topic_url: "http://message-router:3904/events/unauthenticated.VES_NOTIFICATION_OUTPUT"
       type: message_router
 
 # DataRouter Feed Configuration
index c4843d6..dc19527 100644 (file)
@@ -21,21 +21,21 @@ apiVersion: v2
 appVersion: "Kohn"
 description: DCAE datalake-admin-ui helm chart
 name: dcae-datalake-admin-ui
-version: 11.0.0
+version: 12.0.0
 
 dependencies:
   - name: common
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
   - name: repositoryGenerator
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
   - name: readinessCheck
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
   - name: dcaegen2-services-common
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
   - name: serviceAccount
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
index 8573e07..e18ea04 100644 (file)
@@ -66,12 +66,11 @@ certDirectory: /opt/app/datalake-admin-ui/etc/cert/
 # 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: true
+tlsServer: false
 
 # Dependencies
 readinessCheck:
   wait_for:
-    - aaf-cm
     - dcae-datalake-feeder
 
 # Probe Configuration
index 20b65f0..6f3a9af 100644 (file)
@@ -21,21 +21,21 @@ apiVersion: v2
 appVersion: "Kohn"
 description: DCAE Datalake DES MS charts
 name: dcae-datalake-des
-version: 11.0.0
+version: 12.0.0
 
 dependencies:
   - name: common
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
   - name: repositoryGenerator
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
   - name: readinessCheck
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
   - name: dcaegen2-services-common
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
   - name: serviceAccount
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
index bab9c05..cab2a95 100644 (file)
@@ -72,12 +72,11 @@ certDirectory: /opt/app/datalake/etc/cert/
 # 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: true
+tlsServer: false
 
 # Dependencies
 readinessCheck:
   wait_for:
-    - aaf-cm
     - dcae-datalake-feeder
 
 # Probe Configuration
index 3d1ea6e..3b890d0 100644 (file)
@@ -21,24 +21,24 @@ apiVersion: v2
 appVersion: "Kohn"
 description: DCAE Datalake feeder MS charts
 name: dcae-datalake-feeder
-version: 11.0.0
+version: 12.0.0
 
 dependencies:
   - name: common
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
   - name: postgres
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
   - name: repositoryGenerator
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
   - name: readinessCheck
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
   - name: dcaegen2-services-common
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
   - name: serviceAccount
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
index 4de71c3..25b74d7 100644 (file)
@@ -74,12 +74,11 @@ certDirectory: /opt/app/datalake/etc/certs
 # 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: true
+tlsServer: false
 
 # Dependencies
 readinessCheck:
   wait_for:
-    - aaf-cm
     - &postgresName dcae-datalake-postgres
 
 # Probe Configuration
index 056696a..ecde5e6 100644 (file)
@@ -21,24 +21,24 @@ apiVersion: v2
 appVersion: "Kohn"
 description: DCAE Heartbeat Microservice
 name: dcae-heartbeat
-version: 11.0.0
+version: 12.0.0
 
 dependencies:
   - name: common
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
   - name: postgres
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
   - name: readinessCheck
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
   - name: repositoryGenerator
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
   - name: dcaegen2-services-common
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
   - name: serviceAccount
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
index b766567..0198a7d 100644 (file)
@@ -57,7 +57,7 @@ tlsImage: onap/org.onap.dcaegen2.deployments.tls-init-container:2.1.0
 # Application Configuration Defaults.
 #################################################################
 # Application Image
-image: onap/org.onap.dcaegen2.services.heartbeat:2.3.1
+image: onap/org.onap.dcaegen2.services.heartbeat:2.5.0
 pullPolicy: Always
 
 # Log directory where logging sidecar should look for log files
@@ -74,13 +74,13 @@ certDirectory: /opt/app/heartbeat/etc/certs
 # 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: true
+tlsServer: false
 
 # Dependencies
 readinessCheck:
   wait_for:
-    - aaf-cm
     - &postgresName dcae-heartbeat-postgres
+    - message-router
 
 # Probe Configuration
 readiness:
index 0c9732a..59fda72 100644 (file)
@@ -21,24 +21,24 @@ apiVersion: v2
 appVersion: "Kohn"
 description: DCAE HV VES collector
 name: dcae-hv-ves-collector
-version: 11.0.0
+version: 12.0.0
 
 dependencies:
   - name: common
-    version: ~11.x-0
-    repository: '@local'
-  - name: repositoryGenerator
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
   - name: readinessCheck
-    version: ~11.x-0
+    version: ~12.x-0
+    repository: '@local'
+  - name: repositoryGenerator
+    version: ~12.x-0
     repository: '@local'
   - name: dcaegen2-services-common
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
   - name: certManagerCertificate
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
   - name: serviceAccount
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
index 9beef81..da3f473 100644 (file)
@@ -171,6 +171,8 @@ applicationConfig:
 applicationEnv:
   JAVA_OPTS: '-Dlogback.configurationFile=/etc/ONAP/dcae-hv-ves-collector/logback.xml'
   CBS_CLIENT_CONFIG_PATH: '/app-config-input/application_config.yaml'
+  #Temporary Dummy CBS Port Value until internal SDK library is updated
+  CONFIG_BINDING_SERVICE_SERVICE_PORT: '0000'
   KAFKA_BOOTSTRAP_SERVERS: '{{ include "common.release" . }}-strimzi-kafka-bootstrap:9092'
   USE_SCRAM: 'true'
   JAAS_CONFIG:
index ff18e15..b47d717 100644 (file)
@@ -21,21 +21,21 @@ apiVersion: v2
 appVersion: "Kohn"
 description: DCAE KPI MS chart
 name: dcae-kpi-ms
-version: 11.0.0
+version: 12.0.0
 
 dependencies:
   - name: common
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
   - name: readinessCheck
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
   - name: repositoryGenerator
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
   - name: dcaegen2-services-common
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
   - name: serviceAccount
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
index 06c9084..19ff61f 100644 (file)
@@ -50,7 +50,7 @@ tlsImage: onap/org.onap.dcaegen2.deployments.tls-init-container:2.1.0
 # Application Configuration Defaults.
 #################################################################
 # Application Image
-image: onap/org.onap.dcaegen2.services.components.kpi-ms:1.0.10
+image: onap/org.onap.dcaegen2.services.components.kpi-ms:1.0.11
 pullPolicy: Always
 
 # Log directory where logging sidecar should look for log files
@@ -67,8 +67,8 @@ certDirectory: /opt/app/kpims/etc/cert/
 # 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: true
-enable_tls: true
+tlsServer: false
+enable_tls: false
 
 # Optional Policy configuration properties
 # if present, policy-sync side car will be deployed
@@ -80,7 +80,7 @@ enable_tls: true
 # Dependencies
 readinessCheck:
   wait_for:
-    - aaf-cm
+    - message-router
 
 # Probe Configuration
 readiness:
@@ -136,6 +136,9 @@ applicationConfig:
   kpi.policy: '{"domain":"measurementsForKpi","methodForKpi":[{"eventName":"perf3gpp_CORE-AMF_pmMeasResult","controlLoopSchemaType":"SLICE","policyScope":"resource=networkSlice;type=configuration","policyName":"configuration.dcae.microservice.kpi-computation","policyVersion":"v0.0.1","kpis":[{"measType":"AMFRegNbr","operation":"SUM","operands":"RM.RegisteredSubNbrMean"}]},{"eventName":"perf3gpp_CORE-UPF_pmMeasResult","controlLoopSchemaType":"SLICE","policyScope":"resource=networkSlice;type=configuration","policyName":"configuration.dcae.microservice.kpi-computation","policyVersion":"v0.0.1","kpis":[{"measType":"UpstreamDownstreamThr","operation":"SUM","operands":["GTP.InDataOctN3UPF","GTP.OutDataOctN3UPF"]}]}]'
 
 applicationEnv:
+  CBS_CLIENT_CONFIG_PATH: '/app-config-input/application_config.yaml'
+  #Temporary Dummy CBS Port Value until internal SDK library is updated
+  CONFIG_BINDING_SERVICE_SERVICE_PORT: '0000'
   STANDALONE: 'false'
 
 # Resource Limit Flavor -By Default Using Small
index 2e13863..39d7c1a 100644 (file)
@@ -23,15 +23,15 @@ apiVersion: v2
 appVersion: "Kohn"
 description: ONAP DCAE Microservice Health Check
 name: dcae-ms-healthcheck
-version: 11.0.0
+version: 12.0.0
 
 dependencies:
   - name: common
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
   - name: repositoryGenerator
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
   - name: serviceAccount
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
index 5aa8fea..8f28dca 100644 (file)
@@ -21,21 +21,21 @@ apiVersion: v2
 appVersion: "Kohn"
 description: DCAE PM-Mapper Helm charts
 name: dcae-pm-mapper
-version: 11.0.0
+version: 12.0.0
 
 dependencies:
   - name: common
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
   - name: readinessCheck
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
   - name: repositoryGenerator
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
   - name: dcaegen2-services-common
-    version: ~11.x-0
+    version: ~12.x-0
     repository: 'file://../../common/dcaegen2-services-common'
   - name: serviceAccount
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
index d2abf4c..a2479b6 100644 (file)
@@ -73,16 +73,16 @@ certDirectory: /opt/app/pm-mapper/etc/cert
 # 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: true
+tlsServer: false
 
 # Dependencies
 readinessCheck:
   wait_for:
     containers:
-      - aaf-cm
       - dmaap-bc
       - dmaap-provisioning-job
       - dcae-datafile-collector
+      - message-router
 
 # Probe Configuration
 readiness:
@@ -99,7 +99,7 @@ service:
   name: dcae-pm-mapper
   both_tls_and_plain: true
   ports:
-    - name: https
+    - name: http
       port: 8443
       plain_port: 8081
       port_protocol: http
@@ -130,7 +130,7 @@ credentials:
 
 # Initial Application Configuration
 applicationConfig:
-  enable_tls: true
+  enable_tls: false
   enable_http: true
   aaf_identity: ""
   aaf_password: ""
index f68e715..75ebdde 100644 (file)
@@ -22,24 +22,24 @@ apiVersion: v2
 appVersion: "Kohn"
 description: DCAE PMSH Service
 name: dcae-pmsh
-version: 11.0.0
+version: 12.0.0
 
 dependencies:
   - name: common
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
   - name: postgres
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
   - name: readinessCheck
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
   - name: repositoryGenerator
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
   - name: dcaegen2-services-common
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
   - name: serviceAccount
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
index 971d7bf..7f30654 100644 (file)
@@ -74,13 +74,13 @@ certDirectory: /opt/app/pmsh/etc/certs
 # 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: true
+tlsServer: false
 
 # Dependencies
 readinessCheck:
   wait_for:
-    - aaf-cm
     - &postgresName dcae-pmsh-postgres
+    - message-router
 
 # Probe Configuration
 readiness:
@@ -88,16 +88,17 @@ readiness:
   periodSeconds: 15
   timeoutSeconds: 1
   path: /healthcheck
-  scheme: HTTPS
-  port: 8443
+  scheme: HTTP
+  port: 8080
 
 # Service Configuration
 service:
   type: ClusterIP
   name: dcae-pmsh
   ports:
-    - name: https
-      port: 8443
+    - name: http
+      port: 8080
+      plain_port: 8080
       port_protocol: http
 
 # AAF Credentials
@@ -115,7 +116,7 @@ credentials:
 
 # Initial Application Configuration
 applicationConfig:
-  enable_tls: true
+  enable_tls: false
   aaf_identity: ${AAF_IDENTITY}
   aaf_password: ${AAF_PASSWORD}
   key_path: /opt/app/pmsh/etc/certs/key.pem
@@ -135,16 +136,16 @@ applicationConfig:
     policy_pm_publisher:
       type: message_router
       dmaap_info:
-        topic_url: "https://message-router:3905/events/unauthenticated.DCAE_CL_OUTPUT"
+        topic_url: "http://message-router:3904/events/unauthenticated.DCAE_CL_OUTPUT"
   streams_subscribes:
     policy_pm_subscriber:
       type: message_router
       dmaap_info:
-        topic_url: "https://message-router:3905/events/unauthenticated.PMSH_CL_INPUT"
+        topic_url: "http://message-router:3904/events/unauthenticated.PMSH_CL_INPUT"
     aai_subscriber:
       type: message_router
       dmaap_info:
-        topic_url: "https://message-router:3905/events/AAI-EVENT"
+        topic_url: "http://message-router:3904/events/AAI-EVENT"
 
 applicationEnv:
   PMSH_PG_URL: &dcaePmshPgPrimary dcae-pmsh-pg-primary
@@ -154,6 +155,7 @@ applicationEnv:
   PMSH_PG_PASSWORD:
      secretUid: *pgUserCredsSecretUid
      key: password
+  PMSH_API_PORT: '8080'
 
 # Resource Limit Flavor -By Default Using Small
 flavor: small
index 54d1fce..9c7a980 100644 (file)
@@ -21,21 +21,21 @@ apiVersion: v2
 appVersion: "Kohn"
 description: DCAE PRH
 name: dcae-prh
-version: 11.0.0
+version: 12.0.0
 
 dependencies:
   - name: common
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
   - name: repositoryGenerator
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
   - name: readinessCheck
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
   - name: dcaegen2-services-common
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
   - name: serviceAccount
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
index d883e30..80154c7 100644 (file)
@@ -57,7 +57,7 @@ certDirectory: /opt/app/prh/etc/cert
 # 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: true
+tlsServer: false
 
 secrets:
   - uid: &aaiCredsUID aaicreds
@@ -69,7 +69,7 @@ secrets:
 # dependencies
 readinessCheck:
   wait_for:
-    - aaf-cm
+    - message-router
 
 # probe configuration
 readiness:
@@ -107,11 +107,11 @@ applicationConfig:
   dmaap.dmaapConsumerConfiguration.timeoutMs: -1
   dmaap.dmaapProducerConfiguration.dmaapContentType: "application/json"
   dmaap.dmaapUpdateProducerConfiguration.dmaapContentType: "application/json"
-  aai.aaiClientConfiguration.pnfUrl: https://aai.onap.svc.cluster.local:8443/aai/v23/network/pnfs/pnf
-  aai.aaiClientConfiguration.baseUrl: https://aai.onap.svc.cluster.local:8443/aai/v23
-  aai.aaiClientConfiguration.aaiHost: aai.onap.svc.cluster.local
-  aai.aaiClientConfiguration.aaiHostPortNumber: 8443
-  aai.aaiClientConfiguration.aaiProtocol: "https"
+  aai.aaiClientConfiguration.pnfUrl: http://aai-internal.onap.svc.cluster.local:80/aai/v23/network/pnfs/pnf
+  aai.aaiClientConfiguration.baseUrl: http://aai-internal.onap.svc.cluster.local:80/aai/v23
+  aai.aaiClientConfiguration.aaiHost: aai-internal.onap.svc.cluster.local
+  aai.aaiClientConfiguration.aaiHostPortNumber: 80
+  aai.aaiClientConfiguration.aaiProtocol: "http"
   aai.aaiClientConfiguration.aaiUserName: ${AAI_USER}
   aai.aaiClientConfiguration.aaiUserPassword: ${AAI_PASSWORD}
   aai.aaiClientConfiguration.aaiIgnoreSslCertificateErrors: true
index e78d480..10ce140 100644 (file)
@@ -21,21 +21,21 @@ apiVersion: v2
 appVersion: "Kohn"
 description: DCAE RESTConf Collector
 name: dcae-restconf-collector
-version: 11.0.0
+version: 12.0.0
 
 dependencies:
   - name: common
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
   - name: readinessCheck
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
   - name: repositoryGenerator
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
   - name: dcaegen2-services-common
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
   - name: serviceAccount
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
index 1a3cffa..d9fd33f 100644 (file)
@@ -68,12 +68,12 @@ certDirectory: /opt/app/dcae-certificate
 # 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: true
+tlsServer: false
 
 # Dependencies
 readinessCheck:
   wait_for:
-    - aaf-cm
+    - message-router
 
 # Probe Configuration
 readiness:
index 8dbed7c..ed555b2 100644 (file)
@@ -21,24 +21,24 @@ apiVersion: v2
 appVersion: "Kohn"
 description: DCAE SliceAnalysis MS charts
 name: dcae-slice-analysis-ms
-version: 11.0.0
+version: 12.0.0
 
 dependencies:
   - name: common
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
   - name: postgres
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
   - name: repositoryGenerator
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
   - name: readinessCheck
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
   - name: dcaegen2-services-common
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
   - name: serviceAccount
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
index 46002b1..3fdd251 100644 (file)
@@ -92,13 +92,13 @@ certDirectory: /opt/app/sliceanalysisms/etc/cert/
 # 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: true
+tlsServer: false
 
 # Dependencies
 readinessCheck:
   wait_for:
-    - aaf-cm
     - &postgresName dcae-sliceanalysisms-postgres
+    - message-router
 
 # Probe Configuration
 readiness:
@@ -114,7 +114,7 @@ service:
   type: ClusterIP
   name: dcae-slice-analysis-ms
   ports:
-    - name: https
+    - name: http
       port: 8080
       port_protocol: http
 
@@ -155,8 +155,8 @@ applicationConfig:
   sliceanalysisms.cid: sliceanalysisms-cid
   sliceanalysisms.configDb.service: http://config-db:8080
   sliceanalysisms.configDbEnabled: true
-  sliceanalysisms.aai.url: https://aai.onap.svc.cluster.local:8443/aai/v21
-  sliceanalysisms.cps.url: https://cps:8088
+  sliceanalysisms.aai.url: http://aai-internal.onap.svc.cluster.local:80/aai/v21
+  sliceanalysisms.cps.url: http://cps:8080
   sliceanalysisms.samples: 3
   sliceanalysisms.minPercentageChange: 5
   sliceanalysisms.initialDelaySeconds: 120000
@@ -209,6 +209,9 @@ applicationConfig:
         topic_url: http://message-router:3904/events/AAI-EVENT
 
 applicationEnv:
+  CBS_CLIENT_CONFIG_PATH: '/app-config-input/application_config.yaml'
+  #Temporary Dummy CBS Port Value until internal SDK library is updated
+  CONFIG_BINDING_SERVICE_SERVICE_PORT: '0000'
   STANDALONE: 'false'
 
 # Resource Limit Flavor -By Default Using Small
index b05f35f..4ffa58e 100644 (file)
@@ -21,21 +21,21 @@ apiVersion: v2
 appVersion: "Kohn"
 description: DCAE SNMPTrap Collector
 name: dcae-snmptrap-collector
-version: 11.0.0
+version: 12.0.0
 
 dependencies:
   - name: common
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
   - name: readinessCheck
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
   - name: repositoryGenerator
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
   - name: dcaegen2-services-common
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
   - name: serviceAccount
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
index ac23536..5340f35 100644 (file)
@@ -55,7 +55,7 @@ logConfigMapNamePrefix: '{{ include "common.fullname" . }}'
 # 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: true
+tlsServer: false
 
 
 # Dependencies
index edc2efc..57a182b 100644 (file)
@@ -21,24 +21,24 @@ apiVersion: v2
 appVersion: "Kohn"
 description: DCAE Son-handler helm chart
 name: dcae-son-handler
-version: 11.0.0
+version: 12.0.0
 
 dependencies:
   - name: common
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
   - name: postgres
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
   - name: readinessCheck
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
   - name: repositoryGenerator
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
   - name: dcaegen2-services-common
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
   - name: serviceAccount
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
index a746829..bd684e3 100644 (file)
@@ -62,7 +62,7 @@ tlsImage: onap/org.onap.dcaegen2.deployments.tls-init-container:2.1.0
 # Application Configuration Defaults.
 #################################################################
 # Application Image
-image: onap/org.onap.dcaegen2.services.son-handler:2.1.10
+image: onap/org.onap.dcaegen2.services.son-handler:2.1.11
 pullPolicy: Always
 
 # Log directory where logging sidecar should look for log files
@@ -91,8 +91,8 @@ tlsServer: false
 # Dependencies
 readinessCheck:
   wait_for:
-    - aaf-cm
     - &postgresName dcae-sonhms-postgres
+    - message-router
 
 # Probe Configuration
 readiness:
@@ -108,7 +108,7 @@ service:
   type: ClusterIP
   name: dcae-son-handler
   ports:
-    - name: https
+    - name: http
       port: 8080
       port_protocol: http
 
@@ -165,6 +165,7 @@ applicationConfig:
   sonhandler.cg: sonhms-cg
   sonhandler.cid: sonhms-cid
   sonhandler.clientType: cps
+  sonhandler.nearRtricUrl: "https://a1-policy-management:30294/a1-policy/v2/policies"
   cps.service.url: http://cps-tbdmt:8080
   cps.get.celldata: execute/cps-ran-schemaset/get-cell-data
   cps.get.nbr.list.url: execute/cps-ran-schemaset/get-nbr-list
@@ -214,6 +215,9 @@ applicationConfig:
       policy-req: []
 
 applicationEnv:
+  CBS_CLIENT_CONFIG_PATH: '/app-config-input/application_config.yaml'
+  #Temporary Dummy CBS Port Value until internal SDK library is updated
+  CONFIG_BINDING_SERVICE_SERVICE_PORT: '0000'
   STANDALONE: 'false'
 
 # Resource Limit Flavor -By Default Using Small
index 6eb8528..25a5401 100644 (file)
@@ -21,27 +21,27 @@ apiVersion: v2
 appVersion: "Kohn"
 description: DCAE TCA (Gen 2)
 name: dcae-tcagen2
-version: 11.0.0
+version: 12.0.0
 
 dependencies:
   - name: common
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
   - name: repositoryGenerator
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
   - name: readinessCheck
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
   - name: dcaegen2-services-common
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
   - name: serviceAccount
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
   - name: serviceAccount
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
   - name: mongo
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
\ No newline at end of file
index 85ecb26..08ca865 100644 (file)
@@ -57,7 +57,7 @@ certDirectory: /etc/tca-gen2/ssl
 # 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: true
+tlsServer: false
 
 secrets:
   - uid: &aaiCredsUID aaicreds
@@ -69,7 +69,7 @@ secrets:
 # dependencies
 readinessCheck:
   wait_for:
-    - aaf-cm
+   - message-router
 
 # probe configuration
 readiness:
@@ -152,13 +152,17 @@ applicationConfig:
   tca.aai.generic_vnf_path: aai/v11/network/generic-vnfs/generic-vnf
   tca.aai.node_query_path: aai/v11/search/nodes-query
   tca.aai.password: ${AAI_PASSWORD}
-  tca.aai.url: https://aai:8443
+  tca.aai.url: http://aai-internal:80
   tca.aai.username: ${AAI_USERNAME}
   tca.policy: "[{\"domain\":\"measurementsForVfScaling\",\"violatedMetricsPerEventName\":[{\"eventName\":\"Mfvs_eNodeB_RANKPI\",\"controlLoopSchemaType\":\"VNF\",\"policyScope\":\"resource=vFirewall;type=configuration\",\"policyName\":\"configuration.dcae.microservice.tca.xml\",\"policyVersion\":\"v0.0.1\",\"thresholds\":[{\"closedLoopControlName\":\"CL-FRWL-LOW-TRAFFIC-SIG-d925ed73-8231-4d02-9545-db4e101f88f8\",\"closedLoopEventStatus\":\"ONSET\",\"version\":\"1.0.2\",\"fieldPath\":\"$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedBroadcastPacketsAccumulated\",\"thresholdValue\":4000,\"direction\":\"LESS_OR_EQUAL\",\"severity\":\"MAJOR\"},{\"closedLoopControlName\":\"CL-FRWL-HIGH-TRAFFIC-SIG-EA36FE84-9342-5E13-A656-EC5F21309A09\",\"closedLoopEventStatus\":\"ONSET\",\"version\":\"1.0.2\",\"fieldPath\":\"$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedBroadcastPacketsAccumulated\",\"thresholdValue\":20000,\"direction\":\"GREATER_OR_EQUAL\",\"severity\":\"CRITICAL\"}]},{\"eventName\":\"vLoadBalancer\",\"controlLoopSchemaType\":\"VNF\",\"policyScope\":\"resource=vLoadBalancer;type=configuration\",\"policyName\":\"configuration.dcae.microservice.tca.xml\",\"policyVersion\":\"v0.0.1\",\"thresholds\":[{\"closedLoopControlName\":\"CL-LBAL-LOW-TRAFFIC-SIG-FB480F95-A453-6F24-B767-FD703241AB1A\",\"closedLoopEventStatus\":\"ONSET\",\"version\":\"1.0.2\",\"fieldPath\":\"$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedBroadcastPacketsAccumulated\",\"thresholdValue\":500,\"direction\":\"LESS_OR_EQUAL\",\"severity\":\"MAJOR\"},{\"closedLoopControlName\":\"CL-LBAL-LOW-TRAFFIC-SIG-0C5920A6-B564-8035-C878-0E814352BC2B\",\"closedLoopEventStatus\":\"ONSET\",\"version\":\"1.0.2\",\"fieldPath\":\"$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedBroadcastPacketsAccumulated\",\"thresholdValue\":5000,\"direction\":\"GREATER_OR_EQUAL\",\"severity\":\"CRITICAL\"}]}]},{\"domain\":\"measurement\",\"metricsPerEventName\":[{\"eventName\":\"vFirewallBroadcastPackets\",\"controlLoopSchemaType\":\"VM\",\"policyScope\":\"DCAE\",\"policyName\":\"DCAE.Config_tca-hi-lo\",\"policyVersion\":\"v0.0.1\",\"thresholds\":[{\"closedLoopControlName\":\"ControlLoop-vFirewall-d0a1dfc6-94f5-4fd4-a5b5-4630b438850a\",\"version\":\"1.0.2\",\"fieldPath\":\"$.event.measurementFields.nicPerformanceArray[*].receivedTotalPacketsDelta\",\"thresholdValue\":300,\"direction\":\"LESS_OR_EQUAL\",\"severity\":\"MAJOR\",\"closedLoopEventStatus\":\"ABATED\"},{\"closedLoopControlName\":\"ControlLoop-vFirewall-d0a1dfc6-94f5-4fd4-a5b5-4630b438850a\",\"version\":\"1.0.2\",\"fieldPath\":\"$.event.measurementFields.nicPerformanceArray[*].receivedTotalPacketsDelta\",\"thresholdValue\":700,\"direction\":\"GREATER_OR_EQUAL\",\"severity\":\"CRITICAL\",\"closedLoopEventStatus\":\"ONSET\"}]},{\"eventName\":\"vLoadBalancer\",\"controlLoopSchemaType\":\"VM\",\"policyScope\":\"DCAE\",\"policyName\":\"DCAE.Config_tca-hi-lo\",\"policyVersion\":\"v0.0.1\",\"thresholds\":[{\"closedLoopControlName\":\"ControlLoop-vDNS-6f37f56d-a87d-4b85-b6a9-cc953cf779b3\",\"version\":\"1.0.2\",\"fieldPath\":\"$.event.measurementFields.nicPerformanceArray[*].receivedTotalPacketsDelta\",\"thresholdValue\":300,\"direction\":\"GREATER_OR_EQUAL\",\"severity\":\"CRITICAL\",\"closedLoopEventStatus\":\"ONSET\"}]},{\"eventName\":\"Measurement_vGMUX\",\"controlLoopSchemaType\":\"VNF\",\"policyScope\":\"DCAE\",\"policyName\":\"DCAE.Config_tca-hi-lo\",\"policyVersion\":\"v0.0.1\",\"thresholds\":[{\"closedLoopControlName\":\"ControlLoop-vCPE-48f0c2c3-a172-4192-9ae3-052274181b6e\",\"version\":\"1.0.2\",\"fieldPath\":\"$.event.measurementFields.additionalMeasurements[*].arrayOfFields[0].value\",\"thresholdValue\":0,\"direction\":\"EQUAL\",\"severity\":\"MAJOR\",\"closedLoopEventStatus\":\"ABATED\"},{\"closedLoopControlName\":\"ControlLoop-vCPE-48f0c2c3-a172-4192-9ae3-052274181b6e\",\"version\":\"1.0.2\",\"fieldPath\":\"$.event.measurementFields.additionalMeasurements[*].arrayOfFields[0].value\",\"thresholdValue\":0,\"direction\":\"GREATER\",\"severity\":\"CRITICAL\",\"closedLoopEventStatus\":\"ONSET\"}]}]}]"
   tca.processing_batch_size: 10000
   tca.enable_abatement: true
   tca.enable_ecomp_logging: true
 
+applicationEnv:
+  #Temporary Dummy CBS Port Value until internal SDK library is updated
+  CONFIG_BINDING_SERVICE_SERVICE_PORT: '0000'
+
 # Resource Limit flavor -By Default using small
 flavor: small
 # Segregation for Different environment (Small and Large)
index ac1b812..9c63dcf 100644 (file)
@@ -21,24 +21,24 @@ apiVersion: v2
 appVersion: "Kohn"
 description: DCAE VES Collector
 name: dcae-ves-collector
-version: 11.0.0
+version: 12.0.0
 
 dependencies:
   - name: common
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
   - name: repositoryGenerator
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
   - name: readinessCheck
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
   - name: dcaegen2-services-common
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
   - name: certManagerCertificate
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
   - name: serviceAccount
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
index 746853c..e0b2b12 100644 (file)
@@ -87,6 +87,7 @@ certificates:
 readinessCheck:
   wait_for:
     - aaf-cm
+    - message-router
 
 # probe configuration
   initialDelaySeconds: 5
index 82f4881..1978ae4 100644 (file)
@@ -21,21 +21,21 @@ apiVersion: v2
 appVersion: "Kohn"
 description: DCAE VES-Mapper Microservice
 name: dcae-ves-mapper
-version: 11.0.0
+version: 12.0.0
 
 dependencies:
   - name: common
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
   - name: readinessCheck
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
   - name: repositoryGenerator
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
   - name: dcaegen2-services-common
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
   - name: serviceAccount
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
index 714a875..47eb5f1 100644 (file)
@@ -57,12 +57,12 @@ logConfigMapNamePrefix: '{{ include "common.fullname" . }}'
 # 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: true
+#tlsServer: false
 
 # Dependencies
 readinessCheck:
   wait_for:
-    - aaf-cm
+    - message-router
 
 # Service Configuration
 service:
index 74fd557..33b1295 100644 (file)
 apiVersion: v2
 description: ONAP DCAE VES OpenApi Manager
 name: dcae-ves-openapi-manager
-version: 11.0.0
+version: 12.0.0
 
 dependencies:
   - name: common
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
   - name: repositoryGenerator
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
   - name: readinessCheck
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
   - name: serviceAccount
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
index 60a5765..fc15c0b 100644 (file)
 apiVersion: v2
 description: ONAP DCAE MOD
 name: dcaemod
-version: 11.0.0
+version: 12.0.0
 
 dependencies:
     - name: common
-      version: ~11.x-0
+      version: ~12.x-0
       repository: '@local'
     - name: dcaemod-genprocessor
-      version: ~11.x-0
+      version: ~12.x-0
       repository: 'file://components/dcaemod-genprocessor'
       condition: dcaemod-genprocessor.enabled
     - name: dcaemod-distributor-api
-      version: ~11.x-0
+      version: ~12.x-0
       repository: 'file://components/dcaemod-distributor-api'
       condition: dcaemod-distributor-api.enabled
     - name: dcaemod-designtool
-      version: ~11.x-0
+      version: ~12.x-0
       repository: 'file://components/dcaemod-designtool'
       condition: dcaemod-designtool.enabled
     - name: dcaemod-onboarding-api
-      version: ~11.x-0
+      version: ~12.x-0
       repository: 'file://components/dcaemod-onboarding-api'
       condition: dcaemod-onboarding-api.enabled
     - name: dcaemod-runtime-api
-      version: ~11.x-0
+      version: ~12.x-0
       repository: 'file://components/dcaemod-runtime-api'
       condition: dcaemod-runtime-api.enabled
     - name: dcaemod-nifi-registry
-      version: ~11.x-0
+      version: ~12.x-0
       repository: 'file://components/dcaemod-nifi-registry'
       condition: dcaemod-nifi-registry.enabled
     - name: dcaemod-healthcheck
-      version: ~11.x-0
+      version: ~12.x-0
       repository: 'file://components/dcaemod-healthcheck'
       condition: dcaemod-healthcheck.enabled
index d5f61a3..54680d2 100644 (file)
 apiVersion: v2
 description: ONAP DCAE MOD Design Tool
 name: dcaemod-designtool
-version: 11.0.0
+version: 12.0.0
 
 dependencies:
   - name: common
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
   - name: repositoryGenerator
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
   - name: serviceAccount
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
index 0643257..2d8ab41 100644 (file)
 apiVersion: v2
 description: ONAP DCAE MOD Distributor API
 name: dcaemod-distributor-api
-version: 11.0.0
+version: 12.0.0
 
 dependencies:
   - name: common
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
   - name: repositoryGenerator
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
   - name: serviceAccount
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
index 864ac0d..8cdb072 100644 (file)
 apiVersion: v2
 description: ONAP DCAE MOD Genprocessor
 name: dcaemod-genprocessor
-version: 11.0.0
+version: 12.0.0
 
 dependencies:
   - name: common
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
   - name: repositoryGenerator
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
   - name: serviceAccount
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
index 55dbc33..74ad041 100644 (file)
 apiVersion: v2
 description: ONAP DCAE MOD Health Check
 name: dcaemod-healthcheck
-version: 11.0.0
+version: 12.0.0
 
 dependencies:
   - name: common
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
   - name: repositoryGenerator
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
   - name: serviceAccount
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
index ce3d043..d9620bb 100644 (file)
 apiVersion: v2
 description: ONAP DCAE MOD Nifi Registry
 name: dcaemod-nifi-registry
-version: 11.0.0
+version: 12.0.0
 
 dependencies:
   - name: common
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
   - name: repositoryGenerator
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
   - name: serviceAccount
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
index 73bade4..051d942 100644 (file)
 apiVersion: v2
 description: ONAP DCAE MOD Onboarding API
 name: dcaemod-onboarding-api
-version: 11.0.0
+version: 12.0.0
 
 dependencies:
   - name: common
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
   - name: postgres
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
   - name: repositoryGenerator
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
   - name: serviceAccount
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
index 4e1c940..6afc6a7 100644 (file)
 apiVersion: v2
 description: ONAP DCAE MOD Runtime API
 name: dcaemod-runtime-api
-version: 11.0.0
+version: 12.0.0
 
 dependencies:
   - name: common
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
   - name: repositoryGenerator
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
   - name: serviceAccount
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
   - name: readinessCheck
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
index db16451..85dcc79 100644 (file)
@@ -23,25 +23,25 @@ version: TBD
 
 dependencies:
   - name: common
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
   - name: repositoryGenerator
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
   - name: readinessCheck
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
   - name: dcaegen2-services-common
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
   - name: postgres
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
     condition: postgres.enabled
   - name: serviceAccount
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
   - name: mongo
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
     condition: mongo.enabled
index d8cb1d5..8d84a97 100644 (file)
 apiVersion: v2
 description: ONAP DMaaP components
 name: dmaap
-version: 11.0.0
+version: 12.0.0
 
 dependencies:
   - name: common
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
-  - name: dmaap-strimzi
-    version: ~11.x-0
-    repository: 'file://components/dmaap-strimzi'
-    condition: dmaap-strimzi.enabled
   - name: message-router
-    version: ~11.x-0
+    version: ~12.x-0
     repository: 'file://components/message-router'
     condition: message-router.enabled
   - name: dmaap-bc
-    version: ~11.x-0
+    version: ~12.x-0
     repository: 'file://components/dmaap-bc'
     condition: dmaap-bc.enabled
   - name: dmaap-dr-node
-    version: ~11.x-0
+    version: ~12.x-0
     repository: 'file://components/dmaap-dr-node'
     condition: dmaap-dr-node.enabled
   - name: dmaap-dr-prov
-    version: ~11.x-0
+    version: ~12.x-0
     repository: 'file://components/dmaap-dr-prov'
     condition: dmaap-dr-prov.enabled
   - name: serviceAccount
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
index 5ed50ca..66f93cd 100644 (file)
 apiVersion: v2
 description: a Helm chart to deploy ONAP DMaaP Bus Controller (aka dmaap-bc) in Kubernetes
 name: dmaap-bc
-version: 11.0.0
+version: 12.0.0
 
 dependencies:
   - name: common
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
   - name: certInitializer
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
   - name: postgres
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
     condition: PG.enabled
   - name: repositoryGenerator
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
   - name: serviceAccount
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
index 59ea16b..c0a3039 100644 (file)
 apiVersion: v2
 description: ONAP DMaaP Data Router Node Server
 name: dmaap-dr-node
-version: 11.0.0
+version: 12.0.0
 
 dependencies:
   - name: common
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
   - name: repositoryGenerator
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
   - name: serviceAccount
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
   - name: certInitializer
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
index 72e75c4..15c6e8b 100644 (file)
 apiVersion: v2
 description: ONAP DMaaP Data Router Provisioning Server
 name: dmaap-dr-prov
-version: 11.0.0
+version: 12.0.0
 
 dependencies:
   - name: common
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
   - name: mariadb-galera
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
     condition: global.mariadbGalera.localCluster
   - name: mariadb-init
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
   - name: certInitializer
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
   - name: repositoryGenerator
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
   - name: serviceAccount
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
index 74700ff..ba7beaf 100644 (file)
 apiVersion: v2
 description: ONAP Message Router
 name: message-router
-version: 11.0.0
+version: 12.0.0
 
 dependencies:
   - name: common
-    version: ~11.x-0
+    version: ~12.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: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
   - name: repositoryGenerator
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
   - name: serviceAccount
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
index 3acea02..a9b0a01 100755 (executable)
@@ -28,9 +28,9 @@
 ##        Items below are passed through to Kafka's producer and consumer
 ##        configurations (after removing "kafka.")
 ##        if you want to change request.required.acks it can take this one value
-kafka.metadata.broker.list={{ include "common.release" . }}-{{ .Values.global.kafkaBootstrap }}:{{ .Values.global.kafkaInternalPort }}
-config.zk.servers=127.0.0.1:{{ .Values.global.zkTunnelService.internalPort }}
 #kafka.request.required.acks=-1
+kafka.metadata.broker.list={{ include "common.release" . }}-strimzi-kafka-bootstrap:9092
+config.zk.servers=127.0.0.1:{{ .Values.global.zkTunnelService.internalPort }}
 consumer.timeout.ms=100
 zookeeper.connection.timeout.ms=6000
 zookeeper.session.timeout.ms=20000
index 0fba655..904c160 100644 (file)
@@ -150,7 +150,7 @@ spec:
           - name: JAASLOGIN
             {{- include "common.secret.envFromSecretFast" (dict "global" . "uid" "mr-kafka-admin-secret" "key" "sasl.jaas.config") | indent 12 }}
           - name: SASLMECH
-            value: {{ .Values.global.saslMechanism }}
+            value: scram-sha-512
           - name: enableCadi
             value: "{{ .Values.global.aafEnabled }}"
           - name: useZkTopicStore
index f9904e6..80460ba 100644 (file)
 #################################################################
 global:
   nodePortPrefix: 302
-  kafkaBootstrap: strimzi-kafka-bootstrap
-  saslMechanism: scram-sha-512
-  kafkaInternalPort: 9092
   zkTunnelService:
     type: ClusterIP
     name: zk-tunnel-svc
     portName: tcp-zk-tunnel
     internalPort: 2181
 
+zookeeper:
+  entrance:
+    image: scholzj/zoo-entrance:latest
+
 #################################################################
 # AAF part
 #################################################################
@@ -71,10 +72,6 @@ certInitializer:
 image: onap/dmaap/dmaap-mr:1.4.3
 pullPolicy: Always
 
-zookeeper:
-  entrance:
-    image: scholzj/zoo-entrance:latest
-
 secrets:
   - uid: mr-kafka-admin-secret
     externalSecret: '{{ tpl (default "" .Values.config.jaasConfExternalSecret) . }}'
index cf65674..1cb537b 100644 (file)
@@ -38,10 +38,7 @@ global:
   aafEnabled: true
 
   #Strimzi config
-  kafkaBootstrap: strimzi-kafka-bootstrap
   kafkaStrimziAdminUser: strimzi-kafka-admin
-  kafkaInternalPort: 9092
-  saslMechanism: scram-sha-512
 
 #Component overrides
 message-router:
index 2f8c678..abad5ca 100644 (file)
 apiVersion: v2
 description: <Short application description - this is visible via 'helm search'>
 name: <onap-app>
-version: 11.0.0
+version: 12.0.0
 
 dependencies:
   - name: common
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
   - name: repositoryGenerator
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
index 10268d4..971d81c 100644 (file)
 apiVersion: v2
 description: ONAP DCAE HOLMES
 name: holmes
-version: 11.0.0
+version: 12.0.0
 
 dependencies:
   - name: common
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
   - name: repositoryGenerator
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
   - name: postgres
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
     condition: global.postgres.localCluster
   - name: postgres-init
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
     condition: not global.postgres.localCluster
   - name: holmes-rule-mgmt
-    version: ~11.x-0
+    version: ~12.x-0
     repository: 'file://components/holmes-rule-mgmt'
   - name: holmes-engine-mgmt
-    version: ~11.x-0
+    version: ~12.x-0
     repository: 'file://components/holmes-engine-mgmt'
index 5169d65..1aa4726 100644 (file)
@@ -18,18 +18,18 @@ apiVersion: v2
 appVersion: "2.0"
 description: Holmes Engine Management
 name: holmes-engine-mgmt
-version: 11.0.0
+version: 12.0.0
 
 dependencies:
   - name: common
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
   - name: repositoryGenerator
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
   - name: certInitializer
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
   - name: serviceAccount
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
index 08eb19d..628f5c6 100644 (file)
@@ -18,18 +18,18 @@ apiVersion: v2
 appVersion: "2.0"
 description: Holmes Rule Management
 name: holmes-rule-mgmt
-version: 11.0.0
+version: 12.0.0
 
 dependencies:
   - name: common
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
   - name: repositoryGenerator
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
   - name: certInitializer
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
   - name: serviceAccount
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
index 891566c..16df2f8 100644 (file)
 apiVersion: v2
 description: ONAP Logging ElasticStack
 name: log
-version: 11.0.0
+version: 12.0.0
 
 dependencies:
   - name: common
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
   - name: repositoryGenerator
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
   - name: log-elasticsearch
-    version: ~11.x-0
+    version: ~12.x-0
     repository: 'file://components/log-elasticsearch'
   - name: log-kibana
-    version: ~11.x-0
+    version: ~12.x-0
     repository: 'file://components/log-kibana'
   - name: log-logstash
-    version: ~11.x-0
+    version: ~12.x-0
     repository: 'file://components/log-logstash'
index 7783eb1..fad4c67 100644 (file)
 apiVersion: v2
 description: ONAP Logging Elasticsearch
 name: log-elasticsearch
-version: 11.0.0
+version: 12.0.0
 
 dependencies:
   - name: common
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
   - name: repositoryGenerator
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
index 0df19a6..fc55712 100644 (file)
 apiVersion: v2
 description: ONAP Logging Kibana
 name: log-kibana
-version: 11.0.0
+version: 12.0.0
 
 dependencies:
   - name: common
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
   - name: repositoryGenerator
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
index b8a0d8e..0c51886 100644 (file)
 apiVersion: v2
 description: ONAP Logging Logstash
 name: log-logstash
-version: 11.0.0
+version: 12.0.0
 
 dependencies:
   - name: common
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
   - name: repositoryGenerator
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
index fdb4031..c709626 100644 (file)
@@ -17,9 +17,9 @@
 apiVersion: v2
 description: ONAP Modeling (Modeling)
 name: modeling
-version: 11.0.0
+version: 12.0.0
 
 dependencies:
   - name: modeling-etsicatalog
-    version: ~11.x-0
+    version: ~12.x-0
     repository: 'file://components/modeling-etsicatalog'
index 0c6dc78..a90c700 100644 (file)
 apiVersion: v2
 description: ONAP Modeling - Etsicatalog
 name: modeling-etsicatalog
-version: 11.0.0
+version: 12.0.0
 
 dependencies:
   - name: common
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
   - name: mariadb-galera
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
     condition: global.mariadbGalera.localCluster
   - name: mariadb-init
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
     condition: not global.mariadbGalera.localCluster
   - name: readinessCheck
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
   - name: repositoryGenerator
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
   - name: serviceAccount
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
index 0ca7657..84b1a0f 100644 (file)
 apiVersion: v2
 description: ONAP MicroServices Bus
 name: msb
-version: 11.0.0
+version: 12.0.0
 
 dependencies:
   - name: common
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
   - name: repositoryGenerator
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
   - name: kube2msb
-    version: ~11.x-0
+    version: ~12.x-0
     repository: 'file://components/kube2msb'
   - name: msb-consul
-    version: ~11.x-0
+    version: ~12.x-0
     repository: 'file://components/msb-consul'
   - name: msb-discovery
-    version: ~11.x-0
+    version: ~12.x-0
     repository: 'file://components/msb-discovery'
   - name: msb-eag
-    version: ~11.x-0
+    version: ~12.x-0
     repository: 'file://components/msb-eag'
   - name: msb-iag
-    version: ~11.x-0
+    version: ~12.x-0
     repository: 'file://components/msb-iag'
 
index ec63e05..b72e4fb 100644 (file)
 apiVersion: v2
 description: ONAP MicroServices Bus Kube2MSB Registrator
 name: kube2msb
-version: 11.0.0
+version: 12.0.0
 
 dependencies:
   - name: common
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
   - name: repositoryGenerator
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
index 830023b..d75b729 100644 (file)
 apiVersion: v2
 description: ONAP MicroServices Bus Consul
 name: msb-consul
-version: 11.0.0
+version: 12.0.0
 
 dependencies:
   - name: common
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
   - name: repositoryGenerator
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
   - name: serviceAccount
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
index 8d0c9a1..a29970a 100644 (file)
 apiVersion: v2
 description: ONAP MicroServices Bus Discovery
 name: msb-discovery
-version: 11.0.0
+version: 12.0.0
 
 dependencies:
   - name: common
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
   - name: repositoryGenerator
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
   - name: serviceAccount
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
index 1348eaa..55dd240 100644 (file)
 apiVersion: v2
 description: ONAP MicroServices Bus Internal API Gateway
 name: msb-eag
-version: 11.0.0
+version: 12.0.0
 
 dependencies:
   - name: common
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
   - name: repositoryGenerator
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
   - name: certInitializer
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
   - name: serviceAccount
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
index 3808415..d015cce 100644 (file)
 apiVersion: v2
 description: ONAP MicroServices Bus Internal API Gateway
 name: msb-iag
-version: 11.0.0
+version: 12.0.0
 
 dependencies:
   - name: common
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
   - name: repositoryGenerator
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
   - name: certInitializer
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
   - name: serviceAccount
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
index 7bc5f17..2b49b60 100644 (file)
 apiVersion: v2
 description: ONAP multicloud broker
 name: multicloud
-version: 11.0.0
+version: 12.0.0
 
 dependencies:
   - name: common
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
   - name: repositoryGenerator
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
   - name: multicloud-fcaps
-    version: ~11.x-0
+    version: ~12.x-0
     repository: 'file://components/multicloud-fcaps'
     condition: multicloud-fcaps.enabled
   - name: multicloud-k8s
-    version: ~11.x-0
+    version: ~12.x-0
     repository: 'file://components/multicloud-k8s'
     condition: multicloud-k8s.enabled
   - name: multicloud-pike
-    version: ~11.x-0
+    version: ~12.x-0
     repository: 'file://components/multicloud-pike'
     condition: multicloud-pike.enabled
   - name: multicloud-prometheus
-    version: ~11.x-0
+    version: ~12.x-0
     repository: 'file://components/multicloud-prometheus'
     condition: multicloud-prometheus.enabled
   - name: multicloud-starlingx
-    version: ~11.x-0
+    version: ~12.x-0
     repository: 'file://components/multicloud-starlingx'
     condition: multicloud-starlingx.enabled
   - name: multicloud-vio
-    version: ~11.x-0
+    version: ~12.x-0
     repository: 'file://components/multicloud-vio'
     condition: multicloud-vio.enabled
   - name: multicloud-windriver
-    version: ~11.x-0
+    version: ~12.x-0
     repository: 'file://components/multicloud-windriver'
     condition: multicloud-windriver.enabled
   - name: serviceAccount
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
index c8fdd60..3378830 100644 (file)
 apiVersion: v2
 description: ONAP multicloud OpenStack fcaps Plugin
 name: multicloud-fcaps
-version: 11.0.0
+version: 12.0.0
 
 dependencies:
   - name: common
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
   - name: repositoryGenerator
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
   - name: serviceAccount
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
index c6645db..faf9ebf 100644 (file)
 apiVersion: v2
 description: ONAP Multicloud Kubernetes Plugin
 name: multicloud-k8s
-version: 11.0.0
+version: 12.0.0
 
 dependencies:
   - name: common
-    version: ~11.x-0
+    version: ~12.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: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
   - name: etcd
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
   - name: repositoryGenerator
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
   - name: serviceAccount
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
index cf81879..4a08322 100644 (file)
         "sdcConfiguration":{
             "parameterClassName":"org.onap.policy.distribution.reception.handling.sdc.SdcReceptionHandlerConfigurationParameterGroup",
             "parameters":{
-            "asdcAddress": "sdc-be.{{ include "common.namespace" . }}:{{ (eq "true" (include "common.needTLS" .)) | ternary 8443 8080 }}",
-                "messageBusAddress": [
-                    "message-router.{{ include "common.namespace" . }}"
-                 ],
+                "sdcAddress": "sdc-be.{{ include "common.namespace" . }}:{{ (eq "true" (include "common.needTLS" .)) | ternary 8443 8080 }}",
                 "user": "multicloud",
                 "password": "Kp8bJ4SXszM0WXlhak3eHlcse2gAw84vaoGGmJvUy2U",
                 "pollingInterval":20,
                 "pollingTimeout":30,
-                "consumerId": "multicloud-k8s-id",
                 "artifactTypes": [
                     "TOSCA_CSAR",
                     "HEAT",
                     "CLOUD_TECHNOLOGY_SPECIFIC_ARTIFACT",
                     "HELM"
                 ],
-                "consumerGroup": "multicloud-k8s-group",
+                "consumerGroup": "{{ .Values.config.kafka.sdcTopic.consumerGroup }}",
+                "consumerId": "{{ .Values.config.kafka.sdcTopic.clientId }}",
                 "environmentName": "AUTO",
                 "keystorePath": "null",
                 "keystorePassword": "null",
                 "activeserverTlsAuth": false,
                 "isFilterinEmptyResources": true,
-                "isUseHttpsWithDmaap": false,
                 "isUseHttpsWithSDC": {{ (eq "true" (include "common.needTLS" .)) | ternary true false }},
                 "httpsproxyHost": "null",
                 "httpproxyHost": "null",
index c9912ff..45494e1 100644 (file)
@@ -86,6 +86,13 @@ spec:
           subPath: config.json
         - mountPath: /data
           name: artifact-data
+        env:
+        - name: SECURITY_PROTOCOL
+          value: {{ .Values.config.kafka.securityProtocol }}
+        - name: SASL_MECHANISM
+          value: {{ .Values.config.kafka.saslMechanism }}
+        - name: SASL_JAAS_CONFIG
+          {{- include "common.secret.envFromSecretFast" (dict "global" . "uid" "multicloud-k8s-sdc-kafka-secret" "key" "sasl.jaas.config") | indent 10 }}
       serviceAccountName: {{ include "common.fullname" (dict "suffix" "read" "dot" . )}}
       volumes:
       - name: localtime
diff --git a/kubernetes/multicloud/components/multicloud-k8s/templates/multicloud-k8s-sdc-list-kafka-user.yaml b/kubernetes/multicloud/components/multicloud-k8s/templates/multicloud-k8s-sdc-list-kafka-user.yaml
new file mode 100644 (file)
index 0000000..7600fac
--- /dev/null
@@ -0,0 +1,36 @@
+{{/*
+# Copyright Â© 2022 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.
+*/}}
+apiVersion: kafka.strimzi.io/v1beta2
+kind: KafkaUser
+metadata:
+  name: {{ include "common.release" . }}-{{ .Values.global.multicloudK8sKafkaUser }}
+  labels:
+    strimzi.io/cluster: {{ include "common.release" . }}-strimzi
+spec:
+  authentication:
+    type: {{ .Values.config.kafka.saslMechanism | lower }}
+  authorization:
+    type: {{ .Values.config.kafka.authType }}
+    acls:
+    - resource:
+        type: group
+        name: {{ .Values.config.kafka.sdcTopic.consumerGroup }}
+      operation: All
+    - resource:
+        type: topic
+        patternType: prefix
+        name: {{ .Values.config.kafka.sdcTopic.pattern }}
+      operation: All
diff --git a/kubernetes/multicloud/components/multicloud-k8s/templates/secret.yaml b/kubernetes/multicloud/components/multicloud-k8s/templates/secret.yaml
new file mode 100644 (file)
index 0000000..bb5091f
--- /dev/null
@@ -0,0 +1,17 @@
+{{/*
+# Copyright Â© 2022 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.
+*/}}
+
+{{ include "common.secretFast" . }}
index 36cb701..cae151a 100644 (file)
 global:
   nodePortPrefixExt: 304
   persistence: {}
-  artifactImage: onap/multicloud/framework-artifactbroker:1.8.1
+  artifactImage: onap/multicloud/framework-artifactbroker:1.9.0
+  multicloudK8sKafkaUser: mc-k8s-sdc-list-kafka-user
+
+#################################################################
+# Secrets metaconfig
+#################################################################
+secrets:
+  - uid: multicloud-k8s-sdc-kafka-secret
+    externalSecret: '{{ tpl (default "" .Values.config.jaasConfExternalSecret) . }}'
+    type: genericKV
+    envs:
+      - name: sasl.jaas.config
+        value: '{{ .Values.config.someConfig }}'
+        policy: generate
 
 #################################################################
 # Application configuration defaults.
@@ -27,6 +40,17 @@ global:
 image: onap/multicloud/k8s:0.10.1
 pullPolicy: Always
 
+config:
+  someConfig: blah
+  kafka:
+    securityProtocol: SASL_PLAINTEXT
+    saslMechanism: SCRAM-SHA-512
+    authType: simple
+    sdcTopic:
+      pattern: SDC-DIST
+      consumerGroup: multicloud
+      clientId: multicloud-k8s
+
 # flag to enable debugging - application support required
 debugEnabled: false
 
index 45dd8e5..fd84469 100644 (file)
 apiVersion: v2
 description: ONAP multicloud OpenStack Pike Plugin
 name: multicloud-pike
-version: 11.0.0
+version: 12.0.0
 
 dependencies:
   - name: common
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
   - name: repositoryGenerator
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
   - name: serviceAccount
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
index 1fbfcd4..0075548 100644 (file)
 apiVersion: v2
 description: ONAP Multicloud Prometheus
 name: multicloud-prometheus
-version: 11.0.0
+version: 12.0.0
 
 dependencies:
   - name: common
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
   - name: repositoryGenerator
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
   - name: prometheus-alertmanager
-    version: ~11.x-0
+    version: ~12.x-0
     repository: 'file://components/prometheus-alertmanager'
   - name: prometheus-grafana
-    version: ~11.x-0
+    version: ~12.x-0
     repository: 'file://components/prometheus-grafana'
   - name: serviceAccount
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
index 79e0831..d4eac13 100644 (file)
 apiVersion: v2
 description: ONAP multicloud OpenStack Starlingx Plugin
 name: multicloud-starlingx
-version: 11.0.0
+version: 12.0.0
 
 dependencies:
   - name: common
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
   - name: repositoryGenerator
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
   - name: serviceAccount
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
index 1232c3b..1fe7775 100644 (file)
@@ -17,7 +17,7 @@
 #################################################################
 global:
   nodePortPrefixExt: 304
-  artifactImage: onap/multicloud/framework-artifactbroker:1.8.1
+  artifactImage: onap/multicloud/framework-artifactbroker:1.9.0
 
 #################################################################
 # Application configuration defaults.
index 0c444fb..ed67b5e 100644 (file)
 apiVersion: v2
 description: ONAP multicloud VIO plugin
 name: multicloud-vio
-version: 11.0.0
+version: 12.0.0
 
 dependencies:
   - name: common
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
   - name: repositoryGenerator
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
   - name: serviceAccount
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
index d161db5..3cf069b 100644 (file)
 apiVersion: v2
 description: ONAP multicloud OpenStack WindRiver Plugin
 name: multicloud-windriver
-version: 11.0.0
+version: 12.0.0
 
 dependencies:
   - name: common
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
   - name: repositoryGenerator
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
   - name: serviceAccount
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
index 3380293..a328dae 100644 (file)
@@ -18,7 +18,7 @@
 #################################################################
 global:
   nodePortPrefix: 302
-  artifactImage: onap/multicloud/framework-artifactbroker:1.8.1
+  artifactImage: onap/multicloud/framework-artifactbroker:1.9.0
   persistence: {}
 
 #################################################################
index ff9dac1..5e10907 100644 (file)
@@ -55,6 +55,8 @@ spec:
          value: "{{ .Values.config.aai.username }}"
        - name: AAI_PASSWORD
          value: "{{ .Values.config.aai.password }}"
+       - name: AAI_PROTOCOL
+         value: "{{- if (include "common.needTLS" .) }}https{{ else }}http{{ end }}"
        - name: SSL_ENABLED
          value: "{{- if (include "common.needTLS" .) }}{{ .Values.config.ssl_enabled }}{{ else }}false{{ end }}"
        resources:
index 91dfa5c..21e6a61 100644 (file)
 #################################################################
 global:
   nodePortPrefix: 302
-  artifactImage: onap/multicloud/framework-artifactbroker:1.8.1
+  artifactImage: onap/multicloud/framework-artifactbroker:1.9.0
   prometheus:
     enabled: false
   persistence: {}
   centralizedLoggingEnabled: true
+  multicloudK8sKafkaUser: mc-k8s-sdc-list-kafka-user
 
 #################################################################
 # Application configuration defaults.
@@ -39,6 +40,8 @@ multicloud-fcaps:
   logConfigMapNamePrefix: '{{ include "common.release" . }}-multicloud'
 multicloud-k8s:
   enabled: true
+  config:
+    jaasConfExternalSecret: '{{ include "common.release" . }}-{{ .Values.global.multicloudK8sKafkaUser }}'
 multicloud-pike:
   enabled: true
   logConfigMapNamePrefix: '{{ include "common.release" . }}-multicloud'
@@ -64,7 +67,7 @@ config:
   msbPlainPort: 80
   aai:
     aaiPort: 8443
-    aaiPlainPort: 8080
+    aaiPlainPort: 80
     schemaVersion: v13
     username: AAI
     password: AAI
index 93a05d3..ee1e330 100644 (file)
 apiVersion: v2
 description: ONAP Northbound Interface
 name: nbi
-version: 11.0.0
+version: 12.0.0
 
 dependencies:
   - name: common
-    version: ~11.x-0
+    version: ~12.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: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
   - name: mongo
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
   - name: mariadb-galera
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
     condition: global.mariadbGalera.localCluster
   - name: mariadb-init
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
     condition: not global.mariadbGalera.localCluster
   - name: repositoryGenerator
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
   - name: serviceAccount
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
index c1b321a..9515434 100644 (file)
@@ -15,7 +15,7 @@
 
 apiVersion: v2
 name: onap
-version: 11.0.0
+version: 12.0.0
 appVersion: Kohn
 description: Open Network Automation Platform (ONAP)
 home: https://www.onap.org/
@@ -26,156 +26,156 @@ kubeVersion: ">=1.19.11-0"
 
 dependencies:
   - name: aaf
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
     condition: aaf.enabled
   - name: aai
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
     condition: aai.enabled
   - name: appc
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
     condition: appc.enabled
   - name: cassandra
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
     condition: cassandra.enabled
   - name: cds
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
     condition: cds.enabled
   - name: cli
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
     condition: cli.enabled
   - name: common
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
   - name: consul
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
     condition: consul.enabled
   - name: contrib
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
     condition: global.addTestingComponents
   - name: cps
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
     condition: cps.enabled
   - name: dcaegen2-services
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
     condition: dcaegen2-services.enabled
   - name: dcaemod
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
     condition: dcaemod.enabled
   - name: holmes
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
     condition: holmes.enabled
   - name: dmaap
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
     condition: dmaap.enabled
   - name: log
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
     condition: log.enabled
   - name: sniro-emulator
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
     condition: sniro-emulator.enabled
   - name: mariadb-galera
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
     condition: mariadb-galera.enabled
   - name: msb
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
     condition: msb.enabled
   - name: multicloud
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
     condition: multicloud.enabled
   - name: nbi
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
     condition: nbi.enabled
   - name: policy
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
     condition: policy.enabled
   - name: portal
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
     condition: portal.enabled
   - name: postgres
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
     condition: postgres.enabled
   - name: oof
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
     condition: oof.enabled
   - name: repository-wrapper
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
   - name: robot
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
     condition: robot.enabled
   - name: sdc
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
     condition: sdc.enabled
   - name: sdnc
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
     condition: sdnc.enabled
   - name: so
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
     condition: so.enabled
   - name: strimzi
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
     condition: strimzi.enabled
   - name: uui
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
     condition: uui.enabled
   - name: vfc
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
     condition: vfc.enabled
   - name: vid
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
     condition: vid.enabled
   - name: vnfsdk
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
     condition: vnfsdk.enabled
   - name: modeling
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
     condition: modeling.enabled
   - name: platform
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
     condition: platform.enabled
   - name: a1policymanagement
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
     condition: a1policymanagement.enabled
   - name: cert-wrapper
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
     condition: cert-wrapper.enabled
   - name: roles-wrapper
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
     condition: roles-wrapper.enabled
index abf2cd1..8a4bb70 100644 (file)
@@ -16,7 +16,7 @@
 # This override file is used to deploy a core configuration. It is based on
 # minimal-onap.yaml and Orange accomplishments [1][2][3].
 # It includes the following components:
-# AAI, DMAAP, SDC, SDNC, SO (+ Cassandra)
+# AAI, DMAAP Message Router, SDC, SDNC, SO (+ Cassandra), STRIMZI Kafka
 #
 # Minimal resources are also reviewed for the various containers
 # AAI: no override => to be fixed
@@ -75,6 +75,14 @@ holmes:
   enabled: false
 dmaap:
   enabled: true
+  message-router:
+    enabled: true
+  dmaap-bc:
+    enabled: false
+  dmaap-dr-prov:
+    enabled: false
+  dmaap-dr-node:
+    enabled: false
 log:
   enabled: false
 mariadb-galera:
@@ -126,6 +134,16 @@ so:
     openStackKeyStoneUrl: "$OPENSTACK_KEYSTONE_URL"
     openStackServiceTenantName: "$OPENSTACK_TENANT_NAME"
     openStackEncryptedPasswordHere: "$OPENSTACK_ENCRYPTED_PASSWORD"
+strimzi:
+  enabled: true
+  replicaCount: 2
+  persistence:
+    kafka:
+      size: 1Gi
+    zookeeper:
+      size: 500Mbi
+  strimzi-kafka-bridge:
+    enabled: false
 uui:
   enabled: false
 vid:
index e2971f7..2caad2d 100644 (file)
@@ -137,6 +137,8 @@ so:
   mariadb:
     config:
       mariadbRootPassword: password
+strimzi:
+  enabled: false
 uui:
   enabled: false
 vfc:
index 092dc1a..43aa4c8 100644 (file)
@@ -77,6 +77,8 @@ sdnc:
   enabled: false
 so:
   enabled: false
+strimzi:
+  enabled: false
 uui:
   enabled: false
 vfc:
index 12cccfb..7bfa258 100644 (file)
@@ -16,7 +16,7 @@
 # This override file is used to deploy a minimal configuration to
 # onboard and deploy a VNF.
 # It includes the following components:
-# A&AI, Cassandra, DMAAP, Portal, Robot, SDC, SDNC, SO, VID
+# A&AI, Cassandra, DMAAP Message Router, Portal, Robot, SDC, SDNC, SO, STRIMZI Kafka, VID
 #
 # Minimal resources are also reviewed for the various containers
 # A&AI: no override => to be fixed
@@ -70,6 +70,14 @@ holmes:
   enabled: false
 dmaap:
   enabled: true
+  message-router:
+    enabled: true
+  dmaap-bc:
+    enabled: false
+  dmaap-dr-prov:
+    enabled: false
+  dmaap-dr-node:
+    enabled: false
 log:
   enabled: false
 mariadb-galera:
@@ -170,6 +178,16 @@ so:
     openStackKeyStoneUrl: "$OPENSTACK_KEYSTONE_URL"
     openStackServiceTenantName: "$OPENSTACK_TENANT_NAME"
     openStackEncryptedPasswordHere: "$OPENSTACK_ENCRYPTED_PASSWORD"
+strimzi:
+  enabled: true
+  replicaCount: 1
+  persistence:
+    kafka:
+      size: 1Gi
+    zookeeper:
+      size: 500Mbi
+  strimzi-kafka-bridge:
+    enabled: false
 uui:
   enabled: false
 vid:
index 6686e16..506dd4f 100644 (file)
@@ -102,6 +102,14 @@ holmes:
   enabled: false
 dmaap:
   enabled: true
+  message-router:
+    enabled: true
+  dmaap-bc:
+    enabled: false
+  dmaap-dr-prov:
+    enabled: false
+  dmaap-dr-node:
+    enabled: false
 log:
   enabled: true
 sniro-emulator:
@@ -161,6 +169,10 @@ so:
     openStackServiceTenantName: "service"
     openStackEncryptedPasswordHere: "c124921a3a0efbe579782cde8227681e"
 
+strimzi:
+  enabled: true
+  strimzi-kafka-bridge:
+    enabled: false
 uui:
   enabled: true
 vfc:
index dc98a42..c78ac8a 100644 (file)
@@ -19,6 +19,8 @@
 global:
   ingress:
     enabled: true
+    # enable all component's Ingress interfaces
+    enable_all: true
     # All http requests via ingress will be redirected
     config:
       ssl: "redirect"
@@ -100,6 +102,8 @@ dcaegen2-services:
     enabled: true
   dcae-ves-collector:
     enabled: true
+    applicationConfig:
+      auth.method: "noAuth"
   dcae-ves-mapper:
     enabled: true
   dcae-ves-openapi-manager:
@@ -110,6 +114,14 @@ holmes:
   enabled: true
 dmaap:
   enabled: true
+  message-router:
+    enabled: true
+  dmaap-bc:
+    enabled: true
+  dmaap-dr-prov:
+    enabled: true
+  dmaap-dr-node:
+    enabled: true
 oof:
   enabled: true
 msb:
@@ -132,6 +144,8 @@ so:
   enabled: true
 strimzi:
   enabled: true
+  strimzi-kafka-bridge:
+    enabled: true
 uui:
   enabled: true
 vfc:
index 54e2cf3..9a090c1 100644 (file)
@@ -19,6 +19,7 @@
 global:
   ingress:
     enabled: true
+    enable_all: true
   addTestingComponents: &testing true
   centralizedLoggingEnabled: &centralizedLogging false
 cassandra:
@@ -61,6 +62,14 @@ holmes:
   enabled: true
 dmaap:
   enabled: true
+  message-router:
+    enabled: true
+  dmaap-bc:
+    enabled: true
+  dmaap-dr-prov:
+    enabled: true
+  dmaap-dr-node:
+    enabled: true
 oof:
   enabled: true
 msb:
@@ -83,6 +92,8 @@ so:
   enabled: true
 strimzi:
   enabled: true
+  strimzi-kafka-bridge:
+    enabled: true
 uui:
   enabled: true
 vfc:
index 849b55f..aeac83f 100644 (file)
@@ -99,6 +99,14 @@ holmes:
   enabled: true
 dmaap:
   enabled: true
+  message-router:
+    enabled: true
+  dmaap-bc:
+    enabled: true
+  dmaap-dr-prov:
+    enabled: true
+  dmaap-dr-node:
+    enabled: true
 oof:
   enabled: true
 msb:
@@ -121,6 +129,8 @@ so:
   enabled: true
 strimzi:
   enabled: true
+  strimzi-kafka-bridge:
+    enabled: true
 uui:
   enabled: true
 vfc:
index 053f56e..fc0c94d 100644 (file)
@@ -37,6 +37,14 @@ holmes:
   enabled: true
 dmaap:
   enabled: true
+  message-router:
+    enabled: true
+  dmaap-bc:
+    enabled: false
+  dmaap-dr-prov:
+    enabled: false
+  dmaap-dr-node:
+    enabled: false
 log:
   enabled: true
 oof:
@@ -57,5 +65,7 @@ so:
   enabled: true
 strimzi:
   enabled: true
+  strimzi-kafka-bridge:
+    enabled: false
 vid:
   enabled: true
index f744fca..1d3b2eb 100644 (file)
@@ -20,7 +20,8 @@
 #
 # Minimal resources are also reviewed for the various containers
 # AAI: no override => to be fixed
-# DMAAP: no override # SO: no override
+# DMAAP: no override
+# SO: no override
 # SDC: new values
 # SDNC: no override
 #
@@ -44,6 +45,9 @@
 #######################
 global:
   aafEnabled: false
+  cmpv2Enabled: false
+  msbEnabled: false
+  tlsEnabled: false
   centralizedLoggingEnabled: false
   serviceMesh:
     enabled: true
@@ -79,6 +83,16 @@ cps:
   enabled: false
 dcaegen2-services:
   enabled: false
+dmaap:
+  enabled: true
+  message-router:
+    enabled: true
+  dmaap-bc:
+    enabled: true
+  dmaap-dr-prov:
+    enabled: true
+  dmaap-dr-node:
+    enabled: true
 holmes:
   enabled: false
 log:
@@ -134,6 +148,8 @@ so:
     openStackEncryptedPasswordHere: "$OPENSTACK_ENCRYPTED_PASSWORD"
 strimzi:
   enabled: true
+  strimzi-kafka-bridge:
+    enabled: true
 uui:
   enabled: false
 vid:
@@ -144,7 +160,4 @@ vnfsdk:
   enabled: false
 cds:
   enabled: true
-dmaap:
-  enabled: true
-  dmaap-bc:
-    enabled: false
+
index 8a6af16..bdbf5ab 100755 (executable)
@@ -146,9 +146,26 @@ global:
 
   # Global ingress configuration
   ingress:
+    # generally enable ingress for ONAP components
     enabled: false
+    # enable all component's Ingress interfaces
+    enable_all: false
+    # default Ingress base URL
+    # can be overwritten in component vy setting ingress.baseurlOverride
     virtualhost:
       baseurl: "simpledemo.onap.org"
+    # All http requests via ingress will be redirected on Ingress controller
+    # only valid for Istio Gateway (ServiceMesh enabled)
+    config:
+      ssl: "redirect"
+    # you can set an own Secret containing a certificate
+    # only valid for Istio Gateway (ServiceMesh enabled)
+    #  tls:
+    #    secret: 'my-ingress-cert'
+
+    # optional: Namespace of the Istio IngressGateway
+    # only valid for Istio Gateway (ServiceMesh enabled)
+    namespace: istio-ingress
 
   # Global Service Mesh configuration
   # POC Mode, don't use it in production
@@ -303,9 +320,17 @@ holmes:
   enabled: false
 dmaap:
   enabled: false
+  message-router:
+    enabled: false
+  dmaap-bc:
+    enabled: false
+  dmaap-dr-prov:
+    enabled: false
+  dmaap-dr-node:
+    enabled: false
 # Today, "logging" chart that perform the central part of logging must also be
 # enabled in order to make it work. So `logging.enabled` must have the same
-# value than centralizedLoggingEnabled
+# value as centralizedLoggingEnabled
 log:
   enabled: *centralizedLogging
 sniro-emulator:
@@ -370,8 +395,22 @@ so:
   #   server:
   #     monitoring:
   #       password: demo123456!
+
 strimzi:
   enabled: false
+  # Kafka replication & disk storage should be dimensioned
+  # according to each given system use case.
+  replicaCount: 3
+  persistence:
+    kafka:
+      size: 10Gi
+    zookeeper:
+      size: 1Gi
+  # Strimzi kafka bridge is an optional http api towards
+  # kafka provided by https://strimzi.io/docs/bridge/latest/
+  strimzi-kafka-bridge:
+    enabled: false
+
 uui:
   enabled: false
 vfc:
@@ -386,7 +425,6 @@ platform:
   enabled: false
 a1policymanagement:
   enabled: false
-
 cert-wrapper:
   enabled: true
 repository-wrapper:
index 7602afd..3d5441d 100755 (executable)
 apiVersion: v2
 description: ONAP Optimization Framework
 name: oof
-version: 11.0.0
+version: 12.0.0
 
 dependencies:
   - name: common
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
   - name: certInitializer
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
   - name: oof-has
-    version: ~11.x-0
+    version: ~12.x-0
     repository: 'file://components/oof-has'
     condition: oof-has.enabled
   - name: oof-templates
-    version: ~11.x-0
+    version: ~12.x-0
     repository: 'file://components/oof-templates'
   - name: repositoryGenerator
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
   - name: serviceAccount
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
index 8561389..0b3a324 100755 (executable)
 apiVersion: v2
 description: ONAP Homing and Allocation Service
 name: oof-has
-version: 11.0.0
+version: 12.0.0
 
 dependencies:
   - name: common
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
   - name: music
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
     condition: music.enabled
   - name: etcd
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
     condition: etcd.enabled
   - name: etcd-init
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
     condition: etcd-init.enabled
   - name: oof-has-api
-    version: ~11.x-0
+    version: ~12.x-0
     repository: 'file://components/oof-has-api'
     condition: oof-has-api.enabled
   - name: oof-has-controller
-    version: ~11.x-0
+    version: ~12.x-0
     repository: 'file://components/oof-has-controller'
     condition: oof-has-controller.enabled
   - name: oof-has-data
-    version: ~11.x-0
+    version: ~12.x-0
     repository: 'file://components/oof-has-data'
     condition: oof-has-data.enabled
   - name: oof-has-reservation
-    version: ~11.x-0
+    version: ~12.x-0
     repository: 'file://components/oof-has-reservation'
     condition: oof-has-reservation.enabled
   - name: oof-has-solver
-    version: ~11.x-0
+    version: ~12.x-0
     repository: 'file://components/oof-has-solver'
     condition: oof-has-solver.enabled
   - name: repositoryGenerator
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
 
index a155811..39d3f0c 100755 (executable)
 apiVersion: v2
 description: ONAP Homing and Allocation Servicei - API
 name: oof-has-api
-version: 11.0.0
+version: 12.0.0
 
 dependencies:
   - name: common
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
   - name: certInitializer
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
   - name: oof-templates
-    version: ~11.x-0
+    version: ~12.x-0
     repository: 'file://../../../oof-templates'
   - name: repositoryGenerator
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
   - name: serviceAccount
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
index e8f510b..9713d7a 100755 (executable)
 apiVersion: v2
 description: ONAP Homing and Allocation Sservice - Controller
 name: oof-has-controller
-version: 11.0.0
+version: 12.0.0
 
 dependencies:
   - name: common
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
   - name: oof-templates
-    version: ~11.x-0
+    version: ~12.x-0
     repository: 'file://../../../oof-templates'
   - name: repositoryGenerator
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
   - name: serviceAccount
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
index 3bcfd08..7255451 100755 (executable)
 apiVersion: v2
 description: ONAP Homing and Allocation Service - Data Component
 name: oof-has-data
-version: 11.0.0
+version: 12.0.0
 
 dependencies:
   - name: common
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
   - name: oof-templates
-    version: ~11.x-0
+    version: ~12.x-0
     repository: 'file://../../../oof-templates'
   - name: repositoryGenerator
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
   - name: serviceAccount
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
index ba2733e..b8e5521 100755 (executable)
 apiVersion: v2
 description: ONAP Homing and Allocation Sevice - Reservation Component
 name: oof-has-reservation
-version: 11.0.0
+version: 12.0.0
 
 dependencies:
   - name: common
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
   - name: oof-templates
-    version: ~11.x-0
+    version: ~12.x-0
     repository: 'file://../../../oof-templates'
   - name: repositoryGenerator
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
   - name: serviceAccount
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
index 3ec7d88..9f5381b 100755 (executable)
 apiVersion: v2
 description: ONAP Homing and Allocation Service - Solver Component
 name: oof-has-solver
-version: 11.0.0
+version: 12.0.0
 
 dependencies:
   - name: common
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
   - name: oof-templates
-    version: ~11.x-0
+    version: ~12.x-0
     repository: 'file://../../../oof-templates'
   - name: repositoryGenerator
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
   - name: serviceAccount
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
index a59f751..92fea36 100755 (executable)
 apiVersion: v2
 description: ONAP OOF helm templates
 name: oof-templates
-version: 11.0.0
+version: 12.0.0
 
 dependencies:
   - name: common
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
 
index 559e5fe..8ba1101 100644 (file)
 apiVersion: v2
 description: ONAP platform components
 name: platform
-version: 11.0.0
+version: 12.0.0
 
 dependencies:
   - name: oom-cert-service
-    version: ~11.x-0
+    version: ~12.x-0
     repository: 'file://components/oom-cert-service'
   - name: cmpv2-cert-provider
-    version: ~11.x-0
+    version: ~12.x-0
     repository: 'file://components/cmpv2-cert-provider'
   - name: chartmuseum
-    version: ~11.x-0
+    version: ~12.x-0
     repository: 'file://components/chartmuseum'
index e8a5b83..ccf50f7 100644 (file)
 apiVersion: v2
 description: ONAP Chart Museum
 name: chartmuseum
-version: 11.0.0
+version: 12.0.0
 
 dependencies:
   - name: common
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
   - name: repositoryGenerator
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
   - name: readinessCheck
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
   - name: serviceAccount
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
index 1c6cb71..c48d31d 100644 (file)
 apiVersion: v2
 description: ONAP CMPv2 certificate external provider for cert-manager
 name: cmpv2-cert-provider
-version: 11.0.0
+version: 12.0.0
 
 dependencies:
   - name: common
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
   - name: readinessCheck
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
index 30da403..072de8c 100644 (file)
 apiVersion: v2
 description: ONAP Cert Service
 name: oom-cert-service
-version: 11.0.0
+version: 12.0.0
 
 dependencies:
   - name: common
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
   - name: repositoryGenerator
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
   - name: certManagerCertificate
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
   - name: cmpv2Config
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
index f8182e0..8f2723e 100755 (executable)
 apiVersion: v2
 description: ONAP Policy
 name: policy
-version: 11.0.0
+version: 12.0.0
 
 dependencies:
   - name: common
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
   - name: mariadb-galera
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
   - name: policy-nexus
-    version: ~11.x-0
+    version: ~12.x-0
     repository: 'file://components/policy-nexus'
     condition: policy-nexus.enabled
   - name: policy-api
-    version: ~11.x-0
+    version: ~12.x-0
     repository: 'file://components/policy-api'
     condition: policy-api.enabled
   - name: policy-pap
-    version: ~11.x-0
+    version: ~12.x-0
     repository: 'file://components/policy-pap'
     condition: policy-pap.enabled
   - name: policy-xacml-pdp
-    version: ~11.x-0
+    version: ~12.x-0
     repository: 'file://components/policy-xacml-pdp'
     condition: policy-xacml-pdp.enabled
   - name: policy-apex-pdp
-    version: ~11.x-0
+    version: ~12.x-0
     repository: 'file://components/policy-apex-pdp'
     condition: policy-apex-pdp.enabled
   - name: policy-drools-pdp
-    version: ~11.x-0
+    version: ~12.x-0
     repository: 'file://components/policy-drools-pdp'
     condition: policy-drools-pdp.enabled
   - name: policy-distribution
-    version: ~11.x-0
+    version: ~12.x-0
     repository: 'file://components/policy-distribution'
     condition: policy-distribution.enabled
   - name: policy-clamp-ac-k8s-ppnt
-    version: ~11.x-0
+    version: ~12.x-0
     repository: 'file://components/policy-clamp-ac-k8s-ppnt'
     condition: policy-clamp-ac-k8s-ppnt.enabled
   - name: policy-clamp-ac-http-ppnt
-    version: ~11.x-0
+    version: ~12.x-0
     repository: 'file://components/policy-clamp-ac-http-ppnt'
     condition: policy-clamp-ac-http-ppnt.enabled
   - name: policy-clamp-ac-pf-ppnt
-    version: ~11.x-0
+    version: ~12.x-0
     repository: 'file://components/policy-clamp-ac-pf-ppnt'
     condition: policy-clamp-ac-pf-ppnt.enabled
   - name: policy-clamp-runtime-acm
-    version: ~11.x-0
+    version: ~12.x-0
     repository: 'file://components/policy-clamp-runtime-acm'
     condition: policy-clamp-runtime-acm.enabled
   - name: policy-gui
-    version: ~11.x-0
+    version: ~12.x-0
     repository: 'file://components/policy-gui'
     condition: policy-gui.enabled
   - name: repositoryGenerator
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
   - name: serviceAccount
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
   - name: readinessCheck
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
   - name: postgres
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
     condition: global.postgres.localCluster
index 92af552..c91569f 100755 (executable)
 apiVersion: v2
 description: ONAP Policy APEX PDP
 name: policy-apex-pdp
-version: 11.0.0
+version: 12.0.0
 
 dependencies:
   - name: common
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
   - name: certInitializer
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
   - name: repositoryGenerator
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
   - name: serviceAccount
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
index d317b9e..49c067b 100755 (executable)
 apiVersion: v2
 description: ONAP Policy Design API
 name: policy-api
-version: 11.0.0
+version: 12.0.0
 
 dependencies:
   - name: common
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
   - name: certInitializer
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
   - name: repositoryGenerator
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
   - name: serviceAccount
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
index 2fa60d5..1e820fe 100644 (file)
 apiVersion: v2
 description: ONAP Policy Clamp Controlloop Http Participant
 name: policy-clamp-ac-http-ppnt
-version: 11.0.0
+version: 12.0.0
 
 dependencies:
   - name: common
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
   - name: certInitializer
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
   - name: repositoryGenerator
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
   - name: serviceAccount
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
\ No newline at end of file
index 2ca3762..13507f9 100644 (file)
 apiVersion: v2
 description: ONAP Policy Clamp Controlloop K8s Participant
 name: policy-clamp-ac-k8s-ppnt
-version: 11.0.0
+version: 12.0.0
 
 dependencies:
   - name: common
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
   - name: certInitializer
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
   - name: repositoryGenerator
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
   - name: serviceAccount
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
index fc9d432..59e1ab7 100644 (file)
 apiVersion: v2
 description: ONAP Policy Clamp Controlloop Policy Participant
 name: policy-clamp-ac-pf-ppnt
-version: 11.0.0
+version: 12.0.0
 
 dependencies:
   - name: common
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
   - name: certInitializer
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
   - name: repositoryGenerator
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
   - name: serviceAccount
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
\ No newline at end of file
index 42e02ef..12578ab 100644 (file)
 apiVersion: v2
 description: ONAP Policy Clamp Controlloop Runtime
 name: policy-clamp-runtime-acm
-version: 11.0.0
+version: 12.0.0
 
 dependencies:
   - name: common
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
   - name: certInitializer
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
   - name: repositoryGenerator
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
   - name: serviceAccount
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
index 6a5222f..778bfb6 100755 (executable)
 apiVersion: v2
 description: ONAP Policy Distribution
 name: policy-distribution
-version: 11.0.0
+version: 12.0.0
 
 dependencies:
   - name: common
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
   - name: certInitializer
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
   - name: repositoryGenerator
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
   - name: serviceAccount
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
index 1c9c73d..465d16b 100755 (executable)
 apiVersion: v2
 description: ONAP Drools Policy Engine (PDP-D)
 name: policy-drools-pdp
-version: 11.0.0
+version: 12.0.0
 
 dependencies:
   - name: common
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
   - name: certInitializer
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
   - name: repositoryGenerator
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
   - name: serviceAccount
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
index fed1af9..b2769c3 100644 (file)
 apiVersion: v2
 description: ONAP Policy GUI
 name: policy-gui
-version: 11.0.0
+version: 12.0.0
 
 dependencies:
   - name: certInitializer
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
   - name: repositoryGenerator
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
   - name: serviceAccount
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
index e8ba92a..f2f65dd 100755 (executable)
 apiVersion: v2
 description: ONAP Policy Nexus
 name: policy-nexus
-version: 11.0.0
+version: 12.0.0
 
 dependencies:
   - name: common
-    version: ~11.x-0
+    version: ~12.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: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
   - name: serviceAccount
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
index 2735890..41ec369 100755 (executable)
 apiVersion: v2
 description: ONAP Policy Administration (PAP)
 name: policy-pap
-version: 11.0.0
+version: 12.0.0
 
 dependencies:
   - name: common
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
   - name: certInitializer
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
   - name: repositoryGenerator
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
   - name: serviceAccount
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
index faa9d79..4a5e8d1 100755 (executable)
 apiVersion: v2
 description: ONAP Policy XACML PDP (PDP-X)
 name: policy-xacml-pdp
-version: 11.0.0
+version: 12.0.0
 
 dependencies:
   - name: common
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
   - name: certInitializer
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
   - name: repositoryGenerator
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
   - name: serviceAccount
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
index 0f7b846..5b0816e 100644 (file)
 apiVersion: v2
 description: ONAP Web Portal
 name: portal
-version: 11.0.0
+version: 12.0.0
 
 dependencies:
   - name: common
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
   - name: portal-app
-    version: ~11.x-0
+    version: ~12.x-0
     repository: 'file://components/portal-app'
   - name: portal-cassandra
-    version: ~11.x-0
+    version: ~12.x-0
     repository: 'file://components/portal-cassandra'
   - name: portal-mariadb
-    version: ~11.x-0
+    version: ~12.x-0
     repository: 'file://components/portal-mariadb'
   - name: portal-sdk
-    version: ~11.x-0
+    version: ~12.x-0
     repository: 'file://components/portal-sdk'
   - name: portal-widget
-    version: ~11.x-0
+    version: ~12.x-0
     repository: 'file://components/portal-widget'
index 375b11b..276f44f 100644 (file)
 apiVersion: v2
 description: ONAP Portal application
 name: portal-app
-version: 11.0.0
+version: 12.0.0
 
 dependencies:
   - name: common
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
   - name: certInitializer
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
   - name: repositoryGenerator
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
   - name: serviceAccount
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
index 6da2158..21ec14d 100644 (file)
 apiVersion: v2
 description: Portal cassandra
 name: portal-cassandra
-version: 11.0.0
+version: 12.0.0
 
 dependencies:
   - name: common
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
   - name: repositoryGenerator
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
   - name: serviceAccount
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
index ca58d58..c12659d 100644 (file)
 apiVersion: v2
 description: MariaDB Service
 name: portal-mariadb
-version: 11.0.0
+version: 12.0.0
 
 dependencies:
   - name: common
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
   - name: repositoryGenerator
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
   - name: serviceAccount
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
index bfc41f0..7f3ff1d 100644 (file)
 apiVersion: v2
 description: Portal software development kit
 name: portal-sdk
-version: 11.0.0
+version: 12.0.0
 
 dependencies:
   - name: common
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
   - name: certInitializer
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
   - name: repositoryGenerator
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
   - name: serviceAccount
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
index 2059226..b9adb0c 100644 (file)
 apiVersion: v2
 description: Portal widgets micro service application
 name: portal-widget
-version: 11.0.0
+version: 12.0.0
 
 dependencies:
   - name: common
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
   - name: repositoryGenerator
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
   - name: serviceAccount
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
index fcc3de3..343279c 100644 (file)
 apiVersion: v2
 description: A helm Chart for kubernetes-ONAP Robot
 name: robot
-version: 11.0.0
+version: 12.0.0
 
 dependencies:
   - name: common
-    version: ~11.x-0
+    version: ~12.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: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
   - name: serviceAccount
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
index daeec75..bf11e13 100644 (file)
@@ -22,7 +22,7 @@ global: # global defaults
 
 # application image
 repository: nexus3.onap.org:10001
-image: onap/testsuite:1.11.0
+image: onap/testsuite:1.11.1
 pullPolicy: Always
 
 ubuntuInitImage: oomk8s/ubuntu-init:2.0.0
index d2acf1b..aaa3ac2 100644 (file)
 apiVersion: v2
 description: Service Design and Creation Umbrella Helm charts
 name: sdc
-version: 11.0.0
+version: 12.0.0
 
 dependencies:
   - name: sdc-be
-    version: ~11.x-0
+    version: ~12.x-0
     repository: 'file://components/sdc-be'
   - name: sdc-cs
-    version: ~11.x-0
+    version: ~12.x-0
     repository: 'file://components/sdc-cs'
   - name: sdc-fe
-    version: ~11.x-0
+    version: ~12.x-0
     repository: 'file://components/sdc-fe'
   - name: sdc-onboarding-be
-    version: ~11.x-0
+    version: ~12.x-0
     repository: 'file://components/sdc-onboarding-be'
   - name: sdc-wfd-be
-    version: ~11.x-0
+    version: ~12.x-0
     repository: 'file://components/sdc-wfd-be'
     condition: sdc-wfd.enabled
   - name: sdc-wfd-fe
-    version: ~11.x-0
+    version: ~12.x-0
     repository: 'file://components/sdc-wfd-fe'
     condition: sdc-wfd.enabled
   - name: sdc-helm-validator
-    version: ~11.x-0
+    version: ~12.x-0
     repository: 'file://components/sdc-helm-validator'
     condition: sdcHelmValidator.enabled
index 4620c67..e4052af 100644 (file)
 apiVersion: v2
 description: ONAP Service Design and Creation Backend API
 name: sdc-be
-version: 11.0.0
+version: 12.0.0
 
 dependencies:
   - name: certInitializer
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
   - name: repositoryGenerator
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
   - name: serviceAccount
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
index aa632f3..332cd74 100644 (file)
@@ -27,3 +27,5 @@ metadata:
     heritage: {{ .Release.Service }}
 data:
 {{ tpl (.Files.Glob "resources/config/logging/*").AsConfig . | indent 2 }}
+
+
index 24f169a..16fc57a 100644 (file)
@@ -31,8 +31,10 @@ spec:
         args:
         - --container-name
         - "sdc-onboarding-be"
+        {{- if not .Values.global.kafka.useKafka }}
         - --container-name
         - "message-router"
+        {{- end }}
         env:
         - name: NAMESPACE
           valueFrom:
@@ -159,6 +161,12 @@ spec:
             valueFrom:
               fieldRef:
                 fieldPath: status.podIP
+          {{- if .Values.global.kafka.useKafka }}
+          - name: SASL_JAAS_CONFIG
+            {{- include "common.secret.envFromSecretFast" (dict "global" . "uid" "sdc-be-kafka-secret" "key" "sasl.jaas.config") | indent 12 }}
+          - name: USE_KAFKA
+            value: {{ .Values.global.kafka.useKafka | quote }}
+          {{- end }}
           volumeMounts:
           - name: sdc-environments
             mountPath: /app/jetty/chef-solo/environments/
diff --git a/kubernetes/sdc/components/sdc-be/templates/sdc-be-kafka-user.yaml b/kubernetes/sdc/components/sdc-be/templates/sdc-be-kafka-user.yaml
new file mode 100644 (file)
index 0000000..6cd7f93
--- /dev/null
@@ -0,0 +1,39 @@
+{{/*
+# Copyright Â© 2022 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.
+*/}}
+
+{{- if .Values.global.kafka.useKafka }}
+apiVersion: kafka.strimzi.io/v1beta2
+kind: KafkaUser
+metadata:
+  name: {{ include "common.release" . }}-{{ .Values.global.kafka.sdcBeKafkaUser }}
+  labels:
+    strimzi.io/cluster: {{ include "common.release" . }}-strimzi
+spec:
+  authentication:
+    type: {{ .Values.config.kafka.saslMech }}
+  authorization:
+    type: {{ .Values.config.kafka.authType }}
+    acls:
+    - resource:
+        type: group
+        name: {{ .Values.config.kafka.topicConsumer.groupId }}-{{ .Values.env.name }}
+      operation: Read
+    - resource:
+        type: topic
+        patternType: prefix
+        name: {{ .Values.config.kafka.topicConsumer.pattern }}
+      operation: All
+{{- end }}
diff --git a/kubernetes/sdc/components/sdc-be/templates/sdc-distro-topics.yaml b/kubernetes/sdc/components/sdc-be/templates/sdc-distro-topics.yaml
new file mode 100644 (file)
index 0000000..9a6f757
--- /dev/null
@@ -0,0 +1,40 @@
+{{/*
+# Copyright Â© 2022 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.
+*/}}
+{{- if .Values.global.kafka.useKafka }}
+apiVersion: kafka.strimzi.io/v1beta2
+kind: KafkaTopic
+metadata:
+  name: sdc-distro-notif-topic
+  labels:
+    strimzi.io/cluster: {{ include "common.release" . }}-strimzi
+spec:
+  topicName: {{ .Values.global.kafka.topics.sdcDistNotifTopic }}-{{ .Values.env.name }}
+  config:
+    retention.ms: {{ .Values.config.kafka.topicRetentionMs }}
+    segment.bytes: {{ .Values.config.kafka.topicSegmentBytes }}
+---
+apiVersion: kafka.strimzi.io/v1beta2
+kind: KafkaTopic
+metadata:
+  name: sdc-distro-status-topic
+  labels:
+    strimzi.io/cluster: {{ include "common.release" . }}-strimzi
+spec:
+  topicName: {{ .Values.global.kafka.topics.sdcDistStatusTopic }}-{{ .Values.env.name }}
+  config:
+    retention.ms: {{ .Values.config.kafka.topicRetentionMs }}
+    segment.bytes: {{ .Values.config.kafka.topicSegmentBytes }}
+{{- end }}
\ No newline at end of file
diff --git a/kubernetes/sdc/components/sdc-be/templates/secret.yaml b/kubernetes/sdc/components/sdc-be/templates/secret.yaml
new file mode 100644 (file)
index 0000000..bb5091f
--- /dev/null
@@ -0,0 +1,17 @@
+{{/*
+# Copyright Â© 2022 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.
+*/}}
+
+{{ include "common.secretFast" . }}
index 9f21635..faf46e5 100644 (file)
@@ -1,5 +1,6 @@
 # Copyright Â© 2017 Amdocs, Bell Canada
 # Modifications Copyright Â© 2018 AT&T, ZTE
+# Modifications Copyright Â© 2022 Nordix Foundation
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -30,13 +31,20 @@ global:
     replicaCount: 3
     clusterName: cassandra
     dataCenter: Pod
+  # Strimzi kafka config
+  kafka:
+    useKafka: overridden-from-parent-values-yaml
+    sdcBeKafkaUser: overridden-from-parent-values-yaml
+    topics:
+      sdcDistNotifTopic: overridden-from-parent-values-yaml
+      sdcDistStatusTopic: overridden-from-parent-values-yaml
 
 #################################################################
 # Application configuration defaults.
 #################################################################
 # application image
-image: onap/sdc-backend-all-plugins:1.11.9
-backendInitImage: onap/sdc-backend-init:1.11.9
+image: onap/sdc-backend-all-plugins:1.12.0
+backendInitImage: onap/sdc-backend-init:1.12.0
 
 pullPolicy: Always
 
@@ -70,9 +78,29 @@ certInitializer:
 #################################################################
 # SDC Config part
 #################################################################
+
+secrets:
+  - uid: sdc-be-kafka-secret
+    externalSecret: '{{ tpl (default "" .Values.config.jaasConfExternalSecret) . }}'
+    type: genericKV
+    envs:
+      - name: sasl.jaas.config
+        value: '{{ .Values.config.someConfig }}'
+        policy: generate
+
 config:
   javaOptions: "-Xmx1536m -Xms1536m"
   cassandraSslEnabled: "false"
+  # Strimzi kafka config
+  kafka:
+    saslMech: scram-sha-512
+    securityProtocol: SASL_PLAINTEXT
+    authType: simple
+    topicRetentionMs: 7200000
+    topicSegmentBytes: 1073741824
+    topicConsumer:
+      pattern: SDC-DIST
+      groupId: sdc
 
 # default number of instances
 replicaCount: 1
index 1ef26a6..a7e2d1a 100644 (file)
 apiVersion: v2
 description: ONAP Service Design and Creation Cassandra
 name: sdc-cs
-version: 11.0.0
+version: 12.0.0
 
 dependencies:
   - name: common
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
   - name: repositoryGenerator
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
   - name: serviceAccount
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
   - name: cassandra
-    version: ~11.x-0
+    version: ~12.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)
index 46208a2..b3dfbfa 100644 (file)
@@ -51,8 +51,8 @@ cassandra:
 
 # application image
 repository: nexus3.onap.org:10001
-image: onap/sdc-cassandra:1.11.9
-cassandraInitImage: onap/sdc-cassandra-init:1.11.9
+image: onap/sdc-cassandra:1.12.0
+cassandraInitImage: onap/sdc-cassandra-init:1.12.0
 pullPolicy: Always
 
 config:
index 2250947..7b646bd 100644 (file)
 apiVersion: v2
 description: ONAP Service Design and Creation Front End
 name: sdc-fe
-version: 11.0.0
+version: 12.0.0
 
 dependencies:
   - name: certInitializer
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
   - name: repositoryGenerator
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
   - name: serviceAccount
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
index 76c9e13..abac356 100644 (file)
@@ -47,7 +47,7 @@ certInitializer:
 # Application configuration defaults.
 #################################################################
 # application image
-image: onap/sdc-frontend:1.11.9
+image: onap/sdc-frontend:1.12.0
 pullPolicy: Always
 
 config:
index 771bfbf..cf6948b 100644 (file)
 apiVersion: v2
 description: ONAP Service Design and Creation Helm Validator
 name: sdc-helm-validator
-version: 11.0.0
+version: 12.0.0
 
 dependencies:
   - name: repositoryGenerator
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
   - name: common
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
index e2ff602..6032061 100644 (file)
 apiVersion: v2
 description: ONAP Service Design and Creation Onboarding API
 name: sdc-onboarding-be
-version: 11.0.0
+version: 12.0.0
 
 dependencies:
   - name: certInitializer
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
   - name: repositoryGenerator
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
   - name: serviceAccount
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
index 45cbcd6..1db5af9 100644 (file)
@@ -59,8 +59,8 @@ certInitializer:
 # Application configuration defaults.
 #################################################################
 # application image
-image: onap/sdc-onboard-backend:1.11.9
-onboardingInitImage: onap/sdc-onboard-cassandra-init:1.11.9
+image: onap/sdc-onboard-backend:1.12.0
+onboardingInitImage: onap/sdc-onboard-cassandra-init:1.12.0
 pullPolicy: Always
 
 # flag to enable debugging - application support required
index 6992f6b..51e84a6 100644 (file)
 apiVersion: v2
 description: ONAP Service Design and Creation Workflow Designer backend
 name: sdc-wfd-be
-version: 11.0.0
+version: 12.0.0
 
 dependencies:
   - name: certInitializer
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
   - name: repositoryGenerator
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
   - name: serviceAccount
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
index 45f13a0..1b17aa9 100644 (file)
 apiVersion: v2
 description: ONAP Service Design and Creation Workflow Designer frontend
 name: sdc-wfd-fe
-version: 11.0.0
+version: 12.0.0
 
 dependencies:
   - name: certInitializer
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
   - name: repositoryGenerator
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
   - name: serviceAccount
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
index c953559..aee666f 100755 (executable)
                 "message-router.{{include "common.namespace" .}}"
             ]
         },
+        "Kafka": {
+             "bootstrap": "{{ include "common.release" . }}-{{ .Values.global.kafka.kafkaBootstrap }}"
+        },
+        "DistributionTopics": {
+             "notificationTopicName": "{{ .Values.global.kafka.topics.sdcDistNotifTopic }}",
+             "statusTopicName": "{{ .Values.global.kafka.topics.sdcDistStatusTopic }}"
+        },
         "Nodes": {
             "CS": [
                 "{{.Values.global.sdc_cassandra.serviceName}}.{{include "common.namespace" .}}"
index e764306..60a361e 100644 (file)
@@ -1,5 +1,6 @@
 # Copyright Â© 2017 Amdocs, Bell Canada
 # Modifications Copyright Â© 2018 AT&T, ZTE
+# 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.
@@ -41,9 +42,19 @@ global:
    clusterName: cassandra
    dataCenter: Pod
   centralizedLoggingEnabled: true
+  # Kafka config
+  kafka:
+    useKafka: true
+    sdcBeKafkaUser: sdc-be-kafka-user
+    kafkaBootstrap: strimzi-kafka-bootstrap:9092
+    topics:
+      sdcDistNotifTopic: SDC-DISTR-NOTIF-TOPIC
+      sdcDistStatusTopic: SDC-DISTR-STATUS-TOPIC
 
 sdc-be:
   logConfigMapNamePrefix: '{{ include "common.release" . }}-sdc'
+  config:
+    jaasConfExternalSecret: '{{ include "common.release" . }}-{{ .Values.global.kafka.sdcBeKafkaUser }}'
 sdc-fe:
   logConfigMapNamePrefix: '{{ include "common.release" . }}-sdc'
 sdc-onboarding-be:
index cc21484..a3f07eb 100644 (file)
 apiVersion: v2
 description: SDN Controller
 name: sdnc
-version: 11.0.0
+version: 12.0.0
 
 dependencies:
   - name: common
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
   - name: certInitializer
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
   - name: certManagerCertificate
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
   - name: logConfiguration
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
   - name: network-name-gen
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
     condition: network-name-gen.enabled
   - name: dgbuilder
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
     condition: dgbuilder.enabled
   - name: sdnc-prom
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
     condition: config.geoEnabled
   - name: mariadb-galera
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
     condition: global.mariadbGalera.localCluster
   - name: elasticsearch
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
     condition: config.sdnr.enabled
   # conditions for sdnc-subcharts
   - name: dmaap-listener
-    version: ~11.x-0
+    version: ~12.x-0
     repository: 'file://components/dmaap-listener/'
     condition: sdnc.dmaap-listener.enabled,dmaap-listener.enabled
   - name: ueb-listener
-    version: ~11.x-0
+    version: ~12.x-0
     repository: 'file://components/ueb-listener/'
     condition: sdnc.ueb-listener.enabled,ueb-listener.enabled
   - name: sdnc-ansible-server
-    version: ~11.x-0
+    version: ~12.x-0
     repository: 'file://components/sdnc-ansible-server/'
     condition: sdnc.sdnc-ansible-server.enabled,sdnc-ansible-server.enabled
   - name: sdnc-web
-    version: ~11.x-0
+    version: ~12.x-0
     repository: 'file://components/sdnc-web/'
     condition: sdnc.sdnc-web.enabled,sdnc-web.enabled
   - name: repositoryGenerator
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
   - name: serviceAccount
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
index 3737cb7..451e73a 100644 (file)
 apiVersion: v2
 description: SDNC DMaaP Listener
 name: dmaap-listener
-version: 11.0.0
+version: 12.0.0
 
 dependencies:
   - name: common
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
   - name: repositoryGenerator
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
   - name: serviceAccount
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
index c2c1198..924d5e4 100644 (file)
 apiVersion: v2
 description: SDN-C Ansible Server
 name: sdnc-ansible-server
-version: 11.0.0
+version: 12.0.0
 
 dependencies:
   - name: common
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
   - name: repositoryGenerator
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
   - name: serviceAccount
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
index b7da488..65382ed 100644 (file)
 apiVersion: v2
 description: ONAP SDNC Policy Driven Ownership Management
 name: sdnc-prom
-version: 11.0.0
+version: 12.0.0
 
 dependencies:
   - name: common
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
   - name: repositoryGenerator
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
   - name: serviceAccount
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
index 6dc7723..43c53c6 100644 (file)
 apiVersion: v2
 description: SDN-C Web Server
 name: sdnc-web
-version: 11.0.0
+version: 12.0.0
 
 dependencies:
   - name: common
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
   - name: certInitializer
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
   - name: repositoryGenerator
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
   - name: serviceAccount
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
index d9df7af..d30c30e 100644 (file)
 apiVersion: v2
 description: SDNC UEB Listener
 name: ueb-listener
-version: 11.0.0
+version: 12.0.0
 
 dependencies:
   - name: common
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
   - name: repositoryGenerator
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
   - name: serviceAccount
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
index d155d5e..dddaceb 100644 (file)
 apiVersion: v2
 description: ONAP Mock Sniro Emulator
 name: sniro-emulator
-version: 11.0.0
+version: 12.0.0
 
 dependencies:
   - name: common
-    version: ~11.x-0
+    version: ~12.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: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
index acb5368..b9c54d4 100755 (executable)
 apiVersion: v2
 description: ONAP Service Orchestrator
 name: so
-version: 11.0.0
+version: 12.0.0
 
 dependencies:
   - name: common
-    version: ~11.x-0
+    version: ~12.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: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
     condition: global.aafEnabled
   - name: readinessCheck
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
   - name: mariadb-galera
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
     condition: global.mariadbGalera.localCluster
   - name: repositoryGenerator
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
   - name: soHelpers
-    version: ~11.x-0
+    version: ~12.x-0
     repository: 'file://components/soHelpers'
   - name: so-admin-cockpit
-    version: ~11.x-0
+    version: ~12.x-0
     repository: 'file://components/so-admin-cockpit'
     condition: so-admin-cockpit.enabled
   - name: so-appc-orchestrator
-    version: ~11.x-0
+    version: ~12.x-0
     repository: 'file://components/so-appc-orchestrator'
     condition: so-appc-orchestrator.enabled
   - name: so-bpmn-infra
-    version: ~11.x-0
+    version: ~12.x-0
     repository: 'file://components/so-bpmn-infra'
   - name: so-catalog-db-adapter
-    version: ~11.x-0
+    version: ~12.x-0
     repository: 'file://components/so-catalog-db-adapter'
     condition: so-catalog-db-adapter.enabled
   - name: so-cnf-adapter
-    version: ~11.x-0
+    version: ~12.x-0
     repository: "file://components/so-cnf-adapter"
     condition: so-cnf-adapter.enabled
   - name: so-etsi-nfvo-ns-lcm
-    version: ~11.x-0
+    version: ~12.x-0
     repository: 'file://components/so-etsi-nfvo-ns-lcm'
     condition: so-etsi-nfvo-ns-lcm.enabled
   - name: so-etsi-sol003-adapter
-    version: ~11.x-0
+    version: ~12.x-0
     repository: 'file://components/so-etsi-sol003-adapter'
     condition: so-etsi-sol003-adapter.enabled
   - name: so-mariadb
-    version: ~11.x-0
+    version: ~12.x-0
     repository: 'file://components/so-mariadb'
   - name: so-nssmf-adapter
-    version: ~11.x-0
+    version: ~12.x-0
     repository: 'file://components/so-nssmf-adapter'
     condition: so-nssmf-adapter.enabled
   - name: so-oof-adapter
-    version: ~11.x-0
+    version: ~12.x-0
     repository: 'file://components/so-oof-adapter'
     condition: so-oof-adapter.enabled
   - name: so-openstack-adapter
-    version: ~11.x-0
+    version: ~12.x-0
     repository: 'file://components/so-openstack-adapter'
     condition: so-openstack-adapter.enabled
   - name: so-request-db-adapter
-    version: ~11.x-0
+    version: ~12.x-0
     repository: 'file://components/so-request-db-adapter'
   - name: so-sdc-controller
-    version: ~11.x-0
+    version: ~12.x-0
     repository: 'file://components/so-sdc-controller'
   - name: so-sdnc-adapter
-    version: ~11.x-0
+    version: ~12.x-0
     repository: 'file://components/so-sdnc-adapter'
     condition: so-sdnc-adapter.enabled
   - name: so-ve-vnfm-adapter
-    version: ~11.x-0
+    version: ~12.x-0
     repository: 'file://components/so-ve-vnfm-adapter'
     condition: so-ve-vnfm-adapter.enabled
   - name: so-etsi-sol005-adapter
-    version: ~11.x-0
+    version: ~12.x-0
     repository: 'file://components/so-etsi-sol005-adapter'
     condition: so-etsi-sol005-adapter.enabled
   - name: serviceAccount
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
index 4218126..89534e7 100644 (file)
 apiVersion: v2
 description: A Helm chart for ONAP Service Orchestration Monitoring
 name: so-admin-cockpit
-version: 11.0.0
+version: 12.0.0
 
 dependencies:
   - name: common
-    version: ~11.x-0
+    version: ~12.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: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
   - name: soHelpers
-    version: ~11.x-0
+    version: ~12.x-0
     repository: 'file://../soHelpers'
   - name: serviceAccount
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
index 348609b..dc9a4f2 100644 (file)
@@ -9,6 +9,9 @@ server:
     keyStorePassword: ${KEYSTORE_PASSWORD}
     trustStore: ${TRUSTSTORE}
     trustStorePassword: ${TRUSTSTORE_PASSWORD}
+  {{- else }}
+  ssl:
+    enabled: false
   {{- end }}
   tomcat:
     max-threads: 50
index a82663f..51a8095 100644 (file)
 apiVersion: v2
 description: A Helm chart for so appc orchestrator
 name: so-appc-orchestrator
-version: 11.0.0
+version: 12.0.0
 
 dependencies:
   - name: common
-    version: ~11.x-0
+    version: ~12.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: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
   - name: soHelpers
-    version: ~11.x-0
+    version: ~12.x-0
     repository: 'file://../soHelpers'
   - name: serviceAccount
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
index 3a573b4..08cdb93 100755 (executable)
@@ -17,24 +17,24 @@ apiVersion: v2
 appVersion: "1.0"
 description: A Helm chart for SO Bpmn Infra
 name: so-bpmn-infra
-version: 11.0.0
+version: 12.0.0
 
 dependencies:
   - name: common
-    version: ~11.x-0
+    version: ~12.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: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
   - name: repositoryGenerator
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
   - name: soHelpers
-    version: ~11.x-0
+    version: ~12.x-0
     repository: 'file://../soHelpers'
   - name: serviceAccount
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
index e279432..50ffb8c 100755 (executable)
 apiVersion: v2
 description: A Helm chart for so-catalog-db-adapter
 name: so-catalog-db-adapter
-version: 11.0.0
+version: 12.0.0
 
 dependencies:
   - name: common
-    version: ~11.x-0
+    version: ~12.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: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
   - name: repositoryGenerator
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
   - name: soHelpers
-    version: ~11.x-0
+    version: ~12.x-0
     repository: 'file://../soHelpers'
   - name: serviceAccount
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
index abc14e8..82cebaf 100755 (executable)
@@ -18,24 +18,24 @@ apiVersion: v2
 appVersion: "1.7.1"
 description: A Helm chart for Kubernetes
 name: so-cnf-adapter
-version: 11.0.0
+version: 12.0.0
 
 dependencies:
   - name: common
-    version: ~11.x-0
+    version: ~12.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: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
   - name: repositoryGenerator
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
   - name: soHelpers
-    version: ~11.x-0
+    version: ~12.x-0
     repository: 'file://../soHelpers'
   - name: serviceAccount
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
index 4b2fd67..539e3f1 100644 (file)
 apiVersion: v2
 description: ONAP SO ETSI NFVO NS LCM
 name: so-etsi-nfvo-ns-lcm
-version: 11.0.0
+version: 12.0.0
 
 dependencies:
   - name: common
-    version: ~11.x-0
+    version: ~12.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: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
   - name: soHelpers
-    version: ~11.x-0
+    version: ~12.x-0
     repository: 'file://../soHelpers'
   - name: serviceAccount
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
index 742251a..599b805 100755 (executable)
 apiVersion: v2
 description: ONAP SO ETSI SOL003 Adapter
 name: so-etsi-sol003-adapter
-version: 11.0.0
+version: 12.0.0
 
 dependencies:
   - name: common
-    version: ~11.x-0
+    version: ~12.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: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
   - name: soHelpers
-    version: ~11.x-0
+    version: ~12.x-0
     repository: 'file://../soHelpers'
   - name: serviceAccount
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
index 7c2645e..bb92b9f 100755 (executable)
@@ -17,24 +17,24 @@ apiVersion: v2
 appVersion: "1.0"
 description: A Helm chart for Kubernetes
 name: so-etsi-sol005-adapter
-version: 11.0.0
+version: 12.0.0
 
 dependencies:
   - name: common
-    version: ~11.x-0
+    version: ~12.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: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
   - name: repositoryGenerator
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
   - name: soHelpers
-    version: ~11.x-0
+    version: ~12.x-0
     repository: 'file://../soHelpers'
   - name: serviceAccount
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
index 8b6d10f..02a456e 100755 (executable)
 apiVersion: v2
 description: MariaDB Service
 name: so-mariadb
-version: 11.0.0
+version: 12.0.0
 
 dependencies:
   - name: common
-    version: ~11.x-0
+    version: ~12.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: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
   - name: readinessCheck
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
   - name: serviceAccount
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
index ab97237..b8a3387 100755 (executable)
@@ -17,24 +17,24 @@ apiVersion: v2
 appVersion: "1.0"
 description: A Helm chart for Kubernetes
 name: so-nssmf-adapter
-version: 11.0.0
+version: 12.0.0
 
 dependencies:
   - name: common
-    version: ~11.x-0
+    version: ~12.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: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
   - name: repositoryGenerator
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
   - name: soHelpers
-    version: ~11.x-0
+    version: ~12.x-0
     repository: 'file://../soHelpers'
   - name: serviceAccount
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
index d5b8bbf..9f9c107 100755 (executable)
@@ -18,21 +18,21 @@ apiVersion: v2
 appVersion: "1.0"
 description: A Helm chart for Kubernetes
 name: so-oof-adapter
-version: 11.0.0
+version: 12.0.0
 
 dependencies:
   - name: common
-    version: ~11.x-0
+    version: ~12.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: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
   - name: soHelpers
-    version: ~11.x-0
+    version: ~12.x-0
     repository: 'file://../soHelpers'
   - name: serviceAccount
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
index 22c473f..fc80962 100755 (executable)
@@ -17,24 +17,24 @@ apiVersion: v2
 appVersion: "1.0"
 description: A Helm chart for Kubernetes
 name: so-openstack-adapter
-version: 11.0.0
+version: 12.0.0
 
 dependencies:
   - name: common
-    version: ~11.x-0
+    version: ~12.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: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
   - name: repositoryGenerator
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
   - name: soHelpers
-    version: ~11.x-0
+    version: ~12.x-0
     repository: 'file://../soHelpers'
   - name: serviceAccount
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
index db6855a..c959f36 100755 (executable)
 apiVersion: v2
 description: A Helm chart for request-db-adapter
 name: so-request-db-adapter
-version: 11.0.0
+version: 12.0.0
 
 dependencies:
   - name: common
-    version: ~11.x-0
+    version: ~12.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: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
   - name: repositoryGenerator
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
   - name: soHelpers
-    version: ~11.x-0
+    version: ~12.x-0
     repository: 'file://../soHelpers'
   - name: serviceAccount
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
index 2f7cac5..e0db267 100755 (executable)
@@ -17,24 +17,24 @@ apiVersion: v2
 appVersion: "1.0"
 description: A Helm chart for Kubernetes
 name: so-sdc-controller
-version: 11.0.0
+version: 12.0.0
 
 dependencies:
   - name: common
-    version: ~11.x-0
+    version: ~12.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: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
   - name: repositoryGenerator
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
   - name: soHelpers
-    version: ~11.x-0
+    version: ~12.x-0
     repository: 'file://../soHelpers'
   - name: serviceAccount
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
index f75662d..64464ac 100755 (executable)
@@ -17,21 +17,21 @@ apiVersion: v2
 appVersion: "1.0"
 description: A Helm chart for Kubernetes
 name: so-sdnc-adapter
-version: 11.0.0
+version: 12.0.0
 
 dependencies:
   - name: common
-    version: ~11.x-0
+    version: ~12.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: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
   - name: soHelpers
-    version: ~11.x-0
+    version: ~12.x-0
     repository: 'file://../soHelpers'
   - name: serviceAccount
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
index a9f3821..1b4294a 100755 (executable)
 apiVersion: v2
 description: ONAP SO VE VNFM Adapter (SOL002)
 name: so-ve-vnfm-adapter
-version: 11.0.0
+version: 12.0.0
 
 dependencies:
   - name: common
-    version: ~11.x-0
+    version: ~12.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: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
   - name: repositoryGenerator
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
   - name: soHelpers
-    version: ~11.x-0
+    version: ~12.x-0
     repository: 'file://../soHelpers'
   - name: serviceAccount
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
index 2029d4f..bf300e3 100755 (executable)
 apiVersion: v2
 description: A Helm chart for SO helpers
 name: soHelpers
-version: 11.0.0
+version: 12.0.0
 
 dependencies:
   - name: common
-    version: ~11.x-0
+    version: ~12.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: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
index 17da739..4ef20e1 100644 (file)
 # limitations under the License.
 
 apiVersion: v2
-description: ONAP Strimzi kafka
+description: ONAP Strimzi Kafka
 name: strimzi
-version: 11.0.0
+version: 12.0.0
 
 dependencies:
   - name: common
-    version: ~11.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)
+    version: ~12.x-0
     repository: '@local'
   - name: repositoryGenerator
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
   - name: serviceAccount
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
+  - name: strimzi-kafka-bridge
+    version: ~12.x-0
+    repository: 'file://components/strimzi-kafka-bridge'
+    condition: strimzi-kafka-bridge.enabled
 
diff --git a/kubernetes/strimzi/components/strimzi-kafka-bridge/Chart.yaml b/kubernetes/strimzi/components/strimzi-kafka-bridge/Chart.yaml
new file mode 100644 (file)
index 0000000..8c290b2
--- /dev/null
@@ -0,0 +1,23 @@
+# Copyright Â© 2022 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.
+
+apiVersion: v2
+description: ONAP Strimzi Kafka Bridge
+name: strimzi-kafka-bridge
+version: 12.0.0
+
+dependencies:
+  - name: common
+    version: ~12.x-0
+    repository: '@local'
 */}}
 apiVersion: kafka.strimzi.io/v1beta2
 kind: KafkaBridge
-metadata:
-  name: {{ include "common.fullname" . }}
-  namespace: {{ include "common.namespace" . }}
-  labels:
-    app: {{ include "common.name" . }}
-    chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
-    release: {{ include "common.release" . }}
-    heritage: {{ .Release.Service }}
+metadata: {{- include "common.resourceMetadata" . | nindent 2 }}
 spec:
-  replicas: {{ .Values.kafkaBridgeReplicaCount }}
-  enableMetrics: false
-  bootstrapServers: {{ include "common.release" . }}-{{ .Values.global.kafkaBootstrap }}:{{ .Values.global.kafkaInternalPort }}
+  replicas: {{ .Values.replicaCount }}
+  bootstrapServers: {{ include "common.release" . }}-strimzi-kafka-bootstrap:{{ .Values.config.kafkaInternalPort }}
   authentication:
-    type: {{ .Values.global.saslMechanism }}
-    username: {{ .Values.global.kafkaStrimziAdminUser }}
+    type: {{ .Values.config.saslMechanism }}
+    username: {{ .Values.config.strimziKafkaAdminUser }}
     passwordSecret:
-      secretName: {{ .Values.global.kafkaStrimziAdminUser }}
+      secretName: {{ .Values.config.strimziKafkaAdminUser }}
       password: password
+  enableMetrics: {{ .Values.config.enableMetrics }}
   http:
-    port: {{ .Values.kafkaBridgePort }}
+    port: {{ .Values.config.port }}
 # Global configuration defaults.
 #################################################################
 global:
-  kafkaBootstrap: strimzi-kafka-bootstrap
-  kafkaStrimziAdminUser: strimzi-kafka-admin
-  kafkaInternalPort: 9092
-  saslMechanism: scram-sha-512
 
 #################################################################
 # Application configuration defaults.
 #################################################################
-kafkaBridgeReplicaCount: 1
-kafkaBridgePort: 8080
+replicaCount: 1
+config:
+  port: 8080
+  enableMetrics: false
+  # The following config should be set/overridden
+  # from parent chart kubernetes/strimzi/values.yaml
+  saslMechanism: parentValue
+  kafkaInternalPort: parentValue
+  strimziKafkaAdminUser: parentValue
 
-ingress:
-  enabled: false
-
-#Pods Service Account
-serviceAccount:
-  nameOverride: dmaap-strimzi
-  roles:
-    - read
+# nameOverride is required to avoid duplication
+# in pod and service names ie ...-bridge-bridge-{random hex}
+nameOverride: strimzi-kafka
index 616f03e..efd4902 100644 (file)
@@ -13,4 +13,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 */}}
-{{ include "common.replicaPV" (dict "dot" . "suffix" "kafka" "persistenceInfos" .Values.persistenceKafka) }}
+{{ include "common.replicaPV" (dict "dot" . "suffix" "kafka" "persistenceInfos" .Values.persistence.kafka) }}
index 60f4ca6..2c5a8e3 100644 (file)
@@ -13,5 +13,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 */}}
-
-{{ include "common.replicaPV" (dict "dot" . "suffix" "zk" "persistenceInfos" .Values.persistenceZk) }}
+{{ include "common.replicaPV" (dict "dot" . "suffix" "zk" "persistenceInfos" .Values.persistence.zookeeper) }}
index 2653c67..c1bf4b8 100644 (file)
 apiVersion: kafka.strimzi.io/v1beta2
 kind: KafkaUser
 metadata:
-  name: {{ .Values.kafkaStrimziAdminUser }}
+  name: {{ .Values.config.strimziKafkaAdminUser }}
   labels:
     strimzi.io/cluster: {{ include "common.release" . }}-strimzi
 spec:
   authentication:
-    type: {{ .Values.saslMechanism }}
+    type: {{ .Values.config.saslMechanism }}
   authorization:
-    type: simple
+    type: {{ .Values.config.authType }}
     acls:
     - resource:
         type: group
index 8fa74b8..b35485f 100644 (file)
 */}}
 apiVersion: kafka.strimzi.io/v1beta2
 kind: Kafka
-metadata:
-  name: {{ include "common.fullname" . }}
-  namespace: {{ include "common.namespace" . }}
-  labels:
-    app: {{ include "common.name" . }}
-    chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
-    release: {{ include "common.release" . }}
-    heritage: {{ .Release.Service }}
+metadata: {{- include "common.resourceMetadata" . | nindent 2 }}
 spec:
   kafka:
-    version: {{ .Values.version }}
+    version: {{ .Values.config.kafkaVersion }}
     replicas: {{ .Values.replicaCount }}
     listeners:
       - name: plain
-        port: {{ .Values.kafkaInternalPort }}
+        port: {{ .Values.config.kafkaInternalPort }}
         type: internal
         tls: false
         authentication:
-          type: {{ .Values.saslMechanism }}
+          type: {{ .Values.config.saslMechanism }}
       - name: tls
         port: 9093
         type: internal
@@ -57,9 +50,9 @@ spec:
             - broker: 2
               nodePort: {{ .Values.global.nodePortPrefixExt }}92
     authorization:
-      type: simple
+      type: {{ .Values.config.authType }}
       superUsers:
-        - {{ .Values.kafkaStrimziAdminUser }}
+        - {{ .Values.config.strimziKafkaAdminUser }}
     template:
       pod:
         securityContext:
@@ -67,20 +60,21 @@ spec:
           fsGroup: 0
     config:
       default.replication.factor: {{ .Values.replicaCount }}
-      min.insync.replicas: {{ .Values.replicaCount }}
+      min.insync.replicas: {{ (eq 1.0 (.Values.replicaCount)) | ternary 1 (sub .Values.replicaCount 1) }}
       offsets.topic.replication.factor: {{ .Values.replicaCount }}
+      num.partitions: {{ mul .Values.replicaCount 2 }}
       transaction.state.log.replication.factor: {{ .Values.replicaCount }}
-      transaction.state.log.min.isr: {{ .Values.replicaCount }}
-      log.message.format.version: "3.0"
-      inter.broker.protocol.version: "3.0"
+      transaction.state.log.min.isr: {{ (eq 1.0 (.Values.replicaCount)) | ternary 1 (sub .Values.replicaCount 1) }}
+      log.message.format.version: {{ .Values.config.kafkaVersion }}
+      inter.broker.protocol.version: {{ .Values.config.kafkaVersion }}
     storage:
       type: jbod
       volumes:
       - id: 0
         type: persistent-claim
-        size: {{ .Values.persistenceKafka.size }}
+        size: {{ .Values.persistence.kafka.size }}
         deleteClaim: true
-        class: {{ include "common.storageClass" (dict "dot" . "suffix" "kafka" "persistenceInfos" .Values.persistenceKafka) }}
+        class: {{ include "common.storageClass" (dict "dot" . "suffix" "kafka" "persistenceInfos" .Values.persistence.kafka) }}
   zookeeper:
     template:
       pod:
@@ -96,9 +90,9 @@ spec:
       {{- end }}
     storage:
       type: persistent-claim
-      size: {{ .Values.persistenceZk.size }}
+      size: {{ .Values.persistence.zookeeper.size }}
       deleteClaim: true
-      class: {{ include "common.storageClass" (dict "dot" . "suffix" "zk" "persistenceInfos" .Values.persistenceZk) }}
+      class: {{ include "common.storageClass" (dict "dot" . "suffix" "zk" "persistenceInfos" .Values.persistence.zookeeper) }}
   entityOperator:
     topicOperator: {}
     userOperator: {}
index f88f3a0..e6da1d5 100644 (file)
@@ -19,34 +19,49 @@ global:
   nodePortPrefixExt: 304
   persistence:
     mountPath: /dockerdata-nfs
-
 #################################################################
 # Application configuration defaults.
 #################################################################
 replicaCount: 3
-kafkaInternalPort: 9092
-saslMechanism: scram-sha-512
-version: 3.1.0
-kafkaStrimziAdminUser: strimzi-kafka-admin
-persistence: {}
+config:
+  kafkaVersion: 3.2.3
+  authType: simple
+  saslMechanism: &saslMech scram-sha-512
+  kafkaInternalPort: &plainPort 9092
+  strimziKafkaAdminUser: &adminUser strimzi-kafka-admin
 
-persistenceKafka:
-  enabled: true
-  size: 2Gi
-  volumeReclaimPolicy: Retain
-  accessMode: ReadWriteOnce
-  mountPath: /dockerdata-nfs
-  mountSubPath: strimzi-kafka/kafka
-persistenceZk:
-  enabled: true
-  size: 2Gi
-  volumeReclaimPolicy: Retain
-  accessMode: ReadWriteOnce
+persistence:
+  enabled: &pvenabled true
   mountPath: /dockerdata-nfs
-  mountSubPath: strimzi-kafka/zk
+  kafka:
+    enabled: *pvenabled
+    # default values of 2Gi for dev env.
+    # Production values should be dimensioned according to requirements. ie >= 10Gi
+    size: 2Gi
+    volumeReclaimPolicy: Retain
+    accessMode: ReadWriteOnce
+    mountPath: /dockerdata-nfs
+    mountSubPath: strimzi-kafka/kafka
+  zookeeper:
+    enabled: *pvenabled
+    size: 1Gi
+    volumeReclaimPolicy: Retain
+    accessMode: ReadWriteOnce
+    mountPath: /dockerdata-nfs
+    mountSubPath: strimzi-kafka/zk
 
 #Pods Service Account
 serviceAccount:
   nameOverride: strimzi-kafka
   roles:
     - read
+
+######################
+#  Component overrides
+######################
+strimzi-kafka-bridge:
+  enabled: true
+  config:
+    saslMechanism: *saslMech
+    kafkaInternalPort: *plainPort
+    strimziKafkaAdminUser: *adminUser
\ No newline at end of file
index 6a0b0c9..6acf6f2 100644 (file)
@@ -1,6 +1,7 @@
 # Copyright Â© 2017 Amdocs, Bell Canada
 # Modifications Copyright Â© 2021 Orange
 # Modifications Copyright Â© 2021 Nordix Foundation
+# Modifications Copyright Â© 2022 Huawei Technologies Co., Ltd.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 apiVersion: v2
 description: ONAP uui
 name: uui
-version: 11.0.0
+version: 12.0.0
 
 dependencies:
   - name: common
-    version: ~11.x-0
+    version: ~12.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: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
   - name: certInitializer
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
   - name: uui-server
-    version: ~11.x-0
+    version: ~12.x-0
     repository: 'file://components/uui-server'
   - name: uui-nlp
-    version: ~11.x-0
+    version: ~12.x-0
     repository: 'file://components/uui-nlp'
+  - name: uui-intent-analysis
+    version: ~11.x-0
+    repository: 'file://components/uui-intent-analysis'
diff --git a/kubernetes/uui/components/uui-intent-analysis/.helmignore b/kubernetes/uui/components/uui-intent-analysis/.helmignore
new file mode 100644 (file)
index 0000000..f0c1319
--- /dev/null
@@ -0,0 +1,21 @@
+# 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
@@ -1,4 +1,4 @@
-# Copyright Â© 2022 Nordix Foundation
+# Copyright Â© 2022 Huawei Technologies Co., Ltd. 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.
 # limitations under the License.
 
 apiVersion: v2
-description: ONAP Dmaap Strimzi Kafka Bridge
-name: dmaap-strimzi
+description: ONAP uui intent analysis
+name: uui-intent-analysis
 version: 11.0.0
 
 dependencies:
   - name: common
-    version: ~11.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)
+    version: ~12.x-0
     repository: '@local'
   - name: repositoryGenerator
-    version: ~11.x-0
+    version: ~12.x-0
+    repository: '@local'
+  - name: postgres
+    version: ~12.x-0
     repository: '@local'
   - name: serviceAccount
-    version: ~11.x-0
+    version: ~12.x-0
+    repository: '@local'
+  - name: readinessCheck
+    version: ~12.x-0
     repository: '@local'
diff --git a/kubernetes/uui/components/uui-intent-analysis/resources/config/intent-analysis-init.sql b/kubernetes/uui/components/uui-intent-analysis/resources/config/intent-analysis-init.sql
new file mode 100644 (file)
index 0000000..ac3eaf0
--- /dev/null
@@ -0,0 +1,91 @@
+/*
+ * ============LICENSE_START=======================================================
+ *  Copyright (C) 2022 Huawei Technologies Co., Ltd.
+ *  ================================================================================
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT 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=========================================================
+ */
+
+CREATE EXTENSION IF NOT EXISTS "uuid-ossp";
+
+create table if not exists intent(
+    intent_id varchar(255) primary key,
+    intent_name varchar(255)
+);
+
+create table if not exists expectation(
+    expectation_id varchar(255) primary key,
+    expectation_name varchar(255),
+    expectation_type varchar(255),
+    intent_id varchar(255)
+);
+
+create table if not exists expectation_object(
+    object_id varchar(255) DEFAULT uuid_generate_v4 (),
+    primary key(object_id),
+    object_type varchar(255),
+    object_instance varchar(255),
+    expectation_id varchar(255)
+);
+
+create table if not exists expectation_target(
+    target_id varchar(255) primary key,
+    target_name varchar(255),
+    expectation_id varchar(255)
+);
+
+create table if not exists context(
+    context_id varchar(255) primary key,
+    context_name varchar(255),
+    parent_id varchar(255)
+);
+
+create table if not exists context_mapping(
+    context_id varchar(255) primary key,
+    parent_type varchar(255),
+    parent_id varchar(255)
+);
+
+create table if not exists fulfilment_info(
+    fulfilment_info_id varchar(255) primary key,
+    fulfilment_info_status varchar(255),
+    not_fulfilled_state varchar(255),
+    not_fulfilled_reason varchar(255)
+);
+
+create table if not exists state(
+    state_id varchar(255) primary key,
+    state_name varchar(255),
+    is_satisfied boolean,
+    condition varchar(255),
+    expectation_id varchar(255)
+);
+
+create table if not exists condition(
+    condition_id varchar(255) primary key,
+    condition_name varchar(255),
+    operator_type varchar(255),
+    condition_value varchar(255),
+    parent_id varchar(255)
+    );
+
+create table if not exists intent_management_function_reg_info(
+    imfr_info_id varchar(255) primary key,
+    imfr_info_description varchar(255),
+    support_area varchar(255),
+    support_model varchar(255),
+    support_interfaces varchar(255),
+    handle_name varchar(255),
+    intent_function_type varchar(255)
+    );
diff --git a/kubernetes/uui/components/uui-intent-analysis/resources/entrypoint/run.sh b/kubernetes/uui/components/uui-intent-analysis/resources/entrypoint/run.sh
new file mode 100644 (file)
index 0000000..cf68e7c
--- /dev/null
@@ -0,0 +1,31 @@
+{{/*
+#
+# Copyright (C) 2022 Huawei Technologies Co., Ltd. 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.
+#
+*/}}
+
+main_path="/home/uui"
+echo @main_path@ $main_path
+
+JAVA_PATH="$JAVA_HOME/bin/java"
+JAVA_OPTS="-Xms50m -Xmx128m"
+echo @JAVA_PATH@ $JAVA_PATH
+echo @JAVA_OPTS@ $JAVA_OPTS
+
+jar_path="$main_path/usecase-ui-intent-analysis.jar"
+echo @jar_path@ $jar_path
+
+echo "Starting usecase-ui-intent-analysis..."
+$JAVA_PATH $JAVA_OPTS -classpath $jar_path -jar $jar_path $SPRING_OPTS
diff --git a/kubernetes/uui/components/uui-intent-analysis/templates/configmap.yaml b/kubernetes/uui/components/uui-intent-analysis/templates/configmap.yaml
new file mode 100644 (file)
index 0000000..3583c41
--- /dev/null
@@ -0,0 +1,31 @@
+{{/*
+# Copyright Â© 2022 Huawei Technologies Co., Ltd. All rights reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#       http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+*/}}
+
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: {{ include "common.fullname" . }}
+  namespace: {{ include "common.namespace" . }}
+data:
+{{ tpl (.Files.Glob "resources/config/*").AsConfig . | indent 2 }}
+---
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: {{ include "common.fullname" . }}-entrypoint
+  namespace: {{ include "common.namespace" . }}
+data:
+{{ tpl (.Files.Glob "resources/entrypoint/*").AsConfig . | indent 2 }}
diff --git a/kubernetes/uui/components/uui-intent-analysis/templates/deployment.yaml b/kubernetes/uui/components/uui-intent-analysis/templates/deployment.yaml
new file mode 100644 (file)
index 0000000..91d96c2
--- /dev/null
@@ -0,0 +1,76 @@
+{{/*
+# Copyright Â© 2022 Huawei Technologies Co., Ltd. All rights reserved.
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#       http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+*/}}
+
+apiVersion: apps/v1
+kind: Deployment
+metadata: {{- include "common.resourceMetadata" . | nindent 2 }}
+spec:
+  selector: {{- include "common.selectors" . | nindent 4 }}
+  replicas: {{ .Values.replicaCount }}
+  template:
+    metadata: {{- include "common.templateMetadata" . | nindent 6 }}
+    spec:
+      initContainers: {{ include "common.readinessCheck.waitFor" . | nindent 6 }}
+      containers:
+      - name: {{ include "common.name" . }}
+        image: {{ include "repositoryGenerator.repository" . }}/{{ .Values.image }}
+        imagePullPolicy: {{ .Values.pullPolicy }}
+        command: ["sh", "-c"]
+        args:
+        - ". /uui/run.sh"
+        ports: {{ include "common.containerPorts" . | nindent 10 }}
+        env:
+        - name: POSTGRES_IP
+          value: {{ .Values.postgres.service.name2 }}
+        - name: POSTGRES_PORT
+          value: "{{ .Values.postgres.service.externalPort }}"
+        - name: POSTGRES_DB_NAME
+          value: {{ .Values.postgres.config.pgDatabase }}
+        - name: POSTGRES_USERNAME
+          {{- include "common.secret.envFromSecretFast" (dict "global" . "uid" "pg-user-creds" "key" "login") | indent 10 }}
+        - name: POSTGRES_PASSWORD
+          {{- include "common.secret.envFromSecretFast" (dict "global" . "uid" "pg-user-creds" "key" "password") | indent 10 }}
+{{- if eq .Values.liveness.enabled true }}
+        livenessProbe:
+          tcpSocket:
+            port: {{ .Values.liveness.port }}
+          initialDelaySeconds: {{ .Values.liveness.initialDelaySeconds }}
+          periodSeconds: {{ .Values.liveness.periodSeconds }}
+{{- end }}
+        readinessProbe:
+          tcpSocket:
+            port: {{ .Values.readiness.port }}
+          initialDelaySeconds: {{ .Values.readiness.initialDelaySeconds }}
+          periodSeconds: {{ .Values.readiness.periodSeconds }}
+        resources:
+{{ include "common.resources" . }}
+{{- if .Values.nodeSelector }}
+        nodeSelector: {{ toYaml .Values.nodeSelector | nindent 10 }}
+{{- end }}
+{{- if .Values.affinity }}
+        affinity: {{ toYaml .Values.affinity | nindent 10 }}
+{{- end }}
+        volumeMounts:
+        - mountPath: /uui/run.sh
+          name: entrypoint
+          subPath: run.sh
+      serviceAccountName: {{ include "common.fullname" (dict "suffix" "read" "dot" . )}}
+      volumes:
+      - name: entrypoint
+        configMap:
+          name: {{ include "common.fullname" . }}-entrypoint
+          defaultMode: 0755
+      imagePullSecrets:
+      - name: "{{ include "common.namespace" . }}-docker-registry-key"
diff --git a/kubernetes/uui/components/uui-intent-analysis/templates/job.yaml b/kubernetes/uui/components/uui-intent-analysis/templates/job.yaml
new file mode 100644 (file)
index 0000000..edcf3fe
--- /dev/null
@@ -0,0 +1,74 @@
+{{/*
+# Copyright Â© 2022 Huawei Technologies Co., Ltd. All rights reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#       http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+*/}}
+
+apiVersion: batch/v1
+kind: Job
+metadata:
+  name: {{ include "common.fullname" . }}-init-postgres
+  namespace: {{ include "common.namespace" . }}
+  labels:
+    app: {{ include "common.name" . }}-job
+    chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
+    release: {{ include "common.release" . }}
+    heritage: {{ .Release.Service }}
+spec:
+  backoffLimit: 20
+  template:
+    metadata:
+      labels:
+        app: {{ include "common.name" . }}-job
+        release: {{ include "common.release" . }}
+    spec:
+      restartPolicy: Never
+      initContainers:
+      - command:
+        - /app/ready.py
+        args:
+        - --container-name
+        - "{{ .Values.postgres.nameOverride }}"
+        env:
+        - name: NAMESPACE
+          valueFrom:
+            fieldRef:
+              apiVersion: v1
+              fieldPath: metadata.namespace
+        image: {{ include "repositoryGenerator.image.readiness" . }}
+        imagePullPolicy: {{ .Values.pullPolicy }}
+        name: {{ include "common.name" . }}-readiness
+      containers:
+      - name: {{ include "common.name" . }}-job
+        image: {{ include "repositoryGenerator.image.postgres" . }}
+        imagePullPolicy: {{ .Values.pullPolicy }}
+        env:
+        - name: PGUSER
+          {{- include "common.secret.envFromSecretFast" (dict "global" . "uid" "pg-user-creds" "key" "login") | indent 10 }}
+        - name: PGPASSWORD
+          {{- include "common.secret.envFromSecretFast" (dict "global" . "uid" "pg-user-creds" "key" "password") | indent 10 }}
+        command:
+        - /bin/sh
+        - -c
+        - |
+          psql -h $(UUI_INTENT_PG_PRIMARY_SERVICE_HOST) -f /aaa/init/intent-analysis-init.sql -d {{ .Values.postgres.config.pgDatabase }}
+        volumeMounts:
+        - name: init-data
+          mountPath: /aaa/init/intent-analysis-init.sql
+          subPath: intent-analysis-init.sql
+      imagePullSecrets:
+      - name: "{{ include "common.namespace" . }}-docker-registry-key"
+      volumes:
+      - name: init-data
+        configMap:
+          name: {{ include "common.fullname" . }}
diff --git a/kubernetes/uui/components/uui-intent-analysis/templates/secrets.yaml b/kubernetes/uui/components/uui-intent-analysis/templates/secrets.yaml
new file mode 100644 (file)
index 0000000..638e02c
--- /dev/null
@@ -0,0 +1,17 @@
+{{/*
+# Copyright Â© 2022 Huawei Technologies Co., Ltd. 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.
+*/}}
+
+{{ include "common.secretFast" . }}
diff --git a/kubernetes/uui/components/uui-intent-analysis/templates/service.yaml b/kubernetes/uui/components/uui-intent-analysis/templates/service.yaml
new file mode 100644 (file)
index 0000000..33e96ef
--- /dev/null
@@ -0,0 +1,17 @@
+{{/*
+# Copyright Â© 2022 Huawei Technologies Co., Ltd. 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.
+*/}}
+
+{{ include "common.service" . }}
diff --git a/kubernetes/uui/components/uui-intent-analysis/values.yaml b/kubernetes/uui/components/uui-intent-analysis/values.yaml
new file mode 100644 (file)
index 0000000..65cc400
--- /dev/null
@@ -0,0 +1,121 @@
+# Copyright Â© 2022 Huawei Technologies Co., Ltd. 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.
+
+# Default values for uui intent analysis.
+# This is a YAML-formatted file.
+# Declare variables to be passed into your templates.
+
+global:
+  passwordStrength: long
+
+#Pods Service Account
+serviceAccount:
+  nameOverride: uui-intent-analysis
+  roles:
+    - read
+
+secrets:
+  - uid: pg-root-pass
+    name: &pgRootPassSecretName '{{ include "common.release" . }}-uui-intent-pg-root-pass'
+    type: password
+    externalSecret: '{{ ternary "" (tpl (default "" .Values.postgres.config.pgRootPasswordExternalSecret) .) (hasSuffix "uui-intent-pg-root-pass" .Values.postgres.config.pgRootPasswordExternalSecret) }}'
+    password: '{{ .Values.postgres.config.pgRootpassword }}'
+    policy: generate
+  - uid: pg-user-creds
+    name: &pgUserCredsSecretName '{{ include "common.release" . }}-uui-intent-pg-user-creds'
+    type: basicAuth
+    externalSecret: '{{ ternary "" (tpl (default "" .Values.postgres.config.pgUserExternalSecret) .) (hasSuffix "uui-intent-pg-user-creds" .Values.postgres.config.pgUserExternalSecret) }}'
+    login: '{{ .Values.postgres.config.pgUserName }}'
+    password: '{{ .Values.postgres.config.pgUserPassword }}'
+    passwordPolicy: generate
+
+image: onap/usecase-ui-intent-analysis:5.1.1
+pullPolicy: Always
+
+# flag to enable debugging - application support required
+debugEnabled: false
+flavor: small
+replicaCount: 1
+nodeSelector: {}
+affinity: {}
+
+service:
+  type: ClusterIP
+  name: uui-intent-analysis
+  ports:
+  - name: http-rest
+    port: &svc_port 8083
+
+liveness:
+  initialDelaySeconds: 120
+  port: *svc_port
+  periodSeconds: 10
+  enabled: true
+
+readiness:
+  initialDelaySeconds: 60
+  port: *svc_port
+  periodSeconds: 10
+
+# application configuration override for postgres
+postgres:
+  nameOverride: &postgresName uui-intent-postgres
+  service:
+    name: *postgresName
+    name2: uui-intent-pg-primary
+    name3: uui-intent-pg-replica
+  container:
+    name:
+      primary: uui-intent-pg-primary
+      replica: uui-intent-pg-replica
+  config:
+    pgUserName: uui
+    pgDatabase: uuiintdb
+    pgUserExternalSecret: *pgUserCredsSecretName
+    pgRootPasswordExternalSecret: *pgRootPassSecretName
+  persistence:
+    mountSubPath: uui/uuiintent/data
+    mountInitPath: uui
+
+readinessCheck:
+  wait_for:
+    containers:
+      - *postgresName
+
+# We usually recommend not to specify default resources and to leave this as a conscious
+# choice for the user. This also increases chances charts run on environments with little
+# resources, such as Minikube. If you do want to specify resources, uncomment the following
+# lines, adjust them as necessary, and remove the curly braces after 'resources:'.
+#
+# Example:
+# Configure resource requests and limits
+# ref: http://kubernetes.io/docs/user-guide/compute-resources/
+# Minimum memory for development is 2 CPU cores and 4GB memory
+# Minimum memory for production is 4 CPU cores and 8GB memory
+resources:
+  small:
+    limits:
+      cpu: 200m
+      memory: 500Mi
+    requests:
+      cpu: 100m
+      memory: 250Mi
+  large:
+    limits:
+      cpu: 400m
+      memory: 1000Mi
+    requests:
+      cpu: 200m
+      memory: 500Mi
+  unlimited: {}
index 84664dc..3d7bd08 100644 (file)
 apiVersion: v2
 description: ONAP UUI NLP
 name: uui-nlp
-version: 11.0.0
+version: 12.0.0
 
 dependencies:
   - name: common
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
   - name: repositoryGenerator
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
   - name: serviceAccount
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
\ No newline at end of file
index 166e219..a93cb66 100644 (file)
 apiVersion: v2
 description: ONAP uui server
 name: uui-server
-version: 11.0.0
+version: 12.0.0
 
 dependencies:
   - name: common
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
   - name: certInitializer
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
   - name: repositoryGenerator
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
   - name: postgres
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
   - name: serviceAccount
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
index 7852488..44f4399 100644 (file)
@@ -88,7 +88,7 @@ flavor: small
 
 # application image
 repository: nexus3.onap.org:10001
-image: onap/usecase-ui-server:5.1.2
+image: onap/usecase-ui-server:5.1.3
 pullPolicy: Always
 
 # application configuration
index 26c9747..cbc5bf4 100644 (file)
 apiVersion: v2
 description: ONAP Virtual Function Controller (VF-C)
 name: vfc
-version: 11.0.0
+version: 12.0.0
 
 dependencies:
   - name: common
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
   - name: mariadb-galera
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
     condition: global.mariadbGalera.localCluster
   - name: repositoryGenerator
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
   - name: vfc-generic-vnfm-driver
-    version: ~11.x-0
+    version: ~12.x-0
     repository: 'file://components/vfc-generic-vnfm-driver'
     condition: vfc-generic-vnfm-driver.enabled
   - name: vfc-huawei-vnfm-driver
-    version: ~11.x-0
+    version: ~12.x-0
     repository: 'file://components/vfc-huawei-vnfm-driver'
     condition: vfc-huawei-vnfm-driver.enabled
   - name: vfc-nslcm
-    version: ~11.x-0
+    version: ~12.x-0
     repository: 'file://components/vfc-nslcm'
     condition: vfc-nslcm.enabled
   - name: vfc-redis
-    version: ~11.x-0
+    version: ~12.x-0
     repository: 'file://components/vfc-redis'
     condition: vfc-redis.enabled
   - name: vfc-vnflcm
-    version: ~11.x-0
+    version: ~12.x-0
     repository: 'file://components/vfc-vnflcm'
     condition: vfc-vnflcm.enabled
   - name: vfc-vnfmgr
-    version: ~11.x-0
+    version: ~12.x-0
     repository: 'file://components/vfc-vnfmgr'
     condition: vfc-vnfmgr.enabled
   - name: vfc-vnfres
-    version: ~11.x-0
+    version: ~12.x-0
     repository: 'file://components/vfc-vnfres'
     condition: vfc-vnfres.enabled
   - name: vfc-zte-vnfm-driver
-    version: ~11.x-0
+    version: ~12.x-0
     repository: 'file://components/vfc-zte-vnfm-driver'
     condition: vfc-zte-vnfm-driver.enabled
index 74f472e..3655c82 100644 (file)
 apiVersion: v2
 description: ONAP VFC - Generic VNFM Driver
 name: vfc-generic-vnfm-driver
-version: 11.0.0
+version: 12.0.0
 
 dependencies:
   - name: common
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
   - name: repositoryGenerator
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
index 3fa0c45..2ca97f8 100644 (file)
 apiVersion: v2
 description: ONAP VFC - Huawei VNFM Driver
 name: vfc-huawei-vnfm-driver
-version: 11.0.0
+version: 12.0.0
 
 dependencies:
   - name: common
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
   - name: repositoryGenerator
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
index f415fec..51939a8 100644 (file)
 apiVersion: v2
 description: ONAP VFC - NS Life Cycle Management
 name: vfc-nslcm
-version: 11.0.0
+version: 12.0.0
 
 dependencies:
   - name: common
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
   - name: repositoryGenerator
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
index 9fe692b..9b53ef9 100644 (file)
 apiVersion: v2
 description: ONAP VFC - REDIS
 name: vfc-redis
-version: 11.0.0
+version: 12.0.0
 
 dependencies:
   - name: common
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
   - name: repositoryGenerator
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
index 288e447..79d77d0 100644 (file)
 apiVersion: v2
 description: ONAP VFC - VNF Life Cycle Management
 name: vfc-vnflcm
-version: 11.0.0
+version: 12.0.0
 
 dependencies:
   - name: common
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
   - name: repositoryGenerator
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
index 93fb2ed..076155f 100644 (file)
 apiVersion: v2
 description: ONAP VFC - VNF Manager
 name: vfc-vnfmgr
-version: 11.0.0
+version: 12.0.0
 
 dependencies:
   - name: common
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
   - name: repositoryGenerator
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
index b02dfef..2c9c14e 100644 (file)
 apiVersion: v2
 description: ONAP VFC - VNF Resource Manager
 name: vfc-vnfres
-version: 11.0.0
+version: 12.0.0
 
 dependencies:
   - name: common
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
   - name: repositoryGenerator
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
index 5f8a392..6fb5a7d 100644 (file)
 apiVersion: v2
 description: ONAP VFC - ZTE VNFM Driver
 name: vfc-zte-vnfm-driver
-version: 11.0.0
+version: 12.0.0
 
 dependencies:
   - name: common
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
   - name: repositoryGenerator
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
index fe6164a..67eb0be 100644 (file)
 apiVersion: v2
 description: ONAP Virtual Infrastructure Deployment
 name: vid
-version: 11.0.0
+version: 12.0.0
 
 dependencies:
   - name: common
-    version: ~11.x-0
+    version: ~12.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: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
   - name: mariadb-galera
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
     condition: global.mariadbGalera.localCluster
   - name: mariadb-init
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
     condition: not global.mariadbGalera.localCluster
   - name: repositoryGenerator
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
index 7ef08bd..1c67281 100644 (file)
 apiVersion: v2
 description: ONAP VNF SDK
 name: vnfsdk
-version: 11.0.0
+version: 12.0.0
 
 dependencies:
   - name: common
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
   - name: certInitializer
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
   - name: postgres
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
   - name: repositoryGenerator
-    version: ~11.x-0
+    version: ~12.x-0
     repository: '@local'
index 4913184..a849267 100644 (file)
@@ -1,4 +1,3 @@
-lfdocs-conf
 sphinx>=4.2.0  # BSD
 sphinx-rtd-theme>=1.0.0  # MIT
 doc8
@@ -10,3 +9,8 @@ PyEnchant
 pylint
 autopep8
 gitlint-core
+sphinxcontrib-blockdiag
+sphinxcontrib-seqdiag
+sphinxcontrib-swaggerdoc
+sphinxcontrib-plantuml
+sphinx-toolbox