Make transparently compatible with pre 1.26 client

Shopify · Dec 8, 2023 · 54677a0 · 54677a0
1 parent 1209f24
commit 54677a0
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 7 deletions.
diff --git a/lib/krane/kubectl.rb b/lib/krane/kubectl.rb
@@ -12,6 +12,7 @@ class Kubectl
     DEFAULT_TIMEOUT = 15
     MAX_RETRY_DELAY = 16
     SERVER_DRY_RUN_MIN_VERSION = "1.13"
+    ALLOW_LIST_MIN_VERSION = "1.26"
 
     class ResourceNotFoundError < StandardError; end
 
@@ -112,6 +113,14 @@ def dry_run_flag
       "--dry-run=server"
     end
 
+    def allowlist_flag
+      if client_version >= Gem::Version.new(ALLOW_LIST_MIN_VERSION)
+        "--prune-allowlist"
+      else
+        "--prune-whitelist"
+      end
+    end
+
     private
 
     def build_command_from_options(args, use_namespace, use_context, output)

diff --git a/lib/krane/resource_deployer.rb b/lib/krane/resource_deployer.rb
@@ -154,7 +154,8 @@ def apply_all(resources, prune, dry_run: false)
           else
             command.push("--all")
           end
-          @prune_allowlist.each { |type| command.push("--prune-allowlist=#{type}") }
+          allow_list_flag = kubectl.allowlist_flag
+          @prune_allowlist.each { |type| command.push("#{allow_list_flag}=#{type}") }
         end
 
         command.push(kubectl.dry_run_flag) if dry_run

diff --git a/test/unit/krane/resource_deployer_test.rb b/test/unit/krane/resource_deployer_test.rb
@@ -4,21 +4,21 @@
 
 class ResourceDeployerTest < Krane::TestCase
   def test_deploy_prune_builds_whitelist
-    whitelist_kind = "fake_kind"
+    allowlist_kind = "fake_kind"
     resource = build_mock_resource
     Krane::Kubectl.any_instance.expects(:run).with do |*args|
-      args.include?("--prune-allowlist=#{whitelist_kind}")
+      args.any? { |arg| arg == "--prune-allowlist=#{allowlist_kind}" || arg == "--prune-whitelist=#{allowlist_kind}"}
     end.returns(["", "", stub(success?: true)])
-    resource_deployer(kubectl_times: 0, prune_allowlist: [whitelist_kind]).deploy!([resource], false, true)
+    resource_deployer(kubectl_times: 0, prune_allowlist: [allowlist_kind]).deploy!([resource], false, true)
   end
 
   def test_deploy_no_prune_doesnt_prune
-    whitelist_kind = "fake_kind"
+    allowlist_kind = "fake_kind"
     resource = build_mock_resource
     Krane::Kubectl.any_instance.expects(:run).with do |*args|
-      !args.include?("--prune-allowlist=#{whitelist_kind}")
+      args.any? { |arg| arg == "--prune-allowlist=#{allowlist_kind}" || arg == "--prune-whitelist=#{allowlist_kind}"}
     end.returns(["", "", stub(success?: true)])
-    resource_deployer(kubectl_times: 0, prune_allowlist: [whitelist_kind]).deploy!([resource], false, false)
+    resource_deployer(kubectl_times: 0, prune_allowlist: [allowlist_kind]).deploy!([resource], false, false)
   end
 
   def test_deploy_verify_false_message