X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=kubernetes%2Fdcaegen2-services%2Fcomponents%2Fdcae-datafile-collector%2Fvalues.yaml;h=cb6e5f79ec5da8630ede15ab4362cfe13cb15ede;hb=db8167bbf6923c8f316ebadd6cec1dd4891428a1;hp=9bdd0b78879a7d546e7acd25bb2da8b3ac4aa389;hpb=bc5844e278f6a27eb8797f7c2f5b1c27853553d2;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 9bdd0b7887..cb6e5f79ec 100644
--- a/kubernetes/dcaegen2-services/components/dcae-datafile-collector/values.yaml
+++ b/kubernetes/dcaegen2-services/components/dcae-datafile-collector/values.yaml
@@ -1,6 +1,9 @@
 # ================================ LICENSE_START ==========================
 # =========================================================================
-#  Copyright (C) 2021 Nordix Foundation.
+#  Copyright (c) 2021 Nordix Foundation.
+#  Copyright (c) 2022 Nokia.  All rights reserved.
+#  Copyright (c) 2022-2023 J. F. Lucas. All rights reserved.
+#  Copyright (c) 2023 Deutsche Telekom AG. 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.
@@ -30,18 +33,26 @@ filebeatConfig:
   logstashServiceName: log-ls
   logstashPort: 5044
 
+#################################################################
+# Secrets Configuration.
+#################################################################
+secrets:
+  - uid: &drPubCredsUID drpubcreds
+    type: basicAuth
+    login: '{{ .Values.drPubscriberCreds.username }}'
+    password: '{{ .Values.drPubscriberCreds.password }}'
+    passwordPolicy: required
+
 #################################################################
 # 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.4.0
+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.10.0
 pullPolicy: Always
 
 # Log directory where logging sidecar should look for log files
@@ -55,11 +66,6 @@ logConfigMapNamePrefix: '{{ include "common.fullname" . }}'
 # if absent, no certs will be retrieved and stored
 certDirectory: /opt/app/datafile/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
-
 # CMPv2 certificate
 # It is used only when:
 # - certDirectory is set
@@ -83,13 +89,13 @@ certificates:
         create: true
 
 # Dependencies
+# Waiting for dmaap-dr-node (which depends on dmaap-dr-prov)
+# to be sure that we can provision the DR feed that's needed
 readinessCheck:
   wait_for:
     containers:
-      - dcae-config-binding-service
-      - aaf-cm
-      - dmaap-bc
-      - dmaap-provisioning-job
+      - dmaap-dr-node
+      - message-router
 
 # Probe Configuration
 readiness:
@@ -105,16 +111,41 @@ service:
   type: ClusterIP
   name: datafile-collector
   ports:
-    - name: https
+    - name: http
       port: 8443
       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"
+
+serviceMesh:
+  authorizationPolicy:
+    authorizedPrincipals:
+      - serviceAccount: dcae-pm-mapper-read
+      - serviceAccount: message-router-read
+      - serviceAccount: istio-ingress
+        namespace: istio-ingress
+
+# Data Router Publisher Credentials
+drPubscriberCreds:
+  username: username
+  password: password
+
+credentials:
+- name: DR_USERNAME
+  uid: *drPubCredsUID
+  key: login
+- name: DR_PASSWORD
+  uid: *drPubCredsUID
+  key: password
 
 # Initial Application Configuration
 applicationConfig:
@@ -122,10 +153,11 @@ 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: false
   dmaap.dmaapConsumerConfiguration.consumerGroup: OpenDcae-c12
   dmaap.dmaapConsumerConfiguration.consumerId: C12
   dmaap.dmaapConsumerConfiguration.timeoutMs: -1
-  dmaap.security.enableDmaapCertAuth: true
+  dmaap.security.enableDmaapCertAuth: false
   dmaap.security.keyStorePasswordPath: /opt/app/datafile/etc/cert/jks.pass
   dmaap.security.keyStorePath: /opt/app/datafile/etc/cert/cert.jks
   dmaap.security.trustStorePasswordPath: /opt/app/datafile/etc/cert/trust.pass
@@ -135,38 +167,38 @@ applicationConfig:
   streams_publishes:
     PM_MEAS_FILES:
       dmaap_info:
-        publisher_id: ${DR_FILES_PUBLISHER_ID_0}
+        publisher_id: "dummy_id"
         location: loc00
-        log_url: ${DR_LOG_URL_0}
-        publish_url: ${DR_FILES_PUBLISHER_URL_0}
-        username: ${DR_USERNAME_0}
-        password: ${DR_PASSWORD_0}
+        log_url: ${DR_FEED_LOGURL_0}
+        publish_url: ${DR_FEED_PUBURL_0}
+        username: ${DR_USERNAME}
+        password: ${DR_PASSWORD}
       type: data_router
   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
 
+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'
+
 # DataRouter Feed Configuration
 drFeedConfig:
   - feedName: bulk_pm_feed
-    owner: dcaecm
     feedVersion: "0.0"
-    asprClassification: unclassified
+    classification: unclassified
     feedDescription: DFC Feed Creation
-
-# DataRouter Publisher Configuration
-drPubConfig:
-  - feedName: bulk_pm_feed
-    dcaeLocationName: loc00
+    publisher:
+      username: ${DR_USERNAME}
+      password: ${DR_PASSWORD}
 
 # ConfigMap Configuration for Feed, Dr_Publisher
 volumes:
   - name: feeds-config
     path: /opt/app/config/feeds
-  - name: drpub-config
-    path: /opt/app/config/dr_pubs
 
 # Resource Limit Flavor -By Default Using Small
 flavor: small
@@ -175,18 +207,18 @@ flavor: small
 resources:
   small:
     limits:
-      cpu: 1
+      cpu: 2
       memory: 1Gi
     requests:
-      cpu: 500m
-      memory: 768Mi
+      cpu: 1
+      memory: 1Gi
   large:
     limits:
-      cpu: 2
+      cpu: 4
       memory: 2Gi
     requests:
-      cpu: 1
-      memory: 1Gi
+      cpu: 2
+      memory: 2Gi
   unlimited: {}
 
 #Pods Service Account