[pull] master from kubernetes-sigs:master #313
Conversation
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
✨ (go/v4): Improve go-install-tool code implementation into Makefile
- Refactored the alpha update test suite for clarity and modularity. - Added validation for preserved custom code and go.mod dependencies. - Improved version-specific assertions to avoid regressions. - Increased e2e test coverage for v4.6.0 and v4.7.0 update paths. Assisted-by: ChatGPT (OpenAI) and GitHub Copilot
🌱 (ci) Refactor alpha update E2E tests and increase coverage
- Add a test where the user changes the version in the Makefile to trigger a conflict - Check that both the user version and the new version appear in the conflict block - Make sure the update keeps user code and updates go modules correctly - Add clearer step messages using By() to make the test flow easier to follow - Improve check to verify if has markers conflicts
🐛 (alpha commands): Fix incorrect error message when creating the merge branch during alpha update.
…e, fail fast otherwise
- Updated TestContext to use os.TempDir() instead of filepath.Abs to avoid getwd errors in CI - Ensured kubectl is optional: fallback to fake version when not installed - Refactored common package unit tests to leverage TestContext for isolated project setup - Improves test reliability across local and CI environments Assisted by: ChatGPT (OpenAI)
🐛 (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
…ha-update 🌱 (e2e) Make alpha update tests easier to understand and more complete
…uns post-merge fixes in best-effort mode raising warnings instead of errors to allow properly automation with this option"
Bumps [golang.org/x/text](https://github.com/golang/text) from 0.27.0 to 0.28.0. - [Release notes](https://github.com/golang/text/releases) - [Commits](golang/text@v0.27.0...v0.28.0) --- updated-dependencies: - dependency-name: golang.org/x/text dependency-version: 0.28.0 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <[email protected]>
…e-target-warning 🌱 Revert "🐛 (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"
…olang.org/x/text-0.28.0 🌱 Bump golang.org/x/text from 0.27.0 to 0.28.0
Bumps [golang.org/x/mod](https://github.com/golang/mod) from 0.26.0 to 0.27.0. - [Commits](golang/mod@v0.26.0...v0.27.0) --- updated-dependencies: - dependency-name: golang.org/x/mod dependency-version: 0.27.0 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <[email protected]>
…olang.org/x/mod-0.27.0 🌱 Bump golang.org/x/mod from 0.26.0 to 0.27.0
Bumps [golang.org/x/tools](https://github.com/golang/tools) from 0.35.0 to 0.36.0. - [Release notes](https://github.com/golang/tools/releases) - [Commits](golang/tools@v0.35.0...v0.36.0) --- updated-dependencies: - dependency-name: golang.org/x/tools dependency-version: 0.36.0 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <[email protected]>
…olang.org/x/tools-0.36.0 🌱 Bump golang.org/x/tools from 0.35.0 to 0.36.0
🌱 refactor TestContext to allow use in unit tests with directory setup
📖 (docs) include 2025 roadmap
(doc): Update, improve and fix alpha update documentation
…R-friendly upgrades (#5002) 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 <[email protected]>
Bumps [actions/checkout](https://github.com/actions/checkout) from 4 to 5. - [Release notes](https://github.com/actions/checkout/releases) - [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md) - [Commits](actions/checkout@v4...v5) --- updated-dependencies: - dependency-name: actions/checkout dependency-version: '5' dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <[email protected]>
…tion provided by controller-runtime to do the same
…ns/actions/checkout-5 🌱 Bump actions/checkout from 4 to 5
🐛 (go/v4): Replace custom CertWatcher with controller-runtime’s built-in implementation for webhook and metrics server cert reloads. Ensures non-leader replicas update certificates correctly.
✨ (feat): Expose ProjectConfig to external plugins
✨ (helm/v2-alpha): Make webhook and metrics ports configurable
🌱 (CLI) Add unit tests for cli alpha generate.go
🌱 Fix make test-e2e-local to run on mac and linux
Users can now set custom paths for webhooks using --defaulting-path and --validation-path flags. Requires controller-runtime v0.20+. Assisted-by: Cursor
… custom domains Assisted-by: Cursor
🐛 (fix): Fix plugin configuration tracking when wrapped in bundles with custom domains
Upgrade controller-runtime from 0.22.3 to 0.22.4
✨ Add support for custom webhook paths
docs(book): update note about Windows support The book now has the same updated info about Windows support already present in the README in root. Follow-up to #5080.
fix(docs): display copy button on code blocks
chore: Move to maintained yaml library Signed-off-by: Manuel Rüger <[email protected]>
(ci): Fix testdata generation
📖 (docs/ui): better format for warnings
Bumps [golangci/golangci-lint-action](https://github.com/golangci/golangci-lint-action) from 8 to 9. - [Release notes](https://github.com/golangci/golangci-lint-action/releases) - [Commits](golangci/golangci-lint-action@v8...v9) --- updated-dependencies: - dependency-name: golangci/golangci-lint-action dependency-version: '9' dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <[email protected]>
…ns/golangci/golangci-lint-action-9 🌱 Bump golangci/golangci-lint-action from 8 to 9
📖 Improve AGENTS.md
✨ (go/v4): Allow informing Go module for external APIs when pinning a downgraded version is required
All test coverage already exists in comprehensive unit tests at pkg/cli/alpha/internal/generate_test.go (48 specs covering all PROJECT file fields, plugins, and edge cases). Removed: - test/e2e/alphagenerate/ directory - alphagenerate e2e test execution from test/features.sh Assisted-by: Cursor
(chore): Upgrade to Go to 1.24.6 and standardize version across codebase
Bumps [golang.org/x/mod](https://github.com/golang/mod) from 0.29.0 to 0.30.0. - [Commits](golang/mod@v0.29.0...v0.30.0) --- updated-dependencies: - dependency-name: golang.org/x/mod dependency-version: 0.30.0 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <[email protected]>
…olang.org/x/mod-0.30.0 🌱 Bump golang.org/x/mod from 0.29.0 to 0.30.0
Bumps [helm.sh/helm/v3](https://github.com/helm/helm) from 3.19.0 to 3.19.1. - [Release notes](https://github.com/helm/helm/releases) - [Commits](helm/helm@v3.19.0...v3.19.1) --- updated-dependencies: - dependency-name: helm.sh/helm/v3 dependency-version: 3.19.1 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <[email protected]>
Bumps [golang.org/x/text](https://github.com/golang/text) from 0.30.0 to 0.31.0. - [Release notes](https://github.com/golang/text/releases) - [Commits](golang/text@v0.30.0...v0.31.0) --- updated-dependencies: - dependency-name: golang.org/x/text dependency-version: 0.31.0 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <[email protected]>
…rage 🌱 (alpha): Remove redundant alpha generate e2e tests
…olang.org/x/text-0.31.0 🌱 Bump golang.org/x/text from 0.30.0 to 0.31.0
…elm.sh/helm/v3-3.19.1 🌱 Bump helm.sh/helm/v3 from 3.19.0 to 3.19.1
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
24 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.
See Commits and Changes for more details.
Created by
pull[bot]
Can you help keep this open source service alive? 💖 Please sponsor : )