From 7d7878ff5c64024dc3725eda3265b491217eef2f Mon Sep 17 00:00:00 2001 From: Michi Mutsuzaki Date: Mon, 9 Dec 2024 00:36:25 +0000 Subject: [PATCH] Makefile: Remove CILIUM_VERSION variable Now Cilium CLI sets the default Cilium version without relying on the compile-time flag [^1]. [^1]: https://github.com/cilium/cilium/pull/36344 Signed-off-by: Michi Mutsuzaki --- Makefile | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/Makefile b/Makefile index ecfd03d959..f7c1f04bdd 100644 --- a/Makefile +++ b/Makefile @@ -7,15 +7,13 @@ GO_TAGS ?= TARGET=cilium INSTALL = $(QUIET)install BINDIR ?= /usr/local/bin -CILIUM_VERSION=$(shell curl -s https://raw.githubusercontent.com/cilium/cilium/main/stable.txt) CLI_VERSION=$(shell git describe --tags --always) STRIP_DEBUG=-w -s ifdef DEBUG STRIP_DEBUG= endif GO_BUILD_LDFLAGS ?= $(STRIP_DEBUG) \ - -X 'github.com/cilium/cilium/cilium-cli/defaults.CLIVersion=$(CLI_VERSION)' \ - -X 'github.com/cilium/cilium/cilium-cli/defaults.Version=$(CILIUM_VERSION)' + -X 'github.com/cilium/cilium/cilium-cli/defaults.CLIVersion=$(CLI_VERSION)' TEST_TIMEOUT ?= 5s RELEASE_UID ?= $(shell id -u)