Skip to content

Commit 6563934

Browse files
cmd+hack+operator+pkg: unify addons constants
In this commit we unify the usage of addon names i.e `karmada-descheduler`, `karmada-scheduler-estimator`, `karmada-search`, and `karmada-metrics-adapter` across the codebase. Signed-off-by: Mohamed Awnallah <[email protected]>
1 parent 616a95e commit 6563934

File tree

15 files changed

+46
-32
lines changed

15 files changed

+46
-32
lines changed

Diff for: cmd/descheduler/app/descheduler.go

+3-2
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@ import (
3939
"github.com/karmada-io/karmada/cmd/descheduler/app/options"
4040
"github.com/karmada-io/karmada/pkg/descheduler"
4141
karmadaclientset "github.com/karmada-io/karmada/pkg/generated/clientset/versioned"
42+
addonsinit "github.com/karmada-io/karmada/pkg/karmadactl/addons/init"
4243
"github.com/karmada-io/karmada/pkg/sharedcli"
4344
"github.com/karmada-io/karmada/pkg/sharedcli/klogflag"
4445
"github.com/karmada-io/karmada/pkg/sharedcli/profileflag"
@@ -80,7 +81,7 @@ func NewDeschedulerCommand(stopChan <-chan struct{}) *cobra.Command {
8081
opts := options.NewOptions()
8182

8283
cmd := &cobra.Command{
83-
Use: "karmada-descheduler",
84+
Use: addonsinit.DeschedulerResourceName,
8485
Long: `The karmada-descheduler evicts replicas from member clusters
8586
if they are failed to be scheduled for a period of time. It relies on
8687
karmada-scheduler-estimator to get replica status.`,
@@ -113,7 +114,7 @@ karmada-scheduler-estimator to get replica status.`,
113114
logsFlagSet := fss.FlagSet("logs")
114115
klogflag.Add(logsFlagSet)
115116

116-
cmd.AddCommand(sharedcommand.NewCmdVersion("karmada-descheduler"))
117+
cmd.AddCommand(sharedcommand.NewCmdVersion(addonsinit.DeschedulerResourceName))
117118
cmd.Flags().AddFlagSet(genericFlagSet)
118119
cmd.Flags().AddFlagSet(logsFlagSet)
119120

Diff for: cmd/descheduler/app/descheduler_test.go

+2-1
Original file line numberDiff line numberDiff line change
@@ -25,14 +25,15 @@ import (
2525
"github.com/stretchr/testify/require"
2626

2727
"github.com/karmada-io/karmada/cmd/descheduler/app/options"
28+
addonsinit "github.com/karmada-io/karmada/pkg/karmadactl/addons/init"
2829
)
2930

3031
func TestNewDeschedulerCommand(t *testing.T) {
3132
stopCh := make(chan struct{})
3233
cmd := NewDeschedulerCommand(stopCh)
3334

3435
assert.NotNil(t, cmd)
35-
assert.Equal(t, "karmada-descheduler", cmd.Use)
36+
assert.Equal(t, addonsinit.DeschedulerResourceName, cmd.Use)
3637
assert.NotEmpty(t, cmd.Long)
3738
}
3839

Diff for: cmd/descheduler/app/options/options.go

+3-2
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ import (
2424
"k8s.io/client-go/tools/leaderelection/resourcelock"
2525
componentbaseconfig "k8s.io/component-base/config"
2626

27+
addonsinit "github.com/karmada-io/karmada/pkg/karmadactl/addons/init"
2728
"github.com/karmada-io/karmada/pkg/sharedcli/profileflag"
2829
"github.com/karmada-io/karmada/pkg/util"
2930
)
@@ -90,7 +91,7 @@ func NewOptions() *Options {
9091
LeaderElect: true,
9192
ResourceLock: resourcelock.LeasesResourceLock,
9293
ResourceNamespace: util.NamespaceKarmadaSystem,
93-
ResourceName: "karmada-descheduler",
94+
ResourceName: addonsinit.DeschedulerResourceName,
9495
LeaseDuration: defaultElectionLeaseDuration,
9596
RenewDeadline: defaultElectionRenewDeadline,
9697
RetryPeriod: defaultElectionRetryPeriod,
@@ -129,7 +130,7 @@ func (o *Options) AddFlags(fs *pflag.FlagSet) {
129130
fs.StringVar(&o.SchedulerEstimatorCaFile, "scheduler-estimator-ca-file", "", "SSL Certificate Authority file used to secure scheduler estimator communication.")
130131
fs.BoolVar(&o.InsecureSkipEstimatorVerify, "insecure-skip-estimator-verify", false, "Controls whether verifies the scheduler estimator's certificate chain and host name.")
131132
fs.StringVar(&o.SchedulerEstimatorServiceNamespace, "scheduler-estimator-service-namespace", util.NamespaceKarmadaSystem, "The namespace to be used for discovering scheduler estimator services.")
132-
fs.StringVar(&o.SchedulerEstimatorServicePrefix, "scheduler-estimator-service-prefix", "karmada-scheduler-estimator", "The prefix of scheduler estimator service name")
133+
fs.StringVar(&o.SchedulerEstimatorServicePrefix, "scheduler-estimator-service-prefix", addonsinit.EstimatorResourceName, "The prefix of scheduler estimator service name")
133134
fs.DurationVar(&o.DeschedulingInterval.Duration, "descheduling-interval", defaultDeschedulingInterval, "Time interval between two consecutive descheduler executions. Setting this value instructs the descheduler to run in a continuous loop at the interval specified.")
134135
fs.DurationVar(&o.UnschedulableThreshold.Duration, "unschedulable-threshold", defaultUnschedulableThreshold, "The period of pod unschedulable condition. This value is considered as a classification standard of unschedulable replicas.")
135136
fs.StringVar(&o.MetricsBindAddress, "metrics-bind-address", ":8080", "The TCP address that the server should bind to for serving prometheus metrics(e.g. 127.0.0.1:8080, :8080). It can be set to \"0\" to disable the metrics serving. Defaults to 0.0.0.0:8080.")

Diff for: cmd/karmada-search/app/karmada-search.go

+4-3
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@ import (
4444
karmadaclientset "github.com/karmada-io/karmada/pkg/generated/clientset/versioned"
4545
informerfactory "github.com/karmada-io/karmada/pkg/generated/informers/externalversions"
4646
generatedopenapi "github.com/karmada-io/karmada/pkg/generated/openapi"
47+
addonsinit "github.com/karmada-io/karmada/pkg/karmadactl/addons/init"
4748
"github.com/karmada-io/karmada/pkg/search"
4849
"github.com/karmada-io/karmada/pkg/search/proxy"
4950
"github.com/karmada-io/karmada/pkg/search/proxy/framework/runtime"
@@ -63,7 +64,7 @@ func NewKarmadaSearchCommand(ctx context.Context, registryOptions ...Option) *co
6364
opts := options.NewOptions()
6465

6566
cmd := &cobra.Command{
66-
Use: "karmada-search",
67+
Use: addonsinit.SearchResourceName,
6768
Long: `The karmada-search starts an aggregated server. It provides
6869
capabilities such as global search and resource proxy in a multi-cloud environment.`,
6970
RunE: func(_ *cobra.Command, _ []string) error {
@@ -89,7 +90,7 @@ capabilities such as global search and resource proxy in a multi-cloud environme
8990
logsFlagSet := fss.FlagSet("logs")
9091
klogflag.Add(logsFlagSet)
9192

92-
cmd.AddCommand(sharedcommand.NewCmdVersion("karmada-search"))
93+
cmd.AddCommand(sharedcommand.NewCmdVersion(addonsinit.SearchResourceName))
9394
cmd.Flags().AddFlagSet(genericFlagSet)
9495
cmd.Flags().AddFlagSet(logsFlagSet)
9596

@@ -173,7 +174,7 @@ func config(o *options.Options, outOfTreeRegistryOptions ...Option) (*search.Con
173174
sets.NewString("attach", "exec", "proxy", "log", "portforward"))
174175
serverConfig.OpenAPIConfig = genericapiserver.DefaultOpenAPIConfig(generatedopenapi.GetOpenAPIDefinitions, openapi.NewDefinitionNamer(searchscheme.Scheme))
175176
serverConfig.OpenAPIV3Config = genericapiserver.DefaultOpenAPIV3Config(generatedopenapi.GetOpenAPIDefinitions, openapi.NewDefinitionNamer(searchscheme.Scheme))
176-
serverConfig.OpenAPIConfig.Info.Title = "karmada-search"
177+
serverConfig.OpenAPIConfig.Info.Title = addonsinit.SearchResourceName
177178
if err := o.ApplyTo(serverConfig); err != nil {
178179
return nil, err
179180
}

Diff for: cmd/metrics-adapter/app/metrics-adapter.go

100755100644
+3-2
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ import (
2525
"k8s.io/component-base/term"
2626

2727
"github.com/karmada-io/karmada/cmd/metrics-adapter/app/options"
28+
addonsinit "github.com/karmada-io/karmada/pkg/karmadactl/addons/init"
2829
"github.com/karmada-io/karmada/pkg/sharedcli"
2930
"github.com/karmada-io/karmada/pkg/sharedcli/klogflag"
3031
"github.com/karmada-io/karmada/pkg/version/sharedcommand"
@@ -35,7 +36,7 @@ func NewMetricsAdapterCommand(ctx context.Context) *cobra.Command {
3536
opts := options.NewOptions()
3637

3738
cmd := &cobra.Command{
38-
Use: "karmada-metrics-adapter",
39+
Use: addonsinit.MetricsAdapterResourceName,
3940
Long: `The karmada-metrics-adapter is a adapter to aggregate the metrics from member clusters.`,
4041
RunE: func(_ *cobra.Command, _ []string) error {
4142
if err := opts.Complete(); err != nil {
@@ -68,7 +69,7 @@ func NewMetricsAdapterCommand(ctx context.Context) *cobra.Command {
6869
logsFlagSet := fss.FlagSet("logs")
6970
klogflag.Add(logsFlagSet)
7071

71-
cmd.AddCommand(sharedcommand.NewCmdVersion("karmada-metrics-adapter"))
72+
cmd.AddCommand(sharedcommand.NewCmdVersion(addonsinit.MetricsAdapterResourceName))
7273
cmd.Flags().AddFlagSet(genericFlagSet)
7374
cmd.Flags().AddFlagSet(logsFlagSet)
7475

Diff for: cmd/metrics-adapter/app/options/options.go

+2-1
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ import (
3232
karmadaclientset "github.com/karmada-io/karmada/pkg/generated/clientset/versioned"
3333
informerfactory "github.com/karmada-io/karmada/pkg/generated/informers/externalversions"
3434
generatedopenapi "github.com/karmada-io/karmada/pkg/generated/openapi"
35+
addonsinit "github.com/karmada-io/karmada/pkg/karmadactl/addons/init"
3536
"github.com/karmada-io/karmada/pkg/metricsadapter"
3637
"github.com/karmada-io/karmada/pkg/sharedcli/profileflag"
3738
"github.com/karmada-io/karmada/pkg/util"
@@ -96,7 +97,7 @@ func (o *Options) Config(stopCh <-chan struct{}) (*metricsadapter.MetricsServer,
9697
metricsAdapter := metricsadapter.NewMetricsAdapter(metricsController, o.CustomMetricsAdapterServerOptions)
9798
metricsAdapter.OpenAPIConfig = genericapiserver.DefaultOpenAPIConfig(generatedopenapi.GetOpenAPIDefinitions, openapinamer.NewDefinitionNamer(api.Scheme))
9899
metricsAdapter.OpenAPIV3Config = genericapiserver.DefaultOpenAPIV3Config(generatedopenapi.GetOpenAPIDefinitions, openapinamer.NewDefinitionNamer(api.Scheme))
99-
metricsAdapter.OpenAPIConfig.Info.Title = "karmada-metrics-adapter"
100+
metricsAdapter.OpenAPIConfig.Info.Title = addonsinit.MetricsAdapterResourceName
100101
metricsAdapter.OpenAPIConfig.Info.Version = "1.0.0"
101102

102103
// Explicitly specify the remote kubeconfig file here to solve the issue that metrics adapter requires to build

Diff for: cmd/scheduler-estimator/app/scheduler-estimator.go

+3-2
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@ import (
3636

3737
"github.com/karmada-io/karmada/cmd/scheduler-estimator/app/options"
3838
"github.com/karmada-io/karmada/pkg/estimator/server"
39+
addonsinit "github.com/karmada-io/karmada/pkg/karmadactl/addons/init"
3940
"github.com/karmada-io/karmada/pkg/sharedcli"
4041
"github.com/karmada-io/karmada/pkg/sharedcli/klogflag"
4142
"github.com/karmada-io/karmada/pkg/sharedcli/profileflag"
@@ -77,7 +78,7 @@ func NewSchedulerEstimatorCommand(ctx context.Context) *cobra.Command {
7778
opts := options.NewOptions()
7879

7980
cmd := &cobra.Command{
80-
Use: "karmada-scheduler-estimator",
81+
Use: addonsinit.EstimatorResourceName,
8182
Long: `The karmada-scheduler-estimator runs an accurate scheduler estimator of a cluster. It
8283
provides the scheduler with more accurate cluster resource information.`,
8384
RunE: func(_ *cobra.Command, _ []string) error {
@@ -101,7 +102,7 @@ provides the scheduler with more accurate cluster resource information.`,
101102
logsFlagSet := fss.FlagSet("logs")
102103
klogflag.Add(logsFlagSet)
103104

104-
cmd.AddCommand(sharedcommand.NewCmdVersion("karmada-scheduler-estimator"))
105+
cmd.AddCommand(sharedcommand.NewCmdVersion(addonsinit.EstimatorResourceName))
105106
cmd.Flags().AddFlagSet(genericFlagSet)
106107
cmd.Flags().AddFlagSet(logsFlagSet)
107108

Diff for: cmd/scheduler/app/options/options.go

+2-1
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ import (
2727
componentbaseconfig "k8s.io/component-base/config"
2828

2929
"github.com/karmada-io/karmada/pkg/features"
30+
addonsinit "github.com/karmada-io/karmada/pkg/karmadactl/addons/init"
3031
"github.com/karmada-io/karmada/pkg/scheduler"
3132
frameworkplugins "github.com/karmada-io/karmada/pkg/scheduler/framework/plugins"
3233
"github.com/karmada-io/karmada/pkg/sharedcli/profileflag"
@@ -153,7 +154,7 @@ func (o *Options) AddFlags(fs *pflag.FlagSet) {
153154
fs.BoolVar(&o.DisableSchedulerEstimatorInPullMode, "disable-scheduler-estimator-in-pull-mode", false, "Disable the scheduler estimator for clusters in pull mode, which takes effect only when enable-scheduler-estimator is true.")
154155
fs.DurationVar(&o.SchedulerEstimatorTimeout.Duration, "scheduler-estimator-timeout", 3*time.Second, "Specifies the timeout period of calling the scheduler estimator service.")
155156
fs.StringVar(&o.SchedulerEstimatorServiceNamespace, "scheduler-estimator-service-namespace", util.NamespaceKarmadaSystem, "The namespace to be used for discovering scheduler estimator services.")
156-
fs.StringVar(&o.SchedulerEstimatorServicePrefix, "scheduler-estimator-service-prefix", "karmada-scheduler-estimator", "The prefix of scheduler estimator service name")
157+
fs.StringVar(&o.SchedulerEstimatorServicePrefix, "scheduler-estimator-service-prefix", addonsinit.EstimatorResourceName, "The prefix of scheduler estimator service name")
157158
fs.IntVar(&o.SchedulerEstimatorPort, "scheduler-estimator-port", defaultEstimatorPort, "The secure port on which to connect the accurate scheduler estimator.")
158159
fs.StringVar(&o.SchedulerEstimatorCertFile, "scheduler-estimator-cert-file", "", "SSL certification file used to secure scheduler estimator communication.")
159160
fs.StringVar(&o.SchedulerEstimatorKeyFile, "scheduler-estimator-key-file", "", "SSL key file used to secure scheduler estimator communication.")

Diff for: hack/tools/gencomponentdocs/gen_component_docs.go

+5-4
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ import (
3333
estiapp "github.com/karmada-io/karmada/cmd/scheduler-estimator/app"
3434
schapp "github.com/karmada-io/karmada/cmd/scheduler/app"
3535
webhookapp "github.com/karmada-io/karmada/cmd/webhook/app"
36+
addonsinit "github.com/karmada-io/karmada/pkg/karmadactl/addons/init"
3637
"github.com/karmada-io/karmada/pkg/util/lifted"
3738
)
3839

@@ -69,19 +70,19 @@ func main() {
6970
case "karmada-aggregated-apiserver":
7071
// generate docs for karmada-aggregated-apiserver
7172
cmd = aaapp.NewAggregatedApiserverCommand(context.TODO())
72-
case "karmada-descheduler":
73+
case addonsinit.DeschedulerResourceName:
7374
// generate docs for karmada-descheduler
7475
cmd = deschapp.NewDeschedulerCommand(nil)
75-
case "karmada-search":
76+
case addonsinit.SearchResourceName:
7677
// generate docs for karmada-search
7778
cmd = searchapp.NewKarmadaSearchCommand(context.TODO())
78-
case "karmada-scheduler-estimator":
79+
case addonsinit.EstimatorResourceName:
7980
// generate docs for karmada-scheduler-estimator
8081
cmd = estiapp.NewSchedulerEstimatorCommand(context.TODO())
8182
case "karmada-webhook":
8283
// generate docs for karmada-webhook
8384
cmd = webhookapp.NewWebhookCommand(context.TODO())
84-
case "karmada-metrics-adapter":
85+
case addonsinit.MetricsAdapterResourceName:
8586
// generate docs for karmada-metrics-adapter
8687
cmd = adapterapp.NewMetricsAdapterCommand(context.TODO())
8788
default:

Diff for: operator/pkg/constants/constants.go

+5-3
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,8 @@ import (
2121

2222
"k8s.io/apimachinery/pkg/labels"
2323
"k8s.io/apimachinery/pkg/runtime/schema"
24+
25+
addonsinit "github.com/karmada-io/karmada/pkg/karmadactl/addons/init"
2426
)
2527

2628
const (
@@ -56,11 +58,11 @@ const (
5658
// KarmadaWebhook defines the name of the karmada-webhook component
5759
KarmadaWebhook = "karmada-webhook"
5860
// KarmadaSearch defines the name of the karmada-search component
59-
KarmadaSearch = "karmada-search"
61+
KarmadaSearch = addonsinit.SearchResourceName
6062
// KarmadaDescheduler defines the name of the karmada-descheduler component
61-
KarmadaDescheduler = "karmada-descheduler"
63+
KarmadaDescheduler = addonsinit.DeschedulerResourceName
6264
// KarmadaMetricsAdapter defines the name of the karmada-metrics-adapter component
63-
KarmadaMetricsAdapter = "karmada-metrics-adapter"
65+
KarmadaMetricsAdapter = addonsinit.MetricsAdapterResourceName
6466

6567
// KarmadaSystemNamespace defines the leader selection namespace for karmada components
6668
KarmadaSystemNamespace = "karmada-system"

Diff for: pkg/descheduler/descheduler.go

+2-1
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@ import (
4242
informerfactory "github.com/karmada-io/karmada/pkg/generated/informers/externalversions"
4343
clusterlister "github.com/karmada-io/karmada/pkg/generated/listers/cluster/v1alpha1"
4444
worklister "github.com/karmada-io/karmada/pkg/generated/listers/work/v1alpha2"
45+
addonsinit "github.com/karmada-io/karmada/pkg/karmadactl/addons/init"
4546
"github.com/karmada-io/karmada/pkg/util"
4647
"github.com/karmada-io/karmada/pkg/util/fedinformer"
4748
"github.com/karmada-io/karmada/pkg/util/gclient"
@@ -131,7 +132,7 @@ func NewDescheduler(karmadaClient karmadaclientset.Interface, kubeClient kuberne
131132
eventBroadcaster := record.NewBroadcaster()
132133
eventBroadcaster.StartStructuredLogging(0)
133134
eventBroadcaster.StartRecordingToSink(&v1core.EventSinkImpl{Interface: kubeClient.CoreV1().Events(metav1.NamespaceAll)})
134-
desched.eventRecorder = eventBroadcaster.NewRecorder(gclient.NewSchema(), corev1.EventSource{Component: "karmada-descheduler"})
135+
desched.eventRecorder = eventBroadcaster.NewRecorder(gclient.NewSchema(), corev1.EventSource{Component: addonsinit.DeschedulerResourceName})
135136

136137
return desched
137138
}

Diff for: pkg/karmadactl/addons/install/install.go

+4-4
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@ import (
2626

2727
// Install install the karmada addons process in Addons
2828
func Install() {
29-
addonsinit.Addons["karmada-descheduler"] = descheduler.AddonDescheduler
30-
addonsinit.Addons["karmada-metrics-adapter"] = metricsadapter.AddonMetricsAdapter
31-
addonsinit.Addons["karmada-scheduler-estimator"] = estimator.AddonEstimator
32-
addonsinit.Addons["karmada-search"] = search.AddonSearch
29+
addonsinit.Addons[addonsinit.DeschedulerResourceName] = descheduler.AddonDescheduler
30+
addonsinit.Addons[addonsinit.MetricsAdapterResourceName] = metricsadapter.AddonMetricsAdapter
31+
addonsinit.Addons[addonsinit.EstimatorResourceName] = estimator.AddonEstimator
32+
addonsinit.Addons[addonsinit.SearchResourceName] = search.AddonSearch
3333
}

Diff for: pkg/karmadactl/addons/install/install_test.go

+4-4
Original file line numberDiff line numberDiff line change
@@ -38,22 +38,22 @@ func TestInstall(t *testing.T) {
3838
}{
3939
{
4040
name: "Install_WithKarmadaDeschedulerAddon_Installed",
41-
key: "karmada-descheduler",
41+
key: addonsinit.DeschedulerResourceName,
4242
expectedAddon: descheduler.AddonDescheduler,
4343
},
4444
{
4545
name: "Install_WithKarmadaMetricsAdapterAddon_Installed",
46-
key: "karmada-metrics-adapter",
46+
key: addonsinit.MetricsAdapterResourceName,
4747
expectedAddon: metricsadapter.AddonMetricsAdapter,
4848
},
4949
{
5050
name: "Install_WithKarmadaSchedulerEstimatorAddon_Installed",
51-
key: "karmada-scheduler-estimator",
51+
key: addonsinit.EstimatorResourceName,
5252
expectedAddon: estimator.AddonEstimator,
5353
},
5454
{
5555
name: "Install_WithKarmadaSearchAddon_Installed",
56-
key: "karmada-search",
56+
key: addonsinit.SearchResourceName,
5757
expectedAddon: search.AddonSearch,
5858
},
5959
}

Diff for: pkg/search/apiserver.go

+2-1
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ import (
2727
searchapis "github.com/karmada-io/karmada/pkg/apis/search"
2828
searchscheme "github.com/karmada-io/karmada/pkg/apis/search/scheme"
2929
informerfactory "github.com/karmada-io/karmada/pkg/generated/informers/externalversions"
30+
addonsinit "github.com/karmada-io/karmada/pkg/karmadactl/addons/init"
3031
searchstorage "github.com/karmada-io/karmada/pkg/registry/search/storage"
3132
"github.com/karmada-io/karmada/pkg/search/proxy"
3233
)
@@ -79,7 +80,7 @@ var apiGroupInstaller = func(server *APIServer, apiGroupInfo *genericapiserver.A
7980
}
8081

8182
func (c completedConfig) New() (*APIServer, error) {
82-
genericServer, err := c.GenericConfig.New("karmada-search", genericapiserver.NewEmptyDelegate())
83+
genericServer, err := c.GenericConfig.New(addonsinit.SearchResourceName, genericapiserver.NewEmptyDelegate())
8384
if err != nil {
8485
return nil, err
8586
}

Diff for: pkg/search/proxy/controller.go

+2-1
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@ import (
4545
informerfactory "github.com/karmada-io/karmada/pkg/generated/informers/externalversions"
4646
clusterlisters "github.com/karmada-io/karmada/pkg/generated/listers/cluster/v1alpha1"
4747
searchlisters "github.com/karmada-io/karmada/pkg/generated/listers/search/v1alpha1"
48+
addonsinit "github.com/karmada-io/karmada/pkg/karmadactl/addons/init"
4849
"github.com/karmada-io/karmada/pkg/search/proxy/framework"
4950
"github.com/karmada-io/karmada/pkg/search/proxy/framework/plugins"
5051
pluginruntime "github.com/karmada-io/karmada/pkg/search/proxy/framework/runtime"
@@ -299,7 +300,7 @@ func (ctl *Controller) Connect(ctx context.Context, proxyPath string, responder
299300
}
300301

301302
h = metrics.InstrumentHandlerFunc(requestInfo.Verb, requestInfo.APIGroup, requestInfo.APIVersion, requestInfo.Resource, requestInfo.Subresource,
302-
"", "karmada-search", false, "", h.ServeHTTP)
303+
"", addonsinit.SearchResourceName, false, "", h.ServeHTTP)
303304
h.ServeHTTP(rw, newReq)
304305
}), nil
305306
}

0 commit comments

Comments
 (0)