krane 3.4.0 → 3.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0a400c15e247a60bf8596665ddf2737abb44c2418358212e689890eb2178956f
-  data.tar.gz: '0386e1417ba00c97add6aa7184176785f82d05de5453140a8806540833c85f46'
+  metadata.gz: e9af2989b818a90b912ff0be766da947ba16069bf80c37af1fbe796035e09639
+  data.tar.gz: ee50f25e7c6978f00b9fe3db89a1eae508cfc5d5537af3eed34f7de8686d39c0
 SHA512:
-  metadata.gz: a8b4c706a3918d6d3b66f098ae03c1e02680d59bef3f8eab34248997bfc11e512206f1b1d1794f50f12965e7a0cffbb2df2293b4639dd28b4b8526db881cf315
-  data.tar.gz: 7d113bfa20d8dec893fa3494ea7f55a9bf89c3a59ca7a461e1076c5fed37c2725b495a96efa5034c18b857819c96f5803045dec444a3c205e70f647b162f8106
+  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,5 +1,14 @@
 ## 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.
+
 # 3.4.0
 
 - Use `prune-allowlist` instead of `prune-whitelist` for 1.26+ clusters. Clusters running 1.25 or less will continue to use `--prune-whitelist`. [#940](https://github.com/Shopify/krane/pull/940)

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/deploy_task.rb

@@ -286,15 +286,9 @@ module Krane
 
     def validate_resources(resources)
       validate_globals(resources)
-      batch_dry_run_success = 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?
@@ -320,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.0"
+  VERSION = "3.4.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: krane
 version: !ruby/object:Gem::Version
-  version: 3.4.0
+  version: 3.4.2
 platform: ruby
 authors:
 - Katrina Verey
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-12-13 00:00:00.000000000 Z
+date: 2024-01-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -525,7 +525,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.22
+rubygems_version: 3.5.5
 signing_key: 
 specification_version: 4
 summary: A command line tool that helps you ship changes to a Kubernetes namespace