@@ -39,7 +39,6 @@ import (
3939 "sigs.k8s.io/controller-runtime/pkg/metrics/filters"
4040 metricsserver "sigs.k8s.io/controller-runtime/pkg/metrics/server"
4141 "sigs.k8s.io/controller-runtime/pkg/webhook"
42- "sigs.k8s.io/controller-runtime/pkg/webhook/admission"
4342
4443 vectorizedv1alpha1 "github.com/redpanda-data/redpanda-operator/operator/api/vectorized/v1alpha1"
4544 "github.com/redpanda-data/redpanda-operator/operator/cmd/version"
@@ -53,10 +52,8 @@ import (
5352 "github.com/redpanda-data/redpanda-operator/operator/internal/lifecycle"
5453 adminutils "github.com/redpanda-data/redpanda-operator/operator/pkg/admin"
5554 internalclient "github.com/redpanda-data/redpanda-operator/operator/pkg/client"
56- consolepkg "github.com/redpanda-data/redpanda-operator/operator/pkg/console"
5755 pkglabels "github.com/redpanda-data/redpanda-operator/operator/pkg/labels"
5856 "github.com/redpanda-data/redpanda-operator/operator/pkg/resources"
59- redpandawebhooks "github.com/redpanda-data/redpanda-operator/operator/webhooks/redpanda"
6057 "github.com/redpanda-data/redpanda-operator/pkg/otelutil/log"
6158 pkgsecrets "github.com/redpanda-data/redpanda-operator/pkg/secrets"
6259)
@@ -595,39 +592,13 @@ func setupVectorizedControllers(ctx context.Context, mgr ctrl.Manager, cloudExpa
595592 return err
596593 }
597594
598- if err := (& vectorizedcontrollers.ConsoleReconciler {
599- Client : mgr .GetClient (),
600- Scheme : mgr .GetScheme (),
601- Log : ctrl .Log .WithName ("controllers" ).WithName ("redpanda" ).WithName ("Console" ),
602- AdminAPIClientFactory : adminAPIClientFactory ,
603- Store : consolepkg .NewStore (mgr .GetClient (), mgr .GetScheme ()),
604- EventRecorder : mgr .GetEventRecorderFor ("Console" ),
605- KafkaAdminClientFactory : consolepkg .NewKafkaAdmin ,
606- }).WithClusterDomain (opts .clusterDomain ).SetupWithManager (mgr ); err != nil {
607- log .Error (ctx , err , "unable to create controller" , "controller" , "Console" )
608- return err
609- }
610-
611595 // Setup webhooks
612596 if opts .webhookEnabled {
613597 log .Info (ctx , "Setup webhook" )
614598 if err := (& vectorizedv1alpha1.Cluster {}).SetupWebhookWithManager (mgr ); err != nil {
615599 log .Error (ctx , err , "Unable to create webhook" , "webhook" , "RedpandaCluster" )
616600 return err
617601 }
618- hookServer := mgr .GetWebhookServer ()
619- hookServer .Register ("/mutate-redpanda-vectorized-io-v1alpha1-console" , & webhook.Admission {
620- Handler : & redpandawebhooks.ConsoleDefaulter {
621- Client : mgr .GetClient (),
622- Decoder : admission .NewDecoder (mgr .GetScheme ()),
623- },
624- })
625- hookServer .Register ("/validate-redpanda-vectorized-io-v1alpha1-console" , & webhook.Admission {
626- Handler : & redpandawebhooks.ConsoleValidator {
627- Client : mgr .GetClient (),
628- Decoder : admission .NewDecoder (mgr .GetScheme ()),
629- },
630- })
631602 }
632603
633604 if opts .enableGhostBrokerDecommissioner {
0 commit comments