Added tls_config in downstream tripper config

thanos-io · Sep 25, 2023 · 3129371 · 3129371
1 parent acfa60c
commit 3129371
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/cmd/thanos/query_frontend.go b/cmd/thanos/query_frontend.go
@@ -180,7 +180,9 @@ func parseTransportConfiguration(downstreamTripperConfContentYaml []byte) (*http
 		if err := yaml.UnmarshalStrict(downstreamTripperConfContentYaml, tripperConfig); err != nil {
 			return nil, errors.Wrap(err, "parsing downstream tripper config YAML file")
 		}
-
+		if tripperConfig.TLSConfig != nil {
+			downstreamTripper.TLSClientConfig = tripperConfig.TLSConfig
+		}
 		if tripperConfig.IdleConnTimeout > 0 {
 			downstreamTripper.IdleConnTimeout = time.Duration(tripperConfig.IdleConnTimeout)
 		}

diff --git a/pkg/queryfrontend/config.go b/pkg/queryfrontend/config.go
@@ -4,6 +4,7 @@
 package queryfrontend
 
 import (
+	"crypto/tls"
 	"strings"
 	"time"
 
@@ -186,6 +187,7 @@ type DownstreamTripperConfig struct {
 	MaxIdleConns          *int               `yaml:"max_idle_conns"`
 	MaxIdleConnsPerHost   *int               `yaml:"max_idle_conns_per_host"`
 	MaxConnsPerHost       *int               `yaml:"max_conns_per_host"`
+	TLSConfig             *tls.Config        `yaml:"tls_config"`
 
 	CachePathOrContent extflag.PathOrContent
 }
@@ -306,3 +308,4 @@ func (cfg *Config) isDynamicSplitSet() bool {
 		cfg.QueryRangeConfig.HorizontalShards > 0 ||
 		cfg.QueryRangeConfig.MaxQuerySplitInterval > 0
 }
+