pfab 0.58.2 → 0.58.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5431534b800da64ae3ef1e1c4a3b26324e5ba535c72ab520eaac2b7f2f31fc61
-  data.tar.gz: 0dfb207acf2aa57acc1200d41e85d3c624b5ee82c667afb864b3c94561936977
+  metadata.gz: 1c9aea4ca5e33e1435e9dbc50e7b6229a852ccf9537956a818fc2a4a2dfa81f1
+  data.tar.gz: c6428e97bcb16aece2e493978cea6da82a91113c1bc15e7c942f1978f03100ae
 SHA512:
-  metadata.gz: df9d9d0932394fbf2b10a09cba1e27b5cc9b7beb6afc72ec351ac9fb8da65f3b8efed11aa01be27e6ffb6093c6b47dd1cb0b233f558237887eea2c2a1948ccee
-  data.tar.gz: f9ecf06f3bc8e05a654fa6eeef04185143d855964a570be0dd87b0d1d1d7cef2c38c55af8a67dd74805a0e85dc1247573b75b77efb93ce60677759099400fb48
+  metadata.gz: b206ecbb17034d19c921926df9d107f8ec14e3065c14c421ae2465d8463fe3a6aadf22bc0e79f3554192b954162b4254273d2c604240ee24cae6008b45ddf34e
+  data.tar.gz: 247ed244b974a5b81268ee5935d0d607a4dd1e0f46d576566e4f9513df7bf1abdb1fd8539b1171fc3cfefb6cc5fb90606ad191c6c348e0a3fb9e0d384769538c

data/lib/pfab/cli.rb

@@ -65,16 +65,18 @@ module Pfab
       command :shipit do |c|
         c.syntax = "pfab shipit"
         c.summary = "build, generate, apply"
-        c.option "-t", "--timeout timeout", "timeout for rollout (default 240s)"
+        c.option "-t", "--timeout TIMEOUT", Integer, "timeout for rollout (default 360s)"
+        c.option "-r", "--retries RETRIES", Integer, "number of retries for rollout (default 3)"
+        c.option "-s", "--sleep SLEEP", Integer, "sleep duration between retries in seconds (default 5)"
 
         c.action do |args, options|
-          options.default :timeout => 240
+          options.default timeout: 360, retries: 3, sleep: 5
           app_name = get_app_name(all: true)
           puts "Shipping #{app_name}"
           success = cmd_build
           if success
             cmd_generate_yaml
-            cmd_apply(timeout: options.timeout)
+            cmd_apply(timeout: options.timeout, retries: options.retries, sleep_duration: options.sleep)
           end
         end
       end
@@ -207,7 +209,7 @@ module Pfab
       run!
     end
 
-    def cmd_apply(timeout: 240)
+    def cmd_apply(timeout: 240, retries: 3, sleep_duration: 5)
       set_kube_context
       success = true
 
@@ -222,9 +224,13 @@ module Pfab
         success &= puts_and_system("git push origin --tags")
       end
 
+      success &= wait_for_deployments_rollout(timeout, retries: retries, sleep_duration: sleep_duration)
+
+      exit(success ? 0 : 1)
+    end
+
+    def wait_for_deployments_rollout(timeout, retries: 3, sleep_duration: 5)
       selector = "application=#{@application_yaml['name']}"
-      
-      # Get all deployments for the given selector
       deployment_json = `kubectl get deployment -l #{selector} -o json --namespace=#{yy.namespace}`
       deployments = JSON.parse(deployment_json)
       
@@ -232,26 +238,33 @@ module Pfab
         deployments["items"].each do |deployment|
           deployment_name = deployment["metadata"]["name"]
           puts "Waiting for deployment #{deployment_name} to roll out..."
-          rollout_success = kubectl("rollout status deployment/#{deployment_name} --timeout=#{timeout}s")
-          if rollout_success
-            puts "Deployment #{deployment_name} successfully rolled out."
-          else
-            puts "Deployment #{deployment_name} failed to roll out within the specified timeout."
+          
+          retries.times do |attempt|
+            rollout_success = kubectl("rollout status deployment/#{deployment_name} --timeout=#{timeout}s")
+            rollout_success = false
+            if rollout_success
+              puts "Deployment #{deployment_name} successfully rolled out. Attempt #{attempt + 1}/#{retries}."
+              break
+            else
+              puts "Attempt #{attempt + 1}/#{retries}: Deployment #{deployment_name} failed to roll out within the specified timeout."
+              if attempt < retries - 1
+                puts "Retrying in #{sleep_duration} seconds..."
+                sleep(sleep_duration)
+              end
+            end
+          end
+          
+          unless rollout_success
+            puts "Deployment #{deployment_name} failed to roll out after #{retries} attempts."
+            return false
           end
-          success &= rollout_success
         end
-      else
-        puts "No deployments found for selector: #{selector}"
-        success = false
-      end
-
-      if success
         puts "All deployments successfully rolled out."
+        true
       else
-        puts "One or more deployments failed to roll out successfully."
+        puts "No deployments found for selector: #{selector}"
+        false
       end
-
-      exit(success ? 0 : 1)
     end
 
     def image_exists?(full_image_name)

data/lib/pfab/templates/daemon.rb

@@ -33,7 +33,7 @@ module Pfab
                 "deployed-name" => @data['deployed_name'],
               },
             },
-            strategy: rolling_update_strategy(),
+            strategy: rolling_update_strategy,
             revisionHistoryLimit: 5,
             template: {
               metadata: {

data/lib/pfab/templates/long_running_process.rb

@@ -44,12 +44,12 @@ module Pfab
       end
 
 
-      def rolling_update_strategy(max_surge=1,max_unavailable=0)
+      def rolling_update_strategy
         {
           type: "RollingUpdate",
           rollingUpdate: {
-            maxSurge: max_surge,
-            maxUnavailable: max_unavailable,
+            maxSurge: get("maxSurge") || 1,
+            maxUnavailable: get("maxUnavailable") || 0,
           }
         }
       end

data/lib/pfab/templates/web.rb

@@ -319,7 +319,7 @@ module Pfab
                 "deployed-name" => @data['deployed_name'],
               },
             },
-            strategy: rolling_update_strategy(),
+            strategy: rolling_update_strategy,
             revisionHistoryLimit: 5,
             progressDeadlineSeconds: 120,
             template: {

data/lib/pfab/version.rb

@@ -2,7 +2,7 @@ module Pfab
   module Version
     MAJOR = 0
     MINOR = 58
-    PATCH = 2
+    PATCH = 4
     BUILD = nil
 
     STRING = [MAJOR, MINOR, PATCH, BUILD].compact.join('.')

data/pfab.gemspec

@@ -2,16 +2,16 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Juwelier::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: pfab 0.58.2 ruby lib
+# stub: pfab 0.58.4 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "pfab".freeze
-  s.version = "0.58.2"
+  s.version = "0.58.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0".freeze) if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib".freeze]
   s.authors = ["Jeff Dwyer".freeze]
-  s.date = "2024-10-07"
+  s.date = "2024-10-09"
   s.description = "k8s helper".freeze
   s.email = "jdwyer@prefab.cloud".freeze
   s.executables = ["pfab".freeze]
@@ -46,33 +46,19 @@ Gem::Specification.new do |s|
   ]
   s.homepage = "http://github.com/prefab-cloud/pfab".freeze
   s.licenses = ["MIT".freeze]
-  s.rubygems_version = "3.3.7".freeze
+  s.rubygems_version = "3.4.6".freeze
   s.summary = "helper gem".freeze
 
-  if s.respond_to? :specification_version then
-    s.specification_version = 4
-  end
+  s.specification_version = 4
 
-  if s.respond_to? :add_runtime_dependency then
-    s.add_runtime_dependency(%q<commander>.freeze, [">= 0"])
-    s.add_runtime_dependency(%q<activesupport>.freeze, [">= 0"])
-    s.add_runtime_dependency(%q<pry-byebug>.freeze, [">= 0"])
-    s.add_runtime_dependency(%q<styled_yaml>.freeze, ["~> 0.0.1"])
-    s.add_development_dependency(%q<rdoc>.freeze, ["~> 6.1"])
-    s.add_development_dependency(%q<bundler>.freeze, ["~> 2.3"])
-    s.add_development_dependency(%q<juwelier>.freeze, ["~> 2.4.9"])
-    s.add_development_dependency(%q<simplecov>.freeze, [">= 0"])
-    s.add_development_dependency(%q<test-unit>.freeze, [">= 0"])
-  else
-    s.add_dependency(%q<commander>.freeze, [">= 0"])
-    s.add_dependency(%q<activesupport>.freeze, [">= 0"])
-    s.add_dependency(%q<pry-byebug>.freeze, [">= 0"])
-    s.add_dependency(%q<styled_yaml>.freeze, ["~> 0.0.1"])
-    s.add_dependency(%q<rdoc>.freeze, ["~> 6.1"])
-    s.add_dependency(%q<bundler>.freeze, ["~> 2.3"])
-    s.add_dependency(%q<juwelier>.freeze, ["~> 2.4.9"])
-    s.add_dependency(%q<simplecov>.freeze, [">= 0"])
-    s.add_dependency(%q<test-unit>.freeze, [">= 0"])
-  end
+  s.add_runtime_dependency(%q<commander>.freeze, [">= 0"])
+  s.add_runtime_dependency(%q<activesupport>.freeze, [">= 0"])
+  s.add_runtime_dependency(%q<pry-byebug>.freeze, [">= 0"])
+  s.add_runtime_dependency(%q<styled_yaml>.freeze, ["~> 0.0.1"])
+  s.add_development_dependency(%q<rdoc>.freeze, ["~> 6.1"])
+  s.add_development_dependency(%q<bundler>.freeze, ["~> 2.3"])
+  s.add_development_dependency(%q<juwelier>.freeze, ["~> 2.4.9"])
+  s.add_development_dependency(%q<simplecov>.freeze, [">= 0"])
+  s.add_development_dependency(%q<test-unit>.freeze, [">= 0"])
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pfab
 version: !ruby/object:Gem::Version
-  version: 0.58.2
+  version: 0.58.4
 platform: ruby
 authors:
 - Jeff Dwyer
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-10-07 00:00:00.000000000 Z
+date: 2024-10-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: commander