pfab 0.58.17 → 0.58.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 26d320a9f0e310c4807cc869b8d92435beebda0c6018b95f783853c70e35490c
-  data.tar.gz: 6cdb8a9994ad09267235514c85b1883cbe068559708e16a6c0b9aacf28d3bb2d
+  metadata.gz: 49ab8d90eaed3d15f16ca811102a36d316bbd3b7bbcebf0dccc6d664cb1bbc85
+  data.tar.gz: 27706a86056773d0624ce4d5bc2490e1c1b790ee9a0104eec59b560799d7adc1
 SHA512:
-  metadata.gz: 98e8e05373073df2a8120cbbb24720c9a17f13a76f120a534225bdc731cb427007f59babf51a787825637fe8ae527e44435276a55cbcd241833928e5441da5dc
-  data.tar.gz: 0bfbd81ac1fd0011afd5d9ce4afb90b0ea93341105485e28260c34b4fc4c4212370a4a0c36ed2a41c00f7beada0a9163efee21eacabc55d4f7d69034c356252d
+  metadata.gz: c2f67d0e51a3d34d7aa16c1b952da6875a1e5c2db30c2f0a17e18d2ea95f690780fe79f13308e69fca6f3b104887239baefac289d7ec6c88b176a262b2087e26
+  data.tar.gz: 571e3e47519eb6756153281cad1521065cf1da6e1e63b0d3d7e47c8047b8c00b725f6ef64b471558f76f81c501eed37b758f9c7017b44d80a84cce0dfd6ed56b

data/.github/CODEOWNERS

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

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 = 18
     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.18 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "pfab".freeze
-  s.version = "0.58.17"
+  s.version = "0.58.18"
 
   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-14"
   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",

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pfab
 version: !ruby/object:Gem::Version
-  version: 0.58.17
+  version: 0.58.18
 platform: ruby
 authors:
 - Jeff Dwyer
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-06-02 00:00:00.000000000 Z
+date: 2025-08-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: commander
@@ -146,6 +146,7 @@ extra_rdoc_files:
 - README.markdown
 files:
 - ".document"
+- ".github/CODEOWNERS"
 - ".tool-versions"
 - CODEOWNERS
 - Gemfile