diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-02-08 19:54:12 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-02-08 19:54:12 +0300 |
| commit | 9104dda057cc7f2c65f07e509013f3cff10db590 (patch) | |
| tree | 74af16bfb1bc2afc23fb385727fda39b0f211862 /app/models/clusters/concerns | |
| parent | 2b77b43bec240eb5ed2c5422eb810df5eb8edfcc (diff) | |
Add latest changes from gitlab-org/gitlab@14-7-stable-ee
Diffstat (limited to 'app/models/clusters/concerns')
| -rw-r--r-- | app/models/clusters/concerns/elasticsearch_client.rb | 2 |
1 files changed, 1 insertions, 1 deletions
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 |