k8s-client 0.10.2 → 0.10.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 18685c17f11d9b22cd78b7ec8931ada4e58feb72
-  data.tar.gz: 7f1d403748d95d72641a414936b568197b24c058
+SHA256:
+  metadata.gz: 781a19c46761e39d8b647885955a8e947c993d39448b441008c6abef723cd68e
+  data.tar.gz: 0fca7c3e1b3fb2f6fff59036ce1aa21b7659a3d168efe70af840e5c78c98997c
 SHA512:
-  metadata.gz: 42103f4da761437771a1af304462d68111cb9e33db4514f31ae58e68f341896f628d7aea4ac5b8368e10c42426a7f04b4186e7fd28fd22ca0bc8638146954f0a
-  data.tar.gz: 98d9905892a6282bb6a3850beb5a2bc84fcb5179127e5d937bc2983b40601ffa71dadd458395cb7f9e77900793160d7c2921b3a36942cb3c8387883e58379b91
+  metadata.gz: 6c2ff77f3c91c3107dd77f984af8411036ce5181bbe329d475e446e6d3274eed1d93444e128e71bc0f543b2b2720fbc34828b9739af97302b678b8137d216ad0
+  data.tar.gz: 7ad27a638df184987b658a3d2f9f15f4b9051942d4f2a96ff9b232a8900f64614ca8edd277c4e49398b2d83cbaf26567d9220a936c00775296b89339db25e94a

data/k8s-client.gemspec

@@ -23,11 +23,11 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
   spec.required_ruby_version = '~> 2.4'
 
-  spec.add_runtime_dependency "excon", "~> 0.64.0"
+  spec.add_runtime_dependency "excon", "~> 0.66"
   spec.add_runtime_dependency "dry-struct", "~> 0.5.0"
   spec.add_runtime_dependency "dry-types", "~> 0.13.0"
   spec.add_runtime_dependency "recursive-open-struct", "~> 1.1.0"
-  spec.add_runtime_dependency 'hashdiff', '~> 0.3.7'
+  spec.add_runtime_dependency 'hashdiff', '~> 1.0.0'
   spec.add_runtime_dependency 'jsonpath', '~> 0.9.5'
   spec.add_runtime_dependency 'yajl-ruby', '~> 1.4.0'
   spec.add_runtime_dependency "yaml-safe_load_stream", "~> 0.1"
@@ -35,6 +35,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "bundler", ">= 1.17", "< 3.0"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "rspec", "~> 3.7"
-  spec.add_development_dependency "webmock", "~> 3.4.2"
+  spec.add_development_dependency "webmock", "~> 3.6.2"
   spec.add_development_dependency "rubocop", "~> 0.59"
 end

data/lib/k8s/client/version.rb

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

data/lib/k8s/client.rb

@@ -82,8 +82,14 @@ module K8s
         configuration = K8s::Config.build(server: ENV['KUBE_SERVER'], ca: ENV['KUBE_CA'], auth_token: token)
       elsif !ENV['KUBECONFIG'].to_s.empty?
         configuration = K8s::Config.from_kubeconfig_env(ENV['KUBECONFIG'])
-      elsif File.exist?(File.join(Dir.home, '.kube', 'config'))
-        configuration = K8s::Config.load_file(File.join(Dir.home, '.kube', 'config'))
+      else
+        found_config = [
+          File.join(Dir.home, '.kube', 'config'),
+          '/etc/kubernetes/admin.conf',
+          '/etc/kubernetes/kubelet.conf'
+        ].find { |f| File.exist?(f) && File.readable?(f) }
+
+        configuration = K8s::Config.load_file(found_config) if found_config
       end
 
       if configuration

data/lib/k8s/config.rb

@@ -175,7 +175,6 @@ module K8s
           when NilClass
             new_value
           else
-            warn "key is #{key} old val is #{old_value.inspect} and new val is #{new_value.inspect}"
             old_value
           end
         end

data/lib/k8s/stack.rb

@@ -129,7 +129,10 @@ module K8s
     # @param resource [K8s::Resource]
     # @return [Boolean]
     def keep_resource?(resource)
-      @keep_resources["#{resource.kind}:#{resource.metadata.name}@#{resource.metadata.namespace}"] == resource.metadata.annotations[@checksum_annotation]
+      keep_annotation = @keep_resources["#{resource.kind}:#{resource.metadata.name}@#{resource.metadata.namespace}"]
+      return false unless keep_annotation
+
+      keep_annotation == resource.metadata&.annotations.dig(@checksum_annotation)
     end
 
     # Delete all stack resources that were not applied
@@ -157,6 +160,8 @@ module K8s
 
         if resource_label != name
           # apiserver did not respect labelSelector
+        elsif resource.metadata&.ownerReferences && !resource.metadata.ownerReferences.empty?
+          logger.info "Server resource #{resource.apiVersion}:#{resource.apiKind}/#{resource.metadata.name} in namespace #{resource.metadata.namespace} has ownerReferences and will be kept"
         elsif keep_resources && keep_resource?(resource)
           # resource is up-to-date
         else

data/lib/k8s/transport.rb

@@ -131,7 +131,7 @@ module K8s
       raise(K8s::Error::Configuration, "in_cluster_config failed: KUBERNETES_SERVICE_HOST environment not set") if host.empty?
 
       port = ENV['KUBERNETES_SERVICE_PORT_HTTPS'].to_s
-      raise(K8s::Error::Configuration, "in_cluster_config failed: KUBERNETES_SERVICE_HOST environment not set") if port.empty?
+      raise(K8s::Error::Configuration, "in_cluster_config failed: KUBERNETES_SERVICE_PORT_HTTPS environment not set") if port.empty?
 
       new(
         "https://#{host}:#{port}",
@@ -180,7 +180,8 @@ module K8s
     # @param parts [Array<String>] join path parts together to build the full URL
     # @return [String]
     def path(*parts)
-      File.join(path_prefix, *parts)
+      joined_parts = File.join(*parts)
+      joined_parts.start_with?(path_prefix) ? joined_parts : File.join(path_prefix, joined_parts)
     end
 
     # @param request_object [Object] include request body using to_json

data/lib/k8s/util.rb

@@ -98,7 +98,7 @@ module K8s
     # @param patch_to [Hash] Hash to compute patches against
     # @param patch_from [Hash] New Hash to compute patches "from"
     def self.json_patch(patch_to, patch_from)
-      diffs = HashDiff.diff(patch_to, patch_from, array_path: true)
+      diffs = Hashdiff.diff(patch_to, patch_from, array_path: true)
       ops = []
       # Each diff is like:
       # ["+", ["spec", "selector", "food"], "kebab"]

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: k8s-client
 version: !ruby/object:Gem::Version
-  version: 0.10.2
+  version: 0.10.4
 platform: ruby
 authors:
 - Kontena, Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-06-28 00:00:00.000000000 Z
+date: 2019-09-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: excon
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.64.0
+        version: '0.66'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.64.0
+        version: '0.66'
 - !ruby/object:Gem::Dependency
   name: dry-struct
   requirement: !ruby/object:Gem::Requirement
@@ -72,14 +72,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.7
+        version: 1.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.7
+        version: 1.0.0
 - !ruby/object:Gem::Dependency
   name: jsonpath
   requirement: !ruby/object:Gem::Requirement
@@ -176,14 +176,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.4.2
+        version: 3.6.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.4.2
+        version: 3.6.2
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
@@ -233,7 +233,6 @@ files:
 - lib/k8s/client/version.rb
 - lib/k8s/config.rb
 - lib/k8s/error.rb
-- lib/k8s/foo.yaml
 - lib/k8s/logging.rb
 - lib/k8s/resource.rb
 - lib/k8s/resource_client.rb
@@ -259,8 +258,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.14.4
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Kubernetes client library

data/lib/k8s/foo.yaml

@@ -1,33 +0,0 @@
-apiVersion: v1
-kind: Pod
-metadata:
-  name: myapp
-spec:
-  containers:
-  - name: myapp
-    image: docker.io/nginx/:1-alpine
-    resources:
-      limits:
-        memory: "10Mi"
-        cpu: "100m"
-
----
-
-apiVersion: v1
-kind: Pod
-metadata:
-  name: myapp
-  labels: {}
-spec:
-  containers:
-  - name: myapp
-    image: docker.io/nginx/:1-alpine
-    resources:
-      limits:
-        memory: "10Mi"
-        cpu: "100m"
-    ports: []
-
-
-
-