Merge pull request #3465 from newrelic-forks/cherry-pick-3440-to-release-1.8

k8s-ci-robot · web-flow · commit 0e87c742573e · 2023-04-21T08:13:11.000-07:00
[release-1.8] disable surging if externally managed autoscaler is used
diff --git a/azure/services/scalesets/scalesets.go b/azure/services/scalesets/scalesets.go
@@ -298,7 +298,7 @@ func (s *Service) patchVMSSIfNeeded(ctx context.Context, infraVMSS *azure.VMSS)
 	if !isFlex {
 		updated = infraVMSS.HasEnoughLatestModelOrNotMixedModel()
 	}
-	if maxSurge > 0 && (hasModelChanges || !updated) {
+	if maxSurge > 0 && (hasModelChanges || !updated) && !s.Scope.HasReplicasExternallyManaged(ctx) {
 		// surge capacity with the intention of lowering during instance reconciliation
 		surge := spec.Capacity + int64(maxSurge)
 		log.V(4).Info("surging...", "surge", surge, "hasModelChanges", hasModelChanges, "updated", updated)
diff --git a/azure/services/scalesets/scalesets_test.go b/azure/services/scalesets/scalesets_test.go
@@ -617,7 +617,7 @@ func TestReconcileVMSS(t *testing.T) {
 				m.GetResultIfDone(gomockinternal.AContext(), patchFuture).Return(compute.VirtualMachineScaleSet{}, azure.NewOperationNotDoneError(patchFuture))
 				m.Get(gomockinternal.AContext(), defaultResourceGroup, defaultVMSSName).Return(clone, nil)
 				m.ListInstances(gomockinternal.AContext(), defaultResourceGroup, defaultVMSSName).Return(instances, nil)
-				s.HasReplicasExternallyManaged(gomockinternal.AContext()).Return(false)
+				s.HasReplicasExternallyManaged(gomockinternal.AContext()).Times(2).Return(false)
 			},
 		},
 		{

Original file line number	Diff line number	Diff line change
`@@ -298,7 +298,7 @@ func (s Service) patchVMSSIfNeeded(ctx context.Context, infraVMSS azure.VMSS)`
`298`	`298`	`if !isFlex {`
`299`	`299`	`updated = infraVMSS.HasEnoughLatestModelOrNotMixedModel()`
`300`	`300`	`}`
`301`		`- if maxSurge > 0 && (hasModelChanges \|\| !updated) {`
	`301`	`+ if maxSurge > 0 && (hasModelChanges \|\| !updated) && !s.Scope.HasReplicasExternallyManaged(ctx) {`
`302`	`302`	`// surge capacity with the intention of lowering during instance reconciliation`
`303`	`303`	`surge := spec.Capacity + int64(maxSurge)`
`304`	`304`	`log.V(4).Info("surging...", "surge", surge, "hasModelChanges", hasModelChanges, "updated", updated)`
Original file line number	Diff line number	Diff line change
`@@ -617,7 +617,7 @@ func TestReconcileVMSS(t *testing.T) {`
`617`	`617`	`m.GetResultIfDone(gomockinternal.AContext(), patchFuture).Return(compute.VirtualMachineScaleSet{}, azure.NewOperationNotDoneError(patchFuture))`
`618`	`618`	`m.Get(gomockinternal.AContext(), defaultResourceGroup, defaultVMSSName).Return(clone, nil)`
`619`	`619`	`m.ListInstances(gomockinternal.AContext(), defaultResourceGroup, defaultVMSSName).Return(instances, nil)`
`620`		`- s.HasReplicasExternallyManaged(gomockinternal.AContext()).Return(false)`
	`620`	`+ s.HasReplicasExternallyManaged(gomockinternal.AContext()).Times(2).Return(false)`
`621`	`621`	`},`
`622`	`622`	`},`
`623`	`623`	`{`