Skip to content

Commit e0b55ff

Browse files
committed
Fix bug where logrotate config was only added when a volume repo existed.
1 parent 75015e1 commit e0b55ff

File tree

1 file changed

+4
-6
lines changed

1 file changed

+4
-6
lines changed

internal/controller/postgrescluster/instance.go

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1169,7 +1169,7 @@ func (r *Reconciler) reconcileInstance(
11691169
)
11701170

11711171
if err == nil {
1172-
instanceConfigMap, err = r.reconcileInstanceConfigMap(ctx, cluster, spec, instance, otelConfig)
1172+
instanceConfigMap, err = r.reconcileInstanceConfigMap(ctx, cluster, spec, instance, otelConfig, backupsSpecFound)
11731173
}
11741174
if err == nil {
11751175
instanceCertificates, err = r.reconcileInstanceCertificates(
@@ -1410,7 +1410,7 @@ func addPGBackRestToInstancePodSpec(
14101410
// files (etc) that apply to instance of cluster.
14111411
func (r *Reconciler) reconcileInstanceConfigMap(
14121412
ctx context.Context, cluster *v1beta1.PostgresCluster, spec *v1beta1.PostgresInstanceSetSpec,
1413-
instance *appsv1.StatefulSet, otelConfig *collector.Config,
1413+
instance *appsv1.StatefulSet, otelConfig *collector.Config, backupsSpecFound bool,
14141414
) (*corev1.ConfigMap, error) {
14151415
instanceConfigMap := &corev1.ConfigMap{ObjectMeta: naming.InstanceConfigMap(instance)}
14161416
instanceConfigMap.SetGroupVersionKind(corev1.SchemeGroupVersion.WithKind("ConfigMap"))
@@ -1437,11 +1437,9 @@ func (r *Reconciler) reconcileInstanceConfigMap(
14371437
err = collector.AddToConfigMap(ctx, otelConfig, instanceConfigMap)
14381438

14391439
// Add pgbackrest logrotate if OpenTelemetryLogs is enabled and
1440-
// local volumes are available
1440+
// backups are enabled
14411441
if err == nil &&
1442-
feature.Enabled(ctx, feature.OpenTelemetryLogs) &&
1443-
pgbackrest.RepoHostVolumeDefined(cluster) &&
1444-
cluster.Spec.Instrumentation != nil {
1442+
collector.OpenTelemetryLogsEnabled(ctx, cluster) && backupsSpecFound {
14451443

14461444
collector.AddLogrotateConfigs(ctx, cluster.Spec.Instrumentation,
14471445
instanceConfigMap,

0 commit comments

Comments
 (0)