fix: SGShardedCluster's SGCluster is not able to bootstrap due to missing citus extension

Author: teoincontatto

stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/shardedcluster/context/ShardedClusterCoordinatorClusterContextAppender.java

@@ -8,16 +8,14 @@
 import io.stackgres.common.crd.sgcluster.StackGresCluster;
 import io.stackgres.common.crd.sgshardedcluster.StackGresShardedCluster;
 import io.stackgres.common.crd.sgshardedcluster.StackGresShardingType;
-import io.stackgres.operator.conciliation.ContextAppender;
 import io.stackgres.operator.conciliation.factory.shardedcluster.StackGresShardedClusterForCitusUtil;
 import io.stackgres.operator.conciliation.factory.shardedcluster.StackGresShardedClusterForDdpUtil;
 import io.stackgres.operator.conciliation.factory.shardedcluster.StackGresShardedClusterForShardingSphereUtil;
 import io.stackgres.operator.conciliation.shardedcluster.StackGresShardedClusterContext.Builder;
 import jakarta.enterprise.context.ApplicationScoped;
 
 @ApplicationScoped
-public class ShardedClusterCoordinatorClusterContextAppender
-    extends ContextAppender<StackGresShardedCluster, Builder> {
+public class ShardedClusterCoordinatorClusterContextAppender {
 
   private final ShardedClusterCoordinatorPrimaryEndpointsContextAppender
       shardedClusterCoordinatorPrimaryEndpointsContextAppender;
@@ -29,7 +27,6 @@ public ShardedClusterCoordinatorClusterContextAppender(
         shardedClusterCoordinatorPrimaryEndpointsContextAppender;
   }
 
-  @Override
   public void appendContext(StackGresShardedCluster cluster, Builder contextBuilder) {
     StackGresCluster coordinator = getCoordinatorCluster(cluster);
     contextBuilder.coordinator(coordinator);

stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/shardedcluster/context/ShardedClusterPostgresVersionContextAppender.java

@@ -44,20 +44,26 @@ public class ShardedClusterPostgresVersionContextAppender
   private final ShardedClusterShardsPostgresConfigContextAppender clusterShardsPostgresConfigContextAppender;
   private final ShardedClusterRestoreBackupContextAppender clusterRestoreBackupContextAppender;
   private final ShardedClusterExtensionsContextAppender clusterExtensionsContextAppender;
+  private final ShardedClusterCoordinatorClusterContextAppender clusterCoordinatorContextAppender;
+  private final ShardedClusterShardsClustersContextAppender clusterShardsContextAppender;
 
   @Inject
   public ShardedClusterPostgresVersionContextAppender(
       EventEmitter<StackGresShardedCluster> eventController,
       ShardedClusterCoordinatorPostgresConfigContextAppender clusterCoordinatorPostgresConfigContextAppender,
       ShardedClusterShardsPostgresConfigContextAppender clusterShardsPostgresConfigContextAppender,
       ShardedClusterRestoreBackupContextAppender clusterRestoreBackupContextAppender,
-      ShardedClusterExtensionsContextAppender clusterExtensionsContextAppender) {
+      ShardedClusterExtensionsContextAppender clusterExtensionsContextAppender,
+      ShardedClusterCoordinatorClusterContextAppender clusterCoordinatorContextAppender,
+      ShardedClusterShardsClustersContextAppender clusterShardsContextAppender) {
     this(
         eventController,
         clusterCoordinatorPostgresConfigContextAppender,
         clusterShardsPostgresConfigContextAppender,
         clusterRestoreBackupContextAppender,
         clusterExtensionsContextAppender,
+        clusterCoordinatorContextAppender,
+        clusterShardsContextAppender,
         ValidationUtil.SUPPORTED_POSTGRES_VERSIONS);
   }
 
@@ -67,12 +73,16 @@ public ShardedClusterPostgresVersionContextAppender(
       ShardedClusterShardsPostgresConfigContextAppender clusterShardsPostgresConfigContextAppender,
       ShardedClusterRestoreBackupContextAppender clusterRestoreBackupContextAppender,
       ShardedClusterExtensionsContextAppender clusterExtensionsContextAppender,
+      ShardedClusterCoordinatorClusterContextAppender clusterCoordinatorContextAppender,
+      ShardedClusterShardsClustersContextAppender clusterShardsContextAppender,
       Map<StackGresComponent, Map<StackGresVersion, List<String>>> supportedPostgresVersions) {
     this.eventController = eventController;
     this.clusterCoordinatorPostgresConfigContextAppender = clusterCoordinatorPostgresConfigContextAppender;
     this.clusterShardsPostgresConfigContextAppender = clusterShardsPostgresConfigContextAppender;
     this.clusterRestoreBackupContextAppender = clusterRestoreBackupContextAppender;
     this.clusterExtensionsContextAppender = clusterExtensionsContextAppender;
+    this.clusterCoordinatorContextAppender = clusterCoordinatorContextAppender;
+    this.clusterShardsContextAppender = clusterShardsContextAppender;
     this.supportedPostgresVersions = supportedPostgresVersions;
   }
 
@@ -160,6 +170,8 @@ public void appendContext(StackGresShardedCluster cluster, Builder contextBuilde
       clusterRestoreBackupContextAppender.appendContext(cluster, contextBuilder, version);
       clusterExtensionsContextAppender.appendContext(cluster, contextBuilder, version,
           buildVersion, previousVersion, previousBuildVersion);
+      clusterCoordinatorContextAppender.appendContext(cluster, contextBuilder);
+      clusterShardsContextAppender.appendContext(cluster, contextBuilder);
     }
 
     if ((version == null && previousVersion.isEmpty())

stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/shardedcluster/context/ShardedClusterShardsClustersContextAppender.java

@@ -11,16 +11,14 @@
 import io.stackgres.common.crd.sgcluster.StackGresCluster;
 import io.stackgres.common.crd.sgshardedcluster.StackGresShardedCluster;
 import io.stackgres.common.crd.sgshardedcluster.StackGresShardingType;
-import io.stackgres.operator.conciliation.ContextAppender;
 import io.stackgres.operator.conciliation.factory.shardedcluster.StackGresShardedClusterForCitusUtil;
 import io.stackgres.operator.conciliation.factory.shardedcluster.StackGresShardedClusterForDdpUtil;
 import io.stackgres.operator.conciliation.factory.shardedcluster.StackGresShardedClusterForShardingSphereUtil;
 import io.stackgres.operator.conciliation.shardedcluster.StackGresShardedClusterContext.Builder;
 import jakarta.enterprise.context.ApplicationScoped;
 
 @ApplicationScoped
-public class ShardedClusterShardsClustersContextAppender
-    extends ContextAppender<StackGresShardedCluster, Builder> {
+public class ShardedClusterShardsClustersContextAppender {
 
   private final ShardedClusterShardsPrimaryEndpointsContextAppender
       shardedClusterShardsPrimaryEndpointsContextAppender;
@@ -32,7 +30,6 @@ public ShardedClusterShardsClustersContextAppender(
         shardedClusterShardsPrimaryEndpointsContextAppender;
   }
 
-  @Override
   public void appendContext(StackGresShardedCluster cluster, Builder contextBuilder) {
     List<StackGresCluster> shards = getShardsClusters(cluster);
     contextBuilder.shards(shards);

stackgres-k8s/src/operator/src/test/java/io/stackgres/operator/conciliation/shardedcluster/context/ShardedClusterPostgresVersionContextAppenderTest.java

@@ -106,6 +106,12 @@ class ShardedClusterPostgresVersionContextAppenderTest {
   @Mock
   private ShardedClusterExtensionsContextAppender clusterExtensionsContextAppender;
 
+  @Mock
+  private ShardedClusterCoordinatorClusterContextAppender clusterCoordinatorContextAppender;
+
+  @Mock
+  private ShardedClusterShardsClustersContextAppender clusterShardsContextAppender;
+
   @BeforeEach
   void setUp() {
     cluster = Fixtures.shardedCluster().loadDefault().get();
@@ -116,6 +122,8 @@ void setUp() {
         clusterShardsPostgresConfigContextAppender,
         clusterRestoreBackupContextAppender,
         clusterExtensionsContextAppender,
+        clusterCoordinatorContextAppender,
+        clusterShardsContextAppender,
         ALL_SUPPORTED_POSTGRES_VERSIONS);
   }