X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=kubernetes%2Fdcaegen2-services%2Fcomponents%2Fdcae-datafile-collector%2Fvalues.yaml;h=5b0eea661c87ac210064d0e1437b3fce8ff65ab4;hb=261763aa935de4207189397004b01707f5f5188b;hp=2ce6c8977500c7257a37bbc823391f3b52b5c82b;hpb=053f263ccd8786a4f2cf39a36b504c4bd28ed324;p=oom.git

diff --git a/kubernetes/dcaegen2-services/components/dcae-datafile-collector/values.yaml b/kubernetes/dcaegen2-services/components/dcae-datafile-collector/values.yaml
index 2ce6c89775..5b0eea661c 100644
--- a/kubernetes/dcaegen2-services/components/dcae-datafile-collector/values.yaml
+++ b/kubernetes/dcaegen2-services/components/dcae-datafile-collector/values.yaml
@@ -1,6 +1,8 @@
 # ================================ LICENSE_START ==========================
 # =========================================================================
 #  Copyright (c) 2021 Nordix Foundation.
+#  Copyright (c) 2022 Nokia.  All rights reserved.
+#  Copyright (c) 2022 J. F. Lucas. All rights reserved.
 # =========================================================================
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -44,14 +46,13 @@ secrets:
 # InitContainer Images.
 #################################################################
 tlsImage: onap/org.onap.dcaegen2.deployments.tls-init-container:2.1.0
-consulLoaderImage: onap/org.onap.dcaegen2.deployments.consul-loader-container:1.1.1
 certPostProcessorImage: onap/org.onap.oom.platform.cert-service.oom-certservice-post-processor:2.5.0
 
 #################################################################
 # Application Configuration Defaults.
 #################################################################
 # Application Image
-image: onap/org.onap.dcaegen2.collectors.datafile.datafile-app-server:1.6.1
+image: onap/org.onap.dcaegen2.collectors.datafile.datafile-app-server:1.9.0
 pullPolicy: Always
 
 # Log directory where logging sidecar should look for log files
@@ -96,7 +97,6 @@ certificates:
 readinessCheck:
   wait_for:
     containers:
-      - dcae-config-binding-service
       - aaf-cm
       - dmaap-bc
       - dmaap-provisioning-job
@@ -120,11 +120,15 @@ service:
       plain_port: 8100
       port_protocol: http
 
-# Environment variables
-applicationEnv:
-# Empty path forces DFC to use Consul configuration, which allows app runtime reconfiguration.
-# It's a workaround because DMAAP specific env variables are not available in main container.
-  CBS_CLIENT_CONFIG_PATH: ''
+ingress:
+  enabled: false
+  service:
+    - baseaddr: "dcae-datafile-collector-api"
+      name: "datafile-collector"
+      port: 8443
+      plain_port: 8100
+  config:
+    ssl: "redirect"
 
 # Data Router Publisher Credentials
 drPubscriberCreds:
@@ -145,6 +149,7 @@ applicationConfig:
   dmaap.certificateConfig.keyPasswordPath: /opt/app/datafile/etc/cert/p12.pass
   dmaap.certificateConfig.trustedCa: /opt/app/datafile/etc/cert/trust.jks
   dmaap.certificateConfig.trustedCaPasswordPath: /opt/app/datafile/etc/cert/trust.pass
+  dmaap.certificateConfig.enableCertAuth: true
   dmaap.dmaapConsumerConfiguration.consumerGroup: OpenDcae-c12
   dmaap.dmaapConsumerConfiguration.consumerId: C12
   dmaap.dmaapConsumerConfiguration.timeoutMs: -1