add resource requests for the proxy container (#219)

* add resource requests for the proxy container * [ci skip] auto patch increment skip-checks: true Co-authored-by: ras-rm-bot <[email protected]>
ONSdigital · Dec 3, 2020 · e96731a · e96731a
1 parent 7bdd8d1
commit e96731a
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 10 deletions.
diff --git a/_infra/helm/collection-exercise/Chart.yaml b/_infra/helm/collection-exercise/Chart.yaml
@@ -18,5 +18,5 @@ version: 1.2.1
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application.
-appVersion: 11.0.28
+appVersion: 11.0.29
 
diff --git a/_infra/helm/collection-exercise/templates/deployment.yaml b/_infra/helm/collection-exercise/templates/deployment.yaml
@@ -57,6 +57,8 @@ spec:
               secretKeyRef:
                 name: db-config
                 key: db-port
+          resources:
+            {{- toYaml .Values.resources.proxy | nindent 12 }}
         {{- end }}
         - name: {{ .Chart.Name }}
           {{- if eq .Values.image.tag "latest"}}
@@ -290,4 +292,4 @@ spec:
           - name: ACTION_SVC_DEPRECATED
             value: "{{ .Values.deprecateAction }}"
           resources:
-            {{- toYaml .Values.resources | nindent 12 }}
+            {{- toYaml .Values.resources.application | nindent 12 }}
diff --git a/_infra/helm/collection-exercise/values.yaml b/_infra/helm/collection-exercise/values.yaml
@@ -32,18 +32,26 @@ service:
   port: 8080
 
 resources:
-  requests:
-    memory: "500Mi"
-    cpu: "25m"
-  limits:
-    memory: "1000Mi"
-    cpu: "100m"
+  application:
+    requests:
+      memory: "500Mi"
+      cpu: "35m"
+    limits:
+      memory: "2000Mi"
+      cpu: "1000m"
+  proxy:
+    requests:
+      memory: "25Mi"
+      cpu: "5m"
+    limits:
+      memory: "64Mi"
+      cpu: "100m"
 
 autoscaling: false
 scaleAt:
   # These are expressed as a percentage of resources.requests, not resources.limits
-  memoryPercentage: 150
-  cpuPercentage: 200
+  memoryPercentage: 200
+  cpuPercentage: 500
 replicas: 1
 rollingUpdate:
   maxSurge: 1