diff options
| author |   Sylvain Desbureaux <sylvain.desbureaux@orange.com> | 2021-09-14 06:37:55 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2021-09-14 06:37:55 +0000 |
| commit | e37bb050eac61f3907ac815f79bc404e0da3f7d2 (patch) | |
| tree | 2234db43ceea6f2411de7c0be4e8fea158747a72 | |
| parent | 87dae61caeedd4d79d8b6a10e18f7fd0fb811e38 (diff) | |
| parent | 71129595a731fa0a792832860cd32d17eda02cef (diff) | |
Merge "[DCAE] Update DFC to version 1.6.1"
| -rw-r--r-- | kubernetes/dcaegen2-services/components/dcae-datafile-collector/values.yaml | 8 | ||||
| -rw-r--r-- | kubernetes/dcaegen2-services/components/dcae-prh/values.yaml | 2 |
2 files changed, 7 insertions, 3 deletions
diff --git a/kubernetes/dcaegen2-services/components/dcae-datafile-collector/values.yaml b/kubernetes/dcaegen2-services/components/dcae-datafile-collector/values.yaml index 670e6c17dc..be7620733b 100644 --- a/kubernetes/dcaegen2-services/components/dcae-datafile-collector/values.yaml +++ b/kubernetes/dcaegen2-services/components/dcae-datafile-collector/values.yaml @@ -40,7 +40,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.0 +image: onap/org.onap.dcaegen2.collectors.datafile.datafile-app-server:1.6.1 pullPolicy: Always # Log directory where logging sidecar should look for log files @@ -106,6 +106,12 @@ 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: '' + # Initial Application Configuration applicationConfig: dmaap.certificateConfig.keyCert: /opt/app/datafile/etc/cert/cert.p12 diff --git a/kubernetes/dcaegen2-services/components/dcae-prh/values.yaml b/kubernetes/dcaegen2-services/components/dcae-prh/values.yaml index 3fa5faf8c5..c7d4c1d82f 100644 --- a/kubernetes/dcaegen2-services/components/dcae-prh/values.yaml +++ b/kubernetes/dcaegen2-services/components/dcae-prh/values.yaml @@ -101,8 +101,6 @@ customEnvVars: value: "Basic `echo -n ${AAI_USER}:${AAI_PASSWORD} | base64`" # initial application configuration -# Configuration used for in-app substitution must be defined as $${undefined}{<parameter>} under applicationConfig -# inorder to get ${<parameter>} post envsubst (done part of dcae helm service-common templates) applicationConfig: dmaap.dmaapConsumerConfiguration.dmaapContentType: "application/json" dmaap.dmaapConsumerConfiguration.consumerId: "c12" |