commit 1c9eb31cb63299804dd5bd91a25126b7f8debc39
author Alexis de Talhouët <alexis.de_talhouet@bell.ca> Mon Oct 01 19:18:33 2018 +0000
committer Gerrit Code Review <gerrit@onap.org> Mon Oct 01 19:18:33 2018 +0000
tree 975d204d3388184feccd7c0ab9c83700d555ca30
parent 9b2d72b721d3882ee7ef4523ec0c2057fd07e33e
parent e6adf04ad103a8f670116d0f5b52e0694a3a931b

Merge "Make AAF install credentials, the default"

kubernetes/dcaegen2/charts/dcae-bootstrap/resources/inputs/k8s-datafile-collector-inputs.yaml

diff --git a/kubernetes/dcaegen2/charts/dcae-bootstrap/resources/inputs/k8s-datafile-collector-input.yaml b/kubernetes/dcaegen2/charts/dcae-bootstrap/resources/inputs/k8s-datafile-collector-inputs.yaml
similarity index 100%
rename from kubernetes/dcaegen2/charts/dcae-bootstrap/resources/inputs/k8s-datafile-collector-input.yaml
rename to kubernetes/dcaegen2/charts/dcae-bootstrap/resources/inputs/k8s-datafile-collector-inputs.yaml

kubernetes/nbi/charts/mariadb/values.yaml

diff --git a/kubernetes/nbi/charts/mariadb/values.yaml b/kubernetes/nbi/charts/mariadb/values.yaml
index dd93b92..dc5aa89 100644
--- a/kubernetes/nbi/charts/mariadb/values.yaml
+++ b/kubernetes/nbi/charts/mariadb/values.yaml
@@ -80,16 +80,16 @@
 resources:
   small:
     limits:
-      cpu: 2
-      memory: 4Gi
-    requests:
       cpu: 1
-      memory: 2Gi
+      memory: 500Mi
+    requests:
+      cpu: 10m
+      memory: 200Mi
   large:
     limits:
-      cpu: 4
-      memory: 8Gi
+      cpu: 1
+      memory: 1Gi
     requests:
-      cpu: 2
-      memory: 4Gi
+      cpu: 20m
+      memory: 400Mi
   unlimited: {}