Skip to content

Commit 1f259eb

Browse files
committed
Lower requested resorces for sidecar containers
1 parent ed1a205 commit 1f259eb

File tree

2 files changed

+14
-2
lines changed

2 files changed

+14
-2
lines changed

Changelog.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,9 @@ adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
5252
* Update cron documentation
5353
* Set InnoDB buffer parameter: `innodb_buffer_pool_instances` to `min(resources.limit.cpu,
5454
floor(innodb_buffer_pool_size/1G))` (see #502)
55+
* Change requested resources for sidecar containers: `sidecar`: (requested=10m/32Mi,
56+
limit=`.spec.podSpec.rsources.limit`); `exporter`: (requested=10m/32Mi. limit=100m/128Mi);
57+
`heartbeat`: (requested=10m/32Mi, limit=100m/64Mi)
5558
### Removed
5659
### Fixed
5760
* Update and fix e2e tests

pkg/controller/mysqlcluster/internal/syncer/statefullset.go

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -642,16 +642,25 @@ func (s *sfsSyncer) ensureResources(name string) core.ResourceRequirements {
642642
core.ResourceCPU: resource.MustParse("100m"),
643643
}
644644
requests := core.ResourceList{
645-
core.ResourceCPU: resource.MustParse("30m"),
645+
core.ResourceCPU: resource.MustParse("10m"),
646+
core.ResourceMemory: resource.MustParse("32Mi"),
646647
}
647648

648649
switch name {
649650
case containerExporterName:
650651
limits = core.ResourceList{
651-
core.ResourceCPU: resource.MustParse("100m"),
652+
core.ResourceCPU: resource.MustParse("100m"),
653+
core.ResourceMemory: resource.MustParse("128Mi"),
652654
}
653655
case containerMySQLInitName, containerMysqlName:
654656
return s.cluster.Spec.PodSpec.Resources
657+
658+
case containerHeartBeatName:
659+
limits[core.ResourceMemory] = resource.MustParse("64Mi")
660+
661+
case containerSidecarName:
662+
// set same limits as mysql for sidecar container
663+
limits = s.cluster.Spec.PodSpec.Resources.Limits
655664
}
656665

657666
return core.ResourceRequirements{

0 commit comments

Comments
 (0)