Add latest changes from gitlab-org/gitlab@master

lib/gitlab/kubernetes/kube_client.rb

@@ -90,12 +90,21 @@ module Gitlab
 
       attr_reader :api_prefix, :kubeclient_options
 
+      DEFAULT_KUBECLIENT_OPTIONS = {
+        timeouts: {
+          open: 10,
+          read: 30
+        }
+      }.freeze
+
       # We disable redirects through 'http_max_redirects: 0',
       # so that KubeClient does not follow redirects and
       # expose internal services.
       def initialize(api_prefix, **kubeclient_options)
         @api_prefix = api_prefix
-        @kubeclient_options = kubeclient_options.merge(http_max_redirects: 0)
+        @kubeclient_options = DEFAULT_KUBECLIENT_OPTIONS
+          .deep_merge(kubeclient_options)
+          .merge(http_max_redirects: 0)
 
         validate_url!
       end

spec/lib/gitlab/kubernetes/kube_client_spec.rb

@@ -92,6 +92,16 @@ describe Gitlab::Kubernetes::KubeClient do
 
       it_behaves_like 'local address'
     end
+
+    it 'falls back to default options, but allows overriding' do
+      client = Gitlab::Kubernetes::KubeClient.new(api_url, {})
+      defaults = Gitlab::Kubernetes::KubeClient::DEFAULT_KUBECLIENT_OPTIONS
+      expect(client.kubeclient_options[:timeouts]).to eq(defaults[:timeouts])
+
+      client = Gitlab::Kubernetes::KubeClient.new(api_url, timeouts: { read: 7 })
+      expect(client.kubeclient_options[:timeouts][:read]).to eq(7)
+      expect(client.kubeclient_options[:timeouts][:open]).to eq(defaults[:timeouts][:open])
+    end
   end
 
   describe '#core_client' do