Skip to content

Commit

Permalink
fixup! 🌱 check resource blocking clusterctl move during discovery
Browse files Browse the repository at this point in the history
  • Loading branch information
nojnhuh committed Aug 29, 2023
1 parent fc75cf4 commit 2716427
Showing 1 changed file with 8 additions and 1 deletion.
9 changes: 8 additions & 1 deletion cmd/clusterctl/client/cluster/mover.go
Original file line number Diff line number Diff line change
Expand Up @@ -623,7 +623,15 @@ func waitReadyForMove(ctx context.Context, proxy Proxy, nodes []*node, dryRun bo
}

for _, n := range nodes {
log := log.WithValues(
"apiVersion", n.identity.GroupVersionKind(),
"resource", klog.ObjectRef{
Name: n.identity.Name,
Namespace: n.identity.Namespace,
},
)
if !n.blockingMove {
log.V(5).Info("Resource not blocking move")
continue
}

Expand All @@ -638,7 +646,6 @@ func waitReadyForMove(ctx context.Context, proxy Proxy, nodes []*node, dryRun bo
},
}
key := client.ObjectKeyFromObject(obj)
log := log.WithValues("apiVersion", obj.GroupVersionKind(), "resource", klog.KObj(obj))

blockLogged := false
if err := retryWithExponentialBackoff(backoff, func() error {
Expand Down

0 comments on commit 2716427

Please sign in to comment.