kubeclient 0.1.16 → 0.1.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 06875bb69db97a971297a9623c7dddc960311aa7
-  data.tar.gz: e6fabf77ca3e62b6bbe8a4de5046bdbcacf4c91a
+  metadata.gz: d22e1e45425956eb53bd9177f30d99985689a53f
+  data.tar.gz: 2027dcdc5c43ba8920792de49c5b35ead7e98e64
 SHA512:
-  metadata.gz: cd8718be9eeff6a72038e92aade155552a4199ef13d7c8adbf94a4b4e828fee49098cfbf2fa69b997957ad138ec78d358c684036598c5118bd62d5d562c572ef
-  data.tar.gz: 6a257ee339f7268225e66e671401e54cc7c9179e31f3f44374a648d8eb5005e8c1fb4b2a746628bb5ab396f9b3bb4a43053472858533a0bd775093128d9ef282
+  metadata.gz: e71f71efb21a87e7184ddc2415f950d82d931bfc2b02bac01af66c87b1a97afd8bad320918fcc602e80c710ebae67d411542686c1b6bb7e67cf8b77d126f52ac
+  data.tar.gz: 4f0a8c4b33a3871ec3a8c0f9e4f8de1628b9bf6dc9ce0fc12c23865037ec74e8cc47f7f6feb110370bbcc4c2c0eb1409e04f78fdfeda01a8482d381051d5f449

data/README.md

@@ -69,12 +69,14 @@ If you are using basic authentication or bearer tokens as described
 of the following:
 
 ```ruby
-client.bearer_token('MDExMWJkMjItOWY1Ny00OGM5LWJlNDEtMjBiMzgxODkxYzYz')
+client.basic_auth('username', 'password')
 ```
+
 <br>
 or <br>
+
 ```ruby
-client.basic_auth('username', 'password')
+client.bearer_token('MDExMWJkMjItOWY1Ny00OGM5LWJlNDEtMjBiMzgxODkxYzYz')
 ```
 
 If you are running your app using kubeclient inside a Kubernetes cluster, then you can have a bearer token file
@@ -86,8 +88,8 @@ for more details).
 
 ## Examples:
 
-#### Get all pods
-And respectively: `get_services`, `get_nodes`, `get_replication_controllers`
+#### Get all instances of a specific entity type
+Such as: `get_pods`, `get_services`, `get_nodes`, `get_replication_controllers`
 
 ```ruby
 pods = client.get_pods
@@ -102,8 +104,8 @@ You can specify multiple labels (that option will return entities which have bot
 pods = client.get_pods(label_selector: 'name=redis-master,app=redis')
 ```
 
-#### Get a specific node
-And respectively: `get_service "service name"` , `get_pod "pod name"` , `get_replication_controller "rc name"`
+#### Get a specific instance of an entity (by name)
+Such as: `get_service "service name"` , `get_pod "pod name"` , `get_replication_controller "rc name"`
 
 The GET request should include the namespace name, except for nodes and namespaces entities.
 
@@ -118,17 +120,17 @@ service = client.get_service "guestbook", 'development'
 Note - Kubernetes doesn't work with the uid, but rather with the 'name' property.
 Querying with uid causes 404.
 
-#### Delete a service
+#### Delete an entity (by name)
 
-And respectively `delete_pod "pod id"` , `delete_replication_controller "rc id"`, `delete node "node id"`
+For example: `delete_pod "pod name"` , `delete_replication_controller "rc name"`, `delete node "node name"`
 
-Input parameter - id (string) specifying service id, pod id, replication controller id.
+Input parameter - name (string) specifying service name, pod name, replication controller name.
 ```ruby
 client.delete_service "redis-service"
 ```
 
-#### Create a service
-And respectively: `create_pod pod_object`, `create_replication_controller rc_obj`
+#### Create an entity
+For example: `create_pod pod_object`, `create_replication_controller rc_obj`
 
 Input parameter - object of type `Service`, `Pod`, `ReplicationController`.
 
@@ -145,8 +147,8 @@ service.spec.selector.role = "master"
 client.create_service service`
 ```
 
-#### Update entity
-And respectively `update_pod`, `update_service`, `update_replication_controller`
+#### Update an entity
+For example: `update_pod`, `update_service`, `update_replication_controller`
 
 Input parameter - object of type `Service`, `Pod`, `ReplicationController`
 
@@ -156,7 +158,7 @@ The below example is for v1beta3
 client.update_service service1
 ```
 
-#### all_entities
+#### Get all entities of all types : all_entities
 Returns a hash with 7 keys (node, service, pod, replication_controller, namespace, endpoint and event). Each key points to an EntityList of same type.
 
 This method is a convenience method instead of calling each entity's get method separately.

data/lib/kubeclient.rb

@@ -32,6 +32,7 @@ module Kubeclient
     def initialize(uri, version = 'v1beta3')
       handle_uri(uri, '/api')
       @api_version = version
+      @headers = {}
       ssl_options
     end
 

data/lib/kubeclient/common.rb

@@ -71,7 +71,6 @@ module Kubeclient
           verify_ssl: @ssl_options[:verify_ssl],
           ssl_client_cert: @ssl_options[:client_cert],
           ssl_client_key: @ssl_options[:client_key],
-          bearer_token: @bearer_token,
           user: @basic_auth_user,
           password: @basic_auth_password
         }
@@ -102,9 +101,9 @@ module Kubeclient
           verify_mode: @ssl_options[:verify_ssl],
           cert: @ssl_options[:client_cert],
           key: @ssl_options[:client_key],
-          bearer_token: @bearer_token,
           basic_auth_user: @basic_auth_user,
-          basic_auth_password: @basic_auth_password
+          basic_auth_password: @basic_auth_password,
+          headers: @headers
         }
 
         WatchStream.new(uri, options)
@@ -113,12 +112,13 @@ module Kubeclient
       def get_entities(entity_type, klass, options)
         params = {}
         if options[:label_selector]
-          params['labelSelector'] = options[:label_selector]
+          params['params'] = { labelSelector: options[:label_selector] }
         end
 
         # TODO: namespace support?
         response = handle_exception do
-          rest_client[resource_name(entity_type)].get(params: params)
+          rest_client[resource_name(entity_type)]
+          .get(params.merge(@headers))
         end
 
         result = JSON.parse(response)
@@ -137,7 +137,8 @@ module Kubeclient
       def get_entity(entity_type, klass, name, namespace = nil)
         ns_prefix = build_namespace_prefix(namespace)
         response = handle_exception do
-          rest_client[ns_prefix + resource_name(entity_type) + "/#{name}"].get
+          rest_client[ns_prefix + resource_name(entity_type) + "/#{name}"]
+          .get(@headers)
         end
         result = JSON.parse(response)
         new_entity(result, klass)
@@ -147,7 +148,7 @@ module Kubeclient
         ns_prefix = build_namespace_prefix(namespace)
         handle_exception do
           rest_client[ns_prefix + resource_name(entity_type) + "/#{name}"]
-            .delete
+            .delete(@headers)
         end
       end
 
@@ -164,7 +165,8 @@ module Kubeclient
         hash['kind'] = entity_type
         hash['apiVersion'] = @api_version
         response = handle_exception do
-          rest_client[ns_prefix + resource_name(entity_type)].post(hash.to_json)
+          rest_client[ns_prefix + resource_name(entity_type)]
+          .post(hash.to_json, @headers)
         end
         result = JSON.parse(response)
         new_entity(result, klass)
@@ -178,7 +180,7 @@ module Kubeclient
         ns_prefix = build_namespace_prefix(entity_config.metadata.namespace)
         handle_exception do
           rest_client[ns_prefix + resource_name(entity_type) + "/#{name}"]
-            .put(hash.to_json)
+            .put(hash.to_json, @headers)
         end
       end
 
@@ -207,7 +209,7 @@ module Kubeclient
 
       def api
         response = handle_exception do
-          create_rest_client.get
+          create_rest_client.get(@headers)
         end
         JSON.parse(response)
       end
@@ -223,10 +225,8 @@ module Kubeclient
       end
 
       def bearer_token(bearer_token)
-        @bearer_token = bearer_token
-        RestClient.add_before_execution_proc do |req|
-          req['authorization'] = "Bearer #{@bearer_token}"
-        end
+        @headers ||= {}
+        @headers[:Authorization] = "Bearer #{bearer_token}"
       end
 
       def basic_auth(user, password)

data/lib/kubeclient/kube_exception.rb

@@ -1,5 +1,5 @@
 # Kubernetes HTTP Exceptions
-class KubeException < Exception
+class KubeException < StandardError
   attr_reader :error_code, :message
 
   def initialize(error_code, message)

data/lib/kubeclient/version.rb

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

data/lib/kubeclient/watch_stream.rb

@@ -39,8 +39,8 @@ module Kubeclient
                              @options[:basic_auth_password]
         end
 
-        if @options[:bearer_token]
-          request['authorization'] = "Bearer #{@options[:bearer_token]}"
+        @options[:headers].each do |header, value|
+          request[header] = value
         end
         request
       end

data/test/test_kubeclient.rb

@@ -232,6 +232,21 @@ class KubeClientTest < MiniTest::Test
     assert_instance_of(Kubeclient::Namespace, result['namespace'][0])
   end
 
+  def test_api_bearer_token_with_params_success
+    stub_request(:get, 'http://localhost:8080/api/v1beta3/pods?labelSelector=name=redis-master')
+      .with(headers: { Authorization: 'Bearer valid_token' })
+      .to_return(body: open_test_json_file('pod_list_b3.json'),
+                 status: 200)
+
+    client = Kubeclient::Client.new 'http://localhost:8080/api/'
+    client.bearer_token('valid_token')
+
+    pods = client.get_pods(label_selector: 'name=redis-master')
+
+    assert_equal('Pod', pods.kind)
+    assert_equal(1, pods.size)
+  end
+
   def test_api_bearer_token_success
     stub_request(:get, 'http://localhost:8080/api/v1beta3/pods')
       .with(headers: { Authorization: 'Bearer valid_token' })
@@ -245,7 +260,6 @@ class KubeClientTest < MiniTest::Test
 
     assert_equal('Pod', pods.kind)
     assert_equal(1, pods.size)
-    RestClient.reset_before_execution_procs
   end
 
   def test_api_bearer_token_failure
@@ -262,7 +276,6 @@ class KubeClientTest < MiniTest::Test
     exception = assert_raises(KubeException) { client.get_pods }
     assert_equal(403, exception.error_code)
     assert_equal(error_message, exception.message)
-    RestClient.reset_before_execution_procs
   end
 
   def test_api_basic_auth_success

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kubeclient
 version: !ruby/object:Gem::Version
-  version: 0.1.16
+  version: 0.1.17
 platform: ruby
 authors:
 - Alissa Bonas
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-19 00:00:00.000000000 Z
+date: 2015-06-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler