K8s: Remove grafanaAPIServer feature toggle (#81030)

pkg/services/featuremgmt/registry.go

@@ -714,15 +714,6 @@ var (
 			Owner:        grafanaObservabilityTracesAndProfilingSquad,
 			Created:      time.Date(2023, time.August, 28, 12, 0, 0, 0, time.UTC),
 		},
-		{
-			Name:            "grafanaAPIServer",
-			Description:     "Enable Kubernetes API Server for Grafana resources",
-			Stage:           FeatureStageGeneralAvailability,
-			Expression:      "true", // enabled by default
-			RequiresRestart: true,
-			Owner:           grafanaAppPlatformSquad,
-			Created:         time.Date(2023, time.July, 14, 12, 0, 0, 0, time.UTC),
-		},
 		{
 			Name:            "grafanaAPIServerWithExperimentalAPIs",
 			Description:     "Register experimental APIs with the k8s API server",

pkg/services/featuremgmt/toggles_gen.csv

@@ -83,7 +83,6 @@ transformationsRedesign,GA,@grafana/observability-metrics,2023-07-12,false,false
 mlExpressions,experimental,@grafana/alerting-squad,2023-07-13,false,false,false,false
 traceQLStreaming,experimental,@grafana/observability-traces-and-profiling,2023-07-26,false,false,false,true
 metricsSummary,experimental,@grafana/observability-traces-and-profiling,2023-08-28,false,false,false,true
-grafanaAPIServer,GA,@grafana/grafana-app-platform-squad,2023-07-14,false,false,true,false
 grafanaAPIServerWithExperimentalAPIs,experimental,@grafana/grafana-app-platform-squad,2023-10-06,true,false,true,false
 grafanaAPIServerEnsureKubectlAccess,experimental,@grafana/grafana-app-platform-squad,2023-12-06,true,false,true,false
 featureToggleAdminPage,experimental,@grafana/grafana-operator-experience-squad,2023-07-18,false,false,true,false

pkg/services/featuremgmt/toggles_gen.go

@@ -343,10 +343,6 @@ const (
 	// Enables metrics summary queries in the Tempo data source
 	FlagMetricsSummary = "metricsSummary"
 
-	// FlagGrafanaAPIServer
-	// Enable Kubernetes API Server for Grafana resources
-	FlagGrafanaAPIServer = "grafanaAPIServer"
-
 	// FlagGrafanaAPIServerWithExperimentalAPIs
 	// Register experimental APIs with the k8s API server
 	FlagGrafanaAPIServerWithExperimentalAPIs = "grafanaAPIServerWithExperimentalAPIs"

pkg/services/grafana-apiserver/config.go

@@ -46,7 +46,7 @@ func newConfig(cfg *setting.Cfg, features featuremgmt.FeatureToggles) *config {
 	host := fmt.Sprintf("%s:%d", ip, port)
 
 	return &config{
-		enabled:     features.IsEnabledGlobally(featuremgmt.FlagGrafanaAPIServer),
+		enabled:     true,
 		devMode:     features.IsEnabledGlobally(featuremgmt.FlagGrafanaAPIServerEnsureKubectlAccess),
 		dataPath:    filepath.Join(cfg.DataPath, "grafana-apiserver"),
 		ip:          ip,

pkg/services/grafana-apiserver/config_test.go

@@ -22,7 +22,7 @@ func TestNewConfig(t *testing.T) {
 	section.Key("log_level").SetValue("5")
 	section.Key("etcd_servers").SetValue("http://localhost:2379")
 
-	actual := newConfig(cfg, featuremgmt.WithFeatures(featuremgmt.FlagGrafanaAPIServer))
+	actual := newConfig(cfg, featuremgmt.WithFeatures())
 
 	expected := &config{
 		enabled:     true,