kubeclient 0.1.12 → 0.1.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 606934d03c5c996609d2b20af68672b4d90df04b
-  data.tar.gz: c70040510e8b0745b427c07c64d172f130ae22fb
+  metadata.gz: e56c3b573a2c07c74aa8de8048af1dda5e579f8a
+  data.tar.gz: 1e05214d7d5873ebb19c18495ed4085a66dc47aa
 SHA512:
-  metadata.gz: 5f45329a666f56582aab3c390a6f16fe45cc3a9cc973792b080fddfc2b6a08303ef65c324c19b571803f9b7357103ec2b27404be2a9a96b41ddea7ed75ac8eb3
-  data.tar.gz: c92d77763653279b5302432d74af067f58029138c7592492a2603ed6dc25920e0bf316533d7649a6f110ee250b0cc68f8f8e965a8a653e6c1ebc35a90f1f152b
+  metadata.gz: 1a1d759639dd39f6e9fb7c21108469f50a90116f8e4cc9b3725b9fe4d3fa241945c5f5523cb99bbee922db296f7d719bde706d9cd2fb4cddfefa2866348dbd20
+  data.tar.gz: 2fa195b4588382542a48cb80a68f161a5d609b594a4987a47fcc01edbad314b64876aa963bd78e0307f6d71a60aeaba9ef408aed3884ba61057328e1da190b40

data/lib/kubeclient/common.rb

@@ -50,8 +50,8 @@ module Kubeclient
             get_entity(entity_type, klass, name, namespace)
           end
 
-          define_method("delete_#{entity_name}") do |name|
-            delete_entity(entity_type, name)
+          define_method("delete_#{entity_name}") do |name, namespace = nil|
+            delete_entity(entity_type, name, namespace)
           end
 
           define_method("create_#{entity_name}") do |entity_config|
@@ -137,9 +137,11 @@ module Kubeclient
         new_entity(result, klass)
       end
 
-      def delete_entity(entity_type, name)
+      def delete_entity(entity_type, name, namespace = nil)
+        ns_prefix = build_namespace_prefix(namespace)
         handle_exception do
-          rest_client[resource_name(entity_type) + "/#{name}"].delete
+          rest_client[ns_prefix + resource_name(entity_type) + "/#{name}"]
+            .delete
         end
       end
 
@@ -189,11 +191,7 @@ module Kubeclient
       end
 
       def resource_name(entity_type)
-        if @api_version == 'v1beta1'
-          entity_type.pluralize.camelize(:lower)
-        else
-          entity_type.pluralize.downcase
-        end
+        entity_type.pluralize.downcase
       end
 
       def ssl_options(client_cert: nil, client_key: nil, ca_file: nil,

data/lib/kubeclient/version.rb

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

data/test/test_kubeclient.rb

@@ -150,6 +150,10 @@ class KubeClientTest < MiniTest::Test
     assert_equal(2, services.size)
     assert_instance_of(Kubeclient::Service, services[0])
     assert_instance_of(Kubeclient::Service, services[1])
+
+    assert_requested(:get,
+                     'http://localhost:8080/api/v1beta3/services',
+                     times: 1)
   end
 
   def test_empty_list

data/test/test_namespace.rb

@@ -15,6 +15,10 @@ class TestNamespace < MiniTest::Test
     assert_equal('staging', namespace.metadata.name)
     assert_equal('1168', namespace.metadata.resourceVersion)
     assert_equal('v1beta3', namespace.apiVersion)
+
+    assert_requested(:get,
+                     'http://localhost:8080/api/v1beta3/namespaces/staging',
+                     times: 1)
   end
 
   def test_delete_namespace_v1beta3
@@ -26,6 +30,10 @@ class TestNamespace < MiniTest::Test
 
     client = Kubeclient::Client.new 'http://localhost:8080/api/', 'v1beta3'
     client.delete_namespace our_namespace.name
+
+    assert_requested(:delete,
+                     'http://localhost:8080/api/v1beta3/namespaces/staging',
+                     times: 1)
   end
 
   def test_create_namespace

data/test/test_node.rb

@@ -17,5 +17,9 @@ class TestNode < MiniTest::Test
     assert_equal('1724', node.metadata.resourceVersion)
     assert_equal('v1beta3', node.apiVersion)
     assert_equal('2015-03-19T15:08:20+02:00', node.metadata.creationTimestamp)
+
+    assert_requested(:get,
+                     'http://localhost:8080/api/v1beta3/nodes/127.0.0.1',
+                     times: 1)
   end
 end

data/test/test_pod.rb

@@ -8,10 +8,14 @@ class TestPod < MiniTest::Test
                  status: 200)
 
     client = Kubeclient::Client.new 'http://localhost:8080/api/', 'v1beta3'
-    pod = client.get_pod 'redis-master-pod'
+    pod = client.get_pod 'redis-master-pod', 'default'
 
     assert_instance_of(Kubeclient::Pod, pod)
     assert_equal('redis-master3', pod.metadata.name)
     assert_equal('dockerfile/redis', pod.spec.containers[0]['image'])
+
+    assert_requested(:get,
+                     'http://localhost:8080/api/v1beta3/namespaces/default/pods/redis-master-pod',
+                     times: 1)
   end
 end

data/test/test_replication_controller.rb

@@ -8,7 +8,7 @@ class TestReplicationController < MiniTest::Test
                  status: 200)
 
     client = Kubeclient::Client.new 'http://localhost:8080/api/', 'v1beta3'
-    rc = client.get_replication_controller 'frontendController'
+    rc = client.get_replication_controller 'frontendController', 'default'
 
     assert_instance_of(Kubeclient::ReplicationController, rc)
     assert_equal('guestbook-controller', rc.metadata.name)
@@ -16,5 +16,9 @@ class TestReplicationController < MiniTest::Test
     assert_equal('default', rc.metadata.namespace)
     assert_equal(3, rc.spec.replicas)
     assert_equal('guestbook', rc.spec.selector.name)
+
+    assert_requested(:get,
+                     'http://localhost:8080/api/v1beta3/namespaces/default/replicationcontrollers/frontendController',
+                     times: 1)
   end
 end

data/test/test_service.rb

@@ -41,7 +41,7 @@ class TestService < MiniTest::Test
                  status: 200)
 
     client = Kubeclient::Client.new 'http://localhost:8080/api/'
-    service = client.get_service 'redisslave'
+    service = client.get_service 'redis-slave', 'development'
 
     assert_instance_of(Kubeclient::Service, service)
     assert_equal('2015-04-05T13:00:31Z',
@@ -57,6 +57,10 @@ class TestService < MiniTest::Test
     assert_equal(6379, service.spec.ports[0].port)
     assert_equal('', service.spec.ports[0].name)
     assert_equal('redis-server', service.spec.ports[0].targetPort)
+
+    assert_requested(:get,
+                     'http://localhost:8080/api/v1beta3/namespaces/development/services/redis-slave',
+                     times: 1)
   end
 
   def test_delete_service
@@ -67,11 +71,15 @@ class TestService < MiniTest::Test
     our_service.labels.component = 'apiserver'
     our_service.labels.provider = 'kubernetes'
 
-    stub_request(:delete, %r{/services})
+    stub_request(:delete, %r{/namespaces/default/services})
       .to_return(status: 200)
 
     client = Kubeclient::Client.new 'http://localhost:8080/api/', 'v1beta3'
-    client.delete_service our_service.id
+    client.delete_service our_service.name, 'default'
+
+    assert_requested(:delete,
+                     'http://localhost:8080/api/v1beta3/namespaces/default/services/redis-service',
+                     times: 1)
   end
 
   def test_get_service_no_ns
@@ -96,5 +104,9 @@ class TestService < MiniTest::Test
     client = Kubeclient::Client.new 'http://localhost:8080/api/'
     service = client.get_service 'redis-slave', 'development'
     assert_equal('redis-slave', service.metadata.name)
+
+    assert_requested(:get,
+                     'http://localhost:8080/api/v1beta3/namespaces/development/services/redis-slave',
+                     times: 1)
   end
 end

metadata

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