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

more minor changes

This commit is contained in:
Felix Kunde 2022-03-19 00:06:42 +01:00
parent 5b4282101b
commit c9c71130d4
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkg/cluster/k8sres.go
View File

@ -139,8 +139,8 @@ func (c *Cluster) makeDefaultResources() acidv1.Resources {
func generateResourceRequirements(resources *acidv1.Resources, defaultResources acidv1.Resources) (*v1.ResourceRequirements, error) { func generateResourceRequirements(resources *acidv1.Resources, defaultResources acidv1.Resources) (*v1.ResourceRequirements, error) {
var err error var err error
var specRequests acidv1.ResourceDescription var specRequests, specLimits acidv1.ResourceDescription
var specLimits acidv1.ResourceDescription
if resources == nil { if resources == nil {
specRequests = acidv1.ResourceDescription{} specRequests = acidv1.ResourceDescription{}
specLimits = acidv1.ResourceDescription{} specLimits = acidv1.ResourceDescription{}
@ -1024,7 +1024,6 @@ func (c *Cluster) generateStatefulSet(spec *acidv1.PostgresSpec) (*appsv1.Statef
if isSmaller { if isSmaller {
c.logger.Warningf("The memory request of %v for the Postgres container is increased to match the memory limit of %v.", request, limit) c.logger.Warningf("The memory request of %v for the Postgres container is increased to match the memory limit of %v.", request, limit)
spec.Resources.ResourceRequests.Memory = limit spec.Resources.ResourceRequests.Memory = limit
} }
// controller adjusts the Scalyr sidecar request at operator startup // controller adjusts the Scalyr sidecar request at operator startup
@ -1057,7 +1056,6 @@ func (c *Cluster) generateStatefulSet(spec *acidv1.PostgresSpec) (*appsv1.Statef
} }
defaultResources := c.makeDefaultResources() defaultResources := c.makeDefaultResources()
resourceRequirements, err := generateResourceRequirements(spec.Resources, defaultResources) resourceRequirements, err := generateResourceRequirements(spec.Resources, defaultResources)
if err != nil { if err != nil {
return nil, fmt.Errorf("could not generate resource requirements: %v", err) return nil, fmt.Errorf("could not generate resource requirements: %v", err)