k8s-client 0.6.2 → 0.6.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a8aa26f3a1aea64470085acc814c0cb3fcfbb6354dce4c025400b895c485a370
-  data.tar.gz: 36c31b0a1d13d7f22c15efbdddca64a6a243034618cd8a1dc5c435a2cfcf8425
+  metadata.gz: 9d7cce8f8084f9e3cd235ac55f5df20258050e7187567aa20d1fec847d4a5cf2
+  data.tar.gz: 5a7ea616dbf3dbe85fd9482686f97ff2b06d878ad2e86c9dce5956692bed42e9
 SHA512:
-  metadata.gz: afca070bae71e534ded84fbf1c0dcfdfd9e3781d7d1939cbf8a025d10aac00679cd35e1409a8b6ac4fbebd7f880244d278c5942203d7a50eb1df2192cd35ba9c
-  data.tar.gz: 7a7af7c2a520cacf9e893b080d45dfc02572cf544c373b23a544296f655e222a5cbe3d6abe59aea88b4f3d6f801e17a7bda58ddf054eb07f4a07503e173bc345
+  metadata.gz: cfed2d41bdd6ce8f36da105f3277327afb2344ad480fdf8e5361c1c0df5826168b2f16546a9db9d76f22460dab09b7a724610e55e72a6c4860569d9938ef28c8
+  data.tar.gz: b758e50f969330760d4846c9c42ad899f6d540fd0a475ef78562b86b071d17f3dc85068ffb5e83597957b324861a05ace3622ec46b922c3ab91b8d3cd5e20866

data/k8s-client.gemspec

@@ -29,6 +29,7 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency "recursive-open-struct", "~> 1.1.0"
   spec.add_runtime_dependency 'hashdiff', '~> 0.3.7'
   spec.add_runtime_dependency 'jsonpath', '~> 0.9.5'
+  spec.add_runtime_dependency 'yajl-ruby', '~> 1.4.0'
 
   spec.add_development_dependency "bundler", "~> 1.16"
   spec.add_development_dependency "rake", "~> 10.0"

data/lib/k8s/client/version.rb

@@ -3,6 +3,6 @@
 module K8s
   class Client
     # Updated on releases using semver.
-    VERSION = "0.6.2"
+    VERSION = "0.6.3"
   end
 end

data/lib/k8s/client.rb

@@ -2,6 +2,7 @@
 
 require 'openssl'
 require 'base64'
+require 'yajl'
 
 require 'k8s/api/metav1'
 require 'k8s/api/version'

data/lib/k8s/resource_client.rb

@@ -221,28 +221,26 @@ module K8s
     def watch(labelSelector: nil, fieldSelector: nil, resourceVersion: nil, timeout: nil, namespace: @namespace)
       method = 'GET'
       path = path(namespace: namespace)
+      parser = Yajl::Parser.new
+      parser.on_parse_complete = lambda do |data|
+        event = K8s::API::MetaV1::WatchEvent.new(data)
+        yield event
+      end
       @transport.request(
         method: method,
         path: path,
-        response_class: K8s::API::MetaV1::List,
+        read_timeout: nil,
         query: make_query(
           'labelSelector' => selector_query(labelSelector),
           'fieldSelector' => selector_query(fieldSelector),
           'resourceVersion' => resourceVersion,
-          'watch' => '1'
+          'watch' => '1',
+          'timeoutSeconds' => timeout
         ),
         response_block: lambda do |chunk, _, _|
-          data = JSON.parse(chunk)
-          event = K8s::API::MetaV1::WatchEvent.new(data)
-          resourceVersion = event.resource&.metadata&.resourceVersion
-          yield event
-        end,
-        read_timeout: timeout
+          parser << chunk
+        end
       )
-    rescue Excon::Error::Timeout
-      retry if timeout.nil?
-
-      raise K8s::Error::Timeout.new(method, path, 408, 'timeout')
     end
 
     # @return [Bool]

data/lib/k8s/transport.rb

@@ -181,7 +181,7 @@ module K8s
 
       case content_type
       when 'application/json'
-        response_data = JSON.parse(response.body)
+        response_data = Yajl::Parser.parse(response.body)
 
       when 'text/plain'
         response_data = response.body # XXX: broken if status 2xx
@@ -223,8 +223,7 @@ module K8s
       response = excon.request(**excon_options)
       t = Time.now - start
 
-      obj = parse_response(response, options,
-                           response_class: response_class)
+      obj = options[:response_block] ? {} : parse_response(response, options, response_class: response_class)
     rescue K8s::Error::API => exc
       logger.warn { "#{format_request(options)} => HTTP #{exc.code} #{exc.reason} in #{'%.3f' % t}s" }
       logger.debug { "Request: #{excon_options[:body]}" } if excon_options[:body]

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: k8s-client
 version: !ruby/object:Gem::Version
-  version: 0.6.2
+  version: 0.6.3
 platform: ruby
 authors:
 - Kontena, Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-11-23 00:00:00.000000000 Z
+date: 2018-11-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: excon
@@ -94,6 +94,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.9.5
+- !ruby/object:Gem::Dependency
+  name: yajl-ruby
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.4.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.4.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement