feat: include the node name of each Pod in the SGCluster status

Author: teoincontatto

stackgres-k8s/src/cluster-controller/src/main/java/io/stackgres/cluster/controller/ClusterControllerReconciliator.java

@@ -7,6 +7,7 @@
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Objects;
 import java.util.Optional;
 
 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
@@ -45,6 +46,7 @@ public class ClusterControllerReconciliator
   private final PatroniBackupFailoverRestartReconciliator patroniBackupFailoverRestartReconciliator;
   private final ClusterControllerPropertyContext propertyContext;
   private final String podName;
+  private final String nodeName;
 
   @Inject
   public ClusterControllerReconciliator(Parameters parameters) {
@@ -63,6 +65,8 @@ public ClusterControllerReconciliator(Parameters parameters) {
     this.propertyContext = parameters.propertyContext;
     this.podName = parameters.propertyContext
         .getString(ClusterControllerProperty.CLUSTER_CONTROLLER_POD_NAME);
+    this.nodeName = parameters.propertyContext
+        .getString(ClusterControllerProperty.CLUSTER_CONTROLLER_NODE_NAME);
   }
 
   public ClusterControllerReconciliator() {
@@ -82,6 +86,7 @@ public ClusterControllerReconciliator() {
     this.patroniBackupFailoverRestartReconciliator = null;
     this.propertyContext = null;
     this.podName = null;
+    this.nodeName = null;
   }
 
   @SuppressFBWarnings(value = "REC_CATCH_EXCEPTION",
@@ -90,13 +95,19 @@ public ClusterControllerReconciliator() {
   public ReconciliationResult<Void> reconcile(KubernetesClient client,
       StackGresClusterContext context) throws Exception {
     final StackGresCluster cluster = context.getCluster();
-    final boolean podStatusMissing = Optional.ofNullable(cluster.getStatus())
+    final Optional<StackGresClusterPodStatus> foundPodStatus =
+        Optional.ofNullable(cluster.getStatus())
         .map(StackGresClusterStatus::getPodStatuses)
         .stream()
         .flatMap(List::stream)
-        .map(StackGresClusterPodStatus::getName)
-        .noneMatch(podName::equals);
-    if (podStatusMissing) {
+        .filter(podStatus -> Objects.equals(podName, podStatus.getName()))
+        .findFirst();
+    final boolean nodeNameChanged;
+    if (foundPodStatus.isPresent()) {
+      nodeNameChanged = Objects.equals(foundPodStatus.get().getNodeName(), nodeName);
+      foundPodStatus.get().setNodeName(nodeName);
+    } else {
+      nodeNameChanged = true;
       if (cluster.getStatus() == null) {
         cluster.setStatus(new StackGresClusterStatus());
       }
@@ -105,6 +116,7 @@ public ReconciliationResult<Void> reconcile(KubernetesClient client,
       }
       StackGresClusterPodStatus podStatus = new StackGresClusterPodStatus();
       podStatus.setName(podName);
+      podStatus.setNodeName(nodeName);
       podStatus.setPrimary(false);
       podStatus.setPendingRestart(false);
       cluster.getStatus().getPodStatuses().add(podStatus);
@@ -131,7 +143,8 @@ public ReconciliationResult<Void> reconcile(KubernetesClient client,
     ReconciliationResult<Void> patroniBackupFailoverRestartReconciliatorResult =
         patroniBackupFailoverRestartReconciliator.reconcile(client, context);
 
-    if (podStatusMissing
+    if (foundPodStatus.isEmpty()
+        || nodeNameChanged
         || postgresBootstrapReconciliatorResult.result().orElse(false)
         || extensionReconciliationResult.result().orElse(false)
         || patroniReconciliationResult.result().orElse(false)) {

stackgres-k8s/src/common/src/main/java/io/stackgres/common/ClusterControllerProperty.java

@@ -13,6 +13,7 @@ public enum ClusterControllerProperty implements StackGresPropertyReader {
   CLUSTER_NAME("stackgres.clusterName"),
   CLUSTER_CONTROLLER_POD_NAME("stackgres.clusterControllerPodName"),
   CLUSTER_CONTROLLER_POD_IP("stackgres.clusterControllerPodIp"),
+  CLUSTER_CONTROLLER_NODE_NAME("stackgres.clusterControllerNodeName"),
   CLUSTER_CONTROLLER_EXTENSIONS_REPOSITORY_URLS(
       "stackgres.clusterControllerExtensionsRepositoryUrls"),
   CLUSTER_CONTROLLER_SKIP_OVERWRITE_SHARED_LIBRARIES(

stackgres-k8s/src/common/src/main/java/io/stackgres/common/crd/sgcluster/StackGresClusterPodStatus.java

@@ -28,6 +28,8 @@ public class StackGresClusterPodStatus {
 
   private String name;
 
+  private String nodeName;
+
   private Integer replicationGroup;
 
   private Boolean primary;
@@ -53,6 +55,14 @@ public void setName(String name) {
     this.name = name;
   }
 
+  public String getNodeName() {
+    return nodeName;
+  }
+
+  public void setNodeName(String nodeName) {
+    this.nodeName = nodeName;
+  }
+
   public Integer getReplicationGroup() {
     return replicationGroup;
   }
@@ -88,7 +98,7 @@ public void setInstalledPostgresExtensions(
 
   @Override
   public int hashCode() {
-    return Objects.hash(installedPostgresExtensions, name, pendingRestart, primary,
+    return Objects.hash(installedPostgresExtensions, name, nodeName, pendingRestart, primary,
         replicationGroup);
   }
 
@@ -102,7 +112,8 @@ public boolean equals(Object obj) {
     }
     StackGresClusterPodStatus other = (StackGresClusterPodStatus) obj;
     return Objects.equals(installedPostgresExtensions, other.installedPostgresExtensions)
-        && Objects.equals(name, other.name) && Objects.equals(pendingRestart, other.pendingRestart)
+        && Objects.equals(name, other.name) && Objects.equals(nodeName, other.nodeName)
+        && Objects.equals(pendingRestart, other.pendingRestart)
         && Objects.equals(primary, other.primary)
         && Objects.equals(replicationGroup, other.replicationGroup);
   }

stackgres-k8s/src/common/src/main/resources/crds/SGCluster.yaml

@@ -2140,6 +2140,9 @@ spec:
                     name:
                       type: string
                       description: The name of the pod.
+                    nodeName:
+                      type: string
+                      description: The node name where the pod is running.
                     replicationGroup:
                       type: integer
                       description: Indicates the replication group this Pod belongs to.

stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/cluster/sidecars/controller/ClusterController.java

@@ -101,6 +101,13 @@ public Container getContainer(ClusterContainerContext context) {
                 .build())
             .build(),
             new EnvVarBuilder()
+            .withName(ClusterControllerProperty.CLUSTER_CONTROLLER_NODE_NAME
+                .getEnvironmentVariableName())
+            .withValueFrom(new EnvVarSourceBuilder()
+                .withFieldRef(new ObjectFieldSelector("v1", "spec.nodeName"))
+                .build())
+            .build(),
+            new EnvVarBuilder()
             .withName(ClusterControllerProperty.CLUSTER_CONTROLLER_EXTENSIONS_REPOSITORY_URLS
                 .getEnvironmentVariableName())
             .withValue(OperatorProperty.EXTENSIONS_REPOSITORY_URLS

stackgres-k8s/src/restapi/src/main/java/io/stackgres/apiweb/dto/cluster/ClusterPodStatus.java

@@ -17,6 +17,8 @@ public class ClusterPodStatus {
 
   private String name;
 
+  private String nodeName;
+
   private Integer replicationGroup;
 
   private Boolean primary;
@@ -33,6 +35,14 @@ public void setName(String name) {
     this.name = name;
   }
 
+  public String getNodeName() {
+    return nodeName;
+  }
+
+  public void setNodeName(String nodeName) {
+    this.nodeName = nodeName;
+  }
+
   public Integer getReplicationGroup() {
     return replicationGroup;
   }