From d0ee6bd00eb4de979918b319e6adfc1dba976275 Mon Sep 17 00:00:00 2001 From: vitorfloriano <107767584+vitorfloriano@users.noreply.github.com> Date: Sat, 15 Mar 2025 03:24:38 -0300 Subject: [PATCH] =?UTF-8?q?=F0=9F=8C=B1=20Add=20kubernetesVendorVersion=20?= =?UTF-8?q?for=20binary=20builds=20with=20LD=5FFLAGS?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This commit adds a kubernetesVendorVersion flag to Makefile. Rely on ldflags to set kubernetesVendorVersion, similarly to the other variables in cmd/version.go. Use a single variable to define K8S_VERSION for both ldflags and the goreleaser configuration. --- Makefile | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index b539832be70..6f9a8de1d2c 100644 --- a/Makefile +++ b/Makefile @@ -45,8 +45,11 @@ help: ## Display this help ##@ Build +K8S_VERSION ?= $(shell go list -m -modfile=./testdata/project-v4/go.mod -f "{{ .Version }}" k8s.io/api | awk -F'[v.]' '{printf "1.%d.%d", $$3, $$4}') + LD_FLAGS=-ldflags " \ -X sigs.k8s.io/kubebuilder/v4/cmd.kubeBuilderVersion=$(shell git describe --tags --dirty --broken) \ + -X sigs.k8s.io/kubebuilder/v4/cmd.kubernetesVendorVersion=$(K8S_VERSION) \ -X sigs.k8s.io/kubebuilder/v4/cmd.goos=$(shell go env GOOS) \ -X sigs.k8s.io/kubebuilder/v4/cmd.goarch=$(shell go env GOARCH) \ -X sigs.k8s.io/kubebuilder/v4/cmd.gitCommit=$(shell git rev-parse HEAD) \ @@ -201,7 +204,6 @@ install-helm: ## Install the latest version of Helm locally helm-lint: install-helm ## Lint the Helm chart in testdata helm lint testdata/project-v4-with-plugins/dist/chart -K8S_VERSION ?= $(shell go list -m -modfile=./testdata/project-v4/go.mod -f "{{ .Version }}" k8s.io/api | awk -F'[v.]' '{printf "1.%d.%d", $$3, $$4}') .PHONY: update-k8s-version update-k8s-version: ## Update Kubernetes API version in version.go and .goreleaser.yml @if [ -z "$(K8S_VERSION)" ]; then echo "Error: K8S_VERSION is empty"; exit 1; fi