Add latest changes from gitlab-org/gitlab@master

1 files changed, 10 insertions, 1 deletions

diff --git a/lib/gitlab/kubernetes/kube_client.rb b/lib/gitlab/kubernetes/kube_client.rb
index 7d2abcdb0a3..7c5525b982c 100644
--- a/lib/gitlab/kubernetes/kube_client.rb
+++ b/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