krane 2.3.0 → 2.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 676fdc875449178de6e0f4ff1f649271bd691637e4e56d540c5e5ea71dc8ded4
-  data.tar.gz: 6a16a1e9e32947b0bd6aff7f679ca7f4958a4ef4d3c27e8855fc2a7a6e39abfa
+  metadata.gz: 3e1fd1232d053c7f2bc648a315551c103ebd4792165f7b8c9b81f1c0b2f810bc
+  data.tar.gz: 214360319ed90c6bc752d99ee1b3e08244703ad56d3b5e964993fccee2b7562c
 SHA512:
-  metadata.gz: 20aad308cbb7c96ad518d0bb57026d6b95e6e8ced1f9eb968c2d144906920a45da272fdf20c94fd8d455a6265b266b6d10912573839e48b08c8162c382905774
-  data.tar.gz: 31711f6a966d5364d6e084eb67b8bdcff4e511e40967cc9fb0528a9e8dd1739ed3f59363ab1dd2ba122d40331019eaf2a9ef850830d6c92ddcdfc5a291bd5e89
+  metadata.gz: a98198f5aed91b383295bf7ddcd9dad6bdcc68d5361582ef873fa53b7b191d92963c9bd359c841f0c95b7e3c007e0f32dbc331019d5c8a4bf2c4358ccf0aac5c
+  data.tar.gz: 6267bef54343cdf3c301cab0bd377a1d6110b1c2862bdf2dc5288fd0ffba8337a1cc88aa7e708e8a19dd042646699e3ad64c3d23171e0f23a9a5f5a85fcf470c

data/.github/CODEOWNERS

@@ -1 +1 @@
-* @Shopify/krane
+* @Shopify/app-lifecycle

data/CHANGELOG.md

@@ -1,5 +1,21 @@
 ## next
 
+## 2.3.4
+
+- Fix for [CVE-2021-41817](https://www.ruby-lang.org/en/news/2021/11/15/date-parsing-method-regexp-dos-cve-2021-41817/). See [ServicesDB action item here](https://services.shopify.io/action_items/definitions/isolated/59).
+
+## 2.3.3
+
+- Another Psych 4.0 compatibility fix [#844](https://github.com/Shopify/krane/pull/844)
+
+## 2.3.2
+
+- Fix compatibility with Psych 4.0 [#843](https://github.com/Shopify/krane/pull/843)
+
+## 2.3.1
+
+- Fix a bug in RestartTask where a NoMethodError is thrown if any of the target resources do not have annotations [#841](https://github.com/Shopify/krane/pull/841)
+
 ## 2.3.0
 
 - Restart tasks now support restarting StatefulSets and DaemonSets, in addition to Deployments [#836](https://github.com/Shopify/krane/pull/836)

data/krane.gemspec

@@ -27,6 +27,8 @@ Gem::Specification.new do |spec|
 
   spec.required_ruby_version = '>= 2.6.0'
   spec.add_dependency("activesupport", ">= 5.0")
+  spec.add_dependency("cgi")
+  spec.add_dependency("date")
   spec.add_dependency("kubeclient", "~> 4.3")
   spec.add_dependency("googleauth", "~> 0.8")
   spec.add_dependency("ejson", "~> 1.0")

data/lib/krane/renderer.rb

@@ -58,7 +58,7 @@ module Krane
       template = File.read(partial_path)
       expanded_template = ERB.new(template, trim_mode: '-').result(erb_binding)
 
-      docs = Psych.parse_stream(expanded_template, partial_path)
+      docs = Psych.parse_stream(expanded_template, filename: partial_path)
       # If the partial contains multiple documents or has an explicit document header,
       # we know it cannot validly be indented in the parent, so return it immediately.
       return expanded_template unless docs.children.one? && docs.children.first.implicit

data/lib/krane/restart_task.rb

@@ -166,7 +166,7 @@ module Krane
         selector_string = selector.to_s
         apps_v1_kubeclient.get_deployments(namespace: @namespace, label_selector: selector_string)
       end
-      deployments.select { |d| d.metadata.annotations[ANNOTATION] }
+      deployments.select { |d| d.dig(:metadata, :annotations, ANNOTATION) }
     end
 
     def identify_target_statefulsets(selector: nil)
@@ -176,7 +176,7 @@ module Krane
         selector_string = selector.to_s
         apps_v1_kubeclient.get_stateful_sets(namespace: @namespace, label_selector: selector_string)
       end
-      statefulsets.select { |d| d.metadata.annotations[ANNOTATION] }
+      statefulsets.select { |ss| ss.dig(:metadata, :annotations, ANNOTATION) }
     end
 
     def identify_target_daemonsets(selector: nil)
@@ -186,7 +186,7 @@ module Krane
         selector_string = selector.to_s
         apps_v1_kubeclient.get_daemon_sets(namespace: @namespace, label_selector: selector_string)
       end
-      daemonsets.select { |d| d.metadata.annotations[ANNOTATION] }
+      daemonsets.select { |ds| ds.dig(:metadata, :annotations, ANNOTATION) }
     end
 
     def build_watchables(kubeclient_resources, started, klass)

data/lib/krane/template_sets.rb

@@ -77,7 +77,7 @@ module Krane
       def templates(filename:, raw:)
         file_content = File.read(File.join(@template_dir, filename))
         rendered_content = @renderer ? @renderer.render_template(filename, file_content) : file_content
-        YAML.load_stream(rendered_content, "<rendered> #{filename}") do |doc|
+        YAML.load_stream(rendered_content, filename: "<rendered> #{filename}") do |doc|
           next if doc.blank?
           unless doc.is_a?(Hash)
             raise InvalidTemplateError.new("Template is not a valid Kubernetes manifest",

data/lib/krane/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: krane
 version: !ruby/object:Gem::Version
-  version: 2.3.0
+  version: 2.3.4
 platform: ruby
 authors:
 - Katrina Verey
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-10-01 00:00:00.000000000 Z
+date: 2021-11-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -26,6 +26,34 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '5.0'
+- !ruby/object:Gem::Dependency
+  name: cgi
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: date
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: kubeclient
   requirement: !ruby/object:Gem::Requirement