From: Sylvain Desbureaux <sylvain.desbureaux@orange.com>
Date: Fri, 21 May 2021 13:13:32 +0000 (+0000)
Subject: Merge "[DCAEGEN2] Upgrade vescollector to 1.9.2"
X-Git-Tag: 9.0.0~252
X-Git-Url: https://gerrit.onap.org/r/gitweb?p=oom.git;a=commitdiff_plain;h=f4527b94897c02c763f11e4013dbbe9b3a821061;hp=-c

Merge "[DCAEGEN2] Upgrade vescollector to 1.9.2"
---

f4527b94897c02c763f11e4013dbbe9b3a821061
diff --combined kubernetes/dcaegen2-services/components/dcae-ves-collector/values.yaml
index 081bcdcc1a,f9def33cdf..a675db6797
--- a/kubernetes/dcaegen2-services/components/dcae-ves-collector/values.yaml
+++ b/kubernetes/dcaegen2-services/components/dcae-ves-collector/values.yaml
@@@ -1,7 -1,6 +1,7 @@@
  #============LICENSE_START========================================================
  # ================================================================================
  # Copyright (c) 2021 J. F. Lucas. All rights reserved.
 +# Copyright (c) 2021 Nokia.  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.
@@@ -35,13 -34,12 +35,13 @@@ filebeatConfig
  #################################################################
  tlsImage: onap/org.onap.dcaegen2.deployments.tls-init-container:2.1.0
  consulLoaderImage: onap/org.onap.dcaegen2.deployments.consul-loader-container:1.1.0
 +certPostProcessorImage: onap/org.onap.oom.platform.cert-service.oom-certservice-post-processor:2.3.3
  
  #################################################################
  # Application configuration defaults.
  #################################################################
  # application image
- image: onap/org.onap.dcaegen2.collectors.ves.vescollector:1.8.0
+ image: onap/org.onap.dcaegen2.collectors.ves.vescollector:1.9.2
  pullPolicy: Always
  
  # log directory where logging sidecar should look for log files
@@@ -57,24 -55,6 +57,24 @@@ certDirectory: /opt/app/dcae-certificat
  # and key from AAF and mount them in certDirectory.
  tlsServer: true
  
 +# CMPv2 certificate
 +# It is used only when global parameter cmpv2Enabled is true
 +# Disabled by default
 +certificates:
 +  - mountPath: /opt/app/dcae-certificate/external
 +    commonName: dcae-ves-collector
 +    dnsNames:
 +      - dcae-ves-collector
 +      - ves-collector
 +      - ves
 +    keystore:
 +      outputType:
 +        - jks
 +      passwordSecretRef:
 +        name: ves-cmpv2-keystore-password
 +        key: password
 +        create: true
 +
  # dependencies
  readinessCheck:
    wait_for:
diff --combined kubernetes/dcaegen2/components/dcae-bootstrap/values.yaml
index ae86c4311a,d34519f656..694940ec3d
--- a/kubernetes/dcaegen2/components/dcae-bootstrap/values.yaml
+++ b/kubernetes/dcaegen2/components/dcae-bootstrap/values.yaml
@@@ -111,9 -111,9 +111,9 @@@ default_k8s_location: centra
  # Use to override default setting in blueprints
  componentImages:
    tcagen2: onap/org.onap.dcaegen2.analytics.tca-gen2.dcae-analytics-tca-web:1.2.1
-   ves: onap/org.onap.dcaegen2.collectors.ves.vescollector:1.8.0
+   ves: onap/org.onap.dcaegen2.collectors.ves.vescollector:1.9.2
    prh: onap/org.onap.dcaegen2.services.prh.prh-app-server:1.5.6
 -  hv_ves: onap/org.onap.dcaegen2.collectors.hv-ves.hv-collector-main:1.6.0
 +  hv_ves: onap/org.onap.dcaegen2.collectors.hv-ves.hv-collector-main:1.8.0
  
  # Resource Limit flavor -By Default using small
  flavor: small