public_git
/
postgres-operator
mirror of https://github.com/zalando/postgres-operator.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

rename function that enforces min resource limits

This commit is contained in:
Felix Kunde 2020-02-03 11:39:00 +01:00
parent fe7aa92e73
commit 861153605c
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
pkg/cluster/cluster.go
View File

@ -227,8 +227,8 @@ func (c *Cluster) Create() error {
c.setStatus(acidv1.ClusterStatusCreating) c.setStatus(acidv1.ClusterStatusCreating)
if err = c.validateResources(&c.Spec); err != nil { if err = c.enforceMinResourceLimits(&c.Spec); err != nil {
return fmt.Errorf("could not validate postgresql resources: %v", err) return fmt.Errorf("could not enforce minimum resource limits: %v", err)
} }
for _, role := range []PostgresRole{Master, Replica} { for _, role := range []PostgresRole{Master, Replica} {
@ -495,7 +495,7 @@ func compareResourcesAssumeFirstNotNil(a *v1.ResourceRequirements, b *v1.Resourc
} }
func (c *Cluster) validateResources(spec *acidv1.PostgresSpec) error { func (c *Cluster) enforceMinResourceLimits(spec *acidv1.PostgresSpec) error {
var ( var (
isSmaller bool isSmaller bool
@ -510,7 +510,7 @@ func (c *Cluster) validateResources(spec *acidv1.PostgresSpec) error {
if cpuLimit != "" { if cpuLimit != "" {
isSmaller, err = util.IsSmallerQuantity(cpuLimit, minCPULimit) isSmaller, err = util.IsSmallerQuantity(cpuLimit, minCPULimit)
if err != nil { if err != nil {
return fmt.Errorf("error validating CPU limit: %v", err) return fmt.Errorf("could not compare defined CPU limit %s with configured minimum value %s: %v", cpuLimit, minCPULimit, err)
} }
if isSmaller { if isSmaller {
c.logger.Warningf("defined CPU limit %s is below required minimum %s and will be set to it", cpuLimit, minCPULimit) c.logger.Warningf("defined CPU limit %s is below required minimum %s and will be set to it", cpuLimit, minCPULimit)
@ -522,7 +522,7 @@ func (c *Cluster) validateResources(spec *acidv1.PostgresSpec) error {
if memoryLimit != "" { if memoryLimit != "" {
isSmaller, err = util.IsSmallerQuantity(memoryLimit, minMemoryLimit) isSmaller, err = util.IsSmallerQuantity(memoryLimit, minMemoryLimit)
if err != nil { if err != nil {
return fmt.Errorf("error validating memory limit: %v", err) return fmt.Errorf("could not compare defined memory limit %s with configured minimum value %s: %v", memoryLimit, minMemoryLimit, err)
} }
if isSmaller { if isSmaller {
c.logger.Warningf("defined memory limit %s is below required minimum %s and will be set to it", memoryLimit, minMemoryLimit) c.logger.Warningf("defined memory limit %s is below required minimum %s and will be set to it", memoryLimit, minMemoryLimit)
@ -599,7 +599,7 @@ func (c *Cluster) Update(oldSpec, newSpec *acidv1.Postgresql) error {
// Statefulset // Statefulset
func() { func() {
if err := c.validateResources(&c.Spec); err != nil { if err := c.enforceMinResourceLimits(&c.Spec); err != nil {
c.logger.Errorf("could not sync resources: %v", err) c.logger.Errorf("could not sync resources: %v", err)
updateFailed = true updateFailed = true
return return
@ -613,7 +613,7 @@ func (c *Cluster) Update(oldSpec, newSpec *acidv1.Postgresql) error {
} }
// update newSpec to for latter comparison with oldSpec // update newSpec to for latter comparison with oldSpec
c.validateResources(&newSpec.Spec) c.enforceMinResourceLimits(&newSpec.Spec)
newSs, err := c.generateStatefulSet(&newSpec.Spec) newSs, err := c.generateStatefulSet(&newSpec.Spec)
if err != nil { if err != nil {

4
pkg/cluster/sync.go
View File

@ -65,8 +65,8 @@ func (c *Cluster) Sync(newSpec *acidv1.Postgresql) error {
return err return err
} }
if err = c.validateResources(&c.Spec); err != nil { if err = c.enforceMinResourceLimits(&c.Spec); err != nil {
err = fmt.Errorf("could not validate postgresql resources: %v", err) err = fmt.Errorf("could not enforce minimum resource limits: %v", err)
return err return err
} }