diff options
| -rw-r--r-- | kubernetes/dcaegen2-services/components/dcae-prh/values.yaml | 4 | ||||
| -rw-r--r-- | kubernetes/dcaegen2/components/dcae-dashboard/values.yaml | 12 |
2 files changed, 9 insertions, 7 deletions
diff --git a/kubernetes/dcaegen2-services/components/dcae-prh/values.yaml b/kubernetes/dcaegen2-services/components/dcae-prh/values.yaml index d1f3f2a84a..5b608943ab 100644 --- a/kubernetes/dcaegen2-services/components/dcae-prh/values.yaml +++ b/kubernetes/dcaegen2-services/components/dcae-prh/values.yaml @@ -101,6 +101,8 @@ 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" @@ -118,7 +120,7 @@ applicationConfig: aai.aaiClientConfiguration.aaiIgnoreSslCertificateErrors: true aai.aaiClientConfiguration.aaiBasePath: "/aai/v12" aai.aaiClientConfiguration.aaiPnfPath: "/network/pnfs/pnf" - aai.aaiClientConfiguration.aaiServiceInstancePath: "/business/customers/customer/${customer}/service-subscriptions/service-subscription/${serviceType}/service-instances/service-instance/${serviceInstanceId}" + aai.aaiClientConfiguration.aaiServiceInstancePath: "/business/customers/customer/$${undefined}{customer}/service-subscriptions/service-subscription/$${undefined}{serviceType}/service-instances/service-instance/$${undefined}{serviceInstanceId}" aai.aaiClientConfiguration.aaiHeaders: X-FromAppId: "prh" X-TransactionId: "9999" diff --git a/kubernetes/dcaegen2/components/dcae-dashboard/values.yaml b/kubernetes/dcaegen2/components/dcae-dashboard/values.yaml index 83914d423c..6640f78e9a 100644 --- a/kubernetes/dcaegen2/components/dcae-dashboard/values.yaml +++ b/kubernetes/dcaegen2/components/dcae-dashboard/values.yaml @@ -53,7 +53,7 @@ config: # Application configuration defaults. ################################################################# # application image -image: onap/org.onap.ccsdk.dashboard.ccsdk-app-os:1.4.3 +image: onap/org.onap.ccsdk.dashboard.ccsdk-app-os:1.4.4 pullPolicy: Always # probe configuration parameters @@ -97,16 +97,16 @@ postgres: mountSubPath: dcae-dashboard/data mountInitPath: dcae-dashboard -# Resource Limit flavor -By Default using small +#Resource Limit flavor -By Default using small flavor: small -# Segregation for Different environment (Small and Large) +#Segregation for Different environment (Small and Large) resources: small: limits: - cpu: 4000m - memory: 4Gi + cpu: 2 + memory: 2Gi requests: - cpu: 1500m + cpu: 1 memory: 1Gi large: limits: |