Merge pull request #66 from aleskandro/fixes-multiarch

openshift-merge-robot · web-flow · commit 97ea1221e4ca · 2023-06-28T16:07:05.000+02:00
Set upstream labels and fix capability for the arch-aware scale from 0 in Azure
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.
diff --git a/pkg/cloud/azure/services/resourceskus/sku.go b/pkg/cloud/azure/services/resourceskus/sku.go
@@ -71,7 +71,7 @@ const (
 	// UltraSSDAvailable identifies the capability for the support of UltraSSD data disks.
 	UltraSSDAvailable = "UltraSSDAvailable"
 	// CPUArchitectureType identifies the capability for the CPU architecture.
-	CPUArchitectureType = "CpuArchitecture"
+	CPUArchitectureType = "CpuArchitectureType"
 	// X64 and Arm64 are the possible values for CPUArchitectureType, in the Azure APIs. We will adapt them in the controller
 	// to the ones kubernetes expect.
 	X64   = "x64"

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.`