From 2b3d2e5b40631ed4b7bc54a2ff1a4f909d50f175 Mon Sep 17 00:00:00 2001 From: maicon Date: Thu, 29 Aug 2024 12:04:36 -0300 Subject: [PATCH] UniStore: Remove leftover references to `unifiedStorage` feature toggle (#92685) it got removed on https://github.com/grafana/grafana/pull/92192 Signed-off-by: Maicon Costa --- pkg/apiserver/rest/dualwriter.go | 6 +++--- pkg/storage/unified/README.md | 2 -- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/pkg/apiserver/rest/dualwriter.go b/pkg/apiserver/rest/dualwriter.go index e4547881cec..14609439c6a 100644 --- a/pkg/apiserver/rest/dualwriter.go +++ b/pkg/apiserver/rest/dualwriter.go @@ -90,7 +90,7 @@ type DualWriterMode int const ( // Mode0 represents writing to and reading from solely LegacyStorage. This mode is enabled when the - // `unifiedStorage` feature flag is not set. All reads and writes are made to LegacyStorage. None are made to Storage. + // Unified Storage is disabled. All reads and writes are made to LegacyStorage. None are made to Storage. Mode0 DualWriterMode = iota // Mode1 represents writing to and reading from LegacyStorage for all primary functionality while additionally // reading and writing to Storage on a best effort basis for the sake of collecting metrics. @@ -116,7 +116,7 @@ func NewDualWriter( metrics.init(reg) switch mode { // It is not possible to initialize a mode 0 dual writer. Mode 0 represents - // writing to legacy storage without `unifiedStorage` enabled. + // writing to legacy storage without Unified Storage enabled. case Mode1: // read and write only from legacy storage return newDualWriterMode1(legacy, storage, metrics, resource) @@ -179,7 +179,7 @@ func SetDualWritingMode( toMode := map[string]DualWriterMode{ // It is not possible to initialize a mode 0 dual writer. Mode 0 represents - // writing to legacy storage without `unifiedStorage` enabled. + // writing to legacy storage without Unified Storage enabled. "1": Mode1, "2": Mode2, "3": Mode3, diff --git a/pkg/storage/unified/README.md b/pkg/storage/unified/README.md index c43637f1d90..a4be1d78498 100644 --- a/pkg/storage/unified/README.md +++ b/pkg/storage/unified/README.md @@ -26,8 +26,6 @@ target = all protocol = https [feature_toggles] -; enable unified storage -unifiedStorage = true ; enable k8s apiserver grafanaAPIServer = true ; store playlists in k8s