From b7066aa7dc481d773a611c137a85301840a42003 Mon Sep 17 00:00:00 2001 From: Ryan McKinley Date: Wed, 4 Dec 2024 09:10:31 +0300 Subject: [PATCH] Chore: K8s registration cleanup (#97373) cleanup --- pkg/registry/apis/peakq/register.go | 2 +- pkg/registry/apis/query/register.go | 5 +++-- pkg/registry/apis/service/register.go | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/pkg/registry/apis/peakq/register.go b/pkg/registry/apis/peakq/register.go index d77305389a8..7edcb93bd7f 100644 --- a/pkg/registry/apis/peakq/register.go +++ b/pkg/registry/apis/peakq/register.go @@ -35,7 +35,7 @@ func RegisterAPIService(features featuremgmt.FeatureToggles, apiregistration bui return nil // skip registration unless explicitly added (or all experimental are added) } builder := NewPeakQAPIBuilder() - apiregistration.RegisterAPI(NewPeakQAPIBuilder()) + apiregistration.RegisterAPI(builder) return builder } diff --git a/pkg/registry/apis/query/register.go b/pkg/registry/apis/query/register.go index 2354bede53a..fdbcb9c119b 100644 --- a/pkg/registry/apis/query/register.go +++ b/pkg/registry/apis/query/register.go @@ -98,8 +98,9 @@ func RegisterAPIService(features featuremgmt.FeatureToggles, tracer tracing.Tracer, legacy service.LegacyDataSourceLookup, ) (*QueryAPIBuilder, error) { - if !(features.IsEnabledGlobally(featuremgmt.FlagQueryService) || - features.IsEnabledGlobally(featuremgmt.FlagGrafanaAPIServerWithExperimentalAPIs)) { + if !featuremgmt.AnyEnabled(features, + featuremgmt.FlagQueryService, + featuremgmt.FlagGrafanaAPIServerWithExperimentalAPIs) { return nil, nil // skip registration unless explicitly added (or all experimental are added) } diff --git a/pkg/registry/apis/service/register.go b/pkg/registry/apis/service/register.go index 52c26bf3ce0..24827a36ace 100644 --- a/pkg/registry/apis/service/register.go +++ b/pkg/registry/apis/service/register.go @@ -31,7 +31,7 @@ func RegisterAPIService(features featuremgmt.FeatureToggles, apiregistration bui } builder := NewServiceAPIBuilder() - apiregistration.RegisterAPI(NewServiceAPIBuilder()) + apiregistration.RegisterAPI(builder) return builder }