Skip to content

Commit 64ff71e

Browse files
committed
Set sensible defaults for resources limts
1 parent c651482 commit 64ff71e

File tree

2 files changed

+13
-0
lines changed

2 files changed

+13
-0
lines changed

pkg/apis/mysql/v1alpha1/mysqlcluster_defaults.go

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -76,12 +76,24 @@ func (c *MysqlCluster) setPodSpecDefaults(spec *PodSpec) {
7676
}
7777
}
7878

79+
if len(spec.MetricsExporterResources.Limits) == 0 {
80+
spec.MetricsExporterResources.Limits = corev1.ResourceList{
81+
corev1.ResourceCPU: resource.MustParse("100m"),
82+
corev1.ResourceMemory: resource.MustParse("128Mi"),
83+
}
84+
}
85+
7986
if len(spec.MySQLOperatorSidecarResources.Requests) == 0 {
8087
spec.MySQLOperatorSidecarResources.Requests = corev1.ResourceList{
8188
corev1.ResourceCPU: resource.MustParse("10m"),
8289
corev1.ResourceMemory: resource.MustParse("64Mi"),
8390
}
8491
}
92+
93+
if len(spec.MySQLOperatorSidecarResources.Limits) == 0 {
94+
// for the sidecar set the same limits as for mysql
95+
spec.MySQLOperatorSidecarResources.Limits = spec.Resources.Limits
96+
}
8597
}
8698

8799
// SetDefaults for VolumeSpec

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -658,6 +658,7 @@ func (s *sfsSyncer) ensureResources(name string) core.ResourceRequirements {
658658

659659
case containerSidecarName:
660660
return s.cluster.Spec.PodSpec.MySQLOperatorSidecarResources
661+
661662
}
662663

663664
return core.ResourceRequirements{

0 commit comments

Comments
 (0)