# ================================ 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.
global:
nodePortPrefix: 302
nodePortPrefixExt: 304
+ centralizedLoggingEnabled: true
#################################################################
# Filebeat Configuration Defaults.
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
-# if absent, no sidecar will be deployed
-logDirectory: /var/log/ONAP
+# if path is set to null sidecar won't be deployed in spite of
+# global.centralizedLoggingEnabled setting.
+log:
+ path: /var/log/ONAP
+logConfigMapNamePrefix: '{{ include "common.fullname" . }}'
# Directory where TLS certs should be stored
# 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
readinessCheck:
wait_for:
containers:
- - dcae-config-binding-service
- - aaf-cm
- dmaap-bc
- dmaap-provisioning-job
+ - message-router
# Probe Configuration
readiness:
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:
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
location: loc00
log_url: ${DR_LOG_URL_0}
publish_url: ${DR_FILES_PUBLISHER_URL_0}
- username: ${DR_USERNAME_0}
- password: ${DR_PASSWORD_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
# DataRouter Publisher Configuration
drPubConfig:
- feedName: bulk_pm_feed
+ username: ${DR_USERNAME}
+ userpwd: ${DR_PASSWORD}
dcaeLocationName: loc00
# ConfigMap Configuration for Feed, Dr_Publisher
resources:
small:
limits:
- cpu: 1
+ cpu: 999
memory: 1Gi
requests:
- cpu: 500m
- memory: 768Mi
+ cpu: 1
+ memory: 1Gi
large:
limits:
- cpu: 2
+ cpu: 999
memory: 2Gi
requests:
- cpu: 1
- memory: 1Gi
+ cpu: 2
+ memory: 2Gi
unlimited: {}
#Pods Service Account
Code Review / oom.git / blobdiff