From 5a7fbeed35622045afb31de494cb42e83f85821b Mon Sep 17 00:00:00 2001 From: rope252 Date: Mon, 25 Jul 2022 20:00:36 +0100 Subject: [DCAE] DCAEGEN2-Services Service Mesh Patch Service Mesh patch for DCAE, changing port names to http. Remove aaf-cm readiness check, set tlsServer to false (excluding restconf) Added environment variables to pods to solve CBS problems Disable VES authentcation in SM override Change-Id: I42a12912f471d89bd4ebc6181f5454140e54a605 Issue-ID: OOM-2820 Issue-ID: DCAEGEN2-3277 Signed-off-by: rope252 Signed-off-by: Vijay Venkatesh Kumar --- .../components/dcae-hv-ves-collector/Chart.yaml | 3 --- .../components/dcae-hv-ves-collector/values.yaml | 9 ++++----- 2 files changed, 4 insertions(+), 8 deletions(-) (limited to 'kubernetes/dcaegen2-services/components/dcae-hv-ves-collector') diff --git a/kubernetes/dcaegen2-services/components/dcae-hv-ves-collector/Chart.yaml b/kubernetes/dcaegen2-services/components/dcae-hv-ves-collector/Chart.yaml index 0c9732a242..162b624397 100644 --- a/kubernetes/dcaegen2-services/components/dcae-hv-ves-collector/Chart.yaml +++ b/kubernetes/dcaegen2-services/components/dcae-hv-ves-collector/Chart.yaml @@ -30,9 +30,6 @@ dependencies: - name: repositoryGenerator version: ~11.x-0 repository: '@local' - - name: readinessCheck - version: ~11.x-0 - repository: '@local' - name: dcaegen2-services-common version: ~11.x-0 repository: '@local' 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 9beef813f8..5d04aff9c8 100644 --- a/kubernetes/dcaegen2-services/components/dcae-hv-ves-collector/values.yaml +++ b/kubernetes/dcaegen2-services/components/dcae-hv-ves-collector/values.yaml @@ -59,7 +59,7 @@ certDirectory: /etc/ves-hv/ssl # TLS role -- set to true if microservice acts as server # If true, an init container will retrieve a server cert # and key from AAF and mount them in certDirectory. -tlsServer: true +tlsServer: false secrets: - uid: hv-ves-kafka-secret @@ -95,9 +95,6 @@ certificates: create: true # dependencies -readinessCheck: - wait_for: - - aaf-cm # probe configuration readiness: @@ -136,7 +133,7 @@ applicationConfig: server.idleTimeoutSec: 300 server.listenPort: 6061 cbs.requestIntervalSec: 5 - security.sslDisable: false + security.sslDisable: true security.keys.keyStoreFile: /etc/ves-hv/ssl/cert.jks security.keys.keyStorePasswordFile: /etc/ves-hv/ssl/jks.pass security.keys.trustStoreFile: /etc/ves-hv/ssl/trust.jks @@ -171,6 +168,8 @@ applicationConfig: applicationEnv: JAVA_OPTS: '-Dlogback.configurationFile=/etc/ONAP/dcae-hv-ves-collector/logback.xml' CBS_CLIENT_CONFIG_PATH: '/app-config-input/application_config.yaml' + #Temporary Dummy CBS Port Value until internal SDK library is updated + CONFIG_BINDING_SERVICE_SERVICE_PORT: '0000' KAFKA_BOOTSTRAP_SERVERS: '{{ include "common.release" . }}-strimzi-kafka-bootstrap:9092' USE_SCRAM: 'true' JAAS_CONFIG: -- cgit 1.2.3-korg