resque-kubernetes 1.2.0 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bbfbc8c610d079165438b6a635043070730ecc0a
-  data.tar.gz: a409a4638079687074703bbe70e0acb7ab92d40f
+  metadata.gz: c90637618ea819269c20b91f9cc752e28b435da0
+  data.tar.gz: 94391752da8c4a799442d22e31f5cfdf3ac8cc21
 SHA512:
-  metadata.gz: 03e42650b7af55aca5d0eacb803cc58b30f70ebc4148dc8226e39242c266b061824d1a38f3291b5e5b2a8961d216703d5d03fd2ea31faef4027ddc4b1e097d81
-  data.tar.gz: 849ebc1a05f62eb3676d7dfc6550b975f15da62172cdaba86339ad3c8974cf9610c889f72084de908d8739598ff5447b1f5dcaf1e595ede9af6c32c0802685a2
+  metadata.gz: 9c3dcccddc78c704a909c2abba2b0acd7236ba8df30026dbaf4a0ce11958e4823064c25dfb8bdfaf3b923510fe3468088ad70d26ec799c6ca0fe037711db2f89
+  data.tar.gz: f9257d78372f47e6a94be98d022095d05d3af32f960b402c126a760cf247060e28fd7dca34c402898e8db6d591fb79e63f6162042da130b77f4767da3c16ca02

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+# v1.3.0
+- Retry when a timeout occurs connecting to the Kubernetes API server
+
 # v1.2.0
 - Clean up finished pods that have successfully completed
 

data/lib/resque/kubernetes.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require "retriable"
+
 require "resque/kubernetes/configurable"
 require "resque/kubernetes/context/kubectl"
 require "resque/kubernetes/context/well_known"
@@ -9,6 +11,7 @@ require "resque/kubernetes/dns_safe_random"
 require "resque/kubernetes/job"
 require "resque/kubernetes/jobs_manager"
 require "resque/kubernetes/manifest_conformance"
+require "resque/kubernetes/retriable_client"
 require "resque/kubernetes/version"
 
 module Resque

data/lib/resque/kubernetes/jobs_manager.rb

@@ -62,8 +62,12 @@ module Resque
       end
 
       def client(scope)
-        return Resque::Kubernetes.kubeclient if Resque::Kubernetes.kubeclient
+        return RetriableClient.new(Resque::Kubernetes.kubeclient) if Resque::Kubernetes.kubeclient
+        client = build_client(scope)
+        RetriableClient.new(client) if client
+      end
 
+      def build_client(scope)
         context = ContextFactory.context
         return unless context
         @default_namespace = context.namespace if context.namespace

data/lib/resque/kubernetes/manifest_conformance.rb

@@ -2,7 +2,7 @@
 
 module Resque
   module Kubernetes
-    # Provides methods to ensure a mannifest conforms to a job specification
+    # Provides functions to ensure a manifest conforms to a job specification
     # and includes details needed for resque-kubernetes
     module ManifestConformance
       def adjust_manifest(manifest)

data/lib/resque/kubernetes/retriable_client.rb

@@ -0,0 +1,28 @@
+# frozen_string_literal: true
+
+module Resque
+  module Kubernetes
+    # Wraps Kubeclient::Client to retry timeout errors
+    class RetriableClient
+      attr_accessor :kubeclient
+
+      def initialize(client)
+        self.kubeclient = client
+      end
+
+      def method_missing(method, *args, &block)
+        if kubeclient.respond_to?(method)
+          Retriable.retriable(on: {Kubeclient::HttpError => /Timed out/}) do
+            kubeclient.send(method, *args, &block)
+          end
+        else
+          super
+        end
+      end
+
+      def respond_to_missing?(method)
+        kubeclient.respond_to?(method)
+      end
+    end
+  end
+end

data/lib/resque/kubernetes/version.rb

@@ -2,6 +2,6 @@
 
 module Resque
   module Kubernetes
-    VERSION = "1.2.0"
+    VERSION = "1.3.0"
   end
 end

data/resque-kubernetes.gemspec

@@ -34,4 +34,5 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency "kubeclient", ">= 3.1.2", "< 5.0"
   spec.add_dependency "resque", "~> 1.26"
+  spec.add_dependency "retriable", "~> 3.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: resque-kubernetes
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.3.0
 platform: ruby
 authors:
 - Jeremy Wadsack
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-11-13 00:00:00.000000000 Z
+date: 2018-12-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: appraisal
@@ -154,6 +154,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.26'
+- !ruby/object:Gem::Dependency
+  name: retriable
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.0'
 description: Launches a Kubernetes Job when a Resque Job is enqueued, then terminates
   the worker when there are no more jobs in the queue.
 email:
@@ -187,6 +201,7 @@ files:
 - lib/resque/kubernetes/job.rb
 - lib/resque/kubernetes/jobs_manager.rb
 - lib/resque/kubernetes/manifest_conformance.rb
+- lib/resque/kubernetes/retriable_client.rb
 - lib/resque/kubernetes/version.rb
 - resque-kubernetes.gemspec
 homepage: https://github.com/keylimetoolbox/resque-kubernetes