Merge pull request #1294 from apedriza/fix-remote-labels-annotations

apedriza · web-flow · commit 4e5b5b78c294 · 2025-11-17T13:01:45.000+01:00
Fix labels and annotations propagation from pooledremotemachine to re…
diff --git a/internal/controller/infrastructure/remote_machine_controller.go b/internal/controller/infrastructure/remote_machine_controller.go
@@ -345,8 +345,12 @@ func (r *RemoteMachineController) reservePooledMachine(ctx context.Context, rm *
 		}
 	}
 
-	rm.Labels = foundPooledMachine.Labels
-	rm.Annotations = foundPooledMachine.Annotations
+	for k, v := range foundPooledMachine.Labels {
+		rm.Labels[k] = v
+	}
+	for k, v := range foundPooledMachine.Annotations {
+		rm.Annotations[k] = v
+	}
 	rm.Spec.Address = foundPooledMachine.Spec.Machine.Address
 	rm.Spec.Port = foundPooledMachine.Spec.Machine.Port
 	rm.Spec.User = foundPooledMachine.Spec.Machine.User

Original file line number	Diff line number	Diff line change
`@@ -345,8 +345,12 @@ func (r RemoteMachineController) reservePooledMachine(ctx context.Context, rm `
`345`	`345`	`}`
`346`	`346`	`}`
`347`	`347`
`348`		`- rm.Labels = foundPooledMachine.Labels`
`349`		`- rm.Annotations = foundPooledMachine.Annotations`
	`348`	`+ for k, v := range foundPooledMachine.Labels {`
	`349`	`+ rm.Labels[k] = v`
	`350`	`+ }`
	`351`	`+ for k, v := range foundPooledMachine.Annotations {`
	`352`	`+ rm.Annotations[k] = v`
	`353`	`+ }`
`350`	`354`	`rm.Spec.Address = foundPooledMachine.Spec.Machine.Address`
`351`	`355`	`rm.Spec.Port = foundPooledMachine.Spec.Machine.Port`
`352`	`356`	`rm.Spec.User = foundPooledMachine.Spec.Machine.User`