Fix test to align with controller-runtime changes

ref. kubernetes-sigs/controller-runtime#2918
cybozu-go · Oct 2, 2024 · 9e25d40 · 9e25d40
1 parent 8d9cb71
commit 9e25d40
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 0 deletions.
diff --git a/controllers/autovirtualdc_controller_test.go b/controllers/autovirtualdc_controller_test.go
@@ -16,6 +16,7 @@ import (
 	"k8s.io/utils/ptr"
 	ctrl "sigs.k8s.io/controller-runtime"
 	"sigs.k8s.io/controller-runtime/pkg/client"
+	"sigs.k8s.io/controller-runtime/pkg/config"
 	metricsserver "sigs.k8s.io/controller-runtime/pkg/metrics/server"
 )
 
@@ -39,6 +40,9 @@ var _ = Describe("AutoVirtualDC controller", func() {
 			Scheme:         scheme,
 			LeaderElection: false,
 			Metrics:        metricsserver.Options{BindAddress: "0"},
+			Controller: config.Controller{
+				SkipNameValidation: ptr.To(true),
+			},
 		})
 		Expect(err).NotTo(HaveOccurred())
 

diff --git a/controllers/virtualdc_controller_test.go b/controllers/virtualdc_controller_test.go
@@ -18,8 +18,10 @@ import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/types"
 	"k8s.io/apimachinery/pkg/util/intstr"
+	"k8s.io/utils/ptr"
 	ctrl "sigs.k8s.io/controller-runtime"
 	"sigs.k8s.io/controller-runtime/pkg/client"
+	"sigs.k8s.io/controller-runtime/pkg/config"
 	metricsserver "sigs.k8s.io/controller-runtime/pkg/metrics/server"
 )
 
@@ -73,6 +75,9 @@ var _ = Describe("VirtualDC controller", func() {
 			Scheme:         scheme,
 			LeaderElection: false,
 			Metrics:        metricsserver.Options{BindAddress: "0"},
+			Controller: config.Controller{
+				SkipNameValidation: ptr.To(true),
+			},
 		})
 		Expect(err).NotTo(HaveOccurred())