diff options
author | Mandeep Khinda <Mandeep.Khinda@amdocs.com> | 2018-09-19 14:42:13 +0000 |
---|---|---|
committer | Gerrit Code Review <gerrit@onap.org> | 2018-09-19 14:42:13 +0000 |
commit | 0e8836a0ba8bc0327a2513e8572c0ea351404576 (patch) | |
tree | 05131c55f5dbcc3c2b6c7d4a88361d8aa1e7af89 /kubernetes/nbi | |
parent | 7a745ca1374365854a8d69b1bdf2f24c1e472f3e (diff) | |
parent | 659fbae6b585913e892e077312d418f3cb954e64 (diff) |
Merge "Resource Limit for LOG"
Diffstat (limited to 'kubernetes/nbi')
-rw-r--r-- | kubernetes/nbi/charts/mariadb/templates/deployment.yaml | 2 | ||||
-rw-r--r-- | kubernetes/nbi/charts/mariadb/values.yaml | 19 | ||||
-rw-r--r-- | kubernetes/nbi/templates/deployment.yaml | 2 | ||||
-rw-r--r-- | kubernetes/nbi/values.yaml | 14 |
4 files changed, 32 insertions, 5 deletions
diff --git a/kubernetes/nbi/charts/mariadb/templates/deployment.yaml b/kubernetes/nbi/charts/mariadb/templates/deployment.yaml index 2d642e6d9d..fee00bafba 100644 --- a/kubernetes/nbi/charts/mariadb/templates/deployment.yaml +++ b/kubernetes/nbi/charts/mariadb/templates/deployment.yaml @@ -75,7 +75,7 @@ spec: - mountPath: /var/lib/mysql name: mariadb-data 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/nbi/charts/mariadb/values.yaml b/kubernetes/nbi/charts/mariadb/values.yaml index 773e6415bc..db8ea8ad12 100644 --- a/kubernetes/nbi/charts/mariadb/values.yaml +++ b/kubernetes/nbi/charts/mariadb/values.yaml @@ -75,4 +75,21 @@ service: ingress: enabled: false -resources: {} +# Resource Limit flavor +flavor: small +resources: + small: + limits: + cpu: 2 + memory: 4Gi + requests: + cpu: 2 + memory: 4Gi + large: + limits: + cpu: 4 + memory: 8Gi + requests: + cpu: 4 + memory: 8Gi + diff --git a/kubernetes/nbi/templates/deployment.yaml b/kubernetes/nbi/templates/deployment.yaml index 30e6572c27..a7be329238 100644 --- a/kubernetes/nbi/templates/deployment.yaml +++ b/kubernetes/nbi/templates/deployment.yaml @@ -105,7 +105,7 @@ spec: name: localtime readOnly: true 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/nbi/values.yaml b/kubernetes/nbi/values.yaml index f37e8182be..8b9b238896 100644 --- a/kubernetes/nbi/values.yaml +++ b/kubernetes/nbi/values.yaml @@ -103,11 +103,21 @@ service: ingress: enabled: false - +# Resource Limit flavor -By Default using small +flavor: small +# Segregation for Different environment (Small and Large) resources: - limits: + small: + limits: cpu: 1 memory: 2Gi requests: cpu: 100m memory: 1Gi + large: + limits: + cpu: 2 + memory: 4Gi + requests: + cpu: 200m + memory: 2Gi
\ No newline at end of file |