Merge pull request #4174 from k8s-infra-cherrypick-robot/cherry-pick-4158-to-release-1.11

[release-1.11] workaround ASO swallowing updates into ongoing operations

Author: k8s-ci-robot

azure/services/aso/aso.go

@@ -113,11 +113,15 @@ func (s *Service) CreateOrUpdateResource(ctx context.Context, spec azure.ASOReso
 				// update instead of returning early.
 				adopt = true
 			case cond.Reason == conditions.ReasonReconciling.Name:
-				readyErr = azure.NewOperationNotDoneError(&infrav1.Future{
+				// Updating the spec of an ASO resource that is already being updated will swallow this update
+				// and ignore it until the next periodic ASO resync.
+				// ref: https://github.com/Azure/azure-service-operator/issues/3451
+				err := azure.NewOperationNotDoneError(&infrav1.Future{
 					Type:          createOrUpdateFutureType,
 					ResourceGroup: existing.GetNamespace(),
 					Name:          existing.GetName(),
 				})
+				return nil, azure.WithTransientError(err, requeueInterval)
 			default:
 				readyErr = fmt.Errorf("resource is not Ready: %s", conds[i].Message)
 			}

azure/services/aso/aso_test.go

@@ -231,10 +231,6 @@ func TestCreateOrUpdateResource(t *testing.T) {
 				Namespace: "namespace",
 			},
 		})
-		specMock.EXPECT().Parameters(gomockinternal.AContext(), gomock.Not(gomock.Nil())).DoAndReturn(func(_ context.Context, group *asoresourcesv1.ResourceGroup) (*asoresourcesv1.ResourceGroup, error) {
-			return group, nil
-		})
-		specMock.EXPECT().WasManaged(gomock.Any()).Return(false)
 
 		ctx := context.Background()
 		g.Expect(c.Create(ctx, &asoresourcesv1.ResourceGroup{