krane 3.6.1 → 3.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d78cc316978de660c325dc26a7e6857b4b0c622537558929a769c282007203ce
-  data.tar.gz: a8ff6c78f240824244b77ada8f4e835576cd42a97955c4113edb8369feedc086
+  metadata.gz: 0bb4b346e9146186c9e1549f71708707568aa9872a2b7e0e1a0e6fd01e9f4d52
+  data.tar.gz: fb3662468c546ba6717cfd9de125cd4d6ef2caa2269404a618c2152770fc0d3d
 SHA512:
-  metadata.gz: cea17bc39a0fafc26dc2fd0a0de0c5091e4efdd444548559516136d7cde0b10003b30ce924b65859e89e711f7379d64815e89e98b8bfbf55c82b98ec2c8883ca
-  data.tar.gz: d4d3a0aade84bc17a7add8f11bb436820ad0f6f36202a9bf96b9ca80847291c885d6f249a77ea002efa6b9a4e80bd14b8797247eefb82e8a6d7a528e5db95a91
+  metadata.gz: 7a4e23ab9d917f223c6e294a61b26d17791c3554257bbc81a95e5372f1d90af727a13b3bf470008be750fafbb7dbef322486289a2b247e9e60881eff2f4bad15
+  data.tar.gz: b73325f5894e1a9ed67e75d1dc1759ceea4afe58aad5be81f27905bd3d0a10ff38012494c26cf68b06c338cd24367bb8e6d472e7b394aed3f3e0f3dd1ff56546

data/.github/workflows/ci.yml

@@ -18,6 +18,7 @@ jobs:
           - "3.0.4"
           - "2.7.6"
         kubernetes_version:
+          - "1.31.2"
           - "1.30.0"
           - "1.29.4"
           - "1.28.0"
@@ -29,6 +30,8 @@ jobs:
           - "serial_integration_test"
           - "integration_test"
         include:
+          - kubernetes_version: "1.31.2"
+            kind_image: "kindest/node:v1.31.2@sha256:18fbefc20a7113353c7b75b5c869d7145a6abd6269154825872dc59c1329912e"
           - kubernetes_version: "1.30.0"
             kind_image: "kindest/node:v1.30.0@sha256:047357ac0cfea04663786a612ba1eaba9702bef25227a794b52890dd8bcd692e"
           - kubernetes_version: "1.29.4"

data/CHANGELOG.md

@@ -1,10 +1,22 @@
 ## next
 
+## 3.7.0
+
+- Annotate individual resources with `last-applied-configuration` when using `krane deploy` with `--annotate-individuals`. Previously, eligible resources that were made with `create` or `replace` were applied along with the rest of the resources. However, this causes issues when a mutating admission controller modifies otherwise immutable fields.
+
+## 3.6.3
+
+- Test against k8s 1.31
+
+## 3.6.2
+
+- Pinning `stats-instrument` to < 3.9 to avoid breaking changes.
+
 ## 3.6.1
 
 *Features*
 
-- Enable the option to bypass endpoint validation for a service by using the annotation `krane.shopify.io/skip-endpoint-validation: true`. 
+- Enable the option to bypass endpoint validation for a service by using the annotation `krane.shopify.io/skip-endpoint-validation: true`.
 
 ## 3.6.0
 

data/README.md

@@ -97,6 +97,7 @@ Krane provides support for official upstream supported versions [Kubernetes](htt
 |        1.28        | Yes               |                    --                    |
 |        1.29        | Yes               |                    --                    |
 |        1.30        | Yes               |                    --                    |
+|        1.31        | Yes               |                    --                    |
 
 ## Installation
 

data/dev.yml

@@ -6,10 +6,18 @@ up:
   - podman
   - kind:
       name: krane
-      image: kindest/node:v1.28.0@sha256:dad5a6238c5e41d7cac405fae3b5eda2ad1de6f1190fa8bfc64ff5bb86173213
+      image: kindest/node:v1.31.2@sha256:18fbefc20a7113353c7b75b5c869d7145a6abd6269154825872dc59c1329912e
 commands:
   test:
-    run: bin/test
+    run: bin/test unit_test && bin/test cli_test && bin/test serial_integration_test && bin/test integration_test
+  test-unit:
+    run: bin/test unit_test
+  test-cli:
+    run: bin/test cli_test
+  test-serial_integration:
+    run: bin/test serial_integration_test,
+  test-integration:
+    run: bin/test integration_test
   tophat:
     run: PRINT_LOGS=1 bundle exec ruby -I test test/integration/krane_deploy_test.rb -n/${1}/
     desc: Tophat a change by running a test scenario with logging output enabled.

data/krane.gemspec

@@ -31,7 +31,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency("googleauth", "~> 1.2")
   spec.add_dependency("ejson", "~> 1.0")
   spec.add_dependency("colorize", "~> 0.8")
-  spec.add_dependency("statsd-instrument", ['>= 2.8', "< 4"])
+  spec.add_dependency("statsd-instrument", ['>= 2.8', "< 3.9"])
   spec.add_dependency("multi_json")
   spec.add_dependency("concurrent-ruby", "~> 1.1")
   spec.add_dependency("jsonpath", "~> 1.0")

data/lib/krane/resource_deployer.rb

@@ -22,7 +22,7 @@ module Krane
 
     def deploy!(resources, verify_result, prune)
       if verify_result
-        deploy_all_resources(resources, prune: prune, verify: true)
+        deploy_all_resources(resources, prune: prune, verify: true, annotate_individuals: true)
         failed_resources = resources.reject(&:deploy_succeeded?)
         success = failed_resources.empty?
         if !success && failed_resources.all?(&:deploy_timed_out?)
@@ -30,7 +30,7 @@ module Krane
         end
         raise FatalDeploymentError unless success
       else
-        deploy_all_resources(resources, prune: prune, verify: false)
+        deploy_all_resources(resources, prune: prune, verify: false, annotate_individuals: true)
         logger.summary.add_action("deployed #{resources.length} #{'resource'.pluralize(resources.length)}")
         warning = <<~MSG
           Deploy result verification is disabled for this deploy.
@@ -73,12 +73,13 @@ module Krane
 
     private
 
-    def deploy_all_resources(resources, prune: false, verify:, record_summary: true)
-      deploy_resources(resources, prune: prune, verify: verify, record_summary: record_summary)
+    def deploy_all_resources(resources, prune: false, verify:, record_summary: true, annotate_individuals: false)
+      deploy_resources(resources, prune: prune, verify: verify, record_summary: record_summary,
+      annotate_individuals: annotate_individuals)
     end
     measure_method(:deploy_all_resources, 'normal_resources.duration')
 
-    def deploy_resources(resources, prune: false, verify:, record_summary: true)
+    def deploy_resources(resources, prune: false, verify:, record_summary: true, annotate_individuals: false)
       return if resources.empty?
       deploy_started_at = Time.now.utc
 
@@ -96,7 +97,6 @@ module Krane
       applyables, individuals = resources.partition { |r| r.deploy_method == :apply }
       # Prunable resources should also applied so that they can  be pruned
       pruneable_types = @prune_allowlist.map { |t| t.split("/").last }
-      applyables += individuals.select { |r| pruneable_types.include?(r.type) && !r.deploy_method_override }
 
       individuals.each do |individual_resource|
         individual_resource.deploy_started_at = Time.now.utc
@@ -122,6 +122,11 @@ module Krane
 
       apply_all(applyables, prune)
 
+      if annotate_individuals
+        to_annotate = individuals.select { |r| pruneable_types.include?(r.type) && !r.deploy_method_override }
+        update_last_applied_annotations(to_annotate)
+      end
+
       if verify
         watcher = Krane::ResourceWatcher.new(resources: resources, deploy_started_at: deploy_started_at,
           timeout: @global_timeout, task_config: @task_config, sha: @current_sha)
@@ -252,6 +257,19 @@ module Krane
       [err, status]
     end
 
+    def update_last_applied_annotations(resources)
+      resources.each do |resource|
+        err, status = set_last_applied_annotation(resource)
+        raise FatalDeploymentError, "Failed to set last applied annotation: #{err}" unless status.success?
+      end
+    end
+
+    def set_last_applied_annotation(resource)
+      _, err, status = kubectl.run("apply", "set-last-applied", "--create-annotation", "-f", resource.file_path, log_failure: false,
+        output_is_sensitive: resource.sensitive_template_content?, use_namespace: !resource.global?)
+      [err, status]
+    end
+
     # Inspect the file referenced in the kubectl stderr
     # to make it easier for developer to understand what's going on
     def find_bad_files_from_kubectl_output(line)

data/lib/krane/version.rb

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

metadata

@@ -1,16 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: krane
 version: !ruby/object:Gem::Version
-  version: 3.6.1
+  version: 3.7.0
 platform: ruby
 authors:
 - Katrina Verey
 - Daniel Turner
 - Kir Shatrov
-autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-08-06 00:00:00.000000000 Z
+date: 2025-01-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -91,7 +90,7 @@ dependencies:
         version: '2.8'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '4'
+        version: '3.9'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -101,7 +100,7 @@ dependencies:
         version: '2.8'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '4'
+        version: '3.9'
 - !ruby/object:Gem::Dependency
   name: multi_json
   requirement: !ruby/object:Gem::Requirement
@@ -512,7 +511,6 @@ licenses:
 - MIT
 metadata:
   allowed_push_host: https://rubygems.org
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -527,8 +525,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.16
-signing_key:
+rubygems_version: 3.6.2
 specification_version: 4
 summary: A command line tool that helps you ship changes to a Kubernetes namespace
   and understand the result