From 973bfad52ba90a96ce77a3efd2b572d7e5c6f2e0 Mon Sep 17 00:00:00 2001 From: GregSulek Date: Wed, 19 Sep 2018 06:48:37 -0400 Subject: Add Resource Limits for APP-C flavor names removed from global Issue-ID: OOM-1148 Change-Id: Ib8ccb694786d15be2830c067d5c3b10fc7054f0b Signed-off-by: GregSulek --- .../appc-ansible-server/templates/deployment.yaml | 2 +- .../appc/charts/appc-ansible-server/values.yaml | 27 +++++++++++++++------- .../appc/charts/appc-cdt/templates/deployment.yaml | 2 +- kubernetes/appc/charts/appc-cdt/values.yaml | 26 ++++++++++++++------- kubernetes/appc/templates/statefulset.yaml | 4 ++-- kubernetes/appc/values.yaml | 24 ++++++++++++------- 6 files changed, 57 insertions(+), 28 deletions(-) (limited to 'kubernetes/appc') diff --git a/kubernetes/appc/charts/appc-ansible-server/templates/deployment.yaml b/kubernetes/appc/charts/appc-ansible-server/templates/deployment.yaml index 8fb2776566..b7ef21f023 100644 --- a/kubernetes/appc/charts/appc-ansible-server/templates/deployment.yaml +++ b/kubernetes/appc/charts/appc-ansible-server/templates/deployment.yaml @@ -75,8 +75,8 @@ spec: name: config subPath: RestServer_config resources: -{{ toYaml .Values.resources | indent 12 }} {{- if .Values.nodeSelector }} +{{ toYaml (pluck .Values.flavor .Values.resources| first) | indent 12 }} nodeSelector: {{ toYaml .Values.nodeSelector | indent 10 }} {{- end -}} diff --git a/kubernetes/appc/charts/appc-ansible-server/values.yaml b/kubernetes/appc/charts/appc-ansible-server/values.yaml index bfbadd97d1..b9dd41854a 100644 --- a/kubernetes/appc/charts/appc-ansible-server/values.yaml +++ b/kubernetes/appc/charts/appc-ansible-server/values.yaml @@ -25,6 +25,8 @@ global: ################################################################# # Application configuration defaults. ################################################################# +flavor: small + # application image repository: nexus3.onap.org:10001 image: onap/sdnc-ansible-server-image:1.4-STAGING-latest @@ -68,11 +70,20 @@ service: ingress: enabled: false -resources: {} -#resources: -# limits: -# cpu: 2 -# memory: 4Gi -# requests: -# cpu: 2 -# memory: 4Gi +resources: + small: + limits: + cpu: 1 + memory: 1Gi + requests: + cpu: 1 + memory: 1Gi + large: + limits: + cpu: 2 + memory: 2Gi + requests: + cpu: 2 + memory: 2Gi + + diff --git a/kubernetes/appc/charts/appc-cdt/templates/deployment.yaml b/kubernetes/appc/charts/appc-cdt/templates/deployment.yaml index 9c83c2c882..1288183c7f 100644 --- a/kubernetes/appc/charts/appc-cdt/templates/deployment.yaml +++ b/kubernetes/appc/charts/appc-cdt/templates/deployment.yaml @@ -65,7 +65,7 @@ spec: name: localtime readOnly: true resources: -{{ toYaml .Values.resources | indent 12 }} +{{ toYaml (pluck .Values.flavor .Values.resources| first) | indent 12 }} {{- if .Values.nodeSelector }} nodeSelector: {{ toYaml .Values.nodeSelector | indent 10 }} diff --git a/kubernetes/appc/charts/appc-cdt/values.yaml b/kubernetes/appc/charts/appc-cdt/values.yaml index f472152269..26526a829c 100644 --- a/kubernetes/appc/charts/appc-cdt/values.yaml +++ b/kubernetes/appc/charts/appc-cdt/values.yaml @@ -21,6 +21,9 @@ global: ################################################################# # Application configuration defaults. ################################################################# + +flavor: small + # application image repository: nexus3.onap.org:10001 image: onap/appc-cdt-image:1.4.0-SNAPSHOT-latest @@ -58,7 +61,6 @@ 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 @@ -69,10 +71,18 @@ resources: {} # 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 +resources: + small: + limits: + cpu: 1 + memory: 1Gi + requests: + cpu: 1 + memory: 1Gi + large: + limits: + cpu: 2 + memory: 2Gi + requests: + cpu: 2 + memory: 2Gi diff --git a/kubernetes/appc/templates/statefulset.yaml b/kubernetes/appc/templates/statefulset.yaml index 32ff95241b..9453bd9677 100644 --- a/kubernetes/appc/templates/statefulset.yaml +++ b/kubernetes/appc/templates/statefulset.yaml @@ -145,8 +145,8 @@ spec: name: log-config subPath: org.ops4j.pax.logging.cfg resources: -{{ toYaml .Values.resources | indent 12 }} - {{- if .Values.nodeSelector }} +{{ toYaml (pluck .Values.flavor .Values.resources| first) | indent 12 }} + {{- if .Values.nodeSelector }} nodeSelector: {{ toYaml .Values.nodeSelector | indent 10 }} {{- end -}} diff --git a/kubernetes/appc/values.yaml b/kubernetes/appc/values.yaml index 0325275e89..97e39bce87 100644 --- a/kubernetes/appc/values.yaml +++ b/kubernetes/appc/values.yaml @@ -28,6 +28,7 @@ global: ################################################################# # Application configuration defaults. ################################################################# +flavor: small # application image repository: nexus3.onap.org:10001 image: onap/appc-image:1.4.0-SNAPSHOT-latest @@ -155,7 +156,6 @@ 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 @@ -166,10 +166,18 @@ resources: {} # 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 +resources: + small: + limits: + cpu: 2 + memory: 4Gi + requests: + cpu: 2 + memory: 4Gi + large: + limits: + cpu: 4 + memory: 8Gi + requests: + cpu: 4 + memory: 8Gi -- cgit 1.2.3-korg