From d6f8b80b49c274568289af74bfb643537d95917c Mon Sep 17 00:00:00 2001 From: Martin Basti Date: Wed, 22 Feb 2023 19:06:40 +0100 Subject: [PATCH] fix(deps): forward compat with sigs.k8s.io/controller-runtime package sigs.k8s.io/controller-runtime/pkg/envtest/printer will be removed in future version. Use ginko/v2 and drop that package https://github.com/kubernetes-sigs/controller-runtime/releases/tag/v0.14.0 Signed-off-by: Martin Basti --- controllers/suite_test.go | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/controllers/suite_test.go b/controllers/suite_test.go index 65ae92714..55b53904b 100644 --- a/controllers/suite_test.go +++ b/controllers/suite_test.go @@ -20,13 +20,13 @@ import ( "path/filepath" "testing" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "k8s.io/client-go/kubernetes/scheme" + // "k8s.io/client-go/rest" "sigs.k8s.io/controller-runtime/pkg/client" "sigs.k8s.io/controller-runtime/pkg/envtest" - "sigs.k8s.io/controller-runtime/pkg/envtest/printer" logf "sigs.k8s.io/controller-runtime/pkg/log" "sigs.k8s.io/controller-runtime/pkg/log/zap" //+kubebuilder:scaffold:imports @@ -41,10 +41,7 @@ var testEnv *envtest.Environment func TestAPIs(t *testing.T) { RegisterFailHandler(Fail) - - RunSpecsWithDefaultAndCustomReporters(t, - "Controller Suite", - []Reporter{printer.NewlineReporter{}}) + RunSpecs(t, "Controller Suite") } var _ = BeforeSuite(func() { @@ -66,7 +63,7 @@ var _ = BeforeSuite(func() { Expect(err).NotTo(HaveOccurred()) Expect(k8sClient).NotTo(BeNil()) -}, 60) +}) var _ = AfterSuite(func() { By("tearing down the test environment")