diff options
| author |   Mandeep Khinda <Mandeep.Khinda@amdocs.com> | 2018-09-19 20:58:55 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2018-09-19 20:58:55 +0000 |
| commit | c95c60fd3489e4f9fedf42d3e471cbd2917e00db (patch) | |
| tree | 0ba2fd3e8b4ced2f3ec36c1efcf0780053efa50d /kubernetes/sdc/charts/sdc-es | |
| parent | de04571e73b2f11bede6da4caf8a579dca15946c (diff) | |
| parent | a93baa8493c317f7e371f75de13592a0cbb9fb5c (diff) | |
Merge "Resource Limits for sdc"
Diffstat (limited to 'kubernetes/sdc/charts/sdc-es')
| -rw-r--r-- | kubernetes/sdc/charts/sdc-es/templates/deployment.yaml | 12 | ||||
| -rw-r--r-- | kubernetes/sdc/charts/sdc-es/values.yaml | 37 |
2 files changed, 21 insertions, 28 deletions
diff --git a/kubernetes/sdc/charts/sdc-es/templates/deployment.yaml b/kubernetes/sdc/charts/sdc-es/templates/deployment.yaml index fb7c4cfb32..9fd394b71e 100644 --- a/kubernetes/sdc/charts/sdc-es/templates/deployment.yaml +++ b/kubernetes/sdc/charts/sdc-es/templates/deployment.yaml @@ -52,6 +52,8 @@ spec: scheme: HTTP initialDelaySeconds: {{ .Values.readiness.initialDelaySeconds }} periodSeconds: {{ .Values.readiness.periodSeconds }} + resources: +{{ toYaml (pluck .Values.flavor .Values.resources| first) | indent 12 }} env: - name: ENVNAME value: {{ .Values.global.env.name }} @@ -71,16 +73,6 @@ spec: readOnly: true - name: {{ include "common.fullname" . }}-data mountPath: /usr/share/elasticsearch/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: {{ include "common.fullname" . }}-localtime hostPath: diff --git a/kubernetes/sdc/charts/sdc-es/values.yaml b/kubernetes/sdc/charts/sdc-es/values.yaml index a966f68d83..f0beda9e5c 100644 --- a/kubernetes/sdc/charts/sdc-es/values.yaml +++ b/kubernetes/sdc/charts/sdc-es/values.yaml @@ -97,21 +97,22 @@ persistence: 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: 10m + memory: 1Gi + large: + limits: + cpu: 2 + memory: 8Gi + requests: + cpu: 20m + memory: 2Gi + |