Expose a single timeout setting in CRDs

Signed-off-by: Pavol Loffay <[email protected]>

apis/tempo/v1alpha1/tempostack_types.go

@@ -796,16 +796,6 @@ type QueryLimit struct {
 	MaxSearchDuration metav1.Duration `json:"maxSearchDuration"`
 }
 
-// TimeoutsSpec defines timeout limits for ingestion and query
-type TimeoutsSpec struct {
-	// Read defines read timeout. It configures timeouts from ingress/route down to the querier.
-	// If a component uses a single configuration for read and write timeout the higher value will be applied.
-	Read metav1.Duration `json:"read"`
-	// Write defines write timeout. It configures timeouts from ingress/route down to the ingestor.
-	// If a component uses a single configuration for read and write timeout the higher value will be applied.
-	Write metav1.Duration `json:"write"`
-}
-
 // RetentionSpec defines global and per tenant retention configurations.
 type RetentionSpec struct {
 	// PerTenant is used to configure retention per tenant.

internal/manifests/config/options.go

@@ -1,8 +1,9 @@
 package config
 
 import (
-	"github.com/grafana/tempo-operator/internal/manifests/manifestutils"
 	"time"
+
+	"github.com/grafana/tempo-operator/internal/manifests/manifestutils"
 )
 
 // options holds the configuration template options.

internal/manifests/queryfrontend/query_frontend.go

@@ -2,6 +2,9 @@ package queryfrontend
 
 import (
 	"fmt"
+	"path"
+	"strings"
+
 	"github.com/imdario/mergo"
 	routev1 "github.com/openshift/api/route/v1"
 	"github.com/operator-framework/operator-lib/proxy"
@@ -12,9 +15,7 @@ import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	k8slabels "k8s.io/apimachinery/pkg/labels"
 	"k8s.io/apimachinery/pkg/util/intstr"
-	"path"
 	"sigs.k8s.io/controller-runtime/pkg/client"
-	"strings"
 
 	"github.com/grafana/tempo-operator/apis/tempo/v1alpha1"
 	"github.com/grafana/tempo-operator/internal/manifests/manifestutils"

internal/manifests/queryfrontend/query_frontend_test.go

@@ -2,6 +2,8 @@ package queryfrontend
 
 import (
 	"fmt"
+	"testing"
+
 	routev1 "github.com/openshift/api/route/v1"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
@@ -14,7 +16,6 @@ import (
 	k8slabels "k8s.io/apimachinery/pkg/labels"
 	"k8s.io/apimachinery/pkg/util/intstr"
 	"k8s.io/utils/ptr"
-	"testing"
 
 	configv1alpha1 "github.com/grafana/tempo-operator/apis/config/v1alpha1"
 	"github.com/grafana/tempo-operator/apis/tempo/v1alpha1"