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-data-router | |
| parent | cf7dd544779197b91ed9a973cba3843b30809caa (diff) | |
| parent | af645b57657cdfba0ed9e6167bf74ed17e6e21d1 (diff) | |
Merge "Add missing resource limits to POMBA pods"
Diffstat (limited to 'kubernetes/pomba/charts/pomba-data-router')
| -rw-r--r-- | kubernetes/pomba/charts/pomba-data-router/templates/deployment.yaml | 14 | ||||
| -rw-r--r-- | kubernetes/pomba/charts/pomba-data-router/values.yaml | 41 |
2 files changed, 36 insertions, 19 deletions
diff --git a/kubernetes/pomba/charts/pomba-data-router/templates/deployment.yaml b/kubernetes/pomba/charts/pomba-data-router/templates/deployment.yaml index ce62679ee0..3244a74f1f 100644 --- a/kubernetes/pomba/charts/pomba-data-router/templates/deployment.yaml +++ b/kubernetes/pomba/charts/pomba-data-router/templates/deployment.yaml @@ -36,6 +36,20 @@ spec: spec: initContainers: - command: + - /root/ready.py + args: + - --container-name + - pomba-search-data + 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 + - command: - /bin/sh - -c - | diff --git a/kubernetes/pomba/charts/pomba-data-router/values.yaml b/kubernetes/pomba/charts/pomba-data-router/values.yaml index 27d0d2a696..ff7f8a5ee5 100644 --- a/kubernetes/pomba/charts/pomba-data-router/values.yaml +++ b/kubernetes/pomba/charts/pomba-data-router/values.yaml @@ -22,7 +22,9 @@ global: nodePortPrefix: 302 persistence: {} - + readinessRepository: oomk8s + readinessImage: readiness-check:2.0.0 + # application image repository: nexus3.onap.org:10001 image: onap/data-router:1.3.0 @@ -91,21 +93,22 @@ persistence: mountPath: /dockerdata-nfs mountSubPath: pomba/data-router/logs -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: 1400Mi + requests: + cpu: 100m + memory: 700Mi + large: + limits: + cpu: 2 + memory: 2800Mi + requests: + cpu: 200m + memory: 1400Mi + unlimited: {} |