🐛 (alpha commands): alpha update command with --force now runs post-merge fixes in best-effort mode raising warnings instead of errors to allow properly automation with this option#4992
Merged
k8s-ci-robot merged 1 commit intokubernetes-sigs:masterfrom Aug 7, 2025
Conversation
k8s-ci-robot
added
the
cncf-cla: yes
Contributor
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: camilamacedo86 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 |
k8s-ci-robot
added
approved
camilamacedo86
force-pushed
the
fix-makefile-target-warning
branch
from
1caa54d to
96422ce
Compare
camilamacedo86
changed the title
camilamacedo86
force-pushed
the
fix-makefile-target-warning
branch
3 times, most recently
from
edc47c1 to
915d306
Compare
camilamacedo86
changed the title
camilamacedo86
changed the title
--force now runs post-merge fixes in best-effort mode to improve recovery from conflicts.
camilamacedo86
changed the title
--force now runs post-merge fixes in best-effort mode to improve recovery from conflicts.--force now runs post-merge fixes in best-effort mode raising warnings instead of errors to allow properly automation with this option
Member
Author
|
/test pull-kubebuilder-test |
…e, fail fast otherwise
camilamacedo86
force-pushed
the
fix-makefile-target-warning
branch
from
915d306 to
152219d
Compare
Contributor
Contributor
|
@vitorfloriano: changing LGTM is restricted to collaborators DetailsIn response to this:
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-sigs/prow repository. |
vitorfloriano
moved this to Tracking
in GSoC 2025: Kubebuilder: Automating Operator Maintenance
camilamacedo86
added
the
lgtm
github-project-automation
bot
moved this from Tracking
to Done
in GSoC 2025: Kubebuilder: Automating Operator Maintenance
Closed
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
3 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.
This updates the behaviour of runMakeTargets after a merge:
Even if some fail, this helps keep the project in as consistent a state as possible when conflicts are faced.
If the conflict is faced, but we are still able to regenerate the manifest, we try to do so.
We now use
sh -c "make <target> || true"when --force is enabled,So we can continue execution, but still detect and log failures.