Merge pull request #3310 from k8s-infra-cherrypick-robot/cherry-pick-3302-to-release-1.8

k8s-ci-robot · web-flow · commit d1da3f5bb539 · 2023-03-16T03:55:16.000-07:00
[release-1.8] Fixing assignment
diff --git a/azure/services/scalesets/scalesets.go b/azure/services/scalesets/scalesets.go
@@ -281,7 +281,7 @@ func (s *Service) patchVMSSIfNeeded(ctx context.Context, infraVMSS *azure.VMSS)
 	// If the VMSS is managed by an external autoscaler, we should patch the VMSS if customData has changed.
 	shouldPatchCustomData := false
 	if s.Scope.HasReplicasExternallyManaged(ctx) {
-		shouldPatchCustomData, err := s.Scope.HasBootstrapDataChanges(ctx)
+		shouldPatchCustomData, err = s.Scope.HasBootstrapDataChanges(ctx)
 		if err != nil {
 			return nil, errors.Wrap(err, "unable to calculate custom data hash")
 		}

Original file line number	Diff line number	Diff line change
`@@ -281,7 +281,7 @@ func (s Service) patchVMSSIfNeeded(ctx context.Context, infraVMSS azure.VMSS)`
`281`	`281`	`// If the VMSS is managed by an external autoscaler, we should patch the VMSS if customData has changed.`
`282`	`282`	`shouldPatchCustomData := false`
`283`	`283`	`if s.Scope.HasReplicasExternallyManaged(ctx) {`
`284`		`- shouldPatchCustomData, err := s.Scope.HasBootstrapDataChanges(ctx)`
	`284`	`+ shouldPatchCustomData, err = s.Scope.HasBootstrapDataChanges(ctx)`
`285`	`285`	`if err != nil {`
`286`	`286`	`return nil, errors.Wrap(err, "unable to calculate custom data hash")`
`287`	`287`	`}`