pfab 0.18.0 → 0.21.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 39b274de173e627baf79bb67bceee55639a095a503709b3dc8b96076d6374e93
-  data.tar.gz: c94f1bce1be02fbe2158d6a1b51fede74379bf5a2234ec4fe53f08045d24171f
+  metadata.gz: 27a890e2f61bd9bc6199fe0274e29a31e84746e7525e78db1d4c6aa521599fec
+  data.tar.gz: 256394a7e22e8396c7a7a48e1b719cc2d0d70f82061dd7ce76766ce6dc13e5e4
 SHA512:
-  metadata.gz: 9950a8bd021e9f1cbd2a41463a7a1a121e62d72b4841f0e798beb7b4788cb560b0b665aa5dc9d300031100efef71f9f466d257b67a6c35f4648bb010edc0d9cc
-  data.tar.gz: 632de04acb276119e836be46d479b10d32ae38598bd09497f5d1eb3aad95e3df4d8a3c1d9b5674ff60e287fcd4cd5ed10460a62d1590f245a8961b42744a3bf6
+  metadata.gz: fbfc48c374b2014452e18bcb00f0fc58d81058e592bc842106de08f472c8e7841896b4a809d34dfabe5dbdc59f164df86f053dc4b93916a90dca9ab4134e73a2
+  data.tar.gz: e319e0ee8b66448ddcc084fb1dafb871b9e2b0ea4092966deebcb53b15e6dad69e6a79807b406b1281bd259154e712d2051ce2ba83e02ae9bc11bf882836213a

data/.tool-versions

@@ -1 +1 @@
-ruby 2.6.9
+ruby 3.0.3

data/CODEOWNERS

@@ -0,0 +1 @@
+*    @prefab-cloud/prefabdevs @prefab-cloud/prefabmaintainers @prefab-cloud/prefabadmins

data/Gemfile.lock

@@ -18,7 +18,7 @@ GIT
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (5.2.2)
+    activesupport (5.2.4.3)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 0.7, < 2)
       minitest (~> 5.1)
@@ -30,7 +30,7 @@ GEM
     coderay (1.1.2)
     commander (4.4.6)
       highline (~> 1.7.2)
-    concurrent-ruby (1.1.4)
+    concurrent-ruby (1.1.9)
     descendants_tracker (0.0.4)
       thread_safe (~> 0.3, >= 0.3.1)
     docile (1.3.1)
@@ -53,7 +53,7 @@ GEM
     faraday-net_http_persistent (1.2.0)
     faraday-patron (1.0.0)
     faraday-rack (1.0.0)
-    git (1.9.1)
+    git (1.11.0)
       rchardet (~> 1.8)
     github_api (0.19.0)
       addressable (~> 2.4)
@@ -63,20 +63,20 @@ GEM
       oauth2 (~> 1.0)
     hashie (3.6.0)
     highline (1.7.10)
-    i18n (1.2.0)
+    i18n (1.8.11)
       concurrent-ruby (~> 1.0)
     json (1.8.6)
     jwt (2.3.0)
     kamelcase (0.0.2)
       semver2 (~> 3)
     method_source (0.9.2)
-    mini_portile2 (2.6.1)
-    minitest (5.11.3)
+    mini_portile2 (2.8.0)
+    minitest (5.15.0)
     multi_json (1.15.0)
     multi_xml (0.6.0)
     multipart-post (2.1.1)
-    nokogiri (1.12.5)
-      mini_portile2 (~> 2.6.1)
+    nokogiri (1.13.6)
+      mini_portile2 (~> 2.8.0)
       racc (~> 1.4)
     oauth2 (1.4.7)
       faraday (>= 0.8, < 2.0)
@@ -109,7 +109,7 @@ GEM
     test-unit (3.2.9)
       power_assert
     thread_safe (0.3.6)
-    tzinfo (1.2.5)
+    tzinfo (1.2.9)
       thread_safe (~> 0.1)
 
 PLATFORMS
@@ -126,4 +126,4 @@ DEPENDENCIES
   test-unit
 
 BUNDLED WITH
-   1.17.2
+   2.3.5

data/README.markdown

@@ -117,9 +117,9 @@ Releasing
 - modify version.rb
 - ```bundle exec rake gemspec```
 - ```git commit ```
-- ```bundle exec rake git:release```
-- ```bundle exec rake build```
-- ```gem push pkg/pfab-0.12.0.gem```
+- ```REMOTE_BRANCH=main LOCAL_BRANCH=main bundle exec rake git:release```
+- ```REMOTE_BRANCH=main LOCAL_BRANCH=main bundle exec rake build```
+- ```gem push pkg/pfab-0.15.0.gem```
 
 Copyright
 ---------

data/lib/pfab/cli.rb

@@ -209,11 +209,12 @@ module Pfab
 
       full_image_name = "#{container_repository}/#{image_name}:#{rev}"
 
-      cmd = "docker images -q #{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}`
+      existing = `#{cmd}`.strip
 
-      if !existing.to_s.empty? && !force
+      if existing == "0" && !force
         say "Found image #{full_image_name} already, skipping prebuild, build & push"
         return true
       end
@@ -234,13 +235,23 @@ module Pfab
         end
       end
 
-      puts_and_system "docker build -t #{image_name} --platform amd64 ."
+      build_cmd = "docker build -t #{image_name} --platform amd64 ."
+      puts build_cmd
+      result = system(build_cmd)
 
-      puts_and_system "docker tag #{image_name}:latest #{image_name}:#{rev}"
-      puts_and_system "docker tag #{image_name}:#{rev} #{full_image_name}"
+      puts "Build Result #{result}"
+
+      if result
+        puts_and_system "docker tag #{image_name}:latest #{image_name}:#{rev}"
+        puts_and_system "docker tag #{image_name}:#{rev} #{full_image_name}"
+
+        puts_and_system "docker push #{container_repository}/#{image_name}:#{rev}"
+        return true
+      else
+        say "Build Did Not Succeed"
+        return false
+      end
 
-      puts_and_system "docker push #{container_repository}/#{image_name}:#{rev}"
-      return true
     end
 
     def yy
@@ -263,7 +274,7 @@ module Pfab
     end
 
     def get_current_sha
-      `git rev-parse --short --verify HEAD`.chomp
+      `git rev-parse --short=8 --verify HEAD`.chomp
     end
 
     def set_kube_context

data/lib/pfab/templates/base.rb

@@ -42,8 +42,17 @@ module Pfab
         }
       end
 
+
+      def deploy_id
+        "#{@data['application']}.#{application_type}.#{@data['deployed_name']}"
+      end
+
       def env_vars
-        env_vars = { "DEPLOYED_NAME" => { value: @data['deployed_name'] } }
+
+        env_vars = { "DEPLOYED_NAME" => { value: @data['deployed_name'] },
+                     "DEPLOY_ID" => { value: deploy_id },
+                     "POD_ID" => { valueFrom: { fieldRef: { fieldPath: 'metadata.name' } } }
+        }
 
         # load defaults
         load_env_vars(env_vars, @data.dig("application_yaml", :environment))

data/lib/pfab/templates/cron.rb

@@ -5,6 +5,10 @@ module Pfab
         f << YAML.dump(job.deep_stringify_keys)
       end
 
+      def application_type
+        "cron"
+      end
+
       def job
         {
           apiVersion: "batch/v1beta1",
@@ -15,7 +19,8 @@ module Pfab
             labels: {
               application: @data['application'],
               "deployed-name" => @data['deployed_name'],
-              "application-type" => "job",
+              "application-type" => application_type,
+              "deploy-id" => deploy_id
             }
           },
           spec: {

data/lib/pfab/templates/daemon.rb

@@ -5,6 +5,10 @@ module Pfab
         f << YAML.dump(deployment.deep_stringify_keys)
       end
 
+      def application_type
+        "daemon"
+      end
+
       def deployment
         {
           kind: "Deployment",
@@ -15,7 +19,8 @@ module Pfab
             labels: {
               application: @data['application'],
               "deployed-name" => @data['deployed_name'],
-              "application-type" => "daemon",
+              "application-type" => application_type,
+              "deploy-id" => deploy_id
             }
           },
           spec: {

data/lib/pfab/templates/job.rb

@@ -5,6 +5,10 @@ module Pfab
         f << YAML.dump(job.deep_stringify_keys)
       end
 
+      def application_type
+        "job"
+      end
+
       def job
         {
           apiVersion: "batch/v1",
@@ -15,7 +19,8 @@ module Pfab
             labels: {
               application: @data['application'],
               "deployed-name" => @data['deployed_name'],
-              "application-type" => "job",
+              "application-type" => application_type,
+              "deploy-id" => deploy_id
             }
           },
           spec: {

data/lib/pfab/templates/web.rb

@@ -21,7 +21,8 @@ module Pfab
             labels: {
               application: @data['application'],
               "deployed-name" => @data['deployed_name'],
-            }
+            },
+            annotations: service_annotations,
           },
           spec: {
             selector: {
@@ -38,6 +39,12 @@ module Pfab
         }
       end
 
+      def service_annotations
+        h = {}
+        h["traefik.ingress.kubernetes.io/service.serversscheme"] = "h2c" if get("protocol") == "h2c"
+        h
+      end
+
       def ingress
         {
           apiVersion: "networking.k8s.io/v1",
@@ -107,7 +114,6 @@ module Pfab
           "traefik.ingress.kubernetes.io/router.entrypoints" => "websecure",
           "traefik.ingress.kubernetes.io/router.tls" => "true"
         }
-        h["ingress.kubernetes.io/protocol"] = "h2c" if get("protocol") == "h2c"
         h
       end
 
@@ -130,6 +136,10 @@ module Pfab
         get("readinessProbe") || default_probe
       end
 
+      def application_type
+        "web"
+      end
+
       def deployment
         {
           kind: "Deployment",
@@ -140,7 +150,8 @@ module Pfab
             labels: {
               application: @data['application'],
               "deployed-name" => @data['deployed_name'],
-              "application-type" => "web",
+              "application-type" => application_type,
+              "deploy-id" => deploy_id
             }
           },
           spec: {

data/lib/pfab/version.rb

@@ -1,7 +1,7 @@
 module Pfab
   module Version
     MAJOR = 0
-    MINOR = 18
+    MINOR = 21
     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.18.0 ruby lib
+# stub: pfab 0.21.0 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "pfab".freeze
-  s.version = "0.18.0"
+  s.version = "0.21.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-16"
+  s.date = "2022-07-21"
   s.description = "k8s helper".freeze
   s.email = "jdwyer@prefab.cloud".freeze
   s.executables = ["pfab".freeze]
@@ -22,6 +22,7 @@ Gem::Specification.new do |s|
   s.files = [
     ".document",
     ".tool-versions",
+    "CODEOWNERS",
     "Gemfile",
     "Gemfile.lock",
     "LICENSE.txt",
@@ -43,31 +44,22 @@ Gem::Specification.new do |s|
   ]
   s.homepage = "http://github.com/prefab-cloud/pfab".freeze
   s.licenses = ["MIT".freeze]
-  s.rubygems_version = "3.0.3.1".freeze
+  s.rubygems_version = "3.2.32".freeze
   s.summary = "helper gem".freeze
 
   if s.respond_to? :specification_version then
     s.specification_version = 4
+  end
 
-    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
+  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"])
   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.18.0
+  version: 0.21.0
 platform: ruby
 authors:
 - Jeff Dwyer
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-07-16 00:00:00.000000000 Z
+date: 2022-07-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: commander
@@ -133,6 +133,7 @@ extra_rdoc_files:
 files:
 - ".document"
 - ".tool-versions"
+- CODEOWNERS
 - Gemfile
 - Gemfile.lock
 - LICENSE.txt
@@ -170,7 +171,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3.1
+rubygems_version: 3.2.32
 signing_key:
 specification_version: 4
 summary: helper gem