kubeclient 1.2.0 → 2.0.0

data/lib/kubeclient/config.rb

@@ -1,5 +1,6 @@
 require 'yaml'
 require 'base64'
+require 'pathname'
 
 module Kubeclient
   # Kubernetes client configuration class
@@ -63,7 +64,7 @@ module Kubeclient
     private
 
     def ext_file_path(path)
-      File.join(@kcfg_path, path)
+      Pathname(path).absolute? ? path : File.join(@kcfg_path, path)
     end
 
     def fetch_context(context_name)

data/lib/kubeclient/version.rb

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

data/test/cassettes/kubernetes_guestbook.yml

@@ -843,4 +843,37 @@ http_interactions:
       string: '{"kind":"Namespace","apiVersion":"v1","metadata":{"name":"kubeclient-ns","selfLink":"/api/v1/namespaces/kubeclient-ns","uid":"f41e6b27-3e7d-11e5-a75a-18037327aaeb","resourceVersion":"584","creationTimestamp":"2015-08-09T10:03:59Z","deletionTimestamp":"2015-08-09T10:03:59Z"},"spec":{"finalizers":["kubernetes"]},"status":{"phase":"Terminating"}}'
     http_version: 
   recorded_at: Sun, 09 Aug 2015 10:00:02 GMT
-recorded_with: VCR 2.9.3
+- request:
+    method: get
+    uri: http://10.35.0.23:8080/api/v1
+    body:
+      encoding: US-ASCII
+      string: ''
+    headers:
+      Accept:
+      - "*/*"
+      Accept-Encoding:
+      - gzip, deflate
+      User-Agent:
+      - rest-client/2.0.0 (linux-gnu x86_64) ruby/2.3.0p0
+      Host:
+      - localhost:8080
+  response:
+    status:
+      code: 200
+      message: OK
+    headers:
+      Content-Type:
+      - application/json
+      Date:
+      - Mon, 29 Aug 2016 15:51:30 GMT
+      Transfer-Encoding:
+      - chunked
+    body:
+      encoding: UTF-8
+      string: '{"kind":"APIResourceList","groupVersion":"v1","resources":[{"name":"bindings","namespaced":true,"kind":"Binding"},{"name":"componentstatuses","namespaced":false,"kind":"ComponentStatus"},{"name":"configmaps","namespaced":true,"kind":"ConfigMap"},{"name":"endpoints","namespaced":true,"kind":"Endpoints"},{"name":"events","namespaced":true,"kind":"Event"},{"name":"limitranges","namespaced":true,"kind":"LimitRange"},{"name":"namespaces","namespaced":false,"kind":"Namespace"},{"name":"namespaces/finalize","namespaced":false,"kind":"Namespace"},{"name":"namespaces/status","namespaced":false,"kind":"Namespace"},{"name":"nodes","namespaced":false,"kind":"Node"},{"name":"nodes/proxy","namespaced":false,"kind":"Node"},{"name":"nodes/status","namespaced":false,"kind":"Node"},{"name":"persistentvolumeclaims","namespaced":true,"kind":"PersistentVolumeClaim"},{"name":"persistentvolumeclaims/status","namespaced":true,"kind":"PersistentVolumeClaim"},{"name":"persistentvolumes","namespaced":false,"kind":"PersistentVolume"},{"name":"persistentvolumes/status","namespaced":false,"kind":"PersistentVolume"},{"name":"pods","namespaced":true,"kind":"Pod"},{"name":"pods/attach","namespaced":true,"kind":"Pod"},{"name":"pods/binding","namespaced":true,"kind":"Binding"},{"name":"pods/exec","namespaced":true,"kind":"Pod"},{"name":"pods/log","namespaced":true,"kind":"Pod"},{"name":"pods/portforward","namespaced":true,"kind":"Pod"},{"name":"pods/proxy","namespaced":true,"kind":"Pod"},{"name":"pods/status","namespaced":true,"kind":"Pod"},{"name":"podtemplates","namespaced":true,"kind":"PodTemplate"},{"name":"replicationcontrollers","namespaced":true,"kind":"ReplicationController"},{"name":"replicationcontrollers/scale","namespaced":true,"kind":"Scale"},{"name":"replicationcontrollers/status","namespaced":true,"kind":"ReplicationController"},{"name":"resourcequotas","namespaced":true,"kind":"ResourceQuota"},{"name":"resourcequotas/status","namespaced":true,"kind":"ResourceQuota"},{"name":"secrets","namespaced":true,"kind":"Secret"},{"name":"serviceaccounts","namespaced":true,"kind":"ServiceAccount"},{"name":"services","namespaced":true,"kind":"Service"},{"name":"services/proxy","namespaced":true,"kind":"Service"},{"name":"services/status","namespaced":true,"kind":"Service"}]}
+
+'
+    http_version: 
+  recorded_at: Mon, 29 Aug 2016 15:51:30 GMT
+recorded_with: VCR 3.0.3

data/test/json/bindings_list.json

@@ -0,0 +1,10 @@
+{
+  "kind": "Status",
+  "apiVersion": "v1",
+  "metadata": {},
+  "status": "Failure",
+  "message": "the server could not find the requested resource",
+  "reason": "NotFound",
+  "details": {},
+  "code": 404
+}

data/test/json/config_map_list.json

@@ -0,0 +1,9 @@
+{
+  "kind": "ConfigMapList",
+  "apiVersion": "v1",
+  "metadata": {
+    "selfLink": "/api/v1/configmaps",
+    "resourceVersion": "665"
+  },
+  "items": []
+}

data/test/json/core_api_resource_list.json

@@ -0,0 +1,181 @@
+{
+  "kind": "APIResourceList",
+  "groupVersion": "v1",
+  "resources": [
+    {
+      "name": "bindings",
+      "namespaced": true,
+      "kind": "Binding"
+    },
+    {
+      "name": "componentstatuses",
+      "namespaced": false,
+      "kind": "ComponentStatus"
+    },
+    {
+      "name": "configmaps",
+      "namespaced": true,
+      "kind": "ConfigMap"
+    },
+    {
+      "name": "endpoints",
+      "namespaced": true,
+      "kind": "Endpoints"
+    },
+    {
+      "name": "events",
+      "namespaced": true,
+      "kind": "Event"
+    },
+    {
+      "name": "limitranges",
+      "namespaced": true,
+      "kind": "LimitRange"
+    },
+    {
+      "name": "namespaces",
+      "namespaced": false,
+      "kind": "Namespace"
+    },
+    {
+      "name": "namespaces/finalize",
+      "namespaced": false,
+      "kind": "Namespace"
+    },
+    {
+      "name": "namespaces/status",
+      "namespaced": false,
+      "kind": "Namespace"
+    },
+    {
+      "name": "nodes",
+      "namespaced": false,
+      "kind": "Node"
+    },
+    {
+      "name": "nodes/proxy",
+      "namespaced": false,
+      "kind": "Node"
+    },
+    {
+      "name": "nodes/status",
+      "namespaced": false,
+      "kind": "Node"
+    },
+    {
+      "name": "persistentvolumeclaims",
+      "namespaced": true,
+      "kind": "PersistentVolumeClaim"
+    },
+    {
+      "name": "persistentvolumeclaims/status",
+      "namespaced": true,
+      "kind": "PersistentVolumeClaim"
+    },
+    {
+      "name": "persistentvolumes",
+      "namespaced": false,
+      "kind": "PersistentVolume"
+    },
+    {
+      "name": "persistentvolumes/status",
+      "namespaced": false,
+      "kind": "PersistentVolume"
+    },
+    {
+      "name": "pods",
+      "namespaced": true,
+      "kind": "Pod"
+    },
+    {
+      "name": "pods/attach",
+      "namespaced": true,
+      "kind": "Pod"
+    },
+    {
+      "name": "pods/binding",
+      "namespaced": true,
+      "kind": "Binding"
+    },
+    {
+      "name": "pods/exec",
+      "namespaced": true,
+      "kind": "Pod"
+    },
+    {
+      "name": "pods/log",
+      "namespaced": true,
+      "kind": "Pod"
+    },
+    {
+      "name": "pods/portforward",
+      "namespaced": true,
+      "kind": "Pod"
+    },
+    {
+      "name": "pods/proxy",
+      "namespaced": true,
+      "kind": "Pod"
+    },
+    {
+      "name": "pods/status",
+      "namespaced": true,
+      "kind": "Pod"
+    },
+    {
+      "name": "podtemplates",
+      "namespaced": true,
+      "kind": "PodTemplate"
+    },
+    {
+      "name": "replicationcontrollers",
+      "namespaced": true,
+      "kind": "ReplicationController"
+    },
+    {
+      "name": "replicationcontrollers/scale",
+      "namespaced": true,
+      "kind": "Scale"
+    },
+    {
+      "name": "replicationcontrollers/status",
+      "namespaced": true,
+      "kind": "ReplicationController"
+    },
+    {
+      "name": "resourcequotas",
+      "namespaced": true,
+      "kind": "ResourceQuota"
+    },
+    {
+      "name": "resourcequotas/status",
+      "namespaced": true,
+      "kind": "ResourceQuota"
+    },
+    {
+      "name": "secrets",
+      "namespaced": true,
+      "kind": "Secret"
+    },
+    {
+      "name": "serviceaccounts",
+      "namespaced": true,
+      "kind": "ServiceAccount"
+    },
+    {
+      "name": "services",
+      "namespaced": true,
+      "kind": "Service"
+    },
+    {
+      "name": "services/proxy",
+      "namespaced": true,
+      "kind": "Service"
+    },
+    {
+      "name": "services/status",
+      "namespaced": true,
+      "kind": "Service"
+    }
+  ]
+}

data/test/json/pod_template_list.json

@@ -0,0 +1,9 @@
+{
+  "kind": "PodTemplateList",
+  "apiVersion": "v1",
+  "metadata": {
+    "selfLink": "/api/v1/podtemplates",
+    "resourceVersion": "672"
+  },
+  "items": []
+}

data/test/json/processed_template.json

@@ -0,0 +1,27 @@
+{
+  "kind": "Template",
+  "apiVersion": "v1",
+  "metadata": {
+    "name": "my-templtae",
+    "namespace": "default",
+    "selfLink": "/oapi/v1/namespaces/default/processedtemplates/my-templtae",
+    "uid": "2240c61c-8f70-11e5-a806-001a4a231290",
+    "resourceVersion": "1399",
+    "creationTimestamp": "2015-11-20T10:19:07Z"
+  },
+  "objects": [
+    {
+      "apiVersion": "v1",
+      "kind": "Service",
+      "metadata": {
+        "name": "test/my-service"
+      }
+    }
+  ],
+  "parameters": [
+    {
+      "name": "NAME_PREFIX",
+      "value": "test/"
+    }
+  ]
+}

data/test/test_common.rb

@@ -0,0 +1,32 @@
+require 'test_helper'
+
+# Unit tests for the common module
+class CommonTest < MiniTest::Test
+  def test_underscore_entity
+    %w(
+      Pod pod
+      Service service
+      ReplicationController replication_controller
+      Node node
+      Event event
+      Endpoint endpoint
+      Namespace namespace
+      Secret secret
+      ResourceQuota resource_quota
+      LimitRange limit_range
+      PersistentVolume persistent_volume
+      PersistentVolumeClaim persistent_volume_claim
+      ComponentStatus component_status
+      ServiceAccount service_account
+      Project project
+      Route route
+      ClusterRoleBinding cluster_role_binding
+      Build build
+      BuildConfig build_config
+      Image image
+      ImageStream image_stream
+    ).each_slice(2) do |singular, plural|
+      assert_equal(Kubeclient::ClientMixin.underscore_entity(singular), plural)
+    end
+  end
+end

data/test/test_component_status.rb

@@ -6,6 +6,9 @@ class TestComponentStatus < MiniTest::Test
     stub_request(:get, %r{/componentstatuses})
       .to_return(body: open_test_file('component_status.json'),
                  status: 200)
+    stub_request(:get, %r{/api/v1$})
+      .to_return(body: open_test_file('core_api_resource_list.json'),
+                 status: 200)
 
     client = Kubeclient::Client.new 'http://localhost:8080/api/', 'v1'
     component_status = client.get_component_status 'etcd-0', 'default'
@@ -15,6 +18,9 @@ class TestComponentStatus < MiniTest::Test
     assert_equal('Healthy', component_status.conditions[0].type)
     assert_equal('True', component_status.conditions[0].status)
 
+    assert_requested(:get,
+                     'http://localhost:8080/api/v1',
+                     times: 1)
     assert_requested(:get,
                      'http://localhost:8080/api/v1/namespaces/default/componentstatuses/etcd-0',
                      times: 1)

data/test/test_endpoint.rb

@@ -3,8 +3,12 @@ require 'test_helper'
 # Endpoint entity tests
 class TestEndpoint < MiniTest::Test
   def test_create_endpoint
+    stub_request(:get, %r{/api/v1$})
+      .to_return(body: open_test_file('core_api_resource_list.json'),
+                 status: 200)
+
     client = Kubeclient::Client.new 'http://localhost:8080/api/', 'v1'
-    testing_ep = Kubeclient::Endpoint.new
+    testing_ep = Kubeclient::Resource.new
     testing_ep.metadata = {}
     testing_ep.metadata.name = 'myendpoint'
     testing_ep.metadata.namespace = 'default'

data/test/test_guestbook_go.rb

@@ -13,7 +13,7 @@ class CreateGuestbookGo < MiniTest::Test
     VCR.use_cassette('kubernetes_guestbook') do # , record: :new_episodes) do
       client = Kubeclient::Client.new 'http://10.35.0.23:8080/api/', 'v1'
 
-      testing_ns = Kubeclient::Namespace.new
+      testing_ns = Kubeclient::Resource.new
       testing_ns.metadata = {}
       testing_ns.metadata.name = 'kubeclient-ns'
 

data/test/test_kubeclient.rb

@@ -3,7 +3,7 @@ require 'test_helper'
 # Kubernetes client entity tests
 class KubeClientTest < MiniTest::Test
   def test_json
-    our_object = Kubeclient::Service.new
+    our_object = Kubeclient::Resource.new
     our_object.foo = 'bar'
     our_object.nested = {}
     our_object.nested.again = {}
@@ -41,6 +41,10 @@ class KubeClientTest < MiniTest::Test
   def test_pass_proxy
     uri = URI::HTTP.build(host: 'localhost', port: 8080)
     proxy_uri = URI::HTTP.build(host: 'myproxyhost', port: 8888)
+    stub_request(:get, %r{/api/v1$})
+      .to_return(body: open_test_file('core_api_resource_list.json'),
+                 status: 200)
+
     client = Kubeclient::Client.new(uri, http_proxy_uri: proxy_uri)
     rest_client = client.rest_client
     assert_equal proxy_uri.to_s, rest_client.options[:proxy]
@@ -51,11 +55,14 @@ class KubeClientTest < MiniTest::Test
   end
 
   def test_exception
+    stub_request(:get, %r{/api/v1$})
+      .to_return(body: open_test_file('core_api_resource_list.json'),
+                 status: 200)
     stub_request(:post, %r{/services})
       .to_return(body: open_test_file('namespace_exception.json'),
                  status: 409)
 
-    service = Kubeclient::Service.new
+    service = Kubeclient::Resource.new
     service.metadata = {}
     service.metadata.name = 'redisslave'
     service.metadata.namespace = 'default'
@@ -149,6 +156,9 @@ class KubeClientTest < MiniTest::Test
   end
 
   def test_nonjson_exception
+    stub_request(:get, %r{/api/v1$})
+      .to_return(body: open_test_file('core_api_resource_list.json'),
+                 status: 200)
     stub_request(:get, %r{/servic})
       .to_return(body: open_test_file('service_illegal_json_404.json'),
                  status: 404)
@@ -165,6 +175,9 @@ class KubeClientTest < MiniTest::Test
   end
 
   def test_entity_list
+    stub_request(:get, %r{/api/v1$})
+      .to_return(body: open_test_file('core_api_resource_list.json'),
+                 status: 200)
     stub_request(:get, %r{/services})
       .to_return(body: open_test_file('entity_list.json'),
                  status: 200)
@@ -187,6 +200,9 @@ class KubeClientTest < MiniTest::Test
   def test_entities_with_label_selector
     selector = 'component=apiserver'
 
+    stub_request(:get, %r{/api/v1$})
+      .to_return(body: open_test_file('core_api_resource_list.json'),
+                 status: 200)
     stub_request(:get, %r{/services})
       .to_return(body: open_test_file('entity_list.json'),
                  status: 200)
@@ -203,6 +219,9 @@ class KubeClientTest < MiniTest::Test
   def test_entities_with_field_selector
     selector = 'involvedObject.name=redis-master'
 
+    stub_request(:get, %r{/api/v1$})
+      .to_return(body: open_test_file('core_api_resource_list.json'),
+                 status: 200)
     stub_request(:get, %r{/services})
       .to_return(body: open_test_file('entity_list.json'),
                  status: 200)
@@ -217,6 +236,9 @@ class KubeClientTest < MiniTest::Test
   end
 
   def test_empty_list
+    stub_request(:get, %r{/api/v1$})
+      .to_return(body: open_test_file('core_api_resource_list.json'),
+                 status: 200)
     stub_request(:get, %r{/pods})
       .to_return(body: open_test_file('empty_pod_list.json'),
                  status: 200)
@@ -228,6 +250,22 @@ class KubeClientTest < MiniTest::Test
   end
 
   def test_get_all
+    stub_request(:get, %r{/api/v1$})
+      .to_return(body: open_test_file('core_api_resource_list.json'),
+                 status: 200)
+
+    stub_request(:get, %r{/bindings})
+      .to_return(body: open_test_file('bindings_list.json'),
+                 status: 404)
+
+    stub_request(:get, %r{/configmaps})
+      .to_return(body: open_test_file('config_map_list.json'),
+                 status: 200)
+
+    stub_request(:get, %r{/podtemplates})
+      .to_return(body: open_test_file('pod_template_list.json'),
+                 status: 200)
+
     stub_request(:get, %r{/services})
       .to_return(body: open_test_file('service_list.json'),
                  status: 200)
@@ -284,7 +322,7 @@ class KubeClientTest < MiniTest::Test
 
     client = Kubeclient::Client.new 'http://localhost:8080/api/', 'v1'
     result = client.all_entities
-    assert_equal(14, result.keys.size)
+    assert_equal(16, 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,
@@ -312,6 +350,10 @@ class KubeClientTest < MiniTest::Test
       .with(headers: { Authorization: 'Bearer valid_token' })
       .to_return(body: open_test_file('pod_list.json'),
                  status: 200)
+    stub_request(:get, %r{/api/v1$})
+      .with(headers: { Authorization: 'Bearer valid_token' })
+      .to_return(body: open_test_file('core_api_resource_list.json'),
+                 status: 200)
 
     client = Kubeclient::Client.new 'http://localhost:8080/api/',
                                     auth_options: {
@@ -325,6 +367,9 @@ class KubeClientTest < MiniTest::Test
   end
 
   def test_api_bearer_token_success
+    stub_request(:get, %r{/api/v1$})
+      .to_return(body: open_test_file('core_api_resource_list.json'),
+                 status: 200)
     stub_request(:get, 'http://localhost:8080/api/v1/pods')
       .with(headers: { Authorization: 'Bearer valid_token' })
       .to_return(body: open_test_file('pod_list.json'),
@@ -342,11 +387,11 @@ class KubeClientTest < MiniTest::Test
   end
 
   def test_api_bearer_token_failure
-    error_message = '"/api/v1/pods" is forbidden because ' \
+    error_message = '"/api/v1" is forbidden because ' \
                     'system:anonymous cannot list on pods in'
     response = OpenStruct.new(code: 401, message: error_message)
 
-    stub_request(:get, 'http://localhost:8080/api/v1/pods')
+    stub_request(:get, 'http://localhost:8080/api/v1')
       .with(headers: { Authorization: 'Bearer invalid_token' })
       .to_raise(KubeException.new(403, error_message, response))
 
@@ -362,6 +407,9 @@ class KubeClientTest < MiniTest::Test
   end
 
   def test_api_basic_auth_success
+    stub_request(:get, 'http://username:password@localhost:8080/api/v1')
+      .to_return(body: open_test_file('core_api_resource_list.json'),
+                 status: 200)
     stub_request(:get, 'http://username:password@localhost:8080/api/v1/pods')
       .to_return(body: open_test_file('pod_list.json'),
                  status: 200)
@@ -382,6 +430,9 @@ class KubeClientTest < MiniTest::Test
   end
 
   def test_api_basic_auth_back_comp_success
+    stub_request(:get, 'http://username:password@localhost:8080/api/v1')
+      .to_return(body: open_test_file('core_api_resource_list.json'),
+                 status: 200)
     stub_request(:get, 'http://username:password@localhost:8080/api/v1/pods')
       .to_return(body: open_test_file('pod_list.json'),
                  status: 200)
@@ -405,7 +456,7 @@ class KubeClientTest < MiniTest::Test
     error_message = 'HTTP status code 401, 401 Unauthorized'
     response = OpenStruct.new(code: 401, message: '401 Unauthorized')
 
-    stub_request(:get, 'http://username:password@localhost:8080/api/v1/pods')
+    stub_request(:get, 'http://username:password@localhost:8080/api/v1')
       .to_raise(KubeException.new(401, error_message, response))
 
     client = Kubeclient::Client.new 'http://localhost:8080/api/',
@@ -419,7 +470,7 @@ class KubeClientTest < MiniTest::Test
     assert_equal(error_message, exception.message)
     assert_equal(response, exception.response)
     assert_requested(:get,
-                     'http://username:password@localhost:8080/api/v1/pods',
+                     'http://username:password@localhost:8080/api/v1',
                      times: 1)
   end
 
@@ -496,6 +547,9 @@ class KubeClientTest < MiniTest::Test
   end
 
   def test_api_bearer_token_file_success
+    stub_request(:get, %r{/api/v1$})
+      .to_return(body: open_test_file('core_api_resource_list.json'),
+                 status: 200)
     stub_request(:get, 'http://localhost:8080/api/v1/pods')
       .with(headers: { Authorization: 'Bearer valid_token' })
       .to_return(body: open_test_file('pod_list.json'),
@@ -514,10 +568,20 @@ class KubeClientTest < MiniTest::Test
   end
 
   def test_proxy_url
+    stub_request(:get, %r{/api/v1$})
+      .to_return(body: open_test_file('core_api_resource_list.json'),
+                 status: 200)
+
     client = Kubeclient::Client.new 'http://host:8080', 'v1'
     assert_equal('http://host:8080/api/v1/proxy/namespaces/ns/services/srvname:srvportname',
                  client.proxy_url('service', 'srvname', 'srvportname', 'ns'))
 
+    assert_equal('http://host:8080/api/v1/proxy/namespaces/ns/services/srvname:srvportname',
+                 client.proxy_url('services', 'srvname', 'srvportname', 'ns'))
+
+    assert_equal('http://host:8080/api/v1/namespaces/ns/pods/srvname:srvportname/proxy',
+                 client.proxy_url('pod', 'srvname', 'srvportname', 'ns'))
+
     assert_equal('http://host:8080/api/v1/namespaces/ns/pods/srvname:srvportname/proxy',
                  client.proxy_url('pods', 'srvname', 'srvportname', 'ns'))
 
@@ -525,9 +589,15 @@ class KubeClientTest < MiniTest::Test
     assert_equal('http://host:8080/api/v1/proxy/nodes/srvname:srvportname',
                  client.proxy_url('nodes', 'srvname', 'srvportname'))
 
+    assert_equal('http://host:8080/api/v1/proxy/nodes/srvname:srvportname',
+                 client.proxy_url('node', 'srvname', 'srvportname'))
+
     # Check integer port
     assert_equal('http://host:8080/api/v1/proxy/nodes/srvname:5001',
                  client.proxy_url('nodes', 'srvname', 5001))
+
+    assert_equal('http://host:8080/api/v1/proxy/nodes/srvname:5001',
+                 client.proxy_url('node', 'srvname', 5001))
   end
 
   def test_attr_readers
@@ -546,6 +616,9 @@ class KubeClientTest < MiniTest::Test
 
   def test_nil_items
     # handle https://github.com/kubernetes/kubernetes/issues/13096
+    stub_request(:get, %r{/api/v1$})
+      .to_return(body: open_test_file('core_api_resource_list.json'),
+                 status: 200)
     stub_request(:get, %r{/persistentvolumeclaims})
       .to_return(body: open_test_file('persistent_volume_claims_nil_items.json'),
                  status: 200)