From 58ebfb1ebd7de0330f8d01905d989d55d46c3dd3 Mon Sep 17 00:00:00 2001 From: Brad Davidson Date: Tue, 5 Mar 2024 19:38:14 +0000 Subject: [PATCH] Include flannel version in flannel cni plugin version We were misreporting the flannel version as the flannel cni plugin version; restore the actual flannel version as build metadata Signed-off-by: Brad Davidson (cherry picked from commit 6f331ea7b520095785a3a4ca30f8c75c69a12105) Signed-off-by: Brad Davidson --- scripts/build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/build b/scripts/build index f44031677820..1bb17ca62358 100755 --- a/scripts/build +++ b/scripts/build @@ -41,7 +41,7 @@ VERSIONFLAGS=" -X ${PKG_CNI_PLUGINS}/pkg/utils/buildversion.BuildVersion=${VERSION_CNIPLUGINS} -X ${PKG_CNI_PLUGINS}/plugins/meta/flannel.Program=flannel - -X ${PKG_CNI_PLUGINS}/plugins/meta/flannel.Version=${VERSION_FLANNEL_PLUGIN} + -X ${PKG_CNI_PLUGINS}/plugins/meta/flannel.Version=${VERSION_FLANNEL_PLUGIN}+${VERSION_FLANNEL} -X ${PKG_CNI_PLUGINS}/plugins/meta/flannel.Commit=HEAD -X ${PKG_CNI_PLUGINS}/plugins/meta/flannel.buildDate=${buildDate}