From 9104dda057cc7f2c65f07e509013f3cff10db590 Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Tue, 8 Feb 2022 16:54:12 +0000 Subject: Add latest changes from gitlab-org/gitlab@14-7-stable-ee --- app/models/clusters/concerns/elasticsearch_client.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'app/models/clusters/concerns') diff --git a/app/models/clusters/concerns/elasticsearch_client.rb b/app/models/clusters/concerns/elasticsearch_client.rb index 7b0b6bdae02..e9aab7897a8 100644 --- a/app/models/clusters/concerns/elasticsearch_client.rb +++ b/app/models/clusters/concerns/elasticsearch_client.rb @@ -15,7 +15,7 @@ module Clusters proxy_url = kube_client.proxy_url('service', service_name, ELASTICSEARCH_PORT, ELASTICSEARCH_NAMESPACE) - Elasticsearch::Client.new(url: proxy_url) do |faraday| + Elasticsearch::Client.new(url: proxy_url, adapter: :net_http) do |faraday| # ensures headers containing auth data are appended to original client options faraday.headers.merge!(kube_client.headers) # ensure TLS certs are properly verified -- cgit v1.2.3