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

[wmco] WINC-631: BYOH controller is able to react to changes in Node objects #479

Merged
merged 3 commits into from
Jul 9, 2021
Merged

[wmco] WINC-631: BYOH controller is able to react to changes in Node objects #479

merged 3 commits into from
Jul 9, 2021

Conversation

sebsoto
Copy link
Contributor

@sebsoto sebsoto commented Jun 22, 2021 •
edited

This PR consists of three commits:

  • BYOH Nodes are being watched by the ConfigMap controller
  • Nodes are annotated earlier in the configuration process so that they can be identified as BYOH or Machine nodes.
  • Partially configured BYOH nodes will be configured. This enables the reconfiguration tests, which also tests that BYOH node watching is working.

@openshift-ci openshift-ci bot requested a review from aravindhp June 22, 2021 15:31
@openshift-ci openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jun 22, 2021
@sebsoto
Copy link
Contributor Author

sebsoto commented Jun 22, 2021

/approve cancel

@openshift-ci openshift-ci bot removed the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jun 22, 2021
@sebsoto sebsoto changed the title [wmco] BYOH configure nodes that previously failed Configure partially configured BYOH nodes Jun 22, 2021
@sebsoto
Copy link
Contributor Author

sebsoto commented Jun 22, 2021

/approve cancel

@sebsoto sebsoto changed the title Configure partially configured BYOH nodes WINC-582: Configure partially configured BYOH nodes Jun 22, 2021
@sebsoto sebsoto changed the title WINC-582: Configure partially configured BYOH nodes WINC-582: [wmco] Configure partially configured BYOH nodes Jun 22, 2021
@jrvaldes
Copy link
Contributor

/lgtm

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

sebsoto commented Jun 22, 2021

/cherry-pick community-4.8

@openshift-cherrypick-robot
Copy link

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

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.

@sebsoto
Copy link
Contributor Author

sebsoto commented Jun 22, 2021

/cherry-pick release-4.8

@openshift-cherrypick-robot
Copy link

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

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.

aravindhp
aravindhp approved these changes Jun 22, 2021
View reviewed changes
Copy link
Contributor

@aravindhp aravindhp left a comment

Choose a reason for hiding this comment

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

/approve

Please call out what the issue was in the commit message.

@openshift-ci openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jun 22, 2021
@aravindhp
Copy link
Contributor

/hold

@sebsoto adding the hold, so that you can update the commit message.

@openshift-ci openshift-ci bot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Jun 22, 2021
@openshift-ci openshift-ci bot removed the lgtm Indicates that a PR is ready to be merged. label Jun 22, 2021
@mansikulkarni96
Copy link
Member

Thanks for working on this @sebsoto
/lgtm

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

sebsoto commented Jun 23, 2021

/hold cancel

@openshift-ci openshift-ci bot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Jun 23, 2021
@openshift-bot
Copy link

/retest

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

2 similar comments
@openshift-bot
Copy link

/retest

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

@openshift-bot
Copy link

/retest

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

@openshift-ci openshift-ci bot removed the lgtm Indicates that a PR is ready to be merged. label Jul 7, 2021
@sebsoto
Copy link
Contributor Author

sebsoto commented Jul 7, 2021

/hold cancel

@openshift-ci openshift-ci bot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Jul 7, 2021
@saifshaikh48
Copy link
Contributor

/lgtm

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Jul 7, 2021
@mansikulkarni96
Copy link
Member

/retest

@openshift-bot
Copy link

/retest

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

6 similar comments
@openshift-bot
Copy link

/retest

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

@openshift-bot
Copy link

/retest

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

@openshift-bot
Copy link

/retest

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

@openshift-bot
Copy link

/retest

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

@openshift-bot
Copy link

/retest

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

@openshift-bot
Copy link

/retest

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

@aravindhp
Copy link
Contributor

/hold

Metrics tests are failing on vSphere.

@openshift-ci openshift-ci bot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Jul 8, 2021
@sebsoto
Copy link
Contributor Author

sebsoto commented Jul 9, 2021

/retest

1 similar comment
@sebsoto
Copy link
Contributor Author

sebsoto commented Jul 9, 2021

/retest

@sebsoto
Copy link
Contributor Author

sebsoto commented Jul 9, 2021

/hold cancel

@openshift-ci openshift-ci bot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Jul 9, 2021
@openshift-merge-robot openshift-merge-robot merged commit 4a90df3 into openshift:master Jul 9, 2021
@openshift-cherrypick-robot
Copy link

@sebsoto: #479 failed to apply on top of branch "community-4.8":

Applying: ConfigMap controller watches BYOH Nodes
Applying: Annotate Nodes earlier in configuration
Applying: Configure partially configured BYOH nodes
Using index info to reconstruct a base tree...
M	controllers/configmap_controller.go
Falling back to patching base and 3-way merge...
Auto-merging controllers/configmap_controller.go
CONFLICT (content): Merge conflict in controllers/configmap_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 0003 Configure partially configured BYOH nodes
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.

@openshift-cherrypick-robot
Copy link

@sebsoto: #479 failed to apply on top of branch "release-4.8":

Applying: ConfigMap controller watches BYOH Nodes
Using index info to reconstruct a base tree...
M	controllers/configmap_controller.go
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
Auto-merging controllers/configmap_controller.go
CONFLICT (content): Merge conflict in controllers/configmap_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 ConfigMap controller watches BYOH Nodes
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-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.

@sebsoto
Copy link
Contributor Author

sebsoto commented Jul 22, 2021

/cherry-pick community-4.8

@openshift-cherrypick-robot
Copy link

@sebsoto: #479 failed to apply on top of branch "community-4.8":

Applying: ConfigMap controller watches BYOH Nodes
Applying: Annotate Nodes earlier in configuration
Applying: Configure partially configured BYOH nodes
Using index info to reconstruct a base tree...
M	controllers/configmap_controller.go
Falling back to patching base and 3-way merge...
Auto-merging controllers/configmap_controller.go
CONFLICT (content): Merge conflict in controllers/configmap_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 0003 Configure partially configured BYOH nodes
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.

@sebsoto
Copy link
Contributor Author

sebsoto commented Jul 27, 2021

/cherry-pick community-4.8

@openshift-cherrypick-robot openshift-cherrypick-robot mentioned this pull request Jul 27, 2021
Merged
@openshift-cherrypick-robot
Copy link

@sebsoto: new pull request created: #543

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 release-4.8

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

@mansikulkarni96: new pull request created: #578

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.

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

@jrvaldes jrvaldes jrvaldes left review comments

@aravindhp aravindhp aravindhp approved these changes

Assignees

@saifshaikh48 saifshaikh48

@mansikulkarni96 mansikulkarni96

@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
8 participants
@sebsoto @jrvaldes @openshift-cherrypick-robot @aravindhp @mansikulkarni96 @openshift-bot @saifshaikh48 @openshift-merge-robot