krane 2.4.5 → 2.4.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0231d6f4ef50874282ebc4456e5a13ba48408ec22a2b9caef05229323561c2f3
-  data.tar.gz: b3007f0d090526b1552638e63aa3a350e6cc8182aab6abc536f1eafe0acb02fb
+  metadata.gz: a785ceec99d9fef8328e541744ece449fde68685d953f410ad6ce4413c51e33b
+  data.tar.gz: 8a96a80cbed3f02d7bd5d241b12572f90de6432904535839843cac328894a9fa
 SHA512:
-  metadata.gz: 21b40ac3a9ad836e29f293a1ddd293991ab8c784c54869d705496a101500d22893f3033d28632f8175f49b23397fa74f8cd3b98f18bf614447c30568f13f7bfa
-  data.tar.gz: 89d62f90ddccbfcea97abd44dc304f846f639d6a94781efef2f99b361bdd2e604233e6a968a1f8b583ea213b9d6052f6c52ca9fa6526312bb52cc14ba2172e70
+  metadata.gz: ba81377d1e1bb58ae30b6a19254d3403c4d1e18cd7bc748e7b6fa43dba54366a81f539e721febed5bb7c4e97dffb48c56c6ab5af04c193557d794cd5941cd638
+  data.tar.gz: 919a14fff6f1116eb587b1e5521255fc2a498de3139d7fd0402ce89a492fb18d5bb2e6cc53d08a4006e92ea10ca0b46b935c3386c964374130920b3463151f5f

data/CHANGELOG.md

@@ -1,10 +1,32 @@
 ## next
 
+## 2.4.8
+
+- update googleauth gem version to 1.2
+- add the `ruby-lsp` gem to development group in the Gemfile
+## 2.4.7
+
+*Bug fixes*
+
+- Fix `replace-force` deployment method override.
+```
+/usr/local/bundle/gems/krane-2.4.6/lib/krane/resource_deployer.rb:119:in `block in deploy_resources': Unexpected deploy method! (:"replace-force") (ArgumentError)
+```
+Dash (-) must be replaced with underscore (_) before applying it as method on kubernetes resource.
+
+## 2.4.6
+
+*Bug fixes*
+
+- Extend [#886](https://github.com/Shopify/krane/pull/886) to not only secrets but anything that doesn't match `failed to sync %s cache` [#886](https://github.com/Shopify/krane/pull/886)
+It seems an issue when too many pods are referencing the same secret/configmap https://github.com/kubernetes/kubernetes/pull/74755, so instead of failing fast, it'll now let the resources attempt to succeed.
+- Add missing unit test for above feature.
+
 ## 2.4.5
 
 *Bug fixes*
 
-- Revert PR that tried to fail fast when there are container initialization issues to give pods time to be recreated and possible succeed [#885](https://github.com/Shopify/krane/pull/885)
+- Do not fail fast for CreateContainerConfigError when message include issues mounting the secret, to let the pods be recreated and possible succeed [#885](https://github.com/Shopify/krane/pull/885)
 
 ## 2.4.4
 

data/Gemfile

@@ -3,3 +3,5 @@ source 'https://rubygems.org'
 
 # Specify your gem's dependencies in krane.gemspec
 gemspec
+
+gem "ruby-lsp", "~> 0.2.0", :group => :development

data/dev.yml

@@ -3,19 +3,10 @@ name: krane
 up:
   - ruby: '3.0.3' # Matches gemspec
   - bundler
-  - custom:
-      name: Install Kubernetes in Docker (KinD)
-      met?: bin/kind version 2>&1 | grep -q v0.11.1
-      meet: |
-        mkdir -p bin
-        curl -sLo bin/kind "https://github.com/kubernetes-sigs/kind/releases/download/v0.11.1/kind-darwin-amd64"
-        chmod +x bin/kind
-  - custom:
-      name: Create KinD Cluster
-      met?: bin/kind get clusters | grep -q krane
-      meet: bin/kind create cluster --name krane --image "kindest/node:v1.22.0@sha256:b8bda84bb3a190e6e028b1760d277454a72267a5454b57db34437c34a588d047"
-      down: |
-        ((bin/kind get clusters | grep -q krane) && bin/kind delete cluster --name krane) || true
+  - podman
+  - kind:
+      name: krane
+      image: kindest/node:v1.22.0@sha256:b8bda84bb3a190e6e028b1760d277454a72267a5454b57db34437c34a588d047
 commands:
   test:
     run: bin/test

data/krane.gemspec

@@ -28,7 +28,7 @@ Gem::Specification.new do |spec|
   spec.required_ruby_version = '>= 2.6.0'
   spec.add_dependency("activesupport", ">= 5.0")
   spec.add_dependency("kubeclient", "~> 4.9")
-  spec.add_dependency("googleauth", "~> 0.8")
+  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"])

data/lib/krane/kubectl.rb

@@ -82,9 +82,17 @@ module Krane
     def version_info
       @version_info ||=
         begin
-          response, _, status = run("version", use_namespace: false, log_failure: true, attempts: 2)
+          response, _, status = run("version", output: "json", use_namespace: false, log_failure: true, attempts: 2)
           raise KubectlError, "Could not retrieve kubectl version info" unless status.success?
-          extract_version_info_from_kubectl_response(response)
+
+          version_data = JSON.parse(response)
+          client_version = platform_agnostic_version(version_data.dig("clientVersion", "gitVersion").to_s)
+          server_version = platform_agnostic_version(version_data.dig("serverVersion", "gitVersion").to_s)
+          unless client_version && server_version
+            raise KubectlError, "Received invalid kubectl version data: #{version_data}"
+          end
+
+          { client: client_version, server: server_version }
         end
     end
 
@@ -127,15 +135,10 @@ module Krane
       end
     end
 
-    def extract_version_info_from_kubectl_response(response)
-      info = {}
-      response.each_line do |l|
-        match = l.match(/^(?<kind>Client|Server).* GitVersion:"v(?<version>\d+\.\d+\.\d+)/)
-        if match
-          info[match[:kind].downcase.to_sym] = Gem::Version.new(match[:version])
-        end
+    def platform_agnostic_version(version_string)
+      if match = version_string.match(/v(?<version>\d+\.\d+\.\d+)/)
+        Gem::Version.new(match[:version])
       end
-      info
     end
   end
 end

data/lib/krane/kubernetes_resource/pod.rb

@@ -229,9 +229,11 @@ module Krane
         elsif limbo_reason == "ErrImagePull" && limbo_message.match(/not found/i)
           "Failed to pull image #{@image}. "\
           "Did you wait for it to be built and pushed to the registry before deploying?"
-        # Only fail fast when message doesn't include `failed to sync secret cache`.
-        # It's possible that a secret is being created and the pod could get recreated and succeed
-        elsif limbo_reason == "CreateContainerConfigError" && !limbo_message.include?("failed to sync secret cache")
+          # Only fail fast when message doesn't include `failed to sync %s cache`.
+          # It's possible that a secret/configmap is still trying to be mounted to the pod, it seems related
+          # to too many pods referencing the same secret/configmap: https://github.com/kubernetes/kubernetes/pull/74755
+          # Error message format source: https://github.com/kubernetes/kubernetes/pull/75260
+        elsif limbo_reason == "CreateContainerConfigError" && !limbo_message.match("failed to sync (.*?) cache")
           "Failed to generate container configuration: #{limbo_message}"
         elsif @status.dig("lastState", "terminated", "reason") == "ContainerCannotRun"
           # ref: https://github.com/kubernetes/kubernetes/blob/562e721ece8a16e05c7e7d6bdd6334c910733ab2/pkg/kubelet/dockershim/docker_container.go#L353

data/lib/krane/kubernetes_resource.rb

@@ -250,7 +250,7 @@ module Krane
     end
 
     def deploy_method_override
-      krane_annotation_value(DEPLOY_METHOD_OVERRIDE_ANNOTATION)&.to_sym
+      krane_annotation_value(DEPLOY_METHOD_OVERRIDE_ANNOTATION)&.gsub("-", "_")&.to_sym
     end
 
     def sync_debug_info(kubectl)

data/lib/krane/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: krane
 version: !ruby/object:Gem::Version
-  version: 2.4.5
+  version: 2.4.8
 platform: ruby
 authors:
 - Katrina Verey
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-04-05 00:00:00.000000000 Z
+date: 2022-07-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -46,14 +46,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.8'
+        version: '1.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.8'
+        version: '1.2'
 - !ruby/object:Gem::Dependency
   name: ejson
   requirement: !ruby/object:Gem::Requirement
@@ -526,7 +526,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.20
+rubygems_version: 3.3.3
 signing_key: 
 specification_version: 4
 summary: A command line tool that helps you ship changes to a Kubernetes namespace