Extract the kpt CLI into it's own go module by mozesl-nokia · Pull Request #4811 · kptdev/kpt

mozesl-nokia · 2026-10-15T13:13:09Z

Exactly as the title says, moved all the CLI related code into it's own module in cli/, leaving the main "library" part as the root module.

Had to do some auxiliary moving around to avoid weird circular and cross-dependencies. Renamed commands/ to cli/. All of the make targets and workflows should be working. I also redid the api make targets to match Porch and the new cli ones.

Related to #4647 and closes #4554

Obsoletes #4739 by moving all of the third-party code into their respective folders.

For reviewers: You can go through commit-by-commit to avoid big diffs as I tried to logically separate the migration steps as much as possible.

I have used AI in the PR:

Cursor Grok 4.7 for debugging why the ldflags -X flag was not working correctly; and then later to restructure the release actions and makefiles
Cursor Composer 2.5 for verifying the release workflows
Claude Haiku 4.5 for finding more workflow issues and replacing the shlex dependency

Signed-off-by: Mózes László Máté <laszlo.mozes@nokia.com>

Assisted-by: Cursor:grok-4.7 Signed-off-by: Mózes László Máté <laszlo.mozes@nokia.com>

Assisted-by: Cursor:composer-2.5 Signed-off-by: Mózes László Máté <laszlo.mozes@nokia.com>

Assisted-by: Cursor:claude-haiku-4.5 Signed-off-by: Mózes László Máté <laszlo.mozes@nokia.com>

netlify · 2026-10-15T13:13:23Z

✅ Deploy Preview for kptdocs ready!

Name	Link
🔨 Latest commit	`5109c11`
🔍 Latest deploy log	https://app.netlify.com/projects/kptdocs/deploys/6adf20f580b68270cff855e3
😎 Deploy Preview	https://deploy-preview-4811--kptdocs.netlify.app
📱 Preview on mobile	Toggle QR Code... Use your smartphone camera to open QR code link.
🤖 Make changes	Run an agent on this branch

To edit notification comments on pull requests, go to your Netlify project configuration.

Copilot

🟡 Changes recommended

Module wiring, build and validation targets, and omitted CLI test execution leave significant integration failures unresolved.

5 open findings

E2E build still targets removed root entry point · New
Use ./... to vet CLI packages · New
Builds ignore local library changes · New
CLI tests excluded from coverage workflow · New
Make fmt targets the wrong CLI command · New

What changed in this PR

Separates kpt’s CLI from its reusable library, supporting #4647, and absorbs third-party code into its owning packages for #4554.

Changes:

Moves commands, entry points, tests, and fixtures into the new cli module.
Moves shared inventory errors into the library and updates imports.
Updates Make targets, release builds, and CI paths.

File	Description
thirdparty/README.md	Removes obsolete third-party directory documentation.
release/tag/goreleaser.yaml	Builds CLI with updated version metadata.
pkg/lib/errors/resolver/live.go	Resolves library-owned inventory errors.
pkg/lib/errors/inventory.go	Defines shared inventory errors.
Makefile	Delegates module tasks and adds workspace targets.
make/info.mk	Updates version linker symbol.
make/cli.mk	Adds CLI task wrappers.
make/api.mk	Extracts API task wrappers.
go.sum	Removes unused dependency checksums.
go.mod	Adjusts library dependencies.
cli/util/factory.go	Relocates Kubernetes client factory.
cli/util/common.go	Relocates CLI constants.
cli/run.go	Moves command setup into main package.
cli/run_test.go	Updates command setup test package.
cli/pkg/update/cmdupdate.go	Relocates package update command.
cli/pkg/update/cmdupdate_test.go	Updates CLI imports.
cli/pkg/pkgcmd.go	Updates package command registration imports.
cli/pkg/init/cmdinit.go	Relocates package initialization command.
cli/pkg/init/cmdinit_test.go	Updates CLI import.
cli/pkg/get/cmdget.go	Relocates package retrieval command.
cli/pkg/get/cmdget_test.go	Updates CLI import.
cli/pkg/diff/cmddiff.go	Relocates package diff command.
cli/pkg/diff/cmddiff_test.go	Updates CLI imports.
cli/pkg/cmdtree/tree.go	Simplifies relocated tree field assembly.
cli/pkg/cmdtree/cmdtree.go	Uses relocated command helpers.
cli/pkg/cmdtree/cmdtree_test.go	Relocates tree command tests.
cli/pkg/cmdsource/cmdsource.go	Uses relocated error handler.
cli/pkg/cmdsource/cmdsource_test.go	Relocates source command tests.
cli/pkg/cmdcat/runner.go	Consolidates helpers into cmdcat.
cli/pkg/cmdcat/runner_test.go	Updates helper test package.
cli/pkg/cmdcat/cmdcat.go	Uses consolidated local helpers.
cli/Makefile	Adds CLI module tasks.
cli/main.go	Relocates entry point and generation paths.
cli/live/status/fake-loader.go	Relocates fake inventory loader.
cli/live/status/cmdstatus.go	Relocates status command.
cli/live/status/cmdstatus_test.go	Relocates status tests.
cli/live/migrate/migratecmd.go	Updates imports and inventory error reference.
cli/live/migrate/migratecmd_test.go	Relocates migration tests.
cli/live/livecmd.go	Updates live command imports.
cli/live/installrg/cmdinstallrg.go	Relocates ResourceGroup installation command.
cli/live/init/cmdliveinit.go	Uses shared inventory errors.
cli/live/init/cmdliveinit_test.go	Relocates initialization tests.
cli/live/destroy/cmddestroy.go	Relocates destroy command.
cli/live/destroy/cmddestroy_test.go	Relocates destroy tests.
cli/live/apply/cmdapply.go	Relocates apply command.
cli/live/apply/cmdapply_test.go	Relocates apply tests.
cli/k8s.go	Adds adapted Kubernetes command execution helpers.
cli/go.mod	Defines independent CLI module dependencies.
cli/fn/render/cmdrender.go	Relocates render command.
cli/fn/render/cmdrender_test.go	Relocates render tests.
cli/fn/fncmd.go	Updates function command imports.
cli/fn/doc/cmdfndoc.go	Relocates function documentation command.
cli/fn/doc/cmdfndoc_test.go	Updates CLI import.
cli/fn/cmdsink/cmdsink.go	Relocates sink command.
cli/fn/cmdsink/cmdsink_test.go	Relocates sink tests.
cli/fn/cmdeval/test/testdata/java/java-service.resource.yaml	Relocates service fixture.
cli/fn/cmdeval/test/testdata/java/java-deployment.resource.yaml	Relocates deployment fixture.
cli/fn/cmdeval/test/testdata/java/java-configmap.resource.yaml	Relocates ConfigMap fixture.
cli/fn/cmdeval/runfn.go	Consolidates runner into cmdeval.
cli/fn/cmdeval/runfn_test.go	Updates runner test package.
cli/fn/cmdeval/cmdeval.go	Uses consolidated runner and relocated helpers.
cli/fn/cmdeval/cmdeval_test.go	Updates runner references.
cli/commands.go	Moves command registration into main package.
cli/alpha/wasm/wasmcmd.go	Updates WASM command imports.
cli/alpha/wasm/push/command.go	Relocates WASM push command.
cli/alpha/wasm/pull/command.go	Relocates WASM pull command.
cli/alpha/live/plan/diff.go	Relocates plan diff helpers.
cli/alpha/live/plan/command.go	Relocates plan command.
cli/alpha/live/plan/command_test.go	Relocates plan tests.
cli/alpha/live/livecmd.go	Updates alpha live imports.
cli/alpha/alphacmd.go	Updates alpha command imports.
.github/workflows/release.yml	Uses CLI Go version and checks replacements.
.github/workflows/go.yml	Updates changed-code path filters.

🧠 Review effort: Balanced

💡 Add a code-review agent skill or configure MCP servers for context-aware, tailored reviews. Learn more in the docs.

Signed-off-by: Mózes László Máté <laszlo.mozes@nokia.com>

Assisted-by: Cursor:claude-haiku-4.5 Signed-off-by: Mózes László Máté <laszlo.mozes@nokia.com>

Signed-off-by: Mózes László Máté <laszlo.mozes@nokia.com>

Assisted-by: Cursor:grok-4.7 Signed-off-by: Mózes László Máté <laszlo.mozes@nokia.com>

Signed-off-by: Mózes László Máté <laszlo.mozes@nokia.com>

Copilot

🟡 Changes recommended

Critical CLI release and KRM output issues remain, along with workflow and module-integration gaps.

1 open finding

Fix release tag filter to match CLI version tags · New

Previously missed (1)

In code that hasn't changed since last review

Make the go workspace setup command idempotent

Makefile:140

work is phony, so every repeated make work runs go work init again. go work init fails when go.work already exists, making the documented setup command non-idempotent; use go work use for an existing workspace or guard the init.

🧠 Review effort: Lite

Assisted-by: Cursor:grok-4.7 Signed-off-by: Mózes László Máté <laszlo.mozes@nokia.com>

Signed-off-by: Mózes László Máté <laszlo.mozes@nokia.com>

aravindtga

Homebrew formula will break with this split (external follow-up needed).

The homebrew-core formula (Formula/k/kpt.rb (https://github.com/Homebrew/homebrew-core/blob/HEAD/Formula/k/kpt.rb)) builds from the source tarball at the repo root and injects -X github.com/kptdev/kpt/run.version.

It needs a coordinated homebrew-core PR to build the cli/ submodule, switch ldflags to -X main.version, and teach livecheck the cli/v* stream. Flagging so it isn't missed. likely belongs with the release-automation work in #4827.

Signed-off-by: Mózes László Máté <laszlo.mozes@nokia.com>

mozesl-nokia · 2026-10-22T12:44:29Z

@aravindtga Not familiar with homebrew, but I think it can be done any time before the next release.

aravindtga · 2026-10-23T08:38:30Z

@aravindtga Not familiar with homebrew, but I think it can be done any time before the next release.

Yes. It is a pre-requisite to the release after the merge of this PR.

Co-authored-by: Aravindhan Ayyanathan <aravindhan.a@est.tech> Signed-off-by: Mózes László Máté <laszlo.mozes@nokia.com>

mozesl-nokia · 2026-10-26T09:01:55Z

Did not see before but sonar is failing on this because of the commands -> cli rename; do not merge yet

Signed-off-by: Mózes László Máté <laszlo.mozes@nokia.com>

mozesl-nokia · 2026-10-26T09:54:39Z

Nevermind, forgot that sonar always pulls from main, so I cannot verify if the new config works correctly...

mozesl-nokia added 10 commits October 15, 2026 15:05

remove third_party

505fea3

Signed-off-by: Mózes László Máté <laszlo.mozes@nokia.com>

remove live dependency

caaf3a8

Signed-off-by: Mózes László Máté <laszlo.mozes@nokia.com>

move run

0163b14

Signed-off-by: Mózes László Máté <laszlo.mozes@nokia.com>

rename commands to cli, vendor in a few k8s cli functions, fix lint

00badc5

Signed-off-by: Mózes László Máté <laszlo.mozes@nokia.com>

create module, move main.go in, workspace make targets

a090325

Signed-off-by: Mózes László Máté <laszlo.mozes@nokia.com>

make targets (restructure api targets too)

2891fb7

Signed-off-by: Mózes László Máté <laszlo.mozes@nokia.com>

fix make build

a2eda39

Signed-off-by: Mózes László Máté <laszlo.mozes@nokia.com>

fix version ldflag

17f30ef

Assisted-by: Cursor:grok-4.7 Signed-off-by: Mózes László Máté <laszlo.mozes@nokia.com>

fixing release workflows

026eec5

Assisted-by: Cursor:composer-2.5 Signed-off-by: Mózes László Máté <laszlo.mozes@nokia.com>

workflow detection fixes

ed077e7

Assisted-by: Cursor:claude-haiku-4.5 Signed-off-by: Mózes László Máté <laszlo.mozes@nokia.com>

mozesl-nokia requested review from a team and a balanced review from Copilot October 15, 2026 13:13

mozesl-nokia added the cleanup label Oct 15, 2026

mozesl-nokia requested review from efiacor, kispaljr and liamfallon as code owners October 15, 2026 13:13

mozesl-nokia added area/pkg area/live dependencies Pull requests that update a dependency file area/fn-runtime KRM function runtime go Pull requests that update Go code labels Oct 15, 2026

Copilot started reviewing on behalf of mozesl-nokia October 15, 2026 13:13

View session

Copilot AI reviewed Oct 15, 2026

View reviewed changes

Comment thread Makefile

Comment thread cli/Makefile Outdated

Comment thread cli/go.mod

Comment thread .github/workflows/go.yml

Comment thread Makefile Outdated

mozesl-nokia added 4 commits October 15, 2026 15:28

use replace until new main tag

3cdd101

Signed-off-by: Mózes László Máté <laszlo.mozes@nokia.com>

fix copyrights

004c7bc

Signed-off-by: Mózes László Máté <laszlo.mozes@nokia.com>

remove shlex dependency

37a8842

Assisted-by: Cursor:claude-haiku-4.5 Signed-off-by: Mózes László Máté <laszlo.mozes@nokia.com>

fix copilot comments

783c0db

Signed-off-by: Mózes László Máté <laszlo.mozes@nokia.com>

mozesl-nokia added 3 commits October 16, 2026 17:07

restructuring makefiles

7282d5a

Assisted-by: Cursor:grok-4.7 Signed-off-by: Mózes László Máté <laszlo.mozes@nokia.com>

remove name_template from goreleaser config

96de122

Signed-off-by: Mózes László Máté <laszlo.mozes@nokia.com>

actually remove any references to commands

732bf59

Signed-off-by: Mózes László Máté <laszlo.mozes@nokia.com>

mozesl-nokia requested a lite review from Copilot October 16, 2026 15:17

Copilot started reviewing on behalf of mozesl-nokia October 16, 2026 15:18

View session

Copilot AI reviewed Oct 16, 2026

View reviewed changes

Comment thread .github/workflows/release-cli.yml

mozesl-nokia added 4 commits October 16, 2026 17:28

use envOrDefault properly

bada27f

Assisted-by: Cursor:grok-4.7 Signed-off-by: Mózes László Máté <laszlo.mozes@nokia.com>

add guard to make work

fecd687

Signed-off-by: Mózes László Máté <laszlo.mozes@nokia.com>

more releaser config fixes

305d3de

Signed-off-by: Mózes László Máté <laszlo.mozes@nokia.com>

Merge main into cli-mod

5d5057a

mozesl-nokia mentioned this pull request Oct 21, 2026

Move RunnerOptions and related types to the API #4822

Open

liamfallon approved these changes Oct 22, 2026

View reviewed changes

mozesl-nokia added 2 commits October 22, 2026 09:51

Merge main into cli-mod

9505c13

tidy after merge

5a2c0e6

Signed-off-by: Mózes László Máté <laszlo.mozes@nokia.com>

aravindtga requested review from a team October 22, 2026 08:39

aravindtga reviewed Oct 22, 2026

View reviewed changes

Comment thread documentation/content/en/installation/kpt-cli.md Outdated

Comment thread release/tag/goreleaser.yaml Outdated

Comment thread release/tag/goreleaser.yaml Outdated

Comment thread .github/workflows/release-cli.yml Outdated

Comment thread .github/workflows/release-cli.yml Outdated

address review comments relating to post-merge leftovers

b9f00c7

Signed-off-by: Mózes László Máté <laszlo.mozes@nokia.com>

aravindtga approved these changes Oct 23, 2026

View reviewed changes

Comment thread release/tag/goreleaser.yaml Outdated

Comment thread release/tag/goreleaser.yaml Outdated

Apply batched suggestions from code review

c6293d2

Co-authored-by: Aravindhan Ayyanathan <aravindhan.a@est.tech> Signed-off-by: Mózes László Máté <laszlo.mozes@nokia.com>

mozesl-nokia force-pushed the cli-mod branch from ce0e1ca to c6293d2 Compare October 26, 2026 08:48

mozesl-nokia added the do-not-merge/hold label Oct 26, 2026

fix sonar sources

5109c11

Signed-off-by: Mózes László Máté <laszlo.mozes@nokia.com>

mozesl-nokia removed the do-not-merge/hold label Oct 26, 2026

mozesl-nokia merged commit f8cdbbf into kptdev:main Oct 26, 2026
27 checks passed

mozesl-nokia deleted the cli-mod branch October 26, 2026 09:55

Conversation

mozesl-nokia commented Oct 15, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

netlify Bot commented Oct 15, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

✅ Deploy Preview for kptdocs ready!

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

🟡 Changes recommended

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

🟡 Changes recommended

Uh oh!

Uh oh!

aravindtga left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

mozesl-nokia commented Oct 22, 2026

Uh oh!

aravindtga commented Oct 23, 2026

Uh oh!

Uh oh!

Uh oh!

mozesl-nokia commented Oct 26, 2026

Uh oh!

mozesl-nokia commented Oct 26, 2026

Uh oh!

Uh oh!

Reviewers

Uh oh!

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

mozesl-nokia commented Oct 15, 2026 •

edited

Loading

netlify Bot commented Oct 15, 2026 •

edited

Loading