diff --git a/pkg/cluster/k8sres.go b/pkg/cluster/k8sres.go index 53249457b..73be712ca 100644 --- a/pkg/cluster/k8sres.go +++ b/pkg/cluster/k8sres.go @@ -789,7 +789,7 @@ func (c *Cluster) generateStatefulSet(spec *acidv1.PostgresSpec) (*appsv1.Statef if spec.InitContainers != nil && len(spec.InitContainers) > 0 { if c.OpConfig.EnableInitContainers != nil && !(*c.OpConfig.EnableInitContainers) { - c.logger.Warningf("initContainers in use but globally disabled - next statefulSet creation would fail") + c.logger.Warningf("initContainers specified but disabled in configuration - next statefulset creation would fail") } initContainers = spec.InitContainers } @@ -882,7 +882,7 @@ func (c *Cluster) generateStatefulSet(spec *acidv1.PostgresSpec) (*appsv1.Statef // generate sidecar containers if sideCars != nil && len(sideCars) > 0 { if c.OpConfig.EnableSidecars != nil && !(*c.OpConfig.EnableSidecars) { - c.logger.Warningf("sidecars in use but globally disabled - next stateful set creation would fail") + c.logger.Warningf("sidecars specified but disabled in configuration - next statefulset creation would fail") } if sidecarContainers, err = generateSidecarContainers(sideCars, volumeMounts, defaultResources, c.OpConfig.SuperUsername, c.credentialSecretName(c.OpConfig.SuperUsername), c.logger); err != nil { diff --git a/pkg/cluster/resources.go b/pkg/cluster/resources.go index 9936a1371..c94a7bb46 100644 --- a/pkg/cluster/resources.go +++ b/pkg/cluster/resources.go @@ -68,12 +68,12 @@ func (c *Cluster) createStatefulSet() (*appsv1.StatefulSet, error) { // check if it's allowed that spec contains initContainers if c.Spec.InitContainers != nil && len(c.Spec.InitContainers) > 0 && c.OpConfig.EnableInitContainers != nil && !(*c.OpConfig.EnableInitContainers) { - return nil, fmt.Errorf("initContainers specified but globally disabled") + return nil, fmt.Errorf("initContainers specified but disabled in configuration") } // check if it's allowed that spec contains sidecars if c.Spec.Sidecars != nil && len(c.Spec.Sidecars) > 0 && c.OpConfig.EnableSidecars != nil && !(*c.OpConfig.EnableSidecars) { - return nil, fmt.Errorf("sidecar containers specified but globally disabled") + return nil, fmt.Errorf("sidecar containers specified but disabled in configuration") } statefulSetSpec, err := c.generateStatefulSet(&c.Spec)