Skip to content

Fix DB Container Resource Limit, Request #1630

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
kodiak-appscode merged 9 commits into from
Mar 31, 2026
Merged

Fix DB Container Resource Limit, Request #1630

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
d2b8eec
Fix Container Resource Requist and Limit Set
sheikh-arman Mar 24, 2026
92d2fed
ensure request and limit memory are same
sheikh-arman Mar 24, 2026
828c83a
update postgres default container resource
souravbiswassanto Mar 24, 2026
601a777
update maria,percona,singlestore
sheikh-arman Mar 24, 2026
5dc631e
check limit is greater or equal to request
sheikh-arman Mar 24, 2026
c4072cb
remove klog
sheikh-arman Mar 24, 2026
ba5b6b3
fix typo
sheikh-arman Mar 24, 2026
40be122
Update resource set for all db
sheikh-arman Mar 24, 2026
3def592
update
ArnobKumarSaha Mar 31, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion apis/elasticsearch/v1alpha1/elasticsearchdashboard_helpers.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -322,7 +322,7 @@ func (ed *ElasticsearchDashboard) setDefaultContainerSecurityContext(esVersion c

func (ed *ElasticsearchDashboard) setDefaultContainerResourceLimits(podTemplate *ofst.PodTemplateSpec) {
container := coreutil.GetContainerByName(podTemplate.Spec.Containers, kubedb.ElasticsearchContainerName)
if container != nil && (container.Resources.Requests == nil && container.Resources.Limits == nil) {
if container != nil {
apis.SetDefaultResourceLimits(&container.Resources, kubedb.DefaultResources)
}
}
Expand Down
25 changes: 17 additions & 8 deletions apis/helpers.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ func SetDefaultResourceLimits(req *core.ResourceRequirements, defaultResources c
// if request is set,
// - limit set:
// - return max(limit,request)
// return request
// else if limit set:
// - return limit
// else
Expand All @@ -57,14 +58,12 @@ func SetDefaultResourceLimits(req *core.ResourceRequirements, defaultResources c
return defaultValue
}

// if request is not set,
// - if limit exists:
// - copy limit
// - else
// - set default
// else
// - return request
// endif
// if request is set,
// return request
//
// if limit exists:
// return limit
// return default
calRequest := func(name core.ResourceName, defaultValue resource.Quantity, originalLimit resource.Quantity) resource.Quantity {
if r, ok := req.Requests[name]; ok {
return r
Expand Down Expand Up @@ -98,4 +97,14 @@ func SetDefaultResourceLimits(req *core.ResourceRequirements, defaultResources c
for r := range defaultResources.Requests {
req.Requests[r] = calRequest(r, defaultResources.Requests[r], originalLimits[r])
}

// Ensure resource limit is greater than or equal to request
for res, resReq := range req.Requests {
if resLim, limExists := req.Limits[res]; limExists {
if resLim.Cmp(resReq) <= 0 {
// Request is higher or equal, set limit to match request
req.Limits[res] = resReq
}
}
}
}
2 changes: 1 addition & 1 deletion apis/kafka/v1alpha1/connect_cluster_helpers.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -270,7 +270,7 @@ func (k *ConnectCluster) SetDefaults(kc client.Client) {
k.setDefaultInitContainerSecurityContext(kc, &k.Spec.PodTemplate)

dbContainer := coreutil.GetContainerByName(k.Spec.PodTemplate.Spec.Containers, ConnectClusterContainerName)
if dbContainer != nil && (dbContainer.Resources.Requests == nil && dbContainer.Resources.Limits == nil) {
if dbContainer != nil {
apis.SetDefaultResourceLimits(&dbContainer.Resources, kubedb.DefaultResources)
}

Expand Down
2 changes: 1 addition & 1 deletion apis/kafka/v1alpha1/restproxy_helpers.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -177,7 +177,7 @@ func (k *RestProxy) SetDefaults(kc client.Client) {
k.setDefaultContainerSecurityContext(&ksrVersion, &k.Spec.PodTemplate)

dbContainer := coreutil.GetContainerByName(k.Spec.PodTemplate.Spec.Containers, RestProxyContainerName)
if dbContainer != nil && (dbContainer.Resources.Requests == nil && dbContainer.Resources.Limits == nil) {
if dbContainer != nil {
apis.SetDefaultResourceLimits(&dbContainer.Resources, kubedb.DefaultResources)
}

Expand Down
2 changes: 1 addition & 1 deletion apis/kafka/v1alpha1/schemaregistry_helpers.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -217,7 +217,7 @@ func (k *SchemaRegistry) SetDefaults(kc client.Client) {
k.setDefaultContainerSecurityContext(&ksrVersion, &k.Spec.PodTemplate)

dbContainer := coreutil.GetContainerByName(k.Spec.PodTemplate.Spec.Containers, SchemaRegistryContainerName)
if dbContainer != nil && (dbContainer.Resources.Requests == nil && dbContainer.Resources.Limits == nil) {
if dbContainer != nil {
apis.SetDefaultResourceLimits(&dbContainer.Resources, kubedb.DefaultResources)
}

Expand Down
22 changes: 11 additions & 11 deletions apis/kubedb/v1/elasticsearch_helpers.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -485,7 +485,7 @@ func (e *Elasticsearch) SetDefaults(esVersion *catalog.ElasticsearchVersion) {
e.setContainerSecurityContextDefaults(esVersion, &e.Spec.Topology.Ingest.PodTemplate, kubedb.ElasticsearchContainerName)
e.setContainerSecurityContextDefaults(esVersion, &e.Spec.Topology.Ingest.PodTemplate, kubedb.ElasticsearchInitConfigMergerContainerName)
dbContainer := core_util.GetContainerByName(e.Spec.Topology.Ingest.PodTemplate.Spec.Containers, kubedb.ElasticsearchContainerName)
if dbContainer != nil && (dbContainer.Resources.Requests == nil && dbContainer.Resources.Limits == nil) {
if dbContainer != nil {
apis.SetDefaultResourceLimits(&dbContainer.Resources, kubedb.DefaultResourcesMemoryIntensive)
}
if e.Spec.Topology.Ingest.Replicas == nil {
Expand All @@ -503,7 +503,7 @@ func (e *Elasticsearch) SetDefaults(esVersion *catalog.ElasticsearchVersion) {
e.setContainerSecurityContextDefaults(esVersion, &e.Spec.Topology.Master.PodTemplate, kubedb.ElasticsearchContainerName)
e.setContainerSecurityContextDefaults(esVersion, &e.Spec.Topology.Master.PodTemplate, kubedb.ElasticsearchInitConfigMergerContainerName)
dbContainer = core_util.GetContainerByName(e.Spec.Topology.Master.PodTemplate.Spec.Containers, kubedb.ElasticsearchContainerName)
if dbContainer != nil && (dbContainer.Resources.Requests == nil && dbContainer.Resources.Limits == nil) {
if dbContainer != nil {
apis.SetDefaultResourceLimits(&dbContainer.Resources, kubedb.DefaultResourcesMemoryIntensive)
}
if e.Spec.Topology.Master.Replicas == nil {
Expand All @@ -523,7 +523,7 @@ func (e *Elasticsearch) SetDefaults(esVersion *catalog.ElasticsearchVersion) {
e.setContainerSecurityContextDefaults(esVersion, &e.Spec.Topology.Data.PodTemplate, kubedb.ElasticsearchContainerName)
e.setContainerSecurityContextDefaults(esVersion, &e.Spec.Topology.Data.PodTemplate, kubedb.ElasticsearchInitConfigMergerContainerName)
dbContainer = core_util.GetContainerByName(e.Spec.Topology.Data.PodTemplate.Spec.Containers, kubedb.ElasticsearchContainerName)
if dbContainer != nil && (dbContainer.Resources.Requests == nil && dbContainer.Resources.Limits == nil) {
if dbContainer != nil {
apis.SetDefaultResourceLimits(&dbContainer.Resources, kubedb.DefaultResourcesMemoryIntensive)
}
if e.Spec.Topology.Data.Replicas == nil {
Expand All @@ -543,7 +543,7 @@ func (e *Elasticsearch) SetDefaults(esVersion *catalog.ElasticsearchVersion) {
e.setContainerSecurityContextDefaults(esVersion, &e.Spec.Topology.DataHot.PodTemplate, kubedb.ElasticsearchContainerName)
e.setContainerSecurityContextDefaults(esVersion, &e.Spec.Topology.DataHot.PodTemplate, kubedb.ElasticsearchInitConfigMergerContainerName)
dbContainer = core_util.GetContainerByName(e.Spec.Topology.DataHot.PodTemplate.Spec.Containers, kubedb.ElasticsearchContainerName)
if dbContainer != nil && (dbContainer.Resources.Requests == nil && dbContainer.Resources.Limits == nil) {
if dbContainer != nil {
apis.SetDefaultResourceLimits(&dbContainer.Resources, kubedb.DefaultResourcesMemoryIntensive)
}
if e.Spec.Topology.DataHot.Replicas == nil {
Expand All @@ -563,7 +563,7 @@ func (e *Elasticsearch) SetDefaults(esVersion *catalog.ElasticsearchVersion) {
e.setContainerSecurityContextDefaults(esVersion, &e.Spec.Topology.DataWarm.PodTemplate, kubedb.ElasticsearchContainerName)
e.setContainerSecurityContextDefaults(esVersion, &e.Spec.Topology.DataWarm.PodTemplate, kubedb.ElasticsearchInitConfigMergerContainerName)
dbContainer = core_util.GetContainerByName(e.Spec.Topology.DataWarm.PodTemplate.Spec.Containers, kubedb.ElasticsearchContainerName)
if dbContainer != nil && (dbContainer.Resources.Requests == nil && dbContainer.Resources.Limits == nil) {
if dbContainer != nil {
apis.SetDefaultResourceLimits(&dbContainer.Resources, kubedb.DefaultResourcesMemoryIntensive)
}
if e.Spec.Topology.DataWarm.Replicas == nil {
Expand All @@ -583,7 +583,7 @@ func (e *Elasticsearch) SetDefaults(esVersion *catalog.ElasticsearchVersion) {
e.setContainerSecurityContextDefaults(esVersion, &e.Spec.Topology.DataCold.PodTemplate, kubedb.ElasticsearchContainerName)
e.setContainerSecurityContextDefaults(esVersion, &e.Spec.Topology.DataCold.PodTemplate, kubedb.ElasticsearchInitConfigMergerContainerName)
dbContainer = core_util.GetContainerByName(e.Spec.Topology.DataCold.PodTemplate.Spec.Containers, kubedb.ElasticsearchContainerName)
if dbContainer != nil && (dbContainer.Resources.Requests == nil && dbContainer.Resources.Limits == nil) {
if dbContainer != nil {
apis.SetDefaultResourceLimits(&dbContainer.Resources, kubedb.DefaultResourcesMemoryIntensive)
}
if e.Spec.Topology.DataCold.Replicas == nil {
Expand All @@ -603,7 +603,7 @@ func (e *Elasticsearch) SetDefaults(esVersion *catalog.ElasticsearchVersion) {
e.setContainerSecurityContextDefaults(esVersion, &e.Spec.Topology.DataFrozen.PodTemplate, kubedb.ElasticsearchContainerName)
e.setContainerSecurityContextDefaults(esVersion, &e.Spec.Topology.DataFrozen.PodTemplate, kubedb.ElasticsearchInitConfigMergerContainerName)
dbContainer = core_util.GetContainerByName(e.Spec.Topology.DataFrozen.PodTemplate.Spec.Containers, kubedb.ElasticsearchContainerName)
if dbContainer != nil && (dbContainer.Resources.Requests == nil && dbContainer.Resources.Limits == nil) {
if dbContainer != nil {
apis.SetDefaultResourceLimits(&dbContainer.Resources, kubedb.DefaultResourcesMemoryIntensive)
}
if e.Spec.Topology.DataFrozen.Replicas == nil {
Expand All @@ -623,7 +623,7 @@ func (e *Elasticsearch) SetDefaults(esVersion *catalog.ElasticsearchVersion) {
e.setContainerSecurityContextDefaults(esVersion, &e.Spec.Topology.DataContent.PodTemplate, kubedb.ElasticsearchContainerName)
e.setContainerSecurityContextDefaults(esVersion, &e.Spec.Topology.DataContent.PodTemplate, kubedb.ElasticsearchInitConfigMergerContainerName)
dbContainer = core_util.GetContainerByName(e.Spec.Topology.DataContent.PodTemplate.Spec.Containers, kubedb.ElasticsearchContainerName)
if dbContainer != nil && (dbContainer.Resources.Requests == nil && dbContainer.Resources.Limits == nil) {
if dbContainer != nil {
apis.SetDefaultResourceLimits(&dbContainer.Resources, kubedb.DefaultResourcesMemoryIntensive)
}
if e.Spec.Topology.DataContent.Replicas == nil {
Expand All @@ -643,7 +643,7 @@ func (e *Elasticsearch) SetDefaults(esVersion *catalog.ElasticsearchVersion) {
e.setContainerSecurityContextDefaults(esVersion, &e.Spec.Topology.ML.PodTemplate, kubedb.ElasticsearchContainerName)
e.setContainerSecurityContextDefaults(esVersion, &e.Spec.Topology.ML.PodTemplate, kubedb.ElasticsearchInitConfigMergerContainerName)
dbContainer = core_util.GetContainerByName(e.Spec.Topology.ML.PodTemplate.Spec.Containers, kubedb.ElasticsearchContainerName)
if dbContainer != nil && (dbContainer.Resources.Requests == nil && dbContainer.Resources.Limits == nil) {
if dbContainer != nil {
apis.SetDefaultResourceLimits(&dbContainer.Resources, kubedb.DefaultResourcesMemoryIntensive)
}
if e.Spec.Topology.ML.Replicas == nil {
Expand All @@ -663,7 +663,7 @@ func (e *Elasticsearch) SetDefaults(esVersion *catalog.ElasticsearchVersion) {
e.setContainerSecurityContextDefaults(esVersion, &e.Spec.Topology.Transform.PodTemplate, kubedb.ElasticsearchContainerName)
e.setContainerSecurityContextDefaults(esVersion, &e.Spec.Topology.Transform.PodTemplate, kubedb.ElasticsearchInitConfigMergerContainerName)
dbContainer = core_util.GetContainerByName(e.Spec.Topology.Transform.PodTemplate.Spec.Containers, kubedb.ElasticsearchContainerName)
if dbContainer != nil && (dbContainer.Resources.Requests == nil && dbContainer.Resources.Limits == nil) {
if dbContainer != nil {
apis.SetDefaultResourceLimits(&dbContainer.Resources, kubedb.DefaultResourcesMemoryIntensive)
}
if e.Spec.Topology.Transform.Replicas == nil {
Expand All @@ -678,7 +678,7 @@ func (e *Elasticsearch) SetDefaults(esVersion *catalog.ElasticsearchVersion) {
e.setContainerSecurityContextDefaults(esVersion, &e.Spec.PodTemplate, kubedb.ElasticsearchContainerName)
e.setContainerSecurityContextDefaults(esVersion, &e.Spec.PodTemplate, kubedb.ElasticsearchInitConfigMergerContainerName)
dbContainer := core_util.GetContainerByName(e.Spec.PodTemplate.Spec.Containers, kubedb.ElasticsearchContainerName)
if dbContainer != nil && (dbContainer.Resources.Requests == nil && dbContainer.Resources.Limits == nil) {
if dbContainer != nil {
apis.SetDefaultResourceLimits(&dbContainer.Resources, kubedb.DefaultResourcesMemoryIntensive)
}
if e.Spec.Replicas == nil {
Expand Down
6 changes: 3 additions & 3 deletions apis/kubedb/v1/kafka_helpers.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -387,7 +387,7 @@ func (k *Kafka) SetDefaults(kc client.Client) {
k.setDefaultContainerSecurityContext(&kfVersion, &k.Spec.Topology.Controller.PodTemplate)

dbContainer := coreutil.GetContainerByName(k.Spec.Topology.Controller.PodTemplate.Spec.Containers, kubedb.KafkaContainerName)
if dbContainer != nil && (dbContainer.Resources.Requests == nil && dbContainer.Resources.Limits == nil) {
if dbContainer != nil {
apis.SetDefaultResourceLimits(&dbContainer.Resources, kubedb.DefaultResourcesMemoryIntensive)
}
}
Expand All @@ -402,7 +402,7 @@ func (k *Kafka) SetDefaults(kc client.Client) {
k.setDefaultContainerSecurityContext(&kfVersion, &k.Spec.Topology.Broker.PodTemplate)

dbContainer := coreutil.GetContainerByName(k.Spec.Topology.Broker.PodTemplate.Spec.Containers, kubedb.KafkaContainerName)
if dbContainer != nil && (dbContainer.Resources.Requests == nil && dbContainer.Resources.Limits == nil) {
if dbContainer != nil {
apis.SetDefaultResourceLimits(&dbContainer.Resources, kubedb.DefaultResourcesMemoryIntensive)
}
}
Expand All @@ -413,7 +413,7 @@ func (k *Kafka) SetDefaults(kc client.Client) {
k.setDefaultContainerSecurityContext(&kfVersion, &k.Spec.PodTemplate)

dbContainer := coreutil.GetContainerByName(k.Spec.PodTemplate.Spec.Containers, kubedb.KafkaContainerName)
if dbContainer != nil && (dbContainer.Resources.Requests == nil && dbContainer.Resources.Limits == nil) {
if dbContainer != nil {
apis.SetDefaultResourceLimits(&dbContainer.Resources, kubedb.DefaultResourcesMemoryIntensive)
}
}
Expand Down
4 changes: 2 additions & 2 deletions apis/kubedb/v1/mariadb_helpers.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -520,7 +520,7 @@ func (m *MariaDB) assignMaxscaleDefaultContainerSecurityContext(mdVersion *v1alp

func (m *MariaDB) setDefaultContainerResourceLimits(podTemplate *ofstv2.PodTemplateSpec) {
dbContainer := core_util.GetContainerByName(podTemplate.Spec.Containers, kubedb.MariaDBContainerName)
if dbContainer != nil && (dbContainer.Resources.Requests == nil && dbContainer.Resources.Limits == nil) {
if dbContainer != nil {
apis.SetDefaultResourceLimits(&dbContainer.Resources, kubedb.DefaultResources)
}

Expand All @@ -538,7 +538,7 @@ func (m *MariaDB) setDefaultContainerResourceLimits(podTemplate *ofstv2.PodTempl

func (m *MariaDB) setMaxscaleDefaultContainerResourceLimits(podTemplate *ofstv2.PodTemplateSpec) {
dbContainer := core_util.GetContainerByName(podTemplate.Spec.Containers, kubedb.MaxscaleContainerName)
if dbContainer != nil && (dbContainer.Resources.Requests == nil && dbContainer.Resources.Limits == nil) {
if dbContainer != nil {
apis.SetDefaultResourceLimits(&dbContainer.Resources, kubedb.DefaultInitContainerResource)
}

Expand Down
2 changes: 1 addition & 1 deletion apis/kubedb/v1/memcached_helpers.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -295,7 +295,7 @@ func (m *Memcached) assignDefaultContainerSecurityContext(mcVersion *catalog.Mem

func (m *Memcached) setDefaultContainerResourceLimits(podTemplate *ofstv2.PodTemplateSpec) {
dbContainer := core_util.GetContainerByName(podTemplate.Spec.Containers, kubedb.MemcachedContainerName)
if dbContainer != nil && (dbContainer.Resources.Requests == nil && dbContainer.Resources.Limits == nil) {
if dbContainer != nil {
apis.SetDefaultResourceLimits(&dbContainer.Resources, kubedb.DefaultResources)
}
}
Expand Down
4 changes: 1 addition & 3 deletions apis/kubedb/v1/mongodb_helpers.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -833,9 +833,7 @@ func (m *MongoDB) assignDefaultContainerSecurityContext(mgVersion *v1alpha1.Mong
}

func (m *MongoDB) setContainerDefaultResources(container *core.Container, defaultResources core.ResourceRequirements) {
if container.Resources.Requests == nil && container.Resources.Limits == nil {
apis.SetDefaultResourceLimits(&container.Resources, defaultResources)
}
apis.SetDefaultResourceLimits(&container.Resources, defaultResources)
}

func (m *MongoDB) SetHealthCheckerDefaults() {
Expand Down
2 changes: 1 addition & 1 deletion apis/kubedb/v1/mysql_helpers.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -573,7 +573,7 @@ func (m *MySQL) assignDefaultContainerSecurityContext(myVersion *v1alpha1.MySQLV

func (m *MySQL) setDefaultContainerResourceLimits(podTemplate *ofstv2.PodTemplateSpec) {
dbContainer := core_util.GetContainerByName(podTemplate.Spec.Containers, kubedb.MySQLContainerName)
if dbContainer != nil && (dbContainer.Resources.Requests == nil && dbContainer.Resources.Limits == nil) {
if dbContainer != nil {
apis.SetDefaultResourceLimits(&dbContainer.Resources, kubedb.DefaultResources)
}

Expand Down
2 changes: 1 addition & 1 deletion apis/kubedb/v1/perconaxtradb_helpers.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -325,7 +325,7 @@ func (p *PerconaXtraDB) assignDefaultContainerSecurityContext(pVersion *v1alpha1

func (p *PerconaXtraDB) setDefaultContainerResourceLimits(podTemplate *ofstv2.PodTemplateSpec) {
dbContainer := core_util.GetContainerByName(podTemplate.Spec.Containers, kubedb.PerconaXtraDBContainerName)
if dbContainer != nil && (dbContainer.Resources.Requests == nil && dbContainer.Resources.Limits == nil) {
if dbContainer != nil {
apis.SetDefaultResourceLimits(&dbContainer.Resources, kubedb.DefaultResources)
}

Expand Down
6 changes: 2 additions & 4 deletions apis/kubedb/v1/pgbouncer_helpers.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -256,7 +256,7 @@ func (p *PgBouncer) SetDefaults(pgBouncerVersion *catalog.PgBouncerVersion, uses
}
}
dbContainer := core_util.GetContainerByName(p.Spec.PodTemplate.Spec.Containers, ResourceSingularPgBouncer)
if dbContainer != nil && (dbContainer.Resources.Requests == nil && dbContainer.Resources.Limits == nil) {
if dbContainer != nil {
apis.SetDefaultResourceLimits(&dbContainer.Resources, kubedb.DefaultResourcesMemoryIntensive)
}
}
Expand All @@ -271,9 +271,7 @@ func (p *PgBouncer) setPgBouncerContainerDefaults(podTemplate *ofstv2.PodTemplat
}

func (p *PgBouncer) setContainerDefaultResources(container *core.Container, defaultResources core.ResourceRequirements) {
if container.Resources.Requests == nil && container.Resources.Limits == nil {
apis.SetDefaultResourceLimits(&container.Resources, defaultResources)
}
apis.SetDefaultResourceLimits(&container.Resources, defaultResources)
}

func (p *PgBouncer) SetTLSDefaults(usesAcme bool) {
Expand Down
4 changes: 1 addition & 3 deletions apis/kubedb/v1/postgres_helpers.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -577,9 +577,7 @@ func (p *Postgres) setContainerDefaultSecurityContext(container *core.Container,
}

func (p *Postgres) setContainerDefaultResources(container *core.Container, defaultResources core.ResourceRequirements) {
if container.Resources.Requests == nil && container.Resources.Limits == nil {
apis.SetDefaultResourceLimits(&container.Resources, defaultResources)
}
apis.SetDefaultResourceLimits(&container.Resources, defaultResources)
}

func (p *Postgres) assignDefaultContainerSecurityContext(sc *core.SecurityContext, pgVersion *catalog.PostgresVersion) {
Expand Down
2 changes: 1 addition & 1 deletion apis/kubedb/v1/proxysql_helpers.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -242,7 +242,7 @@ func (p *ProxySQL) SetDefaults(psVersion *v1alpha1.ProxySQLVersion, usesAcme boo
p.SetTLSDefaults(usesAcme)
p.SetHealthCheckerDefaults()
dbContainer := core_util.GetContainerByName(p.Spec.PodTemplate.Spec.Containers, kubedb.ProxySQLContainerName)
if dbContainer != nil && (dbContainer.Resources.Requests == nil && dbContainer.Resources.Limits == nil) {
if dbContainer != nil {
apis.SetDefaultResourceLimits(&dbContainer.Resources, kubedb.DefaultResources)
}
}
Expand Down
2 changes: 1 addition & 1 deletion apis/kubedb/v1/redis_helpers.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -430,7 +430,7 @@ func (r *Redis) assignDefaultContainerSecurityContext(rdVersion *catalog.RedisVe

func (r *Redis) setDefaultContainerResourceLimits(podTemplate *ofstv2.PodTemplateSpec) {
dbContainer := core_util.GetContainerByName(podTemplate.Spec.Containers, kubedb.RedisContainerName)
if dbContainer != nil && (dbContainer.Resources.Requests == nil && dbContainer.Resources.Limits == nil) {
if dbContainer != nil {
apis.SetDefaultResourceLimits(&dbContainer.Resources, kubedb.DefaultResources)
}

Expand Down
2 changes: 1 addition & 1 deletion apis/kubedb/v1/redis_sentinel_helpers.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -339,7 +339,7 @@ func (rs *RedisSentinel) assignDefaultContainerSecurityContext(rdVersion *catalo

func (rs *RedisSentinel) setDefaultContainerResourceLimits(podTemplate *ofstv2.PodTemplateSpec) {
dbContainer := core_util.GetContainerByName(podTemplate.Spec.Containers, kubedb.RedisSentinelContainerName)
if dbContainer != nil && (dbContainer.Resources.Requests == nil && dbContainer.Resources.Limits == nil) {
if dbContainer != nil {
apis.SetDefaultResourceLimits(&dbContainer.Resources, kubedb.DefaultResources)
}

Expand Down
Loading
Loading