Remove deprecated storage.trace.cache setting (#1239)

Signed-off-by: Andreas Gerstmayr <[email protected]>

Author: andreasgerstmayr

.chloggen/remove_deprecated_cache_settting.yaml

@@ -0,0 +1,16 @@
+# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix'
+change_type: 'bug_fix'
+
+# The name of the component, or a single word describing the area of concern, (e.g. tempostack, tempomonolithic, github action)
+component: tempostack
+
+# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
+note: Remove deprecated `storage.trace.cache` setting
+
+# One or more tracking issues related to the change
+issues: [1136]
+
+# (Optional) One or more lines of additional information to render under the primary note.
+# These lines will be padded with 2 spaces and then inserted directly into the document.
+# Use pipe (|) for multiline entries.
+subtext:

internal/manifests/config/build_test.go

@@ -79,7 +79,6 @@ storage:
   trace:
     backend: s3
     blocklist_poll: 5m
-    cache: none
     local:
       path: /var/tempo/traces
     s3:
@@ -201,7 +200,6 @@ storage:
   trace:
     backend: s3
     blocklist_poll: 5m
-    cache: none
     local:
       path: /var/tempo/traces
     s3:
@@ -289,7 +287,6 @@ storage:
   trace:
     backend: s3
     blocklist_poll: 5m
-    cache: none
     local:
       path: /var/tempo/traces
     s3:
@@ -376,7 +373,6 @@ storage:
   trace:
     backend: s3
     blocklist_poll: 5m
-    cache: none
     local:
       path: /var/tempo/traces
     s3:
@@ -464,7 +460,6 @@ storage:
   trace:
     backend: s3
     blocklist_poll: 5m
-    cache: none
     local:
       path: /var/tempo/traces
     s3:
@@ -552,7 +547,6 @@ storage:
   trace:
     backend: s3
     blocklist_poll: 5m
-    cache: none
     local:
       path: /var/tempo/traces
     s3:
@@ -640,7 +634,6 @@ storage:
   trace:
     backend: s3
     blocklist_poll: 5m
-    cache: none
     local:
       path: /var/tempo/traces
     s3:
@@ -728,7 +721,6 @@ storage:
   trace:
     backend: s3
     blocklist_poll: 5m
-    cache: none
     local:
       path: /var/tempo/traces
     s3:
@@ -828,7 +820,6 @@ storage:
   trace:
     backend: s3
     blocklist_poll: 5m
-    cache: none
     local:
       path: /var/tempo/traces
     s3:
@@ -926,7 +917,6 @@ storage:
   trace:
     backend: s3
     blocklist_poll: 5m
-    cache: none
     local:
       path: /var/tempo/traces
     s3:
@@ -1117,7 +1107,6 @@ storage:
   trace:
     backend: gcs
     blocklist_poll: 5m
-    cache: none
     local:
       path: /var/tempo/traces
     gcs:
@@ -1231,7 +1220,6 @@ storage:
   trace:
     backend: azure
     blocklist_poll: 5m
-    cache: none
     local:
       path: /var/tempo/traces
     azure:
@@ -1335,7 +1323,6 @@ storage:
   trace:
     backend: s3
     blocklist_poll: 5m
-    cache: none
     local:
       path: /var/tempo/traces
     s3:
@@ -1492,7 +1479,6 @@ storage:
   trace:
     backend: s3
     blocklist_poll: 5m
-    cache: none
     local:
       path: /var/tempo/traces
     s3:
@@ -1609,7 +1595,6 @@ storage:
   trace:
     backend: s3
     blocklist_poll: 5m
-    cache: none
     local:
       path: /var/tempo/traces
     s3:
@@ -1771,7 +1756,6 @@ storage:
   trace:
     backend: s3
     blocklist_poll: 5m
-    cache: none
     local:
       path: /var/tempo/traces
     s3:
@@ -1923,7 +1907,6 @@ storage:
   trace:
     backend: s3
     blocklist_poll: 5m
-    cache: none
     local:
       path: /var/tempo/traces
     s3:
@@ -2030,7 +2013,6 @@ storage:
   trace:
     backend: s3
     blocklist_poll: 5m
-    cache: none
     local:
       path: /var/tempo/traces
     s3:
@@ -2143,7 +2125,6 @@ storage:
   trace:
     backend: s3
     blocklist_poll: 5m
-    cache: none
     local:
       path: /var/tempo/traces
     s3:
@@ -2275,7 +2256,6 @@ storage:
   trace:
     backend: s3
     blocklist_poll: 5m
-    cache: none
     local:
       path: /var/tempo/traces
     s3:
@@ -2357,7 +2337,6 @@ storage:
   trace:
     backend: s3
     blocklist_poll: 5m
-    cache: none
     local:
       path: /var/tempo/traces
     s3:
@@ -2480,7 +2459,6 @@ storage:
   trace:
     backend: s3
     blocklist_poll: 5m
-    cache: none
     local:
       path: /var/tempo/traces
     s3:
@@ -2593,7 +2571,6 @@ storage:
   trace:
     backend: s3
     blocklist_poll: 5m
-    cache: none
     local:
       path: /var/tempo/traces
     s3:
@@ -2709,7 +2686,6 @@ storage:
   trace:
     backend: s3
     blocklist_poll: 5m
-    cache: none
     local:
       path: /var/tempo/traces
     s3:

internal/manifests/config/tempo-config.yaml

@@ -213,7 +213,6 @@ storage:
   trace:
     backend: {{ .StorageType }}
     blocklist_poll: 5m
-    cache: none
     {{- with .StorageParams.AzureStorage }}
     azure:
       container_name: {{ .Container }}

tests/e2e-openshift/route/install-tempo-assert.yaml

@@ -97,7 +97,6 @@ data:
       trace:
         backend: s3
         blocklist_poll: 5m
-        cache: none
         s3:
           endpoint: minio:9000
           bucket: tempo
@@ -212,7 +211,6 @@ data:
       trace:
         backend: s3
         blocklist_poll: 5m
-        cache: none
         s3:
           endpoint: minio:9000
           bucket: tempo

tests/e2e-openshift/tls-singletenant/01-assert.yaml

@@ -280,7 +280,6 @@ data:
       trace:
         backend: s3
         blocklist_poll: 5m
-        cache: none
         s3:
           endpoint: minio:9000
           bucket: tempo
@@ -415,7 +414,6 @@ data:
       trace:
         backend: s3
         blocklist_poll: 5m
-        cache: none
         s3:
           endpoint: minio:9000
           bucket: tempo

tests/e2e/tempostack-extraconfig/install-tempostack-assert.yaml

@@ -464,7 +464,6 @@ data:
         trace:
             backend: s3
             blocklist_poll: 5m
-            cache: none
             local:
                 path: /var/tempo/traces
             s3:
@@ -582,7 +581,6 @@ data:
         trace:
             backend: s3
             blocklist_poll: 5m
-            cache: none
             local:
                 path: /var/tempo/traces
             s3: