kubeclient 0.1.4 → 0.1.5

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    MmJlNzRjMTMwMWM0NzU3ZjlmODZmNDZmOWVmOTcxNGJkODI1MjRiMA==
-  data.tar.gz: !binary |-
-    OWZhYTM1ZWY1ZTViOGVmMGVkYzNiZmNjZTgyYzQwMDJjMTRlNjY1Yw==
+SHA1:
+  metadata.gz: fbba708e9cb9c3075c713fbbeb857f1d40862e74
+  data.tar.gz: 6ae82fd5ed84ca5c8cb0cf4b5dc75f469673b8b7
 SHA512:
-  metadata.gz: !binary |-
-    YzM5ZjNjN2M1YTllMWE3NmNlYjJhZTY0Mzg5NWJlOGE4MzMyZDUyNzk4ZDZj
-    MTIyMTE1ODZmYzExMjM5NDQ2NDc0YTEyNTcyNWU1OTFkYzMyZTQzNzRjOWNj
-    ZGI5MDM4YmVhNWM4ZjE3YmFlNDJhMjY4NmI5ZjFmODBlOTkzNDI=
-  data.tar.gz: !binary |-
-    YzU3MjViNjAxYTI3NDk1YzU4NjM1NTdjNWUxZjBiNDJlMzFhZDVmODI4NTU2
-    MTdkNDE4MmVhMzY3YTg2OGI1ODBjNzU2MDk1M2VhOGZlMjBmMmZmN2M3ZDcw
-    NzdkZTlkZmU2YTFhNmQ4Y2YzNjhkMGU0MTNmODc4OWY0ZjAzYTA=
+  metadata.gz: 27c5a0e7b4ffb85ba71fe6e5400dd4a31daba72dbe4448df99477268f73d1903bdcd6ff57f34cf04ec896849286e3cc7cc552833e5d3e376f97cde78469491f6
+  data.tar.gz: 40c6d213114e6e07605132dc8e012886c68e191319e08c5ad9016a18494f0e9f474e32fa02ed0dc839c9ede26fbb505b4338f4bfa4a5ad93ea95914fc2f2f790

data/README.md

@@ -6,8 +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 pods, services and replication controllers.
-Also, GET and DELETE is supported for nodes.
+The client supports GET, POST, PUT, DELETE on nodes, pods, services, replication controllers and namespaces.
 The client currently supports Kubernetes REST api version v1beta1 and v1beta3.
 
 ## Installation
@@ -109,9 +108,11 @@ It is possible to interrupt the watcher from another thread with:
 
 1. Fork it ( https://github.com/[my-github-username]/kubeclient/fork )
 2. Create your feature branch (`git checkout -b my-new-feature`)
-3. Commit your changes (`git commit -am 'Add some feature'`)
-4. Push to the branch (`git push origin my-new-feature`)
-5. Create a new Pull Request
+3. Test your changes with `rake test rubocop`, add new tests if needed.
+4. If you added a new functionality, add it to README
+5. Commit your changes (`git commit -am 'Add some feature'`)
+6. Push to the branch (`git push origin my-new-feature`)
+7. Create a new Pull Request
 
 ## Tests
 

data/lib/kubeclient/namespace.rb

@@ -0,0 +1,4 @@
+require 'recursive_open_struct'
+
+class Namespace <  RecursiveOpenStruct
+end

data/lib/kubeclient/version.rb

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

data/lib/kubeclient.rb

@@ -17,7 +17,9 @@ module Kubeclient
   # Kubernetes Client
   class Client
     attr_reader :api_endpoint
-    ENTITIES = %w(Pod Service ReplicationController Node Event Endpoint)
+
+    ENTITY_TYPES = %w(Pod Service ReplicationController Node Event Endpoint
+                      Namespace)
 
     def initialize(uri, version)
       @api_endpoint = (uri.is_a? URI) ? uri : URI.parse(uri)
@@ -48,17 +50,98 @@ module Kubeclient
       raise KubeException.new(e.http_code, JSON.parse(e.response)['message'])
     end
 
+    def get_entities(entity_type)
+      # TODO: labels support
+      # TODO: namespace support?
+      response = handling_kube_exception do
+        rest_client[get_resource_name(entity_type)].get # nil, labels
+      end
+
+      result = JSON.parse(response)
+
+      resource_version = result.fetch('resourceVersion', nil)
+      if resource_version.nil?
+        resource_version =
+          result.fetch('metadata', {}).fetch('resourceVersion', nil)
+      end
+
+      collection = EntityList.new(entity_type, resource_version)
+
+      result['items'].each do |item|
+        collection.push(new_entity(item, entity_type))
+      end
+
+      collection
+    end
+
+    def watch_entities(entity_type, resource_version = nil)
+      resource_name = get_resource_name(entity_type.to_s)
+
+      uri = api_endpoint.merge(
+        File.join(api_endpoint.path, 'watch', resource_name))
+
+      unless resource_version.nil?
+        uri.query = URI.encode_www_form('resourceVersion' => resource_version)
+      end
+
+      options = {
+        use_ssl:      uri.scheme == 'https',
+        ca_file:      @ssl_options[:ca_file],
+        verify_ssl:   @ssl_options[:verify_ssl],
+        client_cert:  @ssl_options[:client_cert],
+        client_key:   @ssl_options[:client_key]
+      }
+
+      WatchStream.new(uri, options)
+    end
+
+    def get_entity(entity_type, id)
+      response = handling_kube_exception do
+        rest_client[get_resource_name(entity_type) + "/#{id}"].get
+      end
+      result = JSON.parse(response)
+      new_entity(result, entity_type)
+    end
+
+    def delete_entity(entity_type, id)
+      handling_kube_exception do
+        rest_client[get_resource_name(entity_type) + "/#{id}"].delete
+      end
+    end
+
+    def create_entity(entity_type, entity_config)
+      # to_hash should be called because of issue #9 in recursive open
+      # struct
+      hash = entity_config.to_hash
+      handling_kube_exception do
+        rest_client[get_resource_name(entity_type)].post(hash.to_json)
+      end
+    end
+
+    def update_entity(entity_type, entity_config)
+      id = entity_config.id
+      # to_hash should be called because of issue #9 in recursive open
+      # struct
+      hash = entity_config.to_hash
+      # TODO: temporary solution to delete id till this issue is solved
+      # https://github.com/GoogleCloudPlatform/kubernetes/issues/3085
+      hash.delete(:id)
+      handling_kube_exception do
+        rest_client[get_resource_name(entity_type) + "/#{id}"].put(hash.to_json)
+      end
+    end
+
     protected
 
-    def create_entity(hash, entity)
-      entity.classify.constantize.new(hash)
+    def new_entity(hash, entity_type)
+      entity_type.classify.constantize.new(hash)
     end
 
-    def get_resource_name(entity)
+    def get_resource_name(entity_type)
       if @api_version == 'v1beta1'
-        entity.pluralize.camelize(:lower)
+        entity_type.pluralize.camelize(:lower)
       else
-        entity.pluralize.downcase
+        entity_type.pluralize.downcase
       end
     end
 
@@ -74,100 +157,44 @@ module Kubeclient
       }
     end
 
-    ENTITIES.each do |entity|
-      # get all entities of a type e.g. get_nodes, get_pods, etc.
-      define_method("get_#{entity.underscore.pluralize}") do
-        # TODO: labels support
-        # TODO: namespace support?
-        response = handling_kube_exception do
-          rest_client[get_resource_name(entity)].get # nil, labels
-        end
-
-        result = JSON.parse(response)
-
-        resource_version = result.fetch('resourceVersion', nil)
-        if resource_version.nil?
-          resource_version =
-            result.fetch('metadata', {}).fetch('resourceVersion', nil)
-        end
-
-        collection = EntityList.new(entity, resource_version)
+    ENTITY_TYPES.each do |entity_type|
+      entity_name = entity_type.underscore
+      entity_name_plural = entity_name.pluralize
 
-        result['items'].each do |item|
-          collection.push(create_entity(item, entity))
-        end
-
-        collection
+      # get all entities of a type e.g. get_nodes, get_pods, etc.
+      define_method("get_#{entity_name_plural}") do
+        get_entities(entity_type)
       end
 
       # watch all entities of a type e.g. watch_nodes, watch_pods, etc.
-      define_method("watch_#{entity.underscore.pluralize}") \
-          do |resourceVersion = nil|
-        resource_name = get_resource_name(entity.to_s)
-
-        uri = api_endpoint.merge(
-          File.join(api_endpoint.path, 'watch', resource_name))
+      define_method("watch_#{entity_name_plural}") do |resource_version = nil|
+        watch_entities(entity_type, resource_version)
+      end
 
-        unless resourceVersion.nil?
-          uri.query = URI.encode_www_form(
-            'resourceVersion' => resourceVersion)
-        end
+      # get a single entity of a specific type by id
+      define_method("get_#{entity_name}") do |id|
+        get_entity(entity_type, id)
+      end
 
-        options = {
-          use_ssl:      uri.scheme == 'https',
-          ca_file:      @ssl_options[:ca_file],
-          verify_ssl:   @ssl_options[:verify_ssl],
-          client_cert:  @ssl_options[:client_cert],
-          client_key:   @ssl_options[:client_key]
-        }
+      define_method("delete_#{entity_name}") do |id|
+        delete_entity(entity_type, id)
+      end
 
-        WatchStream.new(uri, options)
+      define_method("create_#{entity_name}") do |entity_config|
+        create_entity(entity_type, entity_config)
       end
 
-      # get a single entity of a specific type by id
-      define_method("get_#{entity.underscore}") do |id|
-        response = handling_kube_exception do
-          rest_client[get_resource_name(entity) + "/#{id}"].get
-        end
-        result = JSON.parse(response)
-        create_entity(result, entity)
-      end
-
-      define_method("delete_#{entity.underscore}") do |id|
-        handling_kube_exception do
-          rest_client[get_resource_name(entity) + "/#{id}"].delete
-        end
-      end
-
-      define_method("create_#{entity.underscore}") do |entity_config|
-        # to_hash should be called because of issue #9 in recursive open
-        # struct
-        hash = entity_config.to_hash
-        handling_kube_exception do
-          rest_client[get_resource_name(entity)].post(hash.to_json)
-        end
-      end
-
-      define_method("update_#{entity.underscore}") do |entity_config|
-        id = entity_config.id
-        # to_hash should be called because of issue #9 in recursive open
-        # struct
-        hash = entity_config.to_hash
-        # TODO: temporary solution to delete id till this issue is solved
-        # https://github.com/GoogleCloudPlatform/kubernetes/issues/3085
-        hash.delete(:id)
-        handling_kube_exception do
-          rest_client[get_resource_name(entity) + "/#{id}"].put(hash.to_json)
-        end
+      define_method("update_#{entity_name}") do |entity_config|
+        update_entity(entity_type, entity_config)
       end
     end
 
     def all_entities
-      ENTITIES.each_with_object({}) do |entity, result_hash|
+      ENTITY_TYPES.each_with_object({}) do |entity_type, result_hash|
         # method call for get each entities
         # build hash of entity name to array of the entities
-        method_name = "get_#{entity.underscore.pluralize}"
-        key_name = entity.underscore
+        method_name = "get_#{entity_type.underscore.pluralize}"
+        key_name = entity_type.underscore
         result_hash[key_name] = send(method_name)
       end
     end

data/test/json/namespace_b3.json

@@ -0,0 +1,13 @@
+{
+    "kind": "Namespace",
+    "apiVersion": "v1beta3",
+    "metadata": {
+        "name": "staging",
+        "selfLink": "/api/v1beta3/namespaces/staging",
+        "uid": "e388bc10-c021-11e4-a514-3c970e4a436a",
+        "resourceVersion": "1168",
+        "creationTimestamp": "2015-03-01T16:47:31+02:00"
+    },
+    "spec": {},
+    "status": {}
+}

data/test/json/namespace_list_b3.json

@@ -0,0 +1,32 @@
+{
+    "kind": "NamespaceList",
+    "apiVersion": "v1beta3",
+    "metadata": {
+        "selfLink": "/api/v1beta3/namespaces",
+        "resourceVersion": "1707"
+    },
+    "items": [
+        {
+            "metadata": {
+                "name": "default",
+                "selfLink": "/api/v1beta3/namespaces/default",
+                "uid": "56c3eb7c-c009-11e4-a514-3c970e4a436a",
+                "resourceVersion": "4",
+                "creationTimestamp": "2015-03-01T13:51:47+02:00"
+            },
+            "spec": {},
+            "status": {}
+        },
+        {
+            "metadata": {
+                "name": "staging",
+                "selfLink": "/api/v1beta3/namespaces/staging",
+                "uid": "e388bc10-c021-11e4-a514-3c970e4a436a",
+                "resourceVersion": "1168",
+                "creationTimestamp": "2015-03-01T16:47:31+02:00"
+            },
+            "spec": {},
+            "status": {}
+        }
+    ]
+}

data/test/kubeclient_test.rb

@@ -85,18 +85,24 @@ class KubeClientTest < MiniTest::Test
       .to_return(body: open_test_json_file('endpoint_list_b3.json'),
                  status: 200)
 
+    stub_request(:get, /\/namespaces/)
+      .to_return(body: open_test_json_file('namespace_list_b3.json'),
+                 status: 200)
+
     client = Kubeclient::Client.new 'http://localhost:8080/api/', 'v1beta1'
     result = client.all_entities
-    assert_equal(6, result.keys.size)
+    assert_equal(7, result.keys.size)
     assert_instance_of(EntityList, result['node'])
     assert_instance_of(EntityList, result['service'])
     assert_instance_of(EntityList, result['replication_controller'])
     assert_instance_of(EntityList, result['pod'])
     assert_instance_of(EntityList, result['event'])
+    assert_instance_of(EntityList, result['namespace'])
     assert_instance_of(Service, result['service'][0])
     assert_instance_of(Node, result['node'][0])
     assert_instance_of(Event, result['event'][0])
     assert_instance_of(Endpoint, result['endpoint'][0])
+    assert_instance_of(Namespace, result['namespace'][0])
   end
 
   private

data/test/namespace_test.rb

@@ -0,0 +1,34 @@
+require 'minitest/autorun'
+require 'webmock/minitest'
+require 'kubeclient/namespace'
+require 'json'
+require './lib/kubeclient'
+
+# Namespace entity tests
+class NamespaceTest < MiniTest::Test
+  def test_get_namespace_v1beta3
+    stub_request(:get, /\/namespaces/)
+      .to_return(body: open_test_json_file('namespace_b3.json'),
+                 status: 200)
+
+    client = Kubeclient::Client.new 'http://localhost:8080/api/', 'v1beta3'
+    namespace = client.get_namespace 'staging'
+
+    assert_instance_of(Namespace, namespace)
+    assert_equal('e388bc10-c021-11e4-a514-3c970e4a436a', namespace.metadata.uid)
+    assert_equal('staging', namespace.metadata.name)
+    assert_equal('1168', namespace.metadata.resourceVersion)
+    assert_equal('v1beta3', namespace.apiVersion)
+  end
+
+  def test_delete_namespace_v1beta3
+    our_namespace = Namespace.new
+    our_namespace.name = 'staging'
+
+    stub_request(:delete, /\/namespaces/)
+      .to_return(status: 200)
+
+    client = Kubeclient::Client.new 'http://localhost:8080/api/', 'v1beta3'
+    client.delete_namespace our_namespace.name
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kubeclient
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors:
 - Alissa Bonas
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-19 00:00:00.000000000 Z
+date: 2015-03-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -42,98 +42,98 @@ dependencies:
   name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rest-client
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: recursive-open-struct
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: A client for Kubernetes REST api
@@ -156,6 +156,7 @@ files:
 - lib/kubeclient/entity_list.rb
 - lib/kubeclient/event.rb
 - lib/kubeclient/kube_exception.rb
+- lib/kubeclient/namespace.rb
 - lib/kubeclient/node.rb
 - lib/kubeclient/pod.rb
 - lib/kubeclient/replication_controller.rb
@@ -170,6 +171,8 @@ files:
 - test/json/get_all_pods_b1.json
 - test/json/get_all_replication_b1.json
 - test/json/get_all_services_b1.json
+- test/json/namespace_b3.json
+- test/json/namespace_list_b3.json
 - test/json/node_b1.json
 - test/json/node_b3.json
 - test/json/pod_b1.json
@@ -181,6 +184,7 @@ files:
 - test/json/service_exception_b1.json
 - test/json/watch_stream_b3.json
 - test/kubeclient_test.rb
+- test/namespace_test.rb
 - test/node_test.rb
 - test/pod_test.rb
 - test/replication_controller_test.rb
@@ -196,17 +200,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: 2.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: A client for Kubernetes REST api
@@ -218,6 +222,8 @@ test_files:
 - test/json/get_all_pods_b1.json
 - test/json/get_all_replication_b1.json
 - test/json/get_all_services_b1.json
+- test/json/namespace_b3.json
+- test/json/namespace_list_b3.json
 - test/json/node_b1.json
 - test/json/node_b3.json
 - test/json/pod_b1.json
@@ -229,6 +235,7 @@ test_files:
 - test/json/service_exception_b1.json
 - test/json/watch_stream_b3.json
 - test/kubeclient_test.rb
+- test/namespace_test.rb
 - test/node_test.rb
 - test/pod_test.rb
 - test/replication_controller_test.rb