From 8b67464758cfd32a40fd6563b0f0318184c3b6d5 Mon Sep 17 00:00:00 2001 From: Gabriel MABILLE Date: Wed, 20 Dec 2023 13:48:56 +0100 Subject: [PATCH] AuthN: Set automatic service accounts for plugins in private preview (#79558) * AuthN: Set automatic service accounts for plugins in private preview * Gen files --- .../configure-grafana/feature-toggles/index.md | 1 - pkg/services/featuremgmt/registry.go | 11 +++++------ pkg/services/featuremgmt/toggles_gen.csv | 2 +- 3 files changed, 6 insertions(+), 8 deletions(-) diff --git a/docs/sources/setup-grafana/configure-grafana/feature-toggles/index.md b/docs/sources/setup-grafana/configure-grafana/feature-toggles/index.md index 9c33e536834..d98b07b74e1 100644 --- a/docs/sources/setup-grafana/configure-grafana/feature-toggles/index.md +++ b/docs/sources/setup-grafana/configure-grafana/feature-toggles/index.md @@ -176,6 +176,5 @@ The following toggles require explicitly setting Grafana's [app mode]({{< relref | `unifiedStorage` | SQL-based k8s storage | | `externalServiceAuth` | Starts an OAuth2 authentication provider for external services | | `grafanaAPIServerEnsureKubectlAccess` | Start an additional https handler and write kubectl options | -| `externalServiceAccounts` | Automatic service account and token setup for plugins | | `panelTitleSearchInV1` | Enable searching for dashboards using panel title in search v1 | | `ssoSettingsApi` | Enables the SSO settings API | diff --git a/pkg/services/featuremgmt/registry.go b/pkg/services/featuremgmt/registry.go index 59375c34f2f..411cf6f6125 100644 --- a/pkg/services/featuremgmt/registry.go +++ b/pkg/services/featuremgmt/registry.go @@ -947,12 +947,11 @@ var ( Created: time.Date(2023, time.September, 27, 12, 0, 0, 0, time.UTC), }, { - Name: "externalServiceAccounts", - Description: "Automatic service account and token setup for plugins", - Stage: FeatureStageExperimental, - RequiresDevMode: true, - Owner: identityAccessTeam, - Created: time.Date(2023, time.September, 28, 12, 0, 0, 0, time.UTC), + Name: "externalServiceAccounts", + Description: "Automatic service account and token setup for plugins", + Stage: FeatureStagePrivatePreview, + Owner: identityAccessTeam, + Created: time.Date(2023, time.September, 28, 12, 0, 0, 0, time.UTC), }, { Name: "panelMonitoring", diff --git a/pkg/services/featuremgmt/toggles_gen.csv b/pkg/services/featuremgmt/toggles_gen.csv index b9889b917bc..b1aa9a7d736 100644 --- a/pkg/services/featuremgmt/toggles_gen.csv +++ b/pkg/services/featuremgmt/toggles_gen.csv @@ -110,7 +110,7 @@ pluginsAPIMetrics,experimental,@grafana/plugins-platform-backend,2023-09-21,fals httpSLOLevels,experimental,@grafana/hosted-grafana-team,2023-09-22,false,false,true,false idForwarding,experimental,@grafana/identity-access-team,2023-09-25,false,false,false,false cloudWatchWildCardDimensionValues,GA,@grafana/aws-datasources,2023-09-27,false,false,false,false -externalServiceAccounts,experimental,@grafana/identity-access-team,2023-09-28,true,false,false,false +externalServiceAccounts,privatePreview,@grafana/identity-access-team,2023-09-28,false,false,false,false panelMonitoring,experimental,@grafana/dataviz-squad,2023-10-08,false,false,false,true enableNativeHTTPHistogram,experimental,@grafana/hosted-grafana-team,2023-10-03,false,false,false,false formatString,privatePreview,@grafana/grafana-bi-squad,2023-10-13,false,false,false,true