Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

WINC-645: [controllers] Handle generic events #628

Merged
merged 1 commit into from
Aug 24, 2021
Merged

WINC-645: [controllers] Handle generic events #628

merged 1 commit into from
Aug 24, 2021

Conversation

aravindhp
Copy link
Contributor

@aravindhp aravindhp commented Aug 23, 2021 •
edited

  • Simplify the check for a Windows node
  • Update all controllers to handle generic events

@openshift-ci openshift-ci bot requested a review from sebsoto August 23, 2021 18:42
@openshift-ci openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Aug 23, 2021
@aravindhp
Copy link
Contributor Author

/approve cancel
/cc @openshift/openshift-team-windows-containers

@openshift-ci openshift-ci bot requested a review from a team August 23, 2021 18:42
@openshift-ci openshift-ci bot removed the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Aug 23, 2021
saifshaikh48
saifshaikh48 reviewed Aug 23, 2021
View reviewed changes
Copy link
Contributor

@saifshaikh48 saifshaikh48 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for taking this on @aravindhp, PTAL at my comment.

controllers/controllers.go Outdated
Comment on lines 191 to 197
if !isValidWindowsNode(o, byoh) {
return false
}
if o.GetAnnotations()[metadata.VersionAnnotation] != version.Get() {
return true
}
return false
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can this function be reduced to return isValidWindowsNode(o, byoh) && o.GetAnnotations()[metadata.VersionAnnotation] != version.Get()? And if so, is there a need to keep this in a helper? I am fine either way, just floating the idea.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I am fine removing the helper.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

+1 not sure we need another helper, rest LGTM.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Addressed. PTAL.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The PR description needs an update removing first bullet point.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Addressed. PTAL.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

/lgtm

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@aravindhp
WINC-645: [controllers] Handle generic events
07e5f80 
- Simplify the check for a Windows node
- Update all controllers to handle generic events
@aravindhp
Copy link
Contributor Author

/retest

1 similar comment
@aravindhp
Copy link
Contributor Author

/retest

jrvaldes
jrvaldes approved these changes Aug 24, 2021
View reviewed changes
Copy link
Contributor

@jrvaldes jrvaldes left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

/lgtm

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Aug 24, 2021
@sebsoto
Copy link
Contributor

sebsoto commented Aug 24, 2021

/approve

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Aug 24, 2021

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: jrvaldes, sebsoto

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:

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

@openshift-ci openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Aug 24, 2021
@openshift-merge-robot openshift-merge-robot merged commit 0a3a937 into openshift:master Aug 24, 2021
@aravindhp aravindhp deleted the WINC-645-generic-events branch August 24, 2021 15:34
@aravindhp
Copy link
Contributor Author

/cherry-pick release-4.8

@aravindhp
Copy link
Contributor Author

/cherry-pick community-4.8

@openshift-cherrypick-robot openshift-cherrypick-robot mentioned this pull request Aug 24, 2021
Merged
@openshift-cherrypick-robot
Copy link

@aravindhp: new pull request created: #634

In response to this:

/cherry-pick release-4.8

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-cherrypick-robot
Copy link

@aravindhp: #628 failed to apply on top of branch "community-4.8":

Applying: WINC-645: [controllers] Handle generic events
Using index info to reconstruct a base tree...
M	controllers/controllers.go
Falling back to patching base and 3-way merge...
Auto-merging controllers/controllers.go
CONFLICT (content): Merge conflict in controllers/controllers.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 WINC-645: [controllers] Handle generic events
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 community-4.8

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.

@mansikulkarni96
Copy link
Member

/cherry-pick community-4.8

@openshift-cherrypick-robot openshift-cherrypick-robot mentioned this pull request Aug 25, 2021
Merged
@openshift-cherrypick-robot
Copy link

@mansikulkarni96: new pull request created: #641

In response to this:

/cherry-pick community-4.8

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.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@saifshaikh48 saifshaikh48 saifshaikh48 left review comments

@mansikulkarni96 mansikulkarni96 mansikulkarni96 left review comments

@jrvaldes jrvaldes jrvaldes approved these changes

@sebsoto sebsoto Awaiting requested review from sebsoto

Assignees

@saifshaikh48 saifshaikh48

@jrvaldes jrvaldes

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. lgtm Indicates that a PR is ready to be merged.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
7 participants
@aravindhp @sebsoto @openshift-cherrypick-robot @mansikulkarni96 @saifshaikh48 @jrvaldes @openshift-merge-robot