k8s-client 0.7.0 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 15012c4385d7320b4026e0da41c3092623ff3b157e3115e4d6a908e56a5af926
-  data.tar.gz: 2a8b4a339cff5223c5c7a601b01d60af5313abde8ba42ad9cace8cda0fd6b510
+  metadata.gz: 4eadbdf15c18c24f837159b566d886fc3d7c2ee0f3319aaf791464ae9474535a
+  data.tar.gz: c1de255adac68b1550b379b555ba3d1c8c8fe9cdb30272344feed1a82a0a3bb3
 SHA512:
-  metadata.gz: ce43ce55808589458ce1f6e002fd3687e78adc015c57f200791109fd88e664a9a11c80284cd60514a7822fc89662f7b23617b2802c8b90a99be31c8355ad62cc
-  data.tar.gz: bbf4c9f9b66412bf179555a4d8ba3ae807f24a2629709efe8ed2ecbd466eeeca7597571685518afc246cec98e05602a050ba148409f8955114b3de373b1c0e1f
+  metadata.gz: 6a5e543cd9d4c310b769ed770a6d69cd27dbfd8d33af00c9b9e239a2f9277dbba450ee05d0f61c27d2940eadf8d372f053d2dec222168fbcb0d09e542236b82b
+  data.tar.gz: d7bbfe14c6ba9686b0ae2319e2e3dea91a983974842dc6089c832c6c582a460d4b422227c8cc3bca12b5a163eeca65455c826a6d8dd010d9974ce1c4dbb72ff2

data/k8s-client.gemspec

@@ -25,7 +25,6 @@ Gem::Specification.new do |spec|
 
   spec.add_runtime_dependency "excon", "~> 0.62.0"
   spec.add_runtime_dependency "dry-struct", "~> 0.5.0"
-  spec.add_runtime_dependency "deep_merge", "~> 1.2.1"
   spec.add_runtime_dependency "recursive-open-struct", "~> 1.1.0"
   spec.add_runtime_dependency 'hashdiff', '~> 0.3.7'
   spec.add_runtime_dependency 'jsonpath', '~> 0.9.5'

data/lib/k8s/client.rb

@@ -3,20 +3,20 @@
 require 'openssl'
 require 'base64'
 require 'yajl'
+require 'monitor'
+
+require 'k8s/util'
 
 require 'k8s/api/metav1'
 require 'k8s/api/version'
-
 require 'k8s/config'
 require 'k8s/logging'
-
 require 'k8s/api_client'
 require "k8s/error"
 require 'k8s/resource'
 require 'k8s/resource_client'
 require 'k8s/stack'
 require 'k8s/transport'
-require 'k8s/util'
 
 module K8s
   # @param server [String] http/s URL
@@ -45,10 +45,11 @@ module K8s
     # @see K8s::Transport#in_cluster_config
     #
     # @param namespace [String] default namespace for all operations
+    # @param options [Hash] options passed to transport, @see Transport#in_cluster_config
     # @return [K8s::Client]
     # @raise [K8s::Error::Config,Errno::ENOENT,Errno::EACCES]
-    def self.in_cluster_config(namespace: nil)
-      new(Transport.in_cluster_config, namespace: namespace)
+    def self.in_cluster_config(namespace: nil, **options)
+      new(Transport.in_cluster_config(**options), namespace: namespace)
     end
 
     # Attempts to create a K8s::Client instance automatically using environment variables, existing configuration
@@ -81,6 +82,8 @@ module K8s
       end
     end
 
+    include MonitorMixin
+
     attr_reader :transport
 
     # @param transport [K8s::Transport]
@@ -90,6 +93,7 @@ module K8s
       @namespace = namespace
 
       @api_clients = {}
+      super()
     end
 
     # @raise [K8s::Error]
@@ -109,10 +113,16 @@ module K8s
     #
     # @return [Array<String>]
     def api_groups!
-      @api_groups = @transport.get(
-        '/apis',
-        response_class: K8s::API::MetaV1::APIGroupList
-      ).groups.map{ |api_group| api_group.versions.map(&:groupVersion) }.flatten
+      synchronize do
+        @api_groups = @transport.get(
+          '/apis',
+          response_class: K8s::API::MetaV1::APIGroupList
+        ).groups.flat_map{ |api_group| api_group.versions.map(&:groupVersion) }
+
+        @api_clients.clear
+      end
+
+      @api_groups
     end
 
     # Cached /apis preferred group apiVersions
@@ -136,8 +146,13 @@ module K8s
                     .map{ |api_version| APIClient.path(api_version) }
 
         # load into APIClient.api_resources=
-        @transport.gets(*api_paths, response_class: K8s::API::MetaV1::APIResourceList, skip_missing: skip_missing).each do |api_resource_list|
-          api(api_resource_list.groupVersion).api_resources = api_resource_list.resources if api_resource_list
+        begin
+          @transport.gets(*api_paths, response_class: K8s::API::MetaV1::APIResourceList, skip_missing: skip_missing).each do |api_resource_list|
+            api(api_resource_list.groupVersion).api_resources = api_resource_list.resources if api_resource_list
+          end
+        rescue K8s::Error::NotFound, K8s::Error::ServiceUnavailable # rubocop:disable Lint/HandleExceptions
+          # kubernetes api is in unstable state
+          # because this is only performance optimization, better to skip prefetch and move on
         end
       end
 
@@ -158,9 +173,18 @@ module K8s
     # @param options @see K8s::ResourceClient#list
     # @return [Array<K8s::Resource>]
     def list_resources(resources = nil, **options)
+      cached_clients = @api_clients.size.positive?
       resources ||= self.resources.select(&:list?)
 
-      ResourceClient.list(resources, @transport, **options)
+      begin
+        ResourceClient.list(resources, @transport, **options)
+      rescue K8s::Error::NotFound
+        raise unless cached_clients
+
+        cached_clients = false
+        api_groups!
+        retry
+      end
     end
 
     # @param resource [K8s::Resource]

data/lib/k8s/client/version.rb

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

data/lib/k8s/resource.rb

@@ -1,6 +1,5 @@
 # frozen_string_literal: true
 
-require 'deep_merge'
 require 'recursive-open-struct'
 require 'hashdiff'
 require 'forwardable'
@@ -13,6 +12,7 @@ module K8s
     include Comparable
 
     using YAMLSafeLoadStream
+    using K8s::Util::HashDeepMerge
 
     # @param data [String]
     # @return [self]

data/lib/k8s/transport.rb

@@ -106,8 +106,8 @@ module K8s
       new(
         "https://#{host}:#{port}",
         ssl_verify_peer: options.key?(:ssl_verify_peer) ? options.delete(:ssl_verify_peer) : true,
-        ssl_ca_file: options.delete(:ssl_ca_file) || '/var/run/secrets/kubernetes.io/serviceaccount/ca.crt',
-        auth_token: options.delete(:auth_token) || File.read('/var/run/secrets/kubernetes.io/serviceaccount/token'),
+        ssl_ca_file: options.delete(:ssl_ca_file) || File.join((ENV['TELEPRESENCE_ROOT'] || '/'), 'var/run/secrets/kubernetes.io/serviceaccount/ca.crt'),
+        auth_token: options.delete(:auth_token) || File.read(File.join((ENV['TELEPRESENCE_ROOT'] || '/'), 'var/run/secrets/kubernetes.io/serviceaccount/token')),
         **options
       )
     end

data/lib/k8s/util.rb

@@ -3,6 +3,58 @@
 module K8s
   # Miscellaneous helpers
   module Util
+    module HashDeepMerge
+      refine Hash do
+        # @param other [Hash]
+        # @param overwrite_arrays [Boolean] when encountering an array, replace the array with the new array
+        # @param union_arrays [Boolean] when encountering an array, use Array#union to combine with the existing array
+        # @param keep_existing [Boolean] prefer old value over new value
+        # @param merge_nil_values [Boolean] overwrite an existing value with a nil value
+        # @param merge_non_hash [Boolean] calls .merge on objects that respond to .merge
+        def deep_merge(other, overwrite_arrays: true, union_arrays: false, keep_existing: false, merge_nil_values: false, merge_non_hash: false)
+          merge(other) do |key, old_value, new_value|
+            case old_value
+            when Hash
+              raise "#{key} : #{new_value.class.name} can not be merged into a Hash" unless new_value.is_a?(Hash)
+
+              old_value.deep_merge(
+                new_value,
+                overwrite_arrays: overwrite_arrays,
+                union_arrays: union_arrays,
+                keep_existing: keep_existing,
+                merge_nil_values: merge_nil_values,
+                merge_non_hash: merge_non_hash
+              )
+            when Array
+              if overwrite_arrays
+                new_value
+              elsif union_arrays
+                raise "#{key} : #{new_value.class.name} can not be merged into an Array" unless new_value.is_a?(Array)
+
+                old_value | new_value
+              else
+                old_value + new_value
+              end
+            else
+              if keep_existing
+                old_value
+              elsif new_value.nil? && merge_nil_values
+                nil
+              elsif merge_non_hash && old_value.respond_to?(:merge)
+                old_value.merge(new_value)
+              else
+                new_value.nil? ? old_value : new_value
+              end
+            end
+          end
+        end
+
+        def deep_merge!(other, **options)
+          replace(deep_merge(other, **options))
+        end
+      end
+    end
+
     PATH_TR_MAP = { '~' => '~0', '/' => '~1' }.freeze
     PATH_REGEX = %r{(/|~(?!1))}.freeze
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: k8s-client
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.8.0
 platform: ruby
 authors:
 - Kontena, Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-01-02 00:00:00.000000000 Z
+date: 2019-01-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: excon
@@ -38,20 +38,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.5.0
-- !ruby/object:Gem::Dependency
-  name: deep_merge
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.2.1
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.2.1
 - !ruby/object:Gem::Dependency
   name: recursive-open-struct
   requirement: !ruby/object:Gem::Requirement