pull from upstream#34
Merged
openshift-merge-robot merged 28 commits intoJul 2, 2019
Merged
Conversation
In order to ensure that fencing works correctly, we can't allow the Machine object to be deleted while there is still a chance that the BaremetalHost is still powered on and running. Delay successful completion of the deletion until the actuator has verified that the Host cannot be online. Closes #84 Signed-off-by: Zane Bitter <zbitter@redhat.com>
If a BareMetalHost that is associated with a Machine changes, the Machine should be reconciled. This can enable (not yet implemented) logic such as waiting for a host to deprovision while a Machine is being deleted.
Ensure that a Machine associated with a Host remains associated at least until the Host has been deprovisioned when the Machine is being deleted. This will allow the Machine controller to continue to receive events when the Host changes (which will reduce latency when detecting the completion of deprovisioning) and ensure that another Machine cannot claim the Host until the current one is ready to release it. Signed-off-by: Zane Bitter <zbitter@redhat.com>
controller watches BareMetalHosts and enqueues corresponding Machines
We now have the Hostname from HardwareDetails. This adds it to the MachineStatus.
Delay Machine deletion until BaremetalHost deprovisioned
Bring in the latest version of baremetal-operator and its dependencies before the version that includes the host object API change.
Only map hosts with consumers that match the version we currently support to reconcile requests for machines.
Instead of a hard-coded fake literal, use the value from the cluster-api code.
Set the hostname from HardwareDetails
switch to using ConsumerRef instead of MachineRef
openshift-ci-robot
added
size/XXL
Author
Author
|
This fails to build for me locally with: I suspect this is due to the mismatch between cluster-api versions in openshift and our upstream version of this repo. I'm not sure yet how to resolve them. |
Author
|
Adding a few custom changes to the imports is now giving me: |
mhrivnak
approved these changes
Jul 2, 2019
Member
|
/lgtm |
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: dhellmann, mhrivnak The full list of commands accepted by this bot can be found here. The pull request process is described here DetailsNeeds approval from an approver in each of these files:
Approvers can indicate their approval by writing |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
7 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
No description provided.