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

Merge changes from upstream as of 2020-07-02 #81

Merged

Conversation

dhellmann
Copy link

  • pkg/bmc: refactor to support all schemes
  • Do not set the status annotation
  • Round clock frequency to integer when setting HW details
  • Remove Unhealthy annotation changes

furkatgofurov7 and others added 21 commits May 28, 2020 11:15
Since float is not considered a valid type we will eventually have to
convert this field to an integer. That's probably going to involve some
very not-fun contortions regardless (see metal3-io/metal3-docs#101), but
at the very least it's not helping anybody to continue creating Hosts
with fractional values that will be non-round-trippable later.
Fix: Delete ironic-endpoint-keepalived container also while deleting other ironic containers
Round clock frequency to integer when setting HW details
⚠️ Remove old BMO & Ironic deployments
…-documentation

Update Ironic Keepalived container documentation
In saveHostStatus, we get the BMH right after updating the
annotation. In some cases the cache is not updated yet, causing
an error in the status update. This could lead to a loop in
some cases where the cache was slow to update as the annotations
were always changed since operationHistory was changing every
time (it uses the current time as end time for an operation).
To solve this :

- Discard operationHistory when comparing status annotation to
  current status to prevent unneeded updates of the annotation
  leading to additional conflicts
- Do not throw an error upon conflict in saveHostStatus, but
  requeue after an info message
Fix SaveHostStatus infinite loop on update conflicts
…erse-jan

Remove Unhealthy annotation changes
This commit removes the code setting the status annotation and
requiring to reconcile the object twice. This is now done in
CAPM3.
All of the redfish BMC's should support `+http` or `+https` explicitly,
however it's not configured for any of the virtualmedia BMC's. This
refactories the registerFactory code to allow specifying schemes for a
BMC, and ensuring the schemed versions exist for every one.

This keeps it explicit, so we can say which BMC's support specifying a
scheme.
pkg/bmc: refactor to support all schemes
@dhellmann dhellmann requested review from stbenjam and honza July 2, 2020 17:32
@openshift-ci-robot openshift-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jul 2, 2020
@dhellmann dhellmann requested a review from kirankt July 2, 2020 17:32
@dhellmann
Copy link
Author

There were some changes to the OWNERS file upstream which I removed during the merge. The main thing we want from this is to remove the code that was trying to set the status annotation.

@stbenjam
Copy link
Member

stbenjam commented Jul 7, 2020

/lgtm

@openshift-ci-robot openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Jul 7, 2020
@openshift-ci-robot
Copy link

[APPROVALNOTIFIER] This PR is APPROVED

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

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

@dhellmann
Copy link
Author

/test images

@openshift-bot
Copy link

/retest

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

13 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.

@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.

@openshift-bot
Copy link

/retest

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

@dhellmann
Copy link
Author

/hold until CI settles down

@openshift-ci-robot openshift-ci-robot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Jul 8, 2020
@kirankt
Copy link

kirankt commented Jul 8, 2020

/test e2e-metal-ipi

4 similar comments
@kirankt
Copy link

kirankt commented Jul 8, 2020

/test e2e-metal-ipi

@kirankt
Copy link

kirankt commented Jul 9, 2020

/test e2e-metal-ipi

@kirankt
Copy link

kirankt commented Jul 9, 2020

/test e2e-metal-ipi

@kirankt
Copy link

kirankt commented Jul 9, 2020

/test e2e-metal-ipi

@stbenjam
Copy link
Member

stbenjam commented Jul 9, 2020

/hold cancel

@openshift-ci-robot openshift-ci-robot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Jul 9, 2020
@openshift-merge-robot openshift-merge-robot merged commit dd55fdf into openshift:master Jul 9, 2020
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