Revert "Migrate to dskit/ring (cortexproject#4539)"

This reverts commit f2656f8.

Signed-off-by: Arve Knudsen <[email protected]>

Author: aknuds1

pkg/alertmanager/distributor_test.go

@@ -27,7 +27,6 @@ import (
 
 	"github.com/cortexproject/cortex/pkg/alertmanager/alertmanagerpb"
 	"github.com/cortexproject/cortex/pkg/ring"
-	"github.com/cortexproject/cortex/pkg/util/flagext"
 	util_log "github.com/cortexproject/cortex/pkg/util/log"
 	"github.com/cortexproject/cortex/pkg/util/test"
 )

pkg/ring/bench/ring_memberlist_test.go

@@ -14,6 +14,7 @@ import (
 	"github.com/prometheus/client_golang/prometheus"
 	"github.com/stretchr/testify/require"
 
+	"github.com/cortexproject/cortex/pkg/util/flagext"
 	"github.com/cortexproject/cortex/pkg/ring"
 )
 

pkg/ring/lifecycler.go

@@ -18,6 +18,8 @@ import (
 	perrors "github.com/pkg/errors"
 	"github.com/prometheus/client_golang/prometheus"
 	"go.uber.org/atomic"
+
+	"github.com/cortexproject/cortex/pkg/util/flagext"
 )
 
 // LifecyclerConfig is the config to build a Lifecycler.

pkg/ring/ring.go

@@ -13,7 +13,6 @@ import (
 
 	"github.com/go-kit/log"
 	"github.com/go-kit/log/level"
-	"github.com/grafana/dskit/flagext"
 	"github.com/grafana/dskit/kv"
 	"github.com/grafana/dskit/services"
 	"github.com/pkg/errors"
@@ -22,6 +21,7 @@ import (
 
 	shardUtil "github.com/cortexproject/cortex/pkg/ring/shard"
 	"github.com/cortexproject/cortex/pkg/ring/util"
+	"github.com/cortexproject/cortex/pkg/util/flagext"
 	utilmath "github.com/cortexproject/cortex/pkg/util/math"
 )
 

pkg/ring/ring_test.go

@@ -25,6 +25,7 @@ import (
 
 	"github.com/cortexproject/cortex/pkg/ring/shard"
 	"github.com/cortexproject/cortex/pkg/ring/util"
+	"github.com/cortexproject/cortex/pkg/util/flagext"
 )
 
 const (