[DCAEGEN2] Provide inputs for new DFC blueprint

DFC blueprint (k8s-datafile.yaml) will use the inputs for CMPv2 cert,
when use_external_tls=true.
- Align inputs to bootstrap blueprint (current are outdated)
- Add External TLS inputs

Issue-ID: DCAEGEN2-1795
Signed-off-by: Tomasz Wrobel <tomasz.wrobel@nokia.com>
Change-Id: Iebd5e10918b2c555997e239f9077bad2c8b05dec

2 files changed, 20 insertions, 10 deletions

diff --git a/kubernetes/dcaegen2/components/dcae-bootstrap/resources/inputs/k8s-datafile-collector-inputs.yaml b/kubernetes/dcaegen2/components/dcae-bootstrap/resources/inputs/k8s-datafile-collector-inputs.yaml
index 8c2c0a217b..d05129bc10 100644
--- a/kubernetes/dcaegen2/components/dcae-bootstrap/resources/inputs/k8s-datafile-collector-inputs.yaml
+++ b/kubernetes/dcaegen2/components/dcae-bootstrap/resources/inputs/k8s-datafile-collector-inputs.yaml
@@ -21,14 +21,23 @@
 {{ if .Values.componentImages.datafile_collector }}
 tag_version: {{ include "repositoryGenerator.repository" . }}/{{ .Values.componentImages.datafile_collector }}
 {{ end }}
-host_port: {{ .Values.config.address.datafile_collector.port }}
-host_port_secure: {{ .Values.config.address.datafile_collector.portSecure }}
-dmaap_mr_host: "{{ .Values.config.address.message_router }}"
-dmaap_mr_port: 3904
-dmaap_mr_user: "admin"
-dmaap_mr_passwd: "admin"
-dmaap_dr_host: "{{ .Values.config.address.dmaap_dr_prov }}"
-dmaap_dr_port: 8443
-dmaap_dr_user: "dradmin"
-dmaap_dr_passwd: "dradmin"
 replicas: 1
+log_directory: "/var/log/ONAP"
+topic_name: "unauthenticated.VES_NOTIFICATION_OUTPUT"
+envs: {}
+use_tls: true
+PM_MEAS_FILES_feed0_location: "loc00"
+feed0_name: "bulk_pm_feed"
+consumer_id: "C12"
+consumer_group: "OpenDcae-c12"
+cert_directory: "/opt/app/datafile/etc/cert/"
+external_port: ":0"
+datafile-collector_memory_limit: "512Mi"
+datafile-collector_memory_request: "512Mi"
+datafile-collector_cpu_limit: "250m"
+datafile-collector_cpu_request: "250m"
+external_cert_use_external_tls: false
+external_cert_ca_name: "RA"
+external_cert_common_name: "dcae-datafile-collector"
+external_cert_sans: "dcae-datafile-collector,datafile-collector,datafile"
+external_cert_cert_type: "P12"
diff --git a/kubernetes/dcaegen2/components/dcae-bootstrap/values.yaml b/kubernetes/dcaegen2/components/dcae-bootstrap/values.yaml
index a3bff07fb2..a59e53a136 100644
--- a/kubernetes/dcaegen2/components/dcae-bootstrap/values.yaml
+++ b/kubernetes/dcaegen2/components/dcae-bootstrap/values.yaml
@@ -116,6 +116,7 @@ componentImages:
   snmptrap: onap/org.onap.dcaegen2.collectors.snmptrap:1.4.0
   prh: onap/org.onap.dcaegen2.services.prh.prh-app-server:1.5.4
   hv_ves: onap/org.onap.dcaegen2.collectors.hv-ves.hv-collector-main:1.5.1
+  datafile_collector: onap/org.onap.dcaegen2.collectors.datafile.datafile-app-server:1.5.0
 
 # Resource Limit flavor -By Default using small
 flavor: small