update

Signed-off-by: drivebyer <[email protected]>
OT-CONTAINER-KIT · Dec 22, 2024 · 14e6ffb · 14e6ffb
1 parent 18d95e6
commit 14e6ffb
Show file tree

Hide file tree

Showing 7 changed files with 0 additions and 12 deletions.
diff --git a/main.go b/main.go
@@ -122,7 +122,6 @@ func main() {
 		Client:     mgr.GetClient(),
 		K8sClient:  k8sclient,
 		Dk8sClient: dk8sClient,
-		Scheme:     mgr.GetScheme(),
 	}).SetupWithManager(mgr); err != nil {
 		setupLog.Error(err, "unable to create controller", "controller", "Redis")
 		os.Exit(1)
@@ -141,7 +140,6 @@ func main() {
 		Client:      mgr.GetClient(),
 		K8sClient:   k8sclient,
 		Dk8sClient:  dk8sClient,
-		Scheme:      mgr.GetScheme(),
 		Pod:         k8sutils.NewPodService(k8sclient),
 		StatefulSet: k8sutils.NewStatefulSetService(k8sclient),
 	}).SetupWithManager(mgr); err != nil {
@@ -152,7 +150,6 @@ func main() {
 		Client:             mgr.GetClient(),
 		K8sClient:          k8sclient,
 		Dk8sClient:         dk8sClient,
-		Scheme:             mgr.GetScheme(),
 		ReplicationWatcher: intctrlutil.NewResourceWatcher(),
 	}).SetupWithManager(mgr); err != nil {
 		setupLog.Error(err, "unable to create controller", "controller", "RedisSentinel")

diff --git a/pkg/controllers/redis/redis_controller.go b/pkg/controllers/redis/redis_controller.go
@@ -23,7 +23,6 @@ import (
 	redisv1beta2 "github.com/OT-CONTAINER-KIT/redis-operator/api/v1beta2"
 	intctrlutil "github.com/OT-CONTAINER-KIT/redis-operator/pkg/controllerutil"
 	"github.com/OT-CONTAINER-KIT/redis-operator/pkg/k8sutils"
-	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/client-go/dynamic"
 	"k8s.io/client-go/kubernetes"
 	ctrl "sigs.k8s.io/controller-runtime"
@@ -35,7 +34,6 @@ type Reconciler struct {
 	client.Client
 	K8sClient  kubernetes.Interface
 	Dk8sClient dynamic.Interface
-	Scheme     *runtime.Scheme
 }
 
 func (r *Reconciler) Reconcile(ctx context.Context, req ctrl.Request) (ctrl.Result, error) {

diff --git a/pkg/controllers/redis/redis_controller_suite_test.go b/pkg/controllers/redis/redis_controller_suite_test.go
@@ -103,7 +103,6 @@ var _ = BeforeSuite(func() {
 		Client:     k8sManager.GetClient(),
 		K8sClient:  k8sClient,
 		Dk8sClient: dk8sClient,
-		Scheme:     k8sManager.GetScheme(),
 	}).SetupWithManager(k8sManager)
 	Expect(err).ToNot(HaveOccurred())
 

diff --git a/pkg/controllers/redisreplication/redisreplication_controller.go b/pkg/controllers/redisreplication/redisreplication_controller.go
@@ -9,7 +9,6 @@ import (
 	"github.com/OT-CONTAINER-KIT/redis-operator/pkg/k8sutils"
 	appsv1 "k8s.io/api/apps/v1"
 	corev1 "k8s.io/api/core/v1"
-	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/client-go/dynamic"
 	"k8s.io/client-go/kubernetes"
 	ctrl "sigs.k8s.io/controller-runtime"
@@ -24,7 +23,6 @@ type Reconciler struct {
 	k8sutils.StatefulSet
 	K8sClient  kubernetes.Interface
 	Dk8sClient dynamic.Interface
-	Scheme     *runtime.Scheme
 }
 
 func (r *Reconciler) Reconcile(ctx context.Context, req ctrl.Request) (ctrl.Result, error) {

diff --git a/pkg/controllers/redisreplication/redisreplication_controller_suite_test.go b/pkg/controllers/redisreplication/redisreplication_controller_suite_test.go
@@ -104,7 +104,6 @@ var _ = BeforeSuite(func() {
 		Client:      k8sManager.GetClient(),
 		K8sClient:   k8sClient,
 		Dk8sClient:  dk8sClient,
-		Scheme:      k8sManager.GetScheme(),
 		Pod:         k8sutils.NewPodService(k8sClient),
 		StatefulSet: k8sutils.NewStatefulSetService(k8sClient),
 	}).SetupWithManager(k8sManager)

diff --git a/pkg/controllers/redissentinel/redissentinel_controller.go b/pkg/controllers/redissentinel/redissentinel_controller.go
@@ -7,7 +7,6 @@ import (
 	redisv1beta2 "github.com/OT-CONTAINER-KIT/redis-operator/api/v1beta2"
 	intctrlutil "github.com/OT-CONTAINER-KIT/redis-operator/pkg/controllerutil"
 	"github.com/OT-CONTAINER-KIT/redis-operator/pkg/k8sutils"
-	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/apimachinery/pkg/types"
 	"k8s.io/client-go/dynamic"
 	"k8s.io/client-go/kubernetes"
@@ -21,7 +20,6 @@ type RedisSentinelReconciler struct {
 	client.Client
 	K8sClient          kubernetes.Interface
 	Dk8sClient         dynamic.Interface
-	Scheme             *runtime.Scheme
 	ReplicationWatcher *intctrlutil.ResourceWatcher
 }
 

diff --git a/pkg/controllers/redissentinel/redissentinel_controller_suite_test.go b/pkg/controllers/redissentinel/redissentinel_controller_suite_test.go
@@ -104,7 +104,6 @@ var _ = BeforeSuite(func() {
 		Client:             k8sManager.GetClient(),
 		K8sClient:          k8sClient,
 		Dk8sClient:         dk8sClient,
-		Scheme:             k8sManager.GetScheme(),
 		ReplicationWatcher: intctrlutil.NewResourceWatcher(),
 	}).SetupWithManager(k8sManager)
 	Expect(err).ToNot(HaveOccurred())