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

[release-4.4] Bug 1843230: Read BMH status from annotation #70

Merged
merged 6 commits into from Jun 24, 2020
Merged

[release-4.4] Bug 1843230: Read BMH status from annotation #70

merged 6 commits into from Jun 24, 2020

Conversation

zaneb
Copy link
Member

@zaneb zaneb commented Jun 2, 2020

Backport of #68 to release-4.4, so so we can populate masters' IP information to make the node/machine link.

kashifest and others added 2 commits June 2, 2020 16:13
@kashifest @zaneb
Put BMH status in annotation while reconciliation
c8df78c 
(cherry-picked from commit 301f313)
@zaneb
Requeue after writing status from annotation
1ef1155 
If we are copying the Status in from a baremetalhost.metal3.io/status
annotation, return and requeue immediately after writing it rather than
try to continue to do other things, which may result in a write
conflict.

Also, invert the output of the hostHasStatus() method, so that it no
longer returns the exact opposite of what it says on the tin.

(cherry picked from commit 7417d87)
@openshift-ci-robot openshift-ci-robot added the bugzilla/severity-high Referenced Bugzilla bug's severity is high for the branch this PR is targeting. label Jun 2, 2020
@openshift-ci-robot
Copy link

@zaneb: This pull request references Bugzilla bug 1843230, which is invalid:

  • expected dependent Bugzilla bug 1835457 to be in one of the following states: VERIFIED, RELEASE_PENDING, CLOSED (ERRATA), but it is ON_QA 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.

In response to this:

Bug 1843230: Read BMH status from annotation

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-robot openshift-ci-robot added the bugzilla/invalid-bug Indicates that a referenced Bugzilla bug is invalid for the branch this PR is targeting. label Jun 2, 2020
@openshift-ci-robot
Copy link

Hi @zaneb. Thanks for your PR.

I'm waiting for a openshift member to verify that this patch is reasonable to test. If it is, they should reply with /ok-to-test on its own line. Until that is done, I will not automatically test new commits in this PR, but the usual testing commands by org members will still work. Regular contributors should join the org to skip this step.

Once the patch is verified, the new status will be reflected by the ok-to-test label.

I understand the commands that are listed here.

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-robot openshift-ci-robot added the needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. label Jun 2, 2020
@zaneb
Copy link
Member Author

zaneb commented Jun 2, 2020

/assign @russellb

@zaneb zaneb changed the title Bug 1843230: Read BMH status from annotation [release-4.4] Bug 1843230: Read BMH status from annotation Jun 2, 2020
@stbenjam
Copy link
Member

stbenjam commented Jun 2, 2020

/ok-to-test

@openshift-ci-robot openshift-ci-robot added ok-to-test Indicates a non-member PR verified by an org member that is safe to test. and removed needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. labels Jun 2, 2020
@stbenjam
Copy link
Member

stbenjam commented Jun 3, 2020

/test e2e-metal-ipi

@dhellmann @zaneb
fix golint errors
b590f55 
Signed-off-by: Doug Hellmann <dhellmann@redhat.com>
(cherry picked from commit e15ccce)
@zaneb
Copy link
Member Author

zaneb commented Jun 4, 2020

/test e2e-metal-ipi

@dhellmann
Copy link

This is going to need to include metal3-io#546 as well

@dhellmann @zaneb
fix typo in variable name in controller tests
8444a26 
Signed-off-by: Doug Hellmann <dhellmann@redhat.com>
(cherry picked from commit 7f3d1f8)
@dhellmann @zaneb
create reusable functions for managing the status annotation content
5c21d5a 
Add functions for marshalling and unmarshalling the data in the status
annotation. These will be useful in test code.

Signed-off-by: Doug Hellmann <dhellmann@redhat.com>
(cherry picked from commit b6a368b)
@dhellmann @zaneb
ensure last updated is set when extracting status from annotation
964cee2 
If the status annotation is a partial version of the status struct it
will not include the LastUpdated value. This results in an infinite
loop, since hostHasStatus() only looks at the LastUpdated value to see
if it is filled in. This change removes the loop condition by ensuring
LastUpdated is set if the value from the annotation is empty.

Signed-off-by: Doug Hellmann <dhellmann@redhat.com>
(cherry picked from commit 7ef20ab)
@openshift-ci-robot openshift-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jun 5, 2020
@dhellmann
Copy link

/bugzilla refresh

@openshift-ci-robot
Copy link

@dhellmann: This pull request references Bugzilla bug 1843230, which is invalid:

  • expected dependent Bugzilla bug 1835457 to be in one of the following states: VERIFIED, RELEASE_PENDING, CLOSED (ERRATA), but it is ON_QA 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.

In response to this:

/bugzilla refresh

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.

@zaneb
Copy link
Member Author

zaneb commented Jun 8, 2020

The 4.5 bugzilla is still ON_QA, so it won't let us merge a backport to 4.4 until that is verified.

@dhellmann
Copy link

/bugzilla refresh

@openshift-ci-robot
Copy link

@dhellmann: This pull request references Bugzilla bug 1843230, which is invalid:

  • expected dependent Bugzilla bug 1835457 to be in one of the following states: VERIFIED, RELEASE_PENDING, CLOSED (ERRATA), but it is ON_QA 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.

In response to this:

/bugzilla refresh

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.

@dhellmann
Copy link

/bugzilla refresh

@openshift-ci-robot
Copy link

@dhellmann: This pull request references Bugzilla bug 1843230, which is valid.

6 validation(s) were run on this bug
  • bug is open, matching expected state (open)
  • bug target release (4.4.z) matches configured target release for branch (4.4.z)
  • bug is in the state POST, which is one of the valid states (NEW, ASSIGNED, ON_DEV, POST, POST)
  • dependent bug Bugzilla bug 1835457 is in the state VERIFIED, which is one of the valid states (VERIFIED, RELEASE_PENDING, CLOSED (ERRATA))
  • dependent Bugzilla bug 1835457 targets the "4.5.0" release, which is one of the valid target releases: 4.5.0, 4.5.z
  • bug has dependents

In response to this:

/bugzilla refresh

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-robot openshift-ci-robot 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 Jun 11, 2020
@stbenjam stbenjam mentioned this pull request Jun 22, 2020
Merged
@stbenjam
Copy link
Member

/lgtm

@openshift-ci-robot openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Jun 22, 2020
dhellmann
dhellmann reviewed Jun 22, 2020
View reviewed changes
Copy link

@dhellmann dhellmann left a comment

Choose a reason for hiding this comment

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

/lgtm
/approve

@openshift-ci-robot
Copy link

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: dhellmann, stbenjam, zaneb

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

@honza
Copy link
Member

honza commented Jun 23, 2020

/label cherry-pick-approved

@openshift-ci-robot
Copy link

@honza: The label(s) /label cherry-pick-approved cannot be applied. These labels are supported: platform/aws, platform/azure, platform/baremetal, platform/google, platform/libvirt, platform/openstack, ga, tide/merge-method-merge, tide/merge-method-rebase, tide/merge-method-squash

In response to this:

/label cherry-pick-approved

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.

@sdodson sdodson added the cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. label Jun 24, 2020
@openshift-merge-robot openshift-merge-robot merged commit 7638257 into openshift:release-4.4 Jun 24, 2020
@openshift-ci-robot
Copy link

@zaneb: All pull requests linked via external trackers have merged: openshift/baremetal-operator#70. Bugzilla bug 1843230 has been moved to the MODIFIED state.

In response to this:

[release-4.4] Bug 1843230: Read BMH status from annotation

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

@dhellmann dhellmann dhellmann left review comments

@stbenjam stbenjam stbenjam left review comments

@hardys hardys Awaiting requested review from hardys

Assignees

@dhellmann dhellmann

@russellb russellb

@stbenjam stbenjam

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. bugzilla/severity-high Referenced Bugzilla bug's severity is high for the branch this PR is targeting. bugzilla/valid-bug Indicates that a referenced Bugzilla bug is valid for the branch this PR is targeting. cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. lgtm Indicates that a PR is ready to be merged. ok-to-test Indicates a non-member PR verified by an org member that is safe to test.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
9 participants
@zaneb @openshift-ci-robot @stbenjam @dhellmann @honza @sdodson @russellb @openshift-merge-robot @kashifest