pfab 0.57.1 → 0.58.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ca0e426618db3917a6ef9ec88e9f0e1e2e915aeda75ada09ee3195554b5e3459
-  data.tar.gz: 2c3f606dc89afe42e3a4f81ca63dc26f86dbbce30b33ec0f65cb42b6e87eb6a8
+  metadata.gz: 54465d79148f277fb4f811a42bd64515cfa91db27136f98d4c5bba1f51175b5f
+  data.tar.gz: 0fd8666d12d99292becd875d99d74a1250ea0fe6e5c1f40b3c4ff799b91b2068
 SHA512:
-  metadata.gz: f4a20bf537748c2ab4e695a1e317102ab68a2523f249b6f764f4b9b45dbbde4e84c3f21e8e9f3979c66c7233d1aedb1432272d34b1f54ddce300d203352d13cd
-  data.tar.gz: 9abb5db57922ddef966c96a3682b2940614384bcee60c9a35f94e24cad27604948c9341f286176ef68310c3c29ba8021dd13be0bb4c59838dc0af3cad23b63f3
+  metadata.gz: f117eac3ced18cf6fc03d04fa4f196922c0b37a6be27052f11b70ca7c13f6c657b279f17c3cec5ba22daa8b940572e3418992ed369580fee748194a4553cf3b3
+  data.tar.gz: '08692b693dc3894006f5879a7b91ed9364a8165047444714b7c1fc6c117991d34afd6b2db3617d0dd4ac336b7f4d1cce972c299781e9158169ceaab63a66bbd0'

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

@@ -206,18 +206,34 @@ module Pfab
 
     def cmd_apply
       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 the deployment for the given selector
+      deployment_json = `kubectl get deployment -l #{selector} -o json --namespace=#{yy.namespace}`
+      deployment = JSON.parse(deployment_json)
+      
+      if deployment["items"].any?
+        deployment_name = deployment["items"].first["metadata"]["name"]
+        success &= kubectl("rollout status deployment/#{deployment_name} --timeout=60s")
+      else
+        puts "No deployment found for selector: #{selector}"
+        success = false
+      end
+
+      exit(success ? 0 : 1)
     end
 
     def image_exists?(full_image_name)
@@ -339,16 +355,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 +424,4 @@ module Pfab
       (name == "all") ? deployables.keys : [name]
     end
   end
-end
+end

data/lib/pfab/version.rb

@@ -1,8 +1,8 @@
 module Pfab
   module Version
     MAJOR = 0
-    MINOR = 57
-    PATCH = 1
+    MINOR = 58
+    PATCH = 0
     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.57.1 ruby lib
+# stub: pfab 0.58.0 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "pfab".freeze
-  s.version = "0.57.1"
+  s.version = "0.58.0"
 
   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]

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pfab
 version: !ruby/object:Gem::Version
-  version: 0.57.1
+  version: 0.58.0
 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