summaryrefslogtreecommitdiffstats
path: root/kubernetes/dcaegen2-services
diff options
context:
space:
mode:
Diffstat (limited to 'kubernetes/dcaegen2-services')
-rw-r--r--kubernetes/dcaegen2-services/common/dcaegen2-services-common/templates/_deployment.tpl7
-rw-r--r--kubernetes/dcaegen2-services/components/dcae-datafile-collector/values.yaml10
-rw-r--r--kubernetes/dcaegen2-services/components/dcae-datalake-feeder/values.yaml1
-rw-r--r--kubernetes/dcaegen2-services/components/dcae-heartbeat/values.yaml1
-rw-r--r--kubernetes/dcaegen2-services/components/dcae-hv-ves-collector/values.yaml1
-rw-r--r--kubernetes/dcaegen2-services/components/dcae-kpi-ms/values.yaml1
-rw-r--r--kubernetes/dcaegen2-services/components/dcae-pm-mapper/values.yaml20
-rw-r--r--kubernetes/dcaegen2-services/components/dcae-pmsh/values.yaml3
-rw-r--r--kubernetes/dcaegen2-services/components/dcae-prh/values.yaml4
-rw-r--r--kubernetes/dcaegen2-services/components/dcae-restconf-collector/values.yaml3
-rw-r--r--kubernetes/dcaegen2-services/components/dcae-slice-analysis-ms/values.yaml1
-rw-r--r--kubernetes/dcaegen2-services/components/dcae-snmptrap-collector/values.yaml3
-rw-r--r--kubernetes/dcaegen2-services/components/dcae-son-handler/values.yaml1
-rw-r--r--kubernetes/dcaegen2-services/components/dcae-tcagen2/values.yaml1
-rw-r--r--kubernetes/dcaegen2-services/components/dcae-ves-collector/values.yaml5
-rw-r--r--kubernetes/dcaegen2-services/components/dcae-ves-mapper/values.yaml6
16 files changed, 28 insertions, 40 deletions
diff --git a/kubernetes/dcaegen2-services/common/dcaegen2-services-common/templates/_deployment.tpl b/kubernetes/dcaegen2-services/common/dcaegen2-services-common/templates/_deployment.tpl
index ef49f8c5d4..ef846034d0 100644
--- a/kubernetes/dcaegen2-services/common/dcaegen2-services-common/templates/_deployment.tpl
+++ b/kubernetes/dcaegen2-services/common/dcaegen2-services-common/templates/_deployment.tpl
@@ -1,7 +1,7 @@
{{/*
#============LICENSE_START========================================================
# ================================================================================
-# Copyright (c) 2021 J. F. Lucas. All rights reserved.
+# Copyright (c) 2021-2022 J. F. Lucas. All rights reserved.
# Copyright (c) 2021 AT&T Intellectual Property. All rights reserved.
# Copyright (c) 2021 Nokia. All rights reserved.
# Copyright (c) 2021 Nordix Foundation.
@@ -176,7 +176,7 @@ The Deployment always includes a single Pod, with a container that uses
the DCAE microservice image.
The Deployment Pod may also include a logging sidecar container.
-The sidecar is included if .Values.logDirectory is set. The
+The sidecar is included if .Values.log.path is set. The
logging sidecar and the DCAE microservice container share a
volume where the microservice logs are written.
@@ -222,7 +222,8 @@ policies:
*/}}
{{- define "dcaegen2-services-common.microserviceDeployment" -}}
-{{- $logDir := default "" .Values.log.path -}}
+{{- $log := default dict .Values.log -}}
+{{- $logDir := default "" $log.path -}}
{{- $certDir := default "" .Values.certDirectory . -}}
{{- $tlsServer := default "" .Values.tlsServer -}}
{{- $commonRelease := print (include "common.release" .) -}}
diff --git a/kubernetes/dcaegen2-services/components/dcae-datafile-collector/values.yaml b/kubernetes/dcaegen2-services/components/dcae-datafile-collector/values.yaml
index 2ce6c89775..d53a83daa4 100644
--- a/kubernetes/dcaegen2-services/components/dcae-datafile-collector/values.yaml
+++ b/kubernetes/dcaegen2-services/components/dcae-datafile-collector/values.yaml
@@ -1,6 +1,7 @@
# ================================ LICENSE_START ==========================
# =========================================================================
# Copyright (c) 2021 Nordix Foundation.
+# Copyright (c) 2022 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.
@@ -51,7 +52,7 @@ certPostProcessorImage: onap/org.onap.oom.platform.cert-service.oom-certservice-
# Application Configuration Defaults.
#################################################################
# Application Image
-image: onap/org.onap.dcaegen2.collectors.datafile.datafile-app-server:1.6.1
+image: onap/org.onap.dcaegen2.collectors.datafile.datafile-app-server:1.7.1
pullPolicy: Always
# Log directory where logging sidecar should look for log files
@@ -96,7 +97,6 @@ certificates:
readinessCheck:
wait_for:
containers:
- - dcae-config-binding-service
- aaf-cm
- dmaap-bc
- dmaap-provisioning-job
@@ -120,12 +120,6 @@ service:
plain_port: 8100
port_protocol: http
-# Environment variables
-applicationEnv:
-# Empty path forces DFC to use Consul configuration, which allows app runtime reconfiguration.
-# It's a workaround because DMAAP specific env variables are not available in main container.
- CBS_CLIENT_CONFIG_PATH: ''
-
# Data Router Publisher Credentials
drPubscriberCreds:
username: username
diff --git a/kubernetes/dcaegen2-services/components/dcae-datalake-feeder/values.yaml b/kubernetes/dcaegen2-services/components/dcae-datalake-feeder/values.yaml
index 07306e1286..ec320ebef8 100644
--- a/kubernetes/dcaegen2-services/components/dcae-datalake-feeder/values.yaml
+++ b/kubernetes/dcaegen2-services/components/dcae-datalake-feeder/values.yaml
@@ -79,7 +79,6 @@ tlsServer: true
# Dependencies
readinessCheck:
wait_for:
- - dcae-config-binding-service
- aaf-cm
- &postgresName dcae-datalake-postgres
diff --git a/kubernetes/dcaegen2-services/components/dcae-heartbeat/values.yaml b/kubernetes/dcaegen2-services/components/dcae-heartbeat/values.yaml
index 4ed0a83677..c325569de5 100644
--- a/kubernetes/dcaegen2-services/components/dcae-heartbeat/values.yaml
+++ b/kubernetes/dcaegen2-services/components/dcae-heartbeat/values.yaml
@@ -79,7 +79,6 @@ tlsServer: true
# Dependencies
readinessCheck:
wait_for:
- - dcae-config-binding-service
- aaf-cm
- &postgresName dcae-heartbeat-postgres
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 65a5d04d80..a8a30f4d12 100644
--- a/kubernetes/dcaegen2-services/components/dcae-hv-ves-collector/values.yaml
+++ b/kubernetes/dcaegen2-services/components/dcae-hv-ves-collector/values.yaml
@@ -93,7 +93,6 @@ certificates:
# dependencies
readinessCheck:
wait_for:
- - dcae-config-binding-service
- aaf-cm
# probe configuration
diff --git a/kubernetes/dcaegen2-services/components/dcae-kpi-ms/values.yaml b/kubernetes/dcaegen2-services/components/dcae-kpi-ms/values.yaml
index 037dd0aec0..8425024ba6 100644
--- a/kubernetes/dcaegen2-services/components/dcae-kpi-ms/values.yaml
+++ b/kubernetes/dcaegen2-services/components/dcae-kpi-ms/values.yaml
@@ -78,7 +78,6 @@ policies:
# Dependencies
readinessCheck:
wait_for:
- - dcae-config-binding-service
- aaf-cm
# Probe Configuration
diff --git a/kubernetes/dcaegen2-services/components/dcae-pm-mapper/values.yaml b/kubernetes/dcaegen2-services/components/dcae-pm-mapper/values.yaml
index 39c4a8ed50..0d28683feb 100644
--- a/kubernetes/dcaegen2-services/components/dcae-pm-mapper/values.yaml
+++ b/kubernetes/dcaegen2-services/components/dcae-pm-mapper/values.yaml
@@ -1,6 +1,7 @@
# ================================ LICENSE_START ==========================
# =========================================================================
# Copyright (C) 2021 Nordix Foundation.
+# Copyright (c) 2022 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.
@@ -55,7 +56,7 @@ consulLoaderImage: onap/org.onap.dcaegen2.deployments.consul-loader-container:1.
# Application Configuration Defaults.
#################################################################
# Application Image
-image: onap/org.onap.dcaegen2.services.pm-mapper:1.7.2
+image: onap/org.onap.dcaegen2.services.pm-mapper:1.8.0
pullPolicy: Always
# Log directory where logging sidecar should look for log files
@@ -78,7 +79,6 @@ tlsServer: true
readinessCheck:
wait_for:
containers:
- - dcae-config-binding-service
- aaf-cm
- dmaap-bc
- dmaap-provisioning-job
@@ -131,14 +131,14 @@ credentials:
# Initial Application Configuration
applicationConfig:
enable_tls: true
- enable_http: false
- aaf_identity: ${AAF_IDENTITY}
- aaf_password: ${AAF_PASSWORD}
+ enable_http: true
+ aaf_identity: ""
+ aaf_password: ""
pm-mapper-filter: "{ \"filters\":[] }"
- key_store_path: /opt/app/pm-mapper/etc/cert/cert.jks
- key_store_pass_path: /opt/app/pm-mapper/etc/cert/jks.pass
- trust_store_path: /opt/app/pm-mapper/etc/cert/trust.jks
- trust_store_pass_path: /opt/app/pm-mapper/etc/cert/trust.pass
+ key_store_path: ""
+ key_store_pass_path: ""
+ trust_store_path: ""
+ trust_store_pass_path: ""
dmaap_dr_delete_endpoint: https://dmaap-dr-node:8443/delete
streams_publishes:
dmaap_publisher:
@@ -147,7 +147,7 @@ applicationConfig:
client_id: ${MR_FILES_PUBLISHER_CLIENT_ID_0}
location: san-francisco
client_role: org.onap.dcae.pmPublisher
- topic_url: http://message-router:3904/events/org.onap.dmaap.mr.PERFORMANCE_MEASUREMENTS
+ topic_url: http://message-router:3904/events/unauthenticated.PERFORMANCE_MEASUREMENTS
streams_subscribes:
dmaap_subscriber:
type: data_router
diff --git a/kubernetes/dcaegen2-services/components/dcae-pmsh/values.yaml b/kubernetes/dcaegen2-services/components/dcae-pmsh/values.yaml
index 4bdd2b8088..80014e7528 100644
--- a/kubernetes/dcaegen2-services/components/dcae-pmsh/values.yaml
+++ b/kubernetes/dcaegen2-services/components/dcae-pmsh/values.yaml
@@ -57,7 +57,7 @@ consulLoaderImage: onap/org.onap.dcaegen2.deployments.consul-loader-container:1.
# Application Configuration Defaults.
#################################################################
# Application Image
-image: onap/org.onap.dcaegen2.services.pmsh:1.3.2
+image: onap/org.onap.dcaegen2.services.pmsh:2.0.0
pullPolicy: Always
# Log directory where logging sidecar should look for log files
@@ -79,7 +79,6 @@ tlsServer: true
# Dependencies
readinessCheck:
wait_for:
- - dcae-config-binding-service
- aaf-cm
- &postgresName dcae-pmsh-postgres
diff --git a/kubernetes/dcaegen2-services/components/dcae-prh/values.yaml b/kubernetes/dcaegen2-services/components/dcae-prh/values.yaml
index a4ed6994f7..7886ed75a8 100644
--- a/kubernetes/dcaegen2-services/components/dcae-prh/values.yaml
+++ b/kubernetes/dcaegen2-services/components/dcae-prh/values.yaml
@@ -1,6 +1,7 @@
#============LICENSE_START========================================================
# ================================================================================
# Copyright (c) 2021 J. F. Lucas. All rights reserved.
+# Copyright (c) 2022 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.
@@ -40,7 +41,7 @@ consulLoaderImage: onap/org.onap.dcaegen2.deployments.consul-loader-container:1.
# Application configuration defaults.
#################################################################
# application image
-image: onap/org.onap.dcaegen2.services.prh.prh-app-server:1.7.1
+image: onap/org.onap.dcaegen2.services.prh.prh-app-server:1.8.0
pullPolicy: Always
# log directory where logging sidecar should look for log files
@@ -69,7 +70,6 @@ secrets:
# dependencies
readinessCheck:
wait_for:
- - dcae-config-binding-service
- aaf-cm
# probe configuration
diff --git a/kubernetes/dcaegen2-services/components/dcae-restconf-collector/values.yaml b/kubernetes/dcaegen2-services/components/dcae-restconf-collector/values.yaml
index 543b79b9c0..4c736c49f0 100644
--- a/kubernetes/dcaegen2-services/components/dcae-restconf-collector/values.yaml
+++ b/kubernetes/dcaegen2-services/components/dcae-restconf-collector/values.yaml
@@ -51,7 +51,7 @@ consulLoaderImage: onap/org.onap.dcaegen2.deployments.consul-loader-container:1.
# Application Configuration Defaults.
#################################################################
# Application Image
-image: onap/org.onap.dcaegen2.collectors.restconfcollector:1.2.7
+image: onap/org.onap.dcaegen2.collectors.restconfcollector:1.3.2
pullPolicy: Always
# Log directory where logging sidecar should look for log files
@@ -73,7 +73,6 @@ tlsServer: true
# Dependencies
readinessCheck:
wait_for:
- - dcae-config-binding-service
- aaf-cm
# Probe Configuration
diff --git a/kubernetes/dcaegen2-services/components/dcae-slice-analysis-ms/values.yaml b/kubernetes/dcaegen2-services/components/dcae-slice-analysis-ms/values.yaml
index 14bbde071c..849738e8e2 100644
--- a/kubernetes/dcaegen2-services/components/dcae-slice-analysis-ms/values.yaml
+++ b/kubernetes/dcaegen2-services/components/dcae-slice-analysis-ms/values.yaml
@@ -78,7 +78,6 @@ tlsServer: true
# Dependencies
readinessCheck:
wait_for:
- - dcae-config-binding-service
- aaf-cm
- &postgresName dcae-sliceanalysisms-postgres
diff --git a/kubernetes/dcaegen2-services/components/dcae-snmptrap-collector/values.yaml b/kubernetes/dcaegen2-services/components/dcae-snmptrap-collector/values.yaml
index 51ec337724..25f0c3b730 100644
--- a/kubernetes/dcaegen2-services/components/dcae-snmptrap-collector/values.yaml
+++ b/kubernetes/dcaegen2-services/components/dcae-snmptrap-collector/values.yaml
@@ -57,10 +57,11 @@ logConfigMapNamePrefix: '{{ include "common.fullname" . }}'
# and key from AAF and mount them in certDirectory.
tlsServer: true
+
# Dependencies
readinessCheck:
wait_for:
- - dcae-config-binding-service
+ - message-router
# Probe Configuration
readiness:
diff --git a/kubernetes/dcaegen2-services/components/dcae-son-handler/values.yaml b/kubernetes/dcaegen2-services/components/dcae-son-handler/values.yaml
index 94c4d880dd..a99623bc07 100644
--- a/kubernetes/dcaegen2-services/components/dcae-son-handler/values.yaml
+++ b/kubernetes/dcaegen2-services/components/dcae-son-handler/values.yaml
@@ -91,7 +91,6 @@ policies:
# Dependencies
readinessCheck:
wait_for:
- - dcae-config-binding-service
- aaf-cm
- &postgresName dcae-sonhms-postgres
diff --git a/kubernetes/dcaegen2-services/components/dcae-tcagen2/values.yaml b/kubernetes/dcaegen2-services/components/dcae-tcagen2/values.yaml
index a65fa7c347..cb03d89d25 100644
--- a/kubernetes/dcaegen2-services/components/dcae-tcagen2/values.yaml
+++ b/kubernetes/dcaegen2-services/components/dcae-tcagen2/values.yaml
@@ -71,7 +71,6 @@ secrets:
# dependencies
readinessCheck:
wait_for:
- - dcae-config-binding-service
- aaf-cm
# probe configuration
diff --git a/kubernetes/dcaegen2-services/components/dcae-ves-collector/values.yaml b/kubernetes/dcaegen2-services/components/dcae-ves-collector/values.yaml
index 508cea4766..13b71ec44d 100644
--- a/kubernetes/dcaegen2-services/components/dcae-ves-collector/values.yaml
+++ b/kubernetes/dcaegen2-services/components/dcae-ves-collector/values.yaml
@@ -1,7 +1,7 @@
#============LICENSE_START========================================================
# ================================================================================
# Copyright (c) 2021 J. F. Lucas. All rights reserved.
-# Copyright (c) 2021 Nokia. All rights reserved.
+# Copyright (c) 2021-2022 Nokia. All rights reserved.
# Copyright (c) 2022 AT&T Intellectual Property. All rights reserved.
# ================================================================================
# Licensed under the Apache License, Version 2.0 (the "License");
@@ -43,7 +43,7 @@ certPostProcessorImage: onap/org.onap.oom.platform.cert-service.oom-certservice-
# Application configuration defaults.
#################################################################
# application image
-image: onap/org.onap.dcaegen2.collectors.ves.vescollector:1.10.3
+image: onap/org.onap.dcaegen2.collectors.ves.vescollector:1.11.0
pullPolicy: Always
# log directory where logging sidecar should look for log files
@@ -87,7 +87,6 @@ certificates:
# dependencies
readinessCheck:
wait_for:
- - dcae-config-binding-service
- aaf-cm
# probe configuration
diff --git a/kubernetes/dcaegen2-services/components/dcae-ves-mapper/values.yaml b/kubernetes/dcaegen2-services/components/dcae-ves-mapper/values.yaml
index d11f167acf..c9ee185984 100644
--- a/kubernetes/dcaegen2-services/components/dcae-ves-mapper/values.yaml
+++ b/kubernetes/dcaegen2-services/components/dcae-ves-mapper/values.yaml
@@ -40,7 +40,7 @@ consulLoaderImage: onap/org.onap.dcaegen2.deployments.consul-loader-container:1.
# Application Configuration Defaults.
#################################################################
# Application Image
-image: onap/org.onap.dcaegen2.services.mapper.vesadapter.universalvesadaptor:1.3.2
+image: onap/org.onap.dcaegen2.services.mapper.vesadapter.universalvesadaptor:1.3.3
pullPolicy: Always
# Log directory where logging sidecar should look for log files
@@ -62,7 +62,6 @@ logConfigMapNamePrefix: '{{ include "common.fullname" . }}'
# Dependencies
readinessCheck:
wait_for:
- - dcae-config-binding-service
- aaf-cm
# Service Configuration
@@ -77,6 +76,9 @@ service:
# application environments
applicationEnv:
LOG4J_FORMAT_MSG_NO_LOOKUPS: 'true'
+ CONFIG_BINDING_SERVICE_SERVICE_PORT: '10000' # Workaround until DCAEGEN2-3098 is addressed
+ CBS_CLIENT_CONFIG_PATH: '/app-config-input/application_config.yaml'
+
# Initial Application Configuration
applicationConfig: