diff options
author | Alexis de Talhouƫt <alexis.de_talhouet@bell.ca> | 2018-10-24 21:04:18 +0000 |
---|---|---|
committer | Gerrit Code Review <gerrit@onap.org> | 2018-10-24 21:04:18 +0000 |
commit | 4d5a96331a9ca22b152bf20c121a572c8235fe69 (patch) | |
tree | 58551122b406a05c1dbf0f8f8cc176284f4d1bff /kubernetes/pomba/charts/pomba-search-data | |
parent | cf7dd544779197b91ed9a973cba3843b30809caa (diff) | |
parent | af645b57657cdfba0ed9e6167bf74ed17e6e21d1 (diff) |
Merge "Add missing resource limits to POMBA pods"
Diffstat (limited to 'kubernetes/pomba/charts/pomba-search-data')
-rw-r--r-- | kubernetes/pomba/charts/pomba-search-data/templates/deployment.yaml | 15 | ||||
-rw-r--r-- | kubernetes/pomba/charts/pomba-search-data/values.yaml | 37 |
2 files changed, 34 insertions, 18 deletions
diff --git a/kubernetes/pomba/charts/pomba-search-data/templates/deployment.yaml b/kubernetes/pomba/charts/pomba-search-data/templates/deployment.yaml index fd03c6c92d..0a81e2615d 100644 --- a/kubernetes/pomba/charts/pomba-search-data/templates/deployment.yaml +++ b/kubernetes/pomba/charts/pomba-search-data/templates/deployment.yaml @@ -34,6 +34,21 @@ spec: release: {{ .Release.Name }} name: {{ include "common.name" . }} spec: + initContainers: + - command: + - /root/ready.py + args: + - --container-name + - pomba-elasticsearch + env: + - name: NAMESPACE + valueFrom: + fieldRef: + apiVersion: v1 + fieldPath: metadata.namespace + image: "{{ .Values.global.readinessRepository }}/{{ .Values.global.readinessImage }}" + imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }} + name: {{ include "common.name" . }}-readiness containers: - name: {{ include "common.name" . }} image: "{{ include "common.repository" . }}/{{ .Values.image }}" diff --git a/kubernetes/pomba/charts/pomba-search-data/values.yaml b/kubernetes/pomba/charts/pomba-search-data/values.yaml index 7c96127932..6a3659e82d 100644 --- a/kubernetes/pomba/charts/pomba-search-data/values.yaml +++ b/kubernetes/pomba/charts/pomba-search-data/values.yaml @@ -47,21 +47,22 @@ 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: 1800Mi + requests: + cpu: 50m + memory: 900Mi + large: + limits: + cpu: 2 + memory: 3600Mi + requests: + cpu: 100m + memory: 1800Mi + unlimited: {}
\ No newline at end of file |