From a973f4eb15cad440382cfa222e148843c95f3fe0 Mon Sep 17 00:00:00 2001 From: Michele Baldessari Date: Tue, 17 Nov 2026 15:55:47 +0100 Subject: [PATCH] Upgrade setup-envtest --- go.mod | 2 +- go.sum | 4 ++-- vendor/modules.txt | 2 +- .../tools/setup-envtest/store/store.go | 9 ++++++--- 4 files changed, 10 insertions(+), 7 deletions(-) diff --git a/go.mod b/go.mod index 0d891287a..ba315d1ae 100644 --- a/go.mod +++ b/go.mod @@ -32,7 +32,7 @@ require ( dario.cat/mergo v1.0.2 github.com/argoproj/argo-cd/v3 v3.5.6 k8s.io/utils v0.0.0-20261023123148-ca04ba58ecab - sigs.k8s.io/controller-runtime/tools/setup-envtest v0.25.2 + sigs.k8s.io/controller-runtime/tools/setup-envtest v0.25.3 sigs.k8s.io/controller-tools v0.23.0 sigs.k8s.io/yaml v1.6.0 ) diff --git a/go.sum b/go.sum index cebad99d9..476360e6e 100644 --- a/go.sum +++ b/go.sum @@ -736,8 +736,8 @@ sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.36.0 h1:/YpDJ4vReG7Zm sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.36.0/go.mod h1:tJo1aepTXyR+8Xs3sUsGBDk4Ub2AM5dPAPKJx0mpm5c= sigs.k8s.io/controller-runtime v0.24.1 h1:miPEwrmirImAvgME1L9qebGHrOnGJoVmVdtOU9fRfo4= sigs.k8s.io/controller-runtime v0.24.1/go.mod h1:vFkfY5fGt5xAC/sKb8IBFKgWPNKG9OUG29dR8Y2wImw= -sigs.k8s.io/controller-runtime/tools/setup-envtest v0.25.2 h1:53Y05LgEZ7qAr1bsdNTIcwgzEHQzHYUZkCDa3TqLdVg= -sigs.k8s.io/controller-runtime/tools/setup-envtest v0.25.2/go.mod h1:q4i4kLTq6J6o29RUAQieHH8LS5knNkpgalnBhvrLp/8= +sigs.k8s.io/controller-runtime/tools/setup-envtest v0.25.3 h1:6SzrgDmf8YueQ3IbX2cNQsg2Jkmy8FzP9dwWYYE7Vb8= +sigs.k8s.io/controller-runtime/tools/setup-envtest v0.25.3/go.mod h1:q4i4kLTq6J6o29RUAQieHH8LS5knNkpgalnBhvrLp/8= sigs.k8s.io/controller-tools v0.23.0 h1:GFmPTaHSyje/kZv/4XOdR1v3rWz0/OJixwpPnGyV4Sw= sigs.k8s.io/controller-tools v0.23.0/go.mod h1:JJRl1h3BoHJWtCVgwGsITk+dusn8LatINcIBhO8aP9A= sigs.k8s.io/json v0.0.0-20260909141634-11ed52e25bc5 h1:k9jo7ED/fsfOcz3L1P20P5tjTNtsdQNwMOG2aKzHrl8= diff --git a/vendor/modules.txt b/vendor/modules.txt index 1dbb89315..90745871a 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -1854,7 +1854,7 @@ sigs.k8s.io/controller-runtime/pkg/webhook/admission/metrics sigs.k8s.io/controller-runtime/pkg/webhook/conversion sigs.k8s.io/controller-runtime/pkg/webhook/conversion/metrics sigs.k8s.io/controller-runtime/pkg/webhook/internal/metrics -# sigs.k8s.io/controller-runtime/tools/setup-envtest v0.25.2 +# sigs.k8s.io/controller-runtime/tools/setup-envtest v0.25.3 ## explicit; go 1.26.0 sigs.k8s.io/controller-runtime/tools/setup-envtest sigs.k8s.io/controller-runtime/tools/setup-envtest/env diff --git a/vendor/sigs.k8s.io/controller-runtime/tools/setup-envtest/store/store.go b/vendor/sigs.k8s.io/controller-runtime/tools/setup-envtest/store/store.go index 4429619cd..315280d07 100644 --- a/vendor/sigs.k8s.io/controller-runtime/tools/setup-envtest/store/store.go +++ b/vendor/sigs.k8s.io/controller-runtime/tools/setup-envtest/store/store.go @@ -202,10 +202,13 @@ func (s *Store) Add(ctx context.Context, item Item, contents io.Reader) (resErr } log.V(1).Info("unpacked archive") - log.V(1).Info("switching version-platform directory to read-only") - if err := itemPath.Chmod("", 0555); err != nil { + // Keep the directory itself writable (0755) so that users can delete it + // (e.g. rm -rf, git worktree remove) without chmod. The files inside stay + // read-only/executable, which protects the binaries from modification. + log.V(1).Info("ensuring version-platform directory is user-writable") + if err := itemPath.Chmod("", 0755); err != nil { // don't bail, this isn't fatal - log.Error(err, "unable to make version-platform directory read-only") + log.Error(err, "unable to set version-platform directory permissions") } return nil }