Remove comment is not considered from global retention (#980)

Signed-off-by: Pavol Loffay <p.loffay@gmail.com>
grafana · Jul 16, 2024 · 3be10cd · 3be10cd
1 parent 3f20588
commit 3be10cd
Show file tree

Hide file tree

Showing 9 changed files with 11 additions and 15 deletions.
diff --git a/apis/tempo/v1alpha1/tempostack_types.go b/apis/tempo/v1alpha1/tempostack_types.go
@@ -71,7 +71,6 @@ type TempoStackSpec struct {
 	// +operator-sdk:csv:customresourcedefinitions:type=spec,displayName="Object Storage"
 	Storage ObjectStorageSpec `json:"storage"`
 
-	// NOTE: currently this field is not considered.
 	// Retention period defined by dataset.
 	// User can specify how long data should be stored.
 	//

diff --git a/bundle/community/manifests/tempo-operator.clusterserviceversion.yaml b/bundle/community/manifests/tempo-operator.clusterserviceversion.yaml
@@ -74,7 +74,7 @@ metadata:
     capabilities: Deep Insights
     categories: Logging & Tracing,Monitoring
     containerImage: ghcr.io/grafana/tempo-operator/tempo-operator:v0.11.1
-    createdAt: "2024-07-10T03:57:59Z"
+    createdAt: "2024-07-15T15:06:51Z"
     description: Create and manage deployments of Tempo, a high-scale distributed
       tracing backend.
     operatorframework.io/cluster-monitoring: "true"
@@ -730,8 +730,8 @@ spec:
           are supported, the operator calculates requests automatically. See http://github.com/grafana/tempo/issues/1540.
         displayName: Resource Requirements
         path: resources.total
-      - description: 'NOTE: currently this field is not considered. Retention period
-          defined by dataset. User can specify how long data should be stored.'
+      - description: Retention period defined by dataset. User can specify how long
+          data should be stored.
         displayName: Retention Period
         path: retention
       - description: Global is used to configure global retention.

diff --git a/bundle/community/manifests/tempo.grafana.com_tempostacks.yaml b/bundle/community/manifests/tempo.grafana.com_tempostacks.yaml
@@ -358,7 +358,6 @@ spec:
                 type: object
               retention:
                 description: |-
-                  NOTE: currently this field is not considered.
                   Retention period defined by dataset.
                   User can specify how long data should be stored.
                 properties:

diff --git a/bundle/openshift/manifests/tempo-operator.clusterserviceversion.yaml b/bundle/openshift/manifests/tempo-operator.clusterserviceversion.yaml
@@ -74,7 +74,7 @@ metadata:
     capabilities: Deep Insights
     categories: Logging & Tracing,Monitoring
     containerImage: ghcr.io/grafana/tempo-operator/tempo-operator:v0.11.1
-    createdAt: "2024-07-10T03:57:57Z"
+    createdAt: "2024-07-15T15:06:50Z"
     description: Create and manage deployments of Tempo, a high-scale distributed
       tracing backend.
     operatorframework.io/cluster-monitoring: "true"
@@ -730,8 +730,8 @@ spec:
           are supported, the operator calculates requests automatically. See http://github.com/grafana/tempo/issues/1540.
         displayName: Resource Requirements
         path: resources.total
-      - description: 'NOTE: currently this field is not considered. Retention period
-          defined by dataset. User can specify how long data should be stored.'
+      - description: Retention period defined by dataset. User can specify how long
+          data should be stored.
         displayName: Retention Period
         path: retention
       - description: Global is used to configure global retention.

diff --git a/bundle/openshift/manifests/tempo.grafana.com_tempostacks.yaml b/bundle/openshift/manifests/tempo.grafana.com_tempostacks.yaml
@@ -358,7 +358,6 @@ spec:
                 type: object
               retention:
                 description: |-
-                  NOTE: currently this field is not considered.
                   Retention period defined by dataset.
                   User can specify how long data should be stored.
                 properties:

diff --git a/config/crd/bases/tempo.grafana.com_tempostacks.yaml b/config/crd/bases/tempo.grafana.com_tempostacks.yaml
@@ -354,7 +354,6 @@ spec:
                 type: object
               retention:
                 description: |-
-                  NOTE: currently this field is not considered.
                   Retention period defined by dataset.
                   User can specify how long data should be stored.
                 properties:

diff --git a/config/manifests/community/bases/tempo-operator.clusterserviceversion.yaml b/config/manifests/community/bases/tempo-operator.clusterserviceversion.yaml
@@ -659,8 +659,8 @@ spec:
           are supported, the operator calculates requests automatically. See http://github.com/grafana/tempo/issues/1540.
         displayName: Resource Requirements
         path: resources.total
-      - description: 'NOTE: currently this field is not considered. Retention period
-          defined by dataset. User can specify how long data should be stored.'
+      - description: Retention period defined by dataset. User can specify how long
+          data should be stored.
         displayName: Retention Period
         path: retention
       - description: Global is used to configure global retention.

diff --git a/config/manifests/openshift/bases/tempo-operator.clusterserviceversion.yaml b/config/manifests/openshift/bases/tempo-operator.clusterserviceversion.yaml
@@ -659,8 +659,8 @@ spec:
           are supported, the operator calculates requests automatically. See http://github.com/grafana/tempo/issues/1540.
         displayName: Resource Requirements
         path: resources.total
-      - description: 'NOTE: currently this field is not considered. Retention period
-          defined by dataset. User can specify how long data should be stored.'
+      - description: Retention period defined by dataset. User can specify how long
+          data should be stored.
         displayName: Retention Period
         path: retention
       - description: Global is used to configure global retention.

diff --git a/docs/spec/tempo.grafana.com_tempostacks.yaml b/docs/spec/tempo.grafana.com_tempostacks.yaml
@@ -54,7 +54,7 @@ spec:                                    # TempoStackSpec defines the desired st
       jaeger_agent_endpoint: "localhost:6831" # JaegerAgentEndpoint defines the jaeger endpoint data gets send to.
       sampling_fraction: ""              # SamplingFraction defines the sampling ratio. Valid values are 0 to 1.
   replicationFactor: 0                   # ReplicationFactor is used to define how many component replicas should exist.
-  retention:                             # NOTE: currently this field is not considered. Retention period defined by dataset. User can specify how long data should be stored.
+  retention:                             # Retention period defined by dataset. User can specify how long data should be stored.
     global:                              # Global is used to configure global retention.
       traces: ""                         # Traces defines retention period. Supported parameter suffixes are "s", "m" and "h". example: 336h default: value is 48h.
     perTenant:                           # PerTenant is used to configure retention per tenant.