Skip to content

Commit ee4a875

Browse files
committed
fix: fix bailing HasLocationCapability method
fix: undo manager image patch
1 parent e031de5 commit ee4a875

File tree

2 files changed

+9
-1
lines changed

2 files changed

+9
-1
lines changed

azure/services/resourceskus/sku.go

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -158,6 +158,12 @@ func (s SKU) HasLocationCapability(capabilityName, location, zone string) bool {
158158

159159
for _, capability := range zoneDetail.Capabilities {
160160
if capability.Name != nil && *capability.Name == capabilityName {
161+
// If capability is not limited to specific zones, return true
162+
if zoneDetail.Name == nil {
163+
return true
164+
}
165+
166+
// Otherwise, we need to check listed zones to verify capability is available
161167
for _, name := range zoneDetail.Name {
162168
if ptr.Deref(name, "") == zone {
163169
return true

azure/services/scalesets/spec.go

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -269,7 +269,9 @@ func (s *ScaleSetSpec) Parameters(ctx context.Context, existing interface{}) (pa
269269
if s.AdditionalCapabilities != nil {
270270
// Set UltraSSDEnabled if a specific value is set on the spec for it.
271271
if s.AdditionalCapabilities.UltraSSDEnabled != nil {
272-
vmss.Properties.AdditionalCapabilities.UltraSSDEnabled = s.AdditionalCapabilities.UltraSSDEnabled
272+
vmss.Properties.AdditionalCapabilities = &armcompute.AdditionalCapabilities{
273+
UltraSSDEnabled: s.AdditionalCapabilities.UltraSSDEnabled,
274+
}
273275
}
274276
}
275277

0 commit comments

Comments
 (0)