diff --git a/apis/elasticsearch/v1alpha1/elasticsearchdashboard_helpers.go b/apis/elasticsearch/v1alpha1/elasticsearchdashboard_helpers.go index eb0defa386..77ea6f6cde 100644 --- a/apis/elasticsearch/v1alpha1/elasticsearchdashboard_helpers.go +++ b/apis/elasticsearch/v1alpha1/elasticsearchdashboard_helpers.go @@ -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) } } diff --git a/apis/helpers.go b/apis/helpers.go index 5766955913..dbd24e6246 100644 --- a/apis/helpers.go +++ b/apis/helpers.go @@ -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 @@ -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 @@ -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 + } + } + } } diff --git a/apis/kafka/v1alpha1/connect_cluster_helpers.go b/apis/kafka/v1alpha1/connect_cluster_helpers.go index 5b59a47578..1e912d9182 100644 --- a/apis/kafka/v1alpha1/connect_cluster_helpers.go +++ b/apis/kafka/v1alpha1/connect_cluster_helpers.go @@ -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) } diff --git a/apis/kafka/v1alpha1/restproxy_helpers.go b/apis/kafka/v1alpha1/restproxy_helpers.go index 663a883307..5b11ba6009 100644 --- a/apis/kafka/v1alpha1/restproxy_helpers.go +++ b/apis/kafka/v1alpha1/restproxy_helpers.go @@ -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) } diff --git a/apis/kafka/v1alpha1/schemaregistry_helpers.go b/apis/kafka/v1alpha1/schemaregistry_helpers.go index 1eda35954d..6f250196b4 100644 --- a/apis/kafka/v1alpha1/schemaregistry_helpers.go +++ b/apis/kafka/v1alpha1/schemaregistry_helpers.go @@ -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) } diff --git a/apis/kubedb/v1/elasticsearch_helpers.go b/apis/kubedb/v1/elasticsearch_helpers.go index 073003828d..71f1bdbe8e 100644 --- a/apis/kubedb/v1/elasticsearch_helpers.go +++ b/apis/kubedb/v1/elasticsearch_helpers.go @@ -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 { @@ -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 { @@ -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 { @@ -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 { @@ -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 { @@ -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 { @@ -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 { @@ -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 { @@ -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 { @@ -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 { @@ -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 { diff --git a/apis/kubedb/v1/kafka_helpers.go b/apis/kubedb/v1/kafka_helpers.go index 9d12ea0c61..82930c6cde 100644 --- a/apis/kubedb/v1/kafka_helpers.go +++ b/apis/kubedb/v1/kafka_helpers.go @@ -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) } } @@ -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) } } @@ -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) } } diff --git a/apis/kubedb/v1/mariadb_helpers.go b/apis/kubedb/v1/mariadb_helpers.go index ad709e77a3..289e456d23 100644 --- a/apis/kubedb/v1/mariadb_helpers.go +++ b/apis/kubedb/v1/mariadb_helpers.go @@ -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) } @@ -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) } diff --git a/apis/kubedb/v1/memcached_helpers.go b/apis/kubedb/v1/memcached_helpers.go index a3f5d09831..50285a10a5 100644 --- a/apis/kubedb/v1/memcached_helpers.go +++ b/apis/kubedb/v1/memcached_helpers.go @@ -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) } } diff --git a/apis/kubedb/v1/mongodb_helpers.go b/apis/kubedb/v1/mongodb_helpers.go index f1aff481f6..579b0d0595 100644 --- a/apis/kubedb/v1/mongodb_helpers.go +++ b/apis/kubedb/v1/mongodb_helpers.go @@ -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() { diff --git a/apis/kubedb/v1/mysql_helpers.go b/apis/kubedb/v1/mysql_helpers.go index d0600fca17..4290b08b05 100644 --- a/apis/kubedb/v1/mysql_helpers.go +++ b/apis/kubedb/v1/mysql_helpers.go @@ -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) } diff --git a/apis/kubedb/v1/perconaxtradb_helpers.go b/apis/kubedb/v1/perconaxtradb_helpers.go index f8656e794b..4e1d83d77a 100644 --- a/apis/kubedb/v1/perconaxtradb_helpers.go +++ b/apis/kubedb/v1/perconaxtradb_helpers.go @@ -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) } diff --git a/apis/kubedb/v1/pgbouncer_helpers.go b/apis/kubedb/v1/pgbouncer_helpers.go index 3613930e09..b54099cf1f 100644 --- a/apis/kubedb/v1/pgbouncer_helpers.go +++ b/apis/kubedb/v1/pgbouncer_helpers.go @@ -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) } } @@ -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) { diff --git a/apis/kubedb/v1/postgres_helpers.go b/apis/kubedb/v1/postgres_helpers.go index 79ec73ec6d..acb91b2d72 100644 --- a/apis/kubedb/v1/postgres_helpers.go +++ b/apis/kubedb/v1/postgres_helpers.go @@ -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) { diff --git a/apis/kubedb/v1/proxysql_helpers.go b/apis/kubedb/v1/proxysql_helpers.go index 53554e5973..e38660c25f 100644 --- a/apis/kubedb/v1/proxysql_helpers.go +++ b/apis/kubedb/v1/proxysql_helpers.go @@ -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) } } diff --git a/apis/kubedb/v1/redis_helpers.go b/apis/kubedb/v1/redis_helpers.go index 3769e7daa2..27f568efc5 100644 --- a/apis/kubedb/v1/redis_helpers.go +++ b/apis/kubedb/v1/redis_helpers.go @@ -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) } diff --git a/apis/kubedb/v1/redis_sentinel_helpers.go b/apis/kubedb/v1/redis_sentinel_helpers.go index 07f88c8bca..a63970f499 100644 --- a/apis/kubedb/v1/redis_sentinel_helpers.go +++ b/apis/kubedb/v1/redis_sentinel_helpers.go @@ -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) } diff --git a/apis/kubedb/v1alpha2/cassandra_helpers.go b/apis/kubedb/v1alpha2/cassandra_helpers.go index 95c9845e9a..eb16f909dd 100644 --- a/apis/kubedb/v1alpha2/cassandra_helpers.go +++ b/apis/kubedb/v1alpha2/cassandra_helpers.go @@ -354,7 +354,7 @@ func (r *Cassandra) SetDefaults(kc client.Client) { } dbContainer := coreutil.GetContainerByName(rack.PodTemplate.Spec.Containers, kubedb.CassandraContainerName) - if dbContainer != nil && (dbContainer.Resources.Requests == nil && dbContainer.Resources.Limits == nil) { + if dbContainer != nil { apis.SetDefaultResourceLimits(&dbContainer.Resources, kubedb.DefaultResources) } r.setDefaultContainerSecurityContext(&casVersion, rack.PodTemplate) @@ -374,7 +374,7 @@ func (r *Cassandra) SetDefaults(kc client.Client) { } r.setDefaultContainerSecurityContext(&casVersion, r.Spec.PodTemplate) dbContainer := coreutil.GetContainerByName(r.Spec.PodTemplate.Spec.Containers, kubedb.CassandraContainerName) - if dbContainer != nil && (dbContainer.Resources.Requests == nil && dbContainer.Resources.Limits == nil) { + if dbContainer != nil { apis.SetDefaultResourceLimits(&dbContainer.Resources, kubedb.DefaultResources) } r.SetHealthCheckerDefaults() diff --git a/apis/kubedb/v1alpha2/clickhouse_helpers.go b/apis/kubedb/v1alpha2/clickhouse_helpers.go index f840d25605..b32c914173 100644 --- a/apis/kubedb/v1alpha2/clickhouse_helpers.go +++ b/apis/kubedb/v1alpha2/clickhouse_helpers.go @@ -389,7 +389,7 @@ func (c *ClickHouse) SetDefaults(kc client.Client) { } dbContainer := coreutil.GetContainerByName(cluster.PodTemplate.Spec.Containers, kubedb.ClickHouseContainerName) - if dbContainer != nil && (dbContainer.Resources.Requests == nil && dbContainer.Resources.Limits == nil) { + if dbContainer != nil { apis.SetDefaultResourceLimits(&dbContainer.Resources, kubedb.ClickHouseDefaultResources) } c.setDefaultContainerSecurityContext(&chVersion, cluster.PodTemplate) @@ -409,7 +409,7 @@ func (c *ClickHouse) SetDefaults(kc client.Client) { } c.setKeeperDefaultContainerSecurityContext(&chVersion, c.Spec.ClusterTopology.ClickHouseKeeper.Spec.PodTemplate) dbContainer := coreutil.GetContainerByName(c.Spec.ClusterTopology.ClickHouseKeeper.Spec.PodTemplate.Spec.Containers, kubedb.ClickHouseKeeperContainerName) - if dbContainer != nil && (dbContainer.Resources.Requests == nil && dbContainer.Resources.Limits == nil) { + if dbContainer != nil { apis.SetDefaultResourceLimits(&dbContainer.Resources, kubedb.DefaultResources) } } @@ -429,7 +429,7 @@ func (c *ClickHouse) SetDefaults(kc client.Client) { } c.setDefaultContainerSecurityContext(&chVersion, c.Spec.PodTemplate) dbContainer := coreutil.GetContainerByName(c.Spec.PodTemplate.Spec.Containers, kubedb.ClickHouseContainerName) - if dbContainer != nil && (dbContainer.Resources.Requests == nil && dbContainer.Resources.Limits == nil) { + if dbContainer != nil { apis.SetDefaultResourceLimits(&dbContainer.Resources, kubedb.ClickHouseDefaultResources) } } diff --git a/apis/kubedb/v1alpha2/druid_helpers.go b/apis/kubedb/v1alpha2/druid_helpers.go index f8c2d1a1da..eea585a492 100644 --- a/apis/kubedb/v1alpha2/druid_helpers.go +++ b/apis/kubedb/v1alpha2/druid_helpers.go @@ -727,7 +727,7 @@ func (d *Druid) assignDefaultContainerSecurityContext(druidVersion *catalog.Drui func (d *Druid) setDefaultContainerResourceLimits(podTemplate *ofst.PodTemplateSpec, nodeRole DruidNodeRoleType) { dbContainer := coreutil.GetContainerByName(podTemplate.Spec.Containers, kubedb.DruidContainerName) - if dbContainer != nil && (dbContainer.Resources.Requests == nil && dbContainer.Resources.Limits == nil) { + if dbContainer != nil { if nodeRole == DruidNodeRoleMiddleManagers { apis.SetDefaultResourceLimits(&dbContainer.Resources, kubedb.DefaultResourcesMemoryIntensiveDruid) } else { diff --git a/apis/kubedb/v1alpha2/hanadb_helpers.go b/apis/kubedb/v1alpha2/hanadb_helpers.go index 9008515e0c..1ecbb9851b 100644 --- a/apis/kubedb/v1alpha2/hanadb_helpers.go +++ b/apis/kubedb/v1alpha2/hanadb_helpers.go @@ -587,7 +587,7 @@ func (h *HanaDB) assignDefaultContainerSecurityContext(hanadbVersion *catalog.Ha func (h *HanaDB) setDefaultContainerResourceLimits(podTemplate *ofst.PodTemplateSpec) { dbContainer := coreutil.GetContainerByName(podTemplate.Spec.Containers, kubedb.HanaDBContainerName) - if dbContainer != nil && (dbContainer.Resources.Requests == nil && dbContainer.Resources.Limits == nil) { + if dbContainer != nil { apis.SetDefaultResourceLimits(&dbContainer.Resources, kubedb.DefaultResourcesHanaDB) } } diff --git a/apis/kubedb/v1alpha2/hazelcast_helpers.go b/apis/kubedb/v1alpha2/hazelcast_helpers.go index f69ad0da3c..e7d3e3f536 100644 --- a/apis/kubedb/v1alpha2/hazelcast_helpers.go +++ b/apis/kubedb/v1alpha2/hazelcast_helpers.go @@ -317,7 +317,7 @@ var ( func (h *Hazelcast) setDefaultContainerResourceLimits(podTemplate *ofst.PodTemplateSpec) { dbContainer := coreutil.GetContainerByName(podTemplate.Spec.Containers, "hazelcast") - if dbContainer != nil && (dbContainer.Resources.Requests == nil && dbContainer.Resources.Limits == nil) { + if dbContainer != nil { apis.SetDefaultResourceLimits(&dbContainer.Resources, DefaultResourcesMemoryIntensive) } diff --git a/apis/kubedb/v1alpha2/kafka_helpers.go b/apis/kubedb/v1alpha2/kafka_helpers.go index f6cec0ecab..81f58f8bca 100644 --- a/apis/kubedb/v1alpha2/kafka_helpers.go +++ b/apis/kubedb/v1alpha2/kafka_helpers.go @@ -349,9 +349,7 @@ func (k *Kafka) SetDefaults(kc client.Client) { k.Spec.Topology.Controller.Replicas = pointer.Int32P(1) } - if k.Spec.Topology.Controller.Resources.Requests == nil && k.Spec.Topology.Controller.Resources.Limits == nil { - apis.SetDefaultResourceLimits(&k.Spec.Topology.Controller.Resources, kubedb.DefaultResources) - } + apis.SetDefaultResourceLimits(&k.Spec.Topology.Controller.Resources, kubedb.DefaultResources) } if k.Spec.Topology.Broker != nil { @@ -361,13 +359,11 @@ func (k *Kafka) SetDefaults(kc client.Client) { if k.Spec.Topology.Broker.Replicas == nil { k.Spec.Topology.Broker.Replicas = pointer.Int32P(1) } - if k.Spec.Topology.Broker.Resources.Requests == nil && k.Spec.Topology.Broker.Resources.Limits == nil { - apis.SetDefaultResourceLimits(&k.Spec.Topology.Broker.Resources, kubedb.DefaultResources) - } + apis.SetDefaultResourceLimits(&k.Spec.Topology.Broker.Resources, kubedb.DefaultResources) } } else { 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.DefaultResources) } if k.Spec.Replicas == nil { diff --git a/apis/kubedb/v1alpha2/milvus_helpers.go b/apis/kubedb/v1alpha2/milvus_helpers.go index 2b7ea7c605..5c55cf8279 100644 --- a/apis/kubedb/v1alpha2/milvus_helpers.go +++ b/apis/kubedb/v1alpha2/milvus_helpers.go @@ -439,7 +439,7 @@ func (m *Milvus) AssignDefaultContainerSecurityContext(mvVersion *catalog.Milvus func (m *Milvus) setDefaultContainerResourceLimits(podTemplate *ofstv2.PodTemplateSpec) { dbContainer := coreutil.GetContainerByName(podTemplate.Spec.Containers, kubedb.MilvusContainerName) - if dbContainer != nil && (dbContainer.Resources.Requests == nil && dbContainer.Resources.Limits == nil) { + if dbContainer != nil { apis.SetDefaultResourceLimits(&dbContainer.Resources, kubedb.DefaultResources) } } diff --git a/apis/kubedb/v1alpha2/mssqlserver_helpers.go b/apis/kubedb/v1alpha2/mssqlserver_helpers.go index e29aaf3e1e..22e4c9e1bf 100644 --- a/apis/kubedb/v1alpha2/mssqlserver_helpers.go +++ b/apis/kubedb/v1alpha2/mssqlserver_helpers.go @@ -544,7 +544,7 @@ func (m *MSSQLServer) assignDefaultContainerSecurityContext(mssqlVersion *catalo func (m *MSSQLServer) setDefaultContainerResourceLimits(podTemplate *ofst.PodTemplateSpec) { dbContainer := coreutil.GetContainerByName(podTemplate.Spec.Containers, kubedb.MSSQLContainerName) - if dbContainer != nil && (dbContainer.Resources.Requests == nil && dbContainer.Resources.Limits == nil) { + if dbContainer != nil { apis.SetDefaultResourceLimits(&dbContainer.Resources, kubedb.DefaultResourcesMSSQLServer) } diff --git a/apis/kubedb/v1alpha2/neo4j_helpers.go b/apis/kubedb/v1alpha2/neo4j_helpers.go index 158271024f..24027b62b8 100644 --- a/apis/kubedb/v1alpha2/neo4j_helpers.go +++ b/apis/kubedb/v1alpha2/neo4j_helpers.go @@ -163,7 +163,7 @@ func (r *Neo4j) SetDefaults(kc client.Client) { r.SetTLSDefaults() dbContainer := coreutil.GetContainerByName(r.Spec.PodTemplate.Spec.Containers, kubedb.Neo4jContainerName) - if dbContainer != nil && (dbContainer.Resources.Requests == nil && dbContainer.Resources.Limits == nil) { + if dbContainer != nil { apis.SetDefaultResourceLimits(&dbContainer.Resources, kubedb.DefaultResourcesNeo4j) } } diff --git a/apis/kubedb/v1alpha2/oracle_helpers.go b/apis/kubedb/v1alpha2/oracle_helpers.go index 65c1eab5c7..e513ab381e 100644 --- a/apis/kubedb/v1alpha2/oracle_helpers.go +++ b/apis/kubedb/v1alpha2/oracle_helpers.go @@ -473,9 +473,7 @@ func (p *Oracle) assignDefaultContainerSecurityContext(sc *core.SecurityContext, } func (o *Oracle) 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 (o *Oracle) SetDataGuardDefaults() { diff --git a/apis/kubedb/v1alpha2/pgpool_helpers.go b/apis/kubedb/v1alpha2/pgpool_helpers.go index 80b6c4d0a0..277b40ad73 100644 --- a/apis/kubedb/v1alpha2/pgpool_helpers.go +++ b/apis/kubedb/v1alpha2/pgpool_helpers.go @@ -350,7 +350,7 @@ func (p *Pgpool) assignContainerSecurityContext(ppVersion *catalog.PgpoolVersion func (p *Pgpool) setContainerResourceLimits(podTemplate *ofst.PodTemplateSpec) { ppContainer := core_util.GetContainerByName(podTemplate.Spec.Containers, kubedb.PgpoolContainerName) - if ppContainer != nil && (ppContainer.Resources.Requests == nil && ppContainer.Resources.Limits == nil) { + if ppContainer != nil { apis.SetDefaultResourceLimits(&ppContainer.Resources, kubedb.DefaultResources) } } diff --git a/apis/kubedb/v1alpha2/qdrant_helpers.go b/apis/kubedb/v1alpha2/qdrant_helpers.go index 1e4ef72f91..884daee685 100644 --- a/apis/kubedb/v1alpha2/qdrant_helpers.go +++ b/apis/kubedb/v1alpha2/qdrant_helpers.go @@ -413,7 +413,7 @@ func (q *Qdrant) assignDefaultContainerSecurityContext(qdVersion *catalog.Qdrant func (q *Qdrant) setDefaultContainerResourceLimits(podTemplate *ofst.PodTemplateSpec) { dbContainer := coreutil.GetContainerByName(podTemplate.Spec.Containers, kubedb.QdrantContainerName) - if dbContainer != nil && (dbContainer.Resources.Requests == nil && dbContainer.Resources.Limits == nil) { + if dbContainer != nil { apis.SetDefaultResourceLimits(&dbContainer.Resources, kubedb.DefaultResources) } } diff --git a/apis/kubedb/v1alpha2/rabbitmq_helpers.go b/apis/kubedb/v1alpha2/rabbitmq_helpers.go index fa5c68c25d..171206e6e6 100644 --- a/apis/kubedb/v1alpha2/rabbitmq_helpers.go +++ b/apis/kubedb/v1alpha2/rabbitmq_helpers.go @@ -311,7 +311,7 @@ func (r *RabbitMQ) SetDefaults(kc client.Client) { r.setDefaultContainerSecurityContext(&rmVersion, &r.Spec.PodTemplate) dbContainer := coreutil.GetContainerByName(r.Spec.PodTemplate.Spec.Containers, kubedb.RabbitMQContainerName) - if dbContainer != nil && (dbContainer.Resources.Requests == nil && dbContainer.Resources.Limits == nil) { + if dbContainer != nil { apis.SetDefaultResourceLimits(&dbContainer.Resources, kubedb.DefaultResources) } diff --git a/apis/kubedb/v1alpha2/singlestore_helpers.go b/apis/kubedb/v1alpha2/singlestore_helpers.go index 25e344fd72..94c771e86f 100644 --- a/apis/kubedb/v1alpha2/singlestore_helpers.go +++ b/apis/kubedb/v1alpha2/singlestore_helpers.go @@ -498,7 +498,7 @@ func (s *Singlestore) assignDefaultContainerSecurityContext(sdbVersion *catalog. func (s *Singlestore) setDefaultContainerResourceLimits(podTemplate *ofst.PodTemplateSpec) { dbContainer := coreutil.GetContainerByName(podTemplate.Spec.Containers, kubedb.SinglestoreContainerName) - if dbContainer != nil && (dbContainer.Resources.Requests == nil && dbContainer.Resources.Limits == nil) { + if dbContainer != nil { apis.SetDefaultResourceLimits(&dbContainer.Resources, kubedb.DefaultResourcesMemoryIntensiveSDB) } diff --git a/apis/kubedb/v1alpha2/solr_helpers.go b/apis/kubedb/v1alpha2/solr_helpers.go index aaf1e299f4..624d345d63 100644 --- a/apis/kubedb/v1alpha2/solr_helpers.go +++ b/apis/kubedb/v1alpha2/solr_helpers.go @@ -482,7 +482,7 @@ func (s *Solr) assignDefaultContainerSecurityContext(slVersion *catalog.SolrVers func (s *Solr) setDefaultContainerResourceLimits(podTemplate *ofst.PodTemplateSpec) { dbContainer := coreutil.GetContainerByName(podTemplate.Spec.Containers, kubedb.SolrContainerName) - if dbContainer != nil && (dbContainer.Resources.Requests == nil && dbContainer.Resources.Limits == nil) { + if dbContainer != nil { apis.SetDefaultResourceLimits(&dbContainer.Resources, kubedb.DefaultResourcesCoreAndMemoryIntensiveSolr) } diff --git a/apis/kubedb/v1alpha2/weaviate_helpers.go b/apis/kubedb/v1alpha2/weaviate_helpers.go index e0f20c7939..01e6eeba5c 100644 --- a/apis/kubedb/v1alpha2/weaviate_helpers.go +++ b/apis/kubedb/v1alpha2/weaviate_helpers.go @@ -186,7 +186,7 @@ func (w *Weaviate) SetDefaults(kc client.Client) { w.setDefaultContainerSecurityContext(&wvVersion, &w.Spec.PodTemplate) dbContainer := coreutil.GetContainerByName(w.Spec.PodTemplate.Spec.Containers, kubedb.WeaviateContainerName) - if dbContainer != nil && (dbContainer.Resources.Requests == nil && dbContainer.Resources.Limits == nil) { + if dbContainer != nil { apis.SetDefaultResourceLimits(&dbContainer.Resources, kubedb.DefaultResources) } diff --git a/apis/kubedb/v1alpha2/zookeeper_helpers.go b/apis/kubedb/v1alpha2/zookeeper_helpers.go index 033279d35d..901eda84c4 100644 --- a/apis/kubedb/v1alpha2/zookeeper_helpers.go +++ b/apis/kubedb/v1alpha2/zookeeper_helpers.go @@ -227,7 +227,7 @@ func (z *ZooKeeper) SetDefaults(kc client.Client) { z.setDefaultContainerSecurityContext(&zkVersion, &z.Spec.PodTemplate) dbContainer := coreutil.GetContainerByName(z.Spec.PodTemplate.Spec.Containers, kubedb.ZooKeeperContainerName) - if dbContainer != nil && (dbContainer.Resources.Requests == nil && dbContainer.Resources.Limits == nil) { + if dbContainer != nil { apis.SetDefaultResourceLimits(&dbContainer.Resources, kubedb.DefaultResources) }