Remove temporary ruler ring key fix (#5189)

Ring keys have been moved out of dskit into their respective projects.

Edit commit drone hack

pkg/loki/config_wrapper.go

@@ -218,11 +218,6 @@ func applyConfigToRings(r, defaults *ConfigWrapper, rc util.RingConfig, mergeWit
 		r.Ruler.Ring.InstanceID = rc.InstanceID
 		r.Ruler.Ring.InstanceInterfaceNames = rc.InstanceInterfaceNames
 		r.Ruler.Ring.KVStore = rc.KVStore
-
-		// TODO(tjw): temporary fix until dskit is updated: https://github.com/grafana/dskit/pull/101
-		// The ruler's default ring key is "ring", so if if registers under the same common prefix
-		// as the ingester, queriers will try to query it, resulting in failed queries.
-		r.Ruler.Ring.KVStore.Prefix = "/rulers"
 	}
 
 	// Query Scheduler

pkg/ruler/base/ruler.go

@@ -50,7 +50,7 @@ var (
 
 const (
 	// ringKey is the key under which we store the rulers ring in the KVStore.
-	ringKey = "ring"
+	ringKey = "rulers"
 
 	// Number of concurrent group list and group loads operations.
 	loadRulesConcurrency  = 10