Skip to content

Commit e0c08c8

Browse files
committed
feat: include the node name of each Pod in the SGCluster status
1 parent 50142a0 commit e0c08c8

1 file changed

Lines changed: 4 additions & 3 deletions

File tree

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

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ public class ClusterControllerReconciliator
4646
private final PatroniBackupFailoverRestartReconciliator patroniBackupFailoverRestartReconciliator;
4747
private final ClusterControllerPropertyContext propertyContext;
4848
private final String podName;
49-
private final String nodeName;
49+
private final Optional<String> nodeName;
5050

5151
@Inject
5252
public ClusterControllerReconciliator(Parameters parameters) {
@@ -66,7 +66,7 @@ public ClusterControllerReconciliator(Parameters parameters) {
6666
this.podName = parameters.propertyContext
6767
.getString(ClusterControllerProperty.CLUSTER_CONTROLLER_POD_NAME);
6868
this.nodeName = parameters.propertyContext
69-
.getString(ClusterControllerProperty.CLUSTER_CONTROLLER_NODE_NAME);
69+
.get(ClusterControllerProperty.CLUSTER_CONTROLLER_NODE_NAME);
7070
}
7171

7272
public ClusterControllerReconciliator() {
@@ -104,6 +104,7 @@ public ReconciliationResult<Void> reconcile(KubernetesClient client,
104104
.findFirst();
105105
final boolean nodeNameChanged;
106106
if (foundPodStatus.isPresent()) {
107+
String nodeName = this.nodeName.orElseGet(foundPodStatus.get()::getNodeName);
107108
nodeNameChanged = Objects.equals(foundPodStatus.get().getNodeName(), nodeName);
108109
foundPodStatus.get().setNodeName(nodeName);
109110
} else {
@@ -116,7 +117,7 @@ public ReconciliationResult<Void> reconcile(KubernetesClient client,
116117
}
117118
StackGresClusterPodStatus podStatus = new StackGresClusterPodStatus();
118119
podStatus.setName(podName);
119-
podStatus.setNodeName(nodeName);
120+
nodeName.ifPresent(podStatus::setNodeName);
120121
podStatus.setPrimary(false);
121122
podStatus.setPendingRestart(false);
122123
cluster.getStatus().getPodStatuses().add(podStatus);

0 commit comments

Comments
 (0)