summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSylvain Desbureaux <sylvain.desbureaux@orange.com>2019-10-29 18:00:15 +0100
committerSylvain Desbureaux <sylvain.desbureaux@orange.com>2019-10-29 18:00:15 +0100
commit5ad860d4543687809f5650894def72b0532e0824 (patch)
tree066721825fd5b94eab252827ceab1829f7d56abe
parentb6ebe18c6bab9c30311400a16aae99c259a4f0f9 (diff)
[Music] Adjust Pods Requests/Limits
I've adjusted the Requests / Limits of portal pods according to real usage of "Orange Openlab" and "Onap daily master". Calculation is the following: per deployment: * CPU/Mem requests is max of average from the two deployments * CPU/Mem limits is (max of max from the two deployments) * 1.2 Change-Id: I3fce54e6be495a7014bf346d66721976fa2dab8b Issue-ID: MUSIC-533 Signed-off-by: Sylvain Desbureaux <sylvain.desbureaux@orange.com>
-rw-r--r--kubernetes/common/music/charts/music-cassandra/templates/statefulset.yaml2
-rw-r--r--kubernetes/common/music/charts/music-cassandra/values.yaml24
-rwxr-xr-xkubernetes/common/music/charts/music-tomcat/templates/deployment.yaml4
-rwxr-xr-xkubernetes/common/music/charts/music-tomcat/values.yaml27
-rw-r--r--kubernetes/common/music/charts/zookeeper/values.yaml16
-rw-r--r--kubernetes/portal/charts/portal-cassandra/templates/deployment.yaml2
6 files changed, 49 insertions, 26 deletions
diff --git a/kubernetes/common/music/charts/music-cassandra/templates/statefulset.yaml b/kubernetes/common/music/charts/music-cassandra/templates/statefulset.yaml
index ae5f7c5a81..514bccc785 100644
--- a/kubernetes/common/music/charts/music-cassandra/templates/statefulset.yaml
+++ b/kubernetes/common/music/charts/music-cassandra/templates/statefulset.yaml
@@ -106,7 +106,7 @@ spec:
- name: {{ template "common.name" . }}-data
mountPath: /var/lib/cassandra
resources:
-{{ toYaml .Values.resources | indent 10 }}
+{{ include "common.resources" . | indent 12 }}
volumes:
- name: localtime
hostPath:
diff --git a/kubernetes/common/music/charts/music-cassandra/values.yaml b/kubernetes/common/music/charts/music-cassandra/values.yaml
index d18dc68e67..f0888c12e6 100644
--- a/kubernetes/common/music/charts/music-cassandra/values.yaml
+++ b/kubernetes/common/music/charts/music-cassandra/values.yaml
@@ -110,10 +110,22 @@ persistence:
storageType: local
storageClass: ""
+# Resource Limit flavor -By Default using small
+flavor: small
+# Segregation for Different environment (Small and Large)
resources:
- limits:
- cpu: 4
- memory: 8Gi
- requests:
- cpu: 2
- memory: 4Gi
+ small:
+ limits:
+ cpu: 500m
+ memory: 1.2Gi
+ requests:
+ cpu: 160m
+ memory: 900Mi
+ large:
+ limits:
+ cpu: 4
+ memory: 10Gi
+ requests:
+ cpu: 2
+ memory: 6Gi
+ unlimited: {}
diff --git a/kubernetes/common/music/charts/music-tomcat/templates/deployment.yaml b/kubernetes/common/music/charts/music-tomcat/templates/deployment.yaml
index 2e04b15561..2a38a6aad0 100755
--- a/kubernetes/common/music/charts/music-tomcat/templates/deployment.yaml
+++ b/kubernetes/common/music/charts/music-tomcat/templates/deployment.yaml
@@ -40,7 +40,7 @@ spec:
- /root/ready.py
args:
- --container-name
- - zookeeper
+ - zookeeper
env:
- name: NAMESPACE
valueFrom:
@@ -101,7 +101,7 @@ spec:
mountPath: /opt/app/music/etc/music.properties
subPath: music.properties
resources:
-{{ toYaml .Values.resources | indent 10 }}
+{{ include "common.resources" . | indent 12 }}
volumes:
- name: shared-data
emptyDir: {}
diff --git a/kubernetes/common/music/charts/music-tomcat/values.yaml b/kubernetes/common/music/charts/music-tomcat/values.yaml
index 05a1b17169..b91ffbd4e4 100755
--- a/kubernetes/common/music/charts/music-tomcat/values.yaml
+++ b/kubernetes/common/music/charts/music-tomcat/values.yaml
@@ -81,14 +81,26 @@ service:
ingress:
enabled: false
-#resources: {}
+# Resource Limit flavor -By Default using small
+flavor: small
+# Segregation for Different environment (Small and Large)
resources:
- limits:
- cpu: 2
- memory: 2Gi
- requests:
- cpu: 2
- memory: 1Gi
+ small:
+ limits:
+ cpu: 900m
+ memory: 460Mi
+ requests:
+ cpu: 550m
+ memory: 360Mi
+ large:
+ limits:
+ cpu: 4
+ memory: 2Gi
+ requests:
+ cpu: 2
+ memory: 1Gi
+ unlimited: {}
+
properties:
@@ -100,4 +112,3 @@ properties:
# Admin API
# ONAP AAF
aafAdminUrl:
-
diff --git a/kubernetes/common/music/charts/zookeeper/values.yaml b/kubernetes/common/music/charts/zookeeper/values.yaml
index ea02e6151e..550dbf272b 100644
--- a/kubernetes/common/music/charts/zookeeper/values.yaml
+++ b/kubernetes/common/music/charts/zookeeper/values.yaml
@@ -54,23 +54,23 @@ ports:
protocol: TCP # Protocol for zookeeper container server port.
# Resource Limit flavor -By Default using small
-flavor: large
+flavor: small
# Segregation for Different environment (Small and Large)
resources:
small:
limits:
- cpu: 1
- memory: 1Gi
+ cpu: 500m
+ memory: 900Mi
requests:
- cpu: 500m
- memory: 500Mi
+ cpu: 10m
+ memory: 730Mi
large:
limits:
cpu: 3
memory: 2Gi
requests:
- cpu: 2
- memory: 1Gi
+ cpu: 2
+ memory: 1Gi
unlimited: {}
nodeSelector: {} # Node label-values required to run zookeeper pods.
@@ -78,7 +78,7 @@ nodeSelector: {} # Node label-values required to run zookeeper pods.
tolerations: [] # Node taint overrides for zookeeper pods.
affinity: {} # Criteria by which pod label-values influence scheduling for zookeeper pods.
-affinity:
+affinity:
podAntiAffinity:
requiredDuringSchedulingIgnoredDuringExecution:
- topologyKey: "kubernetes.io/hostname"
diff --git a/kubernetes/portal/charts/portal-cassandra/templates/deployment.yaml b/kubernetes/portal/charts/portal-cassandra/templates/deployment.yaml
index 2040794074..96e865d8cf 100644
--- a/kubernetes/portal/charts/portal-cassandra/templates/deployment.yaml
+++ b/kubernetes/portal/charts/portal-cassandra/templates/deployment.yaml
@@ -65,7 +65,7 @@ spec:
- name: CASSPASS
value: "{{ .Values.config.cassandraPassword }}"
- name: JVM_OPTS
- value: "{{ .Values.config.cassandraJvmOpts }}"
+ value: "{{ .Values.config.cassandraJvmOpts }}"
- name: POD_IP
valueFrom:
fieldRef: