pfab 0.19.0 → 0.20.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e0d1ae2ca336b8e351b2ac53c9277ea24c35455ced37d6ecf763a48abbc646d3
-  data.tar.gz: 53e793098a80b90dfc79217a946a1db84e945026ed75139979353311855622ee
+  metadata.gz: ae294e06f6c051ecc7a114ce443c26620e95ccad7a51c14f73647b11f49d71a3
+  data.tar.gz: 2f72d8acbd9cac08442e4c8f3aa8e135ccc9830d8e532edfb30ea3d75a2afd00
 SHA512:
-  metadata.gz: e6e6e46e096196424976bef15fbf00ca58ccc25b3223e40792c96e7991962f1fecb0bdd8bc59eb41cf89bcb63c502637c694f62a709780c43088fd3f7aa8a5cc
-  data.tar.gz: 0c6d61a87473c7dff05646bb62d9c46780a9a11c47d4a6f3bcacc0479ff5a1d322c89534a1140d5a07f239a2f7b560a0e0f061d15f4d41532a17cbb2c3373103
+  metadata.gz: ad8d785eb4d122aa05583f15221ae878b43782eb83b6c3f1b83364d33b543c98a0ae6c68d7b923db4d8d328c9eeec3b00d2ed0ebb8262e9859710eef3d28e4af
+  data.tar.gz: fac2aec3de8fce83b95e1c03af150c48c1b5c21cef4afb25dba5daf57f8e7b39f122fe223184330b36395ec575c052237954551b1c050420fdc4ecd91377c0a6

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

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

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 = 19
+    MINOR = 20
     PATCH = 0
     BUILD = nil
 

data/pfab.gemspec

@@ -2,11 +2,11 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Juwelier::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: pfab 0.19.0 ruby lib
+# stub: pfab 0.20.0 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "pfab".freeze
-  s.version = "0.19.0"
+  s.version = "0.20.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0".freeze) if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib".freeze]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pfab
 version: !ruby/object:Gem::Version
-  version: 0.19.0
+  version: 0.20.0
 platform: ruby
 authors:
 - Jeff Dwyer
@@ -133,6 +133,7 @@ extra_rdoc_files:
 files:
 - ".document"
 - ".tool-versions"
+- CODEOWNERS
 - Gemfile
 - Gemfile.lock
 - LICENSE.txt