Merge branch 'development' into 932-dark-stylesheet-alternative

.gitlab/development-values.yaml

@@ -7,13 +7,26 @@ hpa:
   enabled: true
   minReplicas: 1
   maxReplicas: 5
-resources:
-  limits:
+resourcesPhpfpm: 
+  requests:
     cpu: 500m
+    memory: 500M
+  limits:
+resourcesNginx: 
+  requests:
+    cpu: 100m
+    memory: 100M
+  limits:
+resourcesRedis: 
+  requests:
+    cpu: 100m
     memory: 1Gi
+  limits:
+resourcesFetcher: 
   requests:
     cpu: 500m
-    memory: 1Gi
+    memory: 100M
+  limits:
 podDisruptionBudget:
   enabled: true
   minAvailable:

.gitlab/production-values.yaml

@@ -7,13 +7,6 @@ hpa:
   enabled: true
   minReplicas: 3
   maxReplicas: 100
-resources:
-  limits:
-    cpu: 500m
-    memory: 1Gi
-  requests:
-    cpu: 500m
-    memory: 1Gi
 podDisruptionBudget:
   enabled: true
   minAvailable:
@@ -23,6 +16,29 @@ podAnnotations:
   prometheus.io/path: /metrics
   prometheus.io/port: "80"
 deploymentApiVersion: apps/v1
+resources:
+  requests:
+  limits:
+resourcesPhpfpm: 
+  requests:
+    cpu: 500m
+    memory: 500M
+  limits:
+resourcesNginx: 
+  requests:
+    cpu: 100m
+    memory: 100M
+  limits:
+resourcesRedis: 
+  requests:
+    cpu: 100m
+    memory: 1Gi
+  limits:
+resourcesFetcher: 
+  requests:
+    cpu: 500m
+    memory: 100M
+  limits:
 ingress:
   annotations:
     cert-manager.io/cluster-issuer: letsencrypt-prod

.gitlab/review-apps-values.yaml

@@ -24,4 +24,16 @@ service:
   commonName: ""
   externalPort: 80
   internalPort: 80
-deploymentApiVersion: apps/v1
\ No newline at end of file
+deploymentApiVersion: apps/v1
+resourcesPhpfpm: 
+  requests:
+  limits:
+resourcesNginx: 
+  requests:
+  limits:
+resourcesRedis: 
+  requests:
+  limits:
+resourcesFetcher: 
+  requests:
+  limits:
\ No newline at end of file

chart/templates/deployment.yaml

@@ -139,9 +139,7 @@ spec:
           subPath: adBlacklistDomains.txt
           readOnly: true
         resources:
-          requests:
-            cpu: 500m
-            memory: 500m
+{{ toYaml .Values.resourcesPhpfpm | indent 12 }}
       # Nginx Container
       - name: {{ .Chart.Name }}-nginx
         image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
@@ -187,9 +185,7 @@ spec:
           initialDelaySeconds: {{ .Values.readinessProbe.initialDelaySeconds }}
           timeoutSeconds: {{ .Values.readinessProbe.timeoutSeconds }}
         resources:
-          requests:
-            cpu: 100m
-            memory: 100m
+{{ toYaml .Values.resourcesNginx | indent 12 }}
       # Redis Container
       - name: {{ .Chart.Name }}-redis
         image: "redis:5.0.3-alpine"
@@ -208,9 +204,7 @@ spec:
           initialDelaySeconds: {{ .Values.readinessProbe.initialDelaySeconds }}
           timeoutSeconds: {{ .Values.readinessProbe.timeoutSeconds }}
         resources:
-          requests:
-            cpu: 100m
-            memory: 1Gi
+{{ toYaml .Values.resourcesRedis | indent 12 }}
       # Fetcher Container
       - name: {{ .Chart.Name }}-fetcher
         image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
@@ -237,7 +231,5 @@ spec:
           initialDelaySeconds: {{ .Values.readinessProbe.initialDelaySeconds }}
           timeoutSeconds: {{ .Values.readinessProbe.timeoutSeconds }}
         resources:
-          requests:
-            cpu: 500m
-            memory: 100m
+{{ toYaml .Values.resourcesFetcher | indent 12 }}
 {{- end -}}