From 52d5fbba7543922aea3a714f4e172d34b2d703fb Mon Sep 17 00:00:00 2001
From: Friedrich Gonzalez <1517449+friedrichg@users.noreply.github.com>
Date: Mon, 2 Mar 2026 16:54:25 -0800
Subject: [PATCH] Graduate instance limits from experimental

Remove experimental markers for ingester and distributor instance limits:
- Remove WarnExperimentalUse("ingester instance limits") conditional block
- Remove WarnExperimentalUse("distributor instance limits") conditional block
- Remove from experimental features list in v1-guarantees.md

Signed-off-by: Friedrich Gonzalez <1517449+friedrichg@users.noreply.github.com>
---
 docs/configuration/v1-guarantees.md | 1 -
 pkg/distributor/distributor.go      | 4 ----
 pkg/ingester/ingester.go            | 5 -----
 3 files changed, 10 deletions(-)

diff --git a/docs/configuration/v1-guarantees.md b/docs/configuration/v1-guarantees.md
index a7d9a8ded7c..6fc7f544e48 100644
--- a/docs/configuration/v1-guarantees.md
+++ b/docs/configuration/v1-guarantees.md
@@ -70,7 +70,6 @@ Currently experimental features are:
   - `-tenant-federation.user-sync-interval`
 - The thanosconvert tool for converting Thanos block metadata to Cortex
 - HA Tracker: cleanup of old replicas from KV Store.
-- Instance limits in ingester and distributor
 - Exemplar storage, currently in-memory only within the Ingester based on Prometheus exemplar storage (`-blocks-storage.tsdb.max-exemplars`)
 - Querier limits:
   - `-querier.max-fetched-chunks-per-query`
diff --git a/pkg/distributor/distributor.go b/pkg/distributor/distributor.go
index 09653d829b1..9f8b25fc1dd 100644
--- a/pkg/distributor/distributor.go
+++ b/pkg/distributor/distributor.go
@@ -480,10 +480,6 @@ func New(cfg Config, clientConfig ingester_client.Config, limits *validation.Ove
 }
 
 func (d *Distributor) starting(ctx context.Context) error {
-	if d.cfg.InstanceLimits != (InstanceLimits{}) {
-		util_log.WarnExperimentalUse("distributor instance limits")
-	}
-
 	// Only report success if all sub-services start properly
 	return services.StartManagerAndAwaitHealthy(ctx, d.subservices)
 }
diff --git a/pkg/ingester/ingester.go b/pkg/ingester/ingester.go
index d53dc35a573..66156174fd5 100644
--- a/pkg/ingester/ingester.go
+++ b/pkg/ingester/ingester.go
@@ -1029,11 +1029,6 @@ func (i *Ingester) stopping(_ error) error {
 }
 
 func (i *Ingester) updateLoop(ctx context.Context) error {
-	if limits := i.getInstanceLimits(); limits != nil && *limits != (InstanceLimits{}) {
-		// This check will not cover enabling instance limits in runtime, but it will do for now.
-		logutil.WarnExperimentalUse("ingester instance limits")
-	}
-
 	rateUpdateTicker := time.NewTicker(i.cfg.RateUpdatePeriod)
 	defer rateUpdateTicker.Stop()