X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=kubernetes%2Fdcaegen2-services%2Fcomponents%2Fdcae-hv-ves-collector%2Fvalues.yaml;h=067ddb2cf211927528f425d2c4b646d28d992a87;hb=f39c640581cc73afa1b275b1e8f633b960865b3d;hp=9b943c4fccf1599902e2869928977bc2d248b4ea;hpb=6c8bdb10b085afa5a4680b0254163d00c8e8eb0a;p=oom.git

diff --git a/kubernetes/dcaegen2-services/components/dcae-hv-ves-collector/values.yaml b/kubernetes/dcaegen2-services/components/dcae-hv-ves-collector/values.yaml
index 9b943c4fcc..067ddb2cf2 100644
--- a/kubernetes/dcaegen2-services/components/dcae-hv-ves-collector/values.yaml
+++ b/kubernetes/dcaegen2-services/components/dcae-hv-ves-collector/values.yaml
@@ -1,7 +1,8 @@
 #============LICENSE_START========================================================
 # ================================================================================
-# Copyright (c) 2021 J. F. Lucas. All rights reserved.
-# Copyright (c) 2021 Nokia.  All rights reserved.
+# Copyright (c) 2021-2022 J. F. Lucas. All rights reserved.
+# Copyright (c) 2021-2022 Nokia.  All rights reserved.
+# Copyright © 2022 Nordix Foundation
 # ================================================================================
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -22,6 +23,7 @@
 global:
   nodePortPrefix: 302
   nodePortPrefixExt: 304
+  centralizedLoggingEnabled: true
 
 #################################################################
 # Filebeat configuration defaults.
@@ -34,19 +36,21 @@ filebeatConfig:
 # 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.3.3
+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.hv-ves.hv-collector-main:1.9.0
+image: onap/org.onap.dcaegen2.collectors.hv-ves.hv-collector-main:1.11.0
 pullPolicy: Always
 
 # log directory where logging sidecar should look for log files
-# if absent, no sidecar will be deployed
-logDirectory: /var/log/ONAP/dcae-hv-ves-collector
+# if path is set to null sidecar won't be deployed in spite of
+# global.centralizedLoggingEnabled setting.
+log:
+  path: /var/log/ONAP/dcae-hv-ves-collector
+logConfigMapNamePrefix: '{{ include "common.fullname" . }}'
 
 # directory where TLS certs should be stored
 # if absent, no certs will be retrieved and stored
@@ -58,11 +62,15 @@ certDirectory: /etc/ves-hv/ssl
 tlsServer: true
 
 secrets:
-  - uid: &aafCredsUID aafcreds
-    type: basicAuth
-    login: '{{ .Values.aafCreds.user }}'
-    password: '{{ .Values.aafCreds.password }}'
-    passwordPolicy: required
+  - uid: hv-ves-kafka-secret
+    externalSecret: '{{ tpl (default "" .Values.config.jaasConfExternalSecret) . }}'
+    type: genericKV
+    envs:
+      - name: sasl.jaas.config
+        value: '{{ .Values.config.someConfig }}'
+        policy: generate
+config:
+  someConfig: blah
 
 # CMPv2 certificate
 # It is used only when:
@@ -89,7 +97,6 @@ certificates:
 # dependencies
 readinessCheck:
   wait_for:
-    - dcae-config-binding-service
     - aaf-cm
 
 # probe configuration
@@ -111,17 +118,8 @@ service:
       port_protocol: http
       nodePort: 22
 
-aafCreds:
-  user: admin
-  password: admin_secret
-
-credentials:
-- name: AAF_USER
-  uid: *aafCredsUID
-  key: login
-- name: AAF_PASSWORD
-  uid: *aafCredsUID
-  key: password
+#strimzi kafka config
+hvVesKafkaUser: dcae-hv-ves-kafka-user
 
 # initial application configuration
 applicationConfig:
@@ -137,47 +135,38 @@ applicationConfig:
   streams_publishes:
     ves-3gpp-fault-supervision:
       type: kafka
-      aaf_credentials:
-        username: ${AAF_USER}
-        password: ${AAF_PASSWORD}
       kafka_info:
-        bootstrap_servers: message-router-kafka:9092
+        bootstrap_servers: ${KAFKA_BOOTSTRAP_SERVERS}
         topic_name: SEC_3GPP_FAULTSUPERVISION_OUTPUT
     ves-3gpp-provisioning:
       type: kafka
-      aaf_credentials:
-        username: ${AAF_USER}
-        password: ${AAF_PASSWORD}
       kafka_info:
-        bootstrap_servers: message-router-kafka:9092
+        bootstrap_servers: ${KAFKA_BOOTSTRAP_SERVERS}
         topic_name: SEC_3GPP_PROVISIONING_OUTPUT
     ves-3gpp-heartbeat:
       type: kafka
-      aaf_credentials:
-        username: ${AAF_USER}
-        password: ${AAF_PASSWORD}
       kafka_info:
-        bootstrap_servers: message-router-kafka:9092
+        bootstrap_servers: ${KAFKA_BOOTSTRAP_SERVERS}
         topic_name: SEC_3GPP_HEARTBEAT_OUTPUT
     ves-3gpp-performance-assurance:
       type: kafka
-      aaf_credentials:
-        username: ${AAF_USER}
-        password: ${AAF_PASSWORD}
       kafka_info:
-        bootstrap_servers: message-router-kafka:9092
+        bootstrap_servers: ${KAFKA_BOOTSTRAP_SERVERS}
         topic_name: SEC_3GPP_PERFORMANCEASSURANCE_OUTPUT
     perf3gpp:
       type: kafka
-      aaf_credentials:
-        username: ${AAF_USER}
-        password: ${AAF_PASSWORD}
       kafka_info:
-        bootstrap_servers: message-router-kafka:9092
+        bootstrap_servers: ${KAFKA_BOOTSTRAP_SERVERS}
         topic_name: HV_VES_PERF3GPP
 
 applicationEnv:
   JAVA_OPTS: '-Dlogback.configurationFile=/etc/ONAP/dcae-hv-ves-collector/logback.xml'
+  CBS_CLIENT_CONFIG_PATH: '/app-config-input/application_config.yaml'
+  KAFKA_BOOTSTRAP_SERVERS: '{{ include "common.release" . }}-strimzi-kafka-bootstrap:9092'
+  USE_SCRAM: 'true'
+  JAAS_CONFIG:
+    secretUid: hv-ves-kafka-secret
+    key: sasl.jaas.config
 
 # Resource Limit flavor -By Default using small
 flavor: small
@@ -198,3 +187,9 @@ resources:
       cpu: 2
       memory: 2Gi
   unlimited: {}
+
+#Pods Service Account
+serviceAccount:
+  nameOverride: dcae-hv-ves-collector
+  roles:
+    - read