pfab 0.58.17 → 0.58.19

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 26d320a9f0e310c4807cc869b8d92435beebda0c6018b95f783853c70e35490c
-  data.tar.gz: 6cdb8a9994ad09267235514c85b1883cbe068559708e16a6c0b9aacf28d3bb2d
+  metadata.gz: f7691bb5b1e776fa0a627d0c0c310fd4487b00840d7696479b1cf73564e586fc
+  data.tar.gz: 1c9c35389d9d7afd8a8688bc01cdd50219aa6d525a0f311ac6201706a15dc9d9
 SHA512:
-  metadata.gz: 98e8e05373073df2a8120cbbb24720c9a17f13a76f120a534225bdc731cb427007f59babf51a787825637fe8ae527e44435276a55cbcd241833928e5441da5dc
-  data.tar.gz: 0bfbd81ac1fd0011afd5d9ce4afb90b0ea93341105485e28260c34b4fc4c4212370a4a0c36ed2a41c00f7beada0a9163efee21eacabc55d4f7d69034c356252d
+  metadata.gz: 0b2987d1d0aa78f625c948bb39af2f6c675d0f2f609214ff57311021ad1364e55d79582b4e857189b5cf4fb14ec37b9cc4a43426eda8a8510692a37e527f5b6d
+  data.tar.gz: 6d9ab217334a5e06f1f2604d1b9dae6d4611707c14ae0b4d220fe7b1e0935ce0102d0c32731653e28707586f083da1a923f0d34482d66c34dd16672b33851ce9

data/.github/CODEOWNERS

@@ -0,0 +1,2 @@
+# All changes require review from prefabdevs team
+* @prefab-cloud/prefabdevs

data/.tool-versions

@@ -1 +1 @@
-ruby 3.1.2
+ruby 3.3.9

data/Gemfile

@@ -3,7 +3,7 @@ source "https://rubygems.org"
 # Example:
 #   gem "activesupport", ">= 2.3.5"
 
-gem "commander"
+gem "commander", "~> 4.6"
 
 gem "activesupport"
 gem "pry-byebug"

data/Gemfile.lock

@@ -29,8 +29,8 @@ GEM
     builder (3.2.4)
     byebug (11.1.3)
     coderay (1.1.3)
-    commander (4.4.6)
-      highline (~> 1.7.2)
+    commander (4.6.0)
+      highline (~> 2.0.0)
     concurrent-ruby (1.2.3)
     descendants_tracker (0.0.4)
       thread_safe (~> 0.3, >= 0.3.1)
@@ -64,7 +64,7 @@ GEM
       hashie (~> 3.5, >= 3.5.2)
       oauth2 (~> 1.0)
     hashie (3.6.0)
-    highline (1.7.10)
+    highline (2.0.3)
     i18n (1.14.5)
       concurrent-ruby (~> 1.0)
     json (2.6.3)
@@ -121,7 +121,7 @@ PLATFORMS
 DEPENDENCIES
   activesupport
   bundler (~> 2.3)
-  commander
+  commander (~> 4.6)
   juwelier (~> 2.4.9)!
   pry-byebug
   rdoc (~> 6.1)

data/README.markdown

@@ -229,7 +229,7 @@ Contributing to pfab
 Local Testing
 -----------------------------------------
 ```bash
-bundle exec rake build
+bundle exec rake clean build
 gem install --local pkg/pfab-0.57.1.gem
 ```
 ```ruby

data/Rakefile

@@ -23,6 +23,7 @@ Juwelier::Tasks.new do |gem|
   gem.email = "jdwyer@prefab.cloud"
   gem.authors = ["Jeff Dwyer"]
   gem.version = Pfab::Version::STRING
+  gem.required_ruby_version = ">= 3.1"
   # dependencies defined in Gemfile
 end
 Juwelier::RubygemsDotOrgTasks.new

data/lib/pfab/cli.rb

@@ -39,6 +39,14 @@ module Pfab
       global_option("-a", "--application_name APP_NAME", "run without prompting for app") do |app_name|
         $app_name = app_name
       end
+      $enable_docker_registry_cache = false
+      $disable_docker_registry_cache = false
+      global_option("--enable-docker-registry-cache", "enable docker registry caching with 'cache' label") do
+        $enable_docker_registry_cache = true
+      end
+      global_option("--disable-docker-registry-cache", "disable docker registry caching (overrides auto-detection)") do
+        $disable_docker_registry_cache = true
+      end
 
       command :build do |c|
         c.syntax = "pfab build"
@@ -339,7 +347,14 @@ module Pfab
         end
       end
 
-      build_cmd = "docker buildx build --tag #{image_name} --platform linux/amd64 #{build_args} ."
+      cache_args = ""
+      if should_use_registry_cache?
+        cache_image_name = "#{container_repository}/#{image_name}:cache"
+        cache_args = "--cache-from type=registry,ref=#{cache_image_name} --cache-to type=registry,ref=#{cache_image_name},mode=max"
+        say "Using Docker registry cache: #{cache_image_name}"
+      end
+
+      build_cmd = "docker buildx build --tag #{image_name} --platform linux/amd64 #{build_args} #{cache_args} ."
       puts build_cmd
       result = system(build_cmd)
 
@@ -493,6 +508,28 @@ module Pfab
       name = get_app_name(all: true)
       (name == "all") ? deployables.keys : [name]
     end
+
+    def should_use_registry_cache?
+      # Disable flag takes highest precedence
+      return false if $disable_docker_registry_cache
+      
+      # Enable flag takes precedence over auto-detection
+      return true if $enable_docker_registry_cache
+
+      # Auto-detect CI environments where local Docker cache isn't available
+      ci_env_vars = [
+        'CI',           # Generic CI indicator
+        'GITHUB_ACTIONS', # GitHub Actions
+        'GITLAB_CI',    # GitLab CI
+        'CIRCLECI',     # CircleCI
+        'TRAVIS',       # Travis CI
+        'JENKINS_URL',  # Jenkins
+        'BUILD_ID',     # Various CI systems
+        'CONTINUOUS_INTEGRATION' # Generic CI
+      ]
+
+      ci_env_vars.any? { |var| ENV[var] }
+    end
   end
 
   CommandResult = Struct.new(:stdout, :stderr, :exit_status_code, keyword_init: true) do

data/lib/pfab/templates/base.rb

@@ -163,6 +163,40 @@ module Pfab
 
         return ports
       end
+
+      def base_labels
+        {
+          application: @data['application'],
+          "deployed-name" => @data['deployed_name'],
+        }
+      end
+
+      def metadata_labels
+        base_labels.merge({
+          "application-type" => application_type,
+          "deploy-id" => deploy_id,
+        })
+      end
+
+      def datadog_labels
+        labels = {
+          "tags.datadoghq.com/env" => @data['env'],
+          "tags.datadoghq.com/service" => @data['deployed_name'],
+          "tags.datadoghq.com/version" => StyledYAML.double_quoted(@data['sha'])
+        }
+        labels["tags.datadoghq.com/family"] = @data['family'] if @data['family']
+        labels
+      end
+
+      def full_labels
+        metadata_labels.merge(datadog_labels)
+      end
+
+      def pod_labels
+        base_labels.merge({
+          "application-type" => application_type,
+        }).merge(datadog_labels)
+      end
     end
   end
 end

data/lib/pfab/templates/cron.rb

@@ -16,15 +16,7 @@ module Pfab
           metadata: {
             name: "#{@data['deployed_name']}-#{@data['sha']}",
             namespace: get_namespace,
-            labels: {
-              application: @data['application'],
-              "deployed-name" => @data['deployed_name'],
-              "application-type" => application_type,
-              "deploy-id" => deploy_id,
-              "tags.datadoghq.com/env": @data['env'],
-              "tags.datadoghq.com/service": @data['deployed_name'],
-              "tags.datadoghq.com/version": StyledYAML.double_quoted(@data['sha'])
-            }
+            labels: full_labels
           },
           spec: {
             schedule: get("schedule"),
@@ -35,23 +27,12 @@ module Pfab
               metadata: {
                 name: "#{@data['deployed_name']}-#{@data['sha']}",
                 namespace: get_namespace,
-                labels: {
-                  application: @data['application'],
-                  "deployed-name" => @data['deployed_name'],
-                  "application-type" => "cron",
-                },
+                labels: metadata_labels,
               },
               spec: {
                 template: {
                   metadata: {
-                    labels: {
-                      application: @data['application'],
-                      "deployed-name" => @data['deployed_name'],
-                      "application-type" => "cron",
-                      "tags.datadoghq.com/env": @data['env'],
-                      "tags.datadoghq.com/service": @data['deployed_name'],
-                      "tags.datadoghq.com/version": StyledYAML.double_quoted(@data['sha'])
-                    },
+                    labels: pod_labels,
                   },
                   spec: {
                     serviceAccountName: get('serviceAccountName'),

data/lib/pfab/templates/daemon.rb

@@ -16,15 +16,7 @@ module Pfab
           metadata: {
             name: @data['deployed_name'],
             namespace: get_namespace,
-            labels: {
-              application: @data['application'],
-              "deployed-name" => @data['deployed_name'],
-              "application-type" => application_type,
-              "deploy-id" => deploy_id,
-              "tags.datadoghq.com/env": @data['env'],
-              "tags.datadoghq.com/service": @data['deployed_name'],
-              "tags.datadoghq.com/version": StyledYAML.double_quoted(@data['sha'])
-            }
+            labels: full_labels
           },
           spec: {
             replicas: get("replicas") || 1,
@@ -37,14 +29,7 @@ module Pfab
             revisionHistoryLimit: 5,
             template: {
               metadata: {
-                labels: {
-                  application: @data['application'],
-                  "deployed-name" => @data['deployed_name'],
-                  "application-type" => "daemon",
-                  "tags.datadoghq.com/env": @data['env'],
-                  "tags.datadoghq.com/service": @data['deployed_name'],
-                  "tags.datadoghq.com/version": StyledYAML.double_quoted(@data['sha'])
-                },
+                labels: pod_labels,
               },
               spec: {
                 serviceAccountName: get('serviceAccountName'),

data/lib/pfab/templates/job.rb

@@ -16,15 +16,7 @@ module Pfab
           metadata: {
             name: "job-#{@data['deployed_name']}-#{@data['sha']}",
             namespace: get_namespace,
-            labels: {
-              application: @data['application'],
-              "deployed-name" => @data['deployed_name'],
-              "application-type" => application_type,
-              "deploy-id" => deploy_id,
-              "tags.datadoghq.com/env": @data['env'],
-              "tags.datadoghq.com/service": @data['deployed_name'],
-              "tags.datadoghq.com/version": StyledYAML.double_quoted(@data['sha'])
-            }
+            labels: full_labels
           },
           spec: {
             ttlSecondsAfterFinished: get('ttlSecondsAfterFinished'),
@@ -34,14 +26,7 @@ module Pfab
               metadata: {
                 name: "#{@data['deployed_name']}-#{@data['sha']}",
                 namespace: get_namespace,
-                labels: {
-                  application: @data['application'],
-                  "deployed-name" => @data['deployed_name'],
-                  "application-type" => "job",
-                  "tags.datadoghq.com/env": @data['env'],
-                  "tags.datadoghq.com/service": @data['deployed_name'],
-                  "tags.datadoghq.com/version": StyledYAML.double_quoted(@data['sha'])
-                },
+                labels: pod_labels,
               },
               spec: {
                 serviceAccountName: get('serviceAccountName'),

data/lib/pfab/templates/web.rb

@@ -39,10 +39,7 @@ module Pfab
           metadata: {
             name: @data['deployed_name'],
             namespace: get_namespace,
-            labels: {
-              application: @data['application'],
-              "deployed-name" => @data['deployed_name'],
-            },
+            labels: base_labels,
             annotations: service_annotations,
           },
           spec: {
@@ -74,10 +71,7 @@ module Pfab
           metadata: {
             name: "ingress-#{@data['deployed_name']}",
             namespace: get_namespace,
-            labels: {
-              application: @data['application'],
-              "deployed-name" => @data['deployed_name'],
-            },
+            labels: base_labels,
             annotations: ingress_annotations,
           },
           spec: {
@@ -265,16 +259,9 @@ module Pfab
           metadata: {
             name: @data['deployed_name'],
             namespace: get_namespace,
-            labels: {
-              "application" => @data['application'],
-              "deployed-name" => @data['deployed_name'],
-              "application-type" => application_type,
-              "deploy-id" => deploy_id,
+            labels: full_labels.merge({
               LABEL_DEPLOY_UNIQUE_ID => StyledYAML.double_quoted(deploy_unique_id),
-              "tags.datadoghq.com/env" => @data['env'],
-              "tags.datadoghq.com/service" => @data['deployed_name'],
-              "tags.datadoghq.com/version" => StyledYAML.double_quoted(@data['sha'])
-            }
+            })
           },
           spec: {
             replicas: get("replicas") || 1,
@@ -288,15 +275,9 @@ module Pfab
             progressDeadlineSeconds: get("progressDeadlineSeconds") || 600,
             template: {
               metadata: {
-                labels: {
-                  application: @data['application'],
-                  "deployed-name" => @data['deployed_name'],
-                  "application-type" => "web",
+                labels: pod_labels.merge({
                   LABEL_DEPLOY_UNIQUE_ID => StyledYAML.double_quoted(deploy_unique_id),
-                  "tags.datadoghq.com/env": @data['env'],
-                  "tags.datadoghq.com/service": @data['deployed_name'],
-                  "tags.datadoghq.com/version": StyledYAML.double_quoted(@data['sha'])
-                },
+                }),
               },
               spec: {
                 serviceAccountName: get('serviceAccountName'),

data/lib/pfab/version.rb

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

data/lib/pfab/yamls.rb

@@ -13,6 +13,7 @@ module Pfab
         'container_repository' => config["container.repository"],
         'config' => config,
         'application' => application_yaml["name"],
+        'family' => application_yaml["family"],
         'application_yaml' => application_yaml,
         'namespace' => namespace,
         'application_yaml_hash' => application_yaml_hash

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.17 ruby lib
+# stub: pfab 0.58.19 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "pfab".freeze
-  s.version = "0.58.17"
+  s.version = "0.58.19".freeze
 
   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 = "2025-06-02"
+  s.date = "2025-08-19"
   s.description = "k8s helper".freeze
   s.email = "jdwyer@prefab.cloud".freeze
   s.executables = ["pfab".freeze]
@@ -21,6 +21,7 @@ Gem::Specification.new do |s|
   ]
   s.files = [
     ".document",
+    ".github/CODEOWNERS",
     ".tool-versions",
     "CODEOWNERS",
     "Gemfile",
@@ -46,33 +47,20 @@ 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.required_ruby_version = Gem::Requirement.new(">= 3.1".freeze)
+  s.rubygems_version = "3.5.22".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".freeze])
+  s.add_runtime_dependency(%q<activesupport>.freeze, [">= 0".freeze])
+  s.add_runtime_dependency(%q<pry-byebug>.freeze, [">= 0".freeze])
+  s.add_runtime_dependency(%q<styled_yaml>.freeze, ["~> 0.0.1".freeze])
+  s.add_development_dependency(%q<rdoc>.freeze, ["~> 6.1".freeze])
+  s.add_development_dependency(%q<bundler>.freeze, ["~> 2.3".freeze])
+  s.add_development_dependency(%q<juwelier>.freeze, ["~> 2.4.9".freeze])
+  s.add_development_dependency(%q<simplecov>.freeze, [">= 0".freeze])
+  s.add_development_dependency(%q<test-unit>.freeze, [">= 0".freeze])
 end
 

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: pfab
 version: !ruby/object:Gem::Version
-  version: 0.58.17
+  version: 0.58.19
 platform: ruby
 authors:
 - Jeff Dwyer
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-06-02 00:00:00.000000000 Z
+date: 2025-08-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: commander
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '4.6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '4.6'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
@@ -146,6 +146,7 @@ extra_rdoc_files:
 - README.markdown
 files:
 - ".document"
+- ".github/CODEOWNERS"
 - ".tool-versions"
 - CODEOWNERS
 - Gemfile
@@ -180,14 +181,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '3.1'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.7
+rubygems_version: 3.5.22
 signing_key:
 specification_version: 4
 summary: helper gem