From b80af1491e2e9ac60377a87113e7a5beefc92a6b Mon Sep 17 00:00:00 2001 From: Chris Bandy Date: Tue, 4 Nov 2025 15:12:25 -0600 Subject: [PATCH 1/2] Quiet golangci-lint in a testing package --- internal/testing/events/recorder.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/internal/testing/events/recorder.go b/internal/testing/events/recorder.go index e76ef21eb3..dad5dccf83 100644 --- a/internal/testing/events/recorder.go +++ b/internal/testing/events/recorder.go @@ -89,7 +89,7 @@ func (*Recorder) AnnotatedEventf(object runtime.Object, annotations map[string]s } func (r *Recorder) Event(object runtime.Object, eventtype, reason, message string) { if r.eventf != nil { - r.eventf(object, nil, eventtype, reason, "", message) + r.eventf(object, nil, eventtype, reason, "", "%v", message) } } func (r *Recorder) Eventf(object runtime.Object, eventtype, reason, messageFmt string, args ...any) { From b5454490b327101f5ac41e3320dcf463c0d0b86e Mon Sep 17 00:00:00 2001 From: Chris Bandy Date: Tue, 4 Nov 2025 15:14:17 -0600 Subject: [PATCH 2/2] Use a stable release of setup-envtest A recent change caused this tool to select the *oldest* Kubernetes binaries rather than the newest: https://www.github.com/kubernetes-sigs/controller-runtime/issues/3379 This entire tool can be dropped when we move to controller-runtime 0.22.x which has this feature: https://www.github.com/kubernetes-sigs/controller-runtime/pull/3280 --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 793e806d77..e792016ec8 100644 --- a/Makefile +++ b/Makefile @@ -15,7 +15,7 @@ CONTROLLER ?= $(GO) tool sigs.k8s.io/controller-tools/cmd/controller-gen CHAINSAW ?= $(GO) run github.com/kyverno/chainsaw@latest CHAINSAW_TEST ?= $(CHAINSAW) test CRD_CHECKER ?= $(GO) run github.com/openshift/crd-schema-checker/cmd/crd-schema-checker@latest -ENVTEST ?= $(GO) run sigs.k8s.io/controller-runtime/tools/setup-envtest@latest +ENVTEST ?= $(GO) run sigs.k8s.io/controller-runtime/tools/setup-envtest@release-0.22 KUTTL ?= $(GO) run github.com/kudobuilder/kuttl/cmd/kubectl-kuttl@latest KUTTL_TEST ?= $(KUTTL) test