FS: Remove multiTenantFrontend flag (#110776)
* FS: Move multiTenantFrontend evaluation to OpenFeature * comment * actually, just remove the toggle * fix k8s prefs test using toggle * replace frontend flag usage * codeowners * move isFrontendService just into core * put back comment
This commit is contained in:
+2
-4
@@ -84,10 +84,8 @@ func (hs *HTTPServer) registerRoutes() {
|
||||
r.Get("/login", hs.LoginView)
|
||||
r.Get("/invite/:code", hs.Index)
|
||||
|
||||
if hs.Features.IsEnabledGlobally(featuremgmt.FlagMultiTenantFrontend) {
|
||||
// Temporarily expose the full bootdata via API
|
||||
r.Get("/bootdata", reqNoAuth, hs.GetBootdata)
|
||||
}
|
||||
// Temporary MT-frontend config endpoint
|
||||
r.Get("/bootdata", reqNoAuth, hs.GetBootdata)
|
||||
|
||||
// authed views
|
||||
r.Get("/", reqSignedIn, hs.Index)
|
||||
|
||||
@@ -32,9 +32,12 @@ import (
|
||||
// NOTE: this should not be added to the public API docs, and is useful for a transition
|
||||
// towards a fully static index.html -- this will likely be replaced with multiple calls
|
||||
func (hs *HTTPServer) GetBootdata(c *contextmodel.ReqContext) {
|
||||
c, span := hs.injectSpan(c, "api.GetBootdata")
|
||||
defer span.End()
|
||||
|
||||
data, err := hs.setIndexViewData(c)
|
||||
if err != nil {
|
||||
c.Handle(hs.Cfg, http.StatusInternalServerError, "Failed to get settings", err)
|
||||
c.JsonApiErr(http.StatusInternalServerError, "Failed to get settings", err)
|
||||
return
|
||||
}
|
||||
c.JSON(http.StatusOK, data)
|
||||
|
||||
@@ -1664,13 +1664,6 @@ var (
|
||||
FrontendOnly: false,
|
||||
Owner: grafanaPluginsPlatformSquad,
|
||||
},
|
||||
{
|
||||
Name: "multiTenantFrontend",
|
||||
Description: "Register MT frontend",
|
||||
Stage: FeatureStageExperimental,
|
||||
FrontendOnly: false,
|
||||
Owner: grafanaFrontendPlatformSquad,
|
||||
},
|
||||
{
|
||||
Name: "alertingListViewV2PreviewToggle",
|
||||
Description: "Enables the alerting list view v2 preview toggle",
|
||||
|
||||
@@ -216,7 +216,6 @@ grafanaAssistantInProfilesDrilldown,GA,@grafana/observability-traces-and-profili
|
||||
postgresDSUsePGX,experimental,@grafana/oss-big-tent,false,false,false
|
||||
tempoAlerting,experimental,@grafana/observability-traces-and-profiling,false,false,true
|
||||
pluginsAutoUpdate,experimental,@grafana/plugins-platform-backend,false,false,false
|
||||
multiTenantFrontend,experimental,@grafana/grafana-frontend-platform,false,false,false
|
||||
alertingListViewV2PreviewToggle,privatePreview,@grafana/alerting-squad,false,false,true
|
||||
alertRuleUseFiredAtForStartsAt,experimental,@grafana/alerting-squad,false,false,false
|
||||
alertingBulkActionsInUI,GA,@grafana/alerting-squad,false,false,true
|
||||
|
||||
|
@@ -875,10 +875,6 @@ const (
|
||||
// Enables auto-updating of users installed plugins
|
||||
FlagPluginsAutoUpdate = "pluginsAutoUpdate"
|
||||
|
||||
// FlagMultiTenantFrontend
|
||||
// Register MT frontend
|
||||
FlagMultiTenantFrontend = "multiTenantFrontend"
|
||||
|
||||
// FlagAlertingListViewV2PreviewToggle
|
||||
// Enables the alerting list view v2 preview toggle
|
||||
FlagAlertingListViewV2PreviewToggle = "alertingListViewV2PreviewToggle"
|
||||
|
||||
@@ -2229,7 +2229,8 @@
|
||||
"metadata": {
|
||||
"name": "multiTenantFrontend",
|
||||
"resourceVersion": "1753448760331",
|
||||
"creationTimestamp": "2025-04-25T09:24:25Z"
|
||||
"creationTimestamp": "2025-04-25T09:24:25Z",
|
||||
"deletionTimestamp": "2025-09-08T17:06:39Z"
|
||||
},
|
||||
"spec": {
|
||||
"description": "Register MT frontend",
|
||||
|
||||
@@ -252,7 +252,7 @@
|
||||
const rawBootData = await loadBootData();
|
||||
|
||||
window.grafanaBootData = {
|
||||
_femt: true,
|
||||
_femt: true, // isFrontendService() needs this
|
||||
...rawBootData,
|
||||
}
|
||||
|
||||
|
||||
@@ -30,7 +30,6 @@ func TestIntegrationPreferences(t *testing.T) {
|
||||
DisableAnonymous: true,
|
||||
EnableFeatureToggles: []string{
|
||||
featuremgmt.FlagGrafanaAPIServerWithExperimentalAPIs,
|
||||
featuremgmt.FlagMultiTenantFrontend, // So we can compare to boot-data preferences
|
||||
},
|
||||
})
|
||||
|
||||
|
||||
Reference in New Issue
Block a user