kubeclient 0.8.1 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 89981c7be5cb927a6c04b5c8c40304476a21f56f
-  data.tar.gz: b81b39d1e30735371b0e2d74109541a38a7cacf0
+  metadata.gz: 3acf742f15a2ac53054784e80bd9e7d2e281a2ee
+  data.tar.gz: c793a0e544599ae7bd734bd2036e4af55d9496e8
 SHA512:
-  metadata.gz: 2bbd52b20567a3c70eeb0a784a0e608e6adcbf451b0ba61b10565aaafd831f972f717902d62b3daeeef5ed2bc3297083e471a8f430c7142af2cf6e1581ab12b8
-  data.tar.gz: 2b549a7cbde4f56ec88c0a7ef5fd802718d40536549507d912e682026cebde0cc7a999e66f764cd0095a568e604a54304d87de7674dbb6b3eba3edd772a188f6
+  metadata.gz: 5fa15ac1a973910a1ba705d38ef703db022ad99fc37a1a50ab9236c49a22c0505c3eec635b02df6d602c7504dcac7cc3f9ed81cec332827442055bf1808de242
+  data.tar.gz: 3c972f1c2a61d7ae39b1d4afde76bc86e72b884fab763d94339d3ea6a343a6f1ffebd7418c8abed432b3f0e539a68d2381e53a54fad8737a9ab828270ed7f861

data/README.md

@@ -6,7 +6,7 @@
 [![Dependency Status](https://gemnasium.com/abonas/kubeclient.svg)](https://gemnasium.com/abonas/kubeclient)
 
 A Ruby client for Kubernetes REST api.
-The client supports GET, POST, PUT, DELETE on nodes, pods, secrets, services, replication controllers, namespaces, resource quotas, limit ranges, endpoints, persistent volumes, persistent volume claims and component statuses.
+The client supports GET, POST, PUT, DELETE on nodes, pods, secrets, services, replication controllers, namespaces, resource quotas, limit ranges, endpoints, persistent volumes, persistent volume claims, component statuses and service accounts.
 The client currently supports Kubernetes REST api version v1.
 
 ## Installation
@@ -58,6 +58,19 @@ client = Kubeclient::Client.new 'https://localhost:8443/api/' , "v1",
                                 ssl_options: ssl_options
 ```
 
+As an alternative to the `ca_file` it's possible to use the `cert_store`:
+
+```ruby
+cert_store = OpenSSL::X509::Store.new
+cert_store.add_cert(OpenSSL::X509::Certificate.new(ca_cert_data))
+ssl_options = {
+  cert_store: cert_store
+  verify_ssl: OpenSSL::SSL::VERIFY_PEER
+}
+client = Kubeclient::Client.new 'https://localhost:8443/api/' , "v1",
+                                ssl_options: ssl_options
+```
+
 For testing and development purpose you can disable the ssl check with:
 
 ```ruby
@@ -118,7 +131,7 @@ client = Kubeclient::Client.new 'https://localhost:8443/api/' , 'v1',
 ## Examples:
 
 #### Get all instances of a specific entity type
-Such as: `get_pods`, `get_secrets`, `get_services`, `get_nodes`, `get_replication_controllers`, `get_resource_quotas`, `get_limit_ranges`, `get_persistent_volumes`, `get_persistent_volume_claims`, `get_component_statuses`
+Such as: `get_pods`, `get_secrets`, `get_services`, `get_nodes`, `get_replication_controllers`, `get_resource_quotas`, `get_limit_ranges`, `get_persistent_volumes`, `get_persistent_volume_claims`, `get_component_statuses`, `get_service_accounts`
 
 ```ruby
 pods = client.get_pods
@@ -142,7 +155,7 @@ pods = client.get_pods(label_selector: 'name=redis-master,app=redis')
 ```
 
 #### Get a specific instance of an entity (by name)
-Such as: `get_service "service name"` , `get_pod "pod name"` , `get_replication_controller "rc name"`, `get_secret "secret name"`, `get_resource_quota "resource quota name"`, `get_limit_range "limit range name"` , `get_persistent_volume "persistent volume name"` , `get_persistent_volume_claim "persistent volume claim name"`, `get_component_status "component name"`
+Such as: `get_service "service name"` , `get_pod "pod name"` , `get_replication_controller "rc name"`, `get_secret "secret name"`, `get_resource_quota "resource quota name"`, `get_limit_range "limit range name"` , `get_persistent_volume "persistent volume name"` , `get_persistent_volume_claim "persistent volume claim name"`, `get_component_status "component name"`, `get_service_account "service account name"`
 
 The GET request should include the namespace name, except for nodes and namespaces entities.
 
@@ -167,7 +180,7 @@ client.delete_service "redis-service"
 ```
 
 #### Create an entity
-For example: `create_pod pod_object`, `create_replication_controller rc_obj`, `create_secret secret_object`, `create_resource_quota resource_quota_object`, `create_limit_range limit_range_object`, `create_persistent_volume persistent_volume_object`, `create_persistent_volume_claim persistent_volume_claim_object`
+For example: `create_pod pod_object`, `create_replication_controller rc_obj`, `create_secret secret_object`, `create_resource_quota resource_quota_object`, `create_limit_range limit_range_object`, `create_persistent_volume persistent_volume_object`, `create_persistent_volume_claim persistent_volume_claim_object`, `create_service_account service_account_object`
 
 Input parameter - object of type `Service`, `Pod`, `ReplicationController`.
 
@@ -192,7 +205,7 @@ client.create_service service`
 ```
 
 #### Update an entity
-For example: `update_pod`, `update_service`, `update_replication_controller`, `update_secret`, `update_resource_quota`, `update_limit_range`, `update_persistent_volume`, `update_persistent_volume_claim`
+For example: `update_pod`, `update_service`, `update_replication_controller`, `update_secret`, `update_resource_quota`, `update_limit_range`, `update_persistent_volume`, `update_persistent_volume_claim`, `update_service_account`
 
 Input parameter - object of type `Pod`, `Service`, `ReplicationController` etc.
 
@@ -203,7 +216,7 @@ client.update_service service1
 ```
 
 #### Get all entities of all types : all_entities
-Returns a hash with 13 keys (node, secret, service, pod, replication_controller, namespace, resource_quota, limit_range, endpoint, event, persistent_volume, persistent_volume_claim and component_status). Each key points to an EntityList of same type.
+Returns a hash with 14 keys (node, secret, service, pod, replication_controller, namespace, resource_quota, limit_range, endpoint, event, persistent_volume, persistent_volume_claim, component_status and service_account). Each key points to an EntityList of same type.
 This method is a convenience method instead of calling each entity's get method separately.
 
 ```ruby
@@ -226,6 +239,16 @@ It is possible to interrupt the watcher from another thread with:
 watcher.finish
 ```
 
+#### Watch events for a particular object
+You can use the `field_selector` option as part of the watch methods.
+
+```ruby
+watcher = client.watch_events(namespace: 'development', field_selector: 'involvedObject.name=redis-master')
+watcher.each do |notice|
+  # process notice date
+end
+```
+
 #### Get a proxy URL
 You can get a complete URL for connecting a kubernetes entity via the proxy.
 
@@ -241,6 +264,38 @@ client.proxy_url('pod', 'podname', 5001, 'ns')
  => "https://localhost.localdomain:8443/api/v1/namespaces/ns/pods/podname:5001/proxy"
 ```
 
+#### Get the logs of a pod
+You can get the logs of a running pod, specifying the name of the pod and the
+namespace where the pod is running:
+
+```ruby
+client.get_pod_log('pod-name', 'default')
+ => "Running...\nRunning...\nRunning...\n"
+```
+
+If that pod has more than one container, you must specify the container:
+
+```ruby
+client.get_pod_log('pod-name', 'default', container: 'ruby')
+ => "..."
+```
+
+If a container in a pod terminates, a new container is started, and you want to
+retrieve the logs of the dead container, you can pass in the `:previous` option:
+
+```ruby
+client.get_pod_log('pod-name', 'default', previous: true)
+ => "..."
+```
+
+You can also watch the logs of a pod to get a stream of data:
+
+```ruby
+watcher = client.watch_pod_log('pod-name', 'default', container: 'ruby')
+watcher.each do |line|
+  puts line
+end
+```
 
 
 ## Contributing

data/lib/kubeclient.rb

@@ -19,7 +19,7 @@ module Kubeclient
     # and especially since currently the class body is empty
     ENTITY_TYPES = %w(Pod Service ReplicationController Node Event Endpoint
                       Namespace Secret ResourceQuota LimitRange PersistentVolume
-                      PersistentVolumeClaim ComponentStatus).map do |et|
+                      PersistentVolumeClaim ComponentStatus ServiceAccount).map do |et|
       clazz = Class.new(RecursiveOpenStruct) do
         def initialize(hash = nil, args = {})
           args.merge!(recurse_over_arrays: true)
@@ -35,9 +35,10 @@ module Kubeclient
                    version = 'v1',
                    ssl_options: {
                      client_cert: nil,
-                     client_key: nil,
-                     ca_file: nil,
-                     verify_ssl: OpenSSL::SSL::VERIFY_PEER
+                     client_key:  nil,
+                     ca_file:     nil,
+                     cert_store:  nil,
+                     verify_ssl:  OpenSSL::SSL::VERIFY_PEER
                    },
                    auth_options: {
                      username:          nil,

data/lib/kubeclient/common.rb

@@ -16,6 +16,7 @@ module Kubeclient
         client_cert: nil,
         client_key: nil,
         ca_file: nil,
+        cert_store: nil,
         verify_ssl: OpenSSL::SSL::VERIFY_PEER
       },
       auth_options: {
@@ -79,8 +80,12 @@ module Kubeclient
 
         # watch all entities of a type e.g. watch_nodes, watch_pods, etc.
         define_method("watch_#{entity_name_plural}") \
-        do |resource_version = nil|
-          watch_entities(entity_type, resource_version)
+        do |options = {}|
+          # This method used to take resource_version as a param, so
+          # this conversion is to keep backwards compatibility
+          options = { resource_version: options } unless options.is_a?(Hash)
+
+          watch_entities(entity_type, options)
         end
 
         # get a single entity of a specific type by name
@@ -111,6 +116,7 @@ module Kubeclient
       path ||= @api_endpoint.path
       options = {
         ssl_ca_file: @ssl_options[:ca_file],
+        ssl_cert_store: @ssl_options[:cert_store],
         verify_ssl: @ssl_options[:verify_ssl],
         ssl_client_cert: @ssl_options[:client_cert],
         ssl_client_key: @ssl_options[:client_key],
@@ -126,28 +132,41 @@ module Kubeclient
       end
     end
 
-    def watch_entities(entity_type, resource_version = nil)
-      resource = resource_name(entity_type.to_s)
-      uri = @api_endpoint
-            .merge("#{@api_endpoint.path}/#{@api_version}/watch/#{resource}")
-
-      unless resource_version.nil?
-        uri.query = URI.encode_www_form('resourceVersion' => resource_version)
+    # Accepts the following string options:
+    #   :namespace - the namespace of the entity.
+    #   :name - the name of the entity to watch.
+    #   :label_selector - a selector to restrict the list of returned objects by their labels.
+    #   :field_selector - a selector to restrict the list of returned objects by their fields.
+    #   :resource_version - shows changes that occur after that particular version of a resource.
+    def watch_entities(entity_type, options = {})
+      ns = build_namespace_prefix(options[:namespace])
+
+      path = "watch/#{ns}#{resource_name(entity_type.to_s)}"
+      path += "/#{options[:name]}" if options[:name]
+      uri = @api_endpoint.merge("#{@api_endpoint.path}/#{@api_version}/#{path}")
+
+      params = options.slice(:label_selector, :field_selector, :resource_version)
+      if params.any?
+        uri.query = URI.encode_www_form(params.map { |k, v| [k.to_s.camelize(:lower), v] })
       end
 
       Kubeclient::Common::WatchStream.new(uri, net_http_options(uri))
     end
 
+    # Accepts the following string options:
+    #   :namespace - the namespace of the entity.
+    #   :label_selector - a selector to restrict the list of returned objects by their labels.
+    #   :field_selector - a selector to restrict the list of returned objects by their fields.
     def get_entities(entity_type, klass, options = {})
       params = {}
-      if options[:label_selector]
-        params['params'] = { labelSelector: options[:label_selector] }
+      [:label_selector, :field_selector].each do |p|
+        params[p.to_s.camelize(:lower)] = options[p] if options[p]
       end
 
       ns_prefix = build_namespace_prefix(options[:namespace])
       response = handle_exception do
         rest_client[ns_prefix + resource_name(entity_type)]
-        .get(params.merge(@headers))
+        .get({ 'params' => params }.merge(@headers))
       end
 
       result = JSON.parse(response)
@@ -194,7 +213,6 @@ module Kubeclient
       # https://github.com/GoogleCloudPlatform/kubernetes/issues/6439
       hash['kind'] = entity_type
       hash['apiVersion'] = @api_version
-      @headers['Content-Type'] = 'application/json'
       response = handle_exception do
         rest_client[ns_prefix + resource_name(entity_type)]
         .post(hash.to_json, @headers)
@@ -209,7 +227,6 @@ module Kubeclient
       # struct
       hash = entity_config.to_hash
       ns_prefix = build_namespace_prefix(entity_config.metadata['table'][:namespace])
-      @headers['Content-Type'] = 'application/json'
       handle_exception do
         rest_client[ns_prefix + resource_name(entity_type) + "/#{name}"]
           .put(hash.to_json, @headers)
@@ -231,6 +248,33 @@ module Kubeclient
       end
     end
 
+    def get_pod_log(pod_name, namespace, container: nil, previous: false)
+      params = {}
+      params[:previous] = true if previous
+      params[:container] = container if container
+
+      ns = build_namespace_prefix(namespace)
+      handle_exception do
+        rest_client[ns + "pods/#{pod_name}/log"]
+          .get({ 'params' => params }.merge(@headers))
+      end
+    end
+
+    def watch_pod_log(pod_name, namespace, container: nil)
+      # Adding the "follow=true" query param tells the Kubernetes API to keep
+      # the connection open and stream updates to the log.
+      params = { follow: true }
+      params[:container] = container if container
+
+      ns = build_namespace_prefix(namespace)
+
+      uri = @api_endpoint.dup
+      uri.path += "/#{@api_version}/#{ns}pods/#{pod_name}/log"
+      uri.query = URI.encode_www_form(params)
+
+      Kubeclient::Common::WatchStream.new(uri, net_http_options(uri), format: :text)
+    end
+
     def proxy_url(kind, name, port, namespace = '')
       entity_name_plural = ClientMixin.pluralize_entity(kind.to_s)
       ns_prefix = build_namespace_prefix(namespace)
@@ -297,6 +341,7 @@ module Kubeclient
           use_ssl: true,
           ca_file: @ssl_options[:ca_file],
           cert: @ssl_options[:client_cert],
+          cert_store: @ssl_options[:cert_store],
           key: @ssl_options[:client_key],
           # ruby Net::HTTP uses verify_mode instead of verify_ssl
           # http://ruby-doc.org/stdlib-1.9.3/libdoc/net/http/rdoc/Net/HTTP.html

data/lib/kubeclient/version.rb

@@ -1,4 +1,4 @@
 # Kubernetes REST-API Client
 module Kubeclient
-  VERSION = '0.8.1'
+  VERSION = '0.9.0'
 end

data/test/json/service_account.json

@@ -0,0 +1,25 @@
+{
+    "kind": "ServiceAccount",
+    "apiVersion": "v1",
+    "metadata": {
+        "name": "default",
+        "namespace": "default",
+        "selfLink": "/api/v1/namespaces/default/serviceaccounts/default",
+        "uid": "d3d773f4-6bf0-11e5-843a-525400f8b93e",
+        "resourceVersion": "94",
+        "creationTimestamp": "2015-10-06T06:09:39Z"
+    },
+    "secrets": [
+        {
+            "name": "default-token-6s23q"
+        },
+        {
+            "name": "default-dockercfg-62tf3"
+        }
+    ],
+    "imagePullSecrets": [
+        {
+            "name": "default-dockercfg-62tf3"
+        }
+    ]
+}

data/test/json/service_account_list.json

@@ -0,0 +1,82 @@
+{
+    "kind": "List",
+    "apiVersion": "v1",
+    "metadata": {},
+    "items": [
+        {
+            "kind": "ServiceAccount",
+            "apiVersion": "v1",
+            "metadata": {
+                "name": "builder",
+                "namespace": "default",
+                "selfLink": "/api/v1/namespaces/default/serviceaccounts/builder",
+                "uid": "d40655f6-6bf0-11e5-843a-525400f8b93e",
+                "resourceVersion": "133",
+                "creationTimestamp": "2015-10-06T06:09:39Z"
+            },
+            "secrets": [
+                {
+                    "name": "builder-token-5v6z2"
+                },
+                {
+                    "name": "builder-dockercfg-qe2re"
+                }
+            ],
+            "imagePullSecrets": [
+                {
+                    "name": "builder-dockercfg-qe2re"
+                }
+            ]
+        },
+        {
+            "kind": "ServiceAccount",
+            "apiVersion": "v1",
+            "metadata": {
+                "name": "default",
+                "namespace": "default",
+                "selfLink": "/api/v1/namespaces/default/serviceaccounts/default",
+                "uid": "d3d773f4-6bf0-11e5-843a-525400f8b93e",
+                "resourceVersion": "94",
+                "creationTimestamp": "2015-10-06T06:09:39Z"
+            },
+            "secrets": [
+                {
+                    "name": "default-token-6s23q"
+                },
+                {
+                    "name": "default-dockercfg-62tf3"
+                }
+            ],
+            "imagePullSecrets": [
+                {
+                    "name": "default-dockercfg-62tf3"
+                }
+            ]
+        },
+        {
+            "kind": "ServiceAccount",
+            "apiVersion": "v1",
+            "metadata": {
+                "name": "deployer",
+                "namespace": "default",
+                "selfLink": "/api/v1/namespaces/default/serviceaccounts/deployer",
+                "uid": "d41d385e-6bf0-11e5-843a-525400f8b93e",
+                "resourceVersion": "137",
+                "creationTimestamp": "2015-10-06T06:09:39Z"
+            },
+            "secrets": [
+                {
+                    "name": "deployer-token-h3i57"
+                },
+                {
+                    "name": "deployer-dockercfg-qgjjj"
+                }
+            ],
+            "imagePullSecrets": [
+                {
+                    "name": "deployer-dockercfg-qgjjj"
+                }
+            ]
+        }
+    ]
+}

data/test/test_kubeclient.rb

@@ -172,6 +172,38 @@ class KubeClientTest < MiniTest::Test
                      times: 1)
   end
 
+  def test_entities_with_label_selector
+    selector = 'component=apiserver'
+
+    stub_request(:get, %r{/services})
+      .to_return(body: open_test_file('entity_list.json'),
+                 status: 200)
+
+    client = Kubeclient::Client.new 'http://localhost:8080/api/', 'v1'
+    services = client.get_services(label_selector: selector)
+
+    assert_instance_of(Kubeclient::Common::EntityList, services)
+    assert_requested(:get,
+                     "http://localhost:8080/api/v1/services?labelSelector=#{selector}",
+                     times: 1)
+  end
+
+  def test_entities_with_field_selector
+    selector = 'involvedObject.name=redis-master'
+
+    stub_request(:get, %r{/services})
+      .to_return(body: open_test_file('entity_list.json'),
+                 status: 200)
+
+    client = Kubeclient::Client.new 'http://localhost:8080/api/', 'v1'
+    services = client.get_services(field_selector: selector)
+
+    assert_instance_of(Kubeclient::Common::EntityList, services)
+    assert_requested(:get,
+                     "http://localhost:8080/api/v1/services?fieldSelector=#{selector}",
+                     times: 1)
+  end
+
   def test_empty_list
     stub_request(:get, %r{/pods})
       .to_return(body: open_test_file('empty_pod_list.json'),
@@ -234,9 +266,13 @@ class KubeClientTest < MiniTest::Test
       .to_return(body: open_test_file('component_status_list.json'),
                  status: 200)
 
+    stub_request(:get, %r{/serviceaccounts})
+      .to_return(body: open_test_file('service_account_list.json'),
+                 status: 200)
+
     client = Kubeclient::Client.new 'http://localhost:8080/api/', 'v1'
     result = client.all_entities
-    assert_equal(13, result.keys.size)
+    assert_equal(14, result.keys.size)
     assert_instance_of(Kubeclient::Common::EntityList, result['node'])
     assert_instance_of(Kubeclient::Common::EntityList, result['service'])
     assert_instance_of(Kubeclient::Common::EntityList,
@@ -256,6 +292,7 @@ class KubeClientTest < MiniTest::Test
     assert_instance_of(Kubeclient::PersistentVolume, result['persistent_volume'][0])
     assert_instance_of(Kubeclient::PersistentVolumeClaim, result['persistent_volume_claim'][0])
     assert_instance_of(Kubeclient::ComponentStatus, result['component_status'][0])
+    assert_instance_of(Kubeclient::ServiceAccount, result['service_account'][0])
   end
 
   def test_api_bearer_token_with_params_success

data/test/test_pod_log.rb

@@ -0,0 +1,50 @@
+require 'test_helper'
+
+# Pod log tests
+class TestPodLog < MiniTest::Test
+  def test_get_pod_log
+    stub_request(:get, %r{/namespaces/default/pods/[a-z0-9-]+/log})
+      .to_return(body: open_test_file('pod_log.txt'),
+                 status: 200)
+
+    client = Kubeclient::Client.new 'http://localhost:8080/api/', 'v1'
+    retrieved_log = client.get_pod_log('redis-master-pod', 'default')
+
+    assert_equal(open_test_file('pod_log.txt').read, retrieved_log)
+
+    assert_requested(:get,
+                     'http://localhost:8080/api/v1/namespaces/default/pods/redis-master-pod/log',
+                     times: 1)
+  end
+
+  def test_get_pod_log_container
+    stub_request(:get, %r{/namespaces/default/pods/[a-z0-9-]+/log})
+      .to_return(body: open_test_file('pod_log.txt'),
+                 status: 200)
+
+    client = Kubeclient::Client.new 'http://localhost:8080/api/', 'v1'
+    retrieved_log = client.get_pod_log('redis-master-pod', 'default', container: 'ruby')
+
+    assert_equal(open_test_file('pod_log.txt').read, retrieved_log)
+
+    assert_requested(:get,
+                     'http://localhost:8080/api/v1/namespaces/default/pods/redis-master-pod/log?container=ruby',
+                     times: 1)
+  end
+
+  def test_watch_pod_log
+    expected_lines = open_test_file('pod_log.txt').read.split("\n")
+
+    stub_request(:get, %r{/namespaces/default/pods/[a-z0-9-]+/log\?.*follow})
+      .to_return(body: open_test_file('pod_log.txt'),
+                 status: 200)
+
+    client = Kubeclient::Client.new 'http://localhost:8080/api/', 'v1'
+
+    stream = client.watch_pod_log('redis-master-pod', 'default')
+    stream.to_enum.with_index do |notice, index|
+      assert_instance_of(String, notice)
+      assert_equal(expected_lines[index], notice)
+    end
+  end
+end

data/test/test_service_account.rb

@@ -0,0 +1,22 @@
+require 'test_helper'
+
+# ServiceAccount tests
+class TestServiceAccount < MiniTest::Test
+  def test_get_from_json_v1
+    stub_request(:get, %r{/serviceaccounts})
+      .to_return(body: open_test_file('service_account.json'),
+                 status: 200)
+
+    client = Kubeclient::Client.new 'http://localhost:8080/api/', 'v1'
+    account = client.get_service_account 'default'
+
+    assert_instance_of(Kubeclient::ServiceAccount, account)
+    assert_equal('default', account.metadata.name)
+    assert_equal('default-token-6s23q', account.secrets[0].name)
+    assert_equal('default-dockercfg-62tf3', account.secrets[1].name)
+
+    assert_requested(:get,
+                     'http://localhost:8080/api/v1/serviceaccounts/default',
+                     times: 1)
+  end
+end

data/test/test_watch.rb

@@ -50,4 +50,55 @@ class TestWatch < MiniTest::Test
       assert_equal(expected_lines[index], line)
     end
   end
+
+  def test_watch_with_resource_version
+    api_host = 'http://localhost:8080/api'
+    version = '1995'
+
+    stub_request(:get, %r{.*\/watch/events})
+      .to_return(body: open_test_file('watch_stream.json'),
+                 status: 200)
+
+    client = Kubeclient::Client.new api_host, 'v1'
+    results = client.watch_events(version).to_enum
+
+    assert_equal(3, results.count)
+    assert_requested(:get,
+                     "#{api_host}/v1/watch/events?resourceVersion=#{version}",
+                     times: 1)
+  end
+
+  def test_watch_with_label_selector
+    api_host = 'http://localhost:8080/api'
+    selector = 'name=redis-master'
+
+    stub_request(:get, %r{.*\/watch/events})
+      .to_return(body: open_test_file('watch_stream.json'),
+                 status: 200)
+
+    client = Kubeclient::Client.new api_host, 'v1'
+    results = client.watch_events(label_selector: selector).to_enum
+
+    assert_equal(3, results.count)
+    assert_requested(:get,
+                     "#{api_host}/v1/watch/events?labelSelector=#{selector}",
+                     times: 1)
+  end
+
+  def test_watch_with_field_selector
+    api_host = 'http://localhost:8080/api'
+    selector = 'involvedObject.kind=Pod'
+
+    stub_request(:get, %r{.*\/watch/events})
+      .to_return(body: open_test_file('watch_stream.json'),
+                 status: 200)
+
+    client = Kubeclient::Client.new api_host, 'v1'
+    results = client.watch_events(field_selector: selector).to_enum
+
+    assert_equal(3, results.count)
+    assert_requested(:get,
+                     "#{api_host}/v1/watch/events?fieldSelector=#{selector}",
+                     times: 1)
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kubeclient
 version: !ruby/object:Gem::Version
-  version: 0.8.1
+  version: 0.9.0
 platform: ruby
 authors:
 - Alissa Bonas
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-08 00:00:00.000000000 Z
+date: 2015-10-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -202,6 +202,8 @@ files:
 - test/json/resource_quota_list.json
 - test/json/secret_list.json
 - test/json/service.json
+- test/json/service_account.json
+- test/json/service_account_list.json
 - test/json/service_illegal_json_404.json
 - test/json/service_list.json
 - test/json/service_update.json
@@ -217,10 +219,12 @@ files:
 - test/test_persistent_volume.rb
 - test/test_persistent_volume_claim.rb
 - test/test_pod.rb
+- test/test_pod_log.rb
 - test/test_replication_controller.rb
 - test/test_resource_quota.rb
 - test/test_secret.rb
 - test/test_service.rb
+- test/test_service_account.rb
 - test/test_watch.rb
 - test/txt/pod_log.txt
 - test/valid_token_file
@@ -279,6 +283,8 @@ test_files:
 - test/json/resource_quota_list.json
 - test/json/secret_list.json
 - test/json/service.json
+- test/json/service_account.json
+- test/json/service_account_list.json
 - test/json/service_illegal_json_404.json
 - test/json/service_list.json
 - test/json/service_update.json
@@ -294,10 +300,12 @@ test_files:
 - test/test_persistent_volume.rb
 - test/test_persistent_volume_claim.rb
 - test/test_pod.rb
+- test/test_pod_log.rb
 - test/test_replication_controller.rb
 - test/test_resource_quota.rb
 - test/test_secret.rb
 - test/test_service.rb
+- test/test_service_account.rb
 - test/test_watch.rb
 - test/txt/pod_log.txt
 - test/valid_token_file