Expose a single timeout setting in CRDs

Signed-off-by: Pavol Loffay <[email protected]>
grafana · Oct 3, 2024 · 89f3de8 · 89f3de8
1 parent ad1ef25
commit 89f3de8
Show file tree

Hide file tree

Showing 8 changed files with 28 additions and 2 deletions.
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.13.0
-    createdAt: "2024-09-21T07:00:19Z"
+    createdAt: "2024-10-03T16:08:29Z"
     description: Create and manage deployments of Tempo, a high-scale distributed
       tracing backend.
     operatorframework.io/cluster-monitoring: "true"

diff --git a/bundle/community/manifests/tempo.grafana.com_tempomonolithics.yaml b/bundle/community/manifests/tempo.grafana.com_tempomonolithics.yaml
@@ -1683,6 +1683,12 @@ spec:
                 required:
                 - traces
                 type: object
+              timeout:
+                description: |-
+                  Timeout configures the same timeout on all components starting at ingress down to the ingestor/querier.
+                  Timeout configuration on a specific component has a higher precedence.
+                  Default is 30 seconds.
+                type: string
               tolerations:
                 description: Tolerations defines the tolerations of a node to schedule
                   the pod onto it.

diff --git a/bundle/community/manifests/tempo.grafana.com_tempostacks.yaml b/bundle/community/manifests/tempo.grafana.com_tempostacks.yaml
@@ -2714,6 +2714,12 @@ spec:
                 required:
                 - mode
                 type: object
+              timeout:
+                description: |-
+                  Timeout configures the same timeout on all components starting at ingress down to the ingestor/querier.
+                  Timeout configuration on a specific component has a higher precedence.
+                  Defaults to 30 seconds.
+                type: string
             required:
             - storage
             type: object

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.13.0
-    createdAt: "2024-09-21T07:00:18Z"
+    createdAt: "2024-10-03T16:08:28Z"
     description: Create and manage deployments of Tempo, a high-scale distributed
       tracing backend.
     operatorframework.io/cluster-monitoring: "true"

diff --git a/bundle/openshift/manifests/tempo.grafana.com_tempomonolithics.yaml b/bundle/openshift/manifests/tempo.grafana.com_tempomonolithics.yaml
@@ -1683,6 +1683,12 @@ spec:
                 required:
                 - traces
                 type: object
+              timeout:
+                description: |-
+                  Timeout configures the same timeout on all components starting at ingress down to the ingestor/querier.
+                  Timeout configuration on a specific component has a higher precedence.
+                  Default is 30 seconds.
+                type: string
               tolerations:
                 description: Tolerations defines the tolerations of a node to schedule
                   the pod onto it.

diff --git a/bundle/openshift/manifests/tempo.grafana.com_tempostacks.yaml b/bundle/openshift/manifests/tempo.grafana.com_tempostacks.yaml
@@ -2714,6 +2714,12 @@ spec:
                 required:
                 - mode
                 type: object
+              timeout:
+                description: |-
+                  Timeout configures the same timeout on all components starting at ingress down to the ingestor/querier.
+                  Timeout configuration on a specific component has a higher precedence.
+                  Defaults to 30 seconds.
+                type: string
             required:
             - storage
             type: object

diff --git a/docs/spec/tempo.grafana.com_tempomonolithics.yaml b/docs/spec/tempo.grafana.com_tempomonolithics.yaml
@@ -126,6 +126,7 @@ spec:                                    # TempoMonolithicSpec defines the desir
           certName: ""                   # Cert is the name of a Secret containing a certificate (tls.crt) and private key (tls.key). It needs to be in the same namespace as the Tempo custom resource.
           minVersion: ""                 # MinVersion defines the minimum acceptable TLS version.
       size: 0Gi                          # Size defines the size of the volume where traces are stored. For in-memory storage, this defines the size of the tmpfs volume. For persistent volume storage, this defines the size of the persistent volume. For object storage, this defines the size of the persistent volume containing the Write-Ahead Log (WAL) of Tempo. Default: 2Gi for memory, 10Gi for all other backends.
+  timeout: ""                            # Timeout configures the same timeout on all components starting at ingress down to the ingestor/querier. Timeout configuration on a specific component has a higher precedence. Default is 30 seconds.
   affinity:                              # Affinity defines the Affinity rules for scheduling pods.
     nodeAffinity: {}                     # Describes node affinity scheduling rules for the pod.
     podAffinity: {}                      # Describes pod affinity scheduling rules (e.g. co-locate this pod in the same node, zone, etc. as some other pod(s)).

diff --git a/docs/spec/tempo.grafana.com_tempostacks.yaml b/docs/spec/tempo.grafana.com_tempostacks.yaml
@@ -388,6 +388,7 @@ spec:                                    # TempoStackSpec defines the desired st
         resources:
         - ""
     mode: "static"                       # Mode defines the multitenancy mode.
+  timeout: ""                            # Timeout configures the same timeout on all components starting at ingress down to the ingestor/querier. Timeout configuration on a specific component has a higher precedence. Defaults to 30 seconds.
   resources:                             # Resources defines resources configuration.
     total:                               # The total amount of resources for Tempo instance. The operator autonomously splits resources between deployed Tempo components. Only limits are supported, the operator calculates requests automatically. See http://github.com/grafana/tempo/issues/1540.
       claims:                            # Claims lists the names of resources, defined in spec.resourceClaims, that are used by this container.   This is an alpha field and requires enabling the DynamicResourceAllocation feature gate.   This field is immutable. It can only be set for containers.