From 0da8829497597e0472c3ce08af3ea59d65a60f5b Mon Sep 17 00:00:00 2001
From: vaibhav16dec <vaibhav.chopra@amdocs.com>
Date: Mon, 13 Aug 2018 06:10:27 +0000
Subject: [PATCH] Flavors defintion in resource limit

Issue-ID: OOM-1322

Change-Id: I5248ae206da6b5d65b0830f454813e6e14ec7284
Signed-off-by: vaibhav16dec <vaibhav.chopra@amdocs.com>
---
 .../charts/so-bpmn-infra/templates/deployment.yaml |  9 ++----
 kubernetes/so/charts/so-bpmn-infra/values.yaml     | 11 +++++++
 .../templates/deployment.yaml                      |  9 ++----
 .../so/charts/so-catalog-db-adapter/values.yaml    | 15 ++++++++--
 .../so/charts/so-mariadb/templates/deployment.yaml |  4 +--
 kubernetes/so/charts/so-mariadb/values.yaml        | 35 +++++++++++-----------
 .../so-openstack-adapter/templates/deployment.yaml |  9 ++----
 .../so/charts/so-openstack-adapter/values.yaml     | 15 ++++++++--
 .../templates/deployment.yaml                      |  9 ++----
 .../so/charts/so-request-db-adapter/values.yaml    | 15 ++++++++--
 .../so-sdc-controller/templates/deployment.yaml    |  9 ++----
 kubernetes/so/charts/so-sdc-controller/values.yaml | 15 ++++++++--
 .../so-sdnc-adapter/templates/deployment.yaml      |  9 ++----
 kubernetes/so/charts/so-sdnc-adapter/values.yaml   | 15 ++++++++--
 .../so-vfc-adapter/templates/deployment.yaml       |  9 ++----
 kubernetes/so/charts/so-vfc-adapter/values.yaml    | 15 ++++++++--
 kubernetes/so/templates/deployment.yaml            |  9 ++----
 kubernetes/so/values.yaml                          | 17 +++++++++--
 18 files changed, 138 insertions(+), 91 deletions(-)

diff --git a/kubernetes/so/charts/so-bpmn-infra/templates/deployment.yaml b/kubernetes/so/charts/so-bpmn-infra/templates/deployment.yaml
index d235545aa3..a69c189c5b 100755
--- a/kubernetes/so/charts/so-bpmn-infra/templates/deployment.yaml
+++ b/kubernetes/so/charts/so-bpmn-infra/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-bpmn-infra/values.yaml b/kubernetes/so/charts/so-bpmn-infra/values.yaml
index 82fb5a67ff..b5fbef048d 100755
--- a/kubernetes/so/charts/so-bpmn-infra/values.yaml
+++ b/kubernetes/so/charts/so-bpmn-infra/values.yaml
@@ -28,13 +28,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: 8Gi
       cpu: 4000m
+    requests:
+      memory: 2Gi
+      cpu: 1000m
 livenessProbe:
     path: /manage/health
     scheme: HTTP
diff --git a/kubernetes/so/charts/so-catalog-db-adapter/templates/deployment.yaml b/kubernetes/so/charts/so-catalog-db-adapter/templates/deployment.yaml
index d235545aa3..a69c189c5b 100755
--- a/kubernetes/so/charts/so-catalog-db-adapter/templates/deployment.yaml
+++ b/kubernetes/so/charts/so-catalog-db-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-catalog-db-adapter/values.yaml b/kubernetes/so/charts/so-catalog-db-adapter/values.yaml
index a62d9c0d9b..1b2441f8f7 100755
--- a/kubernetes/so/charts/so-catalog-db-adapter/values.yaml
+++ b/kubernetes/so/charts/so-catalog-db-adapter/values.yaml
@@ -28,13 +28,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: 8082
diff --git a/kubernetes/so/charts/so-mariadb/templates/deployment.yaml b/kubernetes/so/charts/so-mariadb/templates/deployment.yaml
index a72d10851b..07feb4aba2 100755
--- a/kubernetes/so/charts/so-mariadb/templates/deployment.yaml
+++ b/kubernetes/so/charts/so-mariadb/templates/deployment.yaml
@@ -81,7 +81,7 @@ spec:
         - name: docker-entrypoint-initdb-d
           mountPath: "/docker-entrypoint-initdb.d"
         resources:
-{{ toYaml .Values.resources | indent 12 }}
+{{ toYaml (pluck .Values.flavor .Values.resources| first) | indent 12 }}
       {{- if .Values.nodeSelector }}
       nodeSelector:
 {{ toYaml .Values.nodeSelector | indent 10 }}
@@ -107,4 +107,4 @@ spec:
       - name: docker-entrypoint-initdb-d
         emptyDir: {}
       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-mariadb/values.yaml b/kubernetes/so/charts/so-mariadb/values.yaml
index 81370c7205..8ea7e13286 100755
--- a/kubernetes/so/charts/so-mariadb/values.yaml
+++ b/kubernetes/so/charts/so-mariadb/values.yaml
@@ -72,21 +72,20 @@ service:
   nodePort: 52
 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
-  # s, 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
\ No newline at end of file
+# Resource Limit flavor
+flavor: small
+resources:
+  small:
+    limits:
+      cpu: 2
+      memory: 4Gi
+    requests:
+      cpu: 2
+      memory: 4Gi
+  large:
+    limits:
+      cpu: 4
+      memory: 8Gi
+    requests:
+      cpu: 4
+      memory: 8Gi
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
diff --git a/kubernetes/so/charts/so-request-db-adapter/templates/deployment.yaml b/kubernetes/so/charts/so-request-db-adapter/templates/deployment.yaml
index d235545aa3..a69c189c5b 100755
--- a/kubernetes/so/charts/so-request-db-adapter/templates/deployment.yaml
+++ b/kubernetes/so/charts/so-request-db-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-request-db-adapter/values.yaml b/kubernetes/so/charts/so-request-db-adapter/values.yaml
index cf418cdaf3..b57f71e096 100755
--- a/kubernetes/so/charts/so-request-db-adapter/values.yaml
+++ b/kubernetes/so/charts/so-request-db-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: 8083
diff --git a/kubernetes/so/charts/so-sdc-controller/templates/deployment.yaml b/kubernetes/so/charts/so-sdc-controller/templates/deployment.yaml
index d235545aa3..a69c189c5b 100755
--- a/kubernetes/so/charts/so-sdc-controller/templates/deployment.yaml
+++ b/kubernetes/so/charts/so-sdc-controller/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-sdc-controller/values.yaml b/kubernetes/so/charts/so-sdc-controller/values.yaml
index c191ffc86f..f5a5176c52 100755
--- a/kubernetes/so/charts/so-sdc-controller/values.yaml
+++ b/kubernetes/so/charts/so-sdc-controller/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: 8085
diff --git a/kubernetes/so/charts/so-sdnc-adapter/templates/deployment.yaml b/kubernetes/so/charts/so-sdnc-adapter/templates/deployment.yaml
index d235545aa3..a69c189c5b 100755
--- a/kubernetes/so/charts/so-sdnc-adapter/templates/deployment.yaml
+++ b/kubernetes/so/charts/so-sdnc-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-sdnc-adapter/values.yaml b/kubernetes/so/charts/so-sdnc-adapter/values.yaml
index 278d30287a..55b5965b3f 100755
--- a/kubernetes/so/charts/so-sdnc-adapter/values.yaml
+++ b/kubernetes/so/charts/so-sdnc-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: 8086
diff --git a/kubernetes/so/charts/so-vfc-adapter/templates/deployment.yaml b/kubernetes/so/charts/so-vfc-adapter/templates/deployment.yaml
index d235545aa3..a69c189c5b 100755
--- a/kubernetes/so/charts/so-vfc-adapter/templates/deployment.yaml
+++ b/kubernetes/so/charts/so-vfc-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-vfc-adapter/values.yaml b/kubernetes/so/charts/so-vfc-adapter/values.yaml
index ad83dbcaac..884280620a 100755
--- a/kubernetes/so/charts/so-vfc-adapter/values.yaml
+++ b/kubernetes/so/charts/so-vfc-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: 8084
diff --git a/kubernetes/so/templates/deployment.yaml b/kubernetes/so/templates/deployment.yaml
index d235545aa3..a69c189c5b 100755
--- a/kubernetes/so/templates/deployment.yaml
+++ b/kubernetes/so/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/values.yaml b/kubernetes/so/values.yaml
index a613ee1a3a..e5af3895c6 100755
--- a/kubernetes/so/values.yaml
+++ b/kubernetes/so/values.yaml
@@ -28,13 +28,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:
+      cpu: 2000m
+      memory: 4Gi
     requests:
-      memory: 1Gi
       cpu: 500m
+      memory: 1Gi
+  large:
     limits:
-      memory: 4Gi
-      cpu: 2000m
+      cpu: 4000m
+      memory: 8Gi
+    requests:
+      cpu: 1000m
+      memory: 2Gi
 livenessProbe:
     path: /manage/health 
     scheme: HTTPS
-- 
2.16.6