From: Sylvain Desbureaux <sylvain.desbureaux@orange.com>
Date: Wed, 1 Sep 2021 13:24:17 +0000 (+0000)
Subject: Merge "[DCAE] Helm charts for SNMPTrap collector"
X-Git-Tag: 9.0.0~156
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=0204932de96a41bd840668a10dd88dc423c7106f;hp=-c;p=oom.git

Merge "[DCAE] Helm charts for SNMPTrap collector"
---

0204932de96a41bd840668a10dd88dc423c7106f
diff --combined kubernetes/dcaegen2-services/requirements.yaml
index a23731a5d0,3991dc60da..51368b686c
--- a/kubernetes/dcaegen2-services/requirements.yaml
+++ b/kubernetes/dcaegen2-services/requirements.yaml
@@@ -26,18 -26,6 +26,18 @@@ dependencies
      version: ~8.x-0
      repository: '@local'
      condition: dcae-datafile-collector.enabled
 +  - name: dcae-datalake-admin-ui
 +    version: ~8.x-0
 +    repository: '@local'
 +    condition: dcae-datalake-admin-ui.enabled
 +  - name: dcae-datalake-des
 +    version: ~8.x-0
 +    repository: '@local'
 +    condition: dcae-datalake-des.enabled
 +  - name: dcae-datalake-feeder
 +    version: ~8.x-0
 +    repository: '@local'
 +    condition: dcae-datalake-feeder.enabled
    - name: dcae-heartbeat
      version: ~8.x-0
      repository: '@local'
@@@ -74,6 -62,10 +74,10 @@@
      version: ~8.x-0
      repository: '@local'
      condition: dcae-slice-analysis-ms.enabled
+   - name: dcae-snmptrap-collector
+     version: ~8.x-0
+     repository: '@local'
+     condition: dcae-snmptrap-collector.enabled
    - name: dcae-son-handler
      version: ~8.x-0
      repository: '@local'
diff --combined kubernetes/dcaegen2-services/values.yaml
index 75329452c0,0be24c9916..eb0b9cc34d
--- a/kubernetes/dcaegen2-services/values.yaml
+++ b/kubernetes/dcaegen2-services/values.yaml
@@@ -20,12 -20,6 +20,12 @@@ dcae-bbs-eventprocessor-ms
    enabled: false
  dcae-datafile-collector:
    enabled: false
 +dcae-datalake-admin-ui:
 +  enabled: false
 +dcae-datalake-des:
 +  enabled: false
 +dcae-datalake-feeder:
 +  enabled: false
  dcae-heartbeat:
    enabled: false
  dcae-hv-ves-collector:
@@@ -44,6 -38,8 +44,8 @@@ dcae-restconf-collector
    enabled: false
  dcae-slice-analysis-ms:
    enabled: false
+ dcae-snmptrap-collector:
+   enabled: false
  dcae-son-handler:
    enabled: false
  dcae-tcagen2: