🐛 Fix MachinePool node taint patching #8462

CecileRobertMichon · 2023-04-03T22:02:27Z

What this PR does / why we need it: Fixes flake observed in CAPZ testing with CAPI v1.4.0 where MachinePool Nodes {node.cluster.x-k8s.io/uninitialized: } taints don't get removed right away (~15 minute delay). The root cause is that we are escaping the second part of the if annotations.AddAnnotations(node, desired) || taints.RemoveNodeTaint(node, clusterv1.NodeUninitializedTaint) when the first part if true (see https://play.golang.com/p/i-6vDeSeeBE). This results in the controller returning no error without having patched the taints. Only after the resyncPeriod does the controller get requeued and Taints finally updated.

Credits to @nawazkh @willie-yao @jackfrancis for helping me find this

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 #8442

CecileRobertMichon · 2023-04-03T22:04:02Z

/cherry-pick release-1.4
/assign @ykakarap @fabriziopandini

I'm working on adding unit tests for this (it's not trivial because the unit tests are non existent at the moment) + testing this patch with kubernetes-sigs/cluster-api-provider-azure#3378

k8s-infra-cherrypick-robot · 2023-04-03T22:04:03Z

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

In response to this:

/cherry-pick release-1.4
/assign @ykakarap @fabriziopandini

I'm working on adding unit tests for this (it's not trivial because the unit tests are non existent at the moment) + testing this patch with kubernetes-sigs/cluster-api-provider-azure#3378

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.

ykakarap

/lgtm

k8s-ci-robot · 2023-04-03T22:22:19Z

LGTM label has been added.

Git tree hash: 6a083f25d17c237e3fc4c020d99039cae1463052

CecileRobertMichon · 2023-04-03T23:46:34Z

exp/internal/controllers/machinepool_controller_noderef.go

+			clusterv1.OwnerKindAnnotation:        mp.Kind,
+			clusterv1.OwnerNameAnnotation:        mp.Name,
+		}
+		// Add annotations and drop NodeUninitializedTaint.


this is the real change here (line 225-228). Everything else is just extracting the code into a function so it can be unit tested.

CecileRobertMichon · 2023-04-03T23:58:18Z

Added unit tests. Had to extract the patching code into a helper function that takes a client so it could be unit tested.

exp/internal/controllers/machinepool_controller_noderef.go

exp/internal/controllers/machinepool_controller_noderef_test.go

nawazkh · 2023-04-04T00:19:55Z

Looks good to me! 🚀

CecileRobertMichon · 2023-04-04T00:20:50Z

/retest

willie-yao

lgtm!

ykakarap

/lgtm

Thank you @CecileRobertMichon 🙂

internal/util/taints/taints_test.go

k8s-ci-robot · 2023-04-04T03:16:27Z

LGTM label has been added.

Git tree hash: 8d7f9ff4f3277b16c8a67df3bf99806bd79b40a5

fabriziopandini

good catch!
/lgtm

CecileRobertMichon · 2023-04-04T16:22:02Z

/approve

k8s-ci-robot · 2023-04-04T16:22:15Z

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: CecileRobertMichon

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~~ [CecileRobertMichon]

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

k8s-infra-cherrypick-robot · 2023-04-04T16:36:24Z

@CecileRobertMichon: new pull request created: #8468

In response to this:

/cherry-pick release-1.4
/assign @ykakarap @fabriziopandini

I'm working on adding unit tests for this (it's not trivial because the unit tests are non existent at the moment) + testing this patch with kubernetes-sigs/cluster-api-provider-azure#3378

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.

johannesfrey · 2023-06-16T08:03:58Z

/area machinepool

k8s-ci-robot added cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. labels Apr 3, 2023

k8s-ci-robot requested review from fabriziopandini and richardcase April 3, 2023 22:02

k8s-ci-robot assigned fabriziopandini and ykakarap Apr 3, 2023

CecileRobertMichon mentioned this pull request Apr 3, 2023

🐛 Add node watcher to MachinePool controller #8443

Merged

ykakarap approved these changes Apr 3, 2023

View reviewed changes

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

CecileRobertMichon force-pushed the fix-mp-taint-drop branch from d1282cf to 875d36a Compare April 3, 2023 23:45

k8s-ci-robot removed the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Apr 3, 2023

k8s-ci-robot requested a review from ykakarap April 3, 2023 23:45

k8s-ci-robot added size/L Denotes a PR that changes 100-499 lines, ignoring generated files. and removed size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. labels Apr 3, 2023

CecileRobertMichon commented Apr 3, 2023

View reviewed changes

CecileRobertMichon force-pushed the fix-mp-taint-drop branch from 875d36a to 39a84c4 Compare April 3, 2023 23:54

jackfrancis reviewed Apr 3, 2023

View reviewed changes

exp/internal/controllers/machinepool_controller_noderef.go Show resolved Hide resolved

willie-yao reviewed Apr 4, 2023

View reviewed changes

exp/internal/controllers/machinepool_controller_noderef_test.go Show resolved Hide resolved

🐛 Fix MachinePool node taint patching

3095518

CecileRobertMichon force-pushed the fix-mp-taint-drop branch from 39a84c4 to 3095518 Compare April 4, 2023 00:11

willie-yao approved these changes Apr 4, 2023

View reviewed changes

ykakarap approved these changes Apr 4, 2023

View reviewed changes

internal/util/taints/taints_test.go Show resolved Hide resolved

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

fabriziopandini reviewed Apr 4, 2023

View reviewed changes

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

k8s-ci-robot merged commit 52fc099 into kubernetes-sigs:main Apr 4, 2023
10 checks passed

k8s-ci-robot added this to the v1.5 milestone Apr 4, 2023

k8s-infra-cherrypick-robot mentioned this pull request Apr 4, 2023

[release-1.4] 🐛 Fix MachinePool node taint patching #8468

Merged

CecileRobertMichon mentioned this pull request Apr 7, 2023

Ensure we test beta releases of CAPI with some providers before release #8498

Closed

k8s-ci-robot added the area/machinepool Issues or PRs related to machinepools label Jun 16, 2023

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

🐛 Fix MachinePool node taint patching #8462

🐛 Fix MachinePool node taint patching #8462

CecileRobertMichon commented Apr 3, 2023 •

edited

CecileRobertMichon commented Apr 3, 2023

k8s-infra-cherrypick-robot commented Apr 3, 2023

ykakarap left a comment

k8s-ci-robot commented Apr 3, 2023

CecileRobertMichon Apr 3, 2023 •

edited

CecileRobertMichon commented Apr 3, 2023

nawazkh commented Apr 4, 2023

CecileRobertMichon commented Apr 4, 2023

willie-yao left a comment

ykakarap left a comment

k8s-ci-robot commented Apr 4, 2023

fabriziopandini left a comment

CecileRobertMichon commented Apr 4, 2023

k8s-ci-robot commented Apr 4, 2023

k8s-infra-cherrypick-robot commented Apr 4, 2023

johannesfrey commented Jun 16, 2023

🐛 Fix MachinePool node taint patching #8462

🐛 Fix MachinePool node taint patching #8462

Conversation

CecileRobertMichon commented Apr 3, 2023 • edited

CecileRobertMichon commented Apr 3, 2023

k8s-infra-cherrypick-robot commented Apr 3, 2023

ykakarap left a comment

Choose a reason for hiding this comment

k8s-ci-robot commented Apr 3, 2023

CecileRobertMichon Apr 3, 2023 • edited

Choose a reason for hiding this comment

CecileRobertMichon commented Apr 3, 2023

nawazkh commented Apr 4, 2023

CecileRobertMichon commented Apr 4, 2023

willie-yao left a comment

Choose a reason for hiding this comment

ykakarap left a comment

Choose a reason for hiding this comment

k8s-ci-robot commented Apr 4, 2023

fabriziopandini left a comment

Choose a reason for hiding this comment

CecileRobertMichon commented Apr 4, 2023

k8s-ci-robot commented Apr 4, 2023

k8s-infra-cherrypick-robot commented Apr 4, 2023

johannesfrey commented Jun 16, 2023

CecileRobertMichon commented Apr 3, 2023 •

edited

CecileRobertMichon Apr 3, 2023 •

edited