Merge pull request #2027 from k8s-infra-cherrypick-robot/cherry-pick-2025-to-release-1.1

k8s-ci-robot · web-flow · commit 61fcf75d5a29 · 2022-02-01T11:21:48.000-08:00
[release-1.1] use aks-managed-poolName also for vmss match
diff --git a/exp/controllers/azuremanagedmachinepool_reconciler.go b/exp/controllers/azuremanagedmachinepool_reconciler.go
@@ -116,6 +116,11 @@ func (s *azureManagedMachinePoolService) Reconcile(ctx context.Context) error {
 			match = &ss
 			break
 		}
+
+		if ss.Tags["aks-managed-poolName"] != nil && *ss.Tags["aks-managed-poolName"] == agentPoolName {
+			match = &ss
+			break
+		}
 	}
 
 	if match == nil {

Original file line number	Diff line number	Diff line change
`@@ -116,6 +116,11 @@ func (s *azureManagedMachinePoolService) Reconcile(ctx context.Context) error {`
`116`	`116`	`match = &ss`
`117`	`117`	`break`
`118`	`118`	`}`
	`119`	`+`
	`120`	`+ if ss.Tags["aks-managed-poolName"] != nil && *ss.Tags["aks-managed-poolName"] == agentPoolName {`
	`121`	`+ match = &ss`
	`122`	`+ break`
	`123`	`+ }`
`119`	`124`	`}`
`120`	`125`
`121`	`126`	`if match == nil {`