Merge pull request #823 from Deeps-1989/dedupe-reconciliation-tags

k8s-ci-robot · web-flow · commit bceee96d979f · 2020-07-23T16:16:23.000-07:00
💎 dedupe tag reconciliation on machine pool
diff --git a/exp/controllers/azuremachinepool_controller.go b/exp/controllers/azuremachinepool_controller.go
@@ -286,12 +286,6 @@ func (r *AzureMachinePoolReconciler) reconcileNormal(ctx context.Context, machin
 		machinePoolScope.SetFailureMessage(errors.Errorf("Azure VMSS state %q is unexpected", vmss.State))
 	}
 
-	// Ensure that the tags are correct.
-	err = r.reconcileTags(ctx, machinePoolScope, clusterScope, ams.skuCache, machinePoolScope.AdditionalTags())
-	if err != nil {
-		return reconcile.Result{}, errors.Errorf("failed to ensure tags: %+v", err)
-	}
-
 	return reconcile.Result{}, nil
 }
 

Original file line number	Diff line number	Diff line change
`@@ -286,12 +286,6 @@ func (r *AzureMachinePoolReconciler) reconcileNormal(ctx context.Context, machin`
`286`	`286`	`machinePoolScope.SetFailureMessage(errors.Errorf("Azure VMSS state %q is unexpected", vmss.State))`
`287`	`287`	`}`
`288`	`288`
`289`		`- // Ensure that the tags are correct.`
`290`		`- err = r.reconcileTags(ctx, machinePoolScope, clusterScope, ams.skuCache, machinePoolScope.AdditionalTags())`
`291`		`- if err != nil {`
`292`		`- return reconcile.Result{}, errors.Errorf("failed to ensure tags: %+v", err)`
`293`		`- }`
`294`		`-`
`295`	`289`	`return reconcile.Result{}, nil`
`296`	`290`	`}`
`297`	`291`