pfab 0.21.0 → 0.24.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 27a890e2f61bd9bc6199fe0274e29a31e84746e7525e78db1d4c6aa521599fec
-  data.tar.gz: 256394a7e22e8396c7a7a48e1b719cc2d0d70f82061dd7ce76766ce6dc13e5e4
+  metadata.gz: f606a8c659a0664f7f4869438a917a897f9c7009cdc1e23e45522739d2e69fe1
+  data.tar.gz: 919bdc6f011315fcf45a4b5fd4722b4c414c892b6e81417041371da63548da76
 SHA512:
-  metadata.gz: fbfc48c374b2014452e18bcb00f0fc58d81058e592bc842106de08f472c8e7841896b4a809d34dfabe5dbdc59f164df86f053dc4b93916a90dca9ab4134e73a2
-  data.tar.gz: e319e0ee8b66448ddcc084fb1dafb871b9e2b0ea4092966deebcb53b15e6dad69e6a79807b406b1281bd259154e712d2051ce2ba83e02ae9bc11bf882836213a
+  metadata.gz: 6263093d254e986ee4d9282ea7768c78c4ca5de747296b44298682557422963b4e8d52f334c0b8fec275876b66a1c87993630a4c9b0c8d8c33b0114084319fa4
+  data.tar.gz: 4846e1aa24220ef5ecf7ab25111613ade6ae9fd7c456fd5a77700cc0b6546bfca9dd58cce3128f912bde5d5cd349c8e63a0159ac1859ca79b49e01fbeaca616e

data/lib/pfab/cli.rb

@@ -31,8 +31,9 @@ module Pfab
         c.syntax = "pfab build"
         c.summary = "build image"
         c.option "--force", "force build and push"
+        c.option "--check", "just check if built"
         c.action do |_args, options|
-          cmd_build(force: options.force)
+          cmd_build(force: options.force, checkonly: options.check)
         end
       end
 
@@ -83,6 +84,18 @@ module Pfab
         end
       end
 
+      command :restart do |c|
+        c.syntax = "pfab restart"
+        c.summary = "rolling restart of a deployment"
+        c.description = "rolling restart of a deployment"
+        c.action do
+          set_kube_context
+          app_name = get_app_name
+
+          puts_and_system "kubectl rollout restart deployment.apps/#{app_name}"
+        end
+      end
+
       command :exec do |c|
         c.syntax = "pfab exec"
         c.summary = "kubectl exec into a  pod"
@@ -193,7 +206,16 @@ module Pfab
       end
     end
 
-    def cmd_build(force: false)
+    def image_exists?(full_image_name)
+
+      # return 0 if image exists 1 if not
+      cmd = "docker manifest inspect #{full_image_name} > /dev/null ; echo $?"
+      say "Looking for images with #{cmd}"
+      existing = `#{cmd}`.strip
+      existing == "0"
+    end
+
+    def cmd_build(force: false, checkonly: false)
       rev = get_current_sha
       say "This repo is at rev: #{rev}"
       uncommitted_changes = !`git diff-index HEAD --`.empty?
@@ -209,14 +231,14 @@ module Pfab
 
       full_image_name = "#{container_repository}/#{image_name}:#{rev}"
 
-      # return 0 if image exists 1 if not
-      cmd = "docker manifest inspect #{full_image_name} > /dev/null ; echo $?"
-      say "Looking for images with #{cmd}"
-      existing = `#{cmd}`.strip
-
-      if existing == "0" && !force
-        say "Found image #{full_image_name} already, skipping prebuild, build & push"
-        return true
+      unless force
+        if image_exists?(full_image_name)
+          say "Found image #{full_image_name} already, skipping prebuild, build & push"
+          return true
+        else
+          say "No image #{full_image_name} present"
+        end
+        return if checkonly
       end
 
       say "No image #{full_image_name} present, building"

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/service": @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/service": @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/service": @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/service": @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/service": @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/service": @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/service": @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 = 21
+    MINOR = 24
     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.21.0 ruby lib
+# stub: pfab 0.24.0 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "pfab".freeze
-  s.version = "0.21.0"
+  s.version = "0.24.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.21.0
+  version: 0.24.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