Merge pull request #5626 from k8s-infra-cherrypick-robot/cherry-pick-…

…5588-to-release-1.0

🐛 restore - set tenants on the new object graph constructed from files in the backup directory

cmd/clusterctl/client/cluster/mover.go

@@ -129,6 +129,9 @@ func (o *objectMover) Restore(toCluster Client, directory string) error {
 	// by a naming convention (without any explicit OwnerReference).
 	objectGraph.setSoftOwnership()
 
+	// Completes the graph by setting for each node the list of tenants the node belongs to.
+	objectGraph.setTenants()
+
 	// Check whether nodes are not included in GVK considered for restore.
 	objectGraph.checkVirtualNode()
 

cmd/clusterctl/client/cluster/mover_test.go

@@ -902,8 +902,12 @@ func Test_objectMover_restore(t *testing.T) {
 				g.Expect(graph.addRestoredObj(&objs[i])).NotTo(HaveOccurred())
 			}
 
-			// trigger discovery the content of the source cluster
-			g.Expect(graph.Discovery("")).To(Succeed())
+			// restore works on the target cluster which does not yet have objs to discover
+			// instead set the owners and tenants correctly on object graph like how ObjectMover.Restore does
+			// https://github.com/kubernetes-sigs/cluster-api/blob/main/cmd/clusterctl/client/cluster/mover.go#L129-L132
+			graph.setSoftOwnership()
+			graph.setTenants()
+			graph.checkVirtualNode()
 
 			err = mover.restore(graph, toProxy)
 			if tt.wantErr {