diff --git a/pkg/cluster/k8sres.go b/pkg/cluster/k8sres.go index a23b9e195..23f3b9cd6 100644 --- a/pkg/cluster/k8sres.go +++ b/pkg/cluster/k8sres.go @@ -139,8 +139,8 @@ func (c *Cluster) makeDefaultResources() acidv1.Resources { func generateResourceRequirements(resources *acidv1.Resources, defaultResources acidv1.Resources) (*v1.ResourceRequirements, error) { var err error - var specRequests acidv1.ResourceDescription - var specLimits acidv1.ResourceDescription + var specRequests, specLimits acidv1.ResourceDescription + if resources == nil { specRequests = acidv1.ResourceDescription{} specLimits = acidv1.ResourceDescription{} @@ -1024,7 +1024,6 @@ func (c *Cluster) generateStatefulSet(spec *acidv1.PostgresSpec) (*appsv1.Statef 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) spec.Resources.ResourceRequests.Memory = limit - } // 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() - resourceRequirements, err := generateResourceRequirements(spec.Resources, defaultResources) if err != nil { return nil, fmt.Errorf("could not generate resource requirements: %v", err)