diff options
| author |   Mandeep Khinda <Mandeep.Khinda@amdocs.com> | 2018-09-19 14:19:04 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2018-09-19 14:19:04 +0000 |
| commit | 2fdf3a77b78c30214e6f8cbfd4363eab997f9497 (patch) | |
| tree | 0c156e2f102cfb4eca86a002ad1d37316eb95c94 | |
| parent | 800e00ec2c466c9242c2ee67775126fc7d7527b3 (diff) | |
| parent | 0e89201bb34d95d41ec4aac6ace92e7228728b73 (diff) | |
Merge "Add resource limit for aai"
| -rw-r--r-- | kubernetes/aai/templates/deployment.yaml | 2 | ||||
| -rw-r--r-- | kubernetes/aai/values.yaml | 25 |
2 files changed, 18 insertions, 9 deletions
diff --git a/kubernetes/aai/templates/deployment.yaml b/kubernetes/aai/templates/deployment.yaml index dc65cef187..17ba83b8d7 100644 --- a/kubernetes/aai/templates/deployment.yaml +++ b/kubernetes/aai/templates/deployment.yaml @@ -80,7 +80,7 @@ spec: initialDelaySeconds: {{ .Values.readiness.initialDelaySeconds }} periodSeconds: {{ .Values.readiness.periodSeconds }} resources: -{{ toYaml .Values.resources | indent 12 }} +{{ toYaml (pluck .Values.flavor .Values.resources| first) | indent 12 }} {{- if .Values.nodeSelector }} nodeSelector: {{ toYaml .Values.nodeSelector | indent 10 }} diff --git a/kubernetes/aai/values.yaml b/kubernetes/aai/values.yaml index 99699a0031..25f8ddf55b 100644 --- a/kubernetes/aai/values.yaml +++ b/kubernetes/aai/values.yaml @@ -196,6 +196,8 @@ dockerhubRepository: registry.hub.docker.com image: aaionap/haproxy:1.2.4 pullPolicy: Always +flavor: small + # flag to enable debugging - application support required debugEnabled: false @@ -240,7 +242,6 @@ service: ingress: enabled: false -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 @@ -251,10 +252,18 @@ resources: {} # 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
\ No newline at end of file +resources: + small: + limits: + cpu: 2 + memory: 4Gi + requests: + cpu: 2 + memory: 4Gi + large: + limits: + cpu: 4 + memory: 8Gi + requests: + cpu: 4 + memory: 8Gi |