[DCAEGEN2] Update snmptrap-collector image

Update snmptrap-collector to 2.0.8.
Fix outdated configuration library.
Add "protocol" to common.containerPorts.
Update dcae-snmptrap-collector chart version to 13.0.1.
Update dcaegen2-services chart version to 13.0.2.

Issue-ID: DCAEGEN2-3409
Issue-ID: OOM-3251
Signed-off-by: Jack Lucas <jflos@sonoris.net>
Change-Id: If0ca26e07fdbbebafb442dc0ead3a14d4ea0d4a6

diff --git a/kubernetes/common/common/templates/_pod.tpl b/kubernetes/common/common/templates/_pod.tpl
index b38a7f1..810350b 100644 (file)
--- a/kubernetes/common/common/templates/_pod.tpl
+++ b/kubernetes/common/common/templates/_pod.tpl
@@ -45,6 +45,9 @@
 - containerPort: {{ default $port.plain_port $port.internal_plain_port }}
   name: {{ $port.name }}-plain
 {{-     end }}
+{{-     if $port.l4_protocol }}
+  protocol: {{ $port.l4_protocol }}
+{{-     end }}
 {{-   end }}
 {{- end -}}
 

diff --git a/kubernetes/dcaegen2-services/Chart.yaml b/kubernetes/dcaegen2-services/Chart.yaml
index 081ff3c..cd6893e 100644 (file)
--- a/kubernetes/dcaegen2-services/Chart.yaml
+++ b/kubernetes/dcaegen2-services/Chart.yaml
@@ -1,6 +1,6 @@
 #============LICENSE_START========================================================
 # ================================================================================
-# Copyright (c) 2020 J. F. Lucas. All rights reserved.
+# Copyright (c) 2020, 2024 J. F. Lucas. All rights reserved.
 # Modifications Copyright © 2021 Orange
 # Modifications Copyright © 2021 Nordix Foundation
 # Modifications Copyright © 2024 Deutsche Telekom Intellectual Property.
@@ -22,7 +22,7 @@ apiVersion: v2
 appVersion: "NewDelhi"
 description: DCAE Microservices
 name: dcaegen2-services
-version: 13.0.1
+version: 13.0.2
 
 dependencies:
   - name: common

diff --git a/kubernetes/dcaegen2-services/components/dcae-snmptrap-collector/Chart.yaml b/kubernetes/dcaegen2-services/components/dcae-snmptrap-collector/Chart.yaml
index dade6c3..5f2eb49 100644 (file)
--- a/kubernetes/dcaegen2-services/components/dcae-snmptrap-collector/Chart.yaml
+++ b/kubernetes/dcaegen2-services/components/dcae-snmptrap-collector/Chart.yaml
@@ -3,6 +3,7 @@
 # Copyright (c) 2021 AT&T Intellectual Property
 # Modifications Copyright © 2021 Orange
 # Modifications Copyright © 2021 Nordix Foundation
+# Copyright (c) 2024 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.
@@ -18,10 +19,10 @@
 # ================================= LICENSE_END ==============================
 
 apiVersion: v2
-appVersion: "Kohn"
+appVersion: "NewDelhi"
 description: DCAE SNMPTrap Collector
 name: dcae-snmptrap-collector
-version: 13.0.0
+version: 13.0.1
 
 dependencies:
   - name: common

diff --git a/kubernetes/dcaegen2-services/components/dcae-snmptrap-collector/values.yaml b/kubernetes/dcaegen2-services/components/dcae-snmptrap-collector/values.yaml
index 01d4316..ab768ef 100644 (file)
--- a/kubernetes/dcaegen2-services/components/dcae-snmptrap-collector/values.yaml
+++ b/kubernetes/dcaegen2-services/components/dcae-snmptrap-collector/values.yaml
@@ -35,7 +35,7 @@ filebeatConfig:
 # Application Configuration Defaults.
 #################################################################
 # Application Image
-image: onap/org.onap.dcaegen2.collectors.snmptrap:2.0.7
+image: onap/org.onap.dcaegen2.collectors.snmptrap:2.0.8
 pullPolicy: Always
 
 # Log directory where logging sidecar should look for log files
@@ -80,7 +80,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:
@@ -88,8 +88,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