kubeclient 0.1.9 → 0.1.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 44f9ae79ede59af09899f793e1ed033432e53961
-  data.tar.gz: 91bd146bc7163d9b63ef077d36282c3f3d4d6e31
+  metadata.gz: e43821f5d44f8c1c576f9a026781bd392216148d
+  data.tar.gz: 6034365578182ed965eebf2c4947de38c76aa8f8
 SHA512:
-  metadata.gz: a228a944f9d2ef70578ab7ad97b5ed1a0636b8b2bcc9e3553d18e5a97c064d2f4135e0803babcf3774e4c020d9ebeb199a0179fa8725ab53e6c91c7bb4a283ac
-  data.tar.gz: b770ad33ad96267dbea66d3cd6e3bff15968dd91c2f1f9a540bcc96936762264667c8ea1f19c186c68ba7b017a077dbedf43b2ebef3ea0cd61729080bf14d021
+  metadata.gz: 39321cd7d662320e4a91665aa6619afe4271378233f4e64cb47e957298fbf378c59ead7912728a758c9dc37977f43a26daff9fea5a7b4ba1325defbfa563d2dc
+  data.tar.gz: 596d4e2b33a4a9b950859799a5ccfaaf69c56ade5a7e3c78a71cfc027c0a06be1c5549816d3388034228c77a03b51b79e782afdc82d4a06b3534c38d4b8daf74

data/kubeclient.gemspec

@@ -14,8 +14,8 @@ Gem::Specification.new do |spec|
   spec.license       = 'MIT'
 
   spec.files         = `git ls-files -z`.split("\x0")
-  spec.executables   = spec.files.grep(/^bin\//) { |f| File.basename(f) }
-  spec.test_files    = spec.files.grep(/^(test|spec|features)\//)
+  spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
+  spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ['lib']
   spec.required_ruby_version = '>= 2.0.0'
 
@@ -23,7 +23,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'rake', '~> 10.0'
   spec.add_development_dependency 'minitest'
   spec.add_development_dependency 'webmock'
-  spec.add_development_dependency 'rubocop'
+  spec.add_development_dependency 'rubocop', '= 0.30.0'
   spec.add_dependency 'rest-client'
   spec.add_dependency 'activesupport'
   spec.add_dependency 'json'

data/lib/kubeclient.rb

@@ -20,7 +20,13 @@ module Kubeclient
     # and especially since currently the class body is empty
     ENTITY_TYPES = %w(Pod Service ReplicationController Node Event Endpoint
                       Namespace).map do |et|
-      [Kubeclient.const_set(et, Class.new(RecursiveOpenStruct)), et]
+      clazz = Class.new(RecursiveOpenStruct) do
+        def initialize(hash = nil, args = {})
+          args.merge!(recurse_over_arrays: true)
+          super(hash, args)
+        end
+      end
+      [Kubeclient.const_set(et, clazz), et]
     end
 
     def initialize(uri, version = 'v1beta3')

data/lib/kubeclient/common.rb

@@ -40,13 +40,13 @@ module Kubeclient
             watch_entities(entity_type, resource_version)
           end
 
-          # get a single entity of a specific type by id
-          define_method("get_#{entity_name}") do |id|
-            get_entity(entity_type, klass, id)
+          # get a single entity of a specific type by name
+          define_method("get_#{entity_name}") do |name|
+            get_entity(entity_type, klass, name)
           end
 
-          define_method("delete_#{entity_name}") do |id|
-            delete_entity(entity_type, id)
+          define_method("delete_#{entity_name}") do |name|
+            delete_entity(entity_type, name)
           end
 
           define_method("create_#{entity_name}") do |entity_config|
@@ -67,17 +67,17 @@ module Kubeclient
             ssl_client_cert: @ssl_options[:client_cert],
             ssl_client_key: @ssl_options[:client_key]
           }
-          endpoint_with_version = @api_endpoint.merge(@api_endpoint.path + '/' \
-                                                      + @api_version)
-          RestClient::Resource.new(endpoint_with_version, options)
+          endpoint_with_ver = @api_endpoint
+                              .merge("#{@api_endpoint.path}/#{@api_version}")
+          RestClient::Resource.new(endpoint_with_ver, options)
         end
       end
 
       def watch_entities(entity_type, resource_version = nil)
-        resource_name = get_resource_name(entity_type.to_s)
+        resource = get_resource_name(entity_type.to_s)
 
-        uri = @api_endpoint.merge(@api_endpoint.path + '/' + @api_version \
-                                  + '/watch/' + resource_name)
+        uri = @api_endpoint
+              .merge("#{@api_endpoint.path}/#{@api_version}/watch/#{resource}")
 
         unless resource_version.nil?
           uri.query = URI.encode_www_form('resourceVersion' => resource_version)
@@ -86,7 +86,9 @@ module Kubeclient
         options = {
           use_ssl: uri.scheme == 'https',
           ca_file: @ssl_options[:ca_file],
-          verify_ssl: @ssl_options[:verify_ssl],
+          # 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
+          verify_mode: @ssl_options[:verify_ssl],
           client_cert: @ssl_options[:client_cert],
           client_key: @ssl_options[:client_key]
         }
@@ -118,17 +120,17 @@ module Kubeclient
         EntityList.new(entity_type, resource_version, collection)
       end
 
-      def get_entity(entity_type, klass, id)
+      def get_entity(entity_type, klass, name)
         response = handle_exception do
-          rest_client[get_resource_name(entity_type) + "/#{id}"].get
+          rest_client[get_resource_name(entity_type) + "/#{name}"].get
         end
         result = JSON.parse(response)
         new_entity(result, klass)
       end
 
-      def delete_entity(entity_type, id)
+      def delete_entity(entity_type, name)
         handle_exception do
-          rest_client[get_resource_name(entity_type) + "/#{id}"].delete
+          rest_client[get_resource_name(entity_type) + "/#{name}"].delete
         end
       end
 
@@ -142,7 +144,7 @@ module Kubeclient
       end
 
       def update_entity(entity_type, entity_config)
-        id = entity_config.id
+        name = entity_config.name
         # to_hash should be called because of issue #9 in recursive open
         # struct
         hash = entity_config.to_hash
@@ -150,7 +152,7 @@ module Kubeclient
         # https://github.com/GoogleCloudPlatform/kubernetes/issues/3085
         hash.delete(:id)
         handle_exception do
-          rest_client[get_resource_name(entity_type) + "/#{id}"]
+          rest_client[get_resource_name(entity_type) + "/#{name}"]
             .put(hash.to_json)
         end
       end

data/lib/kubeclient/version.rb

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

data/test/json/service_b3.json

@@ -2,26 +2,32 @@
     "kind": "Service",
     "apiVersion": "v1beta3",
     "metadata": {
-        "name": "kubernetes-ro",
-        "namespace": "default",
-        "selfLink": "/api/v1beta3/services/kubernetes-ro?namespace=default",
-        "uid": "ffb153db-a230-11e4-a36b-3c970e4a436a",
-        "resourceVersion": "4",
-        "creationTimestamp": "2015-01-22T14:20:05+02:00",
+        "name": "redis-slave",
+        "namespace": "development",
+        "selfLink": "/api/v1beta3/namespaces/development/services/redis-slave",
+        "uid": "bdb80a8f-db93-11e4-b293-f8b156af4ae1",
+        "resourceVersion": "2815",
+        "creationTimestamp": "2015-04-05T13:00:31Z",
         "labels": {
-            "component": "apiserver",
-            "provider": "kubernetes"
+            "name": "redis",
+            "role": "slave"
         }
     },
     "spec": {
-        "port": 80,
-        "protocol": "TCP",
-        "selector": null,
-        "portalIP": "10.0.0.154",
-        "containerPort": 0,
+        "ports": [
+            {
+                "name": "",
+                "protocol": "TCP",
+                "port": 6379,
+                "targetPort": "redis-server"
+            }
+        ],
+        "selector": {
+            "name": "redis",
+            "role": "slave"
+        },
+        "portalIP": "10.0.0.140",
         "sessionAffinity": "None"
     },
-    "status": {
-
-    }
-}
+    "status": {}
+}

data/test/json/service_list_b3.json

@@ -0,0 +1,97 @@
+{
+    "kind": "ServiceList",
+    "apiVersion": "v1beta3",
+    "metadata": {
+        "selfLink": "/api/v1beta3/services",
+        "resourceVersion": "36727"
+    },
+    "items": [
+        {
+            "metadata": {
+                "name": "kubernetes",
+                "namespace": "default",
+                "selfLink": "/api/v1beta3/namespaces/default/services/kubernetes",
+                "uid": "b6606490-db86-11e4-b293-f8b156af4ae1",
+                "resourceVersion": "6",
+                "creationTimestamp": "2015-04-05T11:27:15Z",
+                "labels": {
+                    "component": "apiserver",
+                    "provider": "kubernetes"
+                }
+            },
+            "spec": {
+                "ports": [
+                    {
+                        "name": "",
+                        "protocol": "TCP",
+                        "port": 443,
+                        "targetPort": 443
+                    }
+                ],
+                "selector": null,
+                "portalIP": "10.0.0.2",
+                "sessionAffinity": "None"
+            },
+            "status": {}
+        },
+        {
+            "metadata": {
+                "name": "kubernetes-ro",
+                "namespace": "default",
+                "selfLink": "/api/v1beta3/namespaces/default/services/kubernetes-ro",
+                "uid": "b6606694-db86-11e4-b293-f8b156af4ae1",
+                "resourceVersion": "5",
+                "creationTimestamp": "2015-04-05T11:27:15Z",
+                "labels": {
+                    "component": "apiserver",
+                    "provider": "kubernetes"
+                }
+            },
+            "spec": {
+                "ports": [
+                    {
+                        "name": "",
+                        "protocol": "TCP",
+                        "port": 80,
+                        "targetPort": 80
+                    }
+                ],
+                "selector": null,
+                "portalIP": "10.0.0.1",
+                "sessionAffinity": "None"
+            },
+            "status": {}
+        },
+        {
+            "metadata": {
+                "name": "redis-slave",
+                "namespace": "development",
+                "selfLink": "/api/v1beta3/namespaces/development/services/redis-slave",
+                "uid": "bdb80a8f-db93-11e4-b293-f8b156af4ae1",
+                "resourceVersion": "2815",
+                "creationTimestamp": "2015-04-05T13:00:31Z",
+                "labels": {
+                    "name": "redis",
+                    "role": "slave"
+                }
+            },
+            "spec": {
+                "ports": [
+                    {
+                        "name": "",
+                        "protocol": "TCP",
+                        "port": 6379,
+                        "targetPort": "redis-server"
+                    }
+                ],
+                "selector": {
+                    "name": "redis",
+                    "role": "slave"
+                },
+                "portalIP": "10.0.0.140",
+                "sessionAffinity": "None"
+            },
+            "status": {}
+        }
+    ]
+}

data/test/test_kubeclient.rb

@@ -43,12 +43,12 @@ class KubeClientTest < MiniTest::Test
   end
 
   def test_exception
-    stub_request(:post, /\/services/)
+    stub_request(:post, %r{/services})
       .to_return(body: open_test_json_file('namespace_exception_b3.json'),
                  status: 409)
 
     service = Kubeclient::Service.new
-    service.id = 'redisslave'
+    service.name = 'redisslave'
     service.port = 80
     service.container_port = 6379
     service.protocol = 'TCP'
@@ -107,7 +107,7 @@ class KubeClientTest < MiniTest::Test
   end
 
   def test_nonjson_exception
-    stub_request(:get, /\/servic/)
+    stub_request(:get, %r{/servic})
       .to_return(body: open_test_json_file('service_illegal_json_404.json'),
                  status: 404)
 
@@ -123,7 +123,7 @@ class KubeClientTest < MiniTest::Test
   end
 
   def test_entity_list
-    stub_request(:get, /\/services/)
+    stub_request(:get, %r{/services})
       .to_return(body: open_test_json_file('entity_list_b3.json'),
                  status: 200)
 
@@ -139,7 +139,7 @@ class KubeClientTest < MiniTest::Test
   end
 
   def test_empty_list
-    stub_request(:get, /\/pods/)
+    stub_request(:get, %r{/pods})
       .to_return(body: open_test_json_file('empty_pod_list_b3.json'),
                  status: 200)
 
@@ -150,30 +150,30 @@ class KubeClientTest < MiniTest::Test
   end
 
   def test_get_all
-    stub_request(:get, /\/services/)
-      .to_return(body: open_test_json_file('get_all_services_b3.json'),
+    stub_request(:get, %r{/services})
+      .to_return(body: open_test_json_file('service_list_b3.json'),
                  status: 200)
 
-    stub_request(:get, /\/pods/)
+    stub_request(:get, %r{/pods})
       .to_return(body: open_test_json_file('pod_list_b3.json'),
                  status: 200)
 
-    stub_request(:get, /\/nodes/)
+    stub_request(:get, %r{/nodes})
       .to_return(body: open_test_json_file('node_list_b3.json'),
                  status: 200)
 
-    stub_request(:get, /\/replicationcontrollers/)
+    stub_request(:get, %r{/replicationcontrollers})
       .to_return(body: open_test_json_file('replication_controller_list_' \
                                     'b3.json'), status: 200)
 
-    stub_request(:get, /\/events/)
+    stub_request(:get, %r{/events})
       .to_return(body: open_test_json_file('event_list_b3.json'), status: 200)
 
-    stub_request(:get, /\/endpoints/)
+    stub_request(:get, %r{/endpoints})
       .to_return(body: open_test_json_file('endpoint_list_b3.json'),
                  status: 200)
 
-    stub_request(:get, /\/namespaces/)
+    stub_request(:get, %r{/namespaces})
       .to_return(body: open_test_json_file('namespace_list_b3.json'),
                  status: 200)
 

data/test/test_namespace.rb

@@ -3,7 +3,7 @@ require 'test_helper'
 # Namespace entity tests
 class TestNamespace < MiniTest::Test
   def test_get_namespace_v1beta3
-    stub_request(:get, /\/namespaces/)
+    stub_request(:get, %r{/namespaces})
       .to_return(body: open_test_json_file('namespace_b3.json'),
                  status: 200)
 
@@ -21,7 +21,7 @@ class TestNamespace < MiniTest::Test
     our_namespace = Kubeclient::Namespace.new
     our_namespace.name = 'staging'
 
-    stub_request(:delete, /\/namespaces/)
+    stub_request(:delete, %r{/namespaces})
       .to_return(status: 200)
 
     client = Kubeclient::Client.new 'http://localhost:8080/api/', 'v1beta3'

data/test/test_node.rb

@@ -3,7 +3,7 @@ require 'test_helper'
 # Node entity tests
 class TestNode < MiniTest::Test
   def test_get_from_json_v3
-    stub_request(:get, /\/nodes/)
+    stub_request(:get, %r{/nodes})
       .to_return(body: open_test_json_file('node_b3.json'),
                  status: 200)
 

data/test/test_pod.rb

@@ -3,7 +3,7 @@ require 'test_helper'
 # Pod entity tests
 class TestPod < MiniTest::Test
   def test_get_from_json_v3
-    stub_request(:get, /\/pods/)
+    stub_request(:get, %r{/pods})
       .to_return(body: open_test_json_file('pod_b3.json'),
                  status: 200)
 

data/test/test_replication_controller.rb

@@ -3,7 +3,7 @@ require 'test_helper'
 # Replication Controller entity tests
 class TestReplicationController < MiniTest::Test
   def test_get_from_json_v3
-    stub_request(:get, /\/replicationcontrollers/)
+    stub_request(:get, %r{/replicationcontrollers})
       .to_return(body: open_test_json_file('replication_controller_b3.json'),
                  status: 200)
 

data/test/test_service.rb

@@ -4,9 +4,8 @@ require 'test_helper'
 class TestService < MiniTest::Test
   def test_construct_our_own_service
     our_service = Kubeclient::Service.new
-    our_service.id = 'redis-service'
-    our_service.port = 80
-    our_service.protocol = 'TCP'
+    our_service.name = 'redis-service'
+    # TODO, new ports assignment to be added
     our_service.labels = {}
     our_service.labels.component = 'apiserver'
     our_service.labels.provider = 'kubernetes'
@@ -20,38 +19,38 @@ class TestService < MiniTest::Test
   end
 
   def test_conversion_from_json_v3
-    stub_request(:get, /\/services/)
+    stub_request(:get, %r{/services})
       .to_return(body: open_test_json_file('service_b3.json'),
                  status: 200)
 
-    client = Kubeclient::Client.new 'http://localhost:8080/api/', 'v1beta3'
+    client = Kubeclient::Client.new 'http://localhost:8080/api/'
     service = client.get_service 'redisslave'
 
     assert_instance_of(Kubeclient::Service, service)
-    # checking that creationTimestamp was renamed properly
-    assert_equal('2015-01-22T14:20:05+02:00',
+    assert_equal('2015-04-05T13:00:31Z',
                  service.metadata.creationTimestamp)
-    assert_equal('ffb153db-a230-11e4-a36b-3c970e4a436a', service.metadata.uid)
-    assert_equal('kubernetes-ro', service.metadata.name)
-    assert_equal('4', service.metadata.resourceVersion)
+    assert_equal('bdb80a8f-db93-11e4-b293-f8b156af4ae1', service.metadata.uid)
+    assert_equal('redis-slave', service.metadata.name)
+    assert_equal('2815', service.metadata.resourceVersion)
     assert_equal('v1beta3', service.apiVersion)
-    assert_equal('10.0.0.154', service.spec.portalIP)
-    assert_equal(0, service.spec.containerPort)
-    assert_equal('TCP', service.spec.protocol)
-    assert_equal(80, service.spec.port)
-    assert_equal('default', service.metadata.namespace)
+    assert_equal('10.0.0.140', service.spec.portalIP)
+    assert_equal('development', service.metadata.namespace)
+
+    assert_equal('TCP', service.spec.ports[0].protocol)
+    assert_equal(6379, service.spec.ports[0].port)
+    assert_equal('', service.spec.ports[0].name)
+    assert_equal('redis-server', service.spec.ports[0].targetPort)
   end
 
   def test_delete_service
     our_service = Kubeclient::Service.new
-    our_service.id = 'redis-service'
-    our_service.port = 80
-    our_service.protocol = 'TCP'
+    our_service.name = 'redis-service'
+    # TODO, new ports assignment to be added
     our_service.labels = {}
     our_service.labels.component = 'apiserver'
     our_service.labels.provider = 'kubernetes'
 
-    stub_request(:delete, /\/services/)
+    stub_request(:delete, %r{/services})
       .to_return(status: 200)
 
     client = Kubeclient::Client.new 'http://localhost:8080/api/', 'v1beta3'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kubeclient
 version: !ruby/object:Gem::Version
-  version: 0.1.9
+  version: 0.1.10
 platform: ruby
 authors:
 - Alissa Bonas
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-01 00:00:00.000000000 Z
+date: 2015-04-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -70,16 +70,16 @@ dependencies:
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.30.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.30.0
 - !ruby/object:Gem::Dependency
   name: rest-client
   requirement: !ruby/object:Gem::Requirement
@@ -162,7 +162,6 @@ files:
 - test/json/endpoint_list_b3.json
 - test/json/entity_list_b3.json
 - test/json/event_list_b3.json
-- test/json/get_all_services_b3.json
 - test/json/namespace_b3.json
 - test/json/namespace_exception_b3.json
 - test/json/namespace_list_b3.json
@@ -174,6 +173,7 @@ files:
 - test/json/replication_controller_list_b3.json
 - test/json/service_b3.json
 - test/json/service_illegal_json_404.json
+- test/json/service_list_b3.json
 - test/json/versions_list.json
 - test/json/watch_stream_b3.json
 - test/test_helper.rb
@@ -213,7 +213,6 @@ test_files:
 - test/json/endpoint_list_b3.json
 - test/json/entity_list_b3.json
 - test/json/event_list_b3.json
-- test/json/get_all_services_b3.json
 - test/json/namespace_b3.json
 - test/json/namespace_exception_b3.json
 - test/json/namespace_list_b3.json
@@ -225,6 +224,7 @@ test_files:
 - test/json/replication_controller_list_b3.json
 - test/json/service_b3.json
 - test/json/service_illegal_json_404.json
+- test/json/service_list_b3.json
 - test/json/versions_list.json
 - test/json/watch_stream_b3.json
 - test/test_helper.rb

data/test/json/get_all_services_b3.json

@@ -1,56 +0,0 @@
-{
-    "kind": "ServiceList",
-    "apiVersion": "v1beta3",
-    "metadata": {
-        "selfLink": "/api/v1beta3/services",
-        "resourceVersion": "59"
-    },
-    "items": [
-        {
-            "metadata": {
-                "name": "kubernetes",
-                "namespace": "default",
-                "selfLink": "/api/v1beta3/services/kubernetes?namespace=default",
-                "uid": "016e9dcd-ce39-11e4-ac24-3c970e4a436a",
-                "resourceVersion": "6",
-                "creationTimestamp": "2015-03-19T15:08:16+02:00",
-                "labels": {
-                    "component": "apiserver",
-                    "provider": "kubernetes"
-                }
-            },
-            "spec": {
-                "port": 443,
-                "protocol": "TCP",
-                "selector": null,
-                "portalIP": "10.0.0.2",
-                "containerPort": 0,
-                "sessionAffinity": "None"
-            },
-            "status": {}
-        },
-        {
-            "metadata": {
-                "name": "kubernetes-ro",
-                "namespace": "default",
-                "selfLink": "/api/v1beta3/services/kubernetes-ro?namespace=default",
-                "uid": "015b78bf-ce39-11e4-ac24-3c970e4a436a",
-                "resourceVersion": "5",
-                "creationTimestamp": "2015-03-19T15:08:15+02:00",
-                "labels": {
-                    "component": "apiserver",
-                    "provider": "kubernetes"
-                }
-            },
-            "spec": {
-                "port": 80,
-                "protocol": "TCP",
-                "selector": null,
-                "portalIP": "10.0.0.1",
-                "containerPort": 0,
-                "sessionAffinity": "None"
-            },
-            "status": {}
-        }
-    ]
-}