Merge pull request #5628 from w21froster/amp-additionalCapabilities

feat: add additionalCapabilities spec to az MPs to support UltraSSDs

Author: k8s-ci-robot

azure/scope/machinepool.go

@@ -200,6 +200,7 @@ func (m *MachinePoolScope) ScaleSetSpec(ctx context.Context) azure.ResourceSpecG
 		PublicLBName:                 m.OutboundLBName(infrav1.Node),
 		PublicLBAddressPoolName:      m.OutboundPoolName(infrav1.Node),
 		AcceleratedNetworking:        m.AzureMachinePool.Spec.Template.NetworkInterfaces[0].AcceleratedNetworking,
+		AdditionalCapabilities:       m.AzureMachinePool.Spec.Template.AdditionalCapabilities,
 		Identity:                     m.AzureMachinePool.Spec.Identity,
 		UserAssignedIdentities:       m.AzureMachinePool.Spec.UserAssignedIdentities,
 		DiagnosticsProfile:           m.AzureMachinePool.Spec.Template.Diagnostics,

azure/services/resourceskus/sku.go

@@ -158,6 +158,12 @@ func (s SKU) HasLocationCapability(capabilityName, location, zone string) bool {
 
 			for _, capability := range zoneDetail.Capabilities {
 				if capability.Name != nil && *capability.Name == capabilityName {
+					// If capability is not limited to specific zones, return true
+					if zoneDetail.Name == nil {
+						return true
+					}
+
+					// Otherwise, we need to check listed zones to verify capability is available
 					for _, name := range zoneDetail.Name {
 						if ptr.Deref(name, "") == zone {
 							return true

azure/services/scalesets/spec.go

@@ -269,7 +269,9 @@ func (s *ScaleSetSpec) Parameters(ctx context.Context, existing interface{}) (pa
 	if s.AdditionalCapabilities != nil {
 		// Set UltraSSDEnabled if a specific value is set on the spec for it.
 		if s.AdditionalCapabilities.UltraSSDEnabled != nil {
-			vmss.Properties.AdditionalCapabilities.UltraSSDEnabled = s.AdditionalCapabilities.UltraSSDEnabled
+			vmss.Properties.AdditionalCapabilities = &armcompute.AdditionalCapabilities{
+				UltraSSDEnabled: s.AdditionalCapabilities.UltraSSDEnabled,
+			}
 		}
 	}
 

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

@@ -235,6 +235,17 @@ spec:
                     description: 'Deprecated: AcceleratedNetworking should be set
                       in the networkInterfaces field.'
                     type: boolean
+                  additionalCapabilities:
+                    description: AdditionalCapabilities specifies additional capabilities
+                      enabled or disabled on the virtual machine.
+                    properties:
+                      ultraSSDEnabled:
+                        description: |-
+                          UltraSSDEnabled enables or disables Azure UltraSSD capability for the virtual machine.
+                          Defaults to true if Ultra SSD data disks are specified,
+                          otherwise it doesn't set the capability on the VM.
+                        type: boolean
+                    type: object
                   dataDisks:
                     description: DataDisks specifies the list of data disks to be
                       created for a Virtual Machine

exp/api/v1beta1/azuremachinepool_types.go

@@ -71,6 +71,10 @@ type (
 		// +optional
 		AcceleratedNetworking *bool `json:"acceleratedNetworking,omitempty"`
 
+		// AdditionalCapabilities specifies additional capabilities enabled or disabled on the virtual machine.
+		// +optional
+		AdditionalCapabilities *infrav1.AdditionalCapabilities `json:"additionalCapabilities,omitempty"`
+
 		// Diagnostics specifies the diagnostics settings for a virtual machine.
 		// If not specified then Boot diagnostics (Managed) will be enabled.
 		// +optional