diff options
author | Mandeep Khinda <Mandeep.Khinda@amdocs.com> | 2018-09-12 14:14:31 +0000 |
---|---|---|
committer | Gerrit Code Review <gerrit@onap.org> | 2018-09-12 14:14:31 +0000 |
commit | 37fc0875f12b54f3992160f99eb136b0134ad79e (patch) | |
tree | 7546be61508ecade50d4e553cd56f5a68c52cc5e /kubernetes/so/charts/so-openstack-adapter | |
parent | a0c3957605b630477d77deb9dd2bfe856cf109be (diff) | |
parent | 0da8829497597e0472c3ce08af3ea59d65a60f5b (diff) |
Merge "Flavors defintion in resource limit"
Diffstat (limited to 'kubernetes/so/charts/so-openstack-adapter')
-rwxr-xr-x | kubernetes/so/charts/so-openstack-adapter/templates/deployment.yaml | 9 | ||||
-rwxr-xr-x | kubernetes/so/charts/so-openstack-adapter/values.yaml | 15 |
2 files changed, 15 insertions, 9 deletions
diff --git a/kubernetes/so/charts/so-openstack-adapter/templates/deployment.yaml b/kubernetes/so/charts/so-openstack-adapter/templates/deployment.yaml index d235545aa3..a69c189c5b 100755 --- a/kubernetes/so/charts/so-openstack-adapter/templates/deployment.yaml +++ b/kubernetes/so/charts/so-openstack-adapter/templates/deployment.yaml @@ -47,12 +47,7 @@ spec: - name: {{ include "common.name" . }} image: {{ include "common.repository" . }}/{{ .Values.image }} resources: - requests: - memory: {{ index .Values.resources.requests.memory}} - cpu: {{ index .Values.resources.requests.cpu}} - limits: - memory: {{ index .Values.resources.limits.memory}} - cpu: {{ index .Values.resources.limits.cpu}} +{{ toYaml (pluck .Values.flavor .Values.resources| first) | indent 12 }} env: - name: DB_HOST valueFrom: @@ -141,4 +136,4 @@ spec: configMap: name: {{ include "common.fullname" . }}-app-configmap imagePullSecrets: - - name: "{{ include "common.namespace" . }}-docker-registry-key"
\ No newline at end of file + - name: "{{ include "common.namespace" . }}-docker-registry-key" diff --git a/kubernetes/so/charts/so-openstack-adapter/values.yaml b/kubernetes/so/charts/so-openstack-adapter/values.yaml index c90b931bca..f5b993120d 100755 --- a/kubernetes/so/charts/so-openstack-adapter/values.yaml +++ b/kubernetes/so/charts/so-openstack-adapter/values.yaml @@ -27,13 +27,24 @@ updateStrategy: type: RollingUpdate maxUnavailable: 1 maxSurge: 1 +# Resource Limit flavor -By Default using small +flavor: small +# Segregation for Different environment (Small and Large) resources: + small: + limits: + memory: 4Gi + cpu: 2000m requests: memory: 1Gi cpu: 500m + large: limits: - memory: 4Gi - cpu: 2000m + memory: 8Gi + cpu: 4000m + requests: + memory: 2Gi + cpu: 1000m livenessProbe: path: /manage/health port: 8087 |