pfab 0.56.0 → 0.57.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5624bc3199cebea0b272e764081ad57da5d0eba2139f3d7b849beef0eb32490f
-  data.tar.gz: bd991509dc381b54917ed74c3f4e2b17575ddbedfebd024fafb0d4ff93e57bb3
+  metadata.gz: 76bad8d13c4a3686060931bb8350acd807b155fbf9053e49ef88b78da658f9fc
+  data.tar.gz: 8673276f9288bb2f7f1ce47c747c766140ac3df4266f64940eb66937a892426f
 SHA512:
-  metadata.gz: 49cdc96d66b5ea4fdaae4ce10910483948eb7b107290efe53940e7ed0e37dccdfa08d54ffa5375f8d210347dd43dd53e10ed2840974bc5541f37f70f2281587b
-  data.tar.gz: 61326d6f54566e96b65bb1d318547bf67e74ab9b9aeb1e7178e433efc1cb248d5ba96151c3661aa1352f7d6bb7b9de130c90029cf8fa930b5a7da59ce4bc208e
+  metadata.gz: 0ee62382acaec3c387c5eecbee1237c371b7709213ccf0d662a72d92802b6ae4f6aa15e01fafdc1deec28226884851682cef72974eed067db18b795930b47607
+  data.tar.gz: 4dabd5de2842cbd12e052af63994f6b77c1733aef0a287a45dc0c37b515c9a8e03eb23f6eee8fbcf20033a08aeab14d496a070cf20c30ba72c55c89248903db8

data/lib/pfab/templates/base.rb

@@ -95,7 +95,14 @@ module Pfab
 
         # load env overrides
         load_env_vars(env_vars, @data.dig("application_yaml", @data["env"], :environment))
-        load_secrets(env_vars, @data.dig("application_yaml", @data["env"], :env_secrets))
+
+        #load more env overrides first at app
+        load_env_vars(env_vars, app_vars[:environment])
+        load_secrets(env_vars, app_vars[:env_secrets])
+        #  then app/environment
+        load_env_vars(env_vars, app_vars.dig(@data["env"], :environment))
+        load_secrets(env_vars, app_vars.dig(@data["env"], :env_secrets))
+
 
         env_vars.map do |k, v|
           { name: k }.merge(v)

data/lib/pfab/templates/daemon.rb

@@ -1,6 +1,6 @@
 module Pfab
   module Templates
-    class Daemon < Base
+    class Daemon < LongRunningProcess
       def write_to(f)
         f << StyledYAML.dump(deployment.deep_stringify_keys)
       end
@@ -33,9 +33,7 @@ module Pfab
                 "deployed-name" => @data['deployed_name'],
               },
             },
-            strategy: {
-              type: "Recreate"
-            },
+            strategy: rolling_update_strategy(),
             revisionHistoryLimit: 5,
             template: {
               metadata: {
@@ -59,7 +57,7 @@ module Pfab
                     envFrom: env_from,
                     resources: resources,
                     ports: container_ports()
-                  }
+                  }.merge(probes()).compact
                 ]
               }.compact,
             },

data/lib/pfab/templates/long_running_process.rb

@@ -0,0 +1,68 @@
+# frozen_string_literal: true
+
+
+module Pfab
+  module Templates
+    class LongRunningProcess < Pfab::Templates::Base
+      def default_probe
+        {
+          httpGet: {
+            path: get("health_check_path") || "/",
+            port: get("port"),
+          },
+          initialDelaySeconds: 15,
+          timeoutSeconds: 3
+        }
+      end
+
+      def livenessProbe
+        get("livenessProbe") || default_probe
+      end
+
+      def readinessProbe
+        get("readinessProbe") || default_probe
+      end
+
+      def startupProbe
+        get("startupProbe") || default_probe
+      end
+
+      def probes
+
+        if application_type == "web" || get("probesEnabled")
+          return {
+            livenessProbe: livenessProbe,
+            readinessProbe: readinessProbe,
+            startupProbe: startupProbe,
+          }
+        end
+        puts "probes are disabled, set `probesEnabled: true` to enable"
+        return {
+
+        }
+
+      end
+
+
+      def rolling_update_strategy(max_surge=1,max_unavailable=0)
+        {
+          type: "RollingUpdate",
+          rollingUpdate: {
+            maxSurge: max_surge,
+            maxUnavailable: max_unavailable,
+          }
+        }
+      end
+
+
+
+
+
+
+    end
+
+
+
+  end
+end
+

data/lib/pfab/templates/web.rb

@@ -3,7 +3,7 @@ require "rubygems/safe_yaml"
 module Pfab
   LABEL_DEPLOY_UNIQUE_ID = "deploy-unique-id"
   module Templates
-    class Web < Base
+    class Web < LongRunningProcess
       def write_to(f)
         if ingres_enabled? && get("host").nil?
           puts "No host to configure ingress for #{@data['deployed_name']}. Skipping deployment. add a host or generateIngressEnabled:false"
@@ -136,33 +136,11 @@ module Pfab
         h
       end
 
-      def default_probe
-        {
-          httpGet: {
-            path: get("health_check_path") || "/",
-            port: get("port"),
-          },
-          initialDelaySeconds: 15,
-          timeoutSeconds: 3
-        }
-      end
-
-      def livenessProbe
-        get("livenessProbe") || default_probe
-      end
-
-      def readinessProbe
-        get("readinessProbe") || default_probe
-      end
-
-      def startupProbe
-        get("startupProbe") || default_probe
-      end
-
       def lifecycle
         get("lifecycle")
       end
 
+
       def application_type
         "web"
       end
@@ -341,13 +319,7 @@ module Pfab
                 "deployed-name" => @data['deployed_name'],
               },
             },
-            strategy: {
-              type: "RollingUpdate",
-              rollingUpdate: {
-                maxSurge: 1,
-                maxUnavailable: 0,
-              }
-            },
+            strategy: rolling_update_strategy(),
             revisionHistoryLimit: 5,
             progressDeadlineSeconds: 120,
             template: {
@@ -374,12 +346,9 @@ module Pfab
                     envFrom: env_from,
                     resources: resources,
                     ports: ports,
-                    livenessProbe: livenessProbe,
-                    readinessProbe: readinessProbe,
-                    startupProbe: startupProbe,
                     lifecycle: lifecycle,
                     volumeMounts: volume_mounts
-                  }.compact
+                  }.merge(probes()).compact
                 ],
                 topologySpreadConstraints: topology_spread_constraints,
                 volumes: volumes

data/lib/pfab/version.rb

@@ -1,7 +1,7 @@
 module Pfab
   module Version
     MAJOR = 0
-    MINOR = 56
+    MINOR = 57
     PATCH = 0
     BUILD = nil
 

data/lib/pfab.rb

@@ -2,6 +2,7 @@ require "pfab/version"
 require "pfab/cli"
 require "pfab/yamls"
 require "pfab/templates/base"
+require "pfab/templates/long_running_process"
 require "pfab/templates/job"
 require "pfab/templates/daemon"
 require "pfab/templates/web"

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.56.0 ruby lib
+# stub: pfab 0.57.0 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "pfab".freeze
-  s.version = "0.56.0"
+  s.version = "0.57.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 = "2024-05-31"
+  s.date = "2024-07-17"
   s.description = "k8s helper".freeze
   s.email = "jdwyer@prefab.cloud".freeze
   s.executables = ["pfab".freeze]
@@ -36,6 +36,7 @@ Gem::Specification.new do |s|
     "lib/pfab/templates/cron.rb",
     "lib/pfab/templates/daemon.rb",
     "lib/pfab/templates/job.rb",
+    "lib/pfab/templates/long_running_process.rb",
     "lib/pfab/templates/web.rb",
     "lib/pfab/version.rb",
     "lib/pfab/yamls.rb",

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pfab
 version: !ruby/object:Gem::Version
-  version: 0.56.0
+  version: 0.57.0
 platform: ruby
 authors:
 - Jeff Dwyer
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-05-31 00:00:00.000000000 Z
+date: 2024-07-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: commander
@@ -161,6 +161,7 @@ files:
 - lib/pfab/templates/cron.rb
 - lib/pfab/templates/daemon.rb
 - lib/pfab/templates/job.rb
+- lib/pfab/templates/long_running_process.rb
 - lib/pfab/templates/web.rb
 - lib/pfab/version.rb
 - lib/pfab/yamls.rb