From d4f4a83574dd03a5419fa890b916d09d03cb9acd Mon Sep 17 00:00:00 2001 From: Ryan McKinley Date: Wed, 1 Feb 2023 12:28:19 -0800 Subject: [PATCH] FeatureToggles: Add dev only feature toggle for apiserver (#62726) --- .../configure-grafana/feature-toggles/index.md | 1 + packages/grafana-data/src/types/featureToggles.gen.ts | 1 + pkg/services/featuremgmt/registry.go | 6 ++++++ pkg/services/featuremgmt/toggles_gen.go | 4 ++++ 4 files changed, 12 insertions(+) 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 5a998aaac87..ff022049075 100644 --- a/docs/sources/setup-grafana/configure-grafana/feature-toggles/index.md +++ b/docs/sources/setup-grafana/configure-grafana/feature-toggles/index.md @@ -110,6 +110,7 @@ The following toggles require explicitly setting Grafana's [app mode]({{< relref | `publicDashboardsEmailSharing` | Allows public dashboard sharing to be restricted to only allowed emails | | `k8s` | Explore native k8s integrations | | `k8sDashboards` | Save dashboards via k8s | +| `apiserver` | Add a k8s API server proxy | | `dashboardsFromStorage` | Load dashboards from the generic storage interface | | `export` | Export grafana instance (to git, etc) | | `grpcServer` | Run GRPC server | diff --git a/packages/grafana-data/src/types/featureToggles.gen.ts b/packages/grafana-data/src/types/featureToggles.gen.ts index 7cf1165bc41..b73cd62a87b 100644 --- a/packages/grafana-data/src/types/featureToggles.gen.ts +++ b/packages/grafana-data/src/types/featureToggles.gen.ts @@ -43,6 +43,7 @@ export interface FeatureToggles { storage?: boolean; k8s?: boolean; k8sDashboards?: boolean; + apiserver?: boolean; supportBundles?: boolean; dashboardsFromStorage?: boolean; export?: boolean; diff --git a/pkg/services/featuremgmt/registry.go b/pkg/services/featuremgmt/registry.go index 0ed90ac8ec0..66c59630add 100644 --- a/pkg/services/featuremgmt/registry.go +++ b/pkg/services/featuremgmt/registry.go @@ -154,6 +154,12 @@ var ( State: FeatureStateAlpha, RequiresDevMode: true, }, + { + Name: "apiserver", + Description: "Add a k8s API server proxy", + State: FeatureStateAlpha, + RequiresDevMode: true, + }, { Name: "supportBundles", Description: "Support bundles for troubleshooting", diff --git a/pkg/services/featuremgmt/toggles_gen.go b/pkg/services/featuremgmt/toggles_gen.go index e451c9b530b..8b9d51f5ca8 100644 --- a/pkg/services/featuremgmt/toggles_gen.go +++ b/pkg/services/featuremgmt/toggles_gen.go @@ -115,6 +115,10 @@ const ( // Save dashboards via k8s FlagK8sDashboards = "k8sDashboards" + // FlagApiserver + // Add a k8s API server proxy + FlagApiserver = "apiserver" + // FlagSupportBundles // Support bundles for troubleshooting FlagSupportBundles = "supportBundles"