fix: new topology tags should be additional

vknabel · vknabel · commit 5bd4c4807c06 · 2025-01-29T08:45:16.000+01:00
Otherwise existing machines cannot be found anymore
diff --git a/internal/controller/metalstackmachine_controller.go b/internal/controller/metalstackmachine_controller.go
@@ -438,7 +438,6 @@ func (r *machineReconciler) machineTags() []string {
 	tags := []string{
 		tag.New(tag.ClusterID, string(r.infraCluster.GetUID())),
 		tag.New(v1alpha1.TagInfraMachineID, string(r.infraMachine.GetUID())),
-		tag.New(corev1.LabelTopologyZone, r.infraCluster.Spec.Partition),
 	}
 
 	if util.IsControlPlaneMachine(r.clusterMachine) {
@@ -450,6 +449,7 @@ func (r *machineReconciler) machineTags() []string {
 
 func (r *machineReconciler) additionalMachineTags(partition *models.V1PartitionResponse) []string {
 	tags := []string{
+		tag.New(corev1.LabelTopologyZone, r.infraCluster.Spec.Partition),
 		tag.New(corev1.LabelTopologyRegion, partition.Labels[tag.PartitionRegion]),
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -438,7 +438,6 @@ func (r *machineReconciler) machineTags() []string {`
`438`	`438`	`tags := []string{`
`439`	`439`	`tag.New(tag.ClusterID, string(r.infraCluster.GetUID())),`
`440`	`440`	`tag.New(v1alpha1.TagInfraMachineID, string(r.infraMachine.GetUID())),`
`441`		`- tag.New(corev1.LabelTopologyZone, r.infraCluster.Spec.Partition),`
`442`	`441`	`}`
`443`	`442`
`444`	`443`	`if util.IsControlPlaneMachine(r.clusterMachine) {`
`@@ -450,6 +449,7 @@ func (r *machineReconciler) machineTags() []string {`
`450`	`449`
`451`	`450`	`func (r machineReconciler) additionalMachineTags(partition models.V1PartitionResponse) []string {`
`452`	`451`	`tags := []string{`
	`452`	`+ tag.New(corev1.LabelTopologyZone, r.infraCluster.Spec.Partition),`
`453`	`453`	`tag.New(corev1.LabelTopologyRegion, partition.Labels[tag.PartitionRegion]),`
`454`	`454`	`}`
`455`	`455`