pfab 0.23.0 → 0.26.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 714a03244225ab924ffc98c75b620eb8205e6631314f6f43f731f6016f4dd91f
-  data.tar.gz: 0bca11dc0205345aca57a8cbab34208a0b7144ffd79c0f9b4a21258aff54276c
+  metadata.gz: d629e4ecbcc8a87eda06580322ab28a566aa5d72dcbd05152a0dca10c6cbf589
+  data.tar.gz: 96c65901140ddd33f55a12db4221c01ab2a73d2928dda3aa1c528bfb86b56cc9
 SHA512:
-  metadata.gz: 6e442240a6666c09f9b42c29d37a2abc6dd56c7ac158eec52f0c82c9d36ad4f70cc551b76289084fbc414054fcccffeb13b65e1642c48ebb539681016d3004a2
-  data.tar.gz: 2d9e9765c520d267ccb9e3e97eaa2148d60b62a8d665defd50bbb3971385e855a906e78910af5929e1e727a0c11cb30842eefe22d9a558ac91dbbaf0f1888bd2
+  metadata.gz: 847a71248a41795b117504bc71287ebf04752690014f1c2c6c345dda9009e7f59ff5c08059133487eec170d3933f6f0682c8b4ab13877c2d97518b9d3a1c0f77
+  data.tar.gz: 37298e5c0b92b373d3baebd29d1f7c5e7db2b5fe05dfbcb569a4bbf8336ff35e2527d624502a5976defd68edf046032d676e59d075e7762042df64ef2b05dd1f

data/lib/pfab/cli.rb

@@ -203,6 +203,7 @@ module Pfab
         end
         puts_and_system("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")
       end
     end
 

data/lib/pfab/templates/base.rb

@@ -52,10 +52,12 @@ module Pfab
       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

@@ -11,7 +11,7 @@ module Pfab
 
       def job
         {
-          apiVersion: "batch/v1beta1",
+          apiVersion: "batch/v1",
           kind: "CronJob",
           metadata: {
             name: "#{@data['deployed_name']}-#{@data['sha']}",
@@ -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 = 23
+    MINOR = 26
     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.23.0 ruby lib
+# stub: pfab 0.26.0 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "pfab".freeze
-  s.version = "0.23.0"
+  s.version = "0.26.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-09-01"
   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.23.0
+  version: 0.26.0
 platform: ruby
 authors:
 - Jeff Dwyer
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-07-21 00:00:00.000000000 Z
+date: 2022-09-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: commander