Merge pull request #10 from cben/kubeclient-timeout

kubernetes_connect: add timeout settings
ManageIQ · May 15, 2017 · 1ee90b5 · 1ee90b5
2 parents 43d1d2d + e74b251
commit 1ee90b5
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 2 deletions.
diff --git a/app/models/manageiq/providers/kubernetes/container_manager_mixin.rb b/app/models/manageiq/providers/kubernetes/container_manager_mixin.rb
@@ -31,7 +31,11 @@ def kubernetes_connect(hostname, port, options)
         options[:version] || kubernetes_version,
         :ssl_options    => Kubeclient::Client::DEFAULT_SSL_OPTIONS.merge(options[:ssl_options] || {}),
         :auth_options   => kubernetes_auth_options(options),
-        :http_proxy_uri => VMDB::Util.http_proxy_uri
+        :http_proxy_uri => VMDB::Util.http_proxy_uri,
+        :timeouts       => {
+          :open => Settings.ems.ems_kubernetes.open_timeout.to_f_with_method,
+          :read => Settings.ems.ems_kubernetes.read_timeout.to_f_with_method
+        }
       )
     end
 

diff --git a/config/settings.yml b/config/settings.yml
@@ -36,6 +36,8 @@
         :network:
           :critical:
             - POD_HOSTPORTCONFLICT
+    :open_timeout: 60.seconds
+    :read_timeout: 60.seconds
 :http_proxy:
   :kubernetes:
     :host:

diff --git a/spec/models/manageiq/providers/kubernetes/container_manager_spec.rb b/spec/models/manageiq/providers/kubernetes/container_manager_spec.rb
@@ -112,7 +112,8 @@
       require 'kubeclient'
       expect(Kubeclient::Client).to receive(:new).with(
         instance_of(URI::HTTPS), 'v1',
-        hash_including(:http_proxy_uri => VMDB::Util.http_proxy_uri)
+        hash_including(:http_proxy_uri => VMDB::Util.http_proxy_uri,
+                       :timeouts       => match(:open => be > 0, :read => be > 0))
       )
       described_class.raw_connect(hostname, port, options)
     end