dapp 0.13.20 → 0.13.21

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 76cb1be7940f4087220a9b04e6d8352cfecae333
-  data.tar.gz: 2a0af558bbf26b660f8bd53524bf8c1cfde2692d
+  metadata.gz: c6fe51938164442f3a4d1c70c954505de2a819b2
+  data.tar.gz: 301499af3fb80b51c4a059134a897be3ea966e6c
 SHA512:
-  metadata.gz: 59003aea36976ff49f4687fdca7052a32643617c21aa0bb6dfba445a865c1f66b46421bc1b8a3ef7fc1d68225a41f529ddf068d8a6a0c2ae7dd14952b2da886a
-  data.tar.gz: 1249d96364c8bddee9d369513c146c0e20710f0efa20d00942ce846ac502841043b94634c704fc7947fc3aebcc594080e40089a17bea75a6a546ba76541060c2
+  metadata.gz: ec4a97af9ac3c47067e8fc3ca2cea6b17b1beb309fe778a7ff4ed150c4ee1d2034dbaf4cb0e5ce24bd68d6bfb9f056f7f49a864564bf19f44acd4b35a1d45519
+  data.tar.gz: d045312a3c0b9292bfa1dd930ac9ce0b0ed1c5759aefeadc05211933ffe3903857728ac91ca8962553a2e25ad2de12a5f79ed8e5034c174f5f69ebcbe4e8b567

data/lib/dapp/kube/kubernetes/client.rb

@@ -106,16 +106,13 @@ module Dapp
         rescue Excon::Error::Timeout
           raise Error::Timeout
         rescue Error::Base => err
-          if err.net_status[:code] == :bad_request and err.net_status[:data][:response_body]
-            msg = err.net_status[:data][:response_body]['message']
-            if msg.end_with? 'ContainerCreating'
-              raise Error::Pod::ContainerCreating, data: err.net_status[:data]
-            elsif msg.end_with? 'PodInitializing'
-              raise Error::Pod::PodInitializing, data: err.net_status[:data]
-            end
+          if err.net_status[:code] == :bad_request and
+             err.net_status[:data][:response_body] and
+             err.net_status[:data][:response_body]['message'].end_with? 'ContainerCreating'
+             raise Error::Pod::ContainerCreating, data: err.net_status[:data]
+          else
+            raise
           end
-
-          raise
         end
 
         def event_list(**query_parameters)

data/lib/dapp/kube/kubernetes/client/error.rb

@@ -19,18 +19,11 @@ module Dapp
 
       module Pod
         class NotFound < Kubernetes::Client::Error::NotFound ; end
-
         class ContainerCreating < Kubernetes::Client::Error::Base
           def initialize(**net_status)
             super({code: :container_creating}.merge(net_status))
           end
         end
-
-        class PodInitializing < Kubernetes::Client::Error::Base
-          def initialize(**net_status)
-            super({code: :pod_initializing}.merge(net_status))
-          end
-        end
       end # Pod
     end # Kubernetes::Client::Error
   end # Kube

data/lib/dapp/kube/kubernetes/manager/container.rb

@@ -38,7 +38,7 @@ module Dapp
                     [timestamp, data]
                   end
                   .reject {|timestamp, _| @processed_log_timestamps.include? timestamp}
-              rescue Kubernetes::Client::Error::Pod::ContainerCreating, Kubernetes::Client::Error::Pod::PodInitializing
+              rescue Kubernetes::Client::Error::Pod::ContainerCreating
                 sleep 0.1
                 next
               end

data/lib/dapp/kube/kubernetes/manager/deployment.rb

@@ -129,7 +129,7 @@ module Dapp
                                   [timestamp, data]
                                 end
                               }.compact
-                          rescue Kubernetes::Client::Error::Pod::ContainerCreating, Kubernetes::Client::Error::Pod::PodInitializing
+                          rescue Kubernetes::Client::Error::Pod::ContainerCreating
                             next
                           end
 

data/lib/dapp/version.rb

@@ -1,4 +1,4 @@
 module Dapp
-  VERSION = '0.13.20'.freeze
-  BUILD_CACHE_VERSION = 16
+  VERSION = '0.13.21'.freeze
+  BUILD_CACHE_VERSION = 17
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dapp
 version: !ruby/object:Gem::Version
-  version: 0.13.20
+  version: 0.13.21
 platform: ruby
 authors:
 - Dmitry Stolyarov