From 4c197783fcfb022203ef6efca4278868aaaa750c Mon Sep 17 00:00:00 2001 From: Solly Ross Date: Tue, 27 Apr 2021 17:24:01 -0700 Subject: [PATCH] fixup! Envtest Binary Version Manager Tool --- tools/setup-envtest/env/env.go | 2 -- tools/setup-envtest/main.go | 2 ++ 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/setup-envtest/env/env.go b/tools/setup-envtest/env/env.go index ed6693a2c2..d2d8f8bb63 100644 --- a/tools/setup-envtest/env/env.go +++ b/tools/setup-envtest/env/env.go @@ -448,8 +448,6 @@ func (e *Env) PathMatches(value string) bool { e.Platform.Arch = "*" e.manualPath = value return true - - return false } // versionFromPathName checks if the given path's last component looks like one diff --git a/tools/setup-envtest/main.go b/tools/setup-envtest/main.go index 7bd1f23a50..1dbf0f40ad 100644 --- a/tools/setup-envtest/main.go +++ b/tools/setup-envtest/main.go @@ -102,6 +102,8 @@ func setupEnv(globalLog logr.Logger, version string) *envp.Env { case "", "latest": env.Version = versions.LatestVersion case "latest-on-disk": + // we sort by version, latest first, so this'll give us the latest on + // disk (as per the contract from env.List & store.List) env.Version = versions.AnyVersion env.NoDownload = true default: