fix UT

paulyufan2 · paulyufan2 · commit eade34dd80c1 · 2025-09-15T16:52:29.000-04:00
diff --git a/cns/multitenantcontroller/multitenantoperator/multitenantcrdreconciler_test.go b/cns/multitenantcontroller/multitenantoperator/multitenantcrdreconciler_test.go
@@ -15,14 +15,15 @@ import (
 	apierrors "k8s.io/apimachinery/pkg/api/errors"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/types"
+	"k8s.io/apimachinery/pkg/runtime"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 	"sigs.k8s.io/controller-runtime/pkg/reconcile"
 )
 
 type clientWithApply struct{ *mockclients.MockClient }
 
 // Satisfy controller-runtime v0.22.1 Writer.Apply:
-func (c clientWithApply) Apply(ctx context.Context, ac runtime.ApplyConfiguration, opts ...ctrlclient.ApplyOption) error {
+func (c clientWithApply) Apply(ctx context.Context, ac runtime.ApplyConfiguration, opts ...client.ApplyOption) error {
     return nil // not used in these tests
 }
 

Original file line number	Diff line number	Diff line change
`@@ -15,14 +15,15 @@ import (`
`15`	`15`	`apierrors "k8s.io/apimachinery/pkg/api/errors"`
`16`	`16`	`metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"`
`17`	`17`	`"k8s.io/apimachinery/pkg/types"`
	`18`	`+ "k8s.io/apimachinery/pkg/runtime"`
`18`	`19`	`"sigs.k8s.io/controller-runtime/pkg/client"`
`19`	`20`	`"sigs.k8s.io/controller-runtime/pkg/reconcile"`
`20`	`21`	`)`
`21`	`22`
`22`	`23`	`type clientWithApply struct{ *mockclients.MockClient }`
`23`	`24`
`24`	`25`	`// Satisfy controller-runtime v0.22.1 Writer.Apply:`
`25`		`-func (c clientWithApply) Apply(ctx context.Context, ac runtime.ApplyConfiguration, opts ...ctrlclient.ApplyOption) error {`
	`26`	`+func (c clientWithApply) Apply(ctx context.Context, ac runtime.ApplyConfiguration, opts ...client.ApplyOption) error {`
`26`	`27`	`return nil // not used in these tests`
`27`	`28`	`}`
`28`	`29`