Provisioning: ignore the grafanaAPIServerWithExperimentalAPIs flag (#103761)

pull/103669/head
Ryan McKinley 3 months ago committed by GitHub
parent 8167edc6e5
commit 236212aabb
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
  1. 5
      pkg/registry/apis/provisioning/register.go

@ -167,9 +167,8 @@ func RegisterAPIService(
// FIXME: use multi-tenant service when one exists. In this state, we can't make this a multi-tenant service!
secretsSvc grafanasecrets.Service,
) (*APIBuilder, error) {
if !features.IsEnabledGlobally(featuremgmt.FlagProvisioning) &&
!features.IsEnabledGlobally(featuremgmt.FlagGrafanaAPIServerWithExperimentalAPIs) {
return nil, nil // skip registration unless opting into experimental apis OR the feature specifically
if !features.IsEnabledGlobally(featuremgmt.FlagProvisioning) {
return nil, nil
}
folderResolver := &repository.LocalFolderResolver{

Loading…
Cancel
Save