krane 2.4.6 → 2.4.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3efffadcb3741041089702a861ec5895261b3a47a4b3bee3ab2290f2d47b237e
-  data.tar.gz: fd9d8eda29c43146a4754e55321e0546244ef79ce67d534895b5c159b55399e2
+  metadata.gz: 4ea2d6805d4bcb71c3d3f70d99cb27a6bd392636a19077cea322f782e815b072
+  data.tar.gz: a7aaf751e8d1de0f47006b41bd115615f49b2ba05ff1486447e3747bd467722b
 SHA512:
-  metadata.gz: e5f7a84718bf3be365a9947cbb7124f2ca6df5967dd39694ce0882bbfd620e488e91610ccc284d33a04d0af2471b3fc11f42b79853db0c20e87b6babc69adeb2
-  data.tar.gz: 57ed1f07880d46fd2bf5388bb7ae9bb3bb5f50aa4ec001e7d095d9cadf66e01952f0082bc3bd3f0115dcab3afa531f07d709404c6cfcafc93941a48a55941fbb
+  metadata.gz: b6f742a8c88c993c9c255ce27ae1419989e03810a21cc656bcc6b0766496b0fdeed7ead385e97d30a77c5c03b56c3fac5039e5c2556ed8ceb4a04a6fca31f7e1
+  data.tar.gz: 9ec49b7ffdacf6a58a1e498c1c17be51a2a2c063c613d5ecb391d704383803d3b8911e91bcca125e14fa03b82252ad3e040511e9cc7c632506a9074cd2dafff3

data/CHANGELOG.md

@@ -1,5 +1,15 @@
 ## next
 
+## 2.4.7
+
+*Bug fixes*
+
+- Fix `replace-force` deployment method override. 
+```
+/usr/local/bundle/gems/krane-2.4.6/lib/krane/resource_deployer.rb:119:in `block in deploy_resources': Unexpected deploy method! (:"replace-force") (ArgumentError)
+```
+Dash (-) must be replaced with underscore (_) before applying it as method on kubernetes resource.
+
 ## 2.4.6
 
 *Bug fixes*

data/lib/krane/kubectl.rb

@@ -82,9 +82,17 @@ module Krane
     def version_info
       @version_info ||=
         begin
-          response, _, status = run("version", use_namespace: false, log_failure: true, attempts: 2)
+          response, _, status = run("version", output: "json", use_namespace: false, log_failure: true, attempts: 2)
           raise KubectlError, "Could not retrieve kubectl version info" unless status.success?
-          extract_version_info_from_kubectl_response(response)
+
+          version_data = JSON.parse(response)
+          client_version = platform_agnostic_version(version_data.dig("clientVersion", "gitVersion").to_s)
+          server_version = platform_agnostic_version(version_data.dig("serverVersion", "gitVersion").to_s)
+          unless client_version && server_version
+            raise KubectlError, "Received invalid kubectl version data: #{version_data}"
+          end
+
+          { client: client_version, server: server_version }
         end
     end
 
@@ -127,15 +135,10 @@ module Krane
       end
     end
 
-    def extract_version_info_from_kubectl_response(response)
-      info = {}
-      response.each_line do |l|
-        match = l.match(/^(?<kind>Client|Server).* GitVersion:"v(?<version>\d+\.\d+\.\d+)/)
-        if match
-          info[match[:kind].downcase.to_sym] = Gem::Version.new(match[:version])
-        end
+    def platform_agnostic_version(version_string)
+      if match = version_string.match(/v(?<version>\d+\.\d+\.\d+)/)
+        Gem::Version.new(match[:version])
       end
-      info
     end
   end
 end

data/lib/krane/kubernetes_resource.rb

@@ -250,7 +250,7 @@ module Krane
     end
 
     def deploy_method_override
-      krane_annotation_value(DEPLOY_METHOD_OVERRIDE_ANNOTATION)&.to_sym
+      krane_annotation_value(DEPLOY_METHOD_OVERRIDE_ANNOTATION)&.gsub("-", "_")&.to_sym
     end
 
     def sync_debug_info(kubectl)

data/lib/krane/version.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 module Krane
-  VERSION = "2.4.6"
+  VERSION = "2.4.7"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: krane
 version: !ruby/object:Gem::Version
-  version: 2.4.6
+  version: 2.4.7
 platform: ruby
 authors:
 - Katrina Verey
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-04-05 00:00:00.000000000 Z
+date: 2022-05-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport