k8s-client 0.4.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ac23332f18be9e1b95502a9526eab9ed5e4f31a379540387c452802be09b61dc
-  data.tar.gz: 673e7eb930084bb9dd49353d87de7dc54631e8b4a8a85f3bb707c28573ca8441
+  metadata.gz: 7ffb8d5ea84ea9155cf1edabd3658712e419d61caf2381c7c9e00a450d7b5c52
+  data.tar.gz: d97128fc9858a09d41585a5b9879deb2920cda848fcf1b01661c5bf23c2b1c10
 SHA512:
-  metadata.gz: f19573347f0f74af1e6eb9da2d8aa61d469aa6de69b2deef3938a39f74758191e5edc0f931d33e3953c3f3a96accb0463cfda704dec16d731b700a10e6f8fe7c
-  data.tar.gz: 426356558b0772b51324624ad06ee4ed3b6bef519fd78d845df5f020cf515f81ae1a4bc11febcae3609b425d46ca804645b17e53d891c52e26f9215d4586b4a4
+  metadata.gz: c79481cc31f515777ab46d942aa5f941c4525fee62497dd93137ea33e075d32cd25ec1a4a26c3422b6a7c5ef533432b58e36a6cd10b2cd392deffa0dc66e9c91
+  data.tar.gz: 34694c8c5985f51ff701853cd7d34a307c9e3a414570e0817760df5200edc9b47b92b8b7a087d094c5863e2ef5d0133447905f576b09491fd5b2c9fa002e9a42

data/.travis.yml

@@ -12,7 +12,7 @@ deploy:
   provider: rubygems
   gem: k8s-client
   api_key:
-    secure: ArI9RehHbuJIZklO3FA0cGp4WOc2QYkO26BsKZDWLkTOpRo0GSQRt4WMeOmVpdYfR7yNRgyV8eaGnEYr6ZNS8ejjmwWUnRhBaoEzEC4e9RxaDPTVJDpFOPi38eAtUyAZ7bMeJzhgPev7Y7ofrymuVmsXq/48mJZtSHJckii0UYjaveiH8aGeXxCVFY1csexN36AYr3NCkCqQp9ICXAhQI+UXftVKoN/uXMJC2l8VgjRuxn61x68/XCAxoPr44kYY4PSDAF9eYX/2UTDx4Vu4g4CzCCEC8vYQ36peuFGiCt5lzAIZdu07Xotch6rpHpRRGAhiahNrZVc3oma2IWkPmAJgPWHjjXraq5gjB1O3avLNmmH3rZOPl6kv/FGmafrfu4IbNx78V+SLMWu8+m98xbBLDk/wphtfQuMHAF1huQS0lsKZ2G58OYd7SyJL9RibhOZXgSC4D5YU1uT1m1wIpTw1e7aNkHiSR+zmhmhhKXFW1lJhDsHYQ6prIpKFTkrxChRX4dOyF0ua/hDJP5PdniPEe2ANcao6giEhB5Sr/IdHgFoIiQ1dwuDW6UiNgkLyGAgLVlH61Ie3BBUf8faPs36bgrgwmG5s7/9fF8w892m+Ho+Xx0vSGpup8L64ew9xgrjnW4cLcFUesaVyG+t8uPequosf+wHd8fi9r7KF+PQ=
+    secure: "f5NfPVtrGPaOCP/tnfoYRSZCRwITnQrl/YNW70gm+nk32JD1UE7qloYdNqpx4VChdFsOH/hfxygiFJkuAhvEWsx1kqOfNpVV+05r92ulp0tMyC/U1wBdnY1UEVbyZF/of25aPezx6Egkw5OFAOqUVwC6m1CqHiL91InZcE5uNtI9Kc2MHAWZqKyD7G5hau0jdFWldTS1gRrl4wJaJq0TQEWqllX6UmaW+p3pSFYKw6IekrI4LYTmCCbxRjwl2TQ8WMSTjvzEK3AIeUe7QU8bv3+56FsnCwr7dXeSK6GoDTQHZlflqYaTt6khsIXbGFCQyws4qFWu69Wf+nEJTSe7TH3qKa1WsAQy0CucVxQ5C0Lt5N5Bb2ZhqM3F2rjxeUnRBJfSRPNqyRQJUaY5GyxcEgco/rhFNJKD28sfNMqBslxGRpj2Y+hyzXt9JnRe7yEdWJcVuQLp6ObhK5DDqtcOF4aFrVd1OxZLlvl7DTHlngBuMJ7TRX50wfAkRWr4u+crrsN25j8y1KfXkTBWvlPNlReHxeT3DjPkhGuMGpy52KOtGB+5ibFvea3N2o4t9xT5pykvQ0ohwu+aj/4MroP95NKwVWZ8cbW/euOd68lwA1ZGTalPKmMWH4pPwNUmhnaCgZGexktGAVpDxFE7fZdh7gb/szfmeDDZ66eAolzrImU="
   on:
     tags: true
     rvm: '2.4'

data/lib/k8s/client/version.rb

@@ -1,6 +1,6 @@
 module K8s
   class Client
     # Updated on releases using semver.
-    VERSION = "0.4.0"
+    VERSION = "0.4.1"
   end
 end

data/lib/k8s/resource.rb

@@ -27,7 +27,7 @@ module K8s
 
       if stat.directory?
         # recurse
-        Dir.glob("#{path}/*.{yml,yaml}").sort.map{|path| self.from_files(path) }.flatten
+        Dir.glob("#{path}/*.{yml,yaml}").sort.map { |dir| self.from_files(dir) }.flatten
       else
         ::YAML.load_stream(File.read(path), path).map{|doc| new(doc) }
       end
@@ -79,10 +79,13 @@ module K8s
     # @return [Hash]
     def current_config(config_annotation)
       current_cfg = self.metadata.annotations&.dig(config_annotation)
+      return {} unless current_cfg
 
-      return JSON.parse(current_cfg) if current_cfg
+      current_hash = JSON.parse(current_cfg)
+      # kubectl adds empty metadata.namespace, let's fix it
+      current_hash['metadata'].delete('namespace') if current_hash.dig('metadata', 'namespace').to_s.empty?
 
-      {}
+      current_hash
     end
 
     def can_patch?(config_annotation)

data/lib/k8s/util.rb

@@ -1,6 +1,9 @@
 module K8s
   # Miscellaneous helpers
   module Util
+    PATH_TR_MAP={ '~' => '~0', '/' => '~1' }.freeze
+    PATH_REGEX=%r{(/|~(?!1))}.freeze
+
     # Yield with all non-nil args, returning matching array with corresponding return values or nils.
     #
     # Args must be usable as hash keys. Duplicate args will all map to the same return value.
@@ -29,13 +32,17 @@ module K8s
     def self.json_patch(a, b)
       diffs = HashDiff.diff(a, b, array_path: true)
       ops = []
-      # Each diff is like ["+", "spec.selector.aziz", "kebab"]
-      # or ["-", "spec.selector.aziz", "kebab"]
+      # Each diff is like:
+      # ["+", ["spec", "selector", "food"], "kebab"]
+      # ["-", ["spec", "selector", "drink"], "pepsi"]
+      # or
+      # ["~", ["spec", "selector", "drink"], "old value", "new value"]
+      # the path elements can be symbols too, depending on the input hashes
       diffs.each do |diff|
         operator = diff[0]
         # substitute '/' with '~1' and '~' with '~0'
         # according to RFC 6901
-        path = diff[1].map {|p| p.to_s.gsub('/', '~1')}.map {|p| p.to_s.gsub('~', '~0')}
+        path = diff[1].map {|p| p.to_s.gsub(PATH_REGEX, PATH_TR_MAP) }
         if operator == '-'
           ops << {
             op: "remove",

metadata

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