krane 3.4.1 → 3.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5d9fd3a2bdcd247f19399a1617e4b3d7c2534b78535a05fe2609e1770fbcb943
-  data.tar.gz: 58f419d984de460814ceb27212e577b26d81e243f5be9b3821a0b348e314b975
+  metadata.gz: e9af2989b818a90b912ff0be766da947ba16069bf80c37af1fbe796035e09639
+  data.tar.gz: ee50f25e7c6978f00b9fe3db89a1eae508cfc5d5537af3eed34f7de8686d39c0
 SHA512:
-  metadata.gz: '0443799d9c0b820269127bedc5c2ee8ad7ef4de195bceb8b0cd65f46d55e169b19be24e50798901796ff33b46a34e21af5d2e2e5c3adfff2cf9464fd52899f27'
-  data.tar.gz: 81647888f3cca18356273f23802960d683830d68bb373da6031e64791374ef276a42f8161bf2f50b57dd46de6934d924dde85ddf70c6ac9930fb9f8163c0f452
+  metadata.gz: d7b8f745d709a8a06b8abfa3733df4dc897ea46e019d0d4edba80cbaf46a315697491dd27a75ccc876965d3e42d4cad58f7b1ed98b6d1ba1902ec71e0edf0969
+  data.tar.gz: 804e293dd895cee5a1aaa48b0509ff46dd039fafad7aadcfcb7f97e61cef9490dc745a77f4fb9a38f0627c09c29864f53a493451a9e8fdfe1b1d6c78a2c43386

data/.github/workflows/ci.yml

@@ -6,7 +6,7 @@ jobs:
   ruby-tests:
     runs-on: ubuntu-latest
 
-    name: "Tests - Ruby ${{ matrix.ruby }} with Kubernetes ${{ matrix.kubernetes_version }}"
+    name: "Tests (${{matrix.test_suite}}) - Ruby ${{ matrix.ruby }} with Kubernetes ${{ matrix.kubernetes_version }}"
     strategy:
       fail-fast: false
       matrix:
@@ -20,6 +20,11 @@ jobs:
           - "1.26.4"
           - "1.24.13"
           - "1.23.17"
+        test_suite:
+          - "unit_test"
+          - "cli_test"
+          - "serial_integration_test"
+          - "integration_test"
         include:
           - kubernetes_version: "1.27.3"
             kind_image: "kindest/node:v1.27.3@sha256:9dd3392d79af1b084671b05bcf65b21de476256ad1dcc853d9f3b10b4ac52dde"
@@ -52,4 +57,4 @@ jobs:
 
       - name: Run tests
         run: |
-          bin/test
+          bin/test ${{matrix.test_suite}}

data/CHANGELOG.md

@@ -1,8 +1,13 @@
 ## next
 
+# 3.4.2
+
+- Remove flag `--skip-dry-run` (see [#946](https://github.com/Shopify/krane/pull/946))
+- Remove support for batched server-side dry-run ([#946](https://github.com/Shopify/krane/pull/946))
+
 # 3.4.1
 
-- Added flag `--skip-dry-run` to completely opt out of dry run validation. 
+- Added flag `--skip-dry-run` to completely opt out of dry run validation.
 
 # 3.4.0
 

data/bin/test

@@ -33,16 +33,23 @@ if [[ "${CI:-0}" != "0" ]]; then
   PARALLELISM=2
 fi
 
-print_header "Run CLI Tests"
-bundle exec rake cli_test
+test_type=$1
 
-print_header "Run Unit Tests"
-bundle exec rake unit_test
 
-print_header "Run Non-Parallel Integration Tests"
-bundle exec rake serial_integration_test
+case $test_type in
+  cli_test | unit_test | serial_integration_test)
+    print_header $test_type
+    bundle exec rake $test_type
+    ;;
 
-print_header "Run Parallel Integration Tests (MT_CPU=$PARALLELISM)"
-PARALLELIZE_ME=1 MT_CPU=$PARALLELISM bundle exec rake integration_test
+  integration_test)
+    print_header "Run Parallel Integration Tests (MT_CPU=$PARALLELISM)"
+    PARALLELIZE_ME=1 MT_CPU=$PARALLELISM bundle exec rake integration_test
+    ;;
+
+  *)
+    echo "Argument must be one of: unit_test, cli_test, serial_integration_test, integration_test"
+    ;;
+esac
 
 test $err -eq 0

data/lib/krane/cli/deploy_command.rb

@@ -33,7 +33,6 @@ module Krane
                                   default: false },
         "verify-result" => { type: :boolean, default: true,
                              desc: "Verify workloads correctly deployed" },
-        "skip-dry-run" => { type: :boolean, desc: "Enable skipping dry run", default: false},
       }
 
       def self.from_options(namespace, context, options)
@@ -72,7 +71,6 @@ module Krane
             selector: selector,
             selector_as_filter: selector_as_filter,
             protected_namespaces: protected_namespaces,
-            skip_dry_run: options["skip-dry-run"]
           )
 
           deploy.run!(

data/lib/krane/deploy_task.rb

@@ -106,7 +106,7 @@ module Krane
     # @param render_erb [Boolean] Enable ERB rendering
     def initialize(namespace:, context:, current_sha: nil, logger: nil, kubectl_instance: nil, bindings: {},
       global_timeout: nil, selector: nil, selector_as_filter: false, filenames: [], protected_namespaces: nil,
-      render_erb: false, kubeconfig: nil, skip_dry_run: false)
+      render_erb: false, kubeconfig: nil)
       @logger = logger || Krane::FormattedLogger.build(namespace, context)
       @template_sets = TemplateSets.from_dirs_and_files(paths: filenames, logger: @logger, render_erb: render_erb)
       @task_config = Krane::TaskConfig.new(context, namespace, @logger, kubeconfig)
@@ -121,7 +121,6 @@ module Krane
       @selector_as_filter = selector_as_filter
       @protected_namespaces = protected_namespaces || PROTECTED_NAMESPACES
       @render_erb = render_erb
-      @skip_dry_run = skip_dry_run
     end
 
     # Runs the task, returning a boolean representing success or failure
@@ -287,15 +286,9 @@ module Krane
 
     def validate_resources(resources)
       validate_globals(resources)
-      batch_dry_run_success = @skip_dry_run || validate_dry_run(resources)
       resources.select! { |r| r.selected?(@selector) } if @selector_as_filter
       Krane::Concurrency.split_across_threads(resources) do |r|
-        # No need to pass in kubectl (and do per-resource dry run apply) if batch dry run succeeded
-        if batch_dry_run_success
-          r.validate_definition(kubectl: nil, selector: @selector, dry_run: false)
-        else
-          r.validate_definition(kubectl: kubectl, selector: @selector, dry_run: true)
-        end
+        r.validate_definition(kubectl: kubectl, selector: @selector, dry_run: true)
       end
       failed_resources = resources.select(&:validation_failed?)
       if failed_resources.present?
@@ -321,10 +314,6 @@ module Krane
         "Use GlobalDeployTask instead."
     end
 
-    def validate_dry_run(resources)
-      resource_deployer.dry_run(resources)
-    end
-
     def namespace_definition
       @namespace_definition ||= begin
         definition, _err, st = kubectl.run("get", "namespace", @namespace, use_namespace: false,

data/lib/krane/resource_deployer.rb

@@ -20,13 +20,6 @@ module Krane
       @statsd_tags = statsd_tags
     end
 
-    def dry_run(resources)
-      apply_all(resources, true, dry_run: true)
-      true
-    rescue FatalDeploymentError
-      false
-    end
-
     def deploy!(resources, verify_result, prune)
       if verify_result
         deploy_all_resources(resources, prune: prune, verify: true)

data/lib/krane/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: krane
 version: !ruby/object:Gem::Version
-  version: 3.4.1
+  version: 3.4.2
 platform: ruby
 authors:
 - Katrina Verey
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2024-01-29 00:00:00.000000000 Z
+date: 2024-01-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport