temp #1
temp #1
Conversation
|
|
||
| if vmssInfo.ExtendedLocation != nil { |
There was a problem hiding this comment.
Not present on older versions due to kubernetes#6447. But seemingly justified(?) due to fork code differences, see createOrUpdateInstances() for after-fork location.
This feature itself and the after-fork location is already in the fork from past versions, but kubernetes#6447 upstream it in master.
|
|
||
| if scaleSet.enableForceDelete && isOperationNotAllowed(rerr) { |
There was a problem hiding this comment.
Not present on older versions due to kubernetes#6447. But seemingly justified(?) due to fork code differences, see azure_force_delete_scale_set.go for after-fork location.
This feature itself and the after-fork location is already in the fork from past versions, but kubernetes#6447 upstream it in master.
| if rerr != nil { | ||
| klog.Errorf("virtualMachineScaleSetsClient.DeleteInstancesAsync for instances %v failed: %v", requiredIds.InstanceIds, rerr) | ||
|
|
There was a problem hiding this comment.
Not present on older versions due to fork 1.30 have this white space for unknown reason... No commit differences. Probably a merge mistake.
| @@ -767,6 +837,42 @@ func (scaleSet *ScaleSet) getOrchestrationMode() (compute.OrchestrationMode, err | |||
| return vmss.OrchestrationMode, nil | |||
| } | |||
|
|
|||
| func isOperationNotAllowed(rerr *retry.Error) bool { | |||
There was a problem hiding this comment.
Not present on older versions due to kubernetes#6447. But seemingly justified(?) due to fork code differences, see azure_force_delete_scale_set.go for after-fork location.
This feature itself and the after-fork location is already in the fork from past versions, but kubernetes#6447 upstream it in master.
comtalyst
force-pushed
the
comtalyst/azure-changes-from-managed-master
branch
from
55979ec to
2eb6cbe
Compare
…/azure
What type of PR is this?
What this PR does / why we need it:
Which issue(s) this PR fixes:
Fixes #
Special notes for your reviewer:
Does this PR introduce a user-facing change?
Additional documentation e.g., KEPs (Kubernetes Enhancement Proposals), usage docs, etc.: