krane 2.4.0 → 2.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8100399551f3e460863aa36cd1be88385a4dc648701f53a0be2bf13005796b63
-  data.tar.gz: f5842c8d9d7f71ba9e7b0b5b2b16d956b4ba71931571d9badf3d7bc2a4eae846
+  metadata.gz: 56b75748b54eff6f26c64869117e2ec648569a019e77068f13766ce5b371aab7
+  data.tar.gz: c0d9cb8a202f7a2ccdc0975e7447373bf725705af25ba2f799b02efc9a55ddcc
 SHA512:
-  metadata.gz: 4ed454e7264750fd9b44ab0f3badbff014eb511b3ecd4696dce0b72cee7da2a0efdfac92a65214ead36fc336b941be6869e4282f47846e9dfbd2d9230a8a1607
-  data.tar.gz: 6be5ba46142a43dd1965dca486de1e42020b7aa7c9a806d21a150bb581598dfdf8bb203361be97072a6f7e18a6041335ce722073bc5cd6830f2444828c423484
+  metadata.gz: 3e070999eba8cde1d8a9bc89b77643ef957c234f572a7537b060bac6b2664ea7b8efe9d765aa516b98aaad9ce0cde1e3cb47e5e260d3be4d64a9533a303fdb54
+  data.tar.gz: 6bf1e6adc954c2531f8d871872c5ac352aeb5359abfefd690ad42b289ebd35456fb75f6a69ccc733675134a44f670844f565d82726ac589480fc2c0e319c979f

data/CHANGELOG.md

@@ -1,5 +1,29 @@
 ## next
 
+## 2.4.3
+
+*Enhancements*
+
+- Improve DaemonSet rollout [#881](https://github.com/Shopify/krane/pull/881)
+
+## 2.4.2
+
+*Bug fixes*
+
+- Resolve errors for StatefulSet restart with `updateStrategy: OnDelete` [#876](https://github.com/Shopify/krane/pull/876)
+- Timeouts during the "predeploy priority resources" phase now raise `DeploymentTimeoutError` instead of `FatalDeploymentError` [#874](https://github.com/Shopify/krane/pull/874)
+
+## 2.4.1
+
+*Enhancements*
+
+- Support restart task for stateful sets that use the `OnDelete` strategy [#840](https://github.com/Shopify/krane/pull/840)
+- Make `krane render` produce output in a deterministic order [#871](https://github.com/Shopify/krane/pull/871)
+
+*Other*
+
+- Remove buildkite [#869](https://github.com/Shopify/krane/pull/869)
+
 ## 2.4.0
 
 *Enhancements*

data/README.md

@@ -73,7 +73,7 @@ If you need the ability to render dynamic values in templates before deploying,
 
 ## Prerequisites
 
-* Ruby 2.6+
+* Ruby 2.7+
 * Your cluster must be running Kubernetes v1.19.0 or higher<sup>1</sup>
 
 <sup>1</sup> We run integration tests against these Kubernetes versions. You can find our

data/lib/krane/kubernetes_resource/daemon_set.rb

@@ -9,7 +9,8 @@ module Krane
     def sync(cache)
       super
       @pods = exists? ? find_pods(cache) : []
-      @nodes = find_nodes(cache) if @nodes.blank?
+
+      @nodes = refresh_nodes(cache)
     end
 
     def status
@@ -66,9 +67,24 @@ module Krane
         rollout_data["numberReady"].to_i >= considered_pods.length
     end
 
+    def refresh_nodes(cache)
+      new_nodes = find_nodes(cache)
+      return new_nodes if @nodes.blank?
+
+      # Remove non-existent nodes
+      @nodes.select do |node|
+        new_nodes.find { |n| n.name == node.name } != nil
+      end
+    end
+
     def find_nodes(cache)
       all_nodes = cache.get_all(Node.kind)
-      all_nodes.map { |node_data| Node.new(definition: node_data) }
+      all_nodes.each_with_object([]) do |node_data, relevant_nodes|
+        next if node_data.dig('spec', 'unschedulable').to_s.downcase == 'true'
+        cond = node_data.dig('status', 'conditions').find { |c| c['type'].downcase == 'ready' }
+        next if (!cond.nil? && cond['status'].downcase != 'true')
+        relevant_nodes << Node.new(definition: node_data)
+      end
     end
 
     def rollout_data

data/lib/krane/kubernetes_resource/stateful_set.rb

@@ -19,6 +19,9 @@ module Krane
     end
 
     def deploy_succeeded?
+      success = observed_generation == current_generation &&
+        desired_replicas == status_data['readyReplicas'].to_i &&
+        status_data['currentRevision'] == status_data['updateRevision']
       if update_strategy == ONDELETE
         # Gem cannot monitor update since it doesn't occur until delete
         unless @success_assumption_warning_shown
@@ -27,13 +30,10 @@ module Krane
                        "Consider switching to rollingUpdate.")
           @success_assumption_warning_shown = true
         end
-        true
       else
-        observed_generation == current_generation &&
-        status_data['currentRevision'] == status_data['updateRevision'] &&
-        desired_replicas == status_data['readyReplicas'].to_i &&
-        desired_replicas == status_data['currentReplicas'].to_i
+        success &= desired_replicas == status_data['currentReplicas'].to_i
       end
+      success
     end
 
     def deploy_failed?

data/lib/krane/resource_deployer.rb

@@ -70,6 +70,7 @@ module Krane
             r.sync_debug_info(kubectl)
           end
           failed_resources.each { |r| logger.summary.add_paragraph(r.debug_message) }
+          raise DeploymentTimeoutError if failed_resources.all?(&:deploy_timed_out?)
           raise FatalDeploymentError, "Failed to deploy #{fail_count} priority #{'resource'.pluralize(fail_count)}"
         end
         logger.blank_line

data/lib/krane/restart_task.rb

@@ -69,10 +69,10 @@ module Krane
       deployments, statefulsets, daemonsets = identify_target_workloads(deployments, statefulsets,
                                                 daemonsets, selector: selector)
 
-      @logger.phase_heading("Triggering restart by annotating pod template #{RESTART_TRIGGER_ANNOTATION} annotation")
-      patch_kubeclient_deployments(deployments)
-      patch_kubeclient_statefulsets(statefulsets)
-      patch_kubeclient_daemonsets(daemonsets)
+      @logger.phase_heading("Triggering restart")
+      restart_deployments!(deployments)
+      restart_statefulsets!(statefulsets)
+      restart_daemonsets!(daemonsets)
 
       if verify_result
         @logger.phase_heading("Waiting for rollout")
@@ -210,7 +210,15 @@ module Krane
       apps_v1_kubeclient.patch_daemon_set(record.metadata.name, build_patch_payload(record), @namespace)
     end
 
-    def patch_kubeclient_deployments(deployments)
+    def delete_statefulset_pods(record)
+      pods = kubeclient.get_pods(namespace: record.metadata.namespace)
+      pods.select! do |pod|
+        pod.metadata&.ownerReferences&.find { |ref| ref.uid == record.metadata.uid }
+      end
+      pods.each { |pod| kubeclient.delete_pod(pod.metadata.name, pod.metadata.namespace) }
+    end
+
+    def restart_deployments!(deployments)
       deployments.each do |record|
         begin
           patch_deployment_with_restart(record)
@@ -221,18 +229,23 @@ module Krane
       end
     end
 
-    def patch_kubeclient_statefulsets(statefulsets)
+    def restart_statefulsets!(statefulsets)
       statefulsets.each do |record|
-        begin
+        @logger.info("Triggered `StatefulSet/#{record.metadata.name}` restart")
+        if record.spec.updateStrategy&.type == "OnDelete"
+          @logger.info("`StatefulSet/#{record.metadata.name}` has updateStrategy: OnDelete," \
+            " Restarting by forcefully deleting child pods"
+          )
+          delete_statefulset_pods(record)
+        else
           patch_statefulset_with_restart(record)
-          @logger.info("Triggered `StatefulSet/#{record.metadata.name}` restart")
-        rescue Kubeclient::HttpError => e
-          raise RestartAPIError.new(record.metadata.name, e.message)
         end
+      rescue Kubeclient::HttpError => e
+        raise RestartAPIError.new(record.metadata.name, e.message)
       end
     end
 
-    def patch_kubeclient_daemonsets(daemonsets)
+    def restart_daemonsets!(daemonsets)
       daemonsets.each do |record|
         begin
           patch_daemonset_with_restart(record)

data/lib/krane/template_sets.rb

@@ -104,11 +104,11 @@ module Krane
         dir_paths.each do |template_dir|
           resource_templates[template_dir] = Dir.foreach(template_dir).select do |filename|
             filename.end_with?(*VALID_TEMPLATES) || filename == EjsonSecretProvisioner::EJSON_SECRETS_FILE
-          end
+          end.sort
         end
 
         # Filename paths
-        file_paths.each do |filename|
+        file_paths.sort.each do |filename|
           dir_name = File.dirname(filename)
           resource_templates[dir_name] ||= []
           resource_templates[dir_name] << File.basename(filename) unless resource_templates[dir_name].include?(filename)

data/lib/krane/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: krane
 version: !ruby/object:Gem::Version
-  version: 2.4.0
+  version: 2.4.3
 platform: ruby
 authors:
 - Katrina Verey
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-01-12 00:00:00.000000000 Z
+date: 2022-03-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -411,7 +411,6 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- ".buildkite/pipeline.nightly.yml"
 - ".github/CODEOWNERS"
 - ".github/ISSUE_TEMPLATE.md"
 - ".github/probots.yml"

data/.buildkite/pipeline.nightly.yml

@@ -1,15 +0,0 @@
-steps:
-  - name: 'Run Test Suite (:kubernetes: 1.16-latest)'
-    command: bin/ci
-    agents:
-      queue: k8s-ci
-    env:
-      LOGGING_LEVEL: 4
-      KUBERNETES_VERSION: v1.16-latest
-  - name: 'Run Test Suite (:kubernetes: 1.15-latest)'
-    command: bin/ci
-    agents:
-      queue: k8s-ci
-    env:
-      LOGGING_LEVEL: 4
-      KUBERNETES_VERSION: v1.15-latest