[DCAEGEN2] Create Authorization Policies for DCAE

[oom.git] / kubernetes / dcaegen2-services / components / dcae-datafile-collector / values.yaml

diff --git a/kubernetes/dcaegen2-services/components/dcae-datafile-collector/values.yaml b/kubernetes/dcaegen2-services/components/dcae-datafile-collector/values.yaml
index d53a83d..ee21e10 100644 (file)
--- a/kubernetes/dcaegen2-services/components/dcae-datafile-collector/values.yaml
+++ b/kubernetes/dcaegen2-services/components/dcae-datafile-collector/values.yaml
@@ -2,6 +2,8 @@
 # =========================================================================
 #  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.
@@ -44,15 +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.7.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
@@ -66,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
@@ -97,9 +92,9 @@ certificates:
 readinessCheck:
   wait_for:
     containers:
-      - aaf-cm
       - dmaap-bc
       - dmaap-provisioning-job
+      - message-router
 
 # Probe Configuration
 readiness:
@@ -115,11 +110,29 @@ service:
   type: ClusterIP
   name: datafile-collector
   ports:
-    - name: https
+    - name: http
       port: 8443
       plain_port: 8100
       port_protocol: http
 
+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
@@ -139,10 +152,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
@@ -162,9 +176,14 @@ 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
 
+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