pfab 0.57.1 → 0.58.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ca0e426618db3917a6ef9ec88e9f0e1e2e915aeda75ada09ee3195554b5e3459
-  data.tar.gz: 2c3f606dc89afe42e3a4f81ca63dc26f86dbbce30b33ec0f65cb42b6e87eb6a8
+  metadata.gz: f5439bb786614722bb5525cf32208b7526d5fbd6bdd32ce1f65657c03e109201
+  data.tar.gz: fff1fbdebaca8be995c117192aa451522effb09376c51158c13092bf273c7f14
 SHA512:
-  metadata.gz: f4a20bf537748c2ab4e695a1e317102ab68a2523f249b6f764f4b9b45dbbde4e84c3f21e8e9f3979c66c7233d1aedb1432272d34b1f54ddce300d203352d13cd
-  data.tar.gz: 9abb5db57922ddef966c96a3682b2940614384bcee60c9a35f94e24cad27604948c9341f286176ef68310c3c29ba8021dd13be0bb4c59838dc0af3cad23b63f3
+  metadata.gz: e578cc68d28eb765a4c4dd25cddb2f8792253844e951129c42c504a1042e8b0fe5acc033f6457cf18ca4006826b54c2d50d4509b89f56e92e04ec4848cf81b1f
+  data.tar.gz: 62c984f80c304d4360f67fee40208359d0460f21274c8c84033a2d0048348283105e2a25d681c901e30957f5f7864f818c109537625ee655efc898e8206c0c88

data/README.markdown

@@ -230,7 +230,7 @@ Local Testing
 -----------------------------------------
 ```bash
 bundle exec rake build
-gem install --local pkg/pfab-0.44.0.gem
+gem install --local pkg/pfab-0.57.1.gem
 ```
 ```ruby
 gem 'pfab', :path => "../pfab"

data/lib/pfab/cli.rb

@@ -65,13 +65,16 @@ 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.action do
+          options.default :timeout => 240
           app_name = get_app_name(all: true)
           puts "Shipping #{app_name}"
           success = cmd_build
           if success
             cmd_generate_yaml
-            cmd_apply
+            cmd_apply(timeout: options.timeout)
           end
         end
       end
@@ -204,20 +207,51 @@ module Pfab
       run!
     end
 
-    def cmd_apply
+    def cmd_apply(timeout: 240)
       set_kube_context
+      success = true
+
       get_apps.each do |app_name|
         app = deployables[app_name]
         if app[:deployable_type] == "cron"
           deployed_name = deployed_name(app)
-          kubectl("delete cronjob -l deployed-name=#{deployed_name}")
+          success &= kubectl("delete cronjob -l deployed-name=#{deployed_name}")
         end
-        kubectl("apply -f .application-k8s-#{$env}-#{app_name}.yaml")
-        puts_and_system("git tag release-#{$env}-#{app_name}-#{Time.now.strftime("%Y-%m-%d-%H-%M-%S")} HEAD")
-        puts_and_system("git push origin --tags")
+        success &= kubectl("apply -f .application-k8s-#{$env}-#{app_name}.yaml")
+        success &= puts_and_system("git tag release-#{$env}-#{app_name}-#{Time.now.strftime("%Y-%m-%d-%H-%M-%S")} HEAD")
+        success &= puts_and_system("git push origin --tags")
       end
+
       selector = "application=#{@application_yaml['name']}"
-      kubectl "get pods -l #{selector} -w"
+      
+      # Get all deployments for the given selector
+      deployment_json = `kubectl get deployment -l #{selector} -o json --namespace=#{yy.namespace}`
+      deployments = JSON.parse(deployment_json)
+      
+      if deployments["items"].any?
+        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."
+          end
+          success &= rollout_success
+        end
+      else
+        puts "No deployments found for selector: #{selector}"
+        success = false
+      end
+
+      if success
+        puts "All deployments successfully rolled out."
+      else
+        puts "One or more deployments failed to roll out successfully."
+      end
+
+      exit(success ? 0 : 1)
     end
 
     def image_exists?(full_image_name)
@@ -339,16 +373,18 @@ module Pfab
       @_config ||= YAML.load(File.read(File.join(Dir.home, ".pfab.yaml")))
     end
 
-    def kubectl cmd, post_cmd = ""
-      puts_and_system "kubectl #{cmd} --namespace=#{yy.namespace} #{post_cmd}"
+    def kubectl(cmd, post_cmd = "")
+      result = puts_and_system("kubectl #{cmd} --namespace=#{yy.namespace} #{post_cmd}")
+      result == true
     end
 
-    def puts_and_system cmd
+    def puts_and_system(cmd)
       puts cmd
       if $dryrun
         puts "dry run, didn't run that"
+        true
       else
-        system cmd
+        system(cmd)
       end
     end
 
@@ -406,4 +442,4 @@ module Pfab
       (name == "all") ? deployables.keys : [name]
     end
   end
-end
+end

data/lib/pfab/version.rb

@@ -1,7 +1,7 @@
 module Pfab
   module Version
     MAJOR = 0
-    MINOR = 57
+    MINOR = 58
     PATCH = 1
     BUILD = nil
 

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.57.1 ruby lib
+# stub: pfab 0.58.1 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "pfab".freeze
-  s.version = "0.57.1"
+  s.version = "0.58.1"
 
   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-07-18"
+  s.date = "2024-10-07"
   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.10".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.57.1
+  version: 0.58.1
 platform: ruby
 authors:
 - Jeff Dwyer
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-07-18 00:00:00.000000000 Z
+date: 2024-10-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: commander