Merge "[AAI] Make aai log level configurable"

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

diff --git a/kubernetes/dcaegen2-services/components/dcae-snmptrap-collector/values.yaml b/kubernetes/dcaegen2-services/components/dcae-snmptrap-collector/values.yaml
index 60295b9..599b3d2 100644 (file)
--- a/kubernetes/dcaegen2-services/components/dcae-snmptrap-collector/values.yaml
+++ b/kubernetes/dcaegen2-services/components/dcae-snmptrap-collector/values.yaml
@@ -1,6 +1,7 @@
 # ================================ LICENSE_START =============================
 # ============================================================================
 # Copyright (c) 2021 AT&T Intellectual Property. All rights reserved.
+# Copyright (c) 2022-2023 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.
@@ -21,6 +22,7 @@
 global:
   nodePortPrefix: 302
   nodePortPrefixExt: 304
+  centralizedLoggingEnabled: true
 
 #################################################################
 # Filebeat Configuration Defaults.
@@ -29,34 +31,25 @@ filebeatConfig:
   logstashServiceName: log-ls
   logstashPort: 5044
 
-
-#################################################################
-# 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
-
 #################################################################
 # Application Configuration Defaults.
 #################################################################
 # Application Image
-image: onap/org.onap.dcaegen2.collectors.snmptrap:2.0.5
+image: onap/org.onap.dcaegen2.collectors.snmptrap:2.0.8
 pullPolicy: Always
 
 # Log directory where logging sidecar should look for log files
-# if absent, no sidecar will be deployed
-logDirectory: /opt/app/snmptrap/logs
-
-
-# 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
+# if path is set to null sidecar won't be deployed in spite of
+# global.centralizedLoggingEnabled setting.
+log:
+  path: /opt/app/snmptrap/logs
+logConfigMapNamePrefix: '{{ include "common.fullname" . }}'
 
 # Dependencies
 readinessCheck:
   wait_for:
-    - dcae-config-binding-service
+    services:
+      - message-router
 
 # Probe Configuration
 readiness:
@@ -77,6 +70,10 @@ service:
       nodePort: 70
       useNodePortExt: true
 
+serviceMesh:
+  authorizationPolicy:
+    authorizedPrincipals: []
+
 # Initial Application Configuration
 applicationConfig:
   StormWatchPolicy: ''
@@ -84,7 +81,7 @@ applicationConfig:
     dns_cache_ttl_seconds: 60
   services_calls: {}
   snmptrapd:
-    version: '2.0.4'
+    version: '2.0.8'
     title: ONAP SNMP Trap Receiver
   sw_interval_in_seconds: 60
   streams_publishes:
@@ -92,8 +89,8 @@ applicationConfig:
       dmaap_info:
         topic_url: http://message-router:3904/events/unauthenticated.ONAP-COLLECTOR-SNMPTRAP
       type: message_router
-      aaf_password: null
-      aaf_username: null
+      aaf_password: ""
+      aaf_username: ""
   files:
     runtime_base_dir: "/opt/app/snmptrap"
     log_dir: logs
@@ -132,16 +129,22 @@ flavor: small
 resources:
   small:
     limits:
-      cpu: 1
-      memory: 1Gi
+      cpu: "1"
+      memory: "1Gi"
     requests:
-      cpu: 1
-      memory: 1Gi
+      cpu: "1"
+      memory: "1Gi"
   large:
     limits:
-      cpu: 2
-      memory: 2Gi
+      cpu: "2"
+      memory: "2Gi"
     requests:
-      cpu: 2
-      memory: 2Gi
+      cpu: "2"
+      memory: "2Gi"
   unlimited: {}
+
+#Pods Service Account
+serviceAccount:
+  nameOverride: dcae-snmptrap-collector
+  roles:
+    - read