From 0d4e7e40d3ea270f9a8dc3d98d823bdc02db0e2e Mon Sep 17 00:00:00 2001 From: chansuke Date: Fri, 24 Nov 2023 00:56:36 +0900 Subject: [PATCH] Fix version tag management --- Makefile | 4 +++- api/provenance/provenance.go | 7 +++++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index dbdf4f0dc1..eea4b2ab66 100644 --- a/Makefile +++ b/Makefile @@ -75,7 +75,9 @@ $(MYGOBIN)/pluginator: # Build from local source. $(MYGOBIN)/kustomize: build-kustomize-api cd kustomize; \ - go install -ldflags "-X sigs.k8s.io/kustomize/api/provenance.buildDate=$(shell date -u +'%Y-%m-%dT%H:%M:%SZ')" \ + go install -ldflags \ + "-X sigs.k8s.io/kustomize/api/provenance.buildDate=$(shell date -u +'%Y-%m-%dT%H:%M:%SZ') \ + -X sigs.k8s.io/kustomize/api/provenance.version=$(shell git describe --tags --always --dirty)" \ . kustomize: $(MYGOBIN)/kustomize diff --git a/api/provenance/provenance.go b/api/provenance/provenance.go index 0e24fc36ca..be2136b7b0 100644 --- a/api/provenance/provenance.go +++ b/api/provenance/provenance.go @@ -62,6 +62,13 @@ func GetProvenance() Provenance { p.GitCommit = setting.Value } } + + for _, dep := range info.Deps { + if dep.Path == "sigs.k8s.io/kustomize/kustomize/v5" { + p.Version = dep.Version + } + } + return p }