Merge pull request

ManageIQ/manageiq-providers-kubernetes#10 from cben/kubeclient-timeout

kubernetes_connect: add timeout settings
(cherry picked from merge commit ManageIQ/manageiq-providers-kubernetes@1ee90b5)

openshift_connect: use kubernetes timeout settings
(cherry picked from unmerged
ManageIQ/manageiq-providers-openshift#8 - unnecessary on master but required in backports)

Requires kubeclient >= 2.4.0

app/models/manageiq/providers/kubernetes/container_manager_mixin.rb

@@ -27,7 +27,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
 

app/models/manageiq/providers/openshift/container_manager_mixin.rb

@@ -39,7 +39,11 @@ def openshift_connect(hostname, port, options)
         options[:version] || api_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
   end

config/settings.yml

@@ -112,6 +112,8 @@
     :miq_namespace: management-infra
     :image_inspector_registry: docker.io
     :image_inspector_repository: openshift/image-inspector
+    :open_timeout: 60.seconds
+    :read_timeout: 60.seconds
 :event_streams:
   :history:
     :keep_events: 6.months

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