pfab 0.22.0 → 0.25.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3cf4984e6014745e194fa5d2b6cb12499548ae1113fd61c73529273554d1f5db
-  data.tar.gz: febfd1b79e28f2227c40b2d122a9fd236d065f8b18a0c09fad82779f02174061
+  metadata.gz: 161cf6c476c53435c6bac139c10132e599589b4180533b2d06137d2a39a16296
+  data.tar.gz: 75910dc501c137feafcfb413939dbbdbe2c6c73f1d4bb97b039e4abd4ccf2a5a
 SHA512:
-  metadata.gz: d3802f127e96a1b0f2fc57e6f38821783e0caa2fc065d7d718727960c201ea76d6d96420196256a26ecf2559904b70fbe2d5f45f6b5b71bdca47ffbbb7f4eef5
-  data.tar.gz: 7366605a1c4882177ce807a26113d465a419e839193e795cafa17546f8b38cb7f0709dee5c72c1b771ba44e2147267d7cbd20b036d0f16db5c3851b2fff93829
+  metadata.gz: 80bcfb6f0860893abe2d7eee61012d5deb16721f08dbd5181823fcdce88afed2ec068697c66adc9f5fe5fcec9b3d24846a03f98dcda074a89342a209edab0128
+  data.tar.gz: b3bc0348374e7b234f2106b481bd20c39bf8dde514f1be2bc31e687f566d597b90275934e54cba433364b4588be84748d3b803ffec6a1f0504a1d619e2b60af6

data/lib/pfab/templates/base.rb

@@ -42,16 +42,22 @@ module Pfab
         }
       end
 
+      # overridden in subtypes
+      def application_type
+        "base"
+      end
 
       def deploy_id
         "#{@data['application']}.#{application_type}.#{@data['deployed_name']}"
       end
 
       def env_vars
-
         env_vars = { "DEPLOYED_NAME" => { value: @data['deployed_name'] },
                      "DEPLOY_ID" => { value: deploy_id },
-                     "POD_ID" => { valueFrom: { fieldRef: { fieldPath: 'metadata.name' } } }
+                     "POD_ID" => { valueFrom: { fieldRef: { fieldPath: 'metadata.name' } } },
+                     "DD_ENV" => { valueFrom: { fieldRef: { fieldPath: "metadata.labels['tags.datadoghq.com/env']" } } },
+                     "DD_SERVICE" => { valueFrom: { fieldRef: { fieldPath: "metadata.labels['tags.datadoghq.com/service']" } } },
+                     "DD_VERSION" => { valueFrom: { fieldRef: { fieldPath: "metadata.labels['tags.datadoghq.com/version']" } } }
         }
 
         # load defaults

data/lib/pfab/templates/cron.rb

@@ -20,7 +20,10 @@ module Pfab
               application: @data['application'],
               "deployed-name" => @data['deployed_name'],
               "application-type" => application_type,
-              "deploy-id" => deploy_id
+              "deploy-id" => deploy_id,
+              "tags.datadoghq.com/env": @data['env'],
+              "tags.datadoghq.com/service": @data['deployed_name'],
+              "tags.datadoghq.com/version": @data['sha']
             }
           },
           spec: {
@@ -44,6 +47,9 @@ module Pfab
                       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": @data['sha']
                     },
                   },
                   spec: {

data/lib/pfab/templates/daemon.rb

@@ -20,7 +20,10 @@ module Pfab
               application: @data['application'],
               "deployed-name" => @data['deployed_name'],
               "application-type" => application_type,
-              "deploy-id" => deploy_id
+              "deploy-id" => deploy_id,
+              "tags.datadoghq.com/env": @data['env'],
+              "tags.datadoghq.com/service": @data['deployed_name'],
+              "tags.datadoghq.com/version": @data['sha']
             }
           },
           spec: {
@@ -40,6 +43,9 @@ module Pfab
                   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": @data['sha']
                 },
               },
               spec: {

data/lib/pfab/templates/job.rb

@@ -20,7 +20,10 @@ module Pfab
               application: @data['application'],
               "deployed-name" => @data['deployed_name'],
               "application-type" => application_type,
-              "deploy-id" => deploy_id
+              "deploy-id" => deploy_id,
+              "tags.datadoghq.com/env": @data['env'],
+              "tags.datadoghq.com/service": @data['deployed_name'],
+              "tags.datadoghq.com/version": @data['sha']
             }
           },
           spec: {
@@ -32,6 +35,9 @@ module Pfab
                   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": @data['sha']
                 },
               },
               spec: {

data/lib/pfab/templates/web.rb

@@ -151,7 +151,10 @@ module Pfab
               application: @data['application'],
               "deployed-name" => @data['deployed_name'],
               "application-type" => application_type,
-              "deploy-id" => deploy_id
+              "deploy-id" => deploy_id,
+              "tags.datadoghq.com/env": @data['env'],
+              "tags.datadoghq.com/service": @data['deployed_name'],
+              "tags.datadoghq.com/version": @data['sha']
             }
           },
           spec: {
@@ -176,6 +179,9 @@ module Pfab
                   application: @data['application'],
                   "deployed-name" => @data['deployed_name'],
                   "application-type" => "web",
+                  "tags.datadoghq.com/env": @data['env'],
+                  "tags.datadoghq.com/service": @data['deployed_name'],
+                  "tags.datadoghq.com/version": @data['sha']
                 },
               },
               spec: {
@@ -188,8 +194,22 @@ module Pfab
                     resources: resources,
                     livenessProbe: livenessProbe,
                     readinessProbe: readinessProbe,
+                    volumeMounts: [
+                      {
+                        name: "apmsocketpath",
+                        mountPath: "/var/run/datadog"
+                      }
+                    ]
+                  }
+                ],
+                volumes: [
+                  {
+                    name: "apmsocketpath",
+                    hostPath: {
+                      path: "/var/run/datadog/",
+                    }
                   }
-                ]
+                ],
               },
             },
           },

data/lib/pfab/version.rb

@@ -1,7 +1,7 @@
 module Pfab
   module Version
     MAJOR = 0
-    MINOR = 22
+    MINOR = 25
     PATCH = 0
     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.22.0 ruby lib
+# stub: pfab 0.25.0 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "pfab".freeze
-  s.version = "0.22.0"
+  s.version = "0.25.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 = "2022-07-21"
+  s.date = "2022-08-10"
   s.description = "k8s helper".freeze
   s.email = "jdwyer@prefab.cloud".freeze
   s.executables = ["pfab".freeze]
@@ -44,22 +44,31 @@ Gem::Specification.new do |s|
   ]
   s.homepage = "http://github.com/prefab-cloud/pfab".freeze
   s.licenses = ["MIT".freeze]
-  s.rubygems_version = "3.2.32".freeze
+  s.rubygems_version = "3.0.3.1".freeze
   s.summary = "helper gem".freeze
 
   if s.respond_to? :specification_version then
     s.specification_version = 4
-  end
 
-  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_development_dependency(%q<rdoc>.freeze, ["~> 3.12"])
-    s.add_development_dependency(%q<bundler>.freeze, ["~> 1.0"])
-    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"])
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') 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_development_dependency(%q<rdoc>.freeze, ["~> 3.12"])
+      s.add_development_dependency(%q<bundler>.freeze, ["~> 1.0"])
+      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<rdoc>.freeze, ["~> 3.12"])
+      s.add_dependency(%q<bundler>.freeze, ["~> 1.0"])
+      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
   else
     s.add_dependency(%q<commander>.freeze, [">= 0"])
     s.add_dependency(%q<activesupport>.freeze, [">= 0"])

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pfab
 version: !ruby/object:Gem::Version
-  version: 0.22.0
+  version: 0.25.0
 platform: ruby
 authors:
 - Jeff Dwyer
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-07-21 00:00:00.000000000 Z
+date: 2022-08-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: commander
@@ -171,7 +171,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.32
+rubygems_version: 3.0.3.1
 signing_key:
 specification_version: 4
 summary: helper gem