pfab 0.58.11 → 0.58.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 00df54c67b4498f532bc8bc0a7c3d4d938b93e49bb029feb12f4ad34769db2b9
-  data.tar.gz: '07888f8bfdec5736018b0cbaf9d4f8ecaee98748dc43d88414570ba14a21be72'
+  metadata.gz: 9ab15281d11807142862416a06e9d3782e2047a52de45a00cd840eb0b10e6c89
+  data.tar.gz: ec482b1584f956311feee4581f2f22664cfa17941329755acb3f2627abc0b1b5
 SHA512:
-  metadata.gz: 5d83fbaa51cdacf123f9e88c2445b01d226459f7d6b279f2627758e632833a27db83bcfd8e3970a0ff3b1235918268e0aa1993c503b294d38d36b88936da2ec9
-  data.tar.gz: 3374947912d66d19f18f01325f383c676eba0ae2f676ca9e73ae8609eb02513cc6d3a5cfb9dc783e4b84e708055671f1e0e5584d0905fa74953173aa3850401e
+  metadata.gz: ad3f052c9ab4f63b50cd8049720df9ef10bda103590ed275b0134bb250163b0718ce590a58839d03ccf8e6bb8df8e4654dfcf9675f8c148cef7c54adce7710c3
+  data.tar.gz: 1cfe3d3f09352dddda6fa2b8dd38f8b0d053f165b87f097519c7aef770352023841b55d8fd2ce1a801627adde5aa1de8263d94fd0c8f5836cd1e1b8bc9518daf

data/lib/pfab/cli.rb

@@ -85,6 +85,8 @@ module Pfab
           if success
             cmd_generate_yaml
             cmd_apply(timeout: options.timeout, retries: options.retries, sleep_duration: options.sleep, tagged: options.tagged)
+          else
+            raise "Build failed"
           end
         end
       end
@@ -474,9 +476,10 @@ module Pfab
 
     def get_app_name(all: false, include_run_locals: false)
       return $app_name unless $app_name.nil?
-      apps = deployables.keys
-      apps.concat(run_locals.keys) if include_run_locals
+      apps = []
       apps << "all" if all
+      apps.concat(deployables.keys)
+      apps.concat(run_locals.keys) if include_run_locals
       $app_name = choose("which app?", *apps)
     end
 

data/lib/pfab/templates/web.rb

@@ -4,6 +4,12 @@ module Pfab
   LABEL_DEPLOY_UNIQUE_ID = "deploy-unique-id"
   module Templates
     class Web < LongRunningProcess
+
+      def get_replica_count
+        raw_replicas = get("replicas")
+        raw_replicas ? raw_replicas.to_i : 1
+      end
+
       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"
@@ -15,8 +21,7 @@ module Pfab
             puts "skipping ingress because ingress_disabled = #{@data['generateIngressEnabled']}"
           end
           f << StyledYAML.dump(deployment.deep_stringify_keys)
-          replica_count = get("replicas") ||1
-          if (replica_count > 1)
+          if get_replica_count() > 1
             f << StyledYAML.dump(pod_disruption_budget.deep_stringify_keys)
           end
         end
@@ -166,21 +171,6 @@ module Pfab
         }
         return pdb
       end
-      ANTI_AFFINITY_TYPES = %w[disabled required preferred]
-      ANTI_AFFINITY_MODE = 'antiAffinityMode'
-      ANTI_AFFINITY_PREFERRED_MODE_WEIGHT = 'antiAffinityPreferredModeWeight'
-      ZONE_ANTI_AFFINITY_MODE = 'zoneAntiAffinityMode'
-      ZONE_ANTI_AFFINITY_PREFERRED_MODE_WEIGHT = 'zoneAntiAffinityPreferredModeWeight'
-
-
-      def anti_affinity
-        return host_anti_affinity
-      end
-
-
-      def host_anti_affinity
-        anti_affinity_builder(ANTI_AFFINITY_MODE, ANTI_AFFINITY_PREFERRED_MODE_WEIGHT, "kubernetes.io/hostname")
-      end
 
 
       def topology_spread_constraints
@@ -227,40 +217,6 @@ module Pfab
         }
       end
 
-      def anti_affinity_builder(key, weight_key, topology_key)
-        antiAffinityMode = get(key) || "disabled"
-        if antiAffinityMode
-          affinitySelector = {
-            topologyKey: topology_key,
-            labelSelector: labelSelector,
-          }
-
-          return case antiAffinityMode
-                 when "disabled"
-                   puts "antiAffinityMode is set to disabled, skipping"
-                   {}
-                 when "required"
-                   {
-                     podAntiAffinity: {
-                       requiredDuringSchedulingIgnoredDuringExecution: [
-                         affinitySelector
-                       ] } }
-                 when "preferred"
-                   { podAntiAffinity: {
-                     preferredDuringSchedulingIgnoredDuringExecution: [
-                       {
-                         weight: app_vars[weight_key] || 100,
-                         podAffinityTerm: affinitySelector
-                       }
-                     ]
-                   }
-                   }
-                 else
-                   raise "Unexpected value #{antiAffinityMode} specified for `#{key}`. Valid selections are #{ANTI_AFFINITY_TYPES}"
-                 end
-        end
-        return {}
-      end
 
       def deployment
         secret_mounts = get("secretMounts") || []
@@ -295,6 +251,7 @@ module Pfab
         end
         ports = container_ports()
 
+
         {
           kind: "Deployment",
           apiVersion: "apps/v1",
@@ -302,14 +259,14 @@ module Pfab
             name: @data['deployed_name'],
             namespace: get_namespace,
             labels: {
-              application: @data['application'],
+              "application" => @data['application'],
               "deployed-name" => @data['deployed_name'],
               "application-type" => application_type,
               "deploy-id" => deploy_id,
-              LABEL_DEPLOY_UNIQUE_ID: StyledYAML.double_quoted(deploy_unique_id),
-              "tags.datadoghq.com/env": @data['env'],
-              "tags.datadoghq.com/service": @data['deployed_name'],
-              "tags.datadoghq.com/version": StyledYAML.double_quoted(@data['sha'])
+              LABEL_DEPLOY_UNIQUE_ID => StyledYAML.double_quoted(deploy_unique_id),
+              "tags.datadoghq.com/env" => @data['env'],
+              "tags.datadoghq.com/service" => @data['deployed_name'],
+              "tags.datadoghq.com/version" => StyledYAML.double_quoted(@data['sha'])
             }
           },
           spec: {
@@ -350,7 +307,7 @@ module Pfab
                     volumeMounts: volume_mounts
                   }.merge(probes()).compact
                 ],
-                topologySpreadConstraints: topology_spread_constraints,
+                topologySpreadConstraints: get_replica_count > 1 ? topology_spread_constraints : {},
                 volumes: volumes
               }.compact,
             },

data/lib/pfab/version.rb

@@ -2,7 +2,7 @@ module Pfab
   module Version
     MAJOR = 0
     MINOR = 58
-    PATCH = 11
+    PATCH = 12
     BUILD = nil
 
     STRING = [MAJOR, MINOR, PATCH, BUILD].compact.join('.')

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.58.11 ruby lib
+# stub: pfab 0.58.12 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "pfab".freeze
-  s.version = "0.58.11"
+  s.version = "0.58.12"
 
   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-12-16"
+  s.date = "2025-02-11"
   s.description = "k8s helper".freeze
   s.email = "jdwyer@prefab.cloud".freeze
   s.executables = ["pfab".freeze]
@@ -46,33 +46,19 @@ Gem::Specification.new do |s|
   ]
   s.homepage = "http://github.com/prefab-cloud/pfab".freeze
   s.licenses = ["MIT".freeze]
-  s.rubygems_version = "3.3.7".freeze
+  s.rubygems_version = "3.4.10".freeze
   s.summary = "helper gem".freeze
 
-  if s.respond_to? :specification_version then
-    s.specification_version = 4
-  end
+  s.specification_version = 4
 
-  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_runtime_dependency(%q<styled_yaml>.freeze, ["~> 0.0.1"])
-    s.add_development_dependency(%q<rdoc>.freeze, ["~> 6.1"])
-    s.add_development_dependency(%q<bundler>.freeze, ["~> 2.3"])
-    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<styled_yaml>.freeze, ["~> 0.0.1"])
-    s.add_dependency(%q<rdoc>.freeze, ["~> 6.1"])
-    s.add_dependency(%q<bundler>.freeze, ["~> 2.3"])
-    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
+  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_runtime_dependency(%q<styled_yaml>.freeze, ["~> 0.0.1"])
+  s.add_development_dependency(%q<rdoc>.freeze, ["~> 6.1"])
+  s.add_development_dependency(%q<bundler>.freeze, ["~> 2.3"])
+  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"])
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pfab
 version: !ruby/object:Gem::Version
-  version: 0.58.11
+  version: 0.58.12
 platform: ruby
 authors:
 - Jeff Dwyer
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-12-16 00:00:00.000000000 Z
+date: 2025-02-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: commander