Kpt repo cleanup 1#4640
Open
efiacor wants to merge 6 commits into
Open
Conversation
The site/ folder has been migrated to documentation/ (Hugo-based). This removes the obsolete [site/] markdown reference link. Fixes: kptdev#4574
The CLI command is 'kpt pkg update', not 'upgrade'. - CLI: commands/pkg/update/ - Docs: documentation/content/en/reference/cli/pkg/update/ - Generated docs: UpdateShort, UpdateLong, UpdateExamples Changed 'upgraded' to 'updated' in: - migration.md: 'fetch the package with updated version' - faq.md: 'ability to update from an upstream package' Fixes: kptdev#4553
- Create new guide at documentation/content/en/guides/3-way-merge.md - Covers conceptual explanation, merge strategies, worked example, and best practices - Links to technical reference docs to avoid duplication - Includes practical workflow examples for security updates, version migration, and syncing - Add strategic cross-references: - Updated guides/_index.md with link to new guide - Updated reference/cli/pkg/update/_index.md with prominent callout - Added external links for Porch, Git merge, and Kubernetes SMPP - Explains Git integration: kpt uses field-level schema-aware merge vs Git's line-level merge
efiacor
requested review from
kispaljr,
liamfallon and
mozesl-nokia
as code owners
July 16, 2026 12:42
✅ Deploy Preview for kptdocs ready!
To edit notification comments on pull requests, go to your Netlify project configuration. |
dosubot
Bot
added
size:L
Signed-off-by: Fiachra Corcoran <fiachra.corcoran@est.tech>
dosubot
Bot
added
size:XXL
Signed-off-by: Fiachra Corcoran <fiachra.corcoran@est.tech>
Signed-off-by: Fiachra Corcoran <fiachra.corcoran@est.tech>
liamfallon
approved these changes
Jul 16, 2026
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
2 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.
Epic #4552 Cleanup Tasks - Complete 3 Sub-Issues
Summary
This PR completes three cleanup tasks from Epic #4552:
sitefolder #4574: Remove remaining references to the deprecatedsite/folderChanges
#4574 - Remove site/ folder reference
[site/]: site/fromCONTRIBUTING.md#4553 - Standardize terminology
documentation/content/en/installation/migration.mdto use "update" terminology consistentlydocumentation/content/en/faq.mdto replace "upgrade" with "update"kpt pkg update#4556 - Add 3-way merge documentation
documentation/content/en/guides/3-way-merge.mddocumentation/content/en/guides/_index.mdto include new guidedocumentation/content/en/reference/cli/pkg/update/_index.mdwith prominent callout to guideTesting
Closes
Closes #4574
Closes #4553
Closes #4556