Merge pull request thanos-io#7674 from didukh86/query_frontend_tls_redis_fix

Query-frontend: Fix connection to Redis cluster with TLS.

Author: fpetkovski

CHANGELOG.md

@@ -19,6 +19,7 @@ We use *breaking :warning:* to mark changes that are not backward compatible (re
 - [#7658](https://github.com/thanos-io/thanos/pull/7658) Store: Fix panic because too small buffer in pool.
 - [#7643](https://github.com/thanos-io/thanos/pull/7643) Receive: fix thanos_receive_write_{timeseries,samples} stats
 - [#7644](https://github.com/thanos-io/thanos/pull/7644) fix(ui): add null check to find overlapping blocks logic
+- [#7674](https://github.com/thanos-io/thanos/pull/7674) Query-frontend: Fix connection to Redis cluster with TLS.
 - [#7814](https://github.com/thanos-io/thanos/pull/7814) Store: label_values: if matchers contain **name**=="something", do not add <labelname> != "" to fetch less postings.
 - [#7679](https://github.com/thanos-io/thanos/pull/7679) Query: respect store.limit.* flags when evaluating queries
 - [#7821](https://github.com/thanos-io/thanos/pull/7821) Query/Receive: Fix coroutine leak introduced in https://github.com/thanos-io/thanos/pull/7796.

pkg/queryfrontend/config.go

@@ -162,13 +162,15 @@ func NewCacheConfig(logger log.Logger, confContentYaml []byte) (*cortexcache.Con
 		}
 		return &cortexcache.Config{
 			Redis: cortexcache.RedisConfig{
-				Endpoint:   config.Redis.Addr,
-				Timeout:    config.Redis.ReadTimeout,
-				MasterName: config.Redis.MasterName,
-				Expiration: config.Expiration,
-				DB:         config.Redis.DB,
-				Password:   flagext.Secret{Value: config.Redis.Password},
-				Username:   config.Redis.Username,
+				Endpoint:           config.Redis.Addr,
+				Timeout:            config.Redis.ReadTimeout,
+				MasterName:         config.Redis.MasterName,
+				Expiration:         config.Expiration,
+				DB:                 config.Redis.DB,
+				Password:           flagext.Secret{Value: config.Redis.Password},
+				Username:           config.Redis.Username,
+				EnableTLS:          config.Redis.TLSEnabled,
+				InsecureSkipVerify: config.Redis.TLSConfig.InsecureSkipVerify,
 			},
 			Background: cortexcache.BackgroundConfig{
 				WriteBackBuffer:     config.Redis.MaxSetMultiConcurrency * config.Redis.SetMultiBatchSize,