kubernetes-sigs / kubebuilder
71%
master: 66%

LAST BUILD BRANCH: add-kubeconfig-to-gitignore
DEFAULT BRANCH: master
Repo Added
Files 55
Badge
Embed ▾
README BADGES
x

If you need to use a raster PNG badge, change the '.svg' to '.png' in the link

Markdown

Textile

RDoc

HTML

Rst

LAST BUILD ON BRANCH add-more-options-alpha
branch: add-more-options-alpha
CHANGE BRANCH
x

coverage: 70.864%. First build
16855770250

Pull #5002

github

camilamacedo86 
alpha(update): add --squash, --preserve-path, --output-branch for PR-friendly upgrades

This change makes `kubebuilder alpha update` produce a PR-ready branch and a
single squashed commit when requested, improving automation and review UX.

Key changes
-----------
• New `--squash` flag:
  - Snapshots the exact tree of the temporary merge branch into ONE commit on a
    stable branch: `kubebuilder-alpha-update-to-<to-version>`.
  - Intended for opening/refreshing idempotent PRs.
  - Gracefully handles "no changes" (git commit exits 1 → treated as no-op).

• New `--preserve-path` (repeatable):
  - When squashing, restore given paths from the base branch (e.g.
    `.github/workflows`) so CI/config files are kept as-is on the PR branch.

• New `--output-branch`:
  - Overrides the default PR branch name created by `--squash`.

• Commit message used by `--squash`:
  - `[kubebuilder-automated-update]: update scaffold from <from> to <to>; (squashed 3-way merge)`

• Behavior/ergonomics:
  - Without `--force`: stops on conflicts on the temporary merge branch.
  - With `--force`: commits conflict markers on the merge branch (automation-friendly).
  - After merge, still best-effort run: `make manifests generate fmt vet lint-fix`.

Defaults / Compatibility
------------------------
  - `--squash` is off by default (no behavior change unless opted-in).
  - `--from-branch` defaults to `main`.
  - `--preserve-path` is empty by default (no restores).
  - Safe to run on projects scaffolded with v4.5.0+ (uses `alpha generate`).

Motivation
----------
Make upgrades PR-centric and automation-ready by producing a deterministic,
reviewable branch and a single squashed commit that mirrors the merge result.

Assisted-by: ChatGPT (OpenAI)

Co-authored-by: Vitor Floriano <vitorfloriano@users.noreply.github.com>
Pull Request #5002: ✨ alpha(update): add --squash, --preserve-path, --output-branch for PR-friendly upgrades

73 of 85 new or added lines in 2 files covered. (85.88%)

2960 of 4177 relevant lines covered (70.86%)

14.14 hits per line

Relevant lines Covered
4177 RELEVANT LINES 2960 COVERED LINES
14.14 HITS PER LINE
Source Files on add-more-options-alpha

Recent builds

Builds Branch Commit Type Ran Committer Via Coverage
16855770250 add-more-options-alpha alpha(update): add --squash, --preserve-path, --output-branch for PR-friendly upgrades This change makes `kubebuilder alpha update` produce a PR-ready branch and a single squashed commit when requested, improving automation and review UX. Key ch... Pull #5002 camilamacedo86 github
70.86
16855681995 add-more-options-alpha alpha(update): add --squash, --preserve-path, --output-branch for PR-friendly upgrades This change makes `kubebuilder alpha update` produce a PR-ready branch and a single squashed commit when requested, improving automation and review UX. Key ch... Pull #5002 camilamacedo86 github
70.86
16855078224 add-more-options-alpha alpha(update): add --squash, --preserve-path, --output-branch for PR-friendly upgrades This change makes `kubebuilder alpha update` produce a PR-ready branch and a single squashed commit when requested, improving automation and review UX. Key ch... Pull #5002 camilamacedo86 github
70.86
16854950133 add-more-options-alpha alpha(update): add --squash, --preserve-path, --output-branch for PR-friendly upgrades This change makes `kubebuilder alpha update` produce a PR-ready branch and a single squashed commit when requested, improving automation and review UX. Key ch... Pull #5002 camilamacedo86 github
70.86
16854915615 add-more-options-alpha alpha(update): add --squash, --preserve-path, --output-branch for PR-friendly upgrades This change makes `kubebuilder alpha update` produce a PR-ready branch and a single squashed commit when requested, improving automation and review UX. Key ch... Pull #5002 camilamacedo86 github
70.87
See All Builds (7757)