fix NodeTaints and NodeLabels return type for AzureManagedMachinePools #4122

nawazkh · 2023-10-12T16:13:31Z

What type of PR is this?
/kind bug

What this PR does / why we need it:

CAPZ will send out the below return types to AKS API so that the AKS API clears-out NodeLabels and NodeTaints respectively.
- an empty Map when the NodeLabels are deleted.
- an empty pointer array when the NodeTaints are deleted.

Which issue(s) this PR fixes (optional, in fixes #<issue number>(, fixes #<issue_number>, ...) format, will close the issue(s) when PR gets merged):
Fixes #4116

Special notes for your reviewer:

cherry-pick candidate

TODOs:

squashed commits
includes documentation
adds unit tests

Release note:

fix NodeTaints and NodeLabels return type for AzureManagedMachinePools

nojnhuh · 2023-10-12T17:08:25Z

Does this address #4116?

nojnhuh

I think this is correct. Could you please fix up this PR to be more descriptive and add tests? e2e tests might also need to be updated.

nawazkh · 2023-10-12T17:55:51Z

Thanks, Jon!
I am trying to reproduce this, will fix up the description and add tests after that.
I think Jack has an improvement to build upon: #4124

nawazkh · 2023-10-12T22:23:44Z

Converted to draft so that I don't trigger any more tests on an in progress PR.

nawazkh · 2023-10-12T23:31:12Z

/cherry-pick release-1.11

k8s-infra-cherrypick-robot · 2023-10-12T23:31:14Z

@nawazkh: once the present PR merges, I will cherry-pick it on top of release-1.11 in a new PR and assign it to you.

In response to this:

/cherry-pick release-1.11

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

nawazkh · 2023-10-12T23:31:27Z

/cherry-pick release-1.10

k8s-infra-cherrypick-robot · 2023-10-12T23:31:28Z

@nawazkh: once the present PR merges, I will cherry-pick it on top of release-1.10 in a new PR and assign it to you.

In response to this:

/cherry-pick release-1.10

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

nawazkh · 2023-10-12T23:32:00Z

/cc @jackfrancis @CecileRobertMichon

nojnhuh · 2023-10-13T18:53:38Z

@nawazkh When this PR is ready for review please mark it as such in the project board.

CecileRobertMichon

/lgtm

k8s-ci-robot · 2023-10-13T19:26:37Z

LGTM label has been added.

Git tree hash: edf506c508359320c22efdbf231513f752c30b24

nojnhuh

/lgtm
/approve

nojnhuh · 2023-10-13T21:59:37Z

azure/services/agentpools/spec_test.go

+				"foo":   ptr.To("bar"),
+				"hello": ptr.To("world"),
+			},
+			expected: map[string]*string{},
 		},
 		{


@jackfrancis Are you still taking on updating the e2e tests?

k8s-ci-robot · 2023-10-13T22:20:20Z

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: nojnhuh

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

~~OWNERS~~ [nojnhuh]

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

nawazkh · 2023-10-16T14:37:44Z

/test pull-cluster-api-provider-azure-e2e-aks

mboersma

/lgtm

k8s-infra-cherrypick-robot · 2023-10-16T17:40:09Z

@nawazkh: #4122 failed to apply on top of branch "release-1.11":

Applying: Send empty type to AKS API when deleting NodeLabels, NodeTaints
Using index info to reconstruct a base tree...
M	azure/services/agentpools/spec.go
M	azure/services/agentpools/spec_test.go
Falling back to patching base and 3-way merge...
Auto-merging azure/services/agentpools/spec_test.go
CONFLICT (content): Merge conflict in azure/services/agentpools/spec_test.go
Auto-merging azure/services/agentpools/spec.go
CONFLICT (content): Merge conflict in azure/services/agentpools/spec.go
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Send empty type to AKS API when deleting NodeLabels, NodeTaints
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

In response to this:

/cherry-pick release-1.11

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

k8s-infra-cherrypick-robot · 2023-10-16T17:40:42Z

@nawazkh: #4122 failed to apply on top of branch "release-1.10":

Applying: Send empty type to AKS API when deleting NodeLabels, NodeTaints
Using index info to reconstruct a base tree...
M	azure/services/agentpools/spec.go
M	azure/services/agentpools/spec_test.go
Falling back to patching base and 3-way merge...
Auto-merging azure/services/agentpools/spec_test.go
CONFLICT (content): Merge conflict in azure/services/agentpools/spec_test.go
Auto-merging azure/services/agentpools/spec.go
CONFLICT (content): Merge conflict in azure/services/agentpools/spec.go
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Send empty type to AKS API when deleting NodeLabels, NodeTaints
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

In response to this:

/cherry-pick release-1.10

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

nojnhuh · 2023-10-16T17:47:38Z

@nawazkh Are we sure this bug affects 1.10? Or do we know that this isn't related to the SDK v2 migration?

nawazkh · 2023-10-16T18:51:09Z

Are we sure this bug affects 1.10? Or do we know that this isn't related to the SDK v2 migration?

Confirming. Will update in a bit.

nawazkh · 2023-10-16T19:29:55Z

I see the endless reconciliation on release-1.10 as well. I believe we need this fix on release-1.10.
The cluster is still up in my sub, I see the below in my diff.

 containerservice.AgentPool{
  	Response: {},
  	ManagedClusterAgentPoolProfileProperties: &containerservice.ManagedClusterAgentPoolProfileProperties{
  		... // 27 identical fields
  		SpotMaxPrice:              nil,
  		Tags:                      nil,
- 		NodeLabels:                nil,
+ 		NodeLabels:                map[string]*string{"test": &"test"},
  		NodeTaints:                nil,
  		ProximityPlacementGroupID: nil,
  		... // 7 identical fields
  	},
  	ID:   nil,
  	Name: nil,
  	Type: nil,
  }

nawazkh · 2023-10-17T16:36:45Z

I should now be able to cherry-pick this PR onto release-1.11 since #4140 (comment) got merged onto release-1.11.

/cherry-pick release-1.11

k8s-infra-cherrypick-robot · 2023-10-17T16:37:22Z

@nawazkh: new pull request created: #4147

In response to this:

I should now be able to cherry-pick this PR onto release-1.11 since #4140 (comment) got merged onto release-1.11.

/cherry-pick release-1.11

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

nawazkh · 2023-10-18T15:57:46Z

I should be able to cherry-pick onto release-1.10 branch now that #4127 has merged.

/cherry-pick release-1.10

k8s-infra-cherrypick-robot · 2023-10-18T15:58:20Z

@nawazkh: #4122 failed to apply on top of branch "release-1.10":

Applying: Send empty type to AKS API when deleting NodeLabels, NodeTaints
Using index info to reconstruct a base tree...
M	azure/services/agentpools/spec.go
M	azure/services/agentpools/spec_test.go
Falling back to patching base and 3-way merge...
Auto-merging azure/services/agentpools/spec_test.go
Auto-merging azure/services/agentpools/spec.go
CONFLICT (content): Merge conflict in azure/services/agentpools/spec.go
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Send empty type to AKS API when deleting NodeLabels, NodeTaints
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

In response to this:

I should be able to cherry-pick onto release-1.10 branch now that #4127 has merged.

/cherry-pick release-1.10

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

k8s-ci-robot requested review from Jont828 and jsturtevant October 12, 2023 16:13

k8s-ci-robot added the size/M Denotes a PR that changes 30-99 lines, ignoring generated files. label Oct 12, 2023

nojnhuh reviewed Oct 12, 2023

View reviewed changes

nawazkh force-pushed the agentpools_labels_fix branch 2 times, most recently from 704441f to 9c3eba1 Compare October 12, 2023 22:23

nawazkh marked this pull request as draft October 12, 2023 22:23

nawazkh force-pushed the agentpools_labels_fix branch from 9c3eba1 to f58584e Compare October 12, 2023 23:26

nawazkh marked this pull request as ready for review October 12, 2023 23:29

k8s-ci-robot requested review from mboersma and nojnhuh October 12, 2023 23:29

nawazkh changed the title ~~[WIP] can CAPZ overwrite the values to nil using Azure SDK?~~ fix NodeTaints and NodeLabels return type for AzureManagedMachinePools Oct 12, 2023

k8s-ci-robot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Oct 12, 2023

k8s-ci-robot requested a review from CecileRobertMichon October 12, 2023 23:32

nawazkh force-pushed the agentpools_labels_fix branch from f58584e to 05cbad7 Compare October 12, 2023 23:44

CecileRobertMichon reviewed Oct 13, 2023

View reviewed changes

k8s-ci-robot assigned CecileRobertMichon Oct 13, 2023

k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Oct 13, 2023

nojnhuh reviewed Oct 13, 2023

View reviewed changes

k8s-ci-robot assigned nojnhuh Oct 13, 2023

k8s-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Oct 13, 2023

mboersma approved these changes Oct 16, 2023

View reviewed changes

k8s-ci-robot assigned mboersma Oct 16, 2023

k8s-ci-robot merged commit b7de934 into kubernetes-sigs:main Oct 16, 2023
20 checks passed

k8s-ci-robot added this to the v1.12 milestone Oct 16, 2023

nawazkh deleted the agentpools_labels_fix branch October 16, 2023 18:50

nojnhuh mentioned this pull request Oct 16, 2023

convert managedclusters and agentpools to ASO #4069

Merged

4 tasks

nawazkh mentioned this pull request Oct 16, 2023

[release-1.10] Fix AKS reconciliation of taints #4127

Merged

4 tasks

k8s-infra-cherrypick-robot mentioned this pull request Oct 17, 2023

[release-1.11] fix NodeTaints and NodeLabels return type for AzureManagedMachinePools #4147

Merged

nawazkh mentioned this pull request Oct 18, 2023

[release-1.10] fix NodeTaints and NodeLabels return type for AzureManagedMachinePools #4153

Merged

4 tasks

nojnhuh mentioned this pull request Nov 20, 2023

test deleting all tags, node labels, and node taints in AKS e2e #4295

Merged

4 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

fix NodeTaints and NodeLabels return type for AzureManagedMachinePools #4122

fix NodeTaints and NodeLabels return type for AzureManagedMachinePools #4122

nawazkh commented Oct 12, 2023 •

edited

Loading

nojnhuh commented Oct 12, 2023

nojnhuh left a comment

nawazkh commented Oct 12, 2023

nawazkh commented Oct 12, 2023

nawazkh commented Oct 12, 2023

k8s-infra-cherrypick-robot commented Oct 12, 2023

nawazkh commented Oct 12, 2023

k8s-infra-cherrypick-robot commented Oct 12, 2023

nawazkh commented Oct 12, 2023

nojnhuh commented Oct 13, 2023

CecileRobertMichon left a comment

k8s-ci-robot commented Oct 13, 2023

nojnhuh left a comment

nojnhuh Oct 13, 2023

k8s-ci-robot commented Oct 13, 2023

nawazkh commented Oct 16, 2023

mboersma left a comment

k8s-infra-cherrypick-robot commented Oct 16, 2023

k8s-infra-cherrypick-robot commented Oct 16, 2023

nojnhuh commented Oct 16, 2023

nawazkh commented Oct 16, 2023

nawazkh commented Oct 16, 2023

nawazkh commented Oct 17, 2023

k8s-infra-cherrypick-robot commented Oct 17, 2023

nawazkh commented Oct 18, 2023

k8s-infra-cherrypick-robot commented Oct 18, 2023

fix NodeTaints and NodeLabels return type for AzureManagedMachinePools #4122

fix NodeTaints and NodeLabels return type for AzureManagedMachinePools #4122

Conversation

nawazkh commented Oct 12, 2023 • edited Loading

nojnhuh commented Oct 12, 2023

nojnhuh left a comment

Choose a reason for hiding this comment

nawazkh commented Oct 12, 2023

nawazkh commented Oct 12, 2023

nawazkh commented Oct 12, 2023

k8s-infra-cherrypick-robot commented Oct 12, 2023

nawazkh commented Oct 12, 2023

k8s-infra-cherrypick-robot commented Oct 12, 2023

nawazkh commented Oct 12, 2023

nojnhuh commented Oct 13, 2023

CecileRobertMichon left a comment

Choose a reason for hiding this comment

k8s-ci-robot commented Oct 13, 2023

nojnhuh left a comment

Choose a reason for hiding this comment

nojnhuh Oct 13, 2023

Choose a reason for hiding this comment

k8s-ci-robot commented Oct 13, 2023

nawazkh commented Oct 16, 2023

mboersma left a comment

Choose a reason for hiding this comment

k8s-infra-cherrypick-robot commented Oct 16, 2023

k8s-infra-cherrypick-robot commented Oct 16, 2023

nojnhuh commented Oct 16, 2023

nawazkh commented Oct 16, 2023

nawazkh commented Oct 16, 2023

nawazkh commented Oct 17, 2023

k8s-infra-cherrypick-robot commented Oct 17, 2023

nawazkh commented Oct 18, 2023

k8s-infra-cherrypick-robot commented Oct 18, 2023

nawazkh commented Oct 12, 2023 •

edited

Loading