pfab 0.58.6 → 0.58.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e2e4518728aafd25de6e2d32503a6a287007d78deb1a18b657db3af110a6a486
-  data.tar.gz: a5e3614ff8fef07e2b70bd624eb7b3c845bcb352aebf5f0e29b3979d8137d9c0
+  metadata.gz: e7e3d292ab2f6eee610144e871f341ca2bbb128854552b98d2a4e197850d8328
+  data.tar.gz: 6f8c89d9512f0956039fe97c860a8a8e4edfcc66e4a22a992a3bf2e9a3f01871
 SHA512:
-  metadata.gz: 1fa91a90727c9685754c7239239e6d9035f0c16cce1f28db3a1cb394f66f3cbe0ee342b82203127f66251a1cdea4e1e689b8f51daa82b882e05c2afd14edf2f4
-  data.tar.gz: b9f124a10d4221c1384925680d21dac2e87cdf11ae9011a525a395cceb49ec720e1ff05099ef27940e82a1905eb673e7c2738287675b3864fbc3e3fe8e610a71
+  metadata.gz: b516b4d73d6e281da4e5ce9bc1af4f1e3697f7046af5a24df4df3e154557e08013cf57ff3c7ce731168d3a9e0ee034cb0ec6da4765330aaa9f2527a74c7d0a39
+  data.tar.gz: eb666a562d7e5f86f0ddda3edaf9d038d23ab60b29e3dd27ed66ca47f9c62035aa20201e9d56c20d81fd5cb16608278741f991905bf6b98a1a93423f7de48686

data/lib/pfab/cli.rb

@@ -5,6 +5,7 @@ require "json"
 require 'active_support/core_ext/hash/indifferent_access'
 require 'styled_yaml'
 require 'digest'
+require 'open3'
 
 module Pfab
   class CLI
@@ -68,15 +69,22 @@ module Pfab
         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.option "-g", "--tagged TAGGED", String, "target deployables tagged with TAGGED"
 
         c.action do |args, options|
           options.default timeout: 360, retries: 3, sleep: 5
-          app_name = get_app_name(all: true)
+          app_name = ""
+          if options.tagged && options.tagged != ""
+            app_name = "Apps tagged with #{options.tagged}"
+          else
+            app_name = get_app_name(all: true)
+          end
+
           puts "Shipping #{app_name}"
           success = cmd_build
           if success
             cmd_generate_yaml
-            cmd_apply(timeout: options.timeout, retries: options.retries, sleep_duration: options.sleep)
+            cmd_apply(timeout: options.timeout, retries: options.retries, sleep_duration: options.sleep, tagged: options.tagged)
           end
         end
       end
@@ -209,11 +217,13 @@ module Pfab
       run!
     end
 
-    def cmd_apply(timeout: 240, retries: 3, sleep_duration: 5)
+    def cmd_apply(timeout: 240, retries: 3, sleep_duration: 5, tagged: nil)
       set_kube_context
       success = true
 
-      get_apps.each do |app_name|
+      apps = tagged ? deployables.select { |k, v| v[:tags]&.include?(tagged) }.keys : get_apps
+
+      apps.each do |app_name|
         app = deployables[app_name]
         if app[:deployable_type] == "cron"
           deployed_name = deployed_name(app)
@@ -233,28 +243,30 @@ module Pfab
       selector = "application=#{@application_yaml['name']}"
       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 = false
-          
+
           retries.times do |attempt|
-            rollout_success = kubectl("rollout status deployment/#{deployment_name} --timeout=#{timeout}s")
+            rollout_result = kubectl_with_output("rollout status deployment/#{deployment_name} --timeout=#{timeout}s")
+            rollout_success = rollout_result.success?
             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."
+              puts "Output was #{rollout_result}"
               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
@@ -392,6 +404,10 @@ module Pfab
       result == true
     end
 
+    def kubectl_with_output(cmd, post_cmd = "")
+      puts_and_system_with_output("kubectl #{cmd} --namespace=#{yy.namespace} #{post_cmd}")
+    end
+
     def puts_and_system(cmd)
       puts cmd
       if $dryrun
@@ -402,6 +418,18 @@ module Pfab
       end
     end
 
+    def puts_and_system_with_output(cmd)
+      puts cmd
+      if $dryrun
+        dryrun_message = "dry run, didn't run that"
+        puts dryrun_message
+        CommandResult.new(stdout: dryrun_message, stderr: dryrun_message, exit_status_code: 0)
+      else
+        stdout, stderr, status = Open3.capture3(cmd)
+        CommandResult.new(stdout: stdout, stderr: stderr, exit_status_code: status.exitstatus)
+      end
+    end
+
     def deployables
       @_deployables ||= calculate_runnables("deployables")
     end
@@ -424,6 +452,7 @@ module Pfab
           application: application,
           deployable: deployable,
           deployable_type: deployable_type,
+          tags: dep["tags"],
           command: dep["command"],
         }
       end
@@ -456,4 +485,14 @@ module Pfab
       (name == "all") ? deployables.keys : [name]
     end
   end
+
+  CommandResult = Struct.new(:stdout, :stderr, :exit_status_code, keyword_init: true) do
+    def success?
+      exit_status_code == 0
+    end
+
+    def to_s
+      "status: #{status.exitstatus}\n\nstdout: #{stdout}\n\nstderr: #{stderr}\n\n"
+    end
+  end
 end

data/lib/pfab/version.rb

@@ -2,7 +2,7 @@ module Pfab
   module Version
     MAJOR = 0
     MINOR = 58
-    PATCH = 6
+    PATCH = 8
     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.6 ruby lib
+# stub: pfab 0.58.8 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "pfab".freeze
-  s.version = "0.58.6"
+  s.version = "0.58.8"
 
   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-09"
+  s.date = "2024-10-21"
   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.58.6
+  version: 0.58.8
 platform: ruby
 authors:
 - Jeff Dwyer
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-10-09 00:00:00.000000000 Z
+date: 2024-10-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: commander