Merge pull request #3053 from k8s-infra-cherrypick-robot/cherry-pick-3050-to-release-1.7

k8s-ci-robot · web-flow · commit 3d7d5075fbab · 2023-01-18T12:20:33.000-08:00
[release-1.7] fix unnecessary reconciles on AKS node taints
diff --git a/azure/services/agentpools/spec.go b/azure/services/agentpools/spec.go
@@ -204,6 +204,9 @@ func (s *AgentPoolSpec) Parameters(ctx context.Context, existing interface{}) (p
 				Tags:                converters.TagsToMap(s.AdditionalTags),
 			},
 		}
+		if len(*normalizedProfile.NodeTaints) == 0 {
+			normalizedProfile.NodeTaints = nil
+		}
 
 		if s.KubeletConfig != nil {
 			normalizedProfile.KubeletConfig = &containerservice.KubeletConfig{

Original file line number	Diff line number	Diff line change
`@@ -204,6 +204,9 @@ func (s *AgentPoolSpec) Parameters(ctx context.Context, existing interface{}) (p`
`204`	`204`	`Tags: converters.TagsToMap(s.AdditionalTags),`
`205`	`205`	`},`
`206`	`206`	`}`
	`207`	`+ if len(*normalizedProfile.NodeTaints) == 0 {`
	`208`	`+ normalizedProfile.NodeTaints = nil`
	`209`	`+ }`
`207`	`210`
`208`	`211`	`if s.KubeletConfig != nil {`
`209`	`212`	`normalizedProfile.KubeletConfig = &containerservice.KubeletConfig{`