From: Borislav Glozman <Borislav.Glozman@amdocs.com>
Date: Wed, 6 Jun 2018 14:48:28 +0000 (+0000)
Subject: Merge "Fix OOM settings"
X-Git-Tag: 2.0.0-ONAP~13
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=fa0c5c638094208463a4484f38196ad2934cd7e9;hp=-c;p=oom.git

Merge "Fix OOM settings"
---

fa0c5c638094208463a4484f38196ad2934cd7e9
diff --combined kubernetes/clamp/values.yaml
index 8595922090,79781bff8d..86c55df3bd
--- a/kubernetes/clamp/values.yaml
+++ b/kubernetes/clamp/values.yaml
@@@ -27,7 -27,7 +27,7 @@@ subChartsOnly
  
  # application image
  repository: nexus3.onap.org:10001
 -image: onap/clamp:2.0-STAGING-latest
 +image: onap/clamp:2.0.2
  pullPolicy: Always
  
  # flag to enable debugging - application support required
@@@ -37,9 -37,6 +37,9 @@@ debugEnabled: fals
  # Application configuration defaults.
  #################################################################
  config:
 +  log:
 +    logstashServiceName: log-ls
 +    logstashPort: 5044
    mysqlPassword: strong_pitchou
    dataRootDir: /dockerdata-nfs
    springApplicationJson: >
@@@ -94,7 -91,7 +94,7 @@@ service
  ingress:
    enabled: false
  
- resources: {}
+ #resources: {}
    # We usually recommend not to specify default resources and to leave this as a conscious
    # choice for the user. This also increases chances charts run on environments with little
    # resources, such as Minikube. If you do want to specify resources, uncomment the following
@@@ -105,10 -102,10 +105,10 @@@
    # ref: http://kubernetes.io/docs/user-guide/compute-resources/
    # Minimum memory for development is 2 CPU cores and 4GB memory
    # Minimum memory for production is 4 CPU cores and 8GB memory
- #resources:
- #  limits:
- #    cpu: 2
- #    memory: 4Gi
- #  requests:
- #    cpu: 2
- #    memory: 4Gi
+ resources:
+   limits:
+     cpu: 1
+     memory: 1.2Gi
+   requests:
+     cpu: 10m
+     memory: 800Mi