fix version defs

This brings the version strings defined through 'go build -ldflags' up to date with upstream.

The CLI version definition in the PKGBUILD has been broken for a while, but 1.16.17 introduced a new definition for the default image that broke actual 'cilium-cli install':

$ cilium-cli install
strconv.ParseUint: parsing "": invalid syntax

Reference: https://github.com/cilium/cilium-cli/issues/2795

PKGBUILD

@@ -2,7 +2,9 @@
 
 pkgname=cilium-cli
 pkgver=0.16.20
-pkgrel=1
+pkgrel=2
+# default cilium version from https://raw.githubusercontent.com/cilium/cilium/main/stable.txt
+ciliumver=1.16.4
 pkgdesc="install, manage & troubleshoot Kubernetes clusters running Cilium"
 arch=("x86_64")
 url="https://github.com/cilium/cilium-cli"
@@ -21,7 +23,9 @@ build() {
 	export GOPATH="${srcdir}"
 	export GOFLAGS="-buildmode=pie -mod=vendor -modcacherw"
 	go build \
-		-ldflags "-compressdwarf=false -linkmode external -X \"github.com/cilium/cilium-cli/internal/cli/cmd.Version=v${pkgver}\"" \
+		-ldflags "-compressdwarf=false -linkmode external
+            -X \"github.com/cilium/cilium/cilium-cli/defaults.CLIVersion=v${pkgver}\"
+            -X \"github.com/cilium/cilium/cilium-cli/defaults.Version=v${ciliumver}\"" \
 		-o ${pkgname} ./cmd/cilium
 }
 

[Morten Linderud]

Why is cilium/cilium/stable.txt followed and not the one in the root of the project?

https://github.com/cilium/cilium-cli/blob/main/stable.txt

[Morten Linderud]

I see, https://github.com/cilium/cilium-cli/blob/main/Makefile#L10

[Renato Caldas]

Exactly. I've hardcoded it, so at least it's reproducible on our side. And it does fix 'cilium-cli install'.