Skip to content

Commit 74c24b3

Browse files
committed
tests: drop old sigs.k8s.io/controller-runtime/pkg/envtest/printer package
controller-runtime does not provide the pkg/envtest/printer package anymore since it was migrated to Ginkgo v2. Using the package prevents kubernetes-csi-addons from moving to a more recent version of controller-runtime (and other dependencies). See-also: kubernetes-sigs/controller-runtime#1977 Signed-off-by: Niels de Vos <[email protected]>
1 parent 1e533f5 commit 74c24b3

File tree

7 files changed

+4
-179
lines changed

7 files changed

+4
-179
lines changed

apis/csiaddons/v1alpha1/webhook_suite_test.go

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@ import (
3535
ctrl "sigs.k8s.io/controller-runtime"
3636
"sigs.k8s.io/controller-runtime/pkg/client"
3737
"sigs.k8s.io/controller-runtime/pkg/envtest"
38-
"sigs.k8s.io/controller-runtime/pkg/envtest/printer"
3938
logf "sigs.k8s.io/controller-runtime/pkg/log"
4039
"sigs.k8s.io/controller-runtime/pkg/log/zap"
4140
)
@@ -52,9 +51,7 @@ var cancel context.CancelFunc
5251
func TestAPIs(t *testing.T) {
5352
RegisterFailHandler(Fail)
5453

55-
RunSpecsWithDefaultAndCustomReporters(t,
56-
"Webhook Suite",
57-
[]Reporter{printer.NewlineReporter{}})
54+
RunSpecs(t, "Webhook Suite")
5855
}
5956

6057
var _ = BeforeSuite(func() {

apis/replication.storage/v1alpha1/webhook_suite_test.go

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@ import (
3535
ctrl "sigs.k8s.io/controller-runtime"
3636
"sigs.k8s.io/controller-runtime/pkg/client"
3737
"sigs.k8s.io/controller-runtime/pkg/envtest"
38-
"sigs.k8s.io/controller-runtime/pkg/envtest/printer"
3938
logf "sigs.k8s.io/controller-runtime/pkg/log"
4039
"sigs.k8s.io/controller-runtime/pkg/log/zap"
4140
)
@@ -52,9 +51,7 @@ var cancel context.CancelFunc
5251
func TestAPIs(t *testing.T) {
5352
RegisterFailHandler(Fail)
5453

55-
RunSpecsWithDefaultAndCustomReporters(t,
56-
"Webhook Suite",
57-
[]Reporter{printer.NewlineReporter{}})
54+
RunSpecs(t, "Webhook Suite")
5855
}
5956

6057
var _ = BeforeSuite(func() {

controllers/csiaddons/suite_test.go

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@ import (
2626
"k8s.io/client-go/rest"
2727
"sigs.k8s.io/controller-runtime/pkg/client"
2828
"sigs.k8s.io/controller-runtime/pkg/envtest"
29-
"sigs.k8s.io/controller-runtime/pkg/envtest/printer"
3029
logf "sigs.k8s.io/controller-runtime/pkg/log"
3130
"sigs.k8s.io/controller-runtime/pkg/log/zap"
3231

@@ -46,9 +45,7 @@ var testEnv *envtest.Environment
4645
func TestAPIs(t *testing.T) {
4746
RegisterFailHandler(Fail)
4847

49-
RunSpecsWithDefaultAndCustomReporters(t,
50-
"Controller Suite",
51-
[]Reporter{printer.NewlineReporter{}})
48+
RunSpecs(t, "Controller Suite")
5249
}
5350

5451
var _ = BeforeSuite(func() {

controllers/replication.storage/suite_test.go

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@ import (
2525
"k8s.io/client-go/kubernetes/scheme"
2626
"sigs.k8s.io/controller-runtime/pkg/client"
2727
"sigs.k8s.io/controller-runtime/pkg/envtest"
28-
"sigs.k8s.io/controller-runtime/pkg/envtest/printer"
2928
logf "sigs.k8s.io/controller-runtime/pkg/log"
3029
"sigs.k8s.io/controller-runtime/pkg/log/zap"
3130

@@ -44,9 +43,7 @@ func TestAPIs(t *testing.T) {
4443
t.Parallel()
4544
RegisterFailHandler(Fail)
4645

47-
RunSpecsWithDefaultAndCustomReporters(t,
48-
"Controller Suite",
49-
[]Reporter{printer.NewlineReporter{}})
46+
RunSpecs(t, "Controller Suite")
5047
}
5148

5249
var _ = BeforeSuite(func() {

vendor/modules.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1685,7 +1685,6 @@ sigs.k8s.io/controller-runtime/pkg/controller
16851685
sigs.k8s.io/controller-runtime/pkg/controller/controllerutil
16861686
sigs.k8s.io/controller-runtime/pkg/conversion
16871687
sigs.k8s.io/controller-runtime/pkg/envtest
1688-
sigs.k8s.io/controller-runtime/pkg/envtest/printer
16891688
sigs.k8s.io/controller-runtime/pkg/event
16901689
sigs.k8s.io/controller-runtime/pkg/handler
16911690
sigs.k8s.io/controller-runtime/pkg/healthz

vendor/sigs.k8s.io/controller-runtime/pkg/envtest/printer/ginkgo.go

Lines changed: 0 additions & 53 deletions
This file was deleted.

vendor/sigs.k8s.io/controller-runtime/pkg/envtest/printer/prow.go

Lines changed: 0 additions & 109 deletions
This file was deleted.

0 commit comments

Comments
 (0)