Fixes for the labels capacity annotations

aleskandro · aleskandro · commit fc8a9841e0d2 · 2023-06-26T11:08:06.000+02:00
Use the upstream annotation for the labels as the team is transitioning to use the upstream labels for all the other annotations too and making this in advance allow us not to support both the downstream and upstream annotations for the labels case.
diff --git a/pkg/cloud/azure/actuators/machineset/controller.go b/pkg/cloud/azure/actuators/machineset/controller.go
@@ -53,7 +53,7 @@ const (
 	cpuKey    = "machine.openshift.io/vCPU"
 	memoryKey = "machine.openshift.io/memoryMb"
 	gpuKey    = "machine.openshift.io/GPU"
-	labelsKey = "machine.openshift.io/labels"
+	labelsKey = "capacity.cluster-autoscaler.kubernetes.io/labels"
 )
 
 // Reconciler reconciles machineSets.

Original file line number	Diff line number	Diff line change
`@@ -53,7 +53,7 @@ const (`
`53`	`53`	`cpuKey = "machine.openshift.io/vCPU"`
`54`	`54`	`memoryKey = "machine.openshift.io/memoryMb"`
`55`	`55`	`gpuKey = "machine.openshift.io/GPU"`
`56`		`- labelsKey = "machine.openshift.io/labels"`
	`56`	`+ labelsKey = "capacity.cluster-autoscaler.kubernetes.io/labels"`
`57`	`57`	`)`
`58`	`58`
`59`	`59`	`// Reconciler reconciles machineSets.`