summaryrefslogtreecommitdiffstats
path: root/kubernetes/log/charts/log-elasticsearch
diff options
context:
space:
mode:
authorvaibhavjayas <vaibhav.jayas@amdocs.com>2018-09-19 08:58:10 +0000
committervaibhavjayas <vaibhav.jayas@amdocs.com>2018-09-19 09:03:32 +0000
commit659fbae6b585913e892e077312d418f3cb954e64 (patch)
tree0cf44b70e498faa7446463b342e6c101ffc75cf8 /kubernetes/log/charts/log-elasticsearch
parentc196546bae5346d162b3fb20de96d9df8fe260ca (diff)
Resource Limit for LOG
Issue-ID: OOM-1153 Change-Id: Icd62d392b2e2a275a273b7f6260ad39d68987f50 Signed-off-by: vaibhavjayas <vaibhav.jayas@amdocs.com>
Diffstat (limited to 'kubernetes/log/charts/log-elasticsearch')
-rw-r--r--kubernetes/log/charts/log-elasticsearch/templates/deployment.yaml12
-rw-r--r--kubernetes/log/charts/log-elasticsearch/values.yaml36
2 files changed, 20 insertions, 28 deletions
diff --git a/kubernetes/log/charts/log-elasticsearch/templates/deployment.yaml b/kubernetes/log/charts/log-elasticsearch/templates/deployment.yaml
index 06e1b6b57d..5ff01b8274 100644
--- a/kubernetes/log/charts/log-elasticsearch/templates/deployment.yaml
+++ b/kubernetes/log/charts/log-elasticsearch/templates/deployment.yaml
@@ -59,6 +59,8 @@ spec:
- name: {{ include "common.name" . }}
image: "{{ .Values.global.loggingRepository | default .Values.loggingRepository }}/{{ .Values.image }}"
imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
+ resources:
+{{ toYaml (pluck .Values.flavor .Values.resources| first) | indent 12 }}
ports:
- containerPort: {{ .Values.service.internalPort }}
name: {{ .Values.service.name }}
@@ -88,16 +90,6 @@ spec:
subPath: elasticsearch.yml
- mountPath: /usr/share/elasticsearch/data/
name: {{ include "common.fullname" . }}-data
- resources:
-{{ toYaml .Values.resources | indent 12 }}
- {{- if .Values.nodeSelector }}
- nodeSelector:
-{{ toYaml .Values.nodeSelector | indent 10 }}
- {{- end -}}
- {{- if .Values.affinity }}
- affinity:
-{{ toYaml .Values.affinity | indent 10 }}
- {{- end }}
volumes:
- name: localtime
hostPath:
diff --git a/kubernetes/log/charts/log-elasticsearch/values.yaml b/kubernetes/log/charts/log-elasticsearch/values.yaml
index 235c319b72..e39ba9ed7a 100644
--- a/kubernetes/log/charts/log-elasticsearch/values.yaml
+++ b/kubernetes/log/charts/log-elasticsearch/values.yaml
@@ -95,21 +95,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: 1
+ memory: 4Gi
+ requests:
+ cpu: 1
+ memory: 4Gi
+ large:
+ limits:
+ cpu: 2
+ memory: 8Gi
+ requests:
+ cpu: 2
+ memory: 8Gi \ No newline at end of file