fix: SGDistributedLogs does not set retention policy for timesacledb 2.x

Author: teoincontatto

stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/common/StackGresDistributedLogsUtil.java

@@ -6,12 +6,14 @@
 package io.stackgres.operator.common;
 
 import java.util.List;
+import java.util.Objects;
 import java.util.Optional;
 
 import io.stackgres.common.ExtensionTuple;
 import io.stackgres.common.StackGresComponent;
 import io.stackgres.common.StackGresUtil;
 import io.stackgres.common.StackGresVersion;
+import io.stackgres.common.crd.sgcluster.StackGresClusterExtension;
 import io.stackgres.common.crd.sgcluster.StackGresPostgresFlavor;
 import io.stackgres.common.crd.sgdistributedlogs.StackGresDistributedLogs;
 import io.stackgres.common.crd.sgdistributedlogs.StackGresDistributedLogsStatus;
@@ -21,8 +23,9 @@
 public interface StackGresDistributedLogsUtil {
 
   String POSTGRESQL_VERSION = "17";
-  String TIMESCALEDB_EXTENSION_NAME = "timescaledb";
-  String TIMESCALEDB_EXTENSION_VERSION = "2.17.0";
+  String PREVIOUS_TIMESCALEDB_EXTENSION_NAME = "timescaledb";
+  String TIMESCALEDB_EXTENSION_NAME = "timescaledb_tsl";
+  String TIMESCALEDB_EXTENSION_VERSION = "2.23.1";
 
   static String getPostgresVersion(StackGresDistributedLogs distributedLogs) {
     return Optional.of(distributedLogs)
@@ -54,4 +57,11 @@ static List<ExtensionTuple> getDefaultDistributedLogsExtensions(
         .toList();
   }
 
+  static boolean isNotDeprecatedDistributedLogsExtension(
+      StackGresClusterExtension extension) {
+    return !Objects.equals(
+        extension.getName(),
+        PREVIOUS_TIMESCALEDB_EXTENSION_NAME);
+  }
+
 }

stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/distributedlogs/DistributedLogsCluster.java

@@ -56,6 +56,7 @@
 import io.stackgres.common.crd.sgdistributedlogs.StackGresDistributedLogsSpec;
 import io.stackgres.common.crd.sgdistributedlogs.StackGresDistributedLogsStatus;
 import io.stackgres.common.labels.LabelFactoryForDistributedLogs;
+import io.stackgres.operator.common.StackGresDistributedLogsUtil;
 import io.stackgres.operator.conciliation.OperatorVersionBinder;
 import io.stackgres.operator.conciliation.ResourceGenerator;
 import io.stackgres.operator.conciliation.distributedlogs.StackGresDistributedLogsContext;
@@ -144,10 +145,13 @@ public static StackGresCluster getCluster(
             .orElse(getPostgresVersion(distributedLogs)))
         .withExtensions(
             Seq.of(previousCluster
-            .map(StackGresCluster::getSpec)
-            .map(StackGresClusterSpec::getPostgres)
-            .map(StackGresClusterPostgres::getExtensions)
-            .orElse(List.of()))
+                .map(StackGresCluster::getSpec)
+                .map(StackGresClusterSpec::getPostgres)
+                .map(StackGresClusterPostgres::getExtensions)
+                .stream()
+                .flatMap(List::stream)
+                .filter(StackGresDistributedLogsUtil::isNotDeprecatedDistributedLogsExtension)
+                .toList())
             .flatMap(extensions -> Seq.seq(extensions)
                 .append(getDefaultDistributedLogsExtensions(distributedLogs)
                     .stream()

stackgres-k8s/src/operator/src/main/resources/distributed-logs/reconcile-retention.sql

@@ -15,7 +15,7 @@ BEGIN
           'SELECT drop_retention_policy(' || quote_literal(table_name) || ')');
         PERFORM dblink(
           'host=/var/run/postgresql port=5432 user=' || CURRENT_USER || ' sslmode=disable dbname=' || quote_literal(database_entry[0]),
-          'SELECT add_retention_policy(' || quote_literal(table_name) || ', CAST(' || quote_literal(database_entry[1]) || ' AS INTERVAL');
+          'SELECT add_retention_policy(' || quote_literal(table_name) || ', CAST(' || quote_literal(database_entry[1]) || ' AS INTERVAL))');
       ELSIF EXISTS (SELECT * FROM pg_extension WHERE extname = 'timescaledb' AND SPLIT_PART(extversion,'.',1) = '1') THEN
         -- next reconciliation will take place on %3$s
         PERFORM dblink(