k8s-client 0.6.3 → 0.6.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9d7cce8f8084f9e3cd235ac55f5df20258050e7187567aa20d1fec847d4a5cf2
-  data.tar.gz: 5a7ea616dbf3dbe85fd9482686f97ff2b06d878ad2e86c9dce5956692bed42e9
+  metadata.gz: eba459f35445e6a9712b9c13f4aae1a1e64ee54671c2e79312961814e128a8a0
+  data.tar.gz: 645af48b165e0d3993f76dee2f4e0cbf81a9df2175ba6b7faabecf88eb22fc11
 SHA512:
-  metadata.gz: cfed2d41bdd6ce8f36da105f3277327afb2344ad480fdf8e5361c1c0df5826168b2f16546a9db9d76f22460dab09b7a724610e55e72a6c4860569d9938ef28c8
-  data.tar.gz: b758e50f969330760d4846c9c42ad899f6d540fd0a475ef78562b86b071d17f3dc85068ffb5e83597957b324861a05ace3622ec46b922c3ab91b8d3cd5e20866
+  metadata.gz: 198809fd3961246fe35ac9f8b31bf986573978e1aa60281b38ba53e610f1620c8cefee834f8e12a6a782ea30c0a2ba61d9b660f10d7f3dd0ca28ae6d81f714f6
+  data.tar.gz: 244edac8e01d0896b3b6770f9e414393418aaeb3bc3152154c505f6d5288250b46aef9f0323ece7e74c79738ebb05546f2010bbc4ebfa467cee2847499e9f382

data/bin/k8s-client

@@ -36,7 +36,8 @@ Options = Struct.new(
   :api,
   :list_api_resources,
   :patch_deployment,
-  :replicas
+  :replicas,
+  :version
 )
 
 options = Options.new
@@ -63,6 +64,9 @@ opt_parser = OptionParser.new do |parser|
     K8s::Logging.quiet!
     K8s::Transport.quiet!
   end
+  parser.on('--version') do
+    options.version = true
+  end
   parser.on('--in-cluster-config') do
     options.in_cluster_config = true
   end
@@ -174,7 +178,11 @@ else
                       ssl_verify_peer: !options.insecure_skip_tls_verify)
 end
 
-logger.info "Kube server version: #{client.version.gitVersion}"
+if options.version
+  logger.info client.version
+else
+  logger.info "Kube server version: #{client.version.gitVersion}"
+end
 
 if options.prefetch_resources
   client.apis(prefetch_resources: true)

data/lib/k8s/client.rb

@@ -60,10 +60,7 @@ module K8s
     # @raise [K8s::Error]
     # @return [K8s::API::Version]
     def version
-      @transport.get(
-        '/version',
-        response_class: K8s::API::Version
-      )
+      @version ||= @transport.version
     end
 
     # @param api_version [String] "group/version" or "version" (core)

data/lib/k8s/client/version.rb

@@ -3,6 +3,6 @@
 module K8s
   class Client
     # Updated on releases using semver.
-    VERSION = "0.6.3"
+    VERSION = "0.6.4"
   end
 end

data/lib/k8s/transport.rb

@@ -22,6 +22,9 @@ module K8s
       'Accept' => 'application/json'
     }.freeze
 
+    # Min version of Kube API for which delete options need to be sent as request body
+    DELETE_OPTS_BODY_VERSION_MIN = Gem::Version.new('1.11')
+
     # Construct transport from kubeconfig
     #
     # @param config [K8s::Config]
@@ -217,6 +220,10 @@ module K8s
     # @param response_class [Class] decode response body using #from_json
     # @param options [Hash] @see Excon#request
     def request(response_class: nil, **options)
+      if options[:method] == 'DELETE' && need_delete_body?
+        options[:request_object] = options.delete(:query)
+      end
+
       excon_options = request_options(**options)
 
       start = Time.now
@@ -282,6 +289,19 @@ module K8s
       objects
     end
 
+    # @return [K8s::API::Version]
+    def version
+      @version ||= get(
+        '/version',
+        response_class: K8s::API::Version
+      )
+    end
+
+    # @return [true, false] true if delete options should be sent as bode of the DELETE request
+    def need_delete_body?
+      @need_delete_body ||= Gem::Version.new(version.gitVersion.match(/v*(.*)/)[1]) < DELETE_OPTS_BODY_VERSION_MIN
+    end
+
     # @param path [Array<String>] @see #path
     # @param options [Hash] @see #request
     def get(*path, **options)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: k8s-client
 version: !ruby/object:Gem::Version
-  version: 0.6.3
+  version: 0.6.4
 platform: ruby
 authors:
 - Kontena, Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-11-27 00:00:00.000000000 Z
+date: 2018-12-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: excon