fix: skip terminating pods in getMasterIp (#290)

moskitone · web-flow · commit eb763ffe36be · 2025-02-05T17:56:08.000+05:30
Signed-off-by: Volodymyr Moseichuk &lt;moskitone@gmail.com&gt;
diff --git a/internal/controller/dragonfly_instance.go b/internal/controller/dragonfly_instance.go
@@ -175,7 +175,7 @@ func (dfi *DragonflyInstance) getMasterIp(ctx context.Context) (string, error) {
 	}
 
 	for _, pod := range pods.Items {
-		if pod.Status.Phase == corev1.PodRunning && pod.Status.ContainerStatuses[0].Ready && pod.Labels[resources.Role] == resources.Master {
+		if pod.Status.Phase == corev1.PodRunning && pod.Status.ContainerStatuses[0].Ready && pod.Labels[resources.Role] == resources.Master && pod.DeletionTimestamp == nil {
 			return pod.Status.PodIP, nil
 		}
 	}

Original file line number	Diff line number	Diff line change
`@@ -175,7 +175,7 @@ func (dfi *DragonflyInstance) getMasterIp(ctx context.Context) (string, error) {`
`175`	`175`	`}`
`176`	`176`
`177`	`177`	`for _, pod := range pods.Items {`
`178`		`- if pod.Status.Phase == corev1.PodRunning && pod.Status.ContainerStatuses[0].Ready && pod.Labels[resources.Role] == resources.Master {`
	`178`	`+ if pod.Status.Phase == corev1.PodRunning && pod.Status.ContainerStatuses[0].Ready && pod.Labels[resources.Role] == resources.Master && pod.DeletionTimestamp == nil {`
`179`	`179`	`return pod.Status.PodIP, nil`
`180`	`180`	`}`
`181`	`181`	`}`