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 <brad.davidson@rancher.com> (cherry picked from commit 6f331ea7) Signed-off-by: Brad Davidson <brad.davidson@rancher.com>

Include flannel version in flannel cni plugin version
e92d8efb · Brad Davidson · Brad Davidson · 354b2eb7 · e92d8efb
Commit e92d8efb authored Mar 05, 2024 by Brad Davidson Committed by Brad Davidson Mar 07, 2024
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

build scripts/build +1 -1

No files found.
--- 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}