From: Alexis de Talhouët <alexis.de_talhouet@bell.ca>
Date: Fri, 7 Dec 2018 18:13:18 +0000 (+0000)
Subject: Merge "Add Pluggable Security to aai-resources"
X-Git-Tag: 4.0.0-ONAP~453
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=ce182d7d9d71696a3b062643492d4b0be5f98f69;hp=-c;p=oom.git

Merge "Add Pluggable Security to aai-resources"
---

ce182d7d9d71696a3b062643492d4b0be5f98f69
diff --combined kubernetes/aai/charts/aai-resources/values.yaml
index 25aac6174f,3fd5a89a98..e0a1156461
--- a/kubernetes/aai/charts/aai-resources/values.yaml
+++ b/kubernetes/aai/charts/aai-resources/values.yaml
@@@ -68,6 -68,11 +68,11 @@@ readiness
    initialDelaySeconds: 60
    periodSeconds: 10
  
+ # application configuration
+ sidecar:
+   keyStorePassword: OBF:1y0q1uvc1uum1uvg1pil1pjl1uuq1uvk1uuu1y10
+   keyManagerPassword: OBF:1y0q1uvc1uum1uvg1pil1pjl1uuq1uvk1uuu1y10
+   trustStorePassword: OBF:1y0q1uvc1uum1uvg1pil1pjl1uuq1uvk1uuu1y10
  
  service:
    type: ClusterIP
@@@ -102,13 -107,13 +107,13 @@@ resources
        cpu: 2
        memory: 4Gi
      requests:
 -      cpu: 2
 -      memory: 4Gi
 +      cpu: 1
 +      memory: 3Gi
    large:
      limits:
        cpu: 4
        memory: 8Gi
      requests:
 -      cpu: 4
 -      memory: 8Gi
 +      cpu: 2
 +      memory: 4Gi
    unlimited: {}