Bug 2035005: Move removeUpdateInProgressTaint functionality to mcc #3064

ravisantoshgudimetla · 2022-04-05T21:51:04Z

- What I did
Move removeUpdateInProgressTaint functionality to mcc so that MCD is relieved of this job. The unit tests are updated as well. This was introduced in #2686
- How to verify it

- Description for the changelog

openshift-ci · 2022-04-05T21:51:18Z

@ravisantoshgudimetla: This pull request references Bugzilla bug 2035005, which is invalid:

expected the bug to target the "4.11.0" release, but it targets "---" instead

Comment /bugzilla refresh to re-evaluate validity if changes to the Bugzilla bug are made, or edit the title of this pull request to link to a different bug.

Details

In response to this:

Bug 2035005: Move removeUpdateInProgressTaint functionality to mcc

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.

yuqi-zhang

First pass looks good. Did you get a chance to test in-cluster?

yuqi-zhang · 2022-04-05T22:37:27Z

pkg/controller/node/node_controller.go

This is fine, but for consistency purposes, maybe we can add a check above for

if !checkIfNodeHasInProgressTaint(oldNode) { return nil }

instead?

Removed this block considering we have a check here.

soltysh

/lgtm

yuqi-zhang · 2022-04-06T14:29:57Z

pkg/controller/node/node_controller.go

Should we also move this check out? i.e. in the sync code, have:

if node.Annotations[daemonconsts.DesiredMachineConfigAnnotationKey] != targetConfig && !checkIfNodeHasInProgressTaint(node)

just to keep the two functions consistent

Yup we can do that.

mkenigs · 2022-04-06T14:55:15Z

pkg/controller/node/node_controller.go

Not sure changing this is actually clearer, but when I read this I had to think it out more like:

Suggested change

if node.Annotations[daemonconsts.DesiredMachineConfigAnnotationKey] != targetConfig && !checkIfNodeHasInProgressTaint(node) {

if err := ctrl.setUpdateInProgressTaint(ctx, node.Name); err != nil {

return goerrs.Wrapf(err, "failed applying %s taint for node %s", constants.NodeUpdateInProgressTaint.Key, node.Name)

}

} else if node.Annotations[daemonconsts.DesiredMachineConfigAnnotationKey] == targetConfig && checkIfNodeHasInProgressTaint(node) {

if err := ctrl.removeUpdateInProgressTaint(ctx, node.Name); err != nil {

return goerrs.Wrapf(err, "failed removing %s taint for node %s", constants.NodeUpdateInProgressTaint.Key, node.Name)

}

hasInProgressTaint := checkIfNodeHasInProgressTaint(node)

if node.Annotations[daemonconsts.DesiredMachineConfigAnnotationKey] == pool.Spec.Configuration.Name {

if hasInProgressTaint {

if err := ctrl.removeUpdateInProgressTaint(ctx, node.Name); err != nil {

return goerrs.Wrapf(err, "failed removing %s taint for node %s", constants.NodeUpdateInProgressTaint.Key, node.Name)

}

}

} else {

if !hasInProgressTaint {

if err := ctrl.setUpdateInProgressTaint(ctx, node.Name); err != nil {

return goerrs.Wrapf(err, "failed applying %s taint for node %s", constants.NodeUpdateInProgressTaint.Key, node.Name)

}

}

}

pkg/controller/node/node_controller_test.go

mkenigs · 2022-04-06T15:02:49Z

lgtm, but will let @yuqi-zhang take a final look

ravisantoshgudimetla · 2022-04-07T14:07:50Z

@mkenigs - Thanks for the reviews. I'll try to address them shortly. @yuqi-zhang any other functional comments, if not I'd like to get this merged?

yuqi-zhang · 2022-04-07T14:27:51Z

Looks good otherwise

ravisantoshgudimetla · 2022-04-08T21:03:38Z

@yuqi-zhang - Please tag when you find time.

yuqi-zhang

/lgtm

openshift-bot · 2022-04-12T00:55:29Z

/retest-required

Please review the full test history for this PR and help us cut down flakes.

openshift-bot · 2022-04-12T01:01:15Z

/bugzilla refresh

Recalculating validity in case the underlying Bugzilla bug has changed.

openshift-ci · 2022-04-12T01:01:19Z

@openshift-bot: This pull request references Bugzilla bug 2035005, which is invalid:

expected the bug to target the "4.11.0" release, but it targets "---" instead

Comment /bugzilla refresh to re-evaluate validity if changes to the Bugzilla bug are made, or edit the title of this pull request to link to a different bug.

Details

In response to this:

/bugzilla refresh

Recalculating validity in case the underlying Bugzilla bug has changed.

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.

openshift-bot · 2022-04-12T04:22:09Z

/retest-required

Please review the full test history for this PR and help us cut down flakes.

openshift-bot · 2022-04-12T07:23:08Z

/retest-required

Please review the full test history for this PR and help us cut down flakes.

openshift-bot · 2022-04-12T09:47:10Z

/retest-required

Please review the full test history for this PR and help us cut down flakes.

openshift-bot · 2022-04-12T15:46:08Z

/retest-required

Please review the full test history for this PR and help us cut down flakes.

openshift-bot · 2022-04-12T18:48:20Z

/retest-required

Please review the full test history for this PR and help us cut down flakes.

openshift-bot · 2022-04-12T21:16:11Z

/retest-required

Please review the full test history for this PR and help us cut down flakes.

openshift-bot · 2022-04-13T01:01:02Z

/bugzilla refresh

Recalculating validity in case the underlying Bugzilla bug has changed.

openshift-ci · 2022-04-13T01:01:26Z

@openshift-bot: This pull request references Bugzilla bug 2035005, which is invalid:

expected the bug to target the "4.11.0" release, but it targets "---" instead

Comment /bugzilla refresh to re-evaluate validity if changes to the Bugzilla bug are made, or edit the title of this pull request to link to a different bug.

Details

In response to this:

/bugzilla refresh

Recalculating validity in case the underlying Bugzilla bug has changed.

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.

yuqi-zhang · 2022-04-13T13:46:44Z

/bugzilla refresh
/lgtm

openshift-ci · 2022-04-13T13:46:55Z

@yuqi-zhang: This pull request references Bugzilla bug 2035005, which is valid. The bug has been moved to the POST state. The bug has been updated to refer to the pull request using the external bug tracker.

3 validation(s) were run on this bug

bug is open, matching expected state (open)
bug target release (4.11.0) matches configured target release for branch (4.11.0)
bug is in the state NEW, which is one of the valid states (NEW, ASSIGNED, ON_DEV, POST, POST)

No GitHub users were found matching the public email listed for the QA contact in Bugzilla ([email protected]), skipping review request.

Details

In response to this:

/bugzilla refresh
/lgtm

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.

openshift-ci · 2022-04-13T13:47:17Z

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: ravisantoshgudimetla, soltysh, yuqi-zhang

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

The pull request process is described here

Details

Needs approval from an approver in each of these files:

~~OWNERS~~ [yuqi-zhang]

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

openshift-bot · 2022-04-13T17:54:52Z

/retest-required

Please review the full test history for this PR and help us cut down flakes.

openshift-bot · 2022-04-13T18:06:54Z

/retest-required

Please review the full test history for this PR and help us cut down flakes.

openshift-bot · 2022-04-14T02:18:52Z

/retest-required

Please review the full test history for this PR and help us cut down flakes.

openshift-bot · 2022-04-14T03:30:52Z

/retest-required

Please review the full test history for this PR and help us cut down flakes.

openshift-ci · 2022-04-14T07:13:29Z

@ravisantoshgudimetla: all tests passed!

Full PR test history. Your PR dashboard.

Details

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. I understand the commands that are listed here.

openshift-ci · 2022-04-14T07:14:58Z

@ravisantoshgudimetla: All pull requests linked via external trackers have merged:

openshift/machine-config-operator#3064

Bugzilla bug 2035005 has been moved to the MODIFIED state.

Details

In response to this:

Bug 2035005: Move removeUpdateInProgressTaint functionality to mcc

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.

ravisantoshgudimetla · 2022-04-18T13:03:35Z

/cherrypick release-4.10

openshift-cherrypick-robot · 2022-04-18T13:04:16Z

@ravisantoshgudimetla: #3064 failed to apply on top of branch "release-4.10":

Applying: Move removeUpdateInProgressTaint functionality to mcc
Using index info to reconstruct a base tree...
M	pkg/controller/node/node_controller.go
M	pkg/controller/node/node_controller_test.go
M	pkg/daemon/daemon.go
Falling back to patching base and 3-way merge...
Auto-merging pkg/daemon/daemon.go
CONFLICT (content): Merge conflict in pkg/daemon/daemon.go
Auto-merging pkg/controller/node/node_controller_test.go
Auto-merging pkg/controller/node/node_controller.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 Move removeUpdateInProgressTaint functionality to mcc
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".

Details

In response to this:

/cherrypick release-4.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.

openshift-ci bot added bugzilla/severity-high Referenced Bugzilla bug's severity is high for the branch this PR is targeting. bugzilla/invalid-bug Indicates that a referenced Bugzilla bug is invalid for the branch this PR is targeting. labels Apr 5, 2022

openshift-ci bot requested review from cgwalters and mkenigs April 5, 2022 21:51

yuqi-zhang reviewed Apr 5, 2022

View reviewed changes

ravisantoshgudimetla force-pushed the move-to-mcc branch from c1121a4 to 9c5839f Compare April 6, 2022 13:12

soltysh approved these changes Apr 6, 2022

View reviewed changes

openshift-ci bot assigned soltysh Apr 6, 2022

openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Apr 6, 2022

yuqi-zhang reviewed Apr 6, 2022

View reviewed changes

ravisantoshgudimetla force-pushed the move-to-mcc branch from 9c5839f to 221229b Compare April 6, 2022 14:39

openshift-ci bot removed the lgtm Indicates that a PR is ready to be merged. label Apr 6, 2022

mkenigs reviewed Apr 6, 2022

View reviewed changes

pkg/controller/node/node_controller_test.go Outdated Show resolved Hide resolved

ravisantoshgudimetla force-pushed the move-to-mcc branch from 221229b to 1719277 Compare April 8, 2022 21:02

ravisantoshgudimetla force-pushed the move-to-mcc branch from 1719277 to ddb702b Compare April 8, 2022 21:04

yuqi-zhang approved these changes Apr 12, 2022

View reviewed changes

openshift-ci bot assigned yuqi-zhang Apr 12, 2022

openshift-ci bot added lgtm Indicates that a PR is ready to be merged. approved Indicates a PR has been approved by an approver from all required OWNERS files. labels Apr 12, 2022

Move removeUpdateInProgressTaint functionality to mcc

b490360

ravisantoshgudimetla force-pushed the move-to-mcc branch from ddb702b to b490360 Compare April 13, 2022 13:41

openshift-ci bot removed the lgtm Indicates that a PR is ready to be merged. label Apr 13, 2022

openshift-ci bot added bugzilla/valid-bug Indicates that a referenced Bugzilla bug is valid for the branch this PR is targeting. and removed bugzilla/invalid-bug Indicates that a referenced Bugzilla bug is invalid for the branch this PR is targeting. labels Apr 13, 2022

openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Apr 13, 2022

openshift-merge-robot merged commit a914766 into openshift:master Apr 14, 2022

ravisantoshgudimetla mentioned this pull request Apr 18, 2022

[release-4.10] Bug 2076308: Move removeUpdateInProgressTaint functionality to mcc #3091

Merged

-		if node.Annotations[daemonconsts.DesiredMachineConfigAnnotationKey] != targetConfig && !checkIfNodeHasInProgressTaint(node) {
-			if err := ctrl.setUpdateInProgressTaint(ctx, node.Name); err != nil {
-				return goerrs.Wrapf(err, "failed applying %s taint for node %s", constants.NodeUpdateInProgressTaint.Key, node.Name)
-			}
-		} else if node.Annotations[daemonconsts.DesiredMachineConfigAnnotationKey] == targetConfig && checkIfNodeHasInProgressTaint(node) {
-			if err := ctrl.removeUpdateInProgressTaint(ctx, node.Name); err != nil {
-				return goerrs.Wrapf(err, "failed removing %s taint for node %s", constants.NodeUpdateInProgressTaint.Key, node.Name)
-			}
+		hasInProgressTaint := checkIfNodeHasInProgressTaint(node)
+		if node.Annotations[daemonconsts.DesiredMachineConfigAnnotationKey] == pool.Spec.Configuration.Name {
+			if hasInProgressTaint {
+				if err := ctrl.removeUpdateInProgressTaint(ctx, node.Name); err != nil {
+					return goerrs.Wrapf(err, "failed removing %s taint for node %s", constants.NodeUpdateInProgressTaint.Key, node.Name)
+				}
+			}
+		} else {
+			if !hasInProgressTaint {
+				if err := ctrl.setUpdateInProgressTaint(ctx, node.Name); err != nil {
+					return goerrs.Wrapf(err, "failed applying %s taint for node %s", constants.NodeUpdateInProgressTaint.Key, node.Name)
+				}
+			}
+		}

Bug 2035005: Move removeUpdateInProgressTaint functionality to mcc #3064

Bug 2035005: Move removeUpdateInProgressTaint functionality to mcc #3064

Uh oh!

Conversation

ravisantoshgudimetla commented Apr 5, 2022

Uh oh!

openshift-ci bot commented Apr 5, 2022

Uh oh!

yuqi-zhang left a comment

Choose a reason for hiding this comment

Uh oh!

yuqi-zhang Apr 5, 2022

Choose a reason for hiding this comment

Uh oh!

ravisantoshgudimetla Apr 6, 2022

Choose a reason for hiding this comment

Uh oh!

soltysh left a comment

Choose a reason for hiding this comment

Uh oh!

yuqi-zhang Apr 6, 2022

Choose a reason for hiding this comment

Uh oh!

ravisantoshgudimetla Apr 6, 2022

Choose a reason for hiding this comment

Uh oh!

ravisantoshgudimetla Apr 6, 2022

Choose a reason for hiding this comment

Uh oh!

mkenigs Apr 6, 2022

Choose a reason for hiding this comment

Uh oh!

ravisantoshgudimetla Apr 8, 2022

Choose a reason for hiding this comment

Uh oh!

Uh oh!

mkenigs commented Apr 6, 2022 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

ravisantoshgudimetla commented Apr 7, 2022

Uh oh!

yuqi-zhang commented Apr 7, 2022

Uh oh!

ravisantoshgudimetla commented Apr 8, 2022

Uh oh!

yuqi-zhang left a comment

Choose a reason for hiding this comment

Uh oh!

openshift-bot commented Apr 12, 2022

Uh oh!

openshift-bot commented Apr 12, 2022

Uh oh!

openshift-ci bot commented Apr 12, 2022

Uh oh!

openshift-bot commented Apr 12, 2022

Uh oh!

openshift-bot commented Apr 12, 2022

Uh oh!

openshift-bot commented Apr 12, 2022

Uh oh!

openshift-bot commented Apr 12, 2022

Uh oh!

openshift-bot commented Apr 12, 2022

Uh oh!

openshift-bot commented Apr 12, 2022

Uh oh!

openshift-bot commented Apr 13, 2022

Uh oh!

openshift-ci bot commented Apr 13, 2022

Uh oh!

yuqi-zhang commented Apr 13, 2022

Uh oh!

openshift-ci bot commented Apr 13, 2022

Uh oh!

openshift-ci bot commented Apr 13, 2022

Uh oh!

openshift-bot commented Apr 13, 2022

Uh oh!

openshift-bot commented Apr 13, 2022

Uh oh!

mkenigs commented Apr 6, 2022 •

edited

Loading