remove from all target

Signed-off-by: Bogdan Stancu <[email protected]>

Author: bogdan-st

docs/configuration/config-file-reference.md

@@ -412,10 +412,6 @@ query_scheduler:
     [connect_timeout: <duration> | default = 5s]
 
 overrides:
-  # Enable the overrides API module
-  # CLI flag: -overrides.enabled
-  [enabled: <boolean> | default = false]
-
   # Path to the runtime configuration file that can be updated via the overrides
   # API
   # CLI flag: -overrides.runtime-config-file

integration/overrides_test.go

@@ -56,8 +56,8 @@ func TestOverridesAPIWithRunningCortex(t *testing.T) {
 	flags := mergeFlags(
 		baseFlags,
 		map[string]string{
-			"-target":                         "overrides",
-			"-overrides.enabled":              "true",
+			"-target": "overrides",
+
 			"-overrides.runtime-config-file":  "runtime.yaml",
 			"-overrides.backend":              "s3",
 			"-overrides.s3.access-key-id":     e2edb.MinioAccessKey,
@@ -224,8 +224,8 @@ func TestOverridesAPITenantExtraction(t *testing.T) {
 	flags := mergeFlags(
 		baseFlags,
 		map[string]string{
-			"-target":                         "overrides",
-			"-overrides.enabled":              "true",
+			"-target": "overrides",
+
 			"-overrides.runtime-config-file":  "runtime.yaml",
 			"-overrides.backend":              "s3",
 			"-overrides.s3.access-key-id":     e2edb.MinioAccessKey,
@@ -278,7 +278,6 @@ func TestOverridesAPIFilesystemBackendRejected(t *testing.T) {
 			baseFlags,
 			map[string]string{
 				"-target":                        "overrides",
-				"-overrides.enabled":             "true",
 				"-overrides.runtime-config-file": "runtime.yaml",
 				"-overrides.backend":             "filesystem",
 				"-ring.store":                    "consul",
@@ -303,7 +302,6 @@ func TestOverridesAPIFilesystemBackendRejected(t *testing.T) {
 			baseFlags,
 			map[string]string{
 				"-target":                        "overrides",
-				"-overrides.enabled":             "true",
 				"-overrides.runtime-config-file": "runtime.yaml",
 				"-ring.store":                    "consul",
 				"-consul.hostname":               "localhost:8500",

pkg/cortex/modules.go

@@ -210,9 +210,6 @@ func (t *Cortex) initOverridesConfig() (services.Service, error) {
 }
 
 func (t *Cortex) initOverrides() (services.Service, error) {
-	if !t.Cfg.Overrides.Enabled {
-		return nil, nil
-	}
 
 	overridesAPI, err := overrides.New(t.Cfg.Overrides, util_log.Logger, prometheus.DefaultRegisterer)
 	if err != nil {
@@ -932,7 +929,7 @@ func (t *Cortex) setupModuleManager() error {
 		TenantDeletion:           {API, OverridesConfig},
 		Purger:                   {TenantDeletion},
 		TenantFederation:         {Queryable},
-		All:                      {QueryFrontend, Querier, Ingester, Distributor, Purger, StoreGateway, Ruler, Compactor, AlertManager, Overrides},
+		All:                      {QueryFrontend, Querier, Ingester, Distributor, Purger, StoreGateway, Ruler, Compactor, AlertManager},
 	}
 	if t.Cfg.ExternalPusher != nil && t.Cfg.ExternalQueryable != nil {
 		deps[Ruler] = []string{OverridesConfig, RulerStorage}

pkg/overrides/overrides.go

@@ -28,8 +28,6 @@ const (
 // Config holds configuration for the overrides module
 type Config struct {
 	// Enable the overrides API module
-	// CLI flag: -overrides.enabled
-	Enabled bool `yaml:"enabled"`
 
 	// Path to the runtime configuration file that can be updated via the overrides API
 	// CLI flag: -overrides.runtime-config-file
@@ -42,17 +40,14 @@ type Config struct {
 
 // RegisterFlags registers the overrides module flags
 func (c *Config) RegisterFlags(f *flag.FlagSet) {
-	f.BoolVar(&c.Enabled, "overrides.enabled", false, "Enable the overrides API module")
+
 	f.StringVar(&c.RuntimeConfigFile, "overrides.runtime-config-file", "runtime.yaml", "Path to the runtime configuration file that can be updated via the overrides API")
 
 	c.RegisterFlagsWithPrefix("overrides.", f)
 }
 
 // Validate validates the configuration and returns an error if validation fails
 func (c *Config) Validate() error {
-	if !c.Enabled {
-		return nil
-	}
 
 	if c.RuntimeConfigFile == "" {
 		c.RuntimeConfigFile = "runtime.yaml"

pkg/overrides/overrides_test.go

@@ -32,13 +32,12 @@ func TestConfig_Validate(t *testing.T) {
 		},
 		"disabled config should pass": {
 			initConfig: func(cfg *Config) {
-				cfg.Enabled = false
+
 			},
 			expected: nil,
 		},
 		"enabled config should pass": {
 			initConfig: func(cfg *Config) {
-				cfg.Enabled = true
 				cfg.Config = bucket.Config{
 					Backend: bucket.S3,
 					S3: s3.Config{
@@ -87,7 +86,6 @@ func TestNew(t *testing.T) {
 	}{
 		"valid config should create API": {
 			cfg: Config{
-				Enabled: true,
 				Config: bucket.Config{
 					Backend: bucket.S3,
 					S3: s3.Config{
@@ -123,7 +121,6 @@ func TestNew(t *testing.T) {
 func TestOverridesModuleServiceInterface(t *testing.T) {
 	// Create the API instance with proper configuration
 	cfg := Config{
-		Enabled: true,
 		Config: bucket.Config{
 			Backend: bucket.S3,
 			S3: s3.Config{
@@ -298,8 +295,6 @@ hard_overrides:
 
 			// Create the API instance with proper configuration
 			cfg := Config{
-				Enabled: true,
-
 				Config: bucket.Config{
 					Backend: bucket.S3,
 					S3: s3.Config{
@@ -408,8 +403,6 @@ func TestAPITenantExtraction(t *testing.T) {
 
 			// Create the API instance with proper configuration
 			cfg := Config{
-				Enabled: true,
-
 				Config: bucket.Config{
 					Backend: bucket.S3,
 					S3: s3.Config{
@@ -501,8 +494,6 @@ func TestAPIBucketErrors(t *testing.T) {
 
 			// Create the API instance with proper configuration
 			cfg := Config{
-				Enabled: true,
-
 				Config: bucket.Config{
 					Backend: bucket.S3,
 					S3: s3.Config{