diff --git a/controllers/reconciler_common.go b/controllers/reconciler_common.go index d938b5fea51ab0461ca3d9f534d0eea053a4f79a..eac4c371de2528ebbefe7369e87e37e5c145c65f 100644 --- a/controllers/reconciler_common.go +++ b/controllers/reconciler_common.go @@ -184,32 +184,32 @@ func reqLimDict(container string, qosClass webservicesv1a1.QoSClass) (corev1.Res switch container { case "php-fpm": if qosClass == webservicesv1a1.QoSCritical { - return ResourceRequestLimit("2500Mi", "1000m", "3Gi", "5000m") + return ResourceRequestLimit("2500Mi", "50m", "3Gi", "5000m") } if qosClass == webservicesv1a1.QoSTest { // Test sites should request much fewer resources, but they can still afford to consume more if available (low QoS) - return ResourceRequestLimit("50Mi", "50m", "200Mi", "900m") + return ResourceRequestLimit("50Mi", "1m", "200Mi", "900m") } - return ResourceRequestLimit("100Mi", "90m", "600Mi", "2000m") + return ResourceRequestLimit("100Mi", "5m", "600Mi", "2000m") case "nginx": if qosClass == webservicesv1a1.QoSCritical { // We haven't seen any Nginx bottlenecks with critical sites so far - return ResourceRequestLimit("20Mi", "60m", "55Mi", "1500m") + return ResourceRequestLimit("20Mi", "10m", "55Mi", "1500m") } if qosClass == webservicesv1a1.QoSTest { - return ResourceRequestLimit("5Mi", "20m", "25Mi", "400m") + return ResourceRequestLimit("5Mi", "1m", "25Mi", "400m") } - return ResourceRequestLimit("10Mi", "30m", "25Mi", "700m") + return ResourceRequestLimit("10Mi", "5m", "25Mi", "700m") case "php-fpm-exporter": - return ResourceRequestLimit("15Mi", "4m", "25Mi", "40m") + return ResourceRequestLimit("15Mi", "1m", "25Mi", "40m") case "webdav": // Webdav has very few requests (low QoS) anyway, so there's no need to change for test sites so far // WebDAV workloads are very bursty and they need a lot of CPU to process, therefore giving very high spread - return ResourceRequestLimit("10Mi", "20m", "100Mi", "500m") + return ResourceRequestLimit("10Mi", "1m", "100Mi", "500m") case "cron": - return ResourceRequestLimit("10Mi", "10m", "20Mi", "80m") + return ResourceRequestLimit("10Mi", "1m", "20Mi", "80m") case "drupal-logs": - return ResourceRequestLimit("10Mi", "4m", "15Mi", "15m") + return ResourceRequestLimit("10Mi", "2m", "15Mi", "15m") } return corev1.ResourceRequirements{ Requests: corev1.ResourceList{},