search

metal3-io / baremetal-operator

Bare metal host provisioning integration for Kubernetes
Apache License 2.0
554 stars 241 forks source link

🐛 Fix HFC to execute updates #1793

Closed iurygregory closed 2 weeks ago

iurygregory commented 1 month ago

Currently any changes in HostFirmwareComponents won't trigger the firmware update on it. This commit aims to fix the issues we have observed while testing with real hardware.

What this PR does / why we need it: metal3-io/metal3-docs#364

tuminoid commented 4 weeks ago

We probably want to to cherry-pick this to release-0.6 when done, if HFC doesn't work?

iurygregory commented 4 weeks ago

@tuminoid correct

tuminoid commented 4 weeks ago

@tuminoid correct

Let's schedule the bot then to do the pick: /cherry-pick release-0.6

metal3-io-bot commented 4 weeks ago

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

In response to [this](https://github.com/metal3-io/baremetal-operator/pull/1793#issuecomment-2188703303): >> @tuminoid correct > >Let's schedule the bot then to do the pick: >/cherry-pick release-0.6 > Instructions for interacting with me using PR comments are available [here](https://git.k8s.io/community/contributors/guide/pull-requests.md). If you have questions or suggestions related to my behavior, please file an issue against the [kubernetes/test-infra](https://github.com/kubernetes/test-infra/issues/new?title=Prow%20issue:) repository.
iurygregory commented 3 weeks ago

Done, I've tested again in my setup before pushing the changes here.

zaneb commented 2 weeks ago

/approve This is strictly better than what we have. Should probably hold off on the backport though.

metal3-io-bot commented 2 weeks ago

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: dtantsur, 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: - ~~[OWNERS](https://github.com/metal3-io/baremetal-operator/blob/main/OWNERS)~~ [dtantsur,zaneb] Approvers can indicate their approval by writing `/approve` in a comment Approvers can cancel approval by writing `/approve cancel` in a comment
metal3-io-bot commented 2 weeks ago

@tuminoid: #1793 failed to apply on top of branch "release-0.6":

Applying: Fix HFC to execute updates
Using index info to reconstruct a base tree...
M   controllers/metal3.io/baremetalhost_controller.go
M   controllers/metal3.io/host_state_machine.go
M   controllers/metal3.io/hostfirmwarecomponents_controller.go
M   controllers/metal3.io/hostfirmwarecomponents_test.go
M   main.go
M   pkg/provisioner/fixture/fixture.go
M   pkg/provisioner/ironic/ironic.go
M   pkg/provisioner/ironic/provision_test.go
Falling back to patching base and 3-way merge...
Auto-merging pkg/provisioner/ironic/provision_test.go
CONFLICT (content): Merge conflict in pkg/provisioner/ironic/provision_test.go
Auto-merging pkg/provisioner/ironic/ironic.go
Auto-merging pkg/provisioner/fixture/fixture.go
CONFLICT (content): Merge conflict in pkg/provisioner/fixture/fixture.go
Auto-merging main.go
CONFLICT (content): Merge conflict in main.go
Auto-merging controllers/metal3.io/hostfirmwarecomponents_test.go
CONFLICT (content): Merge conflict in controllers/metal3.io/hostfirmwarecomponents_test.go
Auto-merging controllers/metal3.io/hostfirmwarecomponents_controller.go
Auto-merging controllers/metal3.io/host_state_machine.go
Auto-merging controllers/metal3.io/baremetalhost_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 Fix HFC to execute updates
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](https://github.com/metal3-io/baremetal-operator/pull/1793#issuecomment-2188703303): >> @tuminoid correct > >Let's schedule the bot then to do the pick: >/cherry-pick release-0.6 > Instructions for interacting with me using PR comments are available [here](https://git.k8s.io/community/contributors/guide/pull-requests.md). If you have questions or suggestions related to my behavior, please file an issue against the [kubernetes/test-infra](https://github.com/kubernetes/test-infra/issues/new?title=Prow%20issue:) repository.