Skip to content

Commit 64f7f85

Browse files
openshift-merge-robotopenshift-merge-robot
authored
Merge pull request #65 from aleskandro/MIXEDARCH-129
MIXEDARCH-257: Handle the kubernetes.io/architecture label based on the Azure VM Size
2 parents 8182af8 + 46c3568 commit 64f7f85

File tree

7 files changed

+170
-4
lines changed

7 files changed

+170
-4
lines changed

‎go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ require (
1616
github.com/onsi/ginkgo/v2 v2.9.5
1717
github.com/onsi/gomega v1.27.7
1818
github.com/openshift/api v0.0.0-20230509100629-894b49f57a15
19-
github.com/openshift/machine-api-operator v0.2.1-0.20230526095704-3938d727319b
19+
github.com/openshift/machine-api-operator v0.2.1-0.20230531233206-931f6f67c1c7
2020
github.com/pkg/errors v0.9.1
2121
github.com/spf13/cobra v1.7.0
2222
golang.org/x/crypto v0.6.0

‎go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -305,8 +305,8 @@ github.com/openshift/client-go v0.0.0-20230503144108-75015d2347cb h1:Nij5OnaECrk
305305
github.com/openshift/client-go v0.0.0-20230503144108-75015d2347cb/go.mod h1:Rhb3moCqeiTuGHAbXBOlwPubUMlOZEkrEWTRjIF3jzs=
306306
github.com/openshift/library-go v0.0.0-20230508110756-9b7abe2c9cbf h1:ZpFAN2qprgp7jEhGPrOAwP8mmuYC9BRYzvDefg+k4GM=
307307
github.com/openshift/library-go v0.0.0-20230508110756-9b7abe2c9cbf/go.mod h1:PJVatR/oS/EaFciwylyAr9hORSqQHrC+5bXf4L0wsBY=
308-
github.com/openshift/machine-api-operator v0.2.1-0.20230526095704-3938d727319b h1:Bui00y1DNxAPvmLEb1+sKzUCRPfl01y+DNdL223f5Ns=
309-
github.com/openshift/machine-api-operator v0.2.1-0.20230526095704-3938d727319b/go.mod h1:cYJjVQyNskmxEixGczlLytGF9iacFubTD/UbGvu5EEY=
308+
github.com/openshift/machine-api-operator v0.2.1-0.20230531233206-931f6f67c1c7 h1:6/Yok3qh3FPnjw+OsefCEPbV0KFEVkr00NaEYDpAY6M=
309+
github.com/openshift/machine-api-operator v0.2.1-0.20230531233206-931f6f67c1c7/go.mod h1:cYJjVQyNskmxEixGczlLytGF9iacFubTD/UbGvu5EEY=
310310
github.com/peterbourgon/diskv v2.0.1+incompatible h1:UBdAOUP5p4RWqPBg048CAvpKN+vxiaj6gdUUzhl4XmI=
311311
github.com/peterbourgon/diskv v2.0.1+incompatible/go.mod h1:uqqh8zWWbv1HBMNONnaR/tNboyR3/BZd58JJSHlUSCU=
312312
github.com/pkg/browser v0.0.0-20210911075715-681adbf594b8 h1:KoWmjvw+nsYOo29YJK9vDA65RGE3NrOnUtO7a+RF9HU=

‎pkg/cloud/azure/actuators/machineset/controller.go

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ import (
2323
"github.com/go-logr/logr"
2424
machinev1 "github.com/openshift/api/machine/v1beta1"
2525
mapierrors "github.com/openshift/machine-api-operator/pkg/controller/machine"
26+
"github.com/openshift/machine-api-operator/pkg/util"
2627
"github.com/openshift/machine-api-provider-azure/pkg/cloud/azure/actuators"
2728
"github.com/openshift/machine-api-provider-azure/pkg/cloud/azure/services/resourceskus"
2829
corev1 "k8s.io/api/core/v1"
@@ -35,13 +36,24 @@ import (
3536
"sigs.k8s.io/controller-runtime/pkg/controller"
3637
)
3738

39+
// We define a new type to represent the normalized architecture as the Azure APIs use a different format.
40+
type normalizedArch string
41+
42+
const (
43+
// ArchitectureAmd64 is the normalized architecture for amd64.
44+
ArchitectureAmd64 normalizedArch = "amd64"
45+
// ArchitectureArm64 is the normalized architecture for arm64.
46+
ArchitectureArm64 normalizedArch = "arm64"
47+
)
48+
3849
const (
3950
// This exposes compute information based on the providerSpec input.
4051
// This is needed by the autoscaler to foresee upcoming capacity when scaling from zero.
4152
// https://github.com/openshift/enhancements/pull/186
4253
cpuKey = "machine.openshift.io/vCPU"
4354
memoryKey = "machine.openshift.io/memoryMb"
4455
gpuKey = "machine.openshift.io/GPU"
56+
labelsKey = "machine.openshift.io/labels"
4557
)
4658

4759
// Reconciler reconciles machineSets.
@@ -231,6 +243,17 @@ func updateMachineSetAnnotations(machineSet *machinev1.MachineSet, sku resources
231243
machineSet.Annotations[gpuKey] = gpuCap
232244
}
233245

246+
// Architecture
247+
architecture, ok := sku.GetCapability(resourceskus.CPUArchitectureType)
248+
if !ok {
249+
klog.V(2).Infof("SKU '%s' does not have the CPUArchitecture capability. Defaulting to amd64", *sku.Name)
250+
}
251+
// We guarantee that any existing labels provided via the capacity annotations are preserved.
252+
// See https://github.com/kubernetes/autoscaler/pull/5382 and https://github.com/kubernetes/autoscaler/pull/5697
253+
machineSet.Annotations[labelsKey] = util.MergeCommaSeparatedKeyValuePairs(
254+
fmt.Sprintf("kubernetes.io/arch=%s", normalizedArchitecture(architecture)),
255+
machineSet.Annotations[labelsKey])
256+
234257
return nil
235258
}
236259

@@ -248,3 +271,19 @@ func memoryGiBtoMiB(memoryGiB string) (string, error) {
248271
func getproviderConfig(machineSet *machinev1.MachineSet) (*machinev1.AzureMachineProviderSpec, error) {
249272
return actuators.MachineConfigFromProviderSpec(machineSet.Spec.Template.Spec.ProviderSpec)
250273
}
274+
275+
// normalizedArchitecture adapts the value of the architecture capability for the SKU to the
276+
// one required by the kubernetes APIs.
277+
// For example, the x86_64 architecture is called "x64" in the Azure API.
278+
// The kubernetes.io/arch label, instead, expects the Golang/LLVM names.
279+
func normalizedArchitecture(architecture string) normalizedArch {
280+
switch architecture {
281+
case resourceskus.X64:
282+
return ArchitectureAmd64
283+
case resourceskus.Arm64:
284+
return ArchitectureArm64
285+
}
286+
klog.V(2).Infof("unknown architecture '%s'. Defaulting to amd64", architecture)
287+
// Default to amd64 if we don't recognize the architecture.
288+
return ArchitectureAmd64
289+
}

‎pkg/cloud/azure/actuators/machineset/controller_test.go

Lines changed: 94 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -102,6 +102,10 @@ var _ = Describe("Reconciler", func() {
102102
Name: to.StringPtr(resourceskus.MemoryGB),
103103
Value: to.StringPtr("16"),
104104
},
105+
{
106+
Name: to.StringPtr(resourceskus.CPUArchitectureType),
107+
Value: to.StringPtr(resourceskus.X64),
108+
},
105109
},
106110
},
107111
{
@@ -120,6 +124,60 @@ var _ = Describe("Reconciler", func() {
120124
Name: to.StringPtr(resourceskus.GPUs),
121125
Value: to.StringPtr("4"),
122126
},
127+
{
128+
Name: to.StringPtr(resourceskus.CPUArchitectureType),
129+
Value: to.StringPtr(resourceskus.X64),
130+
},
131+
},
132+
},
133+
{
134+
Name: to.StringPtr("Standard_D4ps_v5"),
135+
ResourceType: to.StringPtr("virtualMachines"),
136+
Capabilities: &[]compute.ResourceSkuCapabilities{
137+
{
138+
Name: to.StringPtr(resourceskus.VCPUs),
139+
Value: to.StringPtr("4"),
140+
},
141+
{
142+
Name: to.StringPtr(resourceskus.MemoryGB),
143+
Value: to.StringPtr("16"),
144+
},
145+
{
146+
Name: to.StringPtr(resourceskus.CPUArchitectureType),
147+
Value: to.StringPtr(resourceskus.Arm64),
148+
},
149+
},
150+
},
151+
{
152+
Name: to.StringPtr("Standard_D4s_v3_wrong-arch"),
153+
ResourceType: to.StringPtr("virtualMachines"),
154+
Capabilities: &[]compute.ResourceSkuCapabilities{
155+
{
156+
Name: to.StringPtr(resourceskus.VCPUs),
157+
Value: to.StringPtr("4"),
158+
},
159+
{
160+
Name: to.StringPtr(resourceskus.MemoryGB),
161+
Value: to.StringPtr("16"),
162+
},
163+
{
164+
Name: to.StringPtr(resourceskus.CPUArchitectureType),
165+
Value: to.StringPtr("wrong-arch"),
166+
},
167+
},
168+
},
169+
{
170+
Name: to.StringPtr("Standard_D4s_v3_missing-arch"),
171+
ResourceType: to.StringPtr("virtualMachines"),
172+
Capabilities: &[]compute.ResourceSkuCapabilities{
173+
{
174+
Name: to.StringPtr(resourceskus.VCPUs),
175+
Value: to.StringPtr("4"),
176+
},
177+
{
178+
Name: to.StringPtr(resourceskus.MemoryGB),
179+
Value: to.StringPtr("16"),
180+
},
123181
},
124182
},
125183
}, "centralus")
@@ -190,6 +248,7 @@ var _ = Describe("Reconciler", func() {
190248
cpuKey: "4",
191249
memoryKey: "16384",
192250
gpuKey: "0",
251+
labelsKey: "kubernetes.io/arch=amd64",
193252
},
194253
expectedEvents: []string{},
195254
}),
@@ -200,6 +259,7 @@ var _ = Describe("Reconciler", func() {
200259
cpuKey: "24",
201260
memoryKey: "229376",
202261
gpuKey: "4",
262+
labelsKey: "kubernetes.io/arch=amd64",
203263
},
204264
expectedEvents: []string{},
205265
}),
@@ -215,6 +275,7 @@ var _ = Describe("Reconciler", func() {
215275
cpuKey: "24",
216276
memoryKey: "229376",
217277
gpuKey: "4",
278+
labelsKey: "kubernetes.io/arch=amd64",
218279
},
219280
expectedEvents: []string{},
220281
}),
@@ -230,6 +291,39 @@ var _ = Describe("Reconciler", func() {
230291
},
231292
expectedEvents: []string{"FailedUpdate"},
232293
}),
294+
Entry("with a Standard_D4ps_v5 (aarch64)", reconcileTestCase{
295+
vmSize: "Standard_D4ps_v5",
296+
existingAnnotations: make(map[string]string),
297+
expectedAnnotations: map[string]string{
298+
cpuKey: "4",
299+
memoryKey: "16384",
300+
gpuKey: "0",
301+
labelsKey: "kubernetes.io/arch=arm64",
302+
},
303+
expectedEvents: []string{},
304+
}),
305+
Entry("with a vmSize missing the architecture capability", reconcileTestCase{
306+
vmSize: "Standard_D4s_v3_missing-arch",
307+
existingAnnotations: make(map[string]string),
308+
expectedAnnotations: map[string]string{
309+
cpuKey: "4",
310+
memoryKey: "16384",
311+
gpuKey: "0",
312+
labelsKey: "kubernetes.io/arch=amd64",
313+
},
314+
expectedEvents: []string{},
315+
}),
316+
Entry("with a vmSize missing an unknown architecture", reconcileTestCase{
317+
vmSize: "Standard_D4s_v3_wrong-arch",
318+
existingAnnotations: make(map[string]string),
319+
expectedAnnotations: map[string]string{
320+
cpuKey: "4",
321+
memoryKey: "16384",
322+
gpuKey: "0",
323+
labelsKey: "kubernetes.io/arch=amd64",
324+
},
325+
expectedEvents: []string{},
326+
}),
233327
)
234328
})
235329

‎pkg/cloud/azure/services/resourceskus/sku.go

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,12 @@ const (
7070
MaximumPlatformFaultDomainCount = "MaximumPlatformFaultDomainCount"
7171
// UltraSSDAvailable identifies the capability for the support of UltraSSD data disks.
7272
UltraSSDAvailable = "UltraSSDAvailable"
73+
// CPUArchitectureType identifies the capability for the CPU architecture.
74+
CPUArchitectureType = "CpuArchitecture"
75+
// X64 and Arm64 are the possible values for CPUArchitectureType, in the Azure APIs. We will adapt them in the controller
76+
// to the ones kubernetes expect.
77+
X64 = "x64"
78+
Arm64 = "Arm64"
7379
)
7480

7581
// HasCapability return true for a capability which can be either

‎vendor/github.com/openshift/machine-api-operator/pkg/util/util.go

Lines changed: 27 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/modules.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -335,7 +335,7 @@ github.com/openshift/client-go/machine/listers/machine/v1beta1
335335
## explicit; go 1.20
336336
github.com/openshift/library-go/pkg/config/clusterstatus
337337
github.com/openshift/library-go/pkg/config/leaderelection
338-
# github.com/openshift/machine-api-operator v0.2.1-0.20230526095704-3938d727319b
338+
# github.com/openshift/machine-api-operator v0.2.1-0.20230531233206-931f6f67c1c7
339339
## explicit; go 1.19
340340
github.com/openshift/machine-api-operator/pkg/controller/machine
341341
github.com/openshift/machine-api-operator/pkg/metrics

0 commit comments

Comments
 (0)