summaryrefslogtreecommitdiffstats
path: root/kubernetes
diff options
context:
space:
mode:
authorvaibhavjayas <vaibhav.jayas@amdocs.com>2018-09-19 09:33:41 +0000
committervaibhavjayas <vaibhav.jayas@amdocs.com>2018-09-19 09:35:26 +0000
commitafb925dceb213156e2cd7909815cef3332b041ed (patch)
treeb64be5c9aa647a4364aeedb86c7985c375f122d7 /kubernetes
parentc196546bae5346d162b3fb20de96d9df8fe260ca (diff)
Resource Limit for VID
Issue-ID: OOM-1167 Change-Id: Ib598b25bbf8fbda5b0fb41e3dfaf13dd7a31bd6c Signed-off-by: vaibhavjayas <vaibhav.jayas@amdocs.com>
Diffstat (limited to 'kubernetes')
-rw-r--r--kubernetes/vid/charts/vid-mariadb-galera/templates/statefulset.yaml2
-rw-r--r--kubernetes/vid/charts/vid-mariadb-galera/values.yaml35
-rw-r--r--kubernetes/vid/templates/deployment.yaml2
-rw-r--r--kubernetes/vid/values.yaml36
4 files changed, 37 insertions, 38 deletions
diff --git a/kubernetes/vid/charts/vid-mariadb-galera/templates/statefulset.yaml b/kubernetes/vid/charts/vid-mariadb-galera/templates/statefulset.yaml
index 816d473257..8ddcb4a69d 100644
--- a/kubernetes/vid/charts/vid-mariadb-galera/templates/statefulset.yaml
+++ b/kubernetes/vid/charts/vid-mariadb-galera/templates/statefulset.yaml
@@ -97,7 +97,7 @@ spec:
timeoutSeconds: {{ .Values.liveness.timeoutSeconds }}
{{- end }}
resources:
-{{ toYaml .Values.resources | indent 12 }}
+{{ toYaml (pluck .Values.flavor .Values.resources| first) | indent 12 }}
volumeMounts:
{{- if .Values.externalConfig }}
- mountPath: /etc/config
diff --git a/kubernetes/vid/charts/vid-mariadb-galera/values.yaml b/kubernetes/vid/charts/vid-mariadb-galera/values.yaml
index e9464b69ee..22b4397f90 100644
--- a/kubernetes/vid/charts/vid-mariadb-galera/values.yaml
+++ b/kubernetes/vid/charts/vid-mariadb-galera/values.yaml
@@ -106,25 +106,24 @@ ingress:
#externalConfig: {}
externalConfig: |-
lower_case_table_names = 1
-#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
- # lines, adjust them as necessary, and remove the curly braces after 'resources:'.
- #
- # Example:
- # Configure resource requests and limits
- # 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
+# Resource Limit flavor -By Default using small
+flavor: small
+# Segregation for Different environment (Small and Large)
resources:
- limits:
- cpu: 2
- memory: 4Gi
- requests:
- cpu: 2
- memory: 4Gi
-
+ small:
+ limits:
+ cpu: 10m
+ memory: 1Gi
+ requests:
+ cpu: 10m
+ memory: 1Gi
+ large:
+ limits:
+ cpu: 20m
+ memory: 2Gi
+ requests:
+ cpu: 20m
+ memory: 2Gi
# Name for mariadb-galera cluster - should be unique accross all projects or other clusters
nameOverride: vid-mariadb-galera
diff --git a/kubernetes/vid/templates/deployment.yaml b/kubernetes/vid/templates/deployment.yaml
index 5cd4f38331..9b9ee8d81f 100644
--- a/kubernetes/vid/templates/deployment.yaml
+++ b/kubernetes/vid/templates/deployment.yaml
@@ -118,7 +118,7 @@ spec:
name: vid-logback
subPath: logback.xml
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/vid/values.yaml b/kubernetes/vid/values.yaml
index 34a265c656..23812c9b48 100644
--- a/kubernetes/vid/values.yaml
+++ b/kubernetes/vid/values.yaml
@@ -91,21 +91,21 @@ 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
- # lines, adjust them as necessary, and remove the curly braces after 'resources:'.
- #
- # Example:
- # Configure resource requests and limits
- # 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
+# Resource Limit flavor -By Default using small
+flavor: small
+# Segregation for Different environment (Small and Large)
+resources:
+ small:
+ limits:
+ cpu: 20m
+ memory: 2Gi
+ requests:
+ cpu: 20m
+ memory: 2Gi
+ large:
+ limits:
+ cpu: 40m
+ memory: 4Gi
+ requests:
+ cpu: 40
+ memory: 4Gi \ No newline at end of file