kubeclient 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f0dac688d6eb0963960c817696dfbd9b8f75da98
-  data.tar.gz: 8a5be4b58833b3f9e8d84c2bb8721e53ec2db180
+  metadata.gz: 780e4ae994bf298d7316518d27110c3a336820c5
+  data.tar.gz: fabcc8d9f9f7900495f9dd75d8e15b3d41b34db8
 SHA512:
-  metadata.gz: 5d63b1408a1788f5327377abf95d4312b086858030b18388ffd550420a05a237eb2551f579018aa573617782249cda5de2df8a6645d2806e7b86002de9507e1e
-  data.tar.gz: 08803875c6d0d1ecb7b4e18dcf066801a325725855579d6b89ff4249638c5aa98485ed6e42012eae5fdda8d1039e96e34cb74811ef745ef2af3ade5cb5abc776
+  metadata.gz: dc85e7d93e8a3a042830d67ceb852ba3c946fec3636d69151382f8d5abafac415567d36ca82453ec3aca6c12df5e25d32dcde82cd2bfd4e5d27a2752bde50503
+  data.tar.gz: 9b029e85c7b33b2d606c39cf87204c0c418e2e79acc613e8262bed142e06297aa6945352667ea72f3a9ec0c75f03ba9750e221ec540fadea227f7c0913239712

data/.rubocop.yml

@@ -6,3 +6,5 @@ Metrics/AbcSize:
   Enabled: false
 Metrics/LineLength:
   Max: 100
+Metrics/ParameterLists:
+  Max: 8

data/README.md

@@ -122,12 +122,24 @@ for more details). For example:
 ```ruby
 auth_options = {
   bearer_token_file: '/var/run/secrets/kubernetes.io/serviceaccount/token'
-
 }
 client = Kubeclient::Client.new 'https://localhost:8443/api/' , 'v1',
                                 auth_options: auth_options
 ```
 
+You can also use kubeclient with non-blocking sockets such as Celluloid::IO, see [here](https://github.com/httprb/http/wiki/Parallel-requests-with-Celluloid%3A%3AIO) 
+for details. For example:
+
+```ruby
+require 'celluloid/io'
+socket_options = {
+  socket_class: Celluloid::IO::TCPSocket,
+  ssl_socket_class: Celluloid::IO::SSLSocket
+}
+client = Kubeclient::Client.new 'https://localhost:8443/api/' , 'v1',
+                                socket_options: socket_options
+```
+
 ## Examples:
 
 #### Get all instances of a specific entity type

data/kubeclient.gemspec

@@ -29,4 +29,5 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'activesupport'
   spec.add_dependency 'json'
   spec.add_dependency 'recursive-open-struct', '= 1.0.0'
+  spec.add_dependency 'http', '= 0.9.8'
 end

data/lib/kubeclient/common.rb

@@ -24,6 +24,10 @@ module Kubeclient
         password: nil,
         bearer_token: nil,
         bearer_token_file: nil
+      },
+      socket_options: {
+        socket_class: nil,
+        ssl_socket_class: nil
       }
     )
       validate_auth_options(auth_options)
@@ -33,12 +37,13 @@ module Kubeclient
       @headers = {}
       @ssl_options = ssl_options
       @auth_options = auth_options
+      @socket_options = socket_options
 
       if auth_options[:bearer_token]
-        @headers[:Authorization] = "Bearer #{@auth_options[:bearer_token]}"
+        bearer_token(@auth_options[:bearer_token])
       elsif auth_options[:bearer_token_file]
         validate_bearer_token_file
-        @headers[:Authorization] = "Bearer #{File.read(@auth_options[:bearer_token_file])}"
+        bearer_token(File.read(@auth_options[:bearer_token_file]))
       end
     end
 
@@ -150,7 +155,7 @@ module Kubeclient
         uri.query = URI.encode_www_form(params.map { |k, v| [k.to_s.camelize(:lower), v] })
       end
 
-      Kubeclient::Common::WatchStream.new(uri, net_http_options(uri))
+      Kubeclient::Common::WatchStream.new(uri, http_options(uri))
     end
 
     # Accepts the following string options:
@@ -272,7 +277,7 @@ module Kubeclient
       uri.path += "/#{@api_version}/#{ns}pods/#{pod_name}/log"
       uri.query = URI.encode_www_form(params)
 
-      Kubeclient::Common::WatchStream.new(uri, net_http_options(uri), format: :text)
+      Kubeclient::Common::WatchStream.new(uri, http_options(uri), format: :text)
     end
 
     def proxy_url(kind, name, port, namespace = '')
@@ -329,7 +334,7 @@ module Kubeclient
       fail ArgumentError, msg unless File.readable?(@auth_options[:bearer_token_file])
     end
 
-    def net_http_options(uri)
+    def http_options(uri)
       options = {
         basic_auth_user: @auth_options[:username],
         basic_auth_password: @auth_options[:password],
@@ -337,19 +342,18 @@ module Kubeclient
       }
 
       if uri.scheme == 'https'
-        options.merge!(
-          use_ssl: true,
+        options[:ssl] = {
           ca_file: @ssl_options[:ca_file],
           cert: @ssl_options[:client_cert],
           cert_store: @ssl_options[:cert_store],
           key: @ssl_options[:client_key],
-          # 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
+          # ruby HTTP uses verify_mode instead of verify_ssl
+          # http://ruby-doc.org/stdlib-1.9.3/libdoc/openssl/rdoc/OpenSSL/SSL/SSLContext.html
           verify_mode: @ssl_options[:verify_ssl]
-        )
+        }
       end
 
-      options
+      options.merge(@socket_options)
     end
   end
 end

data/lib/kubeclient/version.rb

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

data/lib/kubeclient/watch_stream.rb

@@ -1,54 +1,63 @@
 require 'json'
-require 'net/http'
+require 'http'
 module Kubeclient
   module Common
     # HTTP Stream used to watch changes on entities
     class WatchStream
       def initialize(uri, http_options, format: :json)
         @uri = uri
-        @http = nil
-        @http_options = http_options.merge(read_timeout: nil)
+        @http_client = nil
+        @http_options = http_options
         @format = format
       end
 
       def each
         @finished = false
-        @http = Net::HTTP.start(@uri.host, @uri.port, @http_options)
 
-        buffer = ''
-        request = generate_request
+        @http_client = build_client
+        response = @http_client.request(:get, @uri, build_client_options)
+        unless response.code < 300
+          fail KubeException.new(response.code, response.reason, response)
+        end
 
-        @http.request(request) do |response|
-          unless response.is_a? Net::HTTPSuccess
-            fail KubeException.new(response.code, response.message, response)
-          end
-          response.read_body do |chunk|
-            buffer << chunk
-            while (line = buffer.slice!(/.+\n/))
-              yield @format == :json ? WatchNotice.new(JSON.parse(line)) : line.chomp
-            end
+        buffer = ''
+        response.body.each do |chunk|
+          buffer << chunk
+          while (line = buffer.slice!(/.+\n/))
+            yield @format == :json ? WatchNotice.new(JSON.parse(line)) : line.chomp
           end
         end
-      rescue Errno::EBADF
+      rescue IOError
         raise unless @finished
       end
 
-      def generate_request
-        request = Net::HTTP::Get.new(@uri)
-        if @http_options[:basic_auth_user] && @http_options[:basic_auth_password]
-          request.basic_auth @http_options[:basic_auth_user],
-                             @http_options[:basic_auth_password]
-        end
+      def finish
+        @finished = true
+        @http_client.close unless @http_client.nil?
+      end
 
-        @http_options.fetch(:headers, {}).each do |header, value|
-          request[header.to_s] = value
+      private
+
+      def build_client
+        if @http_options[:basic_auth_user] && @http_options[:basic_auth_password]
+          HTTP.basic_auth(user: @http_options[:basic_auth_user],
+                          pass: @http_options[:basic_auth_password])
+        else
+          HTTP::Client.new
         end
-        request
       end
 
-      def finish
-        @finished = true
-        @http.finish if !@http.nil? && @http.started?
+      def build_client_options
+        client_options = { headers: @http_options[:headers] }
+        if @http_options[:ssl]
+          client_options[:ssl] = @http_options[:ssl]
+          client_options[:ssl_socket_class] =
+              @http_options[:ssl_socket_class] if @http_options[:ssl_socket_class]
+        else
+          client_options[:socket_class] =
+              @http_options[:socket_class] if @http_options[:socket_class]
+        end
+        client_options
       end
     end
   end

data/lib/kubeclient.rb

@@ -45,9 +45,14 @@ module Kubeclient
                      password:          nil,
                      bearer_token:      nil,
                      bearer_token_file: nil
+                   },
+                   socket_options: {
+                     socket_class:     nil,
+                     ssl_socket_class: nil
                    }
                   )
-      initialize_client(uri, '/api', version, ssl_options: ssl_options, auth_options: auth_options)
+      initialize_client(uri, '/api', version, ssl_options: ssl_options, auth_options: auth_options,
+                                              socket_options: socket_options)
     end
 
     def all_entities

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kubeclient
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Alissa Bonas
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-05 00:00:00.000000000 Z
+date: 2016-01-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -150,6 +150,20 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: 1.0.0
+- !ruby/object:Gem::Dependency
+  name: http
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.9.8
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.9.8
 description: A client for Kubernetes REST api
 email:
 - abonas@redhat.com