k8s-client 0.3.2 → 0.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0c52ed78175ae8e13a19fdc6a8e0140bd638f49e7120c7b8227bbfb23086487a
-  data.tar.gz: 43224378fdcb6d08636e346d8c79090e572957cf298d72b2fb6be1bb4a13c948
+  metadata.gz: f007ab73089515a1766b43c947c33c8c3e8dfd902b19ce47aa6e5b3a87892536
+  data.tar.gz: 4d3b616e388ae5334966588ea93828f3efb6dac602d4a0f25906063d4360fc82
 SHA512:
-  metadata.gz: fb131b63d5a7ea82c0afbb0a32543ee60b13156c13f13f62b23ff9260491c26561e863c76495600f2db1ccf1cd51a956f9acc195d494a97f9e7e66b1764209cc
-  data.tar.gz: 71d19732db165ac68306d031981f95b4d1dda404ada3e6a2dca146b42c2b7bb427432e74c2192d673010d92668eefb046efd22782c9ba7f9e460cd685c4c2e9a
+  metadata.gz: e13b44376050184651c88518d752062657bb2c1ac820af787090d603411c0ae6a86ae0e9b069dc79ed1a9de3ab07dfbc5e93ae5e6c847b65c16aa1dacf30ae45
+  data.tar.gz: 6344b7a1809baabb31ecd747711171928ae2a0102183732c46029285f773282e82c314e6fb22cbacecaaa281aa331a2eafb3807cb2951ff0ff628a4c024778f2

data/README.md

@@ -63,6 +63,14 @@ The keyword options are [Excon](https://github.com/excon/excon/) options.
 client = K8s::Client.config(K8s::Config.load_file('~/.kube/config'))
 ```
 
+##### With overrides
+
+```ruby
+client = K8s::Client.config(K8s::Config.load_file('~/.kube/config'),
+  server: 'http://localhost:8001',
+)
+```
+
 #### In-cluster client from pod envs/secrets
 
 ```ruby

data/bin/k8s-client

@@ -69,10 +69,10 @@ parser = OptionParser.new do |parser|
     options.config = K8s::Config.load_file(path)
   end
   parser.on('--server=SERVER') do |server|
-    options.server = URI(server)
+    options.server = server
   end
-  parser.on('--insecure-skip-tls-verify') do
-    options.insecure_skip_tls_verify = true
+  parser.on('--insecure-skip-tls-verify', TrueClass) do |bool|
+    options.insecure_skip_tls_verify = bool
   end
   parser.on('--prefetch-resources', TrueClass) do |bool|
     options.prefetch_resources = bool
@@ -160,11 +160,17 @@ end
 parser.parse!
 
 if options.config
-  client = K8s::Client.config(options.config)
+  overrides = {}
+  overrides[:ssl_verify_peer] = false if options.insecure_skip_tls_verify
+
+  client = K8s::Client.config(options.config,
+    server: options.server,
+    **overrides
+  )
 elsif options.in_cluster_config
   client = K8s::Client.in_cluster_config
 else
-  client = K8s.client(options.server.to_s,
+  client = K8s.client(options.server,
     ssl_verify_peer: !options.insecure_skip_tls_verify,
   )
 end
@@ -178,7 +184,7 @@ end
 if options.list_resource_kinds
   client.resources.sort_by{|r| r.kind}.each do |resource_client|
     next if resource_client.subresource?
-    
+
     puts "#{resource_client.kind} => #{resource_client.api_version} #{resource_client.name}"
   end
 end

data/lib/k8s/client.rb

@@ -10,8 +10,10 @@ module K8s
   class Client
     # @param config [Phraos::Kube::Config]
     # @return [K8s::Client]
-    def self.config(config)
-      new(Transport.config(config))
+    def self.config(config, namespace: nil, **options)
+      new(Transport.config(config, **options),
+        namespace: namespace,
+      )
     end
 
     # @return [K8s::Client]

data/lib/k8s/client/version.rb

@@ -1,5 +1,5 @@
 module K8s
   class Client
-    VERSION = "0.3.2"
+    VERSION = "0.3.3"
   end
 end

data/lib/k8s/resource.rb

@@ -25,7 +25,8 @@ module K8s
       stat = File.stat(path)
 
       if stat.directory?
-        Dir.glob("#{path}/*.{yml,yaml}").map{|path| self.load_files(path) }.flatten
+        # recurse
+        Dir.glob("#{path}/*.{yml,yaml}").sort.map{|path| self.from_files(path) }.flatten
       else
         ::YAML.load_stream(File.read(path), path).map{|doc| new(doc) }
       end

data/lib/k8s/stack.rb

@@ -38,7 +38,7 @@ module K8s
 
     attr_reader :name, :resources
 
-    def initialize(name, resources = [], debug: false, label: LABEL, checksum_annotation: CHECKSUM_ANNOTATION)
+    def initialize(name, resources = [], debug: false, label: self.class::LABEL, checksum_annotation: self.class::CHECKSUM_ANNOTATION)
       @name = name
       @resources = resources
       @keep_resources = {}

data/lib/k8s/transport.rb

@@ -20,9 +20,11 @@ module K8s
     #
     # @param config [Phraos::Kube::Config]
     # @return [K8s::Transport]
-    def self.config(config)
+    def self.config(config, server: nil, **overrides)
       options = {}
 
+      server ||= config.cluster.server
+
       if config.cluster.insecure_skip_tls_verify
         logger.debug "Using config with .cluster.insecure_skip_tls_verify"
 
@@ -56,9 +58,9 @@ module K8s
         options[:client_key_data] = Base64.decode64(key_data)
       end
 
-      logger.info "Using config with server=#{config.cluster.server}"
+      logger.info "Using config with server=#{server}"
 
-      new(config.cluster.server, **options)
+      new(server, **options, **overrides)
     end
 
     # In-cluster config within a kube pod, using the kubernetes service envs and serviceaccount secrets

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: k8s-client
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.3.3
 platform: ruby
 authors:
 - Kontena, Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-08-16 00:00:00.000000000 Z
+date: 2018-08-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: excon