✅ Deploy Preview for kptdocs ready!

Name	Link
🔨 Latest commit	a38092a
🔍 Latest deploy log	https://app.netlify.com/projects/kptdocs/deploys/69dd3be958f1af00096c7deb
😎 Deploy Preview	https://deploy-preview-4468--kptdocs.netlify.app
📱 Preview on mobile	Toggle QR Code... Use your smartphone camera to open QR code link.

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

Please fix the DCO issue by following these instructions: https://github.com/kptdev/kpt/pull/4468/checks?check_run_id=70060980850

@CsatariGergely Thanks for pointing this out. I've fixed the DCO issue and updated the commits. Kindly take another look.

Hi @NETIZEN-11,

Thanks for your PR and contribution!

This currently has 23 commits, many of which are unrelated to the build versioning scope. They got included in your branch as part of a merge, This makes it hard to review what's actually part of your change.

Could you rebase cleanly onto main so only the semantic versioning changes are visible in the diff?

I'd also request the same for your other open PRs. That will make reviews much easier across the board and help get things merged faster.

Thanks!

Hi @aravindtga,

Thanks for the feedback. I’ve rebased the branch onto main and cleaned up the commits. Now the PR only contains the relevant semantic versioning changes.

Could you please take another look?

Thanks!

The solution here does not insert the correct version string into the binary when building a development version of kpt, see this log:

Before fix:

kpt % git status
On branch main
Your branch is up to date with 'origin/main'.

nothing to commit, working tree clean
kpt % make build
go build -ldflags "-X github.com/kptdev/kpt/run.version=2cd4e75fa " -o /Users/liam/go/bin/kpt -v .
github.com/kptdev/kpt
kpt % kpt version
2cd4e75fa

After fix:

kpt % git status
On branch main
Your branch is up to date with 'origin/main'.

Changes not staged for commit:
  (use "git add <file>..." to update what will be committed)
  (use "git restore <file>..." to discard changes in working directory)
	modified:   Makefile

no changes added to commit (use "git add" and/or "git commit -a")
kpt % git diff
diff --git a/Makefile b/Makefile
index 7b64949f8..048641216 100644
--- a/Makefile
+++ b/Makefile
@@ -22,9 +22,12 @@ YEAR_GEN          := $(shell date '+%Y')
 GOBIN := $(shell go env GOPATH)/bin
 GIT_COMMIT := $(shell git rev-parse --short HEAD)
 
+# Use git describe to get semantic version, fallback to commit hash for dev builds
+VERSION := $(shell git describe --tags --match='v*' --abbrev=0 2>/dev/null || echo "v0.0.0-dev+${GIT_COMMIT}")
+
 export KPT_FN_WASM_RUNTIME ?= nodejs
 
-LDFLAGS := -ldflags "-X github.com/kptdev/kpt/run.version=${GIT_COMMIT}
+LDFLAGS := -ldflags "-X github.com/kptdev/kpt/run.version=${VERSION}
 ifeq ($(OS),Windows_NT)
        # Do nothing
 else
kpt % make build
go build -ldflags "-X github.com/kptdev/kpt/run.version=v1.0.0-beta.62 " -o /Users/liam/go/bin/kpt -v .
github.com/kptdev/kpt
kpt % kpt version
v1.0.0-beta.62

I think the last version string should be v0.0.0-dev+2cd4e75fa

This still doesn't seem to be working (on a cheked out tag), see below:

kpt % git status
HEAD detached at v1.0.0-beta.62
Changes not staged for commit:
  (use "git add <file>..." to update what will be committed)
  (use "git restore <file>..." to discard changes in working directory)
	modified:   Makefile

no changes added to commit (use "git add" and/or "git commit -a")
kpt % git diff
diff --git a/Makefile b/Makefile
index 7b64949f8..919efb334 100644
--- a/Makefile
+++ b/Makefile
@@ -21,10 +21,23 @@ YEAR_GEN          := $(shell date '+%Y')
 
 GOBIN := $(shell go env GOPATH)/bin
 GIT_COMMIT := $(shell git rev-parse --short HEAD)
+GIT_TAG := $(shell git describe --tags --exact-match 2>/dev/null)
+DIRTY := $(shell git status --porcelain)
+
+# Version logic:
+# - Use tag ONLY if exact match AND clean working tree
+# - Otherwise fallback to dev version
+ifeq ($(GIT_TAG),)
+VERSION := v0.0.0-dev+$(GIT_COMMIT)
+else ifneq ($(DIRTY),)
+VERSION := v0.0.0-dev+$(GIT_COMMIT)
+else
+VERSION := $(GIT_TAG)
+endif
 
 export KPT_FN_WASM_RUNTIME ?= nodejs
 
-LDFLAGS := -ldflags "-X github.com/kptdev/kpt/run.version=${GIT_COMMIT}
+LDFLAGS := -ldflags "-X github.com/kptdev/kpt/run.version=${VESION}
 ifeq ($(OS),Windows_NT)
        # Do nothing
 else
kpt % make build
go build -ldflags "-X github.com/kptdev/kpt/run.version= " -o /Users/liam/go/bin/kpt -v .
kpt % kpt version

kpt % # The kpt version on the tagged branch is blank

Hi @liamfallon 👋

Thanks for pointing this out.

The issue was caused by a typo in the Makefile (VESION instead of VERSION), which resulted in an empty value being passed during build. I've fixed this now.

Also, regarding your test case: the working tree is currently dirty (Makefile modified), so the version logic correctly falls back to the dev version instead of using the tag.

Once the working tree is clean, it should correctly pick up the tag (e.g. v1.0.0-beta.62).

Could you please pull the latest changes and verify again? Thanks!

Hi @liamfallon 👋

Thanks for pointing this out.

The issue was caused by a typo in the Makefile (VESION instead of VERSION), which resulted in an empty value being passed during build. I've fixed this now.

Also, regarding your test case: the working tree is currently dirty (Makefile modified), so the version logic correctly falls back to the dev version instead of using the tag.

Once the working tree is clean, it should correctly pick up the tag (e.g. v1.0.0-beta.62).

Could you please pull the latest changes and verify again? Thanks!

Yes, I know it was dirty. I pulled a tagged version and pasted in your change; your change is not merged so it is not in a tagged version yet.

Also when you have updated a PR, feel free to remove the "awaiting author action" label so we can see that the PR comments are addressed without having to dig into the PR.

I think we should reconsider the whole approach here. I think the way we did this for prochctl in the Porch project is a lot cleaner.

For local Makefile builds, we use the Makefile and code in the porchctl command itself, see:

• https://github.com/nephio-project/porch/blob/4509accabdfe3a4f0f92cedbf02f159ef6f7ee2b/make/build.mk#L50
• https://github.com/nephio-project/porch/blob/4509accabdfe3a4f0f92cedbf02f159ef6f7ee2b/cmd/porchctl/run/run.go#L161

For releases and builds on Github we use a Github action:

• https://github.com/nephio-project/porch/blob/main/release/tag/goreleaser.yaml
• https://github.com/nephio-project/porch/blob/main/.github/workflows/release.yaml

Hi @liamfallon 👋

I've refactored the implementation based on your feedback.

• Simplified the Makefile (removed complex version logic)
• Moved version handling to code
• Aligned the approach with standard release workflows

This should address the concerns around maintainability and separation of local vs release builds.

Could you please take another look and let me know your thoughts? Thanks!