- Backport ManageIQ/manageiq-gems-pending#156

bump kubeclient ~> 2.4.0 (ported from manageiq-gems-pending.gemspec to gems/pending/Gemfile) - Merge ManageIQ/manageiq-providers-kubernetes#10 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)
cben · May 15, 2017 · 6625ab1 · 6625ab1
1 parent 45711be
commit 6625ab1
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 4 deletions.
diff --git a/app/models/manageiq/providers/kubernetes/container_manager_mixin.rb b/app/models/manageiq/providers/kubernetes/container_manager_mixin.rb
@@ -21,7 +21,11 @@ def kubernetes_connect(hostname, port, options)
         kubernetes_version,
         :ssl_options    => { :verify_ssl => verify_ssl_mode },
         :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/app/models/manageiq/providers/openshift/container_manager_mixin.rb b/app/models/manageiq/providers/openshift/container_manager_mixin.rb
@@ -41,7 +41,11 @@ def openshift_connect(hostname, port, options)
         api_version,
         :ssl_options    => { :verify_ssl => verify_ssl_mode },
         :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

diff --git a/config/settings.yml b/config/settings.yml
@@ -104,6 +104,8 @@
       :read_timeout: 1.hour
   :ems_kubernetes:
     :miq_namespace: management-infra
+    :open_timeout: 60.seconds
+    :read_timeout: 60.seconds
   :ems_amazon:
     :disabled_regions: []
   :ems_azure:

diff --git a/gems/pending/Gemfile b/gems/pending/Gemfile
@@ -22,7 +22,7 @@ gem "hawkular-client",         "=2.7.0",            :require => false
 gem "httpclient",              "~>2.7.1",           :require => false
 gem "image-inspector-client",  "~>1.0.3",           :require => false
 gem "iniparse",                                     :require => false
-gem "kubeclient",              "=2.3.0",            :require => false
+gem "kubeclient",              "~>2.4.0",           :require => false
 gem "linux_admin",             "~>0.19.0",          :require => false
 gem "log4r",                   "=1.1.8",            :require => false
 gem "memoist",                 "~>0.14.0",          :require => false

diff --git a/spec/models/manageiq/providers/kubernetes/container_manager_spec.rb b/spec/models/manageiq/providers/kubernetes/container_manager_spec.rb
@@ -69,7 +69,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