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.

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

WINC-649: [wmco] Change BYOH annotation to a label #549

Merged
merged 1 commit into from
Aug 4, 2021

Conversation

sebsoto
Copy link
Contributor

@sebsoto sebsoto commented Jul 29, 2021

Changes the BYOH annotation to a label to allow for easier selection of
BYOH nodes.

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

sebsoto commented Jul 29, 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 Jul 29, 2021
@alinaryan
Copy link
Contributor

/lgtm

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Jul 29, 2021
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 working on this --

/lgtm

@mansikulkarni96
Copy link
Member

LGTM

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.

Thanks for doing this, @sebsoto. Please address my comment.

@@ -219,7 +219,7 @@ func (r *ConfigMapReconciler) ensureInstancesAreUpToDate(instances []*instances.
func (r *ConfigMapReconciler) deconfigureInstances(instances []*instances.InstanceInfo, nodes *core.NodeList) error {
for _, node := range nodes.Items {
// Only looking at BYOH nodes
if _, present := node.Annotations[BYOHAnnotation]; !present {
if _, present := node.GetLabels()[BYOHLabel]; !present {
Copy link
Contributor

Choose a reason for hiding this comment

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

I suggest updating the filter when you are getting the list of nodes.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Done.

controllers/secret_controller.go Outdated Show resolved Hide resolved
@openshift-ci openshift-ci bot removed the lgtm Indicates that a PR is ready to be merged. label Jul 29, 2021
nodes := &core.NodeList{}
if err := r.client.List(ctx, nodes); err != nil {
if err := r.client.List(ctx, nodes, client.MatchingLabels{BYOHLabel: "true"}); err != nil {
Copy link
Contributor

Choose a reason for hiding this comment

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

To be on the safe side, the Windows label should also be added.

Comment on lines -221 to -185
// Only looking at BYOH nodes
if _, present := node.Annotations[BYOHAnnotation]; !present {
continue
}
Copy link
Contributor

Choose a reason for hiding this comment

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

This implies the method doc needs to be updated to state that that input nodes are assumed to be Windows BYOH

@openshift-ci openshift-ci bot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Aug 3, 2021
@openshift-ci openshift-ci bot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Aug 3, 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 Aug 3, 2021
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

Changes the BYOH annotation to a label to allow for easier selection of
BYOH nodes.
@openshift-ci openshift-ci bot removed the lgtm Indicates that a PR is ready to be merged. label Aug 3, 2021
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.

Thanks for doing this, @sebsoto

/approve

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Aug 3, 2021

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: aravindhp, jrvaldes, saifshaikh48

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 3, 2021
@mansikulkarni96
Copy link
Member

/lgtm

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

sebsoto commented Aug 4, 2021

Machine provisioning flake, not an issue on our side
/retest

@openshift-bot
Copy link

/retest-required

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

@openshift-ci openshift-ci bot merged commit 81a5074 into openshift:master Aug 4, 2021
@sebsoto
Copy link
Contributor Author

sebsoto commented Aug 4, 2021

/cherry-pick community-4.8

@openshift-cherrypick-robot

@sebsoto: new pull request created: #563

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

@mansikulkarni96: new pull request created: #606

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
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
Development

Successfully merging this pull request may close these issues.

None yet

8 participants