pfab 0.24.0 → 0.27.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f606a8c659a0664f7f4869438a917a897f9c7009cdc1e23e45522739d2e69fe1
-  data.tar.gz: 919bdc6f011315fcf45a4b5fd4722b4c414c892b6e81417041371da63548da76
+  metadata.gz: 97b268eb1eb19ab0ad4ca592207c4340a1425c0efe11c9149a94fd285fb4a9df
+  data.tar.gz: 3961c3bfa5716db63037f705fedb9ffa5b5f12643df2cef895663209b9530840
 SHA512:
-  metadata.gz: 6263093d254e986ee4d9282ea7768c78c4ca5de747296b44298682557422963b4e8d52f334c0b8fec275876b66a1c87993630a4c9b0c8d8c33b0114084319fa4
-  data.tar.gz: 4846e1aa24220ef5ecf7ab25111613ade6ae9fd7c456fd5a77700cc0b6546bfca9dd58cce3128f912bde5d5cd349c8e63a0159ac1859ca79b49e01fbeaca616e
+  metadata.gz: 743fc34e1cbf93b4cf58f57a548c8bdb5e03079f8e46f8298f3370efb9acd7ecadc7b631f261d226e14c7c7fac5eb53c66377935af39cd2d70b502c6699ac51d
+  data.tar.gz: 90947ae8879590c0201b418e6aea5f7f8eca4002e80645f660023638a2da02ad324049a7a712cfe1d7f4ad6d8c1d27e37c3248c9ff55805a73a03d55d45bcba4

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

@@ -55,6 +55,7 @@ module Pfab
         env_vars = { "DEPLOYED_NAME" => { value: @data['deployed_name'] },
                      "DEPLOY_ID" => { value: deploy_id },
                      "POD_ID" => { valueFrom: { fieldRef: { fieldPath: 'metadata.name' } } },
+                     "K8S_HOSTNAME" => { valueFrom: { fieldRef: { fieldPath: 'kubernetes.io/hostname' } } },
                      "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']" } } }

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']}",
@@ -23,7 +23,7 @@ module Pfab
               "deploy-id" => deploy_id,
               "tags.datadoghq.com/env": @data['env'],
               "tags.datadoghq.com/service": @data['deployed_name'],
-              "tags.datadoghq.com/service": @data['sha']
+              "tags.datadoghq.com/version": "#{@data['sha']}"
             }
           },
           spec: {
@@ -49,7 +49,7 @@ module Pfab
                       "application-type" => "cron",
                       "tags.datadoghq.com/env": @data['env'],
                       "tags.datadoghq.com/service": @data['deployed_name'],
-                      "tags.datadoghq.com/service": @data['sha']
+                      "tags.datadoghq.com/version": "#{@data['sha']}"
                     },
                   },
                   spec: {

data/lib/pfab/templates/daemon.rb

@@ -23,7 +23,7 @@ module Pfab
               "deploy-id" => deploy_id,
               "tags.datadoghq.com/env": @data['env'],
               "tags.datadoghq.com/service": @data['deployed_name'],
-              "tags.datadoghq.com/service": @data['sha']
+              "tags.datadoghq.com/version":"#{@data['sha']}"
             }
           },
           spec: {
@@ -45,7 +45,7 @@ module Pfab
                   "application-type" => "daemon",
                   "tags.datadoghq.com/env": @data['env'],
                   "tags.datadoghq.com/service": @data['deployed_name'],
-                  "tags.datadoghq.com/service": @data['sha']
+                  "tags.datadoghq.com/version": "#{@data['sha']}"
                 },
               },
               spec: {

data/lib/pfab/templates/job.rb

@@ -23,7 +23,7 @@ module Pfab
               "deploy-id" => deploy_id,
               "tags.datadoghq.com/env": @data['env'],
               "tags.datadoghq.com/service": @data['deployed_name'],
-              "tags.datadoghq.com/service": @data['sha']
+              "tags.datadoghq.com/version":"#{@data['sha']}"
             }
           },
           spec: {
@@ -37,7 +37,7 @@ module Pfab
                   "application-type" => "job",
                   "tags.datadoghq.com/env": @data['env'],
                   "tags.datadoghq.com/service": @data['deployed_name'],
-                  "tags.datadoghq.com/service": @data['sha']
+                  "tags.datadoghq.com/version": "#{@data['sha']}"
                 },
               },
               spec: {

data/lib/pfab/templates/web.rb

@@ -154,7 +154,7 @@ module Pfab
               "deploy-id" => deploy_id,
               "tags.datadoghq.com/env": @data['env'],
               "tags.datadoghq.com/service": @data['deployed_name'],
-              "tags.datadoghq.com/service": @data['sha']
+              "tags.datadoghq.com/version":"#{@data['sha']}"
             }
           },
           spec: {
@@ -181,7 +181,7 @@ module Pfab
                   "application-type" => "web",
                   "tags.datadoghq.com/env": @data['env'],
                   "tags.datadoghq.com/service": @data['deployed_name'],
-                  "tags.datadoghq.com/version": @data['sha']
+                  "tags.datadoghq.com/version": "#{@data['sha']}"
                 },
               },
               spec: {

data/lib/pfab/version.rb

@@ -1,7 +1,7 @@
 module Pfab
   module Version
     MAJOR = 0
-    MINOR = 24
+    MINOR = 27
     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.24.0 ruby lib
+# stub: pfab 0.27.0 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "pfab".freeze
-  s.version = "0.24.0"
+  s.version = "0.27.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-08-10"
+  s.date = "2022-09-13"
   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.24.0
+  version: 0.27.0
 platform: ruby
 authors:
 - Jeff Dwyer
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-08-10 00:00:00.000000000 Z
+date: 2022-09-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: commander