k8s-client 0.5.0 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2f06cad5e9cbad737bd7a94f169f56c71f6a323d06f3cfc68dd01ba1733abc95
-  data.tar.gz: 694b1835b27534c3c86841a5d58763b6494331f7078e89115d8c6f6bc50f6260
+  metadata.gz: 6021ff799426838c2f3d874b13b2cd2d53ac8298ccfbb983e3ca53943dcfb3be
+  data.tar.gz: 516330c9bcb21af9221eef99f3304187cde161db1d9f7cc8ec1d9c1a1ac4360f
 SHA512:
-  metadata.gz: d7f1cb6a943da7f7d9e1ecbf396d50f1c7bd481425ed68232b8a99340c20ec5fd7304d89a56c312c1eabf078d7989a37bd22353c7c9a88806ee8c13029d586c5
-  data.tar.gz: aa6b067859e0838f7b1240d282cf6bdb5d2dc1187ead8247409a45c29b0bc9fa2c827fe844323ab7e664a3910716b6646d65e862c4d3c596bd7f95ab10a548ff
+  metadata.gz: ed9e425df7d635def2d912a4083ac64dd189dc2c644983e162066a2f9b3026b4192a79bcfe64df6f38a35bffc5cc970cb6966ab1e12a4b7a3aadff2aa5a6aa9a
+  data.tar.gz: ac16a5c433205dc8a9db24d73413d4053c73cc4da9eac09a180e472d96f87c3ce300e32c70079e9b745f6fed18e507609b352b6e3e10e5d9e09235103668fb8e

data/README.md

@@ -204,6 +204,14 @@ client.api('apps/v1').resource('deployments', namespace: 'default').merge_patch(
 })
 ```
 
+### Watching resources
+
+```ruby
+client.api('v1').resource('pods', namespace: 'default').watch(labelSelector: {'role' => 'test'}) do |watch_event|
+  puts "type=#{watch_event.type} pod=#{watch_event.resource.metadata.name}"
+end
+```
+
 ## Contributing
 
 Bug reports and pull requests are welcome on GitHub at https://github.com/kontena/k8s-client.

data/lib/k8s/api/metav1.rb

@@ -23,3 +23,4 @@ require 'k8s/api/metav1/api_resource'
 require 'k8s/api/metav1/list'
 require 'k8s/api/metav1/object'
 require 'k8s/api/metav1/status'
+require 'k8s/api/metav1/watch_event'

data/lib/k8s/api/metav1/watch_event.rb

@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+require_relative '../../resource'
+
+module K8s
+  module API
+    module MetaV1
+      # @see https://godoc.org/k8s.io/apimachinery/pkg/apis/meta/v1#WatchEvent
+      class WatchEvent < Resource
+        attribute :type, Types::Strict::String
+        attribute :object, Types::Strict::Hash
+
+        # @return [K8s::Resource]
+        def resource
+          @resource ||= K8s::Resource.new(object)
+        end
+      end
+    end
+  end
+end

data/lib/k8s/client.rb

@@ -45,6 +45,8 @@ module K8s
       new(Transport.in_cluster_config)
     end
 
+    attr_reader :transport
+
     # @param transport [K8s::Transport]
     # @param namespace [String] default namespace for all operations
     def initialize(transport, namespace: nil)

data/lib/k8s/client/version.rb

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

data/lib/k8s/resource_client.rb

@@ -189,9 +189,19 @@ module K8s
 
     # @param labelSelector [nil, String, Hash{String => String}]
     # @param fieldSelector [nil, String, Hash{String => String}]
+    # @param namespace [nil, String]
     # @return [Array<resource_class>]
     def list(labelSelector: nil, fieldSelector: nil, namespace: @namespace)
-      list = @transport.request(
+      list = meta_list(labelSelector: labelSelector, fieldSelector: fieldSelector, namespace: namespace)
+      process_list(list)
+    end
+
+    # @param labelSelector [nil, String, Hash{String => String}]
+    # @param fieldSelector [nil, String, Hash{String => String}]
+    # @param namespace [nil, String]
+    # @return [K8s::API::MetaV1::List]
+    def meta_list(labelSelector: nil, fieldSelector: nil, namespace: @namespace)
+      @transport.request(
         method: 'GET',
         path: path(namespace: namespace),
         response_class: K8s::API::MetaV1::List,
@@ -200,7 +210,39 @@ module K8s
           'fieldSelector' => selector_query(fieldSelector)
         )
       )
-      process_list(list)
+    end
+
+    # @param labelSelector [nil, String, Hash{String => String}]
+    # @param fieldSelector [nil, String, Hash{String => String}]
+    # @param resourceVersion [nil, String]
+    # @param timeout [nil, Integer]
+    # @yield [K8S::API::MetaV1::WatchEvent]
+    # @raise [Excon::Error]
+    def watch(labelSelector: nil, fieldSelector: nil, resourceVersion: nil, timeout: nil, namespace: @namespace)
+      method = 'GET'
+      path = path(namespace: namespace)
+      @transport.request(
+        method: method,
+        path: path,
+        response_class: K8s::API::MetaV1::List,
+        query: make_query(
+          'labelSelector' => selector_query(labelSelector),
+          'fieldSelector' => selector_query(fieldSelector),
+          'resourceVersion' => resourceVersion,
+          'watch' => '1'
+        ),
+        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
+      )
+    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

@@ -190,6 +190,8 @@ module K8s
       end
 
       if response.status.between? 200, 299
+        return response_data if content_type == 'text/plain'
+
         unless response_data.is_a? Hash
           raise K8s::Error::API.new(method, path, response.status, "Invalid JSON response: #{response_data.inspect}")
         end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: k8s-client
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.6.0
 platform: ruby
 authors:
 - Kontena, Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-10-27 00:00:00.000000000 Z
+date: 2018-11-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: excon
@@ -192,6 +192,7 @@ files:
 - lib/k8s/api/metav1/list.rb
 - lib/k8s/api/metav1/object.rb
 - lib/k8s/api/metav1/status.rb
+- lib/k8s/api/metav1/watch_event.rb
 - lib/k8s/api/version.rb
 - lib/k8s/api_client.rb
 - lib/k8s/client.rb