Skip to content

Commit e031de5

Browse files
committed
feat: add additionalCapabilities spec to az MPs to support UltraSSDs
1 parent 3a9eb5b commit e031de5

File tree

4 files changed

+21
-0
lines changed

4 files changed

+21
-0
lines changed

azure/scope/machinepool.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -200,6 +200,7 @@ func (m *MachinePoolScope) ScaleSetSpec(ctx context.Context) azure.ResourceSpecG
200200
PublicLBName: m.OutboundLBName(infrav1.Node),
201201
PublicLBAddressPoolName: m.OutboundPoolName(infrav1.Node),
202202
AcceleratedNetworking: m.AzureMachinePool.Spec.Template.NetworkInterfaces[0].AcceleratedNetworking,
203+
AdditionalCapabilities: m.AzureMachinePool.Spec.Template.AdditionalCapabilities,
203204
Identity: m.AzureMachinePool.Spec.Identity,
204205
UserAssignedIdentities: m.AzureMachinePool.Spec.UserAssignedIdentities,
205206
DiagnosticsProfile: m.AzureMachinePool.Spec.Template.Diagnostics,

config/crd/bases/infrastructure.cluster.x-k8s.io_azuremachinepools.yaml

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -235,6 +235,17 @@ spec:
235235
description: 'Deprecated: AcceleratedNetworking should be set
236236
in the networkInterfaces field.'
237237
type: boolean
238+
additionalCapabilities:
239+
description: AdditionalCapabilities specifies additional capabilities
240+
enabled or disabled on the virtual machine.
241+
properties:
242+
ultraSSDEnabled:
243+
description: |-
244+
UltraSSDEnabled enables or disables Azure UltraSSD capability for the virtual machine.
245+
Defaults to true if Ultra SSD data disks are specified,
246+
otherwise it doesn't set the capability on the VM.
247+
type: boolean
248+
type: object
238249
dataDisks:
239250
description: DataDisks specifies the list of data disks to be
240251
created for a Virtual Machine

exp/api/v1beta1/azuremachinepool_types.go

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,10 @@ type (
7171
// +optional
7272
AcceleratedNetworking *bool `json:"acceleratedNetworking,omitempty"`
7373

74+
// AdditionalCapabilities specifies additional capabilities enabled or disabled on the virtual machine.
75+
// +optional
76+
AdditionalCapabilities *infrav1.AdditionalCapabilities `json:"additionalCapabilities,omitempty"`
77+
7478
// Diagnostics specifies the diagnostics settings for a virtual machine.
7579
// If not specified then Boot diagnostics (Managed) will be enabled.
7680
// +optional

exp/api/v1beta1/zz_generated.deepcopy.go

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

0 commit comments

Comments
 (0)